Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit 477cc9463d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      doc/languages-frameworks/coq.section.md
  2. 2
      maintainers/scripts/haskell/hydra-report.hs
  3. 16
      nixos/modules/installer/cd-dvd/iso-image.nix
  4. 4
      nixos/modules/services/continuous-integration/hydra/default.nix
  5. 1
      nixos/modules/services/web-apps/hedgedoc.nix
  6. 2
      nixos/tests/hydra/default.nix
  7. 62
      pkgs/applications/audio/adlplug/default.nix
  8. 44
      pkgs/applications/blockchains/dashpay/default.nix
  9. 63
      pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
  10. 15
      pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
  11. 8
      pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix
  12. 2
      pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
  13. 31
      pkgs/applications/editors/emacs/elisp-packages/plz/default.nix
  14. 1576
      pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
  15. 2
      pkgs/applications/misc/fspy/default.nix
  16. 13
      pkgs/applications/science/logic/coq/default.nix
  17. 2
      pkgs/applications/video/ogmtools/default.nix
  18. 39
      pkgs/build-support/coq/default.nix
  19. 2
      pkgs/development/coq-modules/CoLoR/default.nix
  20. 2
      pkgs/development/coq-modules/HoTT/default.nix
  21. 3
      pkgs/development/coq-modules/QuickChick/default.nix
  22. 2
      pkgs/development/coq-modules/VST/default.nix
  23. 2
      pkgs/development/coq-modules/bignums/default.nix
  24. 15
      pkgs/development/coq-modules/compcert/default.nix
  25. 32
      pkgs/development/coq-modules/coq-bits/default.nix
  26. 4
      pkgs/development/coq-modules/coq-elpi/default.nix
  27. 3
      pkgs/development/coq-modules/coqeal/default.nix
  28. 6
      pkgs/development/coq-modules/coqhammer/default.nix
  29. 1
      pkgs/development/coq-modules/coqprime/default.nix
  30. 4
      pkgs/development/coq-modules/coqtail-math/default.nix
  31. 4
      pkgs/development/coq-modules/coquelicot/default.nix
  32. 4
      pkgs/development/coq-modules/dpdgraph/default.nix
  33. 4
      pkgs/development/coq-modules/fiat/HEAD.nix
  34. 4
      pkgs/development/coq-modules/flocq/default.nix
  35. 2
      pkgs/development/coq-modules/gappalib/default.nix
  36. 16
      pkgs/development/coq-modules/heq/default.nix
  37. 5
      pkgs/development/coq-modules/hierarchy-builder/default.nix
  38. 8
      pkgs/development/coq-modules/interval/default.nix
  39. 2
      pkgs/development/coq-modules/itauto/default.nix
  40. 1
      pkgs/development/coq-modules/ltac2/default.nix
  41. 2
      pkgs/development/coq-modules/math-classes/default.nix
  42. 9
      pkgs/development/coq-modules/mathcomp/default.nix
  43. 6
      pkgs/development/coq-modules/metacoq/default.nix
  44. 1
      pkgs/development/coq-modules/metalib/default.nix
  45. 4
      pkgs/development/coq-modules/semantics/default.nix
  46. 6
      pkgs/development/coq-modules/simple-io/default.nix
  47. 8
      pkgs/development/coq-modules/smtcoq/default.nix
  48. 2
      pkgs/development/haskell-modules/configuration-nix.nix
  49. 3
      pkgs/development/libraries/libcutl/default.nix
  50. 11
      pkgs/development/libraries/libde265/default.nix
  51. 4
      pkgs/development/libraries/opengrm-ngram/default.nix
  52. 1
      pkgs/development/libraries/wlroots/0.14.nix
  53. 1
      pkgs/development/libraries/wlroots/0.15.nix
  54. 1
      pkgs/development/libraries/wlroots/protocols.nix
  55. 12
      pkgs/development/ocaml-modules/elpi/default.nix
  56. 2
      pkgs/development/python-modules/container-inspector/default.nix
  57. 12
      pkgs/development/python-modules/debian-inspector/default.nix
  58. 48
      pkgs/development/python-modules/evtx/default.nix
  59. 14
      pkgs/development/python-modules/jwcrypto/default.nix
  60. 2
      pkgs/development/python-modules/license-expression/default.nix
  61. 16
      pkgs/development/python-modules/parameter-expansion-patched/default.nix
  62. 2
      pkgs/development/python-modules/pip-requirements-parser/default.nix
  63. 16
      pkgs/development/python-modules/plugincode/default.nix
  64. 5
      pkgs/development/python-modules/pontos/default.nix
  65. 8
      pkgs/development/python-modules/pyahocorasick/default.nix
  66. 4
      pkgs/development/python-modules/pytest-cases/default.nix
  67. 20
      pkgs/development/python-modules/scancode-toolkit/default.nix
  68. 4
      pkgs/development/python-modules/tubeup/default.nix
  69. 7
      pkgs/development/python-modules/typecode/default.nix
  70. 31
      pkgs/development/tools/database/sqlc/default.nix
  71. 6
      pkgs/development/tools/dprint/default.nix
  72. 19
      pkgs/development/tools/goconst/default.nix
  73. 26
      pkgs/development/tools/misc/hydra/default.nix
  74. 131
      pkgs/development/tools/misc/hydra/unstable.nix
  75. 2
      pkgs/development/tools/poetry2nix/poetry2nix/default.nix
  76. 66
      pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
  77. 20
      pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
  78. 17
      pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh
  79. 63
      pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
  80. 181
      pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
  81. 46
      pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py
  82. 4
      pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
  83. 6
      pkgs/tools/audio/spotdl/default.nix
  84. 4
      pkgs/tools/networking/cadaver/default.nix
  85. 25
      pkgs/tools/security/bao/default.nix
  86. 48
      pkgs/tools/security/cliam/default.nix
  87. 31
      pkgs/tools/security/evtx/default.nix
  88. 6
      pkgs/tools/security/exploitdb/default.nix
  89. 2
      pkgs/tools/security/yubikey-touch-detector/default.nix
  90. 7
      pkgs/tools/wayland/kanshi/default.nix
  91. 4
      pkgs/tools/wayland/oguri/default.nix
  92. 3
      pkgs/tools/wayland/slurp/default.nix
  93. 1
      pkgs/tools/wayland/swaykbdd/default.nix
  94. 5
      pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
  95. 1
      pkgs/tools/wayland/wayland-utils/default.nix
  96. 16
      pkgs/tools/wayland/wdomirror/default.nix
  97. 4
      pkgs/tools/wayland/wev/default.nix
  98. 4
      pkgs/tools/wayland/wl-clipboard-x11/default.nix
  99. 7
      pkgs/tools/wayland/wl-clipboard/default.nix
  100. 3
      pkgs/tools/wayland/wl-color-picker/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -29,19 +29,14 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
* `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags,
* `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers,
* `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune2`, `useDune2ifVersion` and `mlPlugin` are set).
* `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`,
* `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements,
* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`,
* `extraBuildInputs` (optional, deprecated), an additional list of derivation to add to `buildInputs`,
* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,
* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly,
* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against.
* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2ifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
* `extraNativeBuildInputs` (optional), by default `nativeBuildInputs` just contains `coq`, this allows to add more native build inputs, `nativeBuildInputs` are executables and `buildInputs` are libraries and dependencies,
* `extraBuildInputs` (optional), this allows to add more build inputs,
* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against.
* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
* `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variables `DESTDIR` and `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
* `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`,
* `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility).
* `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`.

@ -1,6 +1,6 @@
#! /usr/bin/env nix-shell
#! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
#! nix-shell -p hydra-unstable
#! nix-shell -p hydra_unstable
#! nix-shell -i runhaskell
{-

@ -369,10 +369,10 @@ let
${lib.optionalString (refindBinary != null) ''
# GRUB apparently cannot do "chainloader" operations on "CD".
if [ "\$root" != "cd0" ]; then
# Force root to be the FAT partition
# Otherwise it breaks rEFInd's boot
search --set=root --no-floppy --fs-uuid 1234-5678
menuentry 'rEFInd' --class refind {
# Force root to be the FAT partition
# Otherwise it breaks rEFInd's boot
search --set=root --no-floppy --fs-uuid 1234-5678
chainloader (\$root)/EFI/boot/${refindBinary}
}
fi
@ -400,10 +400,8 @@ let
# dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i)
''
mkdir ./contents && cd ./contents
cp -rp "${efiDir}"/EFI .
mkdir ./boot
cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \
"${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/
mkdir -p ./EFI/boot
cp -rp "${efiDir}"/EFI/boot/{grub.cfg,*.efi} ./EFI/boot
# Rewrite dates for everything in the FS
find . -exec touch --date=2000-01-01 {} +
@ -421,11 +419,11 @@ let
faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out"
# Force a fixed order in mcopy for better determinism, and avoid file globbing
for d in $(find EFI boot -type d | sort); do
for d in $(find EFI -type d | sort); do
faketime "2000-01-01 00:00:00" mmd -i "$out" "::/$d"
done
for f in $(find EFI boot -type f | sort); do
for f in $(find EFI -type f | sort); do
mcopy -pvm -i "$out" "$f" "::/$f"
done

@ -99,8 +99,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.hydra-unstable;
defaultText = literalExpression "pkgs.hydra-unstable";
default = pkgs.hydra_unstable;
defaultText = literalExpression "pkgs.hydra_unstable";
description = "The Hydra package.";
};

@ -1023,6 +1023,7 @@ in
'';
serviceConfig = {
WorkingDirectory = cfg.workDir;
StateDirectory = [ cfg.workDir cfg.configuration.uploadsPath ];
ExecStart = "${cfg.package}/bin/hedgedoc";
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
Environment = [

@ -11,7 +11,7 @@ let
inherit (import ./common.nix { inherit system; }) baseConfig;
hydraPkgs = {
inherit (pkgs) hydra-unstable;
inherit (pkgs) hydra_unstable;
};
makeHydraTest = with pkgs.lib; name: package: makeTest {

@ -13,11 +13,22 @@
, libXinerama
, libXext
, libXcursor
, libobjc
, Foundation
, Cocoa
, Carbon
, CoreServices
, ApplicationServices
, CoreAudio
, CoreMIDI
, AudioToolbox
, Accelerate
, CoreImage
, IOKit
, AudioUnit
, QuartzCore
, WebKit
, DiscRecording
, CoreAudioKit
# Enabling JACK requires a JACK server at runtime, no fallback mechanism
, withJack ? false, jack
@ -35,25 +46,16 @@ let
in
stdenv.mkDerivation rec {
pname = "${lib.strings.toLower type}plug";
version = "1.0.2";
version = "unstable-2021-12-17";
src = fetchFromGitHub {
owner = "jpcima";
repo = "ADLplug";
rev = "v${version}";
rev = "a488abedf1783c61cb4f0caa689f1b01bf9aa17d";
fetchSubmodules = true;
sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f";
sha256 = "1a5zw0rglqgc5wq1n0s5bxx7y59dsg6qy02236fakl34bvbk60yz";
};
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/jpcima/ADLplug/83636c55bec1b86cabf634b9a6d56d07f00ecc61/resources/patch/juce-gcc9.patch";
sha256 = "15hkdb76n9lgjsrpczj27ld9b4804bzrgw89g95cj4sc8wwkplyy";
extraPrefix = "thirdparty/JUCE/";
stripLen = 1;
})
];
cmakeFlags = [
"-DADLplug_CHIP=${chip}"
"-DADLplug_USE_SYSTEM_FMT=ON"
@ -61,9 +63,24 @@ stdenv.mkDerivation rec {
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
# "fp.h" file not found
"-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers"
]);
NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [
# Framework that JUCE needs which don't get linked properly
"-framework CoreAudioKit"
"-framework QuartzCore"
"-framework AudioToolbox"
] ++ lib.optionals stdenv.hostPlatform.isLinux [
# JUCE dlopen's these at runtime
"-lX11"
"-lXext"
"-lXcursor"
"-lXinerama"
"-lXrandr"
]);
nativeBuildInputs = [
cmake
pkg-config
@ -81,17 +98,32 @@ stdenv.mkDerivation rec {
libXext
libXcursor
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
Foundation
Cocoa
Carbon
CoreServices
ApplicationServices
CoreAudio
CoreMIDI
AudioToolbox
Accelerate
CoreImage
IOKit
AudioUnit
QuartzCore
WebKit
DiscRecording
CoreAudioKit
] ++ lib.optional withJack jack;
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications
mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}}
mv $out/bin/${mainProgram}.app $out/Applications/
ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram}
mv vst2/${mainProgram}.vst $out/Library/Audio/Plug-Ins/VST/
mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/
'';
meta = with lib; {

@ -1,44 +0,0 @@
{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
, qrencode, glib, protobuf, yasm, libevent
, util-linux
, enable_Upnp ? false
, disable_Wallet ? false
, disable_Daemon ? false }:
with lib;
stdenv.mkDerivation rec {
pname = "dashpay";
version = "0.12.2.3";
src = fetchFromGitHub {
owner = "dashpay";
repo= "dash";
rev = "v${version}";
sha256 = "sha256-DMoiUX8Q0HcBHA6ZIN58uPsTnHjEJMi8eGG2DW8z17Q=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ glib openssl db48 yasm boost zlib libevent
miniupnpc protobuf qrencode util-linux ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
++ optional enable_Upnp "--enable-upnp-default"
++ optional disable_Wallet "--disable-wallet"
++ optional disable_Daemon "--disable-daemon"
;
meta = {
description = "A decentralized key/value registration and transfer system";
longDescription = ''
Dash (DASH) is an open sourced, privacy-centric digital currency
with instant transactions. It allows you to keep your finances
private as you make transactions without waits, similar to cash.
'';
homepage = "https://www.dash.org";
maintainers = with maintainers; [ ];
platforms = platforms.unix;
license = licenses.mit;
};
}

@ -384,10 +384,10 @@
elpaBuild {
pname = "boxy";
ename = "boxy";
version = "1.0.5";
version = "1.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/boxy-1.0.5.tar";
sha256 = "0g608nhg160p9gflw52h3247x35r0g6bl89yq35jbsc7fnw6m5ry";
url = "https://elpa.gnu.org/packages/boxy-1.1.0.tar";
sha256 = "17z0amn1klbzvq0z5g20a5gjq5agrrhnkp8amqlqzj7p0p31nbns";
};
packageRequires = [ emacs ];
meta = {
@ -399,10 +399,10 @@
elpaBuild {
pname = "boxy-headings";
ename = "boxy-headings";
version = "2.1.2";
version = "2.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/boxy-headings-2.1.2.tar";
sha256 = "0jyfp41jw33kmi7832x5x0mgh5niqvb7dfc7q00kay5q9ixg83dq";
url = "https://elpa.gnu.org/packages/boxy-headings-2.1.3.tar";
sha256 = "09k5x123db19v2k49y8acyk5y3r0fxw0xz61qqqidrgrx8fs3mg9";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -1384,10 +1384,10 @@
elpaBuild {
pname = "eldoc";
ename = "eldoc";
version = "1.11.1";
version = "1.12.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eldoc-1.11.1.tar";
sha256 = "065clc07nrgp56cgynqhq3fmnwd64ccg2jxzikzb0f2zkn10vc90";
url = "https://elpa.gnu.org/packages/eldoc-1.12.0.tar";
sha256 = "1npggpisqnfkc3gx7dr3pjnif7gf571z7s9g7n6vnb213353qskk";
};
packageRequires = [ emacs ];
meta = {
@ -1499,10 +1499,10 @@
elpaBuild {
pname = "engrave-faces";
ename = "engrave-faces";
version = "0.3.0";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/engrave-faces-0.3.0.tar";
sha256 = "0l59fci16m6li52bqwbqglsi9gavgsfkxlxm9y1ny3ma0w1rnp9d";
url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar";
sha256 = "1q4sjl2rvcfwcirm32nmi53258ln71yhh1dgszlxwknm38a14v3i";
};
packageRequires = [ emacs ];
meta = {
@ -1714,10 +1714,10 @@
elpaBuild {
pname = "fontaine";
ename = "fontaine";
version = "0.1.1";
version = "0.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/fontaine-0.1.1.tar";
sha256 = "1jyb6s2sqr9fmy6f4i9vijaswb8f9vn2br98d4w2afzhmf4d0bdc";
url = "https://elpa.gnu.org/packages/fontaine-0.2.1.tar";
sha256 = "11g03gaiypqf0xi7s3xyjnbi2w154lkd7j0ybmn8scs6pbzdyl95";
};
packageRequires = [ emacs ];
meta = {
@ -2931,10 +2931,10 @@
elpaBuild {
pname = "nano-modeline";
ename = "nano-modeline";
version = "0.6";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nano-modeline-0.6.tar";
sha256 = "1cxycfx4ic2hzfvp3d2z0a5xjg97p49yla3a1qxw1dldcjg9lfg0";
url = "https://elpa.gnu.org/packages/nano-modeline-0.7.tar";
sha256 = "1fsjzbdawkn4vmk6zs6az1b42mx5ka7a618fgx5zdncr79wl0vjw";
};
packageRequires = [ emacs ];
meta = {
@ -3175,10 +3175,10 @@
elpaBuild {
pname = "org-real";
ename = "org-real";
version = "1.0.4";
version = "1.0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-real-1.0.4.tar";
sha256 = "0bn9vyx74lki2nggzir02mcrww94dnqpbkryjr7a4i6am0ylf705";
url = "https://elpa.gnu.org/packages/org-real-1.0.5.tar";
sha256 = "0g70bzhr094fah86cyvd9ci8q28qi9c44g33i4lw7clklgdx7mxl";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -3426,6 +3426,21 @@
license = lib.licenses.free;
};
}) {};
plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "plz";
ename = "plz";
version = "0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/plz-0.1.tar";
sha256 = "083qz6kfg4q8xy3vsfwlk2g9vbg8iym2axmyhh54naivrc096ghc";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/plz.html";
license = lib.licenses.free;
};
}) {};
poker = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "poker";
@ -4553,10 +4568,10 @@
elpaBuild {
pname = "tomelr";
ename = "tomelr";
version = "0.3.0";
version = "0.4.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tomelr-0.3.0.tar";
sha256 = "0jnnyvbmhqn8wkg3y13iy19nck6dphay8jdy2nimp28a1jvs7z6g";
url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar";
sha256 = "03dj7mhqyfdpxr32nyvfgkqr6wr55cd7yk9a0izjs4468zx8vl0d";
};
packageRequires = [ emacs map seq ];
meta = {

@ -104,6 +104,21 @@ self: let
maintainers = [ lib.maintainers.sternenseemann ];
};
});
plz = super.plz.overrideAttrs (
old: {
dontUnpack = false;
postPatch = old.postPatch or "" + ''
substituteInPlace ./plz.el \
--replace 'plz-curl-program "curl"' 'plz-curl-program "${pkgs.curl}/bin/curl"'
'';
preInstall = ''
tar -cf "$pname-$version.tar" --transform "s,^,$pname-$version/," * .[!.]*
src="$pname-$version.tar"
'';
}
);
};
elpaPackages = super // overrides;

@ -5,13 +5,13 @@
trivialBuild {
pname = "header-file-mode";
version = "unstable-2022-04-19";
version = "unstable-2022-05-13";
src = fetchFromGitHub {
owner = "0x4b";
owner = "aidalgol";
repo = "header-file-mode";
rev = "fdf1930730e1b0c3f82490099a1325805491eff5";
sha256 = "sha256-FJgRI6RLQk9osh7d+YRfrV5CoGCDx2cZvsjAWlm969c=";
rev = "bcfd19a2c70030ebf5fa68e87aca4b3db8fad13e";
sha256 = "sha256-XMXOU+vWJ/0e0ny4Dz3DxWpdEfSNXGzm03sBke32Dwc=";
};
postUnpack = ''

@ -194,8 +194,6 @@
control-lock = callPackage ./control-lock { };
plz = callPackage ./plz { };
pod-mode = callPackage ./pod-mode { };
power-mode = callPackage ./power-mode { };

@ -1,31 +0,0 @@
{ trivialBuild, lib, fetchFromGitHub, curl }:
trivialBuild {
pname = "plz";
version = "0.pre+date=2021-08-22";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "plz.el";
rev = "7e456638a651bab3a814e3ea81742dd917509cbb";
hash = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY=";
};
postPatch = ''
substituteInPlace ./plz.el \
--replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"'
'';
meta = {
description = "An HTTP library for Emacs";
longDescription = ''
plz is an HTTP library for Emacs. It uses curl as a backend, which avoids
some of the issues with using Emacss built-in url library. It supports
both synchronous and asynchronous requests. Its API is intended to be
simple, natural, and expressive. Its code is intended to be simple and
well-organized. Every feature is tested against httpbin.org.
'';
license = lib.licenses.gpl3Only;
platforms = lib.platforms.all;
};
}

@ -12,7 +12,7 @@ in appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${pname}-v${version} $out/bin/${pname}
mv $out/bin/${pname}-${version} $out/bin/${pname}
'';
meta = with lib; {

@ -70,10 +70,9 @@ let
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
] ocamlPackages_4_12;
ocamlNativeBuildInputs = [ ocamlPackages.ocaml ]
ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ];
ocamlPropagatedBuildInputs = [ ]
ocamlBuildInputs = []
++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
++ optional (!coqAtLeast "8.13") ocamlPackages.num
++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
@ -83,8 +82,7 @@ self = stdenv.mkDerivation {
passthru = {
inherit coq-version;
inherit ocamlPackages ocamlNativeNuildInputs;
inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs;
inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs;
# For compatibility
inherit (ocamlPackages) ocaml camlp5 findlib num ;
emacsBufferSetup = pkgs: ''
@ -138,16 +136,13 @@ self = stdenv.mkDerivation {
++ optional buildIde copyDesktopItems
++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook
++ optional (!coqAtLeast "8.6") gnumake42;
buildInputs = [ ncurses ]
buildInputs = [ ncurses ] ++ ocamlBuildInputs
++ optionals buildIde
(if coqAtLeast "8.10"
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ]
else [ ocamlPackages.lablgtk ])
;
propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs;
propagatedBuildInputs = ocamlPropagatedBuildInputs;
postPatch = ''
UNAME=$(type -tp uname)
RM=$(type -tp rm)

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libogg libvorbis libdvdread ];
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
meta = {
description = "Tools for modifying and inspecting OGG media streams";
longDescription = ''

@ -1,4 +1,4 @@
{ lib, stdenv, coqPackages, coq, which, fetchzip }@args:
{ lib, stdenv, coqPackages, coq, fetchzip }@args:
let lib = import ./extra-lib.nix {inherit (args) lib;}; in
with builtins; with lib;
let
@ -15,12 +15,8 @@ in
releaseRev ? (v: v),
displayVersion ? {},
release ? {},
buildInputs ? [],
nativeBuildInputs ? [],
extraBuildInputs ? [],
extraNativeBuildInputs ? [],
overrideBuildInputs ? [],
overrideNativeBuildInputs ? [],
namePrefix ? [ "coq" ],
enableParallelBuilding ? true,
extraInstallFlags ? [],
@ -39,11 +35,7 @@ let
args-to-remove = foldl (flip remove) ([
"version" "fetcher" "repo" "owner" "domain" "releaseRev"
"displayVersion" "defaultVersion" "useMelquiondRemake"
"release"
"buildInputs" "nativeBuildInputs"
"extraBuildInputs" "extraNativeBuildInputs"
"overrideBuildInputs" "overrideNativeBuildInputs"
"namePrefix"
"release" "extraBuildInputs" "extraNativeBuildInputs" "extraPropagatedBuildInputs" "namePrefix"
"meta" "useDune2ifVersion" "useDune2" "opam-name"
"extraInstallFlags" "setCOQBIN" "mlPlugin"
"dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs;
@ -65,16 +57,9 @@ let
] "") + optionalString (v == null) "-broken";
append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-";
prefix-name = foldl append-version "" namePrefix;
var-coqlib-install =
(optionalString (versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev") "COQMF_") + "COQLIB";
useDune2 = args.useDune2 or (useDune2ifVersion fetched.version);
coqlib-flags = switch coq.coq-version [
{ case = v: versions.isLe "8.6" v && v != "dev" ;
out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; }
] [ "COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib"
"COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)" ];
docdir-flags = switch coq.coq-version [
{ case = v: versions.isLe "8.6" v && v != "dev";
out = [ "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ]; }
] [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ];
in
stdenv.mkDerivation (removeAttrs ({
@ -83,12 +68,12 @@ stdenv.mkDerivation (removeAttrs ({
inherit (fetched) version src;
nativeBuildInputs = args.overrideNativeBuildInputs
or ([ which ] ++ optional useDune2 coq.ocamlPackages.dune_2
++ optional (useDune2 || mlPlugin) coq.ocaml
++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs);
buildInputs = args.overrideBuildInputs
or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs);
nativeBuildInputs = [ coq ]
++ optionals useDune2 [coq.ocaml coq.ocamlPackages.dune_2]
++ optionals mlPlugin coq.ocamlNativeBuildInputs
++ extraNativeBuildInputs;
buildInputs = optionals mlPlugin coq.ocamlBuildInputs
++ extraBuildInputs;
inherit enableParallelBuilding;
meta = ({ platforms = coq.meta.platforms; } //
@ -103,7 +88,9 @@ stdenv.mkDerivation (removeAttrs ({
// (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; })
// (optionalAttrs (!args?installPhase && !args?useMelquiondRemake) {
installFlags =
[ "DESTDIR=$(out)" ] ++ coqlib-flags ++ docdir-flags ++
[ "${var-coqlib-install}=$(out)/lib/coq/${coq.coq-version}/" ] ++
optional (match ".*doc$" (args.installTargets or "") != null)
"DOCDIR=$(out)/share/coq/${coq.coq-version}/" ++
extraInstallFlags;
})
// (optionalAttrs useDune2 {

@ -20,7 +20,7 @@ with lib; mkCoqDerivation {
release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";
release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
propagatedBuildInputs = [ bignums ];
extraBuildInputs = [ bignums ];
enableParallelBuilding = false;
meta = {

@ -8,7 +8,7 @@ with lib; mkCoqDerivation {
release."20170921".rev = "e3557740a699167e6adb1a65855509d55a392fa1";
release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v";
nativeBuildInputs = [ autoconf automake ];
extraBuildInputs = [ autoconf automake ];
preConfigure = ''
patchShebangs ./autogen.sh

@ -36,7 +36,8 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
"substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
mlPlugin = true;
nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild;
extraNativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild;
extraBuildInputs = lib.optional recent coq.ocamlPackages.num;
propagatedBuildInputs = [ ssreflect ]
++ lib.optionals recent [ coq-ext-lib simple-io ];
extraInstallFlags = [ "-f Makefile.coq" ];

@ -31,7 +31,7 @@ mkCoqDerivation {
release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf";
release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0=";
releaseRev = v: "v${v}";
buildInputs = [ ITree ];
extraBuildInputs = [ ITree ];
propagatedBuildInputs = [ compcert ];
preConfigure = ''

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "coq";
displayVersion = { bignums = ""; };
inherit version;
defaultVersion = if versions.isGe "8.6" coq.coq-version
defaultVersion = if versions.isGe "8.5" coq.coq-version
then "${coq.coq-version}.0" else null;
release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";

@ -1,5 +1,5 @@
{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert
, fetchpatch, makeWrapper, coq2html
, ocamlPackages, fetchpatch, makeWrapper, coq2html
, stdenv, tools ? stdenv.cc
, version ? null
}:
@ -15,9 +15,9 @@ let compcert = mkCoqDerivation rec {
releaseRev = v: "v${v}";
defaultVersion = with versions; switch coq.version [
{ case = range "8.13" "8.15"; out = "3.10"; }
{ case = isEq "8.12" ; out = "3.9"; }
{ case = range "8.8" "8.11"; out = "3.8"; }
{ case = isEq "8.12" ; out = "3.9"; }
{ case = range "8.12" "8.15"; out = "3.10"; }
] null;
release = {
@ -26,9 +26,8 @@ let compcert = mkCoqDerivation rec {
"3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6";
};
mlPlugin = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = with coq.ocamlPackages; [ menhir menhirLib ] ++ [ coq2html ];
buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ];
propagatedBuildInputs = [ flocq ];
enableParallelBuilding = true;
@ -49,13 +48,9 @@ let compcert = mkCoqDerivation rec {
'';
installTargets = "documentation install";
installFlags = []; # trust ./configure
preInstall = ''
mkdir -p $out/share/man
mkdir -p $man/share
'';
postInstall = ''
# move man into place
mkdir -p $man/share
mv $out/share/man/ $man/share/
# move docs into place

@ -1,18 +1,34 @@
{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }:
{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
with lib; mkCoqDerivation {
pname = "coq-bits";
repo = "bits";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "1.1.0"; }
{ case = isGe "8.7"; out = "1.0.0"; }
] null;
defaultVersion =
if versions.isGe "8.10" coq.version
then "1.1.0"
else if versions.isGe "8.7" coq.version
then "1.0.0"
else null;
release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";
release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
release = {
"1.0.0" = {
rev = "1.0.0";
sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
};
"1.1.0" = {
rev = "1.1.0";
sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";
};
};
extraBuildInputs = [ mathcomp.ssreflect mathcomp.fingroup ];
propagatedBuildInputs = [ mathcomp.algebra ];
propagatedBuildInputs = [ mathcomp-algebra ];
installPhase = ''
make -f Makefile CoqMakefile
make -f CoqMakefile COQLIB=$out/lib/coq/${coq.coq-version}/ install
'';
meta = {
description = "A formalization of bitset operations in Coq";

@ -7,7 +7,7 @@ with builtins; with lib; let
{ case = "8.13"; out = { version = "1.13.7"; };}
{ case = "8.14"; out = { version = "1.13.7"; };}
{ case = "8.15"; out = { version = "1.14.1"; };}
] { version = "1.14.1"; } );
] {});
in mkCoqDerivation {
pname = "elpi";
repo = "coq-elpi";
@ -48,8 +48,8 @@ in mkCoqDerivation {
release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
releaseRev = v: "v${v}";
extraNativeBuildInputs = [ which elpi ];
mlPlugin = true;
propagatedBuildInputs = [ elpi ];
meta = {
description = "Coq plugin embedding ELPI.";

@ -1,6 +1,6 @@
{ coq, mkCoqDerivation, mathcomp, bignums, paramcoq, multinomials,
mathcomp-real-closed,
lib, version ? null }:
lib, which, version ? null }:
with lib;
@ -22,6 +22,7 @@ with lib;
release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk";
release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";
extraBuildInputs = [ which ];
propagatedBuildInputs = [ mathcomp.algebra bignums paramcoq multinomials ];
meta = {

@ -28,10 +28,8 @@ with lib; mkCoqDerivation {
release."1.3-coq8.12".sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8";
release."1.3-coq8.11".sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b";
release."1.3-coq8.10".sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd";
release."1.1.1-coq8.9" = { sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
rev = "f8b4d81a213aa1f25afbe53c7c9ca1b15e3d42bc"; };
release."1.1-coq8.8" = { sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
rev = "c3cb54b4d5f33fab372d33c7189861368a08fa22"; };
release."1.1.1-coq8.9".sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
release."1.1-coq8.8".sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
release."1.3.1-coq8.13".version = "1.3.1";
release."1.3.1-coq8.12".version = "1.3.1";

@ -20,6 +20,7 @@ with lib; mkCoqDerivation {
release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
releaseRev = v: "v${v}";
extraBuildInputs = [ which ];
propagatedBuildInputs = [ bignums ];
meta = with lib; {

@ -14,7 +14,9 @@ mkCoqDerivation {
release."8.14".sha256 = "sha256:1k8f8idjnx0mf4z479vcx55iz42rjxrbplbznv80m2famxakq03c";
release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e";
release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ=";
mlPlugin = true;
extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib ];
meta = {
license = licenses.lgpl3Only;
maintainers = [ maintainers.siraben ];

@ -1,4 +1,4 @@
{ lib, mkCoqDerivation, autoconf,
{ lib, mkCoqDerivation, which, autoconf,
coq, ssreflect, version ? null }:
with lib; mkCoqDerivation {
@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl";
releaseRev = v: "coquelicot-${v}";
nativeBuildInputs = [ autoconf ];
extraNativeBuildInputs = [ which autoconf ];
propagatedBuildInputs = [ ssreflect ];
useMelquiondRemake.logpath = "Coquelicot";

@ -39,9 +39,9 @@ mkCoqDerivation {
release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
releaseRev = v: "v${v}";
nativeBuildInputs = [ autoreconfHook ];
extraNativeBuildInputs = [ autoreconfHook ];
mlPlugin = true;
buildInputs = [ coq.ocamlPackages.ocamlgraph ];
extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ];
# dpd_compute.ml uses deprecated Pervasives.compare
# Versions prior to 0.6.5 do not have the WARN_ERR build flag

@ -8,10 +8,10 @@ with lib; mkCoqDerivation rec {
inherit version;
defaultVersion = if coq.coq-version == "8.5" then "2016-10-24" else null;
release."2016-10-24".rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
release."2016-10-24".sha256 = "16y57vibq3f5i5avgj80f4i3aw46wdwzx36k5d3pf3qk17qrlrdi";
release."2016-10-24".sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
mlPlugin = true;
buildInputs = [ python27 ];
extraBuildInputs = [ python27 ];
prePatch = "patchShebangs etc/coq-scripts";

@ -1,4 +1,4 @@
{ lib, bash, autoconf, automake,
{ lib, which, autoconf, automake,
mkCoqDerivation, coq, version ? null }:
with lib; mkCoqDerivation {
@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
releaseRev = v: "flocq-${v}";
nativeBuildInputs = [ bash autoconf ];
nativeBuildInputs = [ which autoconf ];
mlPlugin = true;
useMelquiondRemake.logpath = "Flocq";

@ -13,7 +13,7 @@ with lib; mkCoqDerivation {
release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l";
releaseRev = v: "gappalib-coq-${v}";
nativeBuildInputs = [ autoconf ];
extraNativeBuildInputs = [ which autoconf ];
mlPlugin = true;
propagatedBuildInputs = [ flocq ];
useMelquiondRemake.logpath = "Gappa";

@ -1,26 +1,22 @@
{lib, fetchzip, mkCoqDerivation, coq, version ? null }:
let fetcher = {rev, repo, owner, sha256, domain, ...}:
fetchzip {
url = "https://${domain}/${owner}/${repo}/download/${repo}-${rev}.zip";
inherit sha256;
}; in
with lib; mkCoqDerivation {
pname = "heq";
repo = "Heq";
owner = "gil.hur";
domain = "sf.snu.ac.kr";
owner = "gil";
domain = "mpi-sws.org";
inherit version fetcher;
defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null;
release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74";
mlPlugin = true;
preBuild = "cd src";
propagatedBuildInputs = [ coq ];
extraInstallFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
extraInstallFlags = [ "COQLIB=$out/lib/coq/${coq.coq-version}" ];
preBuild = "cd src";
meta = {
homepage = "https://ropas.snu.ac.kr/~gil.hur/Heq/";
homepage = "https://www.mpi-sws.org/~gil/Heq/";
description = "Heq : a Coq library for Heterogeneous Equality";
maintainers = with maintainers; [ jwiegley ];
};

@ -1,4 +1,4 @@
{ lib, mkCoqDerivation, coq, coq-elpi, version ? null }:
{ lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }:
with lib; let hb = mkCoqDerivation {
pname = "hierarchy-builder";
@ -17,10 +17,13 @@ with lib; let hb = mkCoqDerivation {
release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
releaseRev = v: "v${v}";
extraNativeBuildInputs = [ which ];
propagatedBuildInputs = [ coq-elpi ];
mlPlugin = true;
installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
extraInstallFlags = [ "VFILES=structures.v" ];
meta = {

@ -1,5 +1,4 @@
{ lib, mkCoqDerivation, autoconf, coq, coquelicot, flocq,
mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }:
{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }:
mkCoqDerivation rec {
pname = "interval";
@ -21,9 +20,8 @@ mkCoqDerivation rec {
release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz";
releaseRev = v: "interval-${v}";
nativeBuildInputs = [ autoconf ];
propagatedBuildInputs = lib.optional (lib.versions.isGe "8.6" coq.coq-version) bignums
++ [ coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ]
extraNativeBuildInputs = [ which autoconf ];
propagatedBuildInputs = [ bignums coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ]
++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];
useMelquiondRemake.logpath = "Interval";
mlPlugin = true;

@ -17,7 +17,7 @@ mkCoqDerivation rec {
] null;
mlPlugin = true;
nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
enableParallelBuilding = false;
meta = {

@ -17,6 +17,7 @@ with lib; mkCoqDerivation {
release."0.1-8.7".rev = "v0.1-8.7";
release."0.1-8.7".sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0";
nativeBuildInputs = [ which ];
mlPlugin = true;
meta = {

@ -9,7 +9,7 @@ with lib; mkCoqDerivation {
release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby";
release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw";
propagatedBuildInputs = [ bignums ];
extraBuildInputs = [ bignums ];
meta = {
homepage = "https://math-classes.github.io";

@ -10,9 +10,9 @@
# See the documentation at doc/languages-frameworks/coq.section.md. #
############################################################################
{ lib, ncurses, graphviz, lua, fetchzip,
{ lib, ncurses, which, graphviz, lua, fetchzip,
mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false,
coqPackages, coq, version ? null }@args:
coqPackages, coq, ocamlPackages, version ? null }@args:
with builtins // lib;
let
repo = "math-comp";
@ -60,9 +60,8 @@ let
inherit version pname defaultVersion release releaseRev repo owner;
mlPlugin = versions.isLe "8.6" coq.coq-version;
nativeBuildInputs = optionals withDoc [ graphviz lua ];
buildInputs = [ ncurses ];
propagatedBuildInputs = mathcomp-deps;
extraNativeBuildInputs = [ which ] ++ optionals withDoc [ graphviz lua ];
extraBuildInputs = [ ncurses ] ++ mathcomp-deps;
buildFlags = optional withDoc "doc";

@ -1,4 +1,4 @@
{ lib, fetchzip,
{ lib, which, fetchzip,
mkCoqDerivation, recurseIntoAttrs, single ? false,
coqPackages, coq, equations, version ? null }@args:
with builtins // lib;
@ -36,8 +36,10 @@ let
derivation = mkCoqDerivation ({
inherit version pname defaultVersion release releaseRev repo owner;
extraNativeBuildInputs = [ which ];
mlPlugin = true;
propagatedBuildInputs = [ equations coq.ocamlPackages.zarith ] ++ metacoq-deps;
extraBuildInputs = [ coq.ocamlPackages.zarith ];
propagatedBuildInputs = [ equations ] ++ metacoq-deps;
patchPhase = ''
patchShebangs ./configure.sh

@ -13,6 +13,7 @@ with lib; mkCoqDerivation {
release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs";
sourceRoot = "source/Metalib";
installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}";
meta = {
license = licenses.mit;

@ -24,8 +24,8 @@ mkCoqDerivation rec {
] null;
mlPlugin = true;
nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
propagatedBuildInputs = (with coq.ocamlPackages; [ num ]);
extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
extraBuildInputs = (with coq.ocamlPackages; [ num ]);
postPatch = ''
for p in Make Makefile.coq.local

@ -11,9 +11,11 @@ with lib; mkCoqDerivation {
] null;
release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
extraNativeBuildInputs = (with coq.ocamlPackages; [ cppo zarith ]);
propagatedBuildInputs = [ coq-ext-lib ]
++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
mlPlugin = true;
nativeBuildInputs = [ coq.ocamlPackages.cppo ];
propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ];
doCheck = true;
checkTarget = "test";

@ -13,11 +13,9 @@ mkCoqDerivation {
{ case = isEq "8.13"; out = "itp22"; }
] null;
propagatedBuildInputs = [ trakt cvc4 ]
++ lib.optionals (!stdenv.isDarwin) [ veriT ]
++ (with coq.ocamlPackages; [ num zarith ]);
mlPlugin = true;
nativeBuildInputs = with coq.ocamlPackages; [ ocamlbuild ];
propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];
extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml ocamlbuild ];
extraBuildInputs = with coq.ocamlPackages; [ findlib num zarith ];
meta = {
description = "Communication between Coq and SAT/SMT solvers ";

@ -866,7 +866,7 @@ self: super: builtins.intersectAttrs super {
buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
postInstall = drv.postInstall or "" + ''
wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${
pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ]
pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch ]
}"
'';
}) super.nvfetcher);

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
homepage = "https://codesynthesis.com/projects/libcutl/";
changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}";
platforms = platforms.all;
broken = stdenv.isDarwin;
maintainers = with maintainers; [ ];
license = licenses.mit;
};
@ -26,4 +27,6 @@ stdenv.mkDerivation rec {
buildInputs = [ xercesc ];
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
}

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config }:
stdenv.mkDerivation rec {
version = "1.0.8";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml";
};
patches = [
(fetchpatch {
name = "CVE-2022-1253.patch";
url = "https://github.com/strukturag/libde265/commit/8e89fe0e175d2870c39486fdd09250b230ec10b8.patch";
sha256 = "sha256-F1BOWFx9oXR2trM22atyD3AJ5x6vVfURQ/PTlYP2Ibg=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
enableParallelBuilding = true;
@ -22,5 +30,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ gebner ];
};
}

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "opengrm-ngram";
version = "1.3.13";
version = "1.3.14";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz";
sha256 = "sha256-5CXf6OXs7owny3yZQrWYA6yhIyN0dgA2B8TSDEUTF1Q=";
sha256 = "sha256-ivMPDy6CPM17hWCToLOVzUgcWZiEt2pjYeizeBLYnYc=";
};
nativeBuildInputs = [ autoreconfHook ];

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
# $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
# $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ];

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr";
};
strictDeps = true;
checkInputs = [ wayland-scanner ];
patchPhase = ''

@ -1,13 +1,12 @@
{ stdenv, lib, fetchzip, bash
, buildDunePackage, camlp5
{ stdenv, lib, fetchzip, buildDunePackage, camlp5
, re, perl, ncurses
, ppxlib, ppx_deriving
, ppxlib_0_15, ppx_deriving_0_15
, coqPackages
, version ? "1.14.1"
}:
with lib;
let fetched = coqPackages.metaFetch ({
let fetched = import ../../../build-support/coq/meta-fetch/default.nix
{inherit lib stdenv fetchzip; } ({
release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis=";
release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r";
release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka";
@ -33,11 +32,6 @@ buildDunePackage rec {
else [ ppxlib_0_15 ppx_deriving_0_15 ]
);
patchPhase = ''
sed -e "s/SHELL:=/SHELL?=/" -i Makefile || true
'';
buildPhase = "SHELL=${bash} make build";
meta = {
description = "Embeddable λProlog Interpreter";
license = licenses.lgpl21Plus;

@ -24,6 +24,8 @@ buildPythonPackage rec {
hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [

@ -6,24 +6,30 @@
, commoncode
, pytestCheckHook
, setuptools-scm
, pythonOlder
}:
buildPythonPackage rec {
pname = "debian-inspector";
version = "30.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "debian_inspector";
inherit version;
sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg=";
hash = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [
setuptools-scm
];
dontConfigure = true;
propagatedBuildInputs = [
chardet
attrs

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, rustPlatform
}:
buildPythonPackage rec {
pname = "evtx";
version = "0.7.3";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "omerbenamram";
repo = "pyevtx-rs";
rev = version;
sha256 = "sha256-59iEmgF1m+Yr5k4oxZGqMs5oMZxToUFYuwQDeLEQ2jY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-Q2SpJohLSQCMYmx1ZMWZ7a/NC0lPsHkwxom00qVooNM=";
};
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"evtx"
];
meta = with lib; {
description = "Bindings for evtx";
homepage = "https://github.com/omerbenamram/pyevtx-rs";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

@ -3,15 +3,19 @@
, fetchPypi
, cryptography
, deprecated
, pythonOlder
}:
buildPythonPackage rec {
pname = "jwcrypto";
version = "1.2";
version = "1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-7fQwkyFyHlFhzvzN1ksEUJ4Dkk/q894IW0d4B2WYmuM=";
hash = "sha256-DWRhuhP3wnHYusUBjuYN28rl/zlAP6+kI3X1fQjjmLs=";
};
propagatedBuildInputs = [
@ -19,10 +23,14 @@ buildPythonPackage rec {
deprecated
];
pythonImportsCheck = [
"jwcrypto"
];
meta = with lib; {
description = "Implementation of JOSE Web standards";
homepage = "https://github.com/latchset/jwcrypto";
license = licenses.lgpl3Plus;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

@ -20,6 +20,8 @@ buildPythonPackage rec {
hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [

@ -3,19 +3,27 @@
, fetchPypi
, pytestCheckHook
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "parameter-expansion-patched";
version = "0.2.1b4";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs";
hash = "sha256-/128ifveWC8zNlYtGWtxB3HpK6p7bVk1ahSwhaC2dAs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
checkInputs = [
pytestCheckHook
];
@ -26,7 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "POSIX parameter expansion in Python";
homepage = "https://github.com/nexB/commoncode";
homepage = "https://github.com/nexB/parameter_expansion_patched";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};

@ -21,6 +21,8 @@ buildPythonPackage rec {
hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [

@ -7,14 +7,19 @@
, pluggy
, pytestCheckHook
, pytest-xdist
, pythonOlder
}:
buildPythonPackage rec {
pname = "plugincode";
version = "21.1.21";
version = "30.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "97b5a2c96f0365c80240be103ecd86411c68b11a16f137913cbea9129c54907a";
hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos=";
};
dontConfigure = true;
@ -38,8 +43,13 @@ buildPythonPackage rec {
"plugincode"
];
disabledTests = [
# We don't want black as an input
"test_skeleton_codestyle"
];
meta = with lib; {
description = "A library that provides plugin functionality for ScanCode toolkit";
description = "Library that provides plugin functionality for ScanCode toolkit";
homepage = "https://github.com/nexB/plugincode";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "22.4.0";
version = "22.5.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
hash = "sha256-W+l5QIpum1uTsx/mxZGkRoJAZaC1viURVYg4Kvjv32Y=";
hash = "sha256-WTIuK5kPPqft4u44dN5NDJJKxIPrZGCJjZ5pR6HgOxw=";
};
nativeBuildInputs = [
@ -53,6 +53,7 @@ buildPythonPackage rec {
"test_find_unreleased_information"
# CLI test fails
"test_missing_cmd"
"test_update_file_changed"
];
pythonImportsCheck = [

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyahocorasick";
version = "1.4.4";
version = "2.0.0b1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,17 +17,13 @@ buildPythonPackage rec {
owner = "WojciechMula";
repo = pname;
rev = version;
hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo=";
hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk=";
};
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"unittests.py"
];
pythonImportsCheck = [
"ahocorasick"
];

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pytest-cases";
version = "3.6.11";
version = "3.6.12";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9rcXPoGxR3sxX3tFbv1O/T7kfrKnIB2XV1mJvSH5WQ4=";
sha256 = "sha256-pZ7GGqc+Nd71V+3I2LYVMYbaLBPG5+Ze+d7Mb5CONCI=";
};
nativeBuildInputs = [

@ -8,8 +8,9 @@
, click
, colorama
, commoncode
, container-inspector
, debian-inspector
, dparse
, dparse2
, extractcode
, extractcode-7z
, extractcode-libarchive
@ -32,7 +33,8 @@
, packaging
, parameter-expansion-patched
, pefile
, pkginfo
, pip-requirements-parser
, pkginfo2
, pluggy
, plugincode
, publicsuffix2
@ -58,13 +60,13 @@
buildPythonPackage rec {
pname = "scancode-toolkit";
version = "30.1.0";
version = "31.0.0b4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0=";
hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A=";
};
dontConfigure = true;
@ -78,8 +80,9 @@ buildPythonPackage rec {
click
colorama
commoncode
container-inspector
debian-inspector
dparse
dparse2
extractcode
extractcode-7z
extractcode-libarchive
@ -88,6 +91,7 @@ buildPythonPackage rec {
ftfy
gemfileparser
html5lib
importlib-metadata
intbitset
jaraco_functools
javaproperties
@ -100,7 +104,8 @@ buildPythonPackage rec {
packaging
parameter-expansion-patched
pefile
pkginfo
pip-requirements-parser
pkginfo2
pluggy
plugincode
publicsuffix2
@ -118,9 +123,8 @@ buildPythonPackage rec {
typecode-libmagic
urlpy
xmltodict
zipp
] ++ lib.optionals (pythonOlder "3.9") [
importlib-metadata
zipp
] ++ lib.optionals (pythonOlder "3.7") [
typing
];

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "tubeup";
version = "0.0.28";
version = "0.0.30";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-+RvDwOHL+zwpM/nOWWS7pZIFEOx+jMrgt3FLYSshANo=";
sha256 = "sha256-xN3H3l4ANT7/tXg+oGScvE0Atf6h9CVbODaWybe8a9o=";
};
postPatch = ''

@ -10,16 +10,19 @@
, typecode-libmagic
, pytestCheckHook
, pytest-xdist
, pythonOlder
}:
buildPythonPackage rec {
pname = "typecode";
version = "21.6.1";
version = "30.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "d3a82859df5607c900972e08e1bca31e3fe2daed37afd1b8231cad2ef613d8d6";
hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8=";
};
dontConfigure = true;

@ -0,0 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub }:
let
version = "1.13.0";
in
buildGoModule {
pname = "sqlc";
inherit version;
src = fetchFromGitHub {
owner = "kyleconroy";
repo = "sqlc";
rev = "v${version}";
sha256 = "sha256-HPCt47tctVV8Oz9/7AoVMezIAv6wEsaB7B4rgo9/fNU=";
};
proxyVendor = true;
vendorSha256 = "sha256-zZ0IrtfQvczoB7th9ZCUlYOtyZr3Y3yF0pKzRCqmCjo=";
subPackages = [ "cmd/sqlc" ];
meta = let
inherit (lib) licenses platforms maintainers;
in {
description = " Generate type-safe code from SQL";
homepage = "https://sqlc.dev/";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.adisbladis ];
};
}

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.27.0";
version = "0.28.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-F/uO4hkVL0PczR59TxCTSOOKnQQQoxvAD8b1p1YdcjY=";
sha256 = "sha256-MGAkjjP6efdME4SncV18aLOOC4XxWutaYTINSIRCSp0=";
};
cargoSha256 = "sha256-B9nVsm/ml2hm+Yr6io4tf4JQsPRCtG7dBJQvF2WwWm0=";
cargoSha256 = "sha256-k2BrkdLRFmppQcPm2dkbQIOlmIv/jsfwD8S/rsLxm+0=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

@ -1,23 +1,22 @@
{ buildGoPackage
, lib
, fetchFromGitHub
}:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "goconst";
version = "1.4.0";
goPackagePath = "github.com/jgautheron/goconst";
version = "1.5.1";
excludedPackages = [ "tests" ];
src = fetchFromGitHub {
owner = "jgautheron";
repo = "goconst";
rev = version;
sha256 = "0jp9vg5l4wcvnf653h3d8ay2n7y717l9z34rls1vrsaf0qdf1r6v";
rev = "v${version}";
sha256 = "sha256-chBWxOy9V4pO3hMaeCoKwnQxIEYiSejUOD3QDBCpaoE=";
};
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Find in Go repeated strings that could be replaced by a constant";
homepage = "https://github.com/jgautheron/goconst";

@ -1,26 +0,0 @@
{ lib, fetchFromGitHub, callPackage, nixVersions, nixosTests, fetchpatch }:
{
hydra-unstable = callPackage ./common.nix {
version = "2022-02-07";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "517dce285a851efd732affc084c7083aed2e98cd";
sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg=";
};
patches = [
./eval.patch
./missing-std-string.patch
(fetchpatch {
url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch";
sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I=";
})
];
nix = nixVersions.nix_2_6;
tests = {
basic = nixosTests.hydra.hydra-unstable;
};
};
}

@ -1,29 +1,61 @@
{ stdenv, nix, perlPackages, buildEnv
, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx_6
, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
, migration ? false, patches ? []
, tests ? {}, mdbook
{ stdenv
, lib
, nix
, perlPackages
, buildEnv
, makeWrapper
, autoconf
, automake
, libtool
, unzip
, pkg-config
, sqlite
, libpqxx_6
, top-git
, mercurial
, darcs
, subversion
, breezy
, openssl
, bzip2
, libxslt
, perl
, postgresql
, nukeReferences
, git
, boehmgc
, nlohmann_json
, docbook_xsl
, openssh
, gnused
, coreutils
, findutils
, gzip
, xz
, gnutar
, rpm
, dpkg
, cdrkit
, pixz
, boost
, autoreconfHook
, mdbook
, foreman
, python3
, libressl
, cacert
, glibcLocales
, fetchFromGitHub
, fetchpatch
, nixosTests
}:
with stdenv;
if lib.versions.major nix.version == "1"
then throw "This Hydra version doesn't support Nix 1.x"
else
let
perlDeps = buildEnv {
name = "hydra-perl-deps";
paths = with perlPackages; lib.closePropagation
[ ModulePluggable
[
ModulePluggable
AuthenSASL
CatalystActionREST
CatalystAuthenticationStoreDBIxClass
@ -92,15 +124,37 @@ let
git
];
};
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "hydra";
version = "2022-02-07";
inherit stdenv src version patches;
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "517dce285a851efd732affc084c7083aed2e98cd";
sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg=";
};
buildInputs =
[ makeWrapper libtool unzip nukeReferences sqlite libpqxx_6
top-git mercurial darcs subversion breezy openssl bzip2 libxslt
perlDeps perl nix
[
makeWrapper
libtool
unzip
nukeReferences
sqlite
libpqxx_6
top-git
mercurial
darcs
subversion
breezy
openssl
bzip2
libxslt
perlDeps
perl
nix
postgresql # for running the tests
nlohmann_json
boost
@ -108,9 +162,26 @@ in stdenv.mkDerivation rec {
];
hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz
gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
[
sqlite
subversion
openssh
nix
coreutils
findutils
pixz
gzip
bzip2
xz
gnutar
unzip
git
top-git
mercurial /*darcs*/
gnused
breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ]
);
nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ];
@ -122,6 +193,15 @@ in stdenv.mkDerivation rec {
libressl.nc
];
patches = [
./eval.patch
./missing-std-string.patch
(fetchpatch {
url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch";
sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I=";
})
];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = "-pthread";
@ -158,7 +238,10 @@ in stdenv.mkDerivation rec {
doCheck = true;
passthru = { inherit perlDeps migration tests; };
passthru = {
inherit perlDeps;
tests.basic = nixosTests.hydra.hydra_unstable;
};
meta = with lib; {
description = "Nix-based continuous build system";

@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
version = "1.28.0";
version = "1.29.0";
inherit (poetryLib) isCompatible readTOML moduleName;

@ -3,48 +3,46 @@
, makeSetupHook
, wheel
, pip
, pkgs
}:
let
callPackage = python.pythonForBuild.pkgs.callPackage;
pythonInterpreter = python.pythonForBuild.interpreter;
pythonSitePackages = python.sitePackages;
nonOverlayedPython = pkgs.python3.pythonForBuild.withPackages (ps: [ ps.tomlkit ]);
makeRemoveSpecialDependenciesHook = { fields, kind }:
nonOverlayedPython.pkgs.callPackage
(
{}:
makeSetupHook
{
name = "remove-path-dependencies.sh";
deps = [ ];
substitutions = {
# NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion
# because building of tomlkit and its dependencies also use these hooks.
pythonPath = nonOverlayedPython.pkgs.makePythonPath [ nonOverlayedPython ];
pythonInterpreter = nonOverlayedPython.interpreter;
pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
fields = fields;
kind = kind;
};
} ./remove-special-dependencies.sh
)
{ };
in
{
removePathDependenciesHook = makeRemoveSpecialDependenciesHook {
fields = [ "path" ];
kind = "path";
};
removePathDependenciesHook = callPackage
(
{}:
makeSetupHook
{
name = "remove-path-dependencies.sh";
deps = [ ];
substitutions = {
inherit pythonInterpreter;
yj = "${buildPackages.yj}/bin/yj";
pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
fields = [ "path" ];
kind = "path";
};
} ./remove-special-dependencies.sh
)
{ };
removeGitDependenciesHook = makeRemoveSpecialDependenciesHook {
fields = [ "git" "branch" "rev" "tag" ];
kind = "git";
};
removeGitDependenciesHook = callPackage
({}:
makeSetupHook
{
name = "remove-git-dependencies.sh";
deps = [ ];
substitutions = {
inherit pythonInterpreter;
yj = "${buildPackages.yj}/bin/yj";
pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
fields = [ "git" "branch" "rev" "tag" ];
kind = "git";
};
} ./remove-special-dependencies.sh
)
{ };
pipBuildHook = callPackage
(
@ -89,6 +87,4 @@ in
} ./wheel-unpack-hook.sh
)
{ };
}

@ -1,13 +1,14 @@
#!/usr/bin/env python
# Patch out special dependencies (git and path) from a pyproject.json file
# Patch out special dependencies (git and path) from a pyproject.toml file
import argparse
import json
import sys
import tomlkit
def main(input, output, fields_to_remove):
data = json.load(input)
data = tomlkit.loads(input.read())
try:
deps = data["tool"]["poetry"]["dependencies"]
@ -22,12 +23,7 @@ def main(input, output, fields_to_remove):
if any_removed:
dep["version"] = "*"
# Set ensure_ascii to False because TOML is valid UTF-8 so text that can't
# be represented in ASCII is perfectly legitimate
# HACK: Setting ensure_asscii to False breaks Python2 for some dependencies (like cachy==0.3.0)
json.dump(
data, output, separators=(",", ":"), ensure_ascii=sys.version_info.major < 3
)
output.write(tomlkit.dumps(data))
if __name__ == "__main__":
@ -37,20 +33,20 @@ if __name__ == "__main__":
"--input",
type=argparse.FileType("r"),
default=sys.stdin,
help="Location from which to read input JSON",
help="Location from which to read input TOML",
)
p.add_argument(
"-o",
"--output",
type=argparse.FileType("w"),
default=sys.stdout,
help="Location to write output JSON",
help="Location to write output TOML",
)
p.add_argument(
"-f",
"--fields-to-remove",
nargs="+",
help="The fields to remove from the dependency's JSON",
help="The fields to remove from the dependency's TOML",
)
args = p.parse_args()

@ -1,18 +1,21 @@
remove-@kind@-dependencies-hook() {
# Tell poetry not to resolve special dependencies. Any version is fine!
if ! test -f pyproject.toml; then
return
fi
echo "Removing @kind@ dependencies"
# Tell poetry not to resolve special dependencies. Any version is fine!
@yj@ -tj < pyproject.toml | \
@pythonInterpreter@ \
@pyprojectPatchScript@ \
--fields-to-remove @fields@ > pyproject.json
@yj@ -jt < pyproject.json > pyproject.toml
# NOTE: We have to reset PYTHONPATH to avoid having propagatedBuildInputs
# from the currently building derivation leaking into our unrelated Python
# environment.
PYTHONPATH=@pythonPath@ \
@pythonInterpreter@ \
@pyprojectPatchScript@ \
--fields-to-remove @fields@ < pyproject.toml > pyproject.formatted.toml
rm pyproject.json
mv pyproject.formatted.toml pyproject.toml
echo "Finished removing @kind@ dependencies"
}

@ -50,6 +50,9 @@
"aiokafka": [
"cython"
],
"aiolimiter": [
"poetry-core"
],
"aiomultiprocess": [
"flit-core"
],
@ -229,6 +232,9 @@
"flit-core",
"flitBuildHook"
],
"copier": [
"poetry-core"
],
"cpyparsing": [
"cython"
],
@ -239,6 +245,9 @@
"cython",
"poetry-core"
],
"cruft": [
"poetry-core"
],
"cssselect2": [
"flit",
"flit-core"
@ -350,6 +359,9 @@
"enumatch": [
"poetry"
],
"envs": [
"poetry-core"
],
"exceptiongroup": [
"flit-core",
"flitBuildHook"
@ -366,6 +378,9 @@
"fastavro": [
"cython"
],
"fastbencode": [
"cython"
],
"fastdtw": [
"cython"
],
@ -429,6 +444,9 @@
"gensim": [
"cython"
],
"gidgethub": [
"flitBuildHook"
],
"glances-api": [
"poetry-core"
],
@ -480,6 +498,9 @@
"hashids": [
"flit-core"
],
"hatch-vcs": [
"hatchling"
],
"hdate": [
"poetry-core"
],
@ -711,6 +732,9 @@
"monosat": [
"cython"
],
"more-itertools": [
"flit-core"
],
"motioneye-client": [
"poetry-core"
],
@ -720,6 +744,9 @@
"msgpack-numpy": [
"cython"
],
"msgpack-types": [
"poetry"
],
"msoffcrypto-tool": [
"poetry-core"
],
@ -735,6 +762,9 @@
"mypy-boto3-builder": [
"poetry-core"
],
"myst-parser": [
"flit-core"
],
"nats-python": [
"poetry-core"
],
@ -807,6 +837,9 @@
"openstacksdk": [
"pbr"
],
"openstep-plist": [
"cython"
],
"openvino": [
"cython"
],
@ -889,6 +922,9 @@
"pixelmatch": [
"poetry-core"
],
"pkgconfig": [
"poetry-core"
],
"poetry": [
"poetry-core"
],
@ -925,6 +961,12 @@
"prometheus-fastapi-instrumentator": [
"poetry"
],
"prospector": [
"poetry-core"
],
"protoletariat": [
"poetry-core"
],
"ptyprocess": [
"flit-core"
],
@ -1234,6 +1276,9 @@
"python-swiftclient": [
"pbr"
],
"python-trovo": [
"poetry"
],
"python_openzwave": [
"cython"
],
@ -1276,6 +1321,9 @@
"qiskit-terra": [
"cython"
],
"qstylizer": [
"pbr"
],
"questionary": [
"poetry-core"
],
@ -1330,6 +1378,9 @@
"rich": [
"poetry-core"
],
"rio-tiler": [
"flit-core"
],
"ripser": [
"cython"
],
@ -1367,6 +1418,9 @@
"sarif-om": [
"pbr"
],
"sat-search": [
"pytest-runner"
],
"scikit-bio": [
"cython"
],
@ -1430,6 +1484,9 @@
"single-version": [
"poetry-core"
],
"skia-pathops": [
"cython"
],
"slowapi": [
"poetry-core"
],
@ -1602,6 +1659,9 @@
"toggl-cli": [
"pbr"
],
"toml-cli": [
"poetry"
],
"toml-sort": [
"poetry"
],
@ -1620,6 +1680,9 @@
"traceback2": [
"pbr"
],
"traitlets": [
"flit-core"
],
"transmission-rpc": [
"poetry-core"
],

@ -74,6 +74,12 @@ lib.composeManyExtensions [
inherit (pkgs) buildPackages;
pyBuildPackages = self.python.pythonForBuild.pkgs;
selectQt5 = version:
let
selector = builtins.concatStringsSep "" (lib.take 2 (builtins.splitVersion version));
in
pkgs."qt${selector}" or pkgs.qt5;
in
{
@ -287,6 +293,7 @@ lib.composeManyExtensions [
"36.0.0" = "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk=";
"36.0.1" = "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ=";
"36.0.2" = "1a0ni1a3dbv2dvh6gx2i54z8v5j9m6asqg97kkv7gqb1ivihsbp8";
"37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8=";
}.${version} or null;
sha256 = getCargoHash super.cryptography.version;
scrypto =
@ -517,6 +524,14 @@ lib.composeManyExtensions [
}
);
file-magic = super.file-magic.overridePythonAttrs (
old: {
postPatch = ''
substituteInPlace magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'"
'';
}
);
fiona = super.fiona.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];
@ -735,6 +750,14 @@ lib.composeManyExtensions [
}
);
jinja2-ansible-filters = super.jinja2-ansible-filters.overridePythonAttrs (
old: {
preBuild = (old.preBuild or "") + ''
echo "${old.version}" > VERSION
'';
}
);
jira = super.jira.overridePythonAttrs (
old: {
inherit (pkgs.python3Packages.jira) patches;
@ -1056,6 +1079,18 @@ lib.composeManyExtensions [
mypy = super.mypy.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [
self.types-typed-ast
];
# Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
# version is also the default in the wheels on Pypi that include binaries.
# is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;
# when testing reduce optimisation level to drastically reduce build time
# (default is 3)
# MYPYC_OPT_LEVEL = 1;
} // lib.optionalAttrs (old.format != "wheel") {
# FIXME: Remove patch after upstream has decided the proper solution.
# https://github.com/python/mypy/pull/11143
patches = (old.patches or [ ]) ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.900") && lib.strings.versionOlder old.version "0.940") [
@ -1069,17 +1104,6 @@ lib.composeManyExtensions [
sha256 = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM=";
})
];
buildInputs = (old.buildInputs or [ ]) ++ [
self.types-typed-ast
];
# Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
# version is also the default in the wheels on Pypi that include binaries.
# is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;
# when testing reduce optimisation level to drastically reduce build time
# (default is 3)
# MYPYC_OPT_LEVEL = 1;
}
);
@ -1566,106 +1590,35 @@ lib.composeManyExtensions [
pyqt5 =
let
drv = super.pyqt5;
withConnectivity = drv.passthru.args.withConnectivity or false;
withMultimedia = drv.passthru.args.withMultimedia or false;
withWebKit = drv.passthru.args.withWebKit or false;
withWebSockets = drv.passthru.args.withWebSockets or false;
qt5 = selectQt5 super.pyqt5.version;
in
super.pyqt5.overridePythonAttrs (
old: {
format = "other";
dontConfigure = true;
dontWrapQtApps = true;
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkg-config
pkgs.qt5.qmake
pkgs.xorg.lndir
pkgs.qt5.qtbase
pkgs.qt5.qtsvg
pkgs.qt5.qtdeclarative
pkgs.qt5.qtwebchannel
pkgs.qt5.qt3d
# self.pyqt5-sip
self.sip
]
++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
++ lib.optional withMultimedia pkgs.qt5.qtmultimedia
++ lib.optional withWebKit pkgs.qt5.qtwebkit
++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
;
buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.dbus
pkgs.qt5.qtbase
pkgs.qt5.qtsvg
pkgs.qt5.qtdeclarative
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
self.pyqt-builder
self.sip
]
++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
++ lib.optional withWebKit pkgs.qt5.qtwebkit
++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
;
# Fix dbus mainloop
patches = pkgs.python3.pkgs.pyqt5.patches or [ ];
configurePhase = ''
runHook preConfigure
export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages}
mkdir -p $out/${self.python.sitePackages}/dbus/mainloop
${self.python.executable} configure.py -w \
--confirm-license \
--no-qml-plugin \
--bindir=$out/bin \
--destdir=$out/${self.python.sitePackages} \
--stubsdir=$out/${self.python.sitePackages}/PyQt5 \
--sipdir=$out/share/sip/PyQt5 \
--designer-plugindir=$out/plugins/designer
runHook postConfigure
'';
postInstall = ''
ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/
for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
done
# Let's make it a namespace package
cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
EOF
'';
installCheckPhase =
let
modules = [
"PyQt5"
"PyQt5.QtCore"
"PyQt5.QtQml"
"PyQt5.QtWidgets"
"PyQt5.QtGui"
]
++ lib.optional withWebSockets "PyQt5.QtWebSockets"
++ lib.optional withWebKit "PyQt5.QtWebKit"
++ lib.optional withMultimedia "PyQt5.QtMultimedia"
++ lib.optional withConnectivity "PyQt5.QtConnectivity"
;
imports = lib.concatMapStrings (module: "import ${module};") modules;
in
''
echo "Checking whether modules can be imported..."
${self.python.interpreter} -c "${imports}"
'';
doCheck = true;
qt5.full
];
}
);
enableParallelBuilding = true;
pyqt5-qt5 =
let
qt5 = selectQt5 super.pyqt5-qt5.version;
in
super.pyqt5-qt5.overridePythonAttrs (
old: {
dontWrapQtApps = true;
propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [
qt5.full
qt5.qtgamepad # As of 2022-05-13 not a port of qt5.full
pkgs.gtk3
pkgs.speechd
pkgs.postgresql
pkgs.unixODBC
];
}
);
@ -1681,7 +1634,10 @@ lib.composeManyExtensions [
old: {
# Fixes https://github.com/pytest-dev/pytest/issues/7891
postPatch = old.postPatch or "" + ''
sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
# sometimes setup.cfg doesn't exist
if [ -f setup.cfg ]; then
sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
fi
'';
}
);
@ -1758,6 +1714,10 @@ lib.composeManyExtensions [
}
);
python-twitter = super.python-twitter.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
});
pythran = super.pythran.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
});
@ -1925,7 +1885,14 @@ lib.composeManyExtensions [
shapely = super.shapely.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ];
inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
inherit (pkgs.python3.pkgs.shapely) GEOS_LIBRARY_PATH;
GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
# Fix library paths
postPatch = old.postPatch or "" + ''
${self.python.pythonForBuild.interpreter} ${./shapely-rewrite.py} shapely/geos.py
'';
}
);

@ -0,0 +1,46 @@
"""
Rewrite libc/library path references to Nix store paths
Nixpkgs uses a normal patch for this but we need to be less
sensitive to changes between versions.
"""
from textwrap import dedent
import sys
import ast
import os
with open(sys.argv[1]) as f:
mod = ast.parse(f.read(), "geos.py")
class LibTransformer(ast.NodeTransformer):
_lgeos_replaced = False
def visit_If(self, node):
if ast.unparse(node).startswith("if sys.platform.startswith('linux')"):
return ast.parse(
dedent(
"""
free = CDLL(%s).free
free.argtypes = [c_void_p]
free.restype = None
"""
)
% (lambda x: "'" + x + "'" if x else None)(os.environ.get("GEOS_LIBC"))
)
return node
def visit_Assign(self, node):
_target = node.targets[0]
if (
not self._lgeos_replaced
and isinstance(_target, ast.Name)
and _target.id == "_lgeos"
):
self._lgeos_replaced = True
return ast.parse("_lgeos = CDLL('%s')" % os.environ["GEOS_LIBRARY_PATH"])
return node
with open(sys.argv[1], "w") as f:
f.write(ast.unparse(LibTransformer().visit(mod)))

@ -23,7 +23,9 @@ let
let
entries' = splitString "-" str;
# Hack: Remove version "suffixes" like 2.11.4-1
entries = builtins.filter (x: builtins.match "[0-9]" x == null) entries';
# Some wheels have build tag with more than one digit
# like openvino-2022.1.0-7019-cp36-cp36m-manylinux_2_27_x86_64.whl
entries = builtins.filter (x: builtins.match "[0-9]*" x == null) entries';
p = removeSuffix ".whl" (builtins.elemAt entries 4);
in
{

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "spotdl";
version = "3.9.5";
version = "3.9.6";
src = fetchFromGitHub {
owner = "spotDL";
repo = "spotify-downloader";
rev = "v${version}";
hash = "sha256-Zdm+OVcFgOO8kbJDNQSVDLnIHzhvm9EPbcG95mNrnTk=";
rev = "refs/tags/v${version}";
hash = "sha256-JoeNVMuEslz7A7G4ZvikimZrG75YrH5Mx3Oamtfy4cM=";
};
propagatedBuildInputs = with python3.pkgs; [

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}:
{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib, openssl }:
stdenv.mkDerivation rec {
pname = "cadaver";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-ssl" "--with-readline" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ neon readline zlib ];
buildInputs = [ neon readline zlib openssl ];
meta = with lib; {
description = "A command-line WebDAV client";

@ -0,0 +1,25 @@
{ lib
, fetchCrate
, fetchpatch
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "bao";
version = "0.12.0";
src = fetchCrate {
inherit version;
pname = "${pname}_bin";
sha256 = "SkplBzor7Fv2+6K8wcTtZwjR66RfLPA/YNNUUHniWpM=";
};
cargoSha256 = "yr4HvtOWnU2dFTBgSsbVcuDELe1o1SEtZ7rN/ctKAdI=";
meta = {
description = "An implementation of BLAKE3 verified streaming";
homepage = "https://github.com/oconnor663/bao";
maintainers = with lib.maintainers; [ amarshall ];
license = with lib.licenses; [ cc0 asl20 ];
};
}

@ -0,0 +1,48 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "cliam";
version = "1.0.0";
src = fetchFromGitHub {
owner = "securisec";
repo = pname;
rev = version;
hash = "sha256-bq7u6pknokyY4WwO1qMYPuY86UZlDgeYEa1AJpk8d+4=";
};
vendorSha256 = "sha256-aGBA97EvIUv9myqcrtltiVxh1/0VtrQy2j9GU6r197g=";
nativeBuildInputs = [
installShellFiles
];
ldflags = [
"-s"
"-w"
"-X github.com/securisec/cliam/cli/version.Version=${version}"
];
postBuild = ''
# should be called cliam
mv $GOPATH/bin/{cli,cliam}
'';
postInstall = ''
installShellCompletion --cmd cliam \
--bash <($out/bin/cliam completion bash) \
--fish <($out/bin/cliam completion fish) \
--zsh <($out/bin/cliam completion zsh)
'';
meta = with lib; {
description = "Cloud agnostic IAM permissions enumerator";
homepage = "https://github.com/securisec/cliam";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

@ -0,0 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "evtx";
version = "0.7.2";
src = fetchFromGitHub {
owner = "omerbenamram";
repo = pname;
rev = "v${version}";
hash = "sha256-T165PZhjuX5tUENZoO6x1u2MpMQTfv9dGRmxyNY2ACg=";
};
cargoSha256 = "sha256-qcjJoXB0DV1Z5bhGrtyJzfWqE+tVWBOYMJEd+MWFcD8=";
postPatch = ''
# CLI tests will fail in the sandbox
rm tests/test_cli_interactive.rs
'';
meta = with lib; {
description = "Parser for the Windows XML Event Log (EVTX) format";
homepage = "https://github.com/omerbenamram/evtx";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ fab ];
};
}

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-04-27";
version = "2022-05-13";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-GYAIbE6Vrq6gBnCkeOSvo6gSJqPOhDh2f8n1b6B/x30=";
rev = "refs/tags/${version}";
sha256 = "sha256-hSsVgH6iyfTrHwu/fNc00zhheys8mYYmuDAKJqSWGqo=";
};
nativeBuildInputs = [ makeWrapper ];

@ -21,6 +21,6 @@ buildGoModule rec {
homepage = "https://github.com/maximbaz/yubikey-touch-detector";
maintainers = with maintainers; [ sumnerevans ];
license = licenses.isc;
platforms = platforms.unix;
platforms = platforms.linux;
};
}

@ -6,6 +6,7 @@
, pkg-config
, scdoc
, wayland
, wayland-scanner
}:
stdenv.mkDerivation rec {
@ -19,7 +20,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-RVMeS2qEjTYK6r7IwMeFSqfRpKR8di2eQXhewfhTnYI=";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland ];
meta = with lib; {

@ -8,6 +8,7 @@
, gdk-pixbuf
, wayland
, wayland-protocols
, wayland-scanner
}:
stdenv.mkDerivation rec {
@ -21,7 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ=";
};
nativeBuildInputs = [ pkg-config meson ninja ];
strictDeps = true;
nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ];
buildInputs = [
cairo
gdk-pixbuf

@ -8,6 +8,7 @@
, libxkbcommon
, wayland
, wayland-protocols
, wayland-scanner
, buildDocs ? true, scdoc
}:
@ -22,10 +23,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-5ZB34rqLyZmfjT/clxNRDmF0qgITFZ5xt/gIEXQzvQE=";
};
strictDeps = true;
nativeBuildInputs = [
meson
ninja
pkg-config
wayland-scanner
] ++ lib.optional buildDocs scdoc;
buildInputs = [

@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-umYPVkkYeu6TyVkjDsVBsRZLYh8WyseCPdih85kTz6A=";
};
strictDeps = true;
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ json_c ];

@ -1,7 +1,6 @@
{ lib
, fetchFromGitHub
, ocamlPackages
, buildPackages
}:
ocamlPackages.buildDunePackage rec {
@ -23,8 +22,9 @@ ocamlPackages.buildDunePackage rec {
useDune2 = true;
minimumOCamlVersion = "4.08";
strictDeps = true;
nativeBuildInputs = [
buildPackages.ocamlPackages.ppx_cstruct
ocamlPackages.ppx_cstruct
];
buildInputs = with ocamlPackages; [
@ -32,6 +32,7 @@ ocamlPackages.buildDunePackage rec {
cmdliner
logs
cstruct-lwt
ppx_cstruct
];
doCheck = true;

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4";
};
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
buildInputs = [ wayland wayland-protocols ];

@ -6,7 +6,8 @@
, pkg-config
, wayland
, wayland-protocols
, fetchurl
, fetchpatch
, wayland-scanner
}:
stdenv.mkDerivation {
@ -20,18 +21,19 @@ stdenv.mkDerivation {
sha256 = "1fz0sajhdjqas3l6mpik8w1k15wbv65hgh9r9vdgfqvw5l6cx7jv";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
buildInputs = [ wayland ];
patches = [
# https://github.com/progandy/wdomirror/pull/7
(fetchurl {
(fetchpatch {
url = "https://github.com/progandy/wdomirror/commit/142632208e9ea2b4a4ebd784532efdb8cad7b87c.patch";
hash = "sha256-z6/8q2vOtmlGFbDVG5BVWWbLQT8kBvJXT9/oZkWS9gw=";
hash = "sha256-MG71IEwRAjjacAkRoB7Tn45+FbY7LAqTDkVJkoWuQUU=";
})
];
strictDeps = true;
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [ wayland wayland-protocols ];
installPhase = ''
runHook preInstall
install -m755 -D wdomirror $out/bin/wdomirror

@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms";
};
# for scdoc
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland wayland-protocols libxkbcommon ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, wl-clipboard }:
{ lib, stdenv, fetchFromGitHub, wl-clipboard, bash }:
stdenv.mkDerivation rec {
pname = "wl-clipboard-x11";
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
hash = "sha256-i+oF1Mu72O5WPTWzqsvo4l2CERWWp4Jq/U0DffPZ8vg=";
};
strictDeps = true;
buildInputs = [ bash ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
postPatch = ''

@ -6,6 +6,7 @@
, pkg-config
, wayland
, wayland-protocols
, wayland-scanner
}:
stdenv.mkDerivation rec {
@ -19,8 +20,9 @@ stdenv.mkDerivation rec {
sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
buildInputs = [ wayland ];
strictDeps = true;
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [ wayland wayland-protocols ];
meta = with lib; {
homepage = "https://github.com/bugaevc/wl-clipboard";
@ -30,4 +32,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}
# TODO: is wayland-protocols a nativeBuildInput or a buildInput?

@ -7,6 +7,7 @@
, wl-clipboard
, imagemagick
, makeWrapper
, bash
}:
stdenv.mkDerivation rec {
@ -20,7 +21,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lvhpXy4Sd1boYNGhbPoZTJlBhlW5obltDOrEzB1Gq0A=";
};
strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];
patchPhase = ''
substituteInPlace Makefile \

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save