diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 82d3dd96e88..487fcd93641 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -290,6 +290,8 @@ checkConfigOutput '^"a b"$' config.result ./functionTo/merging-list.nix checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n\s*- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix checkConfigOutput '^"b a"$' config.result ./functionTo/list-order.nix checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix +checkConfigOutput '^"a bee"$' config.result ./functionTo/submodule-options.nix +checkConfigOutput '^"fun.\[function body\].a fun.\[function body\].b"$' config.optionsResult ./functionTo/submodule-options.nix # moduleType checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix diff --git a/lib/tests/modules/functionTo/submodule-options.nix b/lib/tests/modules/functionTo/submodule-options.nix new file mode 100644 index 00000000000..b884892efd6 --- /dev/null +++ b/lib/tests/modules/functionTo/submodule-options.nix @@ -0,0 +1,61 @@ +{ lib, config, options, ... }: +let + inherit (lib) types; +in +{ + imports = [ + + # fun..a + ({ ... }: { + options = { + fun = lib.mkOption { + type = types.functionTo (types.submodule { + options.a = lib.mkOption { default = "a"; }; + }); + }; + }; + }) + + # fun..b + ({ ... }: { + options = { + fun = lib.mkOption { + type = types.functionTo (types.submodule { + options.b = lib.mkOption { default = "b"; }; + }); + }; + }; + }) + ]; + + options = { + result = lib.mkOption + { + type = types.str; + default = lib.concatStringsSep " " (lib.attrValues (config.fun (throw "shouldn't use input param"))); + }; + + optionsResult = lib.mkOption + { + type = types.str; + default = lib.concatStringsSep " " + (lib.concatLists + (lib.mapAttrsToList + (k: v: + if k == "_module" + then [ ] + else [ (lib.showOption v.loc) ] + ) + ( + (options.fun.type.getSubOptions [ "fun" ]) + ) + ) + ); + }; + }; + + config.fun = lib.mkMerge + [ + (input: { b = "bee"; }) + ]; +} diff --git a/lib/types.nix b/lib/types.nix index e4b3f358d1c..2590d3e8710 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -526,9 +526,11 @@ rec { check = isFunction; merge = loc: defs: fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; - getSubOptions = elemType.getSubOptions; + getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "[function body]" ]); getSubModules = elemType.getSubModules; substSubModules = m: functionTo (elemType.substSubModules m); + functor = (defaultFunctor "functionTo") // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; # A submodule (like typed attribute set). See NixOS manual. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 7f5da547805..c0f36fcfd35 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -2514,6 +2514,16 @@ cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb" enabled. + + + The Nextcloud module now allows setting the value of the + max-age directive of the + Strict-Transport-Security HTTP header, + which is now controlled by the + services.nextcloud.https option, rather + than services.nginx.recommendedHttpHeaders. + + The spark3 package has been updated from diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index acead412048..5902957a535 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -892,6 +892,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The Nextcloud module now supports to create a Mysql database automatically with `services.nextcloud.database.createLocally` enabled. +- The Nextcloud module now allows setting the value of the `max-age` directive of the `Strict-Transport-Security` HTTP header, which is now controlled by the `services.nextcloud.https` option, rather than `services.nginx.recommendedHttpHeaders`. + - The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)): - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`. diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index b286f7b5e2c..607db4bb21b 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -20,7 +20,13 @@ Configuration Options - + diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 192c9ec413c..50495eebe4c 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -250,7 +250,7 @@ in }; warnings = optional (isMorPLocate && cfg.localuser != null) - "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)" + "mlocate and plocate do not support the services.locate.localuser option. updatedb will run as root. Silence this warning by setting services.locate.localuser = null." ++ optional (isFindutils && cfg.pruneNames != [ ]) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index ceb2db1faef..41848c1c6d3 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -5,6 +5,9 @@ with lib; let json = pkgs.formats.json { }; cfg = config.services.prometheus; + checkConfigEnabled = + (lib.isBool cfg.checkConfig && cfg.checkConfig) + || cfg.checkConfig == "syntax-only"; workingDir = "/var/lib/" + cfg.stateDir; @@ -27,7 +30,7 @@ let # a wrapper that verifies that the configuration is valid promtoolCheck = what: name: file: - if cfg.checkConfig then + if checkConfigEnabled then pkgs.runCommandLocal "${name}-${replaceStrings [" "] [""] what}-checked" { buildInputs = [ cfg.package ]; } '' @@ -58,7 +61,7 @@ let pkgs.writeText "prometheus.yml" cfg.configText else generatedPrometheusYml; in - promtoolCheck "check config" "prometheus.yml" yml; + promtoolCheck "check config ${lib.optionalString (cfg.checkConfig == "syntax-only") "--syntax-only"}" "prometheus.yml" yml; cmdlineArgs = cfg.extraFlags ++ [ "--storage.tsdb.path=${workingDir}/data/" @@ -1726,16 +1729,20 @@ in }; checkConfig = mkOption { - type = types.bool; + type = with types; either bool (enum [ "syntax-only" ]); default = true; + example = "syntax-only"; description = '' Check configuration with promtool check. The call to promtool is - subject to sandboxing by Nix. When credentials are stored in - external files (password_file, - bearer_token_file, etc), they will not be - visible to promtool and it will report - errors, despite a correct configuration. + subject to sandboxing by Nix. + + If you use credentials stored in external files + (password_file, bearer_token_file, etc), + they will not be visible to promtool + and it will report errors, despite a correct configuration. + To resolve this, you may set this option to "syntax-only" + in order to only syntax check the Prometheus configuration. ''; }; diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index c6c40777ed7..227bafc1d0e 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -164,7 +164,7 @@ in { StateDirectoryMode = "0750"; # Hardening CapabilityBoundingSet = [ "" ]; - DeviceAllow = [ "/dev/stdin" ]; + DeviceAllow = [ "/dev/stdin" "/dev/urandom" ]; DevicePolicy = "strict"; IPAddressAllow = mkIf bindLocalhost "localhost"; IPAddressDeny = mkIf bindLocalhost "any"; diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index 61e9fe5096b..0b3815d0cc6 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -211,7 +211,7 @@ let postUp = optional (values.privateKeyFile != null) "wg set ${name} private-key <(cat ${values.privateKeyFile})" ++ (concatMap (peer: optional (peer.presharedKeyFile != null) "wg set ${name} peer ${peer.publicKey} preshared-key <(cat ${peer.presharedKeyFile})") values.peers) ++ - optional (values.postUp != null) values.postUp; + optional (values.postUp != "") values.postUp; postUpFile = if postUp != [] then writeScriptFile "postUp.sh" (concatMapStringsSep "\n" (line: line) postUp) else null; preDownFile = if values.preDown != "" then writeScriptFile "preDown.sh" values.preDown else null; postDownFile = if values.postDown != "" then writeScriptFile "postDown.sh" values.postDown else null; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a4b886821eb..87270776f5a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -546,10 +546,23 @@ in { ''; }; - nginx.recommendedHttpHeaders = mkOption { - type = types.bool; - default = true; - description = "Enable additional recommended HTTP response headers"; + nginx = { + recommendedHttpHeaders = mkOption { + type = types.bool; + default = true; + description = "Enable additional recommended HTTP response headers"; + }; + hstsMaxAge = mkOption { + type = types.ints.positive; + default = 15552000; + description = '' + Value for the max-age directive of the HTTP + Strict-Transport-Security header. + + See section 6.1.1 of IETF RFC 6797 for detailed information on this + directive and header. + ''; + }; }; }; @@ -702,7 +715,7 @@ in { 'skeletondirectory' => '${cfg.skeletonDirectory}', ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} 'log_type' => 'syslog', - 'log_level' => '${builtins.toString cfg.logLevel}', + 'loglevel' => '${builtins.toString cfg.logLevel}', ${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"} ${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"} ${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"} @@ -983,7 +996,9 @@ in { add_header X-Permitted-Cross-Domain-Policies none; add_header X-Frame-Options sameorigin; add_header Referrer-Policy no-referrer; - add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; + ''} + ${optionalString (cfg.https) '' + add_header Strict-Transport-Security "max-age=${toString cfg.nginx.hstsMaxAge}; includeSubDomains" always; ''} client_max_body_size ${cfg.maxUploadSize}; fastcgi_buffers 64 4K; diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix index fad17ac71fd..2a775369d26 100644 --- a/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation rec { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index a77924bb1f0..48a8d3ad930 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -39,6 +39,13 @@ stdenv.mkDerivation rec { "--enable-keccak" "--enable-bflsc"]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: cgminer-driver-modminer.o:/build/source/miner.h:285: + # multiple definition of `bitforce_drv'; cgminer-cgminer.o:/build/source/miner.h:285: + # first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = with lib; { description = "CPU/GPU miner in c for bitcoin"; homepage = "https://github.com/ckolivas/cgminer"; diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/applications/blockchains/lightwalletd/default.nix index 43af8491210..1cfd2071e86 100644 --- a/pkgs/applications/blockchains/lightwalletd/default.nix +++ b/pkgs/applications/blockchains/lightwalletd/default.nix @@ -1,14 +1,14 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, lightwalletd, testers }: buildGoModule rec { pname = "lightwalletd"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "zcash"; repo = "lightwalletd"; - rev = "v${version}"; - sha256 = "sha256-IksA06V+mP7ZAXXFYLKLacxrDXeMXHAk5w4t7pmobq4="; + rev = "68789356fb1a75f62735a529b38389ef08ea7582"; + sha256 = "sha256-7gZhr6YMarGdgoGjg+oD4nZ/SAJ5cnhEDKmA4YMqJTo="; }; vendorSha256 = null; @@ -16,22 +16,28 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/zcash/lightwalletd/common.Version=v${version}" - "-X github.com/zcash/lightwalletd/common.GitCommit=v${version}" + "-X github.com/zcash/lightwalletd/common.GitCommit=${src.rev}" "-X github.com/zcash/lightwalletd/common.BuildDate=1970-01-01" "-X github.com/zcash/lightwalletd/common.BuildUser=nixbld" ]; - postFixup = '' - shopt -s extglob - cd $out/bin - rm !(lightwalletd) - ''; + excludedPackages = [ + "genblocks" + "testclient" + "zap" + ]; + + passthru.tests.version = testers.testVersion { + package = lightwalletd; + command = "lightwalletd version"; + version = "v${lightwalletd.version}"; + }; meta = with lib; { description = "A backend service that provides a bandwidth-efficient interface to the Zcash blockchain"; homepage = "https://github.com/zcash/lightwalletd"; maintainers = with maintainers; [ centromere ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index f8e20f1a05d..e3cea78629f 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.12.9"; + version = "1.1.13.1"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-DtoLQbRXyR4xGm+M0xg9uj8wcbh1dOBJUG430OS8AS4="; + sha256 = "sha256-AtsNbUqEBQx0DPWR2LjNl7pdviYmvkv3bYKNBoeJHbw="; }; dontBuild = true; diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 38719de371a..bf39ed8781f 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -93,7 +93,7 @@ in python.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ]; propagatedBuildInputs = with python.pkgs; [ - Babel + babel chardet decorator docutils diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 44d54014976..66248ff5365 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-33"; + version = "7.1.0-34"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-qiXTSQcc48IIzz7RUcyOH2w8JUOTdU1zg43gJhoELXo="; + hash = "sha256-eASmIOTYupK5di3lggJ/8O5pkG88ZpFuvaYK23AWsq4="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 0d28a382020..d0b02caff04 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.8"; + version = "0.6.9"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "QPbH7d2RC8DLze44Q3gCQ9IzHOgIq8IB+hZr9+8rTs0="; + sha256 = "sha256-ubhGDx5T1AAJjU6Ka1Pqy5kL8HPa097QhhK5Sp3HWEo="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 8f4bf10b100..5a8055b0815 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -48,7 +48,7 @@ postPatch = "sed -i /PyQt5/d setup.cfg"; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; + propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index c188e5f7853..4a063eb8edd 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -25,7 +25,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - Babel + babel psutil xlib pygobject3 diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 899b7514622..0cd05cfddd5 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "driftctl"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-cn0PhumDaOhTm1vZCj0h9XehnQCDc+mXtne7QQNSbBk="; + sha256 = "sha256-kjXqkaBF3rAaGnDDVmAoFmvH4t8/seC+KF7K78eKZco="; }; vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index acc3370ce83..5de2f03be7d 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FuWfHd4LfFHX5oRopDIDTi90cARi8cYjJBK0BgeCD/U="; + sha256 = "sha256-5bigfsig2LkZoLUlA6764ttG85CNi6rmOgQck+/zc5c="; }; - vendorSha256 = "sha256-mHitGjOfSRlqORWFtB16buSSJrCf7Li9+oHX4rcO4ek="; + vendorSha256 = "sha256-Ei4L35/RN2en7gOUzvGflBivTlBy2YnUvTHqcCe5HN4="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 085b504314e..783f9c79bb7 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -1,22 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub}: +{ lib, buildGoModule, fetchFromGitHub, testers, terraform-inventory }: -buildGoPackage rec { +buildGoModule rec { pname = "terraform-inventory"; - version = "0.7-pre"; - rev = "v${version}"; - - goPackagePath = "github.com/adammck/terraform-inventory"; - - subPackages = [ "./" ]; + version = "0.10"; src = fetchFromGitHub { - inherit rev; owner = "adammck"; repo = "terraform-inventory"; - sha256 = "0wwyi2nfyn3wfpmvj8aabn0cjba0lpr5nw3rgd6qdywy7sc3rmb1"; + rev = "v${version}"; + sha256 = "sha256-gkSDxcBoYmCBzkO8y1WKcRtZdfl8w5qVix0zbyb4Myo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-pj9XLzaGU1PuNnpTL/7XaKJZUymX+i8hFMroZtHIqTc="; + + ldflags = [ "-s" "-w" "-X main.build_version=${version}" ]; + + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = terraform-inventory; + }; meta = with lib; { homepage = "https://github.com/adammck/terraform-inventory"; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/deps.nix b/pkgs/applications/networking/cluster/terraform-inventory/deps.nix deleted file mode 100644 index 9f7b5e317fe..00000000000 --- a/pkgs/applications/networking/cluster/terraform-inventory/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/adammck/venv"; - fetch = { - type = "git"; - url = "https://github.com/adammck/venv"; - rev = "8a9c907a37d36a8f34fa1c5b81aaf80c2554a306"; - sha256 = "1fzk3j4q59kpd2ks2aw8rmic6b123p5mh981cjh0kzs716grc6y8"; - }; - } - { - goPackagePath = "github.com/blang/vfs"; - fetch = { - type = "git"; - url = "https://github.com/blang/vfs"; - rev = "c14afcac17253ce7418da751ec6b1988790cdc8f"; - sha256 = "00q5qzxpn9n59nrmrljz4w9lljxvrr8i5j8i8b4iw86j0alcx53b"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 94fcafcb48c..db7ca3cf386 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -420,10 +420,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.25.0-alpha", - "sha256": "sha256-9BE19VywtNIeDfjBKzle5nGFPmpS8lHV60w0h2xTztU=", + "rev": "v4.24.1", + "sha256": "sha256-1fwHMN2HIVl+8ZL7OtP1U5ORc41e7Tm3qEpMqIgWL20=", "vendorSha256": null, - "version": "4.25.0-alpha" + "version": "4.24.1" }, "gitlab": { "owner": "gitlabhq", @@ -719,10 +719,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.3.0-alpha.3", - "sha256": "sha256-wuZp0Be8a84y7JqpCGnBDPXgNG8JJcNWsIICP3ZjSVk=", - "vendorSha256": "sha256-Ln9EyycPduVuj+JefH9f+Q5KlNGvbcwcEDgaqH2M0So=", - "version": "3.3.0-alpha.3" + "rev": "v3.2.2", + "sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi", + "vendorSha256": null, + "version": "3.2.2" }, "minio": { "owner": "aminueza", diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 4310fcdcc27..fb506cefbe0 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -128,9 +128,12 @@ version="$(jq -r '.version' <<<"${registry_response}")" if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then echo_provider "already at version ${version}" exit -else - echo_provider "updating from ${old_version} to ${version}" fi +if [[ ${version} =~ (alpha|beta|pre) && ${force} != 1 ]]; then + echo_provider "not updating to unstable version ${version}" + exit +fi +echo_provider "updating from ${old_version} to ${version}" update_attr version "${version}" provider_source_url="$(jq -r '.source' <<<"${registry_response}")" diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 57fb1b58d90..d27512bf5bc 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU="; + sha256 = "13jg28dypp7x6wgsc6vikbqnagp1grqsdmmwhll8qz9ih9rq9fxd"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index f81b8853c8b..1070821f5d2 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220430"; + version = "20220517"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-clG0B7PgtlpsSnZgglkv7y7SOtMTBvwJMnvMrcTWXdI="; + sha256 = "sha256-6jKsdilgWm6oDAuzE1aToMg9oV9BmTgQrOvvlwPA5gc="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 5af97fa0f93..c5ba0437efd 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -28,6 +28,7 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; version = "2.2.4"; + outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index ff6760d3daa..9b5b27e7ca4 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { doCheck = false; propagatedBuildInputs = with python3Packages; [ - click Babel opsdroid_get_image_size slackclient webexteamssdk bleach + click babel opsdroid_get_image_size slackclient webexteamssdk bleach parse emoji puremagic yamale nbformat websockets pycron nbconvert aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex mattermostdriver setuptools voluptuous ibm-watson tailer multidict diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5833e5e4adf..c702c02c147 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ - Babel + babel beancount cheroot click diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 1e34b7918da..04d5108dc60 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.10.1"; - _build = "482"; + _version = "2.10.2"; + _build = "484"; version = "${_version}-${_build}"; swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "0pzcfqsf7flzipwivpinpkfb2xisand1sfjm00wif4pyj3f4qfh1"; + sha256 = "1x9sybknzsfxp9z0pvw9dx80732ynyap57y03p7xwwjbcrnjla57"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index 99df3f55c1d..acd3a7a8c84 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -4,6 +4,7 @@ , cmake , corrosion , extra-cmake-modules +, gcc11 , kconfig , kcoreaddons , kdbusaddons @@ -19,8 +20,8 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "21.08" -, cargoSha256 ? "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak" +, cargoShaForVersion ? "22.04" +, cargoSha256 ? "RtdZMBKixC3mdHeFXY9u0pHyDv93Z8p4EVY+lz1aISM=" }: # Guard against incomplete updates. @@ -45,6 +46,7 @@ mkDerivation rec { cmake corrosion extra-cmake-modules + gcc11 # doesn't build with GCC 9 from stdenv on aarch64 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/plasma-mobile/audiotube.nix index 1a1dedc7b42..f020c22b1ae 100644 --- a/pkgs/applications/plasma-mobile/audiotube.nix +++ b/pkgs/applications/plasma-mobile/audiotube.nix @@ -1,8 +1,8 @@ { lib , mkDerivation -, fetchpatch , extra-cmake-modules +, gcc11 , kcoreaddons , kcrash @@ -16,16 +16,9 @@ mkDerivation rec { pname = "audiotube"; - patches = [ - # Fix compatibility with ytmusicapi 0.19.1 - (fetchpatch { - url = "https://invent.kde.org/plasma-mobile/audiotube/-/commit/734caa02805988200f923b88d1590b3f7dac8ac2.patch"; - sha256 = "0zq4f0w84dv0630bpvmqkfmhxbvibr2fxhzy6d2mnf098028gzyd"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules + gcc11 # doesn't build with GCC 9 from stdenv on aarch64 python3Packages.wrapPython python3Packages.pybind11 ]; @@ -37,13 +30,11 @@ mkDerivation rec { kirigami2 qtmultimedia qtquickcontrols2 - python3Packages.youtube-dl - python3Packages.ytmusicapi - ]; + ] ++ pythonPath; - pythonPath = [ - python3Packages.youtube-dl - python3Packages.ytmusicapi + pythonPath = with python3Packages; [ + yt-dlp + ytmusicapi ]; preFixup = '' diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 10c1f1d0e9b..9e0cf1443e2 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -73,9 +73,11 @@ let krecorder = callPackage ./krecorder.nix {}; ktrip = callPackage ./ktrip.nix {}; kweather = callPackage ./kweather.nix {}; + neochat = callPackage ./neochat.nix {}; plasma-dialer = callPackage ./plasma-dialer.nix {}; plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-settings = callPackage ./plasma-settings.nix {}; + plasmatube = callPackage ./plasmatube.nix {}; spacebar = callPackage ./spacebar.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh index 14995aeb2b7..3a3d5b18a53 100644 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ b/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.04/ -A '*.tar.xz' ) diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/plasma-mobile/kasts.nix index 370cba7e2ea..793fd5c9bda 100644 --- a/pkgs/applications/plasma-mobile/kasts.nix +++ b/pkgs/applications/plasma-mobile/kasts.nix @@ -10,9 +10,12 @@ , kcoreaddons , ki18n , kirigami2 +, networkmanager-qt +, qtkeychain , qtmultimedia , qtquickcontrols2 , syndication +, taglib }: let @@ -37,9 +40,12 @@ mkDerivation rec { kcoreaddons ki18n kirigami2 - qtquickcontrols2 + networkmanager-qt + qtkeychain qtmultimedia + qtquickcontrols2 syndication + taglib ]; preFixup = '' diff --git a/pkgs/applications/plasma-mobile/krecorder.nix b/pkgs/applications/plasma-mobile/krecorder.nix index c41413be884..35d38af566c 100644 --- a/pkgs/applications/plasma-mobile/krecorder.nix +++ b/pkgs/applications/plasma-mobile/krecorder.nix @@ -5,6 +5,7 @@ , extra-cmake-modules , kconfig +, kcoreaddons , ki18n , kirigami2 , qtmultimedia @@ -21,6 +22,7 @@ mkDerivation rec { buildInputs = [ kconfig + kcoreaddons ki18n kirigami2 qtmultimedia diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/plasma-mobile/neochat.nix similarity index 80% rename from pkgs/applications/networking/instant-messengers/neochat/default.nix rename to pkgs/applications/plasma-mobile/neochat.nix index a8e73ad1098..8147c4fb760 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/plasma-mobile/neochat.nix @@ -1,6 +1,5 @@ { mkDerivation , lib -, fetchFromGitLab , pkg-config , cmake , cmark @@ -28,15 +27,6 @@ mkDerivation rec { pname = "neochat"; - version = "22.02"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "network"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs="; - }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; @@ -64,7 +54,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A client for matrix, the decentralized communication protocol."; + description = "A client for matrix, the decentralized communication protocol"; homepage = "https://apps.kde.org/en/neochat"; license = licenses.gpl3Only; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix index eb71c497084..1a30977aba9 100644 --- a/pkgs/applications/plasma-mobile/plasma-dialer.nix +++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix @@ -4,6 +4,7 @@ , cmake , extra-cmake-modules +, callaudiod , kcontacts , kcoreaddons , kdbusaddons @@ -12,12 +13,11 @@ , knotifications , kpeople , libphonenumber -, libpulseaudio -, libqofono +, modemmanager-qt , protobuf -, pulseaudio-qt +, qtfeedback +, qtmpris , qtquickcontrols2 -, telepathy }: mkDerivation rec { @@ -29,6 +29,7 @@ mkDerivation rec { ]; buildInputs = [ + callaudiod kcontacts kcoreaddons kdbusaddons @@ -37,12 +38,11 @@ mkDerivation rec { knotifications kpeople libphonenumber - libpulseaudio - libqofono + modemmanager-qt protobuf # Needed by libphonenumber - pulseaudio-qt + qtfeedback + qtmpris qtquickcontrols2 - telepathy ]; meta = with lib; { diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix index bcd04dadca2..039f2d674b3 100644 --- a/pkgs/applications/plasma-mobile/plasma-settings.nix +++ b/pkgs/applications/plasma-mobile/plasma-settings.nix @@ -11,6 +11,8 @@ , kdbusaddons , ki18n , kitemmodels +, modemmanager-qt +, networkmanager-qt , plasma-framework }: @@ -29,6 +31,8 @@ mkDerivation rec { kdbusaddons ki18n kitemmodels + modemmanager-qt + networkmanager-qt plasma-framework ]; diff --git a/pkgs/applications/plasma-mobile/plasmatube.nix b/pkgs/applications/plasma-mobile/plasmatube.nix new file mode 100644 index 00000000000..894af98b6d1 --- /dev/null +++ b/pkgs/applications/plasma-mobile/plasmatube.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, gst_all_1 +, kcoreaddons +, kdeclarative +, ki18n +, kirigami2 +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation { + pname = "plasmatube"; + + nativeBuildInputs = [ + extra-cmake-modules + ]; + + buildInputs = [ + kcoreaddons + kdeclarative + ki18n + kirigami2 + qtmultimedia + qtquickcontrols2 + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer + ]); + + meta = { + description = "Youtube player powered by an invidious server"; + homepage = "https://invent.kde.org/plasma-mobile/plasmatube"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 8d566550108..24e2f6f4715 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -11,8 +11,10 @@ , kpeople , libphonenumber , libqofono +, modemmanager-qt , protobuf -, telepathy +, qcoro +, qtquickcontrols2 }: mkDerivation rec { @@ -30,9 +32,10 @@ mkDerivation rec { knotifications kpeople libphonenumber - libqofono + modemmanager-qt protobuf # Needed by libphonenumber - telepathy + qcoro + qtquickcontrols2 ]; meta = with lib; { diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index 06b551a94cf..e7da4d7b0f4 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/pkgs/applications/plasma-mobile/srcs.nix @@ -4,155 +4,187 @@ { alligator = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/alligator-21.08.tar.xz"; - sha256 = "1dhwfwd1v5wmx3sldpygb79kz87j13wd0arhlkm94z1whsixan0q"; - name = "alligator-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/alligator-22.04.tar.xz"; + sha256 = "1f2s0ay4qr7ylqnx8d1fawwi4h15gza2d4dsvrww1gm8ar1miqwc"; + name = "alligator-22.04.tar.xz"; }; }; angelfish = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/angelfish-21.08.tar.xz"; - sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh"; - name = "angelfish-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/angelfish-22.04.tar.xz"; + sha256 = "169bhkymfxcs93injzp86cvcdhv78pl4dfsscjahlh9c1g5lsbqa"; + name = "angelfish-22.04.tar.xz"; }; }; audiotube = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/audiotube-21.08.tar.xz"; - sha256 = "14h4xna9v70lmp7cfpvdnz0f5a4gwgj0q3byccmawm38xsv15v8c"; - name = "audiotube-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/audiotube-22.04.tar.xz"; + sha256 = "0x9xmlfz39ac15c4rbg33sl1bbjmglxgz39flmrvrrw9h2m62s2x"; + name = "audiotube-22.04.tar.xz"; }; }; calindori = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/calindori-21.08.tar.xz"; - sha256 = "08s16a8skh02n8ygqwryxpzczj5aqr5k58aijaz2gzx45m7ym31b"; - name = "calindori-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/calindori-22.04.tar.xz"; + sha256 = "1zinhlflrx230yymlfxvm98dvvq1yig3r49bq61fmyrzq6fdfv60"; + name = "calindori-22.04.tar.xz"; }; }; kalk = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/kalk-21.08.tar.xz"; - sha256 = "0xzrahpz47yajalsfmpzmavxjwmr4bgljwyz2dhxdg40ryjxdy23"; - name = "kalk-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/kalk-22.04.tar.xz"; + sha256 = "0aaqcb7jkkqypawfkzjnqglzyni17064d0mhch8g7q0qm5izvap8"; + name = "kalk-22.04.tar.xz"; }; }; kasts = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/kasts-21.08.tar.xz"; - sha256 = "10v6icxwv46nihzbdi0n2w71bsg7l166z7jf9rb7vf2mjh1gqavn"; - name = "kasts-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/kasts-22.04.tar.xz"; + sha256 = "0c60wp0i6l7ji13ap69lh21vpdq09h2nmqpzjlrwlbjqbhhx7lsh"; + name = "kasts-22.04.tar.xz"; }; }; kclock = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/kclock-21.08.tar.xz"; - sha256 = "1zq0fxlwd7l3b6dgfqsmv1x4wvhmrjz5r0a38hbd7j7pzgyix47d"; - name = "kclock-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/kclock-22.04.tar.xz"; + sha256 = "1ycln85ydd3qmzfadgg80zf7jlwx5yijxs1mbfmx7f1rr427qdk6"; + name = "kclock-22.04.tar.xz"; }; }; keysmith = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/keysmith-21.08.tar.xz"; - sha256 = "0fa8inli7cwmb75af0mr2cflng0r6k3pd6ckih6ph7szqbpg2x90"; - name = "keysmith-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/keysmith-22.04.tar.xz"; + sha256 = "0cx14r820mnlh75l3blc0ywxwmlinn2wakdnwl75w6i8l46k48li"; + name = "keysmith-22.04.tar.xz"; + }; + }; + khealthcertificate = { + version = "22.04"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/22.04/khealthcertificate-22.04.tar.xz"; + sha256 = "0sr90ki42m3cbjy63rl2ay02wm089wyka0lc4ik7jaic6wb47y5d"; + name = "khealthcertificate-22.04.tar.xz"; }; }; koko = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/koko-21.08.tar.xz"; - sha256 = "1sqlcl871m6dlrnkkhqa3xfwix01d74d7jf94r1a3p32hqljv76p"; - name = "koko-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/koko-22.04.tar.xz"; + sha256 = "0i4h2brc5dqwdmj2bs7nywrz7cgqcf7nmm6yl03047vj9aah01cw"; + name = "koko-22.04.tar.xz"; }; }; kongress = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/kongress-21.08.tar.xz"; - sha256 = "099ds4bv4ngx21f28hxcvc17wd2nk786kydwf2h5n3mdd2mgz3ka"; - name = "kongress-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/kongress-22.04.tar.xz"; + sha256 = "07yb8hddxl7m1wl0z7rcwdls3k9q89zl1d271n15j1rwrsbwiyxd"; + name = "kongress-22.04.tar.xz"; }; }; krecorder = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/krecorder-21.08.tar.xz"; - sha256 = "1381x889h37saf6k875iqhwz5vbixrp7650smxp31r56ycrqq26i"; - name = "krecorder-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/krecorder-22.04.tar.xz"; + sha256 = "0d7nvq87avw4gj6whjrlmxs361r9cvzfmfsrca5f536jlazp95pg"; + name = "krecorder-22.04.tar.xz"; }; }; ktrip = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/ktrip-21.08.tar.xz"; - sha256 = "0ipxi3pqd7mznq3qjf9j9w3wyck85lxnr81ay6b3ricfb08ry68x"; - name = "ktrip-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/ktrip-22.04.tar.xz"; + sha256 = "1ijy19axc492l4naayr3d8qdjznc286105qnki8vmcaw93p48n9x"; + name = "ktrip-22.04.tar.xz"; }; }; kweather = { - version = "21.08"; + version = "22.04"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/22.04/kweather-22.04.tar.xz"; + sha256 = "0080l00dya34d35sf6z2j3ra6lls0nafr045a9jmxv09763ydb5d"; + name = "kweather-22.04.tar.xz"; + }; + }; + neochat = { + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/kweather-21.08.tar.xz"; - sha256 = "0b1zjwsakwsnh6827zjhypvb04c78gwwygr7k1cy2x3finrp5if5"; - name = "kweather-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/neochat-22.04.tar.xz"; + sha256 = "04i1kn52w9jjaaw8x53mksw2vzrpsq1xrq13h158c1s3q1g9jdm8"; + name = "neochat-22.04.tar.xz"; }; }; plasma-dialer = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/plasma-dialer-21.08.tar.xz"; - sha256 = "14vgjg0nihhm446cfrrld1l43r50dlah5xs2ypdnm68618bdc7p1"; - name = "plasma-dialer-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/plasma-dialer-22.04.tar.xz"; + sha256 = "0hnxasj6psplwykahhisipyvy67hfr820azixw5p820fzy11x2g4"; + name = "plasma-dialer-22.04.tar.xz"; }; }; plasma-phonebook = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/plasma-phonebook-21.08.tar.xz"; - sha256 = "09gr5mkwhayx6k6bhm29bmcvdlqqw8jj7gydh5fz40g9z98c84km"; - name = "plasma-phonebook-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/plasma-phonebook-22.04.tar.xz"; + sha256 = "14nd2yx9cf6gabb10kcaqkdn7kb96n2209qrib7daq2ldva8c9i9"; + name = "plasma-phonebook-22.04.tar.xz"; }; }; plasma-settings = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/plasma-settings-21.08.tar.xz"; - sha256 = "005v1gyrzl9b0k875p2wipja3l8l4awp8nl2d1jx7c28lqaspz2j"; - name = "plasma-settings-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/plasma-settings-22.04.tar.xz"; + sha256 = "1k40mviikpij1srar1hkg732qg14ld0176g1mpza0ysr3yr21vny"; + name = "plasma-settings-22.04.tar.xz"; + }; + }; + plasmatube = { + version = "22.04"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/22.04/plasmatube-22.04.tar.xz"; + sha256 = "01bmxdh0aclm184j5s0kddjc7a14225bdnbkr8jlk21g9wlw8cyx"; + name = "plasmatube-22.04.tar.xz"; }; }; qmlkonsole = { - version = "21.08"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/qmlkonsole-21.08.tar.xz"; - sha256 = "1p3ysf6sgiji86400523hm67rvw3znj3a7k6g6s83dxynxdh2faq"; - name = "qmlkonsole-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/qmlkonsole-22.04.1.tar.xz"; + sha256 = "06zfrqaag9sgihs5k93nssgm4smrs2ymh7q0fx35z7fcphngjpaw"; + name = "qmlkonsole-22.04.1.tar.xz"; }; }; spacebar = { - version = "21.08"; + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/spacebar-21.08.tar.xz"; - sha256 = "1cg36iys4x7p97ywilnp2lzz1ry5a1m7jz38yh2yiw6m8wvzfqff"; - name = "spacebar-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/spacebar-22.04.tar.xz"; + sha256 = "0ga3symavdrq5aim924bd889b9cmv09dyplz9gcspk46w49vx3s5"; + name = "spacebar-22.04.tar.xz"; }; }; tokodon = { - version = "21.08"; + version = "22.04"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/22.04/tokodon-22.04.tar.xz"; + sha256 = "0c9q2ax0h047xm3g5r5cn6sxfyv2lb93dahd5z3nw67bfrzwvnw2"; + name = "tokodon-22.04.tar.xz"; + }; + }; + vakzination = { + version = "22.04"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/21.08/tokodon-21.08.tar.xz"; - sha256 = "0j9zfcdss1872hv8xxrmy0jjmcz3y5kdz8gdrd6qmig5scrzjvnf"; - name = "tokodon-21.08.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.04/vakzination-22.04.tar.xz"; + sha256 = "0zadygzw4xzpwbdnb6dwjjjls1h915gp9xaf59kbfbmzwb6m4mf8"; + name = "vakzination-22.04.tar.xz"; }; }; } diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index a2ba038c059..6c140b03ee4 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.free; + broken = true; # ITK5 compatibility issue (https://github.com/BIC-MNI/EZminc/issues/15) }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 66acf07f8e4..4132bd0fa96 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.6.2"; + version = "7.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mIl5c+HR2kqgJzbLVTQjJlf4Ca/+Icqg9G49yIUyipc="; + hash = "sha256-KAnilLq7hZy5IU8d95D9sHSGfqibAvUAW3bRH/JwGnw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch b/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch new file mode 100644 index 00000000000..dd43e17cc7a --- /dev/null +++ b/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,21 +54,7 @@ endif() + endif() + + #Use c preprocessor with fortran +- +-if(UNIX AND NOT APPLE) +- set(CMAKE_Fortran_FLAGS "-cpp -Wno-argument-mismatch") +-endif() +- +-if(APPLE) +- set(CMAKE_Fortran_FLAGS "-cpp -fallow-argument-mismatch") +-endif() +- +- +-if (CMAKE_MAJOR_VERSION VERSION_GREATER_EQUAL "3") +-if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL "10") +- set(CMAKE_Fortran_FLAGS "-cpp -fallow-argument-mismatch") +-endif() +-endif() ++set(CMAKE_Fortran_FLAGS "-cpp") + + + #For Fortran +diff --git a/src/GetChisquare.f b/src/GetChisquare.f +index b21413fe..28391bcb 100644 +--- a/src/GetChisquare.f ++++ b/src/GetChisquare.f +@@ -2418,8 +2418,8 @@ C> @Brief Interface to lapack, to dynamically allocate work arrays + integer NCovar, NDimCovar + double precision Covar(NDimCovar,NDimCovar), EigenValues(NCovar) + integer IFail +- double precision Work +- integer IWork ++ double precision Work(1) ++ integer IWork(1) + Character*80 msg + C--------------------------------------------------------------- + C Determine optimal size of the work array: +@@ -2432,7 +2432,7 @@ C Determine optimal size of the work array: + $ int(work)+1, iwork + call HF_ERRLOG(14121701,msg) + call MyDSYEVD2(NCovar,Covar,NDimCovar, EigenValues, +- $ int(work)+1,iwork,ifail) ++ $ int(work(1))+1,iwork(1),ifail) + + end + diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 2be61538788..4e6f6626602 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZHIQ5hOY+k0/wmpE0o4Po+RZ4MkVMk+bK1Rc6eqwwH0="; }; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace "-fallow-argument-mismatch" "" - ''; + patches = [ + # Avoid need for -fallow-argument-mismatch + ./0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch + ]; nativeBuildInputs = [ cmake gfortran pkg-config ]; buildInputs = diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 5ff6d6b1f84..98da70a274e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "git-ignore"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bKIBPqGKiS3ey8vH2F4EoleV1H2PTOp+71d/YW3jkT0="; + sha256 = "sha256-Bfr+4zDi6QqirlqccW1jU95eb4q82ZFG9LtT2mCPYLc="; }; - cargoSha256 = "sha256-7jPNVBf5DYtE8nsh7LIywMCjU7ODZ3qFsmBie2mZ3h8="; + cargoSha256 = "sha256-ehEUI4M2IxqS6QhyqOncwP+w6IGbIlSFNIP/FEVH/JI="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] @@ -21,9 +21,10 @@ buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - outputs = [ "out" "man" ]; - preFixup = '' - installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 + postInstall = '' + installManPage assets/git-ignore.1 + # There's also .elv and .ps1 completion files but I don't know where to install those + installShellCompletion assets/git-ignore.{bash,fish} --zsh assets/_git-ignore ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 14696903542..83314802ca9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-sync"; - version = "unstable-2021-07-14"; + version = "unstable-2022-03-20"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590"; - sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI="; + rev = "8466b77a38b3d5e8b4ed9e3cb1b635e475eeb415"; + sha256 = "sha256-8rCwpmHV6wgFCLzPJOKzwN5mG8uD5KIlGFwcgQD+SK4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -a git-* $out/bin/ + cp -a contrib/git-* $out/bin/ ''; wrapperPath = with lib; makeBinPath [ diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 4377b255fd9..f854054b3b6 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - Babel + babel pycairo pygobject3 ]; diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index b3c9e1ea62a..5e36cd109e4 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gnome +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, intltool, gnome , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -10,12 +10,20 @@ stdenv.mkDerivation rec { sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA="; }; + patches = [ + (fetchpatch { + name = "reduce-build-parallelism.patch"; + url = "https://gitlab.gnome.org/vcunat/adwaita-icon-theme/-/commit/27edeca7927eb2247d7385fccb3f0fd7787471e6.patch"; + sha256 = "vDWuvz5yRhtn9obTtHRp6J7gJpXDZz1cajyquPGw53I="; + }) + ]; + # For convenience, we can specify adwaita-icon-theme only in packages propagatedBuildInputs = [ hicolor-icon-theme ]; buildInputs = [ gdk-pixbuf librsvg ]; - nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ]; + nativeBuildInputs = [ pkg-config autoreconfHook intltool iconnamingutils gtk3 ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 9447de1fd4e..e7afab4c9ac 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -4,19 +4,19 @@ , glib , gettext , sassc -, unstableGitUpdater +, gitUpdater }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "71+date=2022-02-23"; + version = "72"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; - rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f"; - sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100="; + rev = "extensions.gnome.org-v${version}"; + sha256 = "Cds5Fc+rnvoy01GTZBS7qPh8UC9ekrNBOs+IEkDNkJw="; }; nativeBuildInputs = [ @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { extensionUuid = "dash-to-dock@micxgx.gmail.com"; extensionPortalSlug = "dash-to-dock"; - updateScript = unstableGitUpdater { - stableVersion = true; - tagPrefix = "extensions.gnome.org-v"; + updateScript = gitUpdater { + pname = "gnomeExtensions.dash-to-dock"; + inherit version; + rev-prefix = "extensions.gnome.org-v"; }; }; diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index d9180e9001d..1483660d1ec 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.9"; + version = "1.17.10"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-djrUuvuAqSBEWMX6K45zJ/qXGu5FQlLA42LBEjYVaBM="; + sha256 = "sha256-KZ5VrzDxVpGwFdjc+OyuckEkElaeWy7OIDYXU6RW8vk="; }; # perl is used for testing go vet @@ -167,7 +167,6 @@ stdenv.mkDerivation rec { ./remove-test-pie-1.15.patch ./creds-test.patch ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch ./skip-chown-tests-1.16.patch ./skip-external-network-tests-1.16.patch ./skip-nohup-tests.patch diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 3ae837ac46b..b0ba8508fc3 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { checkInputs = [ lit ]; - makeFlags = [ "llvm-spirv" ]; - cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" "-DLLVM_DIR=${llvm_11.dev}" @@ -37,6 +35,12 @@ stdenv.mkDerivation rec { # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; + makeFlags = [ "all" "llvm-spirv" ]; + + postInstall = '' + install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv + ''; + meta = with lib; { homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR"; diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 0601022df61..64ccb2fc16e 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "vlang"; - version = "weekly.2022.19"; + version = "weekly.2022.20"; src = fetchFromGitHub { owner = "vlang"; repo = "v"; rev = version; - sha256 = "1bl91j3ip3i84jq3wg03sflllxv38sv4dc072r302rl2g9f4dbg6"; + sha256 = "1isbyfs98bdbm2qjf7q4bqbpsmdiqlavn3gznwr12bkvhnsf4j3x"; }; # Required for bootstrap. vc = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "a298ad7069f6333ef8ab59a616654fc74e04c847"; - sha256 = "168cgq6451hcgsxzyd8vq11g01642bs5kkwxqh6rz3rnc86ajic0"; + rev = "167f262866090493650f58832d62d910999dd5a4"; + sha256 = "1xax8355qkrccjcmx24gcab88xnrqj15mhqy0bgp3v2rb1hw1n3a"; }; # Required for vdoc. @@ -27,11 +27,6 @@ stdenv.mkDerivation rec { sha256 = "0cawzizr3rjz81blpvxvxrcvcdai1adj66885ss390444qq1fnv7"; }; - # vcreate_test.v requires git, so we must disable it. - patches = [ - ./disable_vcreate_test.patch - ]; - propagatedBuildInputs = [ glfw freetype openssl ] ++ lib.optional stdenv.hostPlatform.isUnix upx; @@ -42,9 +37,16 @@ stdenv.mkDerivation rec { "VC=${vc}" ]; - prePatch = '' + preBuild = '' export HOME=$(mktemp -d) - cp cmd/tools/vcreate_test.v $HOME/vcreate_test.v + ''; + + # vcreate_test.v requires git, so we must remove it when building the tools. + # vtest.v fails on Darwin, so let's just disable it for now. + preInstall = '' + mv cmd/tools/vcreate_test.v $HOME/vcreate_test.v + '' + lib.optionalString stdenv.isDarwin '' + mv cmd/tools/vtest.v $HOME/vtest.v ''; installPhase = '' @@ -64,12 +66,16 @@ stdenv.mkDerivation rec { $out/lib/v -v $out/lib/cmd/tools/vast $out/lib/v -v $out/lib/cmd/tools/vvet - # Return the pre-patch vcreate_test.v now that we no longer need the alteration. - cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v - runHook postInstall ''; + # Return vcreate_test.v and vtest.v, so the user can use it. + postInstall = '' + cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v + '' + lib.optionalString stdenv.isDarwin '' + cp $HOME/vtest.v $out/lib/cmd/tools/vtest.v + ''; + meta = with lib; { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; diff --git a/pkgs/development/compilers/vlang/disable_vcreate_test.patch b/pkgs/development/compilers/vlang/disable_vcreate_test.patch deleted file mode 100644 index 85ed867c83e..00000000000 --- a/pkgs/development/compilers/vlang/disable_vcreate_test.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff --git a/cmd/tools/vcreate_test.v b/cmd/tools/vcreate_test.v -index 3d07f4773..de8a202df 100644 ---- a/cmd/tools/vcreate_test.v -+++ b/cmd/tools/vcreate_test.v -@@ -2,127 +2,6 @@ import os - - const test_path = 'vcreate_test' - --fn init_and_check() ? { -- os.execute_or_exit('${os.quoted_path(@VEXE)} init') -- -- assert os.read_file('vcreate_test.v') ? == [ -- 'module main\n', -- 'fn main() {', -- " println('Hello World!')", -- '}', -- '', -- ].join_lines() -- -- assert os.read_file('v.mod') ? == [ -- 'Module {', -- " name: 'vcreate_test'", -- " description: ''", -- " version: ''", -- " license: ''", -- ' dependencies: []', -- '}', -- '', -- ].join_lines() -- -- assert os.read_file('.gitignore') ? == [ -- '# Binaries for programs and plugins', -- 'main', -- 'vcreate_test', -- '*.exe', -- '*.exe~', -- '*.so', -- '*.dylib', -- '*.dll', -- 'vls.log', -- '', -- ].join_lines() -- -- assert os.read_file('.gitattributes') ? == [ -- '*.v linguist-language=V text=auto eol=lf', -- '*.vv linguist-language=V text=auto eol=lf', -- '*.vsh linguist-language=V text=auto eol=lf', -- '**/v.mod linguist-language=V text=auto eol=lf', -- '', -- ].join_lines() -- -- assert os.read_file('.editorconfig') ? == [ -- '[*]', -- 'charset = utf-8', -- 'end_of_line = lf', -- 'insert_final_newline = true', -- 'trim_trailing_whitespace = true', -- '', -- '[*.v]', -- 'indent_style = tab', -- 'indent_size = 4', -- '', -- ].join_lines() --} -- - fn test_v_init() ? { -- dir := os.join_path(os.temp_dir(), test_path) -- os.rmdir_all(dir) or {} -- os.mkdir(dir) or {} -- defer { -- os.rmdir_all(dir) or {} -- } -- os.chdir(dir) ? -- -- init_and_check() ? --} -- --fn test_v_init_in_git_dir() ? { -- dir := os.join_path(os.temp_dir(), test_path) -- os.rmdir_all(dir) or {} -- os.mkdir(dir) or {} -- defer { -- os.rmdir_all(dir) or {} -- } -- os.chdir(dir) ? -- os.execute_or_exit('git init .') -- init_and_check() ? --} -- --fn test_v_init_no_overwrite_gitignore() ? { -- dir := os.join_path(os.temp_dir(), test_path) -- os.rmdir_all(dir) or {} -- os.mkdir(dir) or {} -- os.write_file('$dir/.gitignore', 'blah') ? -- defer { -- os.rmdir_all(dir) or {} -- } -- os.chdir(dir) ? -- -- os.execute_or_exit('${os.quoted_path(@VEXE)} init') -- -- assert os.read_file('.gitignore') ? == 'blah' --} -- --fn test_v_init_no_overwrite_gitattributes_and_editorconfig() ? { -- git_attributes_content := '*.v linguist-language=V text=auto eol=lf' -- editor_config_content := '[*] --charset = utf-8 --end_of_line = lf --insert_final_newline = true --trim_trailing_whitespace = true -- --[*.v] --indent_style = tab --indent_size = 4 --' -- -- dir := os.join_path(os.temp_dir(), test_path) -- os.rmdir_all(dir) or {} -- os.mkdir(dir) or {} -- os.write_file('$dir/.gitattributes', git_attributes_content) ? -- os.write_file('$dir/.editorconfig', editor_config_content) ? -- defer { -- os.rmdir_all(dir) or {} -- } -- os.chdir(dir) ? -- -- os.execute_or_exit('${os.quoted_path(@VEXE)} init') -- -- assert os.read_file('.gitattributes') ? == git_attributes_content -- assert os.read_file('.editorconfig') ? == editor_config_content -+ println('vcreate_test disabled') - } diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index e41d71ef960..7f35dcfc635 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,82 +1,107 @@ -{ lib, stdenv, fetchFromGitHub, readline, libedit, bc +{ lib +, stdenv +, fetchFromGitHub +, bc +, libedit +, readline , avxSupport ? stdenv.hostPlatform.avxSupport }: stdenv.mkDerivation rec { pname = "j"; - version = "902"; - jtype = "release-b"; + version = "904-beta-c"; + src = fetchFromGitHub { + name = "${pname}-source"; owner = "jsoftware"; repo = "jsource"; - rev = "j${version}-${jtype}"; - sha256 = "0j67vgikqflwjqacsdicasvyv1k54s2c8vjgwmf0ix7l41p4xqz0"; - name = "jsource"; + rev = "j${version}"; + hash = "sha256-MzEO/saHEBl1JwVlFC6P2UKm9RZnV7KVrNd9h4cPV/w="; }; - buildInputs = [ readline libedit bc ]; - bits = if stdenv.is64bit then "64" else "32"; - platform = - if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" else - if stdenv.isLinux then "linux" else - if stdenv.isDarwin then "darwin" else - "unknown"; - variant = if stdenv.isx86_64 && avxSupport then "avx" else ""; - - j64x="j${bits}${variant}"; - - doCheck = true; - - # Causes build failure due to warning - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - - # Causes build failure due to warning - # https://github.com/jsoftware/jsource/issues/16 - NIX_CFLAGS_COMPILE = "-Wno-error=return-local-addr"; + buildInputs = [ + readline + libedit + bc + ]; + + dontConfigure = true; + + # emulating build_all.sh configuration variables + jplatform = + if stdenv.isDarwin then "darwin" + else if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" + else if stdenv.isLinux then "linux" + else "unsupported"; + + j64x = + if stdenv.is32bit then "j32" + else if stdenv.isx86_64 then + if (stdenv.isLinux && avxSupport) then "j64avx" else "j64" + else if stdenv.isAarch64 then + if stdenv.isDarwin then "j64arm" else "j64" + else "unsupported"; buildPhase = '' - export SOURCE_DIR=$(pwd) - export HOME=$TMPDIR - export JLIB=$SOURCE_DIR/jlibrary + runHook preBuild - echo $OUT_DIR + export SRCDIR=$(pwd) + export HOME=$TMPDIR + export JLIB=$SRCDIR/jlibrary + export CC=cc cd make2 patchShebangs . - sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;" - j64x="${j64x}" ./build_all.sh + j64x="${j64x}" jplatform="${jplatform}" ./build_all.sh - cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin" + cp -v $SRCDIR/bin/${jplatform}/${j64x}/* "$JLIB/bin" + + runHook postBuild ''; + doCheck = true; + checkPhase = '' + runHook preCheck - echo 'i. 5' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4" + echo "Smoke test" + echo 'i. 10' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4 5 6 7 8 9" # Now run the real tests - cd $SOURCE_DIR/test + pushd $SRCDIR/test for f in *.ijs do - echo $f + echo -n "test $f: " $JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS done + popd + + runHook postCheck ''; installPhase = '' - mkdir -p "$out" + runHook preInstall - mkdir -p "$out/share/j" + mkdir -p "$out/share/j/" cp -r $JLIB/{addons,system} "$out/share/j" cp -r $JLIB/bin "$out" + + runHook postInstall ''; meta = with lib; { + homepage = "http://jsoftware.com/"; description = "J programming language, an ASCII-based APL successor"; - maintainers = with maintainers; [ raskin synthetica ]; - platforms = with platforms; linux ++ darwin; + longDescription = '' + J is a high-level, general-purpose programming language that is + particularly suited to the mathematical, statistical, and logical analysis + of data. It is a powerful tool for developing algorithms and exploring + problems that are not already well understood. + ''; license = licenses.gpl3Plus; - homepage = "http://jsoftware.com/"; + maintainers = with maintainers; [ raskin synthetica AndersonTorres ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 1ce2b1525f0..0112748695e 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -22,6 +22,7 @@ , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , wayland , wayland-protocols +, wayland-scanner , drmSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , libdrm , mesa @@ -76,9 +77,18 @@ stdenv.mkDerivation rec { ./find-headers.patch ]; + postPatch = '' + # Fix running wayland-scanner for the build platform when cross-compiling. + # See comment here: https://github.com/libsdl-org/SDL/issues/4860#issuecomment-1119003545 + substituteInPlace configure \ + --replace '$(WAYLAND_SCANNER)' 'wayland-scanner' + ''; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; + nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 08e6e5b0e41..ce3352b5751 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,36 +1,49 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib -, fixDarwinDylibNames, gobject-introspection, gnome +{ stdenv +, lib +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, glib +, fixDarwinDylibNames +, gobject-introspection +, gnome }: -let +stdenv.mkDerivation rec { pname = "atk"; - version = "2.36.0"; -in + version = "2.38.0"; -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY="; }; - outputs = [ "out" "dev" ]; + patches = [ + # meson builds an incorrect .pc file + # glib should be Requires not Requires.private + ./fix_pc.patch + ]; - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + glib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; propagatedBuildInputs = [ # Required by atk.pc glib ]; - patches = [ - # meson builds an incorrect .pc file - # glib should be Requires not Requires.private - ./fix_pc.patch - ]; - mesonFlags = [ "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; @@ -55,7 +68,7 @@ stdenv.mkDerivation rec { control running applications. ''; - homepage = "http://library.gnome.org/devel/atk/"; + homepage = "https://gitlab.gnome.org/GNOME/atk"; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/development/libraries/console-bridge/default.nix index e2370ecce64..5c85bbd4a19 100644 --- a/pkgs/development/libraries/console-bridge/default.nix +++ b/pkgs/development/libraries/console-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "console-bridge"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ros"; repo = "console_bridge"; rev = version; - sha256 = "18qycrjnf7v8n5bipij91jsv7ap98z5dsp93w2gz9rah4lfjb80q"; + sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM="; }; nativeBuildInputs = [ cmake validatePkgConfig ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 6e3a6ed5b30..e7852949249 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -8,42 +8,26 @@ , systemd , audit , libapparmor -, libX11 ? null -, libICE ? null -, libSM ? null -, x11Support ? (stdenv.isLinux || stdenv.isDarwin) , dbus , docbook_xml_dtd_44 , docbook-xsl-nons , xmlto , autoreconfHook , autoconf-archive +, x11Support ? (stdenv.isLinux || stdenv.isDarwin) +, xorg }: stdenv.mkDerivation rec { pname = "dbus"; - version = "1.12.20"; + version = "1.14.0"; src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp"; + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; + sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q="; }; patches = [ - # 'generate.consistent.ids=1' ensures reproducible docs, for further details see - # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html - # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189, - # expected in version 1.14 - ./docs-reproducible-ids.patch - # AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems - # to provide valid pkg-config files. This replace AC_PATH_XTRA with - # PKG_CHECK_MODULES. - # MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f - (fetchpatch { - url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch"; - sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2"; - }) - # Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS. # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302 (fetchpatch { @@ -68,6 +52,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "doc" "man" ]; + strictDeps = true; nativeBuildInputs = [ autoreconfHook autoconf-archive @@ -82,11 +67,11 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optionals x11Support [ + lib.optionals x11Support (with xorg; [ libX11 libICE libSM - ] ++ lib.optional enableSystemd systemd + ]) ++ lib.optional enableSystemd systemd ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; # ToDo: optional selinux? @@ -104,7 +89,8 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ]; + ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] + ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemd}/bin/systemctl" ]; NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; diff --git a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch b/pkgs/development/libraries/dbus/docs-reproducible-ids.patch deleted file mode 100644 index 2356b64d95c..00000000000 --- a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in ---- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200 -+++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100 -@@ -870,8 +870,10 @@ - .PRECIOUS: Makefile - - -+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see -+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html - @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml --@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $< -+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $< - - @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml - @DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $< diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 3549368fecb..3dae39b3c38 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "fribidi"; - version = "1.0.11"; + version = "1.0.12"; outputs = [ "out" "devdoc" ]; # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MPk+nGPuYn0aLO3PWaw01FvzAkCYL5nkTG4BVGa05z0="; + sha256 = "sha256-DNIz+X/IxnuzrCfOhEDe9dP/rPUWdluRwsxlRJgpNJU="; }; postPatch = '' diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 22acc73c49c..a1270af259c 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz }: +{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -47,12 +47,14 @@ stdenv.mkDerivation rec { sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in ''; + strictDeps = true; nativeBuildInputs = [ xz xz.bin ]; + buildInputs = [ bash ] # HACK, see #10874 (and 14664) - buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; + ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ libiconv ]; setupHooks = [ ../../../build-support/setup-hooks/role.bash diff --git a/pkgs/development/libraries/glibc/2.34-master.patch.gz b/pkgs/development/libraries/glibc/2.34-master.patch.gz index 8fb02ca6d72..b7aa7518c37 100644 Binary files a/pkgs/development/libraries/glibc/2.34-master.patch.gz and b/pkgs/development/libraries/glibc/2.34-master.patch.gz differ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index bf77f6abaa3..91c3d55926a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.34"; - patchSuffix = "-115"; + patchSuffix = "-210"; sha256 = "sha256-RNJqH+ILiFOkj0cOrQHkJ56GmsFJsZXdpORKGV2YGrI="; in @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.34/master && git describe - glibc-2.34-115-gd5d1c95aaf + glibc-2.34-210-ge123f08ad5 $ git show --minimal --reverse glibc-2.34.. | gzip -9n --rsyncable - > 2.34-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index a6942445fc5..599e6586ea0 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -5,7 +5,6 @@ , meson , ninja , gettext -, gobject-introspection , python3 , gstreamer , orc @@ -37,6 +36,8 @@ , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia , glib +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +, gobject-introspection }: stdenv.mkDerivation rec { @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { sha256 = "0162ly7pscymq6bsf1d5fva2k9s16zvfwyi1q6z4yfd97d0sdn4n"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja @@ -58,10 +60,11 @@ stdenv.mkDerivation rec { gettext orc glib - gobject-introspection - + gstreamer # docs # TODO add hotdoc here + ] ++ lib.optionals withIntrospection [ + gobject-introspection ] ++ lib.optional enableWayland wayland; buildInputs = [ @@ -88,6 +91,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableWayland [ wayland wayland-protocols + ] ++ lib.optionals withIntrospection [ + gobject-introspection ] ++ lib.optional enableCocoa Cocoa ++ lib.optional enableCdparanoia cdparanoia; @@ -101,8 +106,8 @@ stdenv.mkDerivation rec { "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" "-Dtests=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index dcb4fcaef93..c5f836f26a4 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -4,7 +4,6 @@ , ninja , pkg-config , gettext -, gobject-introspection , bison , flex , python3 @@ -17,6 +16,8 @@ , bash-completion , lib , CoreServices +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +, gobject-introspection }: stdenv.mkDerivation rec { @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { sha256 = "0cghi6n4nhdbajz3wqcgbh5xm94myvnqgsi9g2bz9n1s9904l2fy"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja @@ -47,11 +49,14 @@ stdenv.mkDerivation rec { python3 makeWrapper glib - gobject-introspection bash-completion # documentation # TODO add hotdoc here + ] ++ lib.optionals stdenv.isLinux [ + libcap # for setcap binary + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ @@ -60,6 +65,8 @@ stdenv.mkDerivation rec { libcap libunwind elfutils + ] ++ lib.optionals withIntrospection [ + gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -72,8 +79,7 @@ stdenv.mkDerivation rec { "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index aff5b1ea3c1..146262a4258 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; patches = [ ./build-shared.patch + ] ++ lib.optionals stdenv.isAarch32 [ # https://github.com/nodejs/http-parser/pull/510 (fetchpatch { url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch"; diff --git a/pkgs/development/libraries/icu/59.nix b/pkgs/development/libraries/icu/59.nix deleted file mode 100644 index 9ca66ca525f..00000000000 --- a/pkgs/development/libraries/icu/59.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "59.1"; - sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; -} diff --git a/pkgs/development/libraries/icu/65.nix b/pkgs/development/libraries/icu/65.nix deleted file mode 100644 index c5074eea114..00000000000 --- a/pkgs/development/libraries/icu/65.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "65.1"; - sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk"; -} diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index e1251b0e942..bbb11522dee 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -19,11 +19,11 @@ in with lib; stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.19.2"; + version = "1.19.3"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h"; + sha256 = "1l6wp58zav37g03n2ig5qr0pslz38gh5cxgigbmxkjfxrxilil2n"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 8c8e47b98a4..b8f6aac0b38 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libbsd"; - version = "0.11.5"; + version = "0.11.6"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-GpyVJSVjXBu2dwyyLpabk42Oap15EjYrmO6DcFmbDv0="; + sha256 = "sha256-GbOPMXLq9pPm4caHFGNhkMfkiFHkUiTXILO1vASZtd8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index c634892944c..3f6e12291a3 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages, spirv-llvm-translator }: let llvm = llvmPackages.llvm; @@ -7,13 +7,13 @@ in stdenv.mkDerivation rec { pname = "libclc"; - version = "11.0.1"; + version = "12.0.1"; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = "llvmorg-${version}"; - sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags"; + sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv"; }; sourceRoot = "source/libclc"; @@ -21,10 +21,12 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' + 'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' ''; - nativeBuildInputs = [ cmake ninja python3 ]; + nativeBuildInputs = [ cmake ninja python3 spirv-llvm-translator ]; buildInputs = [ llvm clang-unwrapped ]; strictDeps = true; cmakeFlags = [ diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 77c595c9184..02c02b607e5 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -13,7 +13,7 @@ , python3 , tzdata , fixDarwinDylibNames -, introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection , vala }: @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-gZ6IBjG5pNKJ+hWcTzXMP7yxL4he4LTklZGoC9vXra8="; }; + strictDeps = true; nativeBuildInputs = [ cmake ninja @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # provides ical-glib-src-generator that runs during build libical - ] ++ lib.optionals introspectionSupport [ + ] ++ lib.optionals withIntrospection [ gobject-introspection vala ] ++ lib.optionals stdenv.isDarwin [ @@ -60,13 +61,14 @@ stdenv.mkDerivation rec { glib libxml2 icu + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; cmakeFlags = [ "-DENABLE_GTK_DOC=False" - ] ++ lib.optionals introspectionSupport [ - "-DGOBJECT_INTROSPECTION=True" - "-DICAL_GLIB_VAPI=True" + "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}" + "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" ]; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix deleted file mode 100644 index fbe01bf4062..00000000000 --- a/pkgs/development/libraries/libnih/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, dbus, expat }: - -let version = "1.0.3"; in - -stdenv.mkDerivation { - pname = "libnih"; - inherit version; - - src = fetchurl { - url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; - sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus expat ]; - - doCheck = false; # fails 1 of 17 test - - meta = { - description = "A small library for C application development"; - homepage = "https://launchpad.net/libnih"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index de3f2141c2e..5cf79781a7d 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.7.11"; + version = "0.7.12"; outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3VaC7GgiAznhHFFZt+ASIEoxjdGzaDoJxILKQhqwc3U="; + sha256 = "dEsrN1CBNfgmG3Vanevm4JrdQhrcdb3pMPbhmLcKtG4="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 26a89fe47a4..a0506dda1f6 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,6 +7,7 @@ # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform +, removeReferencesTo }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -112,7 +113,11 @@ let # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. - ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared"; + ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared" + # This introduces a reference to the CTLOG_FILE which is undesired when + # trying to build binaries statically. + ++ lib.optional static "no-ct" + ; makeFlags = [ "MANDIR=$(man)/share/man" @@ -126,13 +131,16 @@ let enableParallelBuilding = true; postInstall = - lib.optionalString (!static) '' + (if static then '' + # OPENSSLDIR has a reference to self + ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a + '' else '' # If we're building dynamic libraries, then don't install static # libraries. if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then rm "$out/lib/"*.a fi - '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + '') + lib.optionalString (!stdenv.hostPlatform.isWindows) # Fix bin/c_rehash's perl interpreter line # # - openssl 1_0_2: embeds a reference to buildPackages.perl diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ee79d537059..13dd24b5482 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.6"; + version = "1.50.7"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qZi882iBw6wgSV1AvOswT06qkXW9KWfIVlZDTL2v6Go="; + sha256 = "BHfzaaPUxpXfcpmmmJ3ABHVqf03ifuysQFxnkLfjrTM="; }; strictDeps = !withIntrospection; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index ee99ab5de6f..c4aab614915 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; pname = "podofo"; src = fetchurl { url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; - sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw"; + sha256 = "sha256-XeYH4V8ZK4rZBzgwB1nYjeoPXM3OO/AASKDJMrxkUVQ="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix index 9b18b25c726..938d16d3776 100644 --- a/pkgs/development/libraries/prometheus-client-c/default.nix +++ b/pkgs/development/libraries/prometheus-client-c/default.nix @@ -43,6 +43,13 @@ let ) ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: CMakeFiles/prom.dir/src/prom_process_stat.c.o:(.bss+0x0): multiple definition of + # `prom_process_start_time_seconds'; CMakeFiles/prom.dir/src/prom_collector.c.o:(.bss+0x0): first defined here + # Should be fixed in 1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25 + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' cd ${subdir} ''; diff --git a/pkgs/development/libraries/qtmpris/default.nix b/pkgs/development/libraries/qtmpris/default.nix new file mode 100644 index 00000000000..ef595efa731 --- /dev/null +++ b/pkgs/development/libraries/qtmpris/default.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +}: + +mkDerivation rec { + pname = "qtmpris"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "sailfishos"; + repo = "qtmpris"; + rev = version; + hash = "sha256-kuM8hUdsa7N+eLDbwYw3ay+PWxg35zcTBOvGow1NlzI="; + }; + + postPatch = '' + substituteInPlace src/src.pro \ + --replace '$$[QT_INSTALL_LIBS]' "$out/lib" \ + --replace '$$[QT_INSTALL_HEADERS]' "$out/include" \ + --replace '$$[QMAKE_MKSPECS]' "$out/mkspecs" + ''; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + ]; + + meta = { + description = "Qt and QML MPRIS interface and adaptor"; + homepage = "https://github.com/sailfishos/qtmpris"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix index 063fead1165..ae5beb0f09e 100644 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lrs"; - version = "7.0"; + version = "7.2"; src = fetchurl { - url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz"; - sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9"; + url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-072.tar.gz"; + sha256 = "1w1jsnfgny8cihndr5gfm99pvwp48qsvxkqfsi2q87gd3m57aj7w"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 726ccff02bb..7677406874a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.38.3"; + version = "3.38.5"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-YfLdk6LjjDNGi3EllnwyGL+fTdg2Xe9gJeMU+QXclC4="; + sha256 = "sha256-WvB96YK6ZY/ZGgMXDJRfmclx9pVbx53zJmVENz45hpw="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index d112515c8e9..b804fcbfd65 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.38.3"; + version = "3.38.5"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-oQTUk+CEAGvXT/H/esLrKzh8fAo7Y7pv6i+vtBGDE68="; + sha256 = "sha256-ZQO7WeOeyGYwg2lpQOyBjNVVUZbmylQ9QClEDMp7ANk="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 95373934a47..b027c95a7e4 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, meson +, ninja , pkg-config , libxslt -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , dbus , glib @@ -10,17 +13,19 @@ stdenv.mkDerivation rec { pname = "xdg-dbus-proxy"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s="; + sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs="; }; nativeBuildInputs = [ + meson + ninja pkg-config libxslt - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 ]; @@ -32,10 +37,6 @@ stdenv.mkDerivation rec { dbus ]; - configureFlags = [ - "--enable-man" - ]; - # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index a3fb9722965..7e3fe5f483e 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,12 +1,22 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, ocaml, buildDunePackage }: + +let params = + if lib.versionAtLeast ocaml.version "4.08" then { + version = "1.3.3"; + sha256 = "sha256:05n4mm1yz33h9gw811ivjw7x4m26lpmf7kns9lza4v6227lwmz7a"; + } else { + version = "1.3.2"; + sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l"; + }; +in buildDunePackage rec { pname = "easy-format"; - version = "1.3.2"; + inherit (params) version; src = fetchurl { url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz"; - sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l"; + inherit (params) sha256; }; doCheck = true; diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix deleted file mode 100644 index 3143a800768..00000000000 --- a/pkgs/development/python-modules/Babel/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }: - -buildPythonPackage rec { - pname = "Babel"; - version = "2.9.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"; - }; - - propagatedBuildInputs = [ pytz ]; - - checkInputs = [ pytestCheckHook freezegun ]; - - doCheck = !stdenv.isDarwin; - - meta = with lib; { - homepage = "http://babel.edgewall.org"; - description = "A collection of tools for internationalizing Python applications"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index d7b350b9f96..5eca80d98a5 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -8,7 +8,7 @@ , markupsafe # extras: Babel -, Babel +, babel # tests , mock @@ -32,7 +32,7 @@ buildPythonPackage rec { passthru.extras-require = { babel = [ - Babel + babel ]; }; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index c95283acda5..b15f07bfcae 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -1,6 +1,6 @@ { lib , aiohttp -, Babel +, babel , blinker , buildPythonPackage , python-dateutil @@ -51,7 +51,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - Babel + babel blinker python-dateutil docutils diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix deleted file mode 100644 index af125e1f40e..00000000000 --- a/pkgs/development/python-modules/Pygments/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, docutils -}: - -buildPythonPackage rec { - pname = "Pygments"; - version = "2.11.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"; - }; - - propagatedBuildInputs = [ docutils ]; - - # Circular dependency with sphinx - doCheck = false; - pythonImportsCheck = [ "pygments" ]; - - meta = { - homepage = "https://pygments.org/"; - description = "A generic syntax highlighter"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 04266bc3d88..29f58063648 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -1,5 +1,5 @@ { lib -, Babel +, babel , buildPythonPackage , cssselect , fetchFromGitHub @@ -32,7 +32,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - Babel + babel isodate leather parsedatetime diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 88ce74ad4cd..5440359af72 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.0.3"; + version = "2.0.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oRV+QFneQYefP2XV7WK/ND/lvUUoYQHi0pcf/lfjqKU="; + sha256 = "sha256-PV+yHB/waehKxfwX9sjSJhwqeymZhr6BDTOd/HfBKKk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 948fae7893b..c753458fb7e 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -243,5 +243,7 @@ buildPythonPackage rec { homepage = "https://airflow.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ bhipple costrouc ingenieroariel ]; + # requires extremely outdated versions of multiple dependencies + broken = true; }; } diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 5bccffea292..cf532aedd24 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,5 +1,5 @@ { lib -, Babel +, babel , buildPythonPackage , click , cryptography @@ -31,7 +31,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - Babel + babel installShellFiles ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 260a40e9de8..bae168e26dd 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder , aiodns , aiohttp , flask @@ -15,16 +15,26 @@ }: buildPythonPackage rec { - version = "1.23.1"; + version = "1.24.0"; pname = "azure-core"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-KKAd+68KaBLE4qgtFkLqMJVqlznyW8d8myO5H06mjw8="; + sha256 = "sha256-NFsbBB+q19AgWyDVaX8dDfNEMC56qoUBkFWA/4e9C+U="; }; + patches = [ + # FIXME: fixes tests with new versions of flask/werkzeug + # upstream PR: https://github.com/Azure/azure-sdk-for-python/pull/24450 + (fetchpatch { + url = "https://github.com/Azure/azure-sdk-for-python/commit/fb20b0b985f614bb7bcd84f3f5f6f3105de25fd9.patch"; + stripLen = 3; + sha256 = "sha256-Gt5T/UkQT1yml8bqYbeUpimfOPlmzpN1KKKUnbU9xJw="; + }) + ]; + propagatedBuildInputs = [ requests six diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index f2426586d6a..d5fe92f320b 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "4.2.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-At0BP9mWJneG65FDZuQXTnikaNcEWe+GtTr9ZPri89M="; + hash = "sha256-BciA3sFyja5xo9yS3WVglC73y8gTfw8UejdEzbD4HYE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 9bafac41ef3..84114684476 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.9.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZRiqnxPRdSOqyRMwuvxqKiZcxMbhVEYJ09CIlepc/B4="; + sha256 = "sha256-7uq8uRZ3MXI1Gy+DmMkRVNV7uZPw6j8r9KfhS8d+tCY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix new file mode 100644 index 00000000000..14633062f36 --- /dev/null +++ b/pkgs/development/python-modules/babel/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }: + +buildPythonPackage rec { + pname = "babel"; + version = "2.10.1"; + + src = fetchPypi { + pname = "Babel"; + inherit version; + sha256 = "sha256-mK6soIYTPvs+HiqtA5aYdJDIQlkp3bz+BVAYT9xUzRM="; + }; + + propagatedBuildInputs = [ pytz ]; + + checkInputs = [ pytestCheckHook freezegun ]; + + doCheck = !stdenv.isDarwin; + + meta = with lib; { + homepage = "https://babel.pocoo.org/"; + description = "Collection of internationalizing tools"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index b1516d1abdb..bd6baccbde4 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -2,7 +2,7 @@ , isPy3k , buildPythonPackage , fetchPypi -, Babel +, babel }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - Babel + babel ]; # SyntaxError: Non-ASCII character '\xc3' in file /build/BabelGladeExtractor-0.6.3/babelglade/tests/test_translate.py on line 20, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 8d5c2d7d4c2..56773e372b4 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.39"; + version = "0.3.40"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JMQ2sLgAnMJ1/0nR8LgKbpPB43gVKtCtrZKr/T4p0O8="; + hash = "sha256-4we2Txk7kJ1SrCa82eQJ9OsqyTkFzocNi+GG7cV+OAc="; }; # Nose is required during build process, so can not use `checkInputs`. diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index ace2e2166d7..fa2880fb055 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.2.0"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-NnTn4m9we40Ww2abP7mbz1CtdypZyN2GYBvj8zxhOpI="; + hash = "sha256-PT6XaKz3QFAEhCmS7jXKK7xxscNlpbhGpCKQIRuSt6U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index d074183e79d..bee126fbf16 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -21,10 +21,11 @@ buildPythonPackage rec { owner = "ionrock"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mgvL0q10UbPHY1H3tJprke5p8qNl3HNYoeLAERZTcTs="; + hash = "sha256-mgvL0q10UbPHY1H3tJprke5p8qNl3HNYoeLAERZTcTs="; }; propagatedBuildInputs = [ + lockfile msgpack requests ]; @@ -32,7 +33,6 @@ buildPythonPackage rec { checkInputs = [ cherrypy mock - lockfile pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 9c0620c8740..5a5c001c135 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; - rev = version; - sha256 = "sha256-1msDiNYxaETJfVBTaMuNJbSxhOpyRdHkb5CQ+1+ZbbQ="; + rev = "refs/tags/${version}"; + sha256 = "sha256-/378xNkBZHoTJ9Qs8RTYi+QosLs7GBgMOkIDYOaSH1Y="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index a75f563862a..81bcf03130e 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -5,23 +5,21 @@ , importlib-metadata , pytestCheckHook -# large-rebuild downstream dependencies +# large-rebuild downstream dependencies and applications , flask , black - -# applications , magic-wormhole , mitmproxy }: buildPythonPackage rec { pname = "click"; - version = "8.1.2"; + version = "8.1.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R5cH/hTZ7JoHV2GLehAKCuTE4jb6xbf4DKaAKBQaGnI="; + sha256 = "sha256-doLcivswKXABZ0V16gDRgU2AjWo2r0Fagr1IHTe6e44="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 73609966ba8..033af1fb5d9 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QURm/ehJovqr/ZRE7ILKLnvxQsAdcjdSTPlzCt60IBw="; + sha256 = "sha256-bWdkJkPR3bLyr1m0Zrh9QsSi42eDGte0PDO1nu+ltQ4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/delorean/default.nix b/pkgs/development/python-modules/delorean/default.nix index 3435b461d09..847a5c6e5ad 100644 --- a/pkgs/development/python-modules/delorean/default.nix +++ b/pkgs/development/python-modules/delorean/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, Babel +, babel , humanize , python-dateutil , tzlocal @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0d31ay7yq2w7xz7m3ssk5phjbm64b2k8hmgcif22719k29p7hrzy"; }; - propagatedBuildInputs = [ Babel humanize python-dateutil tzlocal ]; + propagatedBuildInputs = [ babel humanize python-dateutil tzlocal ]; pythonImportsCheck = [ "delorean" ]; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 131be8781b3..f8de884a24f 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, django, pytz, isPy27 }: buildPythonPackage rec { version = "3.12.4"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # Test settings are missing doCheck = false; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django pytz ]; meta = with lib; { description = "Web APIs for Django, made easy"; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index e86013605e7..a9781b3aea1 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-0q+qFrfMsXkwgu08igt2kHZ9c3/aqz/inCpJXkPZsdg="; + sha256 = "sha256-3l5bELb5f/cvh4gF2kJZEX6kAK9achTerIIplMuesTk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 602564d1626..a538327650b 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -3,7 +3,7 @@ , python , fetchPypi , flask -, Babel +, babel , jinja2 , pytz , speaklater @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask - Babel + babel jinja2 pytz speaklater diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix index cdcb400983b..4a7294540e1 100644 --- a/pkgs/development/python-modules/flask-babelex/default.nix +++ b/pkgs/development/python-modules/flask-babelex/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , flask -, Babel +, babel , speaklater , jinja2 , pytest @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask - Babel + babel speaklater jinja2 ]; diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 70a6b6e1d6b..789060ed2b5 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -3,7 +3,7 @@ , fetchPypi # extras: babel -, Babel +, babel , flask-babel # extras: common @@ -65,7 +65,7 @@ buildPythonPackage rec { passthru.extras-require = { babel = [ - Babel + babel flask-babel ]; common = [ diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 997a28de1e9..e4ded57576e 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "2.1.1"; + version = "2.1.2"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qMm9PlWOyZZG0Xepc5xB3x3tBilIC0yNKXVBLzyVGcg="; + sha256 = "sha256-MV3tLd+KYoFWftsnOTAQ/jQGGIuvv+ZaMznVeH2J5Hc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index d15950bba9a..a0e42e60c2e 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -4,7 +4,7 @@ , flask , jinja2 , speaklater -, Babel +, babel , pytz }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; }; - propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ]; + propagatedBuildInputs = [ flask jinja2 speaklater babel pytz ]; meta = with lib; { description = "Adds i18n/l10n support to Flask applications"; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index fb84371e203..7ff15774889 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -7,6 +7,8 @@ , numpy , aiohttp , pytest-vcr +, pytest-mock +, pytest-asyncio , requests , paramiko , smbprotocol @@ -14,14 +16,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2022.01.0"; + version = "2022.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-iPe2q9hY3ZRIKQGpxrHda3t9G0AtbtohVcWdnAzlzCo="; + sha256 = "sha256-jTF8R0kaHMsCYg+7YFi21Homn63K+ulp9NDZC/jkIXM="; }; propagatedBuildInputs = [ @@ -34,6 +36,8 @@ buildPythonPackage rec { checkInputs = [ numpy pytest-vcr + pytest-mock + pytest-asyncio pytestCheckHook ]; @@ -59,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/intake/filesystem_spec"; description = "A specification that Python filesystems should adhere to"; + changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix new file mode 100644 index 00000000000..f20f5dde8b4 --- /dev/null +++ b/pkgs/development/python-modules/func-timeout/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "func-timeout"; + version = "4.3.5"; + + src = fetchPypi { + pname = "func_timeout"; + inherit version; + sha256 = "74cd3c428ec94f4edfba81f9b2f14904846d5ffccc27c92433b8b5939b5575dd"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "func_timeout" ]; + + meta = with lib; { + description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads"; + homepage = "https://github.com/kata198/func_timeout"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index 500d157427d..a1bec8f3a1f 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.5"; + version = "0.2.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cFOTbPv7CnRdet7bx5LVq5xp9LG4yNm0oxlW5aSEeZs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index 5078c6fdb39..ccaf7b6f038 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -3,7 +3,7 @@ , callPackage , pythonOlder , fetchFromGitHub -, Babel +, babel , gruut-ipa , dateparser , jsonlines @@ -54,7 +54,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - Babel + babel gruut-ipa jsonlines num2words diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 1a95d20cff7..6385b32a48c 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,7 +21,7 @@ let pname = "hatchling"; - version = "0.24.0"; + version = "0.25.0"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-zmdl9bW688tX0vgBlsUOIB43KMrNlTU/XJtPA9/fTrk="; + hash = "sha256-k/bjZvGaOjZshVr6w3Jb7XaC1dAOlIaraFQKCth2ZII="; }; # listed in backend/src/hatchling/ouroboros.py diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 71aad2650f3..045910d8a1a 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.7"; + version = "3.5.8"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "abdullahselek"; repo = "HerePy"; - rev = version; - hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo="; + rev = "refs/tags/${version}"; + hash = "sha256-BwuH3GxEXiIFFM0na8Jhgp7J5TPW41/u89LWf+EprG4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 5092175b50c..459ebe5ad51 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -5,7 +5,7 @@ , fetchPypi , alembic , aniso8601 -, Babel +, babel , blinker , cachetools , click @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aniso8601 - Babel + babel blinker cachetools click diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 226fea5b621..d17a4a85c3b 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.9.0"; + version = "0.9.1"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "sha256-HpO3T/zRbimxd1+nUkbSmclj7nPsMYuSUK0VJItZQs4="; + sha256 = "sha256-NQW0ctQSF4/RFeJVdk0efnYy1sgunebWKyVDijU3RoA="; }; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 29b08df8e0f..8f9113c98de 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -3,24 +3,24 @@ , buildPythonPackage , pythonOlder , fetchPypi -, Babel +, babel , markupsafe , pytestCheckHook }: buildPythonPackage rec { pname = "Jinja2"; - version = "3.1.1"; + version = "3.1.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZAvtS7UBy9FxlLPKzh3CEm9bYZzwaKcmuYGSoP3nSuk="; + sha256 = "sha256-MTUacCpAip51laj8YVD8P0O7a/fjGXcMvA2535Q36FI="; }; propagatedBuildInputs = [ - Babel + babel markupsafe ]; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index dd2a47f1bcb..202e047dd8e 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -4,9 +4,7 @@ , fetchPypi , importlib-metadata , importlib-resources -, pyperf , pyrsistent -, pytestCheckHook , pythonOlder , setuptools-scm , twisted @@ -15,16 +13,20 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.4.0"; + version = "4.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83"; + sha256 = "sha256-fG2IJhk0DDNHob9zFeFH5tPa5DkDOuY4PWrLkIwQHfw="; }; + postPatch = '' + patchShebangs json/bin/jsonschema_suite + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -42,18 +44,21 @@ buildPythonPackage rec { ]; checkInputs = [ - pyperf - pytestCheckHook twisted ]; + checkPhase = '' + export JSON_SCHEMA_TEST_SUITE=json + trial jsonschema + ''; + pythonImportsCheck = [ "jsonschema" ]; meta = with lib; { description = "An implementation of JSON Schema validation for Python"; - homepage = "https://github.com/Julian/jsonschema"; + homepage = "https://github.com/python-jsonschema/jsonschema"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index e612cfaeab0..3fde727d148 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -6,7 +6,7 @@ , requests , pytestCheckHook , pyjson5 -, Babel +, babel , jupyter_server , openapi-core , pytest-tornasync @@ -32,7 +32,7 @@ buildPythonPackage rec { rm -r tests/translations/ ''; - propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ]; + propagatedBuildInputs = [ requests jsonschema pyjson5 babel jupyter_server ]; checkInputs = [ openapi-core diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 6dd55a4876f..76289816a2a 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, Babel +, babel , pytz , nine , pytestCheckHook @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f0d6dfa27eb2b6c0d2a28ae21d69dceb5363cc0432f4045bcc98aac42a662ccb"; }; - propagatedBuildInputs = [ Babel pytz nine ]; + propagatedBuildInputs = [ babel pytz nine ]; checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 600304f48a1..4688b7394cc 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -1,5 +1,5 @@ { lib -, Babel +, babel , buildPythonPackage , click , exifread @@ -40,7 +40,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - Babel + babel click exifread filetype diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 35331c14b08..fd148382617 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, - mistune, docutils } : +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, mistune +, pygments +}: + buildPythonPackage rec { pname = "m2r"; version = "0.2.1"; @@ -9,16 +15,19 @@ buildPythonPackage rec { sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; }; + postPatch = '' + substituteInPlace tests/test_cli.py \ + --replace "optional" "positional" + ''; + propagatedBuildInputs = [ mistune docutils ]; - # Some tests interfeere with each other (test.md and test.rst are - # deleted by some tests and not properly regenerated) - doCheck = false; + checkInputs = [ pygments ]; meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; - description = "converts a markdown file including reST markups to a valid reST format"; + description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 2c91e46d13d..7207edb5815 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.3.6"; + version = "3.3.7"; disabled = pythonOlder "3.6"; + format = "setuptools"; + src = fetchPypi { pname = "Markdown"; inherit version; - sha256 = "sha256-dt+K4yKU7Dnc+JNAOCiC36Epdfh/RcPtHs2x6M78cAY="; + sha256 = "cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ @@ -29,6 +31,8 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; + pythonImportsCheck = [ "markdown" ]; + meta = with lib; { description = "A Python implementation of John Gruber's Markdown with Extension support"; homepage = "https://github.com/Python-Markdown/markdown"; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index a0df1000892..feed177a9af 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.2.11"; + version = "8.2.15"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg="; + hash = "sha256-6x3ENFPGmtRDMV6YRGlTLCYusmX49LrGBDwicg8sDB0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 13604bc975a..2345ca93f94 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -16,7 +16,7 @@ , pyyaml-env-tag , watchdog # testing deps -, Babel +, babel , mock , pytestCheckHook }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - Babel + babel mock ]; diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index e1699292944..3b63b02986a 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.23.0"; + version = "4.26.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "9274bc8298b2d4b69cb3936bdcda315b50e45975789f519a237bdec58346b8d7"; + sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 312170ee36c..f1af4662a9d 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.16.3"; + version = "2.17.0"; src = fetchPypi { inherit pname version; - sha256 = "95890627001efb2cb8d17418730cdc1bdd64b8dbb9862b01a8e0359d79fe863e"; + sha256 = "sha256-G42ak4w4OAbE2RTe3STN03A43/rZqJBbB8rBm0TlOWU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 5188ce63795..38173eb4fe0 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -59,16 +59,6 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/39687 hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = lib.optionalString stdenv.isDarwin '' - cpp_sdk="${lib.getDev libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - ''; - doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture # don't max out build cores, it breaks tests diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index c871a7bccb8..b3ac256e0bb 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.26.1"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zNK2/hkK3ddMCTpivgcwuemfPqA6oO96uV7Rt/9p0lc="; + sha256 = "sha256-Q1E949TjeOc6xEKpOQa6qdNWJFqmeqf2FgXFbjmn9ZE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix new file mode 100644 index 00000000000..5e4412dcf85 --- /dev/null +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pip +, pretend +, pytestCheckHook +, pythonOlder +, virtualenv +}: + +buildPythonPackage rec { + pname = "pip-api"; + version = "0.0.29"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-9wFYTrHD4BAhyEb4nWKauTc7ZiTwYmdXd0rVT8TClXE="; + }; + + propagatedBuildInputs = [ + pip + ]; + + checkInputs = [ + pretend + pytestCheckHook + virtualenv + ]; + + pythonImportsCheck = [ + "pip_api" + ]; + + disabledTests = [ + "test_hash" + "test_hash_default_algorithm_is_256" + "test_installed_distributions" + "test_invoke_install" + "test_invoke_uninstall" + "test_isolation" + ]; + + meta = with lib; { + description = "Importable pip API"; + homepage = "https://github.com/di/pip-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 105beaccb9b..6721390d7ab 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -26,12 +26,9 @@ buildPythonPackage rec { sha256 = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8="; }; - patches = [ ./executable.patch ]; - postPatch = '' - rm pkgconfig/pkgconfig.py.orig substituteInPlace pkgconfig/pkgconfig.py \ - --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"' + --replace "pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'" "pkg_config_exe = '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" # those pc files are missing and pkg-config validates that they exist substituteInPlace data/fake-openssl.pc \ @@ -40,8 +37,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedNativeBuildInputs = [ pkg-config ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkgconfig" ]; diff --git a/pkgs/development/python-modules/pkgconfig/executable.patch b/pkgs/development/python-modules/pkgconfig/executable.patch deleted file mode 100644 index 79fca7a44f1..00000000000 --- a/pkgs/development/python-modules/pkgconfig/executable.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit d8e0bac0c0d831510683939ec7a7b5bd72192423 -Author: Frederik Rietdijk -Date: Sat Jan 5 11:38:28 2019 +0100 - - Have a top-level attribute for the executable - -diff --git a/pkgconfig/pkgconfig.py b/pkgconfig/pkgconfig.py -index 3deb97f..e7c5561 100644 ---- a/pkgconfig/pkgconfig.py -+++ b/pkgconfig/pkgconfig.py -@@ -30,6 +30,9 @@ from functools import wraps - from subprocess import call, PIPE, Popen - - -+PKG_CONFIG_EXE = "pkg-config" -+ -+ - def _compare_versions(v1, v2): - """ - Compare two version strings and return -1, 0 or 1 depending on the equality -@@ -65,7 +68,7 @@ def _convert_error(func): - - @_convert_error - def _query(package, *options): -- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config' -+ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE - cmd = '{0} {1} {2}'.format(pkg_config_exe, ' '.join(options), package) - proc = Popen(shlex.split(cmd), stdout=PIPE, stderr=PIPE) - out, err = proc.communicate() -@@ -84,7 +87,7 @@ def exists(package): - - If ``pkg-config`` not on path, raises ``EnvironmentError``. - """ -- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config' -+ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE - cmd = '{0} --exists {1}'.format(pkg_config_exe, package).split() - return call(cmd) == 0 - diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 584d9361fb7..e04b40bc1e4 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -2,17 +2,17 @@ , appdirs , buildPythonPackage , fetchFromGitHub -, platformdirs , pytest-mock , pytestCheckHook , pythonOlder -, setuptools-scm +, hatchling +, hatch-vcs }: buildPythonPackage rec { pname = "platformdirs"; - version = "2.5.1"; - format = "setuptools"; + version = "2.5.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +20,14 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-z6WIwTWLlc/chNRxt3dqqa/IxYj1BBTcQ6OcfliHrvA="; + sha256 = "sha256-c7gGgqOUVYA6wYU4+nQsYYw4Gn+DpMoIq2nP8nEdPcg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools-scm + hatchling + hatch-vcs ]; checkInputs = [ diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index bdc484fd1bb..ff730f834d7 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dLtZSm10OYWLRK4eRo83RczW0zBVAUF0HQXLQbeDJCk="; + hash = "sha256-u4rqkwy5C1+OrHJUsc/9Sy3YyxWlsTv8cbB1bBKh2K4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index 87e0e6613b1..0134b0dc36a 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -1,19 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pretend"; version = "1.0.9"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "alex"; + repo = pname; + rev = "v${version}"; + hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ="; }; - # No tests in archive - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pretend" + ]; meta = with lib; { + description = "Module for stubbing"; homepage = "https://github.com/alex/pretend"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix new file mode 100644 index 00000000000..c8759a2fe05 --- /dev/null +++ b/pkgs/development/python-modules/pygments/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, lxml +, pytestCheckHook +, wcag-contrast-ratio +}: + +let pygments = buildPythonPackage + rec { + pname = "pygments"; + version = "2.12.0"; + + src = fetchPypi { + pname = "Pygments"; + inherit version; + sha256 = "sha256-XrEWEY+WEv8e6JrJZDe7a0no8E2KE7UUuib2ICCOJus="; + }; + + propagatedBuildInputs = [ + docutils + ]; + + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + lxml + pytestCheckHook + wcag-contrast-ratio + ]; + + disabledTestPaths = [ + # 5 lines diff, including one nix store path in 20000+ lines + "tests/examplefiles/bash/ltmain.sh" + ]; + + pythonImportsCheck = [ "pygments" ]; + + passthru.tests = { + check = pygments.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://pygments.org/"; + description = "A generic syntax highlighter"; + license = licenses.bsd2; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + }; +in pygments diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index dec84b4eccf..447d49a9442 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.42.0"; + version = "3.42.1"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "mxJhbjLPx5L53IQdnEcqQaNbhbpn06brQn4wem/kNns="; + sha256 = "HzS192JN415E61p+tCg1MoW9AwBNVRMaX39/qbkPPMk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 94a73fd8211..068c3196952 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch +, hatchling , pytestCheckHook , markdown , pyyaml @@ -38,26 +38,17 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.1"; + version = "9.4"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = version; - sha256 = "sha256-II8Po8144h3wPFrzMbOB/qiCm2HseYrcZkyIZFGT+ek="; + sha256 = "sha256-9oYLDerz6ZcE4QyLO4mFPuHws8oZoXX8LcSV209MFec="; }; - patches = [ - # this patch is needed to allow tests to pass for later versions of the - # markdown dependency - # - # it can be removed after the next pymdown-extensions release - (fetchpatch { - url = "https://github.com/facelessuser/pymdown-extensions/commit/8ee5b5caec8f9373e025f50064585fb9d9b71f86.patch"; - sha256 = "sha256-jTHNcsV0zL0EkSTSj8zCGXXtpUaLnNPldmL+krZj3Gk="; - }) - ]; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ markdown pygments ]; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index fb5abc5c352..3d10fca06c0 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,9 +1,7 @@ { buildPythonPackage , fetchFromGitHub , lib - -# since this is a dependency of pytest, we need to avoid -# circular dependencies +, flit-core , jinja2 , pytestCheckHook , railroad-diagrams @@ -12,16 +10,21 @@ let pyparsing = buildPythonPackage rec { pname = "pyparsing"; - version = "3.0.7"; + version = "3.0.9"; + format = "pyproject"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "sha256-RyvTTbFshAZgyZPgzqcq31E504RlnMZuf16jJYGqDDI="; + sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; }; - # circular dependencies if enabled by default + nativeBuildInputs = [ + flit-core + ]; + + # circular dependencies with pytest if enabled by default doCheck = false; checkInputs = [ jinja2 @@ -43,4 +46,4 @@ let }; }; in - pyparsing +pyparsing diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 30dd52e3eea..663440965fd 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = version; - hash = "sha256-Ty+yIA8amKyV3z++7n1m/YRH0gEoVIVTdX8xiZYp/eM="; + hash = "sha256-0tdT7UIT9F2z9+ufnzaACVxRybWxFjZObYQCd3hcXTk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index d78682a8c66..dc1694b83e8 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -2,7 +2,7 @@ , buildPythonApplication , fetchPypi , pbr -, Babel +, babel , cliff , iso8601 , osc-lib @@ -31,7 +31,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pbr - Babel + babel cliff iso8601 osc-lib diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 09dc46ba955..76527971834 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -13,7 +13,7 @@ , simplejson , sphinx , sphinxcontrib-programoutput -, Babel +, babel , osc-lib , python-keystoneclient , debtcollector @@ -45,7 +45,7 @@ buildPythonApplication rec { prettytable requests simplejson - Babel + babel osc-lib python-keystoneclient debtcollector diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 4def2f46317..765ef5ba7d5 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rich"; - version = "12.3.0"; + version = "12.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/BPJcFjUldbTa/M3i9jGGU7apbrTcWbF+yrrFuLXcHY="; + sha256 = "sha256-6fr5mtZwXdZihoHEjF1jJxOLH3ajPX1tF2N/ZCV9g50="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 020cf5c143a..4639cf43d31 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -4,7 +4,7 @@ , pythonOlder , fetchFromGitHub # propagatedBuildInputs -, Babel +, babel , alabaster , docutils , imagesize @@ -51,10 +51,16 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "docutils>=0.14,<0.18" "docutils>=0.14" + + # remove impurity caused by date inclusion + # https://github.com/sphinx-doc/sphinx/blob/master/setup.cfg#L4-L6 + substituteInPlace setup.cfg \ + --replace "tag_build = .dev" "" \ + --replace "tag_date = true" "" ''; propagatedBuildInputs = [ - Babel + babel alabaster docutils imagesize diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index b6e800a7ed3..0bed203007c 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.35"; + version = "1.4.36"; src = fetchPypi { inherit pname version; - hash = "sha256-L/yBOwHcZHOZD15XXyEMpawvVGWs45CLeP/W0gBYqrU="; + hash = "sha256-ZGeKwyHWSkWQHvLiRyXsXng/H0pYgwXhlkMUR+es4kM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index eb9879a4bf0..7f319333cac 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -49,8 +49,10 @@ buildPythonPackage rec { disabledTests = [ # AssertionError - "test_variables" "test_example" + "test_executing_style_defs" + "test_pygments_example" + "test_variables" ]; pythonImportsCheck = [ "stack_data" ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index bb7e12d5963..43795067729 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.25"; + version = "2.27.26"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gFrn44/Z0VcVMGbcQ4HPWF/TTfohLy/B/s4kjAWqxXE="; + sha256 = "sha256-pqBMAnTAlJ/QUl812LU6w053r+y+s8STLdxs5nWsAJw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix new file mode 100644 index 00000000000..c7b7e9bc9e8 --- /dev/null +++ b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "wcag-contrast-ratio"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw="; + }; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test.py" + ]; + + pythonImportsCheck = [ "wcag_contrast_ratio" ]; + + meta = with lib; { + description = "Library for computing contrast ratios, as required by WCAG 2.0"; + homepage = "https://github.com/gsnedders/wcag-contrast-ratio"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 4d0373105cc..094dcb3bfbd 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,5 +1,5 @@ { lib -, Babel +, babel , buildPythonPackage , cssselect , feedparser @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - Babel + babel cssselect python-dateutil feedparser diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index f961d0359db..aaaecc6098f 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.1.0"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "sha256-m1VGaj6Z4TsfBoamYRfTm9qFqZIWbgp5rt/PNYYyj3o="; + sha256 = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; }; propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ @@ -63,6 +63,6 @@ buildPythonPackage rec { utility libraries. ''; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 3c9529c2644..a681b523a32 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -1,5 +1,5 @@ { lib -, Babel +, babel , buildPythonPackage , colorama , cssselect @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - Babel + babel colorama cssselect python-dateutil diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 48764d509fe..95f9d2df65c 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , markupsafe -, Babel +, babel , pytestCheckHook , email_validator }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb"; }; - propagatedBuildInputs = [ markupsafe Babel ]; + propagatedBuildInputs = [ markupsafe babel ]; checkInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 0f64df2a56a..253962910ac 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, more-itertools +, func-timeout +, jaraco_itertools , pythonOlder , setuptools-scm }: -buildPythonPackage rec { +let zipp = buildPythonPackage rec { pname = "zipp"; version = "3.7.0"; format = "setuptools"; @@ -22,21 +23,26 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ - more-itertools - ]; - # Prevent infinite recursion with pytest doCheck = false; + checkInputs = [ + func-timeout + jaraco_itertools + ]; + pythonImportsCheck = [ "zipp" ]; + passthru.tests = { + check = zipp.overridePythonAttrs (_: { doCheck = true; }); + }; + meta = with lib; { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; -} +}; in zipp diff --git a/pkgs/development/python2-modules/sphinx/default.nix b/pkgs/development/python2-modules/sphinx/default.nix index 0424b9b4c39..80dec053108 100644 --- a/pkgs/development/python2-modules/sphinx/default.nix +++ b/pkgs/development/python2-modules/sphinx/default.nix @@ -13,7 +13,7 @@ , jinja2 , pygments , alabaster -, Babel +, babel , snowballstemmer , six , sqlalchemy @@ -46,7 +46,7 @@ buildPythonPackage rec { jinja2 pygments alabaster - Babel + babel setuptools snowballstemmer six diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index eadeec8acce..743405be6a7 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1140"; + version = "2.0.1143"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-aGO5mjBsUwpLIv73pZH1la6tyGByznTrjkW9dojkXwg="; + hash = "sha256-Kl9/wbjiQ46ysmnE24iQveTEzSTsVF5FHRqG3WWz3DQ="; }; nativeBuildInputs = with py.pkgs; [ @@ -94,6 +94,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ + --replace "bc-python-hcl2==0.3.39" "bc-python-hcl2>=0.3.39" \ --replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \ --replace "prettytable>=3.0.0" "prettytable" \ --replace "pycep-parser==0.3.4" "pycep-parser" diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index 76e523170ca..9b6d9361726 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -1,5 +1,5 @@ { lib -, Babel +, babel , buildPythonApplication , fetchPypi , fixtures @@ -21,7 +21,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - Babel + babel pbr setuptools ]; diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 9f0421d3eee..51cc427ff19 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -8,27 +8,22 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "unstable-2021-11-23"; + version = "0.2.1"; src = fetchFromGitHub { - owner = "AndrewGaspar"; + owner = "corrosion-rs"; repo = "corrosion"; - rev = "f679545a63a8b214a415e086f910126ab66714fa"; - sha256 = "sha256-K+QdhWc5n5mH6yxiQa/v5HsrqnWJ5SM93IprVpyCVO0="; + rev = "v${version}"; + hash = "sha256-nJ4ercNykECDBqecuL8cdCl4DHgbgIUmbiFBG/jiOaA="; }; - patches = [ - # https://github.com/AndrewGaspar/corrosion/issues/84 - ./cmake-install-full-dir.patch - ]; - cargoRoot = "generator"; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "sha256-ZvCRgXv+ASMIL00oc3luegV1qVNDieU9J7mbIhfayGk="; + hash = "sha256-4JVbHYlMOKztWPYW7tXQdvdNh/ygfpi0CY6Ly93VxsI="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; @@ -50,7 +45,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for integrating Rust into an existing CMake project"; - homepage = "https://github.com/AndrewGaspar/corrosion"; + homepage = "https://github.com/corrosion-rs/corrosion"; + changelog = "https://github.com/corrosion-rs/corrosion/blob/${src.rev}/RELEASES.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index a8c6821f27f..08788878cc9 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -1,8 +1,12 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config , openssl + +# darwin +, Security }: let @@ -27,6 +31,8 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl + ] ++ lib.optionals (stdenv.isDarwin) [ + Security ]; checkFlags = [ diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 9bbe6164852..e0f9a726945 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec { install -m 0755 gradlew-fdroid $out/bin ''; - buildInputs = [ python.pkgs.Babel ]; + buildInputs = [ python.pkgs.babel ]; propagatedBuildInputs = with python.pkgs; [ androguard diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 4ff990ca0ed..8fba52aa1fd 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - buildInputs = [ m4 perl ]; + nativeBuildInputs = [ m4 perl ]; + strictDeps = true; doCheck = true; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ac342086f6c..63302c8ed94 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl, texinfo }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { pname = "autoconf"; version = "2.71"; + outputs = [ "out" "doc" ]; src = fetchurl { url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz"; @@ -19,8 +20,15 @@ stdenv.mkDerivation rec { ./2.71-fix-race.patch ]; - nativeBuildInputs = [ m4 perl ]; + nativeBuildInputs = [ m4 perl texinfo ]; buildInputs = [ m4 ]; + postBuild = " + make html + "; + + postInstall = " + make install-html + "; # Work around a known issue in Cygwin. See # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index fa867c26316..a3b093c3827 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -2,16 +2,17 @@ , musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs , argp-standalone , enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive +, gitUpdater }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.186"; + version = "0.187"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-f2+5FJsWc9ONkXig0+D7ih7E9TqfTC/4lGlgmHlkEXc="; + sha256 = "sha256-5wsN++YQ+QxNH+DXGvFCpOJcPE7566uNLXK2UVnUVMg="; }; patches = [ @@ -62,10 +63,6 @@ stdenv.mkDerivation rec { propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isMusl [ - "-Wno-null-dereference" - ]; - configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" @@ -81,6 +78,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isMusl; doInstallCheck = !stdenv.hostPlatform.isMusl; + passthru.updateScript = gitUpdater { + inherit pname version; + url = "https://sourceware.org/git/elfutils.git"; + rev-prefix = "elfutils-"; + }; + meta = with lib; { homepage = "https://sourceware.org/elfutils/"; description = "A set of utilities to handle ELF objects"; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index de661948b9c..009c3cb6fe2 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; - sha256 = "sha256-AkhEVKsbmYhAx4c1CexrIwHrkmYsEy749fT1abNaa2A="; + url = "https://github.com/ocaml/dune/releases/download/${version}/chrome-trace-${version}.tbz"; + sha256 = "sha256-vR+85q557R6yb6ibsuLiOXivzrP1P1V4zxvasIoa1bw="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix new file mode 100644 index 00000000000..8f700761d16 --- /dev/null +++ b/pkgs/development/tools/pip-audit/default.nix @@ -0,0 +1,83 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, python3 +}: + +let + py = python3.override { + packageOverrides = self: super: { + + # ansible doesn't support resolvelib > 0.6.0 and can't have an override + resolvelib = super.resolvelib.overridePythonAttrs (oldAttrs: rec { + version = "0.8.1"; + src = fetchFromGitHub { + owner = "sarugaku"; + repo = "resolvelib"; + rev = version; + sha256 = "1qpd0gg9yl0kbamlgjs9pkxd39kx511kbc92civ77v0ka5sw8ca0"; + }; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { + pname = "pip-audit"; + version = "2.2.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ji61783imVlvoBaDMTxQwbf1L1G4lJbOFZ1FjcNOT/8="; + }; + + propagatedBuildInputs = [ + cachecontrol + cyclonedx-python-lib + html5lib + packaging + pip-api + progress + resolvelib + ]; + + checkInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pip_audit" + ]; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTestPaths = [ + # Tests require network access + "test/dependency_source/test_requirement.py" + "test/dependency_source/test_resolvelib.py" + "test/service/test_pypi.py" + "test/service/test_osv.py" + ]; + + disabledTests = [ + # Tests requrire network access + "test_get_pip_cache" + "test_virtual_env" + "test_pyproject_source" + "test_pyproject_source_duplicate_deps" + ]; + + meta = with lib; { + description = "Tool for scanning Python environments for known vulnerabilities"; + homepage = "https://github.com/trailofbits/pip-audit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 57250f0d101..ce9805cd41e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -2346,7 +2346,7 @@ lib.composeManyExtensions [ }); wtforms = super.wtforms.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.babel ]; }); } diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix index 4ffc0a24264..ee1793f01ca 100644 --- a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix +++ b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "protoc-gen-go-vtproto"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "vtprotobuf"; rev = "v${version}"; - sha256 = "0kjjpfsiws4vi36ha1gajb97rwcggqw753mv2jqf09kdfszz9p63"; + sha256 = "sha256-fOF7n1WeQ3s1S+o5NbAoTUnqqk5IHtKvXCb2o8LmI5U="; }; - vendorSha256 = "01lxwlgh3y3gp22gk5qx7r60c1j63pnpi6jnri8gf2lmiiib8fdc"; + vendorSha256 = "sha256-JpSVO8h7+StLG9/dJQkmrIlh9zIHABoqP1hq+X5ajVs="; excludedPackages = [ "conformance" ]; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 27606f998d5..9e73c566ef8 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-rxferVxTWmclviDshHhBmbCezOI+FvcfUW3gAkBQNHQ="; + sha256 = "sha256-n54PWkiB+vXAqIOZ5FOTUNgGhAdBs81Q1WYxJ2XIb8o="; fetchSubmodules = true; }; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.Foundation ]; - # Disable cwd support on darwin, because it requires macOS>=10.15 - preConfigure = lib.optionalString stdenv.isDarwin '' + # Disable cwd support on x86 darwin, because it requires macOS>=10.15 + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' for file in 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp 3rd/luamake/3rd/bee.lua/bee/subprocess/subprocess_posix.cpp; do - substituteInPlace $file --replace '#define SUPPORT_CWD 1' "" + substituteInPlace $file --replace '#define USE_POSIX_SPAWN 1' "" done ''; diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index e95371ec5ea..eab7941cbd1 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -13,7 +13,14 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ "-lm" ]; + NIX_CFLAGS_COMPILE = [ + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: random.o:(.bss+0x0): multiple definition of `LW_RANDOM_ON'; game.o:(.bss+0x4): first defined here + "-fcommon" + + "-lm" + ]; meta = with lib; { description = "The classic version of a quick tactics game LiquidWar"; diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 17ea9ffee6e..68996e4e457 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -1,15 +1,18 @@ { lib +, fetchFromGitHub , python3 }: python3.pkgs.buildPythonApplication rec { pname = "rich-cli"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; - src = python3.pkgs.fetchPypi { - inherit pname version; - sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk="; + src = fetchFromGitHub { + owner = "Textualize"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ="; }; nativeBuildInputs = with python3.pkgs; [ @@ -26,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'rich = "^12.3.0"' 'rich = "*"' + --replace 'rich = "^12.4.0"' 'rich = "*"' ''; pythonImportsCheck = [ diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 86c91e9b55c..6f8124dbac4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages -, appleDerivation', cpio, xnu, Libc, Libm, libdispatch, Libinfo +, appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutilHeaders, hfsHeaders, darling, darwin-stubs @@ -11,15 +11,21 @@ appleDerivation' stdenv { dontBuild = true; dontFixup = true; - nativeBuildInputs = [ cpio ]; - installPhase = '' export NIX_ENFORCE_PURITY= mkdir -p $out/lib $out/include + function copyHierarchy () { + mkdir -p $1 + while read f; do + mkdir -p $1/$(dirname $f) + cp --parents -pn $f $1 + done + } + # Set up our include directories - (cd ${xnu}/include && find . -name '*.h' -or -name '*.defs' | cpio -pdm $out/include) + (cd ${xnu}/include && find . -name '*.h' -or -name '*.defs' | copyHierarchy $out/include) cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h $out/include @@ -28,10 +34,10 @@ appleDerivation' stdenv { ${CommonCrypto} ${copyfile} ${removefile} ${libresolvHeaders} \ ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} \ ${libutilHeaders} ${libpthread} ${hfsHeaders}; do - (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) + (cd $dep/include && find . -name '*.h' | copyHierarchy $out/include) done - (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o) + (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o) mkdir -p $out/include/os diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt index 09b0ab41045..cdca44c7292 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt @@ -71,6 +71,7 @@ architecture/i386/table.h architecture/i386/tss.h arpa/ftp.h arpa/inet.h +arpa/nameser.h arpa/nameser_compat.h arpa/telnet.h arpa/tftp.h @@ -956,6 +957,7 @@ mpool.h msgcat.h nameser.h nc_tparm.h +ncurses.h ncurses_dll.h ndbm.h net/bpf.h diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 6d14a3293fc..bda8d8ab30c 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPackages, fetchurl, fetchpatch, runCommand, autoreconfHook, - autoconf, automake, libtool, + autoconf, automake, libtool, bash, # Enabling python support while cross compiling would be possible, but # the configure script tries executing python to gather info instead of # relying on python3-config exclusively @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; + strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optionals enablePython [ python3 swig ]; + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optionals enablePython [ python3 swig ]; + buildInputs = [ bash ]; configureFlags = [ # z/OS plugin is not useful on Linux, diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 1d93174ec65..3805f99e0a5 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -138,6 +138,7 @@ in stdenv.mkDerivation rec { filename=$(basename $files) install -Dm755 tools/$filename $out/bin/$filename done + install -Dm755 attrib/gatttool $out/bin/gatttool ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/os-specific/linux/restool/default.nix index 4f488c28323..83c7c93ffcd 100644 --- a/pkgs/os-specific/linux/restool/default.nix +++ b/pkgs/os-specific/linux/restool/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { "VERSION=${version}" ]; + postPatch = '' + # -Werror makes this derivation fragile on compiler version upgrades, patch + # it out. + sed -i /-Werror/d Makefile + ''; + preFixup = '' # wrapProgram interacts badly with the ls-main tool, which relies on the # shell's $0 argument to figure out which operation to run (busybox-style diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9e914132ef2..14d5e29c372 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -178,6 +178,13 @@ stdenv.mkDerivation { # need (AFAICT). # See https://github.com/systemd/systemd/pull/20479 for upstream discussion. ./0019-core-handle-lookup-paths-being-symlinks.patch + + # fixes reproducability of dbus xml files + # Should no longer be necessary with v251. + (fetchpatch { + url = "https://github.com/systemd/systemd/pull/22174.patch"; + sha256 = "sha256-RVhxUEUiISgRlIP/AhU+w1VHfDQw2W16cFl2TXXyxno="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -641,12 +648,6 @@ stdenv.mkDerivation { ''; postInstall = '' - # sysinit.target: Don't depend on - # systemd-tmpfiles-setup.service. This interferes with NixOps's - # send-keys feature (since sshd.service depends indirectly on - # sysinit.target). - mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ - mkdir -p $out/example/systemd mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/systemd/{system,user} $out/example/systemd diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index e9075d7d043..9d21951a299 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - sha256 = "sha256:05k0qcd5c5xb124dpp6lvfdh4dzf6bkd34v4sy7aj776p4hrlqx2"; + sha256 = "sha256:0ndd4gd26rglbz85izfvqc4ghcfa7wpq6ghrhggbzg819phndg5a"; }; installPhase = '' diff --git a/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix index 9c3bc68615c..ca04c97c128 100644 --- a/pkgs/servers/invidious/lsquic.nix +++ b/pkgs/servers/invidious/lsquic.nix @@ -1,11 +1,19 @@ -{ lib, boringssl, stdenv, fetchgit, fetchFromGitHub, cmake, zlib, perl, libevent, gcc10Stdenv, buildGoModule }: +{ lib, boringssl, stdenv, fetchgit, fetchFromGitHub, fetchurl, cmake, zlib, perl, libevent }: let versions = builtins.fromJSON (builtins.readFile ./versions.json); - buildGoModuleGcc10 = buildGoModule.override { stdenv = gcc10Stdenv; }; + fetchGitilesPatch = { name, url, sha256 }: + fetchurl { + url = "${url}%5E%21?format=TEXT"; + inherit name sha256; + downloadToTemp = true; + postFetch = '' + base64 -d < $downloadedFile > $out + ''; + }; # lsquic requires a specific boringssl version (noted in its README) - boringssl' = (boringssl.overrideAttrs (old: { + boringssl' = boringssl.overrideAttrs ({ preBuild, ... }: { version = versions.boringssl.rev; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; @@ -15,10 +23,43 @@ let patches = [ # Use /etc/ssl/certs/ca-certificates.crt instead of /etc/ssl/cert.pem ./use-etc-ssl-certs.patch + + # because lsquic requires that specific boringssl version and that + # version does not yet include fixes for gcc11 build errors, they + # must be backported + (fetchGitilesPatch { + name = "fix-mismatch-between-header-and-implementation-of-bn_sqr_comba8.patch"; + url = "https://boringssl.googlesource.com/boringssl/+/139adff9b27eaf0bdaac664ec4c9a7db2fe3f920"; + sha256 = "05sp602dvh50v46jkzmh4sf4wqnq5bwy553596g2rhxg75bailjj"; + }) + (fetchGitilesPatch { + name = "use-an-unsized-helper-for-truncated-SHA-512-variants.patch"; + url = "https://boringssl.googlesource.com/boringssl/+/a24ab549e6ae246b391155d7bed3790ac0e07de2"; + sha256 = "0483jkpg4g64v23ln2blb74xnmzdjcn3r7w4zk7nfg8j3q5f9lxm"; + }) +/* + # the following patch is too complex, so we will modify the build flags + # of crypto/fipsmodule/CMakeFiles/fipsmodule.dir/bcm.c.o in preBuild + # and turn off -Werror=stringop-overflow + (fetchGitilesPatch { + name = "make-md32_common.h-single-included-and-use-an-unsized-helper-for-SHA-256.patch"; + url = "https://boringssl.googlesource.com/boringssl/+/597ffef971dd980b7de5e97a0c9b7ca26eec94bc"; + sha256 = "1y0bkkdf1ccd6crx326agp01q22clm4ai4p982y7r6dkmxmh52qr"; + }) +*/ + (fetchGitilesPatch { + name = "fix-array-parameter-warnings.patch"; + url = "https://boringssl.googlesource.com/boringssl/+/92c6fbfc4c44dc8462d260d836020d2b793e7804"; + sha256 = "0h4sl95i8b0dj0na4ngf50wg54raxyjxl1zzwdc810abglp10vnv"; + }) ]; - })).override { - buildGoModule = buildGoModuleGcc10; - }; + + preBuild = '' + ${preBuild} + sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \ + -i build.ninja + ''; + }); in stdenv.mkDerivation rec { pname = "lsquic"; diff --git a/pkgs/servers/invidious/shards.nix b/pkgs/servers/invidious/shards.nix index 582a4083e7d..e5f297d902c 100644 --- a/pkgs/servers/invidious/shards.nix +++ b/pkgs/servers/invidious/shards.nix @@ -20,14 +20,14 @@ exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.2.0"; - sha256 = "0nlgnh5iykbr1v2132342k2mz6s2laws6nkgqsqlwhhcr4gb4jcx"; + rev = "v0.2.2"; + sha256 = "1c8askb9b7621jjz5pjj6b8pdbhw3r1l3dym6swg1saspf5j3jwi"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v1.1.0"; - sha256 = "07vlvddy4mba9li2bvskzqzywwq55cyvlgkz13q6dsl4zfgc96ca"; + rev = "v1.1.2"; + sha256 = "1149q4qw0zrws5asqqr4snrdi67xsmisdcq58zcrbgqgsxgly9d0"; }; kilt = { owner = "jeromegn"; diff --git a/pkgs/servers/invidious/update.sh b/pkgs/servers/invidious/update.sh index 580d6136388..bf43fbb4b36 100755 --- a/pkgs/servers/invidious/update.sh +++ b/pkgs/servers/invidious/update.sh @@ -41,7 +41,7 @@ git -C "$git_dir" fetch origin "$git_branch" # because there might still be commits coming # use the day of the latest commit we picked as version new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch") -new_version="unstable-$(git -C "$git_dir" log -n 1 --format='format:%cs' "$new_rev")" +new_version="unstable-$(TZ=UTC git -C "$git_dir" log -n 1 --date='format-local:%Y-%m-%d' --format='%cd' "$new_rev")" info "latest commit before $today: $new_rev" if [ "$new_rev" = "$old_rev" ]; then diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index cec068a09bf..40f8bb04182 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,15 +4,15 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "ed265cfdcd131b9df5398d899cc5d7036a5b7846", - "sha256": "0hhnq4s0slwbgxra7gxapl7dcz60a7k71cndi4crqcikmazzac3b", - "version": "unstable-2022-03-16" + "rev": "ca27e096f3249533cc7a9b123a8a8378f3312bb7", + "sha256": "0xjdzxnw6b5lk8pr82sjj60wfzxqkyamh0gpf2wxby52jvlbdcka", + "version": "unstable-2022-05-11" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", "version": "2.18.1" }, "videojs": { - "sha256": "0b4vxd29kpvy60yhqm376r1872gds17s6wljqw0zlr16j762k50r" + "sha256": "0m09pc9acpzhfwwvc9dayl60nn28skmmglgvmlp48dlkqgfbgc27" } } diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index d1e4581789e..b84e78e323d 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonOlder @@ -40,6 +41,15 @@ buildPythonPackage rec { sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y="; }; + patches = [ + # FIXME: backport Python 3.10 support fix, remove for next release + (fetchpatch { + url = "https://gitlab.com/mailman/hyperkitty/-/commit/551a44a76e46931fc5c1bcb341235d8f579820be.patch"; + sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk="; + includes = [ "hyperkitty/*" ]; + }) + ]; + postPatch = '' # isort is a development dependency sed -i '/isort/d' setup.py diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index a674aca2a37..643e505d794 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.2"; + version = "2.13.3"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256:1ijvav2ymgq1i8jycrqbp2y4r54y0dkwjnwxc20bmcixxh877zdn"; + sha256 = "sha256:1z8wzhlhl8vb7m8axvayfyqgf86lz67gaa02n3r17049vwswdgmb"; }; patches = [ diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index dc65911a066..6d7466afd86 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.26.0.5715-8cf78dab3"; + version = "1.26.1.5798-99a4a6ac9"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - hash = "sha256-Ou5DlQPk+zAt/wE5Nry4nzLaR1Id6tQdwl73qawig4M="; + hash = "sha256-Y2LW7NNdwD4t/R7dHOAEG2mxC4qFV6Z8VUh0APo8QNM="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - hash = "sha256-DQbRobiJwT7Xr4NzKS2iQOszOsd/bS/+kJ4p+QUVXfg="; + hash = "sha256-Chu4IULIvkmfMEV0LSg50i6usZJZI3UWOgCHQakbhaY="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 7171b4550fd..a8f5a29db8d 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -20,6 +20,7 @@ python3.pkgs.buildPythonApplication rec { passlib vobject python-dateutil + pytz # https://github.com/Kozea/Radicale/issues/816 ] ++ passlib.extras-require.bcrypt; checkInputs = with python3.pkgs; [ diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 988076947bc..ee868397ee7 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -9,36 +9,7 @@ let py = python3.override { packageOverrides = self: super: { - django = super.django_3; - jsonschema = super.jsonschema.overridePythonAttrs (old: rec { - version = "3.2.0"; - src = self.fetchPypi { - pname = old.pname; - inherit version; - sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; - }; - }); - lxml = super.lxml.overridePythonAttrs (old: rec { - version = "4.6.5"; - src = self.fetchPypi { - pname = old.pname; - inherit version; - sha256 = "6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca"; - }; - }); - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.0.3"; - src = self.fetchPypi { - pname = "Werkzeug"; - inherit version; - sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; - }; - }); - sentry-sdk = super.sentry-sdk.overridePythonAttrs (old: rec { - disabledTestPaths = old.disabledTestPaths ++ [ - "tests/integrations/flask/test_flask.py" - ]; - }); + django = super.django_4; }; }; @@ -64,7 +35,7 @@ py.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ - django_3 + django_4 django-cors-headers django-debug-toolbar django-filter diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index afcded31116..5327b48d51e 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -31,7 +31,7 @@ toPythonModule (buildPythonApplication rec { ''; propagatedBuildInputs = [ - Babel + babel certifi python-dateutil flask diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix index 3bd41a53844..095347a3ca9 100644 --- a/pkgs/shells/any-nix-shell/default.nix +++ b/pkgs/shells/any-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bash }: stdenv.mkDerivation rec { pname = "any-nix-shell"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0q27rhjhh7k0qgcdcfm8ly5za6wm4rckh633d0sjz87faffkp90k"; }; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; installPhase = '' mkdir -p $out/bin cp -r bin $out diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index a30c9a4a507..7cd7fb6905c 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { "--disable-nls" ]; + strictDeps = true; # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ] @@ -98,7 +99,7 @@ stdenv.mkDerivation rec { if interactive then '' substituteInPlace "$out/bin/bashbug" \ - --replace '${stdenv.shell}' "$out/bin/bash" + --replace '#!/bin/sh' "#!$out/bin/bash" '' # most space is taken by locale data else '' diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 6571d572a42..75ded461ea6 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1b0iz7da1sgifx1a5wdyx1kxbzys53v0kyk8nhxfipllmm5qka3k"; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook ]; # tests are super flaky unfortunately, and regularily break. diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 089e5dfc702..c4282ab0f64 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc"; }; + strictDeps = true; # To enable lazy loading via. bash-completion we need a symlink to the script # from every command name. installPhase = '' diff --git a/pkgs/shells/bash/undistract-me/default.nix b/pkgs/shells/bash/undistract-me/default.nix index 9ed5544713d..b15903e779e 100644 --- a/pkgs/shells/bash/undistract-me/default.nix +++ b/pkgs/shells/bash/undistract-me/default.nix @@ -43,6 +43,8 @@ stdenvNoCC.mkDerivation rec { }) ]; + strictDeps = true; + # Patch in dependencies. Can't use makeWrapper because the bash # functions will be sourced and invoked in a different environment # for each command invocation. diff --git a/pkgs/shells/bash/yarn-completion/default.nix b/pkgs/shells/bash/yarn-completion/default.nix index fabfc0a1ce2..48d1f42b5ce 100644 --- a/pkgs/shells/bash/yarn-completion/default.nix +++ b/pkgs/shells/bash/yarn-completion/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng"; }; + strictDeps = true; nativeBuildInputs = [ installShellFiles ]; installPhase = '' diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index a1f789dc3a3..f33fd5520f8 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { }) ]; + strictDeps = true; # configure.ac patched; remove on next release nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index 7a6ae67c3ae..2c98938b46d 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -41,5 +41,8 @@ stdenv.mkDerivation { license = with licenses; asl20; maintainers = with maintainers; [ vrthra ]; platforms = with platforms; all; + # lib/freadseek.c:68:3: error: #error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your > + # 68 | #error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your system, then report > + broken = true; # marked 2022-05-06 }; } diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index fc61efc3006..f0c5611e3b3 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -17,6 +17,7 @@ buildGoModule rec { vendorSha256 = "sha256-iuklI7XEQUgZ2ObYRROxyiccZ1JkajK5OJA7hIcpRZQ="; + strictDeps = true; doCheck = false; doInstallCheck = true; diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 8cc49bd39eb..308a684e6f6 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sourceRoot=. ''; - buildInputs = [ readline bison ]; + strictDeps = true; + nativeBuildInputs = [ bison ]; + buildInputs = [ readline ]; configureFlags = [ "--with-readline" ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 4c45fd3a75f..e9555c7f21f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -186,6 +186,7 @@ let rm tests/pexpects/exit_handlers.py ''; + strictDeps = true; nativeBuildInputs = [ cmake gettext diff --git a/pkgs/shells/fish/oh-my-fish/default.nix b/pkgs/shells/fish/oh-my-fish/default.nix index 3ec4e3b12d7..252e9350eaf 100644 --- a/pkgs/shells/fish/oh-my-fish/default.nix +++ b/pkgs/shells/fish/oh-my-fish/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fish +, bash , runtimeShell , writeShellScript }: @@ -17,8 +18,10 @@ stdenv.mkDerivation rec { hash = "sha256-lwMo4+PcYR9kYJPWK+ALiMfBdxFSgB2vjtSn8QrmmEA="; }; + strictDeps = true; buildInputs = [ fish + bash ]; dontConfigure = true; diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index 12cd6c935c0..a09024608bb 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1azvghrh31gawd798a254ml4id642qvbva64zzg30pjszh1087n8"; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ editline ]; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 8575f6439b9..4f06225e94f 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ntCfXJUOQqL63HWoG+WJr9a+qB16AaL5zf58039t7GU="; }; + strictDeps = true; installPhase = '' install -D -m 0444 liquidprompt $out/bin/liquidprompt install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist diff --git a/pkgs/shells/loksh/default.nix b/pkgs/shells/loksh/default.nix index b9f7d5ef7e7..5b304e45c5b 100644 --- a/pkgs/shells/loksh/default.nix +++ b/pkgs/shells/loksh/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q5RiY9/xEFCk+oHlxgNwDOB+TNjRWHKzU2kQH2LjCWY="; }; + strictDeps = true; nativeBuildInputs = [ meson ninja @@ -47,4 +48,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 8bdabd4d8c1..3e4791e2b8a 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY="; }; + strictDeps = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index be87b97ebd7..2b9bc4e3e22 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vvdwzw3fq74lwgmy6xxkk01sd68fzhsw84c750lm1dma22xhjci"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ readline ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 2b82d488278..f99c285a4f0 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; + strictDeps = true; buildInputs = lib.optional withReadline readline; configureFlags = lib.optional withReadline "--with-readline"; diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index 418a453d9e9..c56bd179c74 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-076nD0aPps6n5qkR3LQJ6Kn2g3mkov+/M0qSvxNLZ6o="; }; + strictDeps = true; + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace configure --replace "./conftest" "echo" ''; diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 431091bf8d1..c9150fda18a 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -11,6 +11,7 @@ buildDotnetPackage { sha256 = "0c4wa8qi1zs01p9ck171jkw0n1rsymsrhpsb42gl7warwhpmv59f"; }; + strictDeps = true; preConfigure = "rm -rvf $src/Source/PashConsole/bin/*"; outputFiles = [ "Source/PashConsole/bin/Release/*" ]; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 9f3dcbe1812..445dca9f4a4 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; + strictDeps = true; buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isLinux autoPatchelfHook; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index 804919665ec..5783607751a 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0744ars6y9zzsjr9xazms91qy6bi7msg2gg87526waziahfh4s4z"; }; - nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook byacc ]; # acinclude.m4 wants headers for tgetent(). - buildInputs = [ byacc ncurses ] + buildInputs = [ ncurses ] ++ lib.optionals readlineSupport [ readline ]; configureFlags = [ diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index d840c3b77a5..c9560c86f24 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv }: +{ fetchurl, lib, stdenv, bash, perl }: stdenv.mkDerivation rec { pname = "rush"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ld5TdpF7siprQCbhE4oxYhH40x3QZ5NCQlD3zRaNmM0="; }; + strictDeps = true; + buildInputs = [ bash ]; + + postInstall = '' + substituteInPlace $out/bin/rush-po \ + --replace "exec perl" "exec ${lib.getExe perl}" + ''; + doCheck = true; meta = { diff --git a/pkgs/shells/scponly/default.nix b/pkgs/shells/scponly/default.nix index c0c39d8e316..f15f04cfe22 100644 --- a/pkgs/shells/scponly/default.nix +++ b/pkgs/shells/scponly/default.nix @@ -13,14 +13,15 @@ stdenv.mkDerivation { patches = [ ./scponly-fix-make.patch ]; - buildInputs = [ openssh ]; - - # Add path to sftp-server so configure finds it - preConfigure = "export PATH=$PATH:${openssh}/libexec"; + strictDeps = true; # chroot doesn't seem to work, so not enabling # rsync could also be optionally enabled - configureFlags = [ "--enable-winscp-compat" ]; + configureFlags = [ + "--enable-winscp-compat" + "scponly_PROG_SFTP_SERVER=${lib.getBin openssh}/libexec/sftp-server" + "scponly_PROG_SCP=${lib.getBin openssh}/bin/scp" + ]; postInstall = lib.optionalString (debugLevel > 0) '' mkdir -p $out/etc/scponly && echo ${ diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 4357ca605b1..4fac6eb13d6 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA="; }; + strictDeps = true; buildInputs = [ ncurses ]; diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index 44faf5c4e02..01340df5e9a 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256:1jdmj4cyzwxxyyqf20y1zi578h7md860ryffp02qi143zpppn4sm"; }; + strictDeps = true; buildInputs = [ gettext ncurses ]; meta = with lib; { diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index 91d1bd3022b..5f9573b71aa 100644 --- a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-TOfAWxw1uIV0hKV9o4EJjOlp+jmGWCONDex86ipegOY="; }; + strictDeps = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index 9a69f90dca3..ca5fbee6e36 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix"; }; + strictDeps = true; dontUnpack = true; installPhase = '' diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5a2c0d050ce..f09a0672f19 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { ./tz_completion.patch ]; - nativeBuildInputs = [ autoreconfHook perl groff texinfo ] + strictDeps = true; + nativeBuildInputs = [ autoreconfHook perl groff texinfo pcre] ++ lib.optionals stdenv.isLinux [ util-linux yodl ]; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index ac5cab94d4c..aa5af013e43 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1irjmxhcg1fm4g8p3psjqk7sz5qhj5kw73pyhv91njvpdhn9l26z"; }; + strictDeps = true; postPatch = '' substituteInPlace fzf-zsh.plugin.zsh \ --replace \ diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index bf5969d1300..fa40db3603b 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2"; }; + strictDeps = true; + # we just move two files into $out, # this shouldn't bother Hydra. preferLocalBuild = true; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 538fbc0a522..feb55d9ccde 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-GEuBYN6HVAjiAbusVuEA7zBG9fIVZHLV628Jt6Cv5cM="; }; - buildInputs = [ zsh coreutils txt2tags procps ] + strictDeps = true; + nativeBuildInputs = [ txt2tags ]; + buildInputs = [ zsh coreutils procps ] ++ optional stdenv.isLinux inetutils; buildPhase = '' diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index e8d00d73d1a..eae5f77904b 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { sha256 = "0fvxnvgbcvwii7ghvpj5l43frllq71wwjvfg7cqfmic727z001dh"; }; + strictDeps = true; installPhase = '' install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme ''; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 472cc47459c..dab73419ab5 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf"; }; + strictDeps = true; installPhase = '' mkdir -p $out/share/zsh/{site-functions,plugins/nix} cp _* $out/share/zsh/site-functions diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 447dc5da78a..84c3a1abf28 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -2,7 +2,7 @@ # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git { lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts -, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: +, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { version = "2022-04-24"; @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "yxuvVDjNCH7r/g6ZoF8kEzwirBB0s+CRQizBwRR4Sp4="; }; + strictDeps = true; + buildInputs = [ bash ]; + installPhase = '' runHook preInstall diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 09be79d6fbc..994f223b58d 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-iuLi0o++e0PqK81AKWfIbCV0CTIxq2Oki6U2oEYsr68="; }; + strictDeps = true; installPhase = '' OUTDIR="$out/share/zsh/site-functions" mkdir -p "$OUTDIR" diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 5bdcb21f8dd..7dfbb14eec6 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-4G1+K6ENLwChtivR7Ura0vl6Ph9Wae3SOXCW1pNbgHI="; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index 9946d7d0c3a..ca8b7ea2e46 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { }; # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git dontBuild = true; + strictDeps = true; nativeBuildInputs = [ installShellFiles ]; installPhase = '' outdir="$out/share/$pname" diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix index 0660bbe7e7b..c6c80ba6a13 100644 --- a/pkgs/shells/zsh/zplug/default.nix +++ b/pkgs/shells/zsh/zplug/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hci1pbs3k5icwfyfw5pzcgigbh9vavprxxvakg1xm19n8zb61b3"; }; + strictDeps = true; dontConfigure = true; dontBuild = true; dontPatch = true; diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix index 14ea0ec8f63..a5683c43227 100644 --- a/pkgs/shells/zsh/zsh-autocomplete/default.nix +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-+UziTYsjgpiumSulrLojuqHtDrgvuG91+XNiaMD7wIs="; }; + strictDeps = true; installPhase = '' install -D zsh-autocomplete.plugin.zsh $out/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh cp -R scripts $out/share/zsh-autocomplete/scripts diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/shells/zsh/zsh-autopair/default.nix index 0cc1535e53a..73b70c00405 100644 --- a/pkgs/shells/zsh/zsh-autopair/default.nix +++ b/pkgs/shells/zsh/zsh-autopair/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; }; + strictDeps = true; + installPhase = '' install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh ''; diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index e261cdedc74..b1df50a9c68 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98"; }; + strictDeps = true; buildInputs = [ zsh ]; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index f2c2dc90fb4..ebfa55ecd22 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "020f8nq86g96cps64hwrskppbh2dapfw2m9np1qbs5pgh16z4fcb"; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix index 372d49eaeb7..d9a813bbbfd 100644 --- a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix +++ b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16z7k5n1rcl9i61lrm7i5dsqsmhvdp1y4y5ii6hv2xpp470addgy"; }; + strictDeps = true; installPhase = '' install -Dm 0644 zsh-better-npm-completion.plugin.zsh $out/share/zsh-better-npm-completion ''; diff --git a/pkgs/shells/zsh/zsh-clipboard/default.nix b/pkgs/shells/zsh/zsh-clipboard/default.nix index 114e0bfd7dc..eb395d74472 100644 --- a/pkgs/shells/zsh/zsh-clipboard/default.nix +++ b/pkgs/shells/zsh/zsh-clipboard/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { src = ./.; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index b92ced6be71..c10b67c2b3d 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; + strictDeps = true; dontUnpack = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 249826a2a25..937114e982e 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vs14n29wvkai84fvz3dz2kqznwsq2i5fzbwpv8nsfk1126ql13i"; }; + strictDeps = true; installPhase= '' install -D --target-directory=$out/share/zsh/site-functions src/* ''; diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix index ab544d7c314..0d3a6bc9ee6 100644 --- a/pkgs/shells/zsh/zsh-deer/default.nix +++ b/pkgs/shells/zsh/zsh-deer/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl"; }; + strictDeps = true; + prePatch = '' substituteInPlace deer \ --replace " perl " " ${perl}/bin/perl " diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix index 5b77978c022..68f09828b45 100644 --- a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d"; }; + strictDeps = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index be12ec147d5..5ce66fd8133 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -13,6 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-ixUnuNtxxmiigeVjzuV5uG6rIBPY/1vdBZF2/Qv0Trs="; }; + strictDeps = true; buildInputs = [ ncurses ]; postConfigure = '' diff --git a/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix b/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix index 09d2136ea26..30d26c96766 100644 --- a/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix +++ b/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "11r2mmy6bg3b6pf6qc0ml3idh333cj8yz754hrvd1sc4ipfkkqh7"; }; + strictDeps = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix index 9890993eed6..63e5fe8281e 100644 --- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix +++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0y8va5kc2ram38hbk2cibkk64ffrabfv1sh4xm7pjspsba9n5p1y"; }; + strictDeps = true; installPhase = '' install -D zsh-history-substring-search.zsh \ "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh" diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index 8b463eda573..e46a5cf727c 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgs }: +{ lib, stdenv, fetchFromGitHub, bash }: # To make use of this derivation, use # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-719lVo6p55G1tt3+6nMhZ904nyvlq0Q5exb0il36/Aw="; }; + strictDeps = true; + buildInputs = [ bash ]; installPhase = '' install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh-nix-shell install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 19d3e70c0a3..cdda7d81f41 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs }: +{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs, bash }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { sha256 = "0fkfh8j7rd8mkpgz6nsx4v7665d375266shl1aasdad8blgqmf0c"; }; + strictDeps = true; + buildInputs = [ bash ]; + patches = [ (substituteAll { src = ./gitstatusd.patch; diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index b681dc2d3a3..27e3a648e2b 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { sha256 = "0v1dqg9hvycdkcvklg2njff97xwr8rah0nyldv4xm39r77f4yfvq"; }; + strictDeps = true; installPhase= '' install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel9k install -D functions/* --target-directory=$out/share/zsh-powerlevel9k/functions diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index e4bbd7a8b64..6201e42c0c0 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }: +{ lib, stdenv, fetchFromGitHub, unstableGitUpdater, bash }: stdenv.mkDerivation rec { pname = "zsh-prezto"; @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + strictDeps = true; + buildInputs = [ bash ]; + postPatch = '' # make zshrc aware of where zsh-prezto is installed sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/share/zsh-prezto/|g" runcoms/zshrc diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index 09d6eb3cf96..ef76798ccf4 100644 --- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0"; }; + strictDeps = true; buildInputs = [ zsh ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/pkgs/shells/zsh/zsh-system-clipboard/default.nix index b4d407a70bc..6e875b6ee08 100644 --- a/pkgs/shells/zsh/zsh-system-clipboard/default.nix +++ b/pkgs/shells/zsh/zsh-system-clipboard/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09lqav1mz5zajklr3xa0iaivhpykv3azkjb7yj9wyp0hq3vymp8i"; }; + strictDeps = true; installPhase = '' install -D zsh-system-clipboard.zsh $out/share/zsh/${pname}/zsh-system-clipboard.zsh ''; diff --git a/pkgs/shells/zsh/zsh-vi-mode/default.nix b/pkgs/shells/zsh/zsh-vi-mode/default.nix index 32f1e9c024a..73eae88b71d 100644 --- a/pkgs/shells/zsh/zsh-vi-mode/default.nix +++ b/pkgs/shells/zsh/zsh-vi-mode/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "EOYqHh0rcgoi26eopm6FTl81ehak5kXMmzNcnJDH8/E="; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index 8019e75a859..95cdb3273c5 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dz48rd66priqhxx7byndqhbmlwxi1nfw8ik25k0z5k7k754brgy"; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-z/default.nix b/pkgs/shells/zsh/zsh-z/default.nix index 9623ff6648c..a03b81cb6bf 100644 --- a/pkgs/shells/zsh/zsh-z/default.nix +++ b/pkgs/shells/zsh/zsh-z/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-HnwUWqzwavh/Qox+siOe5lwTp7PBdiYx+9M0NMNFx00="; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index a02e34df631..2d294d7f88e 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.8.8"; + version = "1.8.11"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-frVQ2nqOflY26ZZWVYJGMNMOdbLuIojQDu/79kLilBk="; + sha256 = "sha256-4a5GPB6R3jTzcZRMrYwDn6oNEHBdKQJUFQb+k76X5Z4="; }; vendorSha256 = "sha256-1c+YtfRy1ey0z117YHHkrCnpb7g+DmM+LR1rjn1YwMQ="; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 0f7d3806182..4a74b851b34 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.45.1"; + version = "0.46.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oexsu52x9rAqwTVxTVHzKPuaIfvg5lvvuBmKcnb2Yew="; + sha256 = "sha256-ojjudnS0yJZ6YoHmq4m0YKyCqq9Ge+AFU7ejlPop71w="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,11 +20,11 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-d6ZBWX4/lgh610fBLTE1EUqZmpctLfxi2PSRifH+1jg="; + vendorSha256 = "sha256-nb7QcdmwAfYDTzCFNjs7uKwK/gng2iMD36ANaFSsftk="; nativeBuildInputs = [ installShellFiles ]; - subPackages = [ "." ]; + subPackages = [ "cmd/syft" ]; ldflags = [ "-s" @@ -52,6 +52,17 @@ buildGoModule rec { --zsh <($out/bin/syft completion zsh) ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export SYFT_CHECK_FOR_APP_UPDATE=false + $out/bin/syft --help + $out/bin/syft version | grep "${version}" + + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/anchore/syft"; changelog = "https://github.com/anchore/syft/releases/tag/v${version}"; diff --git a/pkgs/tools/audio/beets/badfiles-plugin-nix-paths.patch b/pkgs/tools/audio/beets/badfiles-plugin-nix-paths.patch deleted file mode 100644 index 6956183344c..00000000000 --- a/pkgs/tools/audio/beets/badfiles-plugin-nix-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git i/beetsplug/badfiles.py w/beetsplug/badfiles.py -index 36b45de3..5208b696 100644 ---- i/beetsplug/badfiles.py -+++ w/beetsplug/badfiles.py -@@ -71,14 +71,14 @@ class BadFiles(BeetsPlugin): - return status, errors, [line for line in output.split("\n") if line] - - def check_mp3val(self, path): -- status, errors, output = self.run_command(["mp3val", path]) -+ status, errors, output = self.run_command(["@mp3val@/bin/mp3val", path]) - if status == 0: - output = [line for line in output if line.startswith("WARNING:")] - errors = len(output) - return status, errors, output - - def check_flac(self, path): -- return self.run_command(["flac", "-wst", path]) -+ return self.run_command(["@flac@/bin/flac", "-wst", path]) - - def check_custom(self, command): - def checker(path): diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix new file mode 100644 index 00000000000..1fef39ef72f --- /dev/null +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -0,0 +1,95 @@ +{ stdenv +, aacgain +, essentia-extractor +, ffmpeg +, flac +, imagemagick +, keyfinder-cli +, lib +, mp3gain +, mp3val +, python3Packages +, ... +}: { + absubmit = { + enable = lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms; + wrapperBins = [ essentia-extractor ]; + }; + acousticbrainz.propagatedBuildInputs = [ python3Packages.requests ]; + albumtypes = { }; + aura.propagatedBuildInputs = with python3Packages; [ flask pillow ]; + badfiles.wrapperBins = [ mp3val flac ]; + bareasc = { }; + beatport.propagatedBuildInputs = [ python3Packages.requests-oauthlib ]; + bench = { }; + bpd = { }; + bpm = { }; + bpsync = { }; + bucket = { }; + chroma.propagatedBuildInputs = [ python3Packages.pyacoustid ]; + convert.wrapperBins = [ ffmpeg ]; + deezer.propagatedBuildInputs = [ python3Packages.requests ]; + discogs.propagatedBuildInputs = with python3Packages; [ discogs-client requests ]; + duplicates = { }; + edit = { }; + embedart = { + propagatedBuildInputs = with python3Packages; [ pillow ]; + wrapperBins = [ imagemagick ]; + }; + embyupdate.propagatedBuildInputs = [ python3Packages.requests ]; + export = { }; + fetchart = { + propagatedBuildInputs = with python3Packages; [ requests pillow ]; + wrapperBins = [ imagemagick ]; + }; + filefilter = { }; + fish = { }; + freedesktop = { }; + fromfilename = { }; + ftintitle = { }; + fuzzy = { }; + gmusic = { }; + hook = { }; + ihate = { }; + importadded = { }; + importfeeds = { }; + info = { }; + inline = { }; + ipfs = { }; + keyfinder.wrapperBins = [ keyfinder-cli ]; + kodiupdate.propagatedBuildInputs = [ python3Packages.requests ]; + lastgenre.propagatedBuildInputs = [ python3Packages.pylast ]; + lastimport.propagatedBuildInputs = [ python3Packages.pylast ]; + loadext.propagatedBuildInputs = [ python3Packages.requests ]; + lyrics.propagatedBuildInputs = [ python3Packages.beautifulsoup4 ]; + mbcollection = { }; + mbsubmit = { }; + mbsync = { }; + metasync = { }; + missing = { }; + mpdstats.propagatedBuildInputs = [ python3Packages.mpd2 ]; + mpdupdate.propagatedBuildInputs = [ python3Packages.mpd2 ]; + parentwork = { }; + permissions = { }; + play = { }; + playlist.propagatedBuildInputs = [ python3Packages.requests ]; + plexupdate = { }; + random = { }; + replaygain.wrapperBins = [ aacgain ffmpeg mp3gain ]; + rewrite = { }; + scrub = { }; + smartplaylist = { }; + sonosupdate.propagatedBuildInputs = [ python3Packages.soco ]; + spotify = { }; + subsonicplaylist.propagatedBuildInputs = [ python3Packages.requests ]; + subsonicupdate.propagatedBuildInputs = [ python3Packages.requests ]; + the = { }; + thumbnails = { + propagatedBuildInputs = with python3Packages; [ pillow pyxdg ]; + wrapperBins = [ imagemagick ]; + }; + types.testPaths = [ "test/test_types_plugin.py" ]; + unimported = { }; + web.propagatedBuildInputs = [ python3Packages.flask ]; + zero = { }; +} diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix new file mode 100644 index 00000000000..3c7ad800c3b --- /dev/null +++ b/pkgs/tools/audio/beets/common.nix @@ -0,0 +1,147 @@ +{ stdenv +, bashInteractive +, diffPlugins +, glibcLocales +, gobject-introspection +, gst_all_1 +, lib +, python3Packages +, runtimeShell +, writeScript + + # plugin deps +, aacgain +, essentia-extractor +, ffmpeg +, flac +, imagemagick +, keyfinder-cli +, mp3gain +, mp3val + +, src +, version +, pluginOverrides ? { } +, disableAllPlugins ? false +}@inputs: +let + inherit (lib) attrNames attrValues concatMap; + + builtinPlugins = import ./builtin-plugins.nix inputs; + + mkPlugin = { enable ? !disableAllPlugins, propagatedBuildInputs ? [ ], testPaths ? [ ], wrapperBins ? [ ] }: { + inherit enable propagatedBuildInputs testPaths wrapperBins; + }; + + allPlugins = lib.mapAttrs (_: mkPlugin) (lib.recursiveUpdate builtinPlugins pluginOverrides); + enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins; + disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins; + + pluginWrapperBins = concatMap (p: p.wrapperBins) (attrValues enabledPlugins); +in +python3Packages.buildPythonApplication rec { + pname = "beets"; + inherit src version; + + patches = [ + # Bash completion fix for Nix + ./patches/bash-completion-always-print.patch + ]; + + propagatedBuildInputs = with python3Packages; [ + confuse + gobject-introspection + gst-python + jellyfish + mediafile + munkres + musicbrainzngs + mutagen + pygobject3 + pyyaml + reflink + unidecode + ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); + + buildInputs = [ + ] ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + ]); + + postInstall = '' + mkdir -p $out/share/zsh/site-functions + cp extra/_beet $out/share/zsh/site-functions/ + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + tmphome="$(mktemp -d)" + + EDITOR="${writeScript "beetconfig.sh" '' + #!${runtimeShell} + cat > "$1" < plugins_available + ${diffPlugins (attrNames allPlugins) "plugins_available"} + + export BEETS_TEST_SHELL="${bashInteractive}/bin/bash --norc" + export HOME="$(mktemp -d)" + + args=" -m pytest -r fEs" + eval "disabledTestPaths=($disabledTestPaths)" + for path in ''${disabledTestPaths[@]}; do + if [ -e "$path" ]; then + args+=" --ignore \"$path\"" + else + echo "Skipping non-existent test path '$path'" + fi + done + + python $args + + runHook postCheck + ''; + + meta = with lib; { + description = "Music tagger and library organizer"; + homepage = "https://beets.io"; + license = licenses.mit; + maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/audio/beets/convert-plugin-ffmpeg-path.patch b/pkgs/tools/audio/beets/convert-plugin-ffmpeg-path.patch deleted file mode 100644 index 1bc17893448..00000000000 --- a/pkgs/tools/audio/beets/convert-plugin-ffmpeg-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git i/beetsplug/convert.py w/beetsplug/convert.py -index 6bc07c28..039fb452 100644 ---- i/beetsplug/convert.py -+++ w/beetsplug/convert.py -@@ -118,22 +118,22 @@ class ConvertPlugin(BeetsPlugin): - 'id3v23': 'inherit', - 'formats': { - 'aac': { -- 'command': 'ffmpeg -i $source -y -vn -acodec aac ' -+ 'command': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec aac ' - '-aq 1 $dest', - 'extension': 'm4a', - }, - 'alac': { -- 'command': 'ffmpeg -i $source -y -vn -acodec alac $dest', -+ 'command': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec alac $dest', - 'extension': 'm4a', - }, -- 'flac': 'ffmpeg -i $source -y -vn -acodec flac $dest', -- 'mp3': 'ffmpeg -i $source -y -vn -aq 2 $dest', -+ 'flac': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec flac $dest', -+ 'mp3': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -aq 2 $dest', - 'opus': -- 'ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest', -+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest', - 'ogg': -- 'ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest', -+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest', - 'wma': -- 'ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest', -+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest', - }, - 'max_bitrate': 500, - 'auto': False, diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 0bdbe9d345d..a66b018678c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,279 +1,50 @@ -{ stdenv -, lib +{ lib +, callPackage , fetchFromGitHub -, writeScript -, glibcLocales -, diffPlugins -, substituteAll -, pythonPackages -# can be null, if you wish to disable a reference to it. It's needed for the -# artresizer, see: -# https://beets.readthedocs.io/en/v1.6.0/plugins/fetchart.html#image-resizing -, imagemagick -, gobject-introspection -, gst_all_1 -, runtimeShell - -# external plugins package set -, beetsExternalPlugins - -, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor -, enableAcousticbrainz ? true -, enableAcoustid ? true -, enableAura ? true -, enableBadfiles ? true, flac, mp3val -, enableBeatport ? true -, enableBpsync ? true -, enableConvert ? true, ffmpeg -, enableDeezer ? true -, enableDiscogs ? true -, enableEmbyupdate ? true -, enableFetchart ? true -, enableKeyfinder ? true, keyfinder-cli -, enableKodiupdate ? true -, enableLastfm ? true -, enableLoadext ? true -, enableLyrics ? true -, enableMpd ? true -, enablePlaylist ? true -, enableReplaygain ? true -, enableSonosUpdate ? true -, enableSubsonicplaylist ? true -, enableSubsonicupdate ? true -, enableThumbnails ? true -, enableWeb ? true - -# External plugins -, enableAlternatives ? false -, enableCopyArtifacts ? false -, enableExtraFiles ? false - -, bashInteractive, bash-completion }: - -assert enableBpsync -> enableBeatport; - -let - optionalPlugins = { - absubmit = enableAbsubmit; - acousticbrainz = enableAcousticbrainz; - aura = enableAura; - badfiles = enableBadfiles; - beatport = enableBeatport; - bpsync = enableBpsync; - chroma = enableAcoustid; - convert = enableConvert; - deezer = enableDeezer; - discogs = enableDiscogs; - embyupdate = enableEmbyupdate; - fetchart = enableFetchart; - keyfinder = enableKeyfinder; - kodiupdate = enableKodiupdate; - lastgenre = enableLastfm; - lastimport = enableLastfm; - loadext = enableLoadext; - lyrics = enableLyrics; - mpdstats = enableMpd; - mpdupdate = enableMpd; - playlist = enablePlaylist; - replaygain = enableReplaygain; - sonosupdate = enableSonosUpdate; - subsonicplaylist = enableSubsonicplaylist; - subsonicupdate = enableSubsonicupdate; - thumbnails = enableThumbnails; - web = enableWeb; +/* +** To customize the enabled beets plugins, use the pluginOverrides input to the +** derivation. +** Examples: +** +** Disabling a builtin plugin: +** beets.override { pluginOverrides = { beatport.enable = false; }; } +** +** Enabling an external plugin: +** beets.override { pluginOverrides = { +** alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; }; +** }; } +*/ +lib.makeExtensible (self: { + beets = self.beets-stable; + + beets-stable = callPackage ./common.nix rec { + version = "1.6.0"; + src = fetchFromGitHub { + owner = "beetbox"; + repo = "beets"; + rev = "v${version}"; + hash = "sha256-fT+rCJJQR7bdfAcmeFRaknmh4ZOP4RCx8MXpq7/D8tM="; + }; }; - pluginsWithoutDeps = [ - "albumtypes" "bareasc" "bench" "bpd" "bpm" "bucket" "duplicates" "edit" "embedart" - "export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy" - "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "gmusic" - "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play" - "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" - "types" "unimported" "zero" - ]; - - enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins); - - allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins; - allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins; - - testShell = "${bashInteractive}/bin/bash --norc"; - completion = "${bash-completion}/share/bash-completion/bash_completion"; - -in pythonPackages.buildPythonApplication rec { - pname = "beets"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "beetbox"; - repo = "beets"; - rev = "v${version}"; - sha256 = "sha256-fT+rCJJQR7bdfAcmeFRaknmh4ZOP4RCx8MXpq7/D8tM="; + beets-minimal = self.beets.override { disableAllPlugins = true; }; + + beets-unstable = callPackage ./common.nix { + version = "unstable-2022-05-08"; + src = fetchFromGitHub { + owner = "beetbox"; + repo = "beets"; + rev = "e06cf7969bfdfa4773049699320471be45d56054"; + hash = "sha256-yWwxYSzSSmx2UfCn0EBH23hQGZKSRn/c8ryvxLUeHdM="; + }; + pluginOverrides = { + # unstable has a new plugin, so we register it here. + limit = { }; + }; }; - propagatedBuildInputs = [ - pythonPackages.six - pythonPackages.enum34 - pythonPackages.jellyfish - pythonPackages.munkres - pythonPackages.musicbrainzngs - pythonPackages.mutagen - pythonPackages.pyyaml - pythonPackages.unidecode - pythonPackages.gst-python - pythonPackages.pygobject3 - pythonPackages.reflink - pythonPackages.confuse - pythonPackages.mediafile - gobject-introspection - ] ++ lib.optional enableAbsubmit essentia-extractor - ++ lib.optional enableAcoustid pythonPackages.pyacoustid - ++ lib.optional enableBeatport pythonPackages.requests-oauthlib - ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs-client - ++ lib.optional (enableFetchart - || enableDeezer - || enableEmbyupdate - || enableKodiupdate - || enableLoadext - || enablePlaylist - || enableSubsonicplaylist - || enableSubsonicupdate - || enableAcousticbrainz) pythonPackages.requests - ++ lib.optional enableKeyfinder keyfinder-cli - ++ lib.optional enableLastfm pythonPackages.pylast - ++ lib.optional enableLyrics pythonPackages.beautifulsoup4 - ++ lib.optional enableMpd pythonPackages.mpd2 - ++ lib.optional enableSonosUpdate pythonPackages.soco - ++ lib.optional enableThumbnails pythonPackages.pyxdg - ++ lib.optional (enableAura - || enableWeb) pythonPackages.flask - ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives - ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts - ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles - ; - - buildInputs = [ - ] ++ (with gst_all_1; [ - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - ]); - - checkInputs = with pythonPackages; [ - beautifulsoup4 - mock - nose - rarfile - responses - # Although considered as plugin dependencies, they are needed for the - # tests, for disabling them via an override makes the build fail. see: - # https://github.com/beetbox/beets/blob/v1.6.0/setup.py - pylast - mpd2 - discogs-client - pyxdg - ]; - - patches = [ - # Bash completion fix for Nix - ./bash-completion-always-print.patch - ] - # Fix path to imagemagick, used for the artresizer.py file. This reference - # to imagemagick might be expensive for some people, so the patch can be - # disabled if imagemagick is set to null - ++ lib.optional (imagemagick != null) (substituteAll { - src = ./imagemagick-nix-path.patch; - inherit imagemagick; - }) - # We need to force ffmpeg as the default, since we do not package - # bs1770gain, and set the absolute path there, to avoid impurities. - ++ lib.optional enableReplaygain (substituteAll { - src = ./replaygain-default-ffmpeg.patch; - ffmpeg = lib.getBin ffmpeg; - }) - # Put absolute Nix paths in place - ++ lib.optional enableConvert (substituteAll { - src = ./convert-plugin-ffmpeg-path.patch; - ffmpeg = lib.getBin ffmpeg; - }) - ++ lib.optional enableBadfiles (substituteAll { - src = ./badfiles-plugin-nix-paths.patch; - inherit mp3val flac; - }) - ; - - # Disable failing tests - postPatch = '' - echo echo completion tests passed > test/rsrc/test_completion.sh - - # https://github.com/beetbox/beets/issues/1187 - sed -i -e 's/len(mf.images)/0/' test/test_zero.py - ''; - - postInstall = '' - mkdir -p $out/share/zsh/site-functions - cp extra/_beet $out/share/zsh/site-functions/ - ''; - - doCheck = true; - - preCheck = '' - find beetsplug -mindepth 1 \ - \! -path 'beetsplug/__init__.py' -a \ - \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \ - | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \ - | sort -u > plugins_available - - ${diffPlugins allPlugins "plugins_available"} - ''; - - checkPhase = '' - runHook preCheck - - LANG=en_US.UTF-8 \ - LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \ - BEETS_TEST_SHELL="${testShell}" \ - BASH_COMPLETION_SCRIPT="${completion}" \ - HOME="$(mktemp -d)" nosetests -v - - runHook postCheck - ''; - - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - tmphome="$(mktemp -d)" - - EDITOR="${writeScript "beetconfig.sh" '' - #!${runtimeShell} - cat > "$1" <beetsplug/__init__.py - - # Skip test which is already failing upstream. - sed -i -e '1i import unittest' \ - -e 's/\(^ *\)# failing/\1@unittest.skip/' \ - tests/test_reimport.py ''; - nativeBuildInputs = [ beets pythonPackages.nose glibcLocales ]; + pytestFlagsArray = [ "-r fEs" ]; - checkPhase = "LANG=en_US.UTF-8 nosetests"; + checkInputs = with python3Packages; [ + pytestCheckHook + beets + six + ]; meta = { description = "Beets plugin to move non-music files during the import process"; homepage = "https://github.com/sbarakat/beets-copyartifacts"; license = lib.licenses.mit; + inherit (beets.meta) platforms; }; } diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix index 0d3ccc0d7a7..7cd4c76d504 100644 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, beets, pythonPackages }: +{ lib, fetchFromGitHub, beets, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "beets-extrafiles"; version = "unstable-2020-12-13"; @@ -17,17 +17,21 @@ pythonPackages.buildPythonApplication rec { sed -i -e 's/mediafile~=0.6.0/mediafile>=0.6.0/' setup.py ''; - nativeBuildInputs = [ beets ]; + propagatedBuildInputs = with python3Packages; [ mediafile ]; - propagatedBuildInputs = with pythonPackages; [ mediafile ]; + checkInputs = [ + python3Packages.pytestCheckHook + beets + ]; preCheck = '' - HOME=$TEMPDIR + HOME="$(mktemp -d)" ''; meta = { homepage = "https://github.com/Holzhaus/beets-extrafiles"; description = "A plugin for beets that copies additional files and directories during the import process"; license = lib.licenses.mit; + inherit (beets.meta) platforms; }; } diff --git a/pkgs/tools/audio/beets/replaygain-default-ffmpeg.patch b/pkgs/tools/audio/beets/replaygain-default-ffmpeg.patch deleted file mode 100644 index e441997cae5..00000000000 --- a/pkgs/tools/audio/beets/replaygain-default-ffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/beetsplug/replaygain.py w/beetsplug/replaygain.py -index b6297d93..5c1cbbc0 100644 ---- i/beetsplug/replaygain.py -+++ w/beetsplug/replaygain.py -@@ -139,7 +139,7 @@ class FfmpegBackend(Backend): - - def __init__(self, config, log): - super().__init__(config, log) -- self._ffmpeg_path = "ffmpeg" -+ self._ffmpeg_path = "@ffmpeg@/bin/ffmpeg" - - # check that ffmpeg is installed - try: -@@ -975,11 +975,10 @@ class ReplayGainPlugin(BeetsPlugin): - def __init__(self): - super().__init__() - -- # default backend is 'command' for backward-compatibility. - self.config.add({ - 'overwrite': False, - 'auto': True, -- 'backend': 'command', -+ 'backend': 'ffmpeg', - 'threads': cpu_count(), - 'parallel_on_import': False, - 'per_disc': False, diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index f2e23fd2f57..16070c91dd9 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "mpris-scrobbler"; - version = "0.4.90"; + version = "0.4.95"; src = fetchFromGitHub { owner = "mariusor"; repo = "mpris-scrobbler"; rev = "v${version}"; - sha256 = "sha256-+Y5d7yFOnSk2gQS/m/01ofbNeDCLXb+cTTlHj4bgO0M="; + sha256 = "sha256-Cqf0egS4XSDiKLdizNHPdS0Zt3jQxw9e78S7n23CuKI="; }; postPatch = '' diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 17abb6503c9..7fa7b4e35c8 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -7,13 +7,14 @@ stdenv.mkDerivation rec { pname = "lzip"; - version = "1.22"; + version = "1.23"; + outputs = [ "out" "man" "info" ]; nativeBuildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; - sha256 = "sha256-wzQtQuZxOcFluLEo0DO1yWiToTrF8lkzGQMVIU6HqUg="; + sha256 = "sha256-R5LAR93xXvKdVbqOaKGiHgy3aS2H7N9yBEGYZFgvKA0="; }; configureFlags = [ diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 5c0bc74245f..776312c8902 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.9.0"; + version = "0.10.9"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-uqzwS7+OQsPdMv3+fWdn3yVFJwtFZNd8kVWw//mQZj8="; + sha256 = "L8yqf+QadN+uZxBjT3RWG7L3QqIerNrNc1u9PP1pt1I="; }; - cargoSha256 = "sha256-EC3E5NawsDe+CU5WEu0G3FWVLuqW5nXOoUURN0iDPK0="; + cargoSha256 = "UxqgJBgKD7hGT0UjAVYqb+sjbZ1sYVVOQSDvRQROOso="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/tools/misc/addic7ed-cli/default.nix similarity index 100% rename from pkgs/development/python-modules/addic7ed-cli/default.nix rename to pkgs/tools/misc/addic7ed-cli/default.nix diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 3de016bf6d6..aa3d16a5fa5 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { ++ lib.optional (!withGTK) "-DENABLE_X11=ON" ++ lib.optional withExtras "-DENABLE_FONTFORGE_EXTRAS=ON"; - # work-around: git isn't really used, but configuration fails without it preConfigure = '' # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19) export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index e158f1c3f44..72048610021 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.47.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-IbpQd01uU6/Ihli+gVDjTB8T8cj//XHoZYcDjXD635Q="; + sha256 = "sha256-lMTOJFGuJhdXOvCk70Bee97Vb0HBCDnOLeK2q7S4hW8="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-1svBCXfutjXfXfVqVHUTAt9T1ON/qbiS+VCt5kP/YIc="; + vendorSha256 = "sha256-CzFcSvJCMfS83Semk92XUd9iSX6OjOrDzRUNNLVtpi4="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 1feb290bb13..35ae2ca3f14 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.47.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-1dMdQWV+gxbMc/2iVsB1LCsYxR0bt5AJEvoFq2/KHCg="; + sha256 = "sha256-XCOyvFWvgGxjuOdyFk4Rh+HO8GBdRfWcR73h+7lF+8E="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-ps6fUVg7vhGgy47WTJv/U1qHQ2MGXIWXNZ5Rddo1yQY="; + vendorSha256 = "sha256-BAcJpiO6jFKcjtbBA9LDad1ifDpb47nWOylH8dDBUN0="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/shellspec/default.nix b/pkgs/tools/misc/shellspec/default.nix index 27eead6e1c3..480ada8d571 100644 --- a/pkgs/tools/misc/shellspec/default.nix +++ b/pkgs/tools/misc/shellspec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, bash }: stdenv.mkDerivation rec { pname = "shellspec"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46"; }; + strictDeps = true; + buildInputs = [ bash ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; checkPhase = '' diff --git a/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch b/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch new file mode 100644 index 00000000000..c68f9f1d84d --- /dev/null +++ b/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch @@ -0,0 +1,51 @@ +diff --git a/lib/vquic/quiche.c b/lib/vquic/quiche.c +index bfdc966a85ea..e4bea4d677be 100644 +--- a/lib/vquic/quiche.c ++++ b/lib/vquic/quiche.c +@@ -201,23 +201,31 @@ static SSL_CTX *quic_ssl_ctx(struct Curl_easy *data) + + { + struct connectdata *conn = data->conn; +- const char * const ssl_cafile = conn->ssl_config.CAfile; +- const char * const ssl_capath = conn->ssl_config.CApath; +- + if(conn->ssl_config.verifypeer) { +- SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); +- /* tell OpenSSL where to find CA certificates that are used to verify +- the server's certificate. */ +- if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { +- /* Fail if we insist on successfully verifying the server. */ +- failf(data, "error setting certificate verify locations:" +- " CAfile: %s CApath: %s", +- ssl_cafile ? ssl_cafile : "none", +- ssl_capath ? ssl_capath : "none"); +- return NULL; ++ const char * const ssl_cafile = conn->ssl_config.CAfile; ++ const char * const ssl_capath = conn->ssl_config.CApath; ++ if(ssl_cafile || ssl_capath) { ++ SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); ++ /* tell OpenSSL where to find CA certificates that are used to verify ++ the server's certificate. */ ++ if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { ++ /* Fail if we insist on successfully verifying the server. */ ++ failf(data, "error setting certificate verify locations:" ++ " CAfile: %s CApath: %s", ++ ssl_cafile ? ssl_cafile : "none", ++ ssl_capath ? ssl_capath : "none"); ++ return NULL; ++ } ++ infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); ++ infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); + } +- infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); +- infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); ++#ifdef CURL_CA_FALLBACK ++ else { ++ /* verifying the peer without any CA certificates won't work so ++ use openssl's built-in default as fallback */ ++ SSL_CTX_set_default_verify_paths(ssl_ctx); ++ } ++#endif + } + } + return ssl_ctx; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 02ae74bd633..66d2dfcdb9a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -62,18 +62,21 @@ assert zstdSupport -> zstd != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.83.0"; + version = "7.83.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-JHx+x1IcQljmVjTlKScNIU/jKWmXHMy3KEXnqkaDH5Y="; + sha256 = "sha256-9Tmjb7RKgmDsXZd+Tg290u7intkPztqpvDyfeKETv/A="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch + # quiche: support ca-fallback + # https://github.com/curl/curl/commit/fdb5e21b4dd171a96cf7c002ee77bb08f8e58021 + ./7.83.1-quiche-support-ca-fallback.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -141,15 +144,24 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. - # https://github.com/curl/curl/issues/8696 - fallback is not supported by HTTP3 - (if http3Support then "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" else "--without-ca-bundle") + "--without-ca-bundle" "--without-ca-path" ]; CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - doCheck = false; # expensive, fails + doCheck = true; + preCheck = '' + patchShebangs tests/ + '' + lib.optionalString stdenv.isDarwin '' + # bad interaction with sandbox if enabled? + rm tests/data/test1453 + rm tests/data/test1086 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # different resolving behaviour? + rm tests/data/test1592 + ''; postInstall = '' moveToOutput bin/curl-config "$dev" diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/tools/nix/npins/default.nix new file mode 100644 index 00000000000..8324a2d8900 --- /dev/null +++ b/pkgs/tools/nix/npins/default.nix @@ -0,0 +1,44 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-gitignore +, makeWrapper +, stdenv +, darwin +, callPackage + + # runtime dependencies +, nix # for nix-prefetch-url +, nix-prefetch-git +, git # for git ls-remote +}: + +let + runtimePath = lib.makeBinPath [ nix nix-prefetch-git git ]; + sources = (builtins.fromJSON (builtins.readFile ./sources.json)).pins; +in rustPlatform.buildRustPackage rec { + pname = "npins"; + version = src.version; + src = passthru.mkSource sources.npins; + + cargoSha256 = "0rwnzkmx91cwcz9yw0rbbqv73ba6ggim9f4qgz5pgy6h696ld2k8"; + + buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + nativeBuildInputs = [ makeWrapper ]; + + # (Almost) all tests require internet + doCheck = false; + + postFixup = '' + wrapProgram $out/bin/npins --prefix PATH : "${runtimePath}" + ''; + + meta = with lib; { + description = "Simple and convenient dependency pinning for Nix"; + homepage = "https://github.com/andir/npins"; + license = licenses.eupl12; + maintainers = with maintainers; [ piegames ]; + }; + + passthru.mkSource = callPackage ./source.nix {}; +} diff --git a/pkgs/tools/nix/npins/source.nix b/pkgs/tools/nix/npins/source.nix new file mode 100644 index 00000000000..8c9e47204af --- /dev/null +++ b/pkgs/tools/nix/npins/source.nix @@ -0,0 +1,57 @@ +# Not part of the public API – for use within nixpkgs only +# +# Usage: +# ```nix +# let +# sources = builtins.fromJSON (builtins.readFile ./sources.json); +# in mkMyDerivation rec { +# version = src.version; # This obviously only works for releases +# src = pkgs.npins.mkSource sources.mySource; +# } +# ``` + +{ fetchgit +, fetchzip +, fetchurl +}: +let + mkSource = spec: + assert spec ? type; let + path = + if spec.type == "Git" then mkGitSource spec + else if spec.type == "GitRelease" then mkGitSource spec + else if spec.type == "PyPi" then mkPyPiSource spec + else if spec.type == "Channel" then mkChannelSource spec + else throw "Unknown source type ${spec.type}"; + in + spec // { outPath = path; }; + + mkGitSource = { repository, revision, url ? null, hash, ... }: + assert repository ? type; + # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository + # In the latter case, there we will always be an url to the tarball + if url != null then + (fetchzip { + inherit url; + sha256 = hash; + extension = "tar"; + }) + else assert repository.type == "Git"; fetchgit { + url = repository.url; + rev = revision; + }; + + mkPyPiSource = { url, hash, ... }: + fetchurl { + inherit url; + sha256 = hash; + }; + + mkChannelSource = { url, hash, ... }: + fetchzip { + inherit url; + sha256 = hash; + extension = "tar"; + }; +in + mkSource diff --git a/pkgs/tools/nix/npins/sources.json b/pkgs/tools/nix/npins/sources.json new file mode 100644 index 00000000000..0481abe3f97 --- /dev/null +++ b/pkgs/tools/nix/npins/sources.json @@ -0,0 +1,19 @@ +{ + "pins": { + "npins": { + "type": "GitRelease", + "repository": { + "type": "GitHub", + "owner": "andir", + "repo": "npins" + }, + "pre_releases": false, + "version_upper_bound": null, + "version": "0.1.0", + "revision": "5c9253ff6010f435ab73fbe1e50ae0fdca0ec07b", + "url": "https://api.github.com/repos/andir/npins/tarball/0.1.0", + "hash": "019fr9xsirld8kap75k18in3krkikqhjn4mglpy3lyhbhc5n1kh6" + } + }, + "version": 2 +} diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index d9c17f935ed..50148195754 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -44,16 +44,7 @@ stdenv.mkDerivation rec { gettext gtk-doc libxslt - # TODO: apply this to D-Bus so that other packages can benefit. - # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/202 - (dbus.overrideAttrs (attrs: { - postInstall = attrs.postInstall or "" + '' - ln -s ${fetchurl { - url = "https://gitlab.freedesktop.org/dbus/dbus/-/raw/b207135dbd8c09cf8da28f7e3b0a18bb11483663/doc/catalog.xml"; - sha256 = "1/43XwAIcmRXfM4OXOPephyQyUnW8DSveiZbiPvW72I="; - }} $out/share/xml/dbus-1/catalog.xml - ''; - })) + dbus docbook-xsl-nons docbook_xml_dtd_412 ]; diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index a94be8295ea..50a1ff98d14 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook gobject-introspection ] ++ (with python3.pkgs; [ - Babel + babel babelgladeextractor ]); diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index e82052d961b..e071f460b1a 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--ar=${stdenv.cc.targetPrefix}ar" + "--target=${stdenv.hostPlatform.config}" (lib.enableFeature enableStatic "static") (lib.enableFeature enableStatic "lib-static") ]; diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 921d524be6a..f443d765b57 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "witness"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fkY3/UmHzggmysrae8VCY3NMBxC/LcWoQcXBELEzJlM="; + sha256 = "sha256-i76sw5ysWDZwuNt7CYtpVy9mEV643i4YaMxksglyPWw="; }; - vendorSha256 = "sha256-ajWIjQXLvFQB1AVYyGjyWMrWIyue/d1uU5HHNf4/UcU="; + vendorSha256 = "sha256-A3fnAWEJ7SeUnDfIIOkbHIhUBRB8INcqMleOLL3LHF0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 44d50c0c963..7422b445d81 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,36 +1,28 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.2.7"; + version = "2.2.7b"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = pname; rev = "v${version}"; - sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7"; + sha256 = "sha256-S6OVKYulhvEPRqNXBsvZ7m2W4cbdnrpZKPAo3SfD+9s="; }; - patches = [ - ./fix-configure-path.patch - - # Fix parallel make depends: - # - https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch - # - https://github.com/Orc/discount/pull/245 - ./parallel-make.patch - ]; + patches = [ ./fix-configure-path.patch ]; configureScript = "./configure.sh"; - configureFlags = [ - "--enable-all-features" - "--pkg-config" "--shared" - "--with-fenced-code" - # Use deterministic mangling - "--debian-glitch" + "--debian-glitch" # use deterministic mangling + "--pkg-config" + "--h1-title" ]; enableParallelBuilding = true; + installTargets = [ "install.everything" ]; + doCheck = true; postFixup = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/text/discount/parallel-make.patch b/pkgs/tools/text/discount/parallel-make.patch deleted file mode 100644 index 583622a9152..00000000000 --- a/pkgs/tools/text/discount/parallel-make.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/Orc/discount/pull/245 -https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch - -Fix parallel make failure: add missing pandoc_headers dependency. ---- a/Makefile.in -+++ b/Makefile.in -@@ -139,7 +139,7 @@ test: $(PGMS) $(TESTFRAMEWORK) verify - - pandoc_headers.o: tools/pandoc_headers.c config.h - $(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c --pandoc_headers: pandoc_headers.o -+pandoc_headers: pandoc_headers.o $(COMMON) $(MKDLIB) - $(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown - - branch.o: tools/branch.c config.h diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index c685ef60331..3e348f159c1 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , python3 +, flex , sqlite , libedit , runCommand @@ -13,18 +14,19 @@ let link-grammar = stdenv.mkDerivation rec { pname = "link-grammar"; - version = "5.10.2"; + version = "5.10.4"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY="; + sha256 = "sha256-Pd4tEsre7aGTlEoereSElisCGXXhwgZDTMt4UEZIf4E="; }; nativeBuildInputs = [ pkg-config python3 + flex ]; buildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 271e5ba4c85..eb5340740ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -112,6 +112,7 @@ mapAliases ({ bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09 bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 + beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 bird2 = bird; # Added 2022-02-21 @@ -566,6 +567,8 @@ mapAliases ({ icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14 + icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14 idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 imagemagick7Big = imagemagickBig; # Added 2021-02-22 @@ -677,6 +680,7 @@ mapAliases ({ liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 + libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; libpng_apng = throw "libpng_apng has been removed, because it is equivalent to libpng"; # Added 2021-03-21 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 @@ -868,6 +872,7 @@ mapAliases ({ navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 + neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03b807a0686..bd2206f92bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -987,6 +987,8 @@ with pkgs; adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { }; + addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { }; + addlicense = callPackage ../tools/misc/addlicense { }; adlplug = callPackage ../applications/audio/adlplug { @@ -4013,6 +4015,8 @@ with pkgs; notify = callPackage ../tools/misc/notify { }; + npins = callPackage ../tools/nix/npins { }; + nrsc5 = callPackage ../applications/misc/nrsc5 { }; nsync = callPackage ../development/libraries/nsync { }; @@ -4405,28 +4409,8 @@ with pkgs; bee-clef = callPackage ../applications/networking/bee/bee-clef.nix { }; - beets = callPackage ../tools/audio/beets { - pythonPackages = python3Packages; - }; - - beetsExternalPlugins = - let - pluginArgs = { - # This is a stripped down beets for testing of the external plugins. - beets = (beets.override { - enableAlternatives = false; - enableCopyArtifacts = false; - enableExtraFiles = false; - }).overrideAttrs (lib.const { - doInstallCheck = false; - }); - pythonPackages = python3Packages; - }; - in lib.recurseIntoAttrs { - alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; - copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs; - extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; - }; + beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); + inherit (beetsPackages) beets beets-unstable; bento4 = callPackage ../tools/video/bento4 { }; @@ -5307,7 +5291,9 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - dump_syms = callPackage ../development/tools/dump_syms { }; + dump_syms = callPackage ../development/tools/dump_syms { + inherit (darwin.apple_sdk.frameworks) Security; + }; dumptorrent = callPackage ../tools/misc/dumptorrent { }; @@ -8518,8 +8504,6 @@ with pkgs; neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; - neochat = libsForQt5.callPackage ../applications/networking/instant-messengers/neochat { }; - neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -14516,6 +14500,8 @@ with pkgs; poetry2conda = python3Packages.callPackage ../development/python-modules/poetry2conda { }; + pip-audit = callPackage ../development/tools/pip-audit {}; + pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire { @@ -16572,10 +16558,7 @@ with pkgs; arrayfire = callPackage ../development/libraries/arrayfire {}; - arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' - }); + arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; arsenal = callPackage ../tools/security/arsenal { }; @@ -17882,65 +17865,34 @@ with pkgs; icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; - } // - (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); - icu59 = callPackage ../development/libraries/icu/59.nix ({ - nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu64 = callPackage ../development/libraries/icu/64.nix ({ nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); - icu65 = callPackage ../development/libraries/icu/65.nix ({ - nativeBuildRoot = buildPackages.icu65.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu66 = callPackage ../development/libraries/icu/66.nix ({ nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu67 = callPackage ../development/libraries/icu/67.nix ({ nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu68 = callPackage ../development/libraries/icu/68.nix ({ nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu69 = callPackage ../development/libraries/icu/69.nix ({ nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu70 = callPackage ../development/libraries/icu/70.nix ({ nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu71 = callPackage ../development/libraries/icu/71.nix ({ nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu = icu71; @@ -19036,8 +18988,6 @@ with pkgs; libnftnl = callPackage ../development/libraries/libnftnl { }; - libnih = callPackage ../development/libraries/libnih { }; - libnova = callPackage ../development/libraries/science/astronomy/libnova { }; libnxml = callPackage ../development/libraries/libnxml { }; @@ -23273,6 +23223,8 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; + linuxPackages_5_17_hardened = linuxKernel.packages.linux_5_17_hardened; + linux_5_17_hardened = linuxKernel.kernels.linux_5_17_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 7c892035e7f..8196811a7b2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -236,6 +236,7 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; + linux_5_17_hardened = hardenedKernelFor kernels.linux_5_17 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d76d079eab2..d8e5c19f0c7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -38,6 +38,7 @@ mapAliases ({ anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 argon2_cffi = argon2-cffi; # added 2022-05-09 asyncio-nats-client = nats-py; # added 2022-02-08 + Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e25e0968fa7..3f538812767 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -195,8 +195,6 @@ in { addict = callPackage ../development/python-modules/addict { }; - addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; - adext = callPackage ../development/python-modules/adext { }; adguardhome = callPackage ../development/python-modules/adguardhome { }; @@ -1099,7 +1097,7 @@ in { b2sdk = callPackage ../development/python-modules/b2sdk { }; - Babel = callPackage ../development/python-modules/Babel { }; + babel = callPackage ../development/python-modules/babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; @@ -3234,6 +3232,8 @@ in { ftputil = callPackage ../development/python-modules/ftputil { }; + func-timeout = callPackage ../development/python-modules/func-timeout { }; + funcparserlib = callPackage ../development/python-modules/funcparserlib { }; funcsigs = callPackage ../development/python-modules/funcsigs { }; @@ -6385,6 +6385,8 @@ in { pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; + pip-api = callPackage ../development/python-modules/pip-api { }; + pip-tools = callPackage ../development/python-modules/pip-tools { }; pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { }; @@ -7264,7 +7266,7 @@ in { pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; - pygments = callPackage ../development/python-modules/Pygments { }; + pygments = callPackage ../development/python-modules/pygments { }; pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; @@ -10948,6 +10950,8 @@ in { wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; + wcag-contrast-ratio = callPackage ../development/python-modules/wcag-contrast-ratio { }; + wcmatch = callPackage ../development/python-modules/wcmatch { }; wcwidth = callPackage ../development/python-modules/wcwidth { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 8551c5f9bff..6459e6291f8 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -203,6 +203,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; + qtmpris = callPackage ../development/libraries/qtmpris { }; + qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };