From 890437821134149478359b0781bd085ebdace0bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 13:52:22 +0000 Subject: [PATCH 01/41] klipper: unstable-2022-03-11 -> unstable-2022-03-14 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index e2932c16a109..5ac0fef1555e 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2022-03-11"; + version = "unstable-2022-03-14"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "e3beafbdb4f2ac3f889f81aec0cad5ec473c8612"; - sha256 = "sha256-xZSZUJ2TNaUzfwEFpnzr5EPlOvILLyiQ/3K1iiup7kU="; + rev = "30098db22a43274ceb87e078e603889f403a35c4"; + sha256 = "sha256-ORpXBFGPY6A/HEYX9Hhwb3wP2KcAE+z3pTxf6j7CwGg="; }; sourceRoot = "source/klippy"; From b0a6341bb7ba2205d1de1c4cd99ac3272b36a16d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Mar 2022 15:56:04 +0000 Subject: [PATCH 02/41] joker: 0.18.0 -> 1.0.0 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 141bda75fa88..ae408f5fec5e 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.18.0"; + version = "1.0.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-Iia4sl8lRTpek5aZvQW/yy+TnMq5KNJH+pBnksqL/G0="; + sha256 = "sha256-SlkhxALJwrZ/DOuBbqjb+wHEfT5mhd3lSD6E0geFP4Y="; }; vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA="; From b598eae35a80364534971102f78733d0bc6bc078 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 12:50:38 +0000 Subject: [PATCH 03/41] doctl: 1.71.1 -> 1.72.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index d7667538e8e5..9c428347d8f1 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.71.1"; + version = "1.72.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-Y6YabrpM1WcNGp5ksvq3SBuAS6KEUVzEfxsPmBDS+Io="; + sha256 = "sha256-+8uGh7cvNndBBLdTfbYDxfn7Z+4LPPgqeseLcR1P468="; }; meta = with lib; { From ead7f8fb35333edd4337e6b7091422db6a763bfa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Mar 2022 14:08:35 +0000 Subject: [PATCH 04/41] nq: 0.4 -> 0.5 --- pkgs/tools/system/nq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 239ac1368ad6..133ce941faa5 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nq"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "nq"; rev = "v${version}"; - sha256 = "sha256-UfCeHwOD+tG6X2obW64DYZr6j90yh1Yl7My4ur+sqmk="; + sha256 = "sha256-g14t2Wy2GwiqnfEDiLAPGehzUgK6mLC+5PAZynez62s="; }; makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' From 1f72f975349e71525983050a09c62e18cca75ef3 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 4 Apr 2022 03:15:14 +0000 Subject: [PATCH 05/41] marathonctl: 2017-03-06 -> 0.0.7 --- .../virtualization/marathonctl/default.nix | 20 +++++++++---------- .../tools/virtualization/marathonctl/deps.nix | 12 ----------- 2 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 pkgs/tools/virtualization/marathonctl/deps.nix diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index fe31c64952a5..12111819c26b 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,20 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { - pname = "marathonctl-unstable"; - version = "2017-03-06"; - - goPackagePath = "github.com/shoenig/marathonctl"; - subPackages = [ "." ]; - goDeps = ./deps.nix; +buildGoModule rec { + pname = "marathonctl"; + version = "0.0.7"; src = fetchFromGitHub { owner = "shoenig"; repo = "marathonctl"; - rev = "0867e66551fff5d81f25959baf914a8ee11a3a8b"; - sha256 = "1fcc54hwpa8s3kz4gn26mc6nrv6zjrw869331nvm47khi23gpmxw"; + rev = "v${version}"; + sha256 = "sha256-MigmvOwYa0uYPexchS4MP74I1Tp6QHYuQVSOh1+FrMg="; }; + vendorSha256 = "sha256-Oiol4KuPOyJq2Bfc5div+enX4kQqYn20itmwWBecuIg="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/shoenig/marathonctl"; description = "CLI tool for Marathon"; diff --git a/pkgs/tools/virtualization/marathonctl/deps.nix b/pkgs/tools/virtualization/marathonctl/deps.nix deleted file mode 100644 index 39efaab95358..000000000000 --- a/pkgs/tools/virtualization/marathonctl/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/shoenig/config"; - fetch = { - type = "git"; - url = "https://github.com/shoenig/config"; - rev = "7d793e7ad7f175ef22743b1ea38acee8267788db"; - sha256 = "1dhcv1j5xk30kj73dfnx3xqx8mcvk9r8ywp9khgf2kq6wh9sm1qr"; - }; - } -] From e40b63c1da1a8d6134f06242f2f67e97d7a871c0 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 4 Apr 2022 14:35:00 +0000 Subject: [PATCH 06/41] kompose: 1.21.0 -> 1.26.1 --- .../networking/cluster/kompose/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index c01e1c8c0041..517ab55d9d2d 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,19 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }: -buildGoPackage rec { +buildGoModule rec { pname = "kompose"; - version = "1.21.0"; - - goPackagePath = "github.com/kubernetes/kompose"; + version = "1.26.1"; src = fetchFromGitHub { - rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "15a1alf6ywwfc4z5kdcnv64fp3cfy3qrcw62ny6xyn1kh1w24vkh"; + rev = "v${version}"; + sha256 = "sha256-NfzqGG5ZwPpmjhvcvXN1AA+kfZG/oujbAEtXkm1mzeU="; }; + vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc="; + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; + postInstall = '' for shell in bash zsh; do $out/bin/kompose completion $shell > kompose.$shell @@ -21,6 +26,11 @@ buildGoPackage rec { done ''; + passthru.tests.version = testVersion { + package = kompose; + command = "kompose version"; + }; + meta = with lib; { description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; homepage = "https://kompose.io"; From daa65aca3aaadbb5e67de4ee5d0b73d22c02ab77 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 4 Apr 2022 14:00:59 +0000 Subject: [PATCH 07/41] gosu: unstable-2017-05-09 -> 1.4 --- pkgs/tools/misc/gosu/default.nix | 25 +++++++++++++++---------- pkgs/tools/misc/gosu/deps.nix | 11 ----------- 2 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/misc/gosu/deps.nix diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index d4c233007d26..0831649f6008 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,24 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testVersion, gosu }: -buildGoPackage rec { +buildGoModule rec { pname = "gosu"; - version = "unstable-2017-05-09"; - - goPackagePath = "github.com/tianon/gosu"; + version = "1.14"; src = fetchFromGitHub { owner = "tianon"; repo = "gosu"; - rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; - sha256 = "sha256-Ff0FXJg3z8akof+/St1JJu1OO1kS5gMtxSRnCLpj4eI="; + rev = version; + sha256 = "sha256-qwoHQB37tY8Pz8CHleYZI+SGkbHG7P/vgfXVMSyqi10="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-yxrOLCtSrY/a84N5yRWGUx1L425TckjvRyn/rtkzsRY="; - meta = { - description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; + ldflags = [ "-d" "-s" "-w" ]; + + passthru.tests.version = testVersion { + package = gosu; + }; + + meta = with lib; { + description = "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; license = lib.licenses.gpl3; + maintainers = with maintainers; [ aaronjheng ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/gosu/deps.nix b/pkgs/tools/misc/gosu/deps.nix deleted file mode 100644 index 9bdfa3923401..000000000000 --- a/pkgs/tools/misc/gosu/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "5274430fee9bc930598cfd9c9dbd33213f79f96e"; - sha256 = "149057gm2y1mc45s7bh43c1ngjg1m54jkpaxw534ir9v5mb1zsxx"; - }; - } -] From 08f0b6cf00b0ee29326b879b4f32e0769d8c1239 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 19:17:18 +0000 Subject: [PATCH 08/41] helm-docs: 1.7.0 -> 1.8.1 --- pkgs/applications/networking/cluster/helm-docs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index f7c05843bcfc..1d3c9f43e906 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-TXwEVyRYRiVqCDL7IR+DIu1iKqaq81W5xkvz+laxVek="; + sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw="; }; - vendorSha256 = "sha256-XTV0gyUWe6G5gxucsXOaDOUQoKMCfhrWzlKwUOaA6y4="; + vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ From 5ba31f02b866de9e409bdbb35fdec8dd90a2fb0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Apr 2022 02:09:35 +0000 Subject: [PATCH 09/41] masterpdfeditor: 5.8.33 -> 5.8.46 --- pkgs/applications/misc/masterpdfeditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index cab136d55dc9..68453252ba53 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.8.33"; + version = "5.8.46"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-sgLF/NpaNlkL5iA1l7QzMiYKwRcMDu2DHdTIaeHOtfI="; + sha256 = "sha256-xms4aqIxYXR6v226RMf+abrFU1xz2aDIL6iQ+Yfff1k="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; From 9b8e5b524b045e60558b98d074df29bc788d82c9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 10 Apr 2022 07:46:10 +0000 Subject: [PATCH 10/41] c14: remove --- pkgs/applications/networking/c14/default.nix | 22 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/applications/networking/c14/default.nix diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix deleted file mode 100644 index 3a9192164adf..000000000000 --- a/pkgs/applications/networking/c14/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "c14-cli"; - version = "0.3"; - - goPackagePath = "github.com/online-net/c14-cli"; - - src = fetchFromGitHub { - owner = "online-net"; - repo = "c14-cli"; - rev = version; - sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; - }; - - meta = with lib; { - description = "C14 is designed for data archiving & long-term backups"; - homepage = "https://www.online.net/en/storage/c14-cold-storage"; - license = licenses.mit; - maintainers = with maintainers; [ apeyroux ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6f9aadf4b76a..50170ca15da3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -141,6 +141,7 @@ mapAliases ({ ### C ### + c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2e3f168abd5..90c5080ae1aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4508,8 +4508,6 @@ with pkgs; code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; }; - c14 = callPackage ../applications/networking/c14 { }; - certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; From 224426ba6d4370ede958c127d9b9866a189522f9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 24 Apr 2022 00:07:59 +0200 Subject: [PATCH 11/41] lib.types.submoduleWith: Avoid _key collisions after extendModules --- lib/modules.nix | 8 +++- lib/tests/modules.sh | 6 ++- .../modules/extendModules-168767-imports.nix | 41 +++++++++++++++++++ lib/types.nix | 10 ++++- 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 lib/tests/modules/extendModules-168767-imports.nix diff --git a/lib/modules.nix b/lib/modules.nix index abcdd1a894cc..0b3560a12661 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -113,6 +113,10 @@ rec { args ? {} , # This would be remove in the future, Prefer _module.check option instead. check ? true + # Internal variable to avoid `_key` collisions regardless + # of `extendModules`. Used in `submoduleWith`. + # Test case: lib/tests/modules, "168767" + , extensionOffset ? 0 }: let withWarnings = x: @@ -338,15 +342,17 @@ rec { modules ? [], specialArgs ? {}, prefix ? [], + extensionOffset ? length modules, }: evalModules (evalModulesArgs // { modules = regularModules ++ modules; specialArgs = evalModulesArgs.specialArgs or {} // specialArgs; prefix = extendArgs.prefix or evalModulesArgs.prefix; + inherit extensionOffset; }); type = lib.types.submoduleWith { - inherit modules specialArgs; + inherit modules specialArgs extensionOffset; }; result = withWarnings { diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 8050c6539fc2..cc13a8d38e37 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -293,7 +293,7 @@ checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix # moduleType checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix -checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix +checkConfigOutput '^"a b y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix ## emptyValue's @@ -327,6 +327,10 @@ checkConfigError 'The option .theOption.nested. in .other.nix. is already declar # Test that types.optionType leaves types untouched as long as they don't need to be merged checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix +# Anonymous submodules don't get nixed by import resolution/deduplication +# because of an `extendModules` bug, issue 168767. +checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-imports.nix + cat < Date: Sat, 23 Apr 2022 23:26:46 +0200 Subject: [PATCH 12/41] qt5: use 1t5.15 LTS for certain packages use qt5.15 LTS instead of 5.14 for packages currently not building due to broken qtwebengine 5.14 (see https://github.com/NixOS/nixpkgs/issues/169996) packages were checked on hydra and if broken, tried to build with qt 5.15. If this succeeded, they were upgraded here. Signed-off-by: Florian Brandes --- pkgs/top-level/all-packages.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84bbec974b6c..2d7d066d40a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7725,7 +7725,7 @@ with pkgs; ninka = callPackage ../development/tools/misc/ninka { }; - nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; + nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; nodenv = callPackage ../development/tools/nodenv { }; @@ -8663,7 +8663,7 @@ with pkgs; nmap-formatter = callPackage ../tools/security/nmap-formatter { }; - nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; + nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -12186,7 +12186,7 @@ with pkgs; colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; + colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; @@ -27552,7 +27552,7 @@ with pkgs; libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; - librecad = libsForQt514.callPackage ../applications/misc/librecad { + librecad = libsForQt5.callPackage ../applications/misc/librecad { boost = boost175; }; @@ -27833,8 +27833,7 @@ with pkgs; meme-suite = callPackage ../applications/science/biology/meme-suite { }; - # Needs qtwebkit which is broken on qt5.15 - mendeley = libsForQt514.callPackage ../applications/office/mendeley { + mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = gnome2.GConf; }; @@ -28945,7 +28944,7 @@ with pkgs; qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; - qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt { + qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt { gdal = gdal.override { libgeotiff = libgeotiff.override { proj = proj_7; }; libspatialite = libspatialite.override { proj = proj_7; }; @@ -30119,7 +30118,7 @@ with pkgs; virtual-ans = callPackage ../applications/audio/virtual-ans {}; - virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -30402,7 +30401,7 @@ with pkgs; worldengine-cli = python3Packages.worldengine; - wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -34867,7 +34866,7 @@ with pkgs; inherit pkgs lib stdenv; }; - golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; From 126d6553b34e4efb555fe4f554394bdaad902905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Apr 2022 06:44:17 +0000 Subject: [PATCH 13/41] python310Packages.pg8000: 1.26.0 -> 1.26.1 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index f22df192148b..c871a7bccb85 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.0"; + version = "1.26.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-niXqE6W3/Mg7AmBR18bk3NUiHpUOvlOT3nFaP+oVJ9M="; + sha256 = "sha256-zNK2/hkK3ddMCTpivgcwuemfPqA6oO96uV7Rt/9p0lc="; }; propagatedBuildInputs = [ From 0a803ad7098f3074ef266e607d2fd62e4a354c5a Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 25 Apr 2022 16:37:35 +0200 Subject: [PATCH 14/41] freerdp: 2.6.1 -> 2.7.0 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 852fcf68987e..99a81fd1a809 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U="; + sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0="; }; postPatch = '' From d14db18fc785c543c0b38aa5425f7a38d9643921 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Apr 2022 16:25:41 +0000 Subject: [PATCH 15/41] python310Packages.fuse: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/fuse-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index f1bf6e39a069..46cf6ec53459 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fuse-python"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "b9a69c38b3909ffd35d77cb1a73ebfdc3a103a6d4cdd20c86c70ed1141771580"; + sha256 = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o="; }; buildInputs = [ fuse ]; From 0dc64213dc7d792ea07deda5da31ad53ec8b40f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Apr 2022 21:40:09 +0200 Subject: [PATCH 16/41] python3Packages.update-dotdee: disable failing test - update inputs - add pythonImportsCheck - switch to pytestCheckHook - disable on older Python releases --- .../python-modules/update-dotdee/default.nix | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix index 1532fca78c4c..a89f0df403c3 100644 --- a/pkgs/development/python-modules/update-dotdee/default.nix +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -1,17 +1,56 @@ -{ lib, buildPythonPackage, fetchFromGitHub, executor, naturalsort }: +{ lib +, buildPythonPackage +, coloredlogs +, executor +, fetchFromGitHub +, humanfriendly +, naturalsort +, property-manager +, pytestCheckHook +, pythonOlder +, six +}: buildPythonPackage rec { pname = "update-dotdee"; version = "6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "xolox"; repo = "python-update-dotdee"; rev = version; - sha256 = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A="; + hash = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A="; }; - propagatedBuildInputs = [ executor naturalsort ]; + propagatedBuildInputs = [ + coloredlogs + executor + humanfriendly + naturalsort + property-manager + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov --showlocals --verbose" "" + ''; + + pythonImportsCheck = [ + "update_dotdee" + ]; + + disabledTests = [ + # TypeError: %o format: an integer is required, not str + "test_executable" + ]; meta = with lib; { description = "Generic modularized configuration file manager"; From 9759288f340754dbe1a33e55343a1931eb807140 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 25 Apr 2022 19:08:54 -0300 Subject: [PATCH 17/41] hcloud: 1.29.0 -> 1.29.5 * Enable tests * Minor refactoring --- pkgs/development/tools/hcloud/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 0e9474e4f390..4d7197937d70 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,23 +2,24 @@ buildGoModule rec { pname = "hcloud"; - version = "1.29.0"; + version = "1.29.5"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-B5L4vK5JkcYHqdyxAsP+tBcA6PtM2Gd4JwtW5nMuIXQ="; + sha256 = "sha256-a+AXWr/60VFdNk+UkDYRXo5ib8LvaCVpjNi1GFrRVho="; }; + vendorSha256 = "sha256-iJnjmfP9BcT+OXotbS2+OSWGxQaMXwdlR1WTi04FesM="; + + ldflags = [ + "-s" "-w" + "-X github.com/hetznercloud/cli/cli.Version=${version}" + ]; + nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-3YU6vAIzTzkEwyMPH4QSUuQ1PQlrWnfRRCA1fHMny48="; - - doCheck = false; - - ldflags = [ "-s" "-w" "-X github.com/hetznercloud/cli/cli.Version=${version}" ]; - postInstall = '' for shell in bash zsh; do $out/bin/hcloud completion $shell > hcloud.$shell From 6da8554b2eb85ce06dd86f5549ff54fff2a43d73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Apr 2022 00:19:45 +0200 Subject: [PATCH 18/41] nuclei: 2.6.8 -> 2.6.9 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index cc24c3114af8..2ca79ed25a49 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.6.8"; + version = "2.6.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XVABgsmPRNseWN+iNfbjicoNuHyZSrrlVOV3YEX7DPU="; + sha256 = "sha256-BGWlkNj0LQ02BSUWQYjoT4bR0t/DmNB0jBpvwB/gWwo="; }; - vendorSha256 = "sha256-Mibn93EviweuEsMF2d1kQAJtss/ELlJQIZTM7To2dkg="; + vendorSha256 = "sha256-ar62CZ/2zXO3lwvWNiIAt9XITj2Y/0iIYGX8tmSCwcU="; modRoot = "./v2"; subPackages = [ From eddb2a151f1ed061e6aa2129866305a0a165de26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Apr 2022 00:29:56 +0200 Subject: [PATCH 19/41] checkov: 2.0.1077 -> 2.0.1084 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index fca7695757cb..9b1472f53b41 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.1077"; + version = "2.0.1084"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-Jrwgm5diBSJGY0DFG6r6iv1VQwwawKy04K8/y8yokYI="; + hash = "sha256-bzmXLqjtl742UcjBpYQdtiTKO6Oe/x7lGoJZh+uJzUo="; }; nativeBuildInputs = with py.pkgs; [ From c0212333c618ab675bd31424706f9fc0c8351673 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 01:26:50 +0000 Subject: [PATCH 20/41] python310Packages.mkdocs-material: 8.2.9 -> 8.2.11 --- pkgs/development/python-modules/mkdocs-material/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 41eff2026b97..50917777bc9c 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.2.9"; + version = "8.2.11"; src = fetchFromGitHub { owner = "squidfunk"; repo = pname; - rev = version; - sha256 = "sha256-lrklTQWWsP1rjixqu5/S7XMN+K095NRGv3JkjRQ4brM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg="; }; propagatedBuildInputs = [ From 5c0ff7c3d993130cdc0e132d0a7a146390618ea2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 02:42:32 +0000 Subject: [PATCH 21/41] python310Packages.hahomematic: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index d54f93b9b2dc..cf7acf0f484e 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.1.4"; + version = "1.1.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-it3Hku0k+o2v+KeykCO3W5CxOpkWbGXT055Kq6cSDzo="; + sha256 = "sha256-wuoc+A+KoqH/OdZ7/Rj/RZjgRLMU1WrRFqlS3TzJL4I="; }; propagatedBuildInputs = [ From 9e39f6eae2b1aad269142191e858010c18869553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 26 Apr 2022 03:17:28 +0000 Subject: [PATCH 22/41] python3Packages.aprslib: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/aprslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix index 67d585d36ed0..7c2fa222bd2c 100644 --- a/pkgs/development/python-modules/aprslib/default.nix +++ b/pkgs/development/python-modules/aprslib/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aprslib"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "rossengeorgiev"; repo = "aprs-python"; rev = "v${version}"; - sha256 = "sha256-QasyF0Ch4zdPoAgcqRavEENVGA/02/AgeWAgXYcSUjk="; + hash = "sha256-wWlzOFhWJ7hJeM3RWsPTEsLjRzN4SMXsb2Cd612HB4w="; }; checkInputs = [ From 5c63410e0eb6bb61804abfeabefa7bdcc32153e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 26 Apr 2022 03:21:10 +0000 Subject: [PATCH 23/41] python3Packages.pycoolmasternet-async: 0.1.2 -> 0.1.3 --- .../python-modules/pycoolmasternet-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix index 45b40ddeadb9..909feb944328 100644 --- a/pkgs/development/python-modules/pycoolmasternet-async/default.nix +++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pycoolmasternet-async"; - version = "0.1.2"; + version = "0.1.3"; disabled = pythonOlder "3.7"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pycoolmasternet-async"; rev = "v${version}"; - sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g"; + hash = "sha256-1Xd8OdN8d3g23kQZqihZrNLKoqLCbu5BvAMNitg8aDA="; }; # no tests implemented From df2e11770d0797853a5f77ecf48096533091ca65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 03:29:41 +0000 Subject: [PATCH 24/41] python310Packages.mypy-boto3-s3: 1.21.34 -> 1.22.0.post1 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index fe0933f7bd9e..c77dc3846636 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.21.34"; + version = "1.22.0.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-gXvMC+GZknL+jYG9ZQD1/dqRhMwXrZvXG8CvCFYxdco="; + hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4="; }; propagatedBuildInputs = [ From 3a27c7fe7083b752bf62bd3936ae7fa80a6f71ff Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 25 Apr 2022 22:10:40 -0700 Subject: [PATCH 25/41] clucene_core_2: fix cross compile --- pkgs/development/libraries/clucene-core/2.x.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 52caa26c9c58..861e9179e094 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0" "-D_CL_HAVE_NAMESPACES_EXITCODE=0" + "-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0" - "-D_CL_HAVE_NO_SNWPRINTF_BUG_EXITCODE=0" + "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0" + "-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0" "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0" + "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT=" ]; patches = # From debian From 05a6bcb708967bb6ceff019207c607c253612cf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 05:35:15 +0000 Subject: [PATCH 26/41] python310Packages.pyoppleio: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/pyoppleio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoppleio/default.nix b/pkgs/development/python-modules/pyoppleio/default.nix index 2503eb5d001f..f0d11d86c7c2 100644 --- a/pkgs/development/python-modules/pyoppleio/default.nix +++ b/pkgs/development/python-modules/pyoppleio/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyoppleio"; - version = "1.0.6"; + version = "1.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q//uJ+2m9S0r+Jsa5Eye90YSw4cKzd04vPHMm89j8kg="; + hash = "sha256-S1w3pPqhX903kkXUq9ALz0+zRvNGOimLughRRVKjV8E="; }; propagatedBuildInputs = [ From bea03532b9a185ff62ae4540ebf6999eea407747 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Apr 2022 08:56:29 +0200 Subject: [PATCH 27/41] python3Packages.mkdocs-material: disable on older Python releases --- .../python-modules/mkdocs-material/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 50917777bc9c..a0df10008926 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -1,21 +1,28 @@ -{ lib, callPackage, buildPythonApplication, fetchFromGitHub +{ lib +, callPackage +, buildPythonApplication +, fetchFromGitHub , jinja2 , markdown , mkdocs , mkdocs-material-extensions , pygments , pymdown-extensions +, pythonOlder }: buildPythonApplication rec { pname = "mkdocs-material"; version = "8.2.11"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg="; + hash = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg="; }; propagatedBuildInputs = [ @@ -30,7 +37,9 @@ buildPythonApplication rec { # No tests for python doCheck = false; - pythonImportsCheck = [ "mkdocs" ]; + pythonImportsCheck = [ + "mkdocs" + ]; meta = with lib; { description = "Material for mkdocs"; From 48d473f1c319157f85a1e22cd1e16e8831c81227 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 20 Apr 2022 08:47:15 +0200 Subject: [PATCH 28/41] upower: fix cross-compilation support Disable gtk-doc and introspection when cross-compiling --- pkgs/os-specific/linux/upower/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index aff9125c236d..f083184a1145 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -18,13 +18,15 @@ , systemd , useIMobileDevice ? true , libimobiledevice +, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform) }: stdenv.mkDerivation rec { pname = "upower"; version = "0.99.17"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optionals withDocs [ "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -34,6 +36,12 @@ stdenv.mkDerivation rec { sha256 = "xvvqzGxgkuGcvnO12jnLURNJUoSlnMw2g/mnII+i6Bs="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -66,6 +74,8 @@ stdenv.mkDerivation rec { "-Dos_backend=linux" "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "auto" else "disabled"}" + "-Dgtk-doc=${lib.boolToString withDocs}" ]; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" From c7352fbc0eba3f2d7d06a429e997cb3a5b53c603 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 07:23:44 +0000 Subject: [PATCH 29/41] python310Packages.winsspi: 0.0.9 -> 0.0.10 --- pkgs/development/python-modules/winsspi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix index ea880234c0bf..f0f076ff9503 100644 --- a/pkgs/development/python-modules/winsspi/default.nix +++ b/pkgs/development/python-modules/winsspi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "winsspi"; - version = "0.0.9"; + version = "0.0.10"; src = fetchPypi { inherit pname version; - sha256 = "1q8hr8l8d9jxyp55qsrlkyhdhqjc0n18ajzms7hf1xkhdl7rrbd2"; + sha256 = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s="; }; propagatedBuildInputs = [ minikerberos ]; From 162ea08aab1a156308a6f35bec867479da5be4b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 07:35:14 +0000 Subject: [PATCH 30/41] python310Packages.pypykatz: 0.5.6 -> 0.5.7 --- pkgs/development/python-modules/pypykatz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 67b5bf8be9e9..72fdb6d3c5b4 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.5.6"; + version = "0.5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iuLQfdRNxy6Z+7sYGG+dSHlxicOPtNOdB/VNLyZjRsY="; + hash = "sha256-G+dbP+xtRH8dIU70HbimRJV+e/yYlo2ds5OAIzUcydY="; }; propagatedBuildInputs = [ From 2be43f13935d1e65718f3453d4159bf66c2c4f6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Apr 2022 10:05:34 +0200 Subject: [PATCH 31/41] python3Packages.winsspi: disable on older Python releases --- .../python-modules/winsspi/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix index f0f076ff9503..6869c9f0b08a 100644 --- a/pkgs/development/python-modules/winsspi/default.nix +++ b/pkgs/development/python-modules/winsspi/default.nix @@ -2,21 +2,31 @@ , buildPythonPackage , fetchPypi , minikerberos +, pythonOlder }: buildPythonPackage rec { pname = "winsspi"; version = "0.0.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s="; + hash = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s="; }; - propagatedBuildInputs = [ minikerberos ]; - # Project doesn't have tests + propagatedBuildInputs = [ + minikerberos + ]; + + # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ "winsspi" ]; + + pythonImportsCheck = [ + "winsspi" + ]; meta = with lib; { description = "Python module for ACL/ACE/Security descriptor manipulation"; From dd4ca36aac752f0b15824b241343d8d7bb0ac006 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Apr 2022 10:24:16 +0200 Subject: [PATCH 32/41] natscli: 0.0.30 -> 0.0.32 --- pkgs/tools/system/natscli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index c889bffcf896..949ad31a0185 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.30"; + version = "0.0.32"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+WvJWHRQr5wYV9TG5e379trBO2Gwy0/4bAEJNwDun7s="; + sha256 = "sha256-/bK7eQaH5VpYm0lfL43DtVxEeoo4z0Ns1ykuA0osPAs="; }; - vendorSha256 = "sha256-IHDJp+cjukX916dvffpv4Wit9kmuY101fasN+ChMxWQ="; + vendorSha256 = "sha256-qg3fmFBHeKujNQr7WFhkdvMQeR/PCBzqTHHeNsCrrMc="; meta = with lib; { description = "NATS Command Line Interface"; From 0c922b4ea680ff2fa2d7c120c0eaea32694f7eb0 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 25 Apr 2022 18:07:10 -0700 Subject: [PATCH 33/41] evtest: update sha256 hash Commit 6df37c9aab85fb1494e2a106b5491a3fc1f7f278 bumped the version of evtest but failed to update the hash. As a result, hosts which already have evtest-1.33 source present will build the old version but label it as evtest-1.34. Hosts which lack the older source code will fail their builds. This commit corrects the issue. We should think about a way to get Hydra to catch issues like this. Maybe require that if two FODs have different hashes then they must have different `${pname}-${version}`s? Only for FODs, of course. --- pkgs/applications/misc/evtest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 84fae703a0c3..c4b0df2cc0d5 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://anongit.freedesktop.org/${pname}"; rev = "refs/tags/${pname}-${version}"; - sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g"; + sha256 = "sha256-0UGcoGkNF/19aSTWNEFAmZP7seL/yObXsOLlZLiyG2Q="; }; meta = with lib; { From 89f390a40b79bcf2170c4060540a5392c8d1a06a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 4 Apr 2022 03:34:12 +0000 Subject: [PATCH 34/41] mmark: 1.3.6 -> 2.2.25 --- pkgs/tools/typesetting/mmark/default.nix | 25 +++++++++++++----------- pkgs/tools/typesetting/mmark/deps.nix | 12 ------------ 2 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 pkgs/tools/typesetting/mmark/deps.nix diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index bc5ddcc9d751..85f4bfad1187 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -1,24 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, mmark }: -buildGoPackage rec { +buildGoModule rec { pname = "mmark"; - version = "1.3.6"; - rev = "v${version}"; - - goPackagePath = "github.com/miekg/mmark"; + version = "2.2.25"; src = fetchFromGitHub { - inherit rev; - owner = "miekg"; + owner = "mmarkdown"; repo = "mmark"; - sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; + rev = "v${version}"; + sha256 = "sha256-9XjNTbsB4kh7YpjUnTzSXypw9r4ZyR7GALTrYebRKAg="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-uHphMy9OVnLD6IBqfMTyRlDyyTabzZC4Vn0628P+0F4="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = mmark; + }; meta = { description = "A powerful markdown processor in Go geared towards the IETF"; - homepage = "https://github.com/miekg/mmark"; + homepage = "https://github.com/mmarkdown/mmark"; license = with lib.licenses; bsd2; maintainers = with lib.maintainers; [ yrashk ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/typesetting/mmark/deps.nix b/pkgs/tools/typesetting/mmark/deps.nix deleted file mode 100644 index 47f964c6a477..000000000000 --- a/pkgs/tools/typesetting/mmark/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; - }; - } -] From e6194ec45c9f44745c3e1979d4fc535a64d7156e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 09:15:21 +0000 Subject: [PATCH 35/41] python310Packages.ansible-later: 2.0.10 -> 2.0.11 --- pkgs/development/python-modules/ansible-later/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 567c4a66ac13..e8f40a109ab8 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.10"; + version = "2.0.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thegeeklab"; repo = pname; - rev = "v${version}"; - hash = "sha256-EwWoRLTA1vm8Su3VpXTrRVtmtneEsO/+SuuY1k1yeMQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-K4GResTKKWXQ0OHpBwqTLnptQ8ipuQ9iaGZDlPqRUaI="; }; nativeBuildInputs = [ From 82fbd08191e65e8ab21cf37efff9510537454c47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 09:45:14 +0000 Subject: [PATCH 36/41] python310Packages.mocket: 3.10.4 -> 3.10.5 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 1a0b7ee907bc..d5fe44b37e74 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.4"; + version = "3.10.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "831c23bf891c525828b7da49a358c6e0698481e4c8b3a61a69e87f36d06ef969"; + sha256 = "sha256-rF6ol5T6wH0nNmaP+lHQL8H+XZz1kl7OEe7NNO4MCtw="; }; propagatedBuildInputs = [ From 0872d0d82ea419bda0330ffc15121dfee4995285 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 Apr 2022 12:49:37 +0200 Subject: [PATCH 37/41] terraform-providers.buildkite: init at v0.8.0 (#170405) This provider can be used to configure build pipelines and other organisation settings on Buildkite. --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ea2060109c3e..0f1f3a73bc1d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -162,6 +162,15 @@ "vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71", "version": "2.2.0" }, + "buildkite": { + "owner": "buildkite", + "provider-source-address": "registry.terraform.io/buildkite/buildkite", + "repo": "terraform-provider-buildkite", + "rev": "v0.8.0", + "sha256": "1v4kzsvzkzf0bb6vpyjh0n2kbcfrqa193idvm4jgbcrdb0y3xzn5", + "vendorSha256": "12kqjpyy80pfrasicmdi1f43mr846rad3c6xaa4dvzn7hq640q5j", + "version": "0.8.0" + }, "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", From 68322e1297ce606a37622186c85c7b60dd336a1c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 19 Apr 2022 14:34:47 +0200 Subject: [PATCH 38/41] =?UTF-8?q?coqPackages.mathcomp-word:=201.0=20?= =?UTF-8?q?=E2=86=92=201.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/mathcomp-word/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 9c74edd54712..463c5e5f5e9d 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -10,11 +10,12 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z"; release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.12" "8.14") (isGe "1.12") ]; out = "1.0"; } + { cases = [ (range "8.12" "8.15") (isGe "1.12") ]; out = "1.1"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; From 9d15d4620b0e559020f89c768d38096b22b6e58d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 02:28:53 +0000 Subject: [PATCH 39/41] evolution: 3.44.0 -> 3.44.1 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 2fae122fc1b6..1581790c3d4c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.0"; + version = "3.44.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3yHT31Ik36hC6ikO/82QKv1LFBhgik37aQejt9TZlPk="; + sha256 = "dEx+CK0R4bYQPO60u/2Jo7Yo4SbOOGe7AI80F8wEnqk="; }; nativeBuildInputs = [ From 786a6094962bae771c9f7f085deefd0a7e157876 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Tue, 26 Apr 2022 13:43:58 +0200 Subject: [PATCH 40/41] ranger: add optional python dependencies (#170328) * ranger: add optional python dependencies Ranger has some [optional python dependencies](https://github.com/ranger/ranger#dependencies). Also, for use with the rnvimr NeoVim plugin, the pynvim packgage needs to be included. * Update pkgs/applications/misc/ranger/default.nix Apply PR suggestion Co-authored-by: Sandro * Update pkgs/applications/misc/ranger/default.nix Apply PR suggestion Co-authored-by: Sandro Co-authored-by: Marc Jakobi Co-authored-by: Sandro --- pkgs/applications/misc/ranger/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 4bd8a182d6f1..95f85430ba0b 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,5 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight -, imagePreviewSupport ? true, w3m }: +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m +, imagePreviewSupport ? true +, neoVimSupport ? true +, improvedEncodingDetection ? true +, rightToLeftTextSupport ? false +}: python3Packages.buildPythonApplication rec { pname = "ranger"; @@ -15,8 +19,13 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = with python3Packages; [ pytestCheckHook ]; - propagatedBuildInputs = [ file ] - ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; + propagatedBuildInputs = [ + less + file + ] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] + ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] + ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] + ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; preConfigure = '' ${lib.optionalString (highlight != null) '' From eb1bc95c2d886a13e16cc6d0469c7405bd296373 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 25 Apr 2022 13:42:40 -0400 Subject: [PATCH 41/41] caddy: 2.4.6 -> 2.5.0 --- pkgs/servers/caddy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 46ce2a94a6b3..711c65f66176 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: let - version = "2.4.6"; + version = "2.5.0"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -18,10 +18,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-xNCxzoNpXkj8WF9+kYJfO18ux8/OhxygkGjA49+Q4vY="; + sha256 = "sha256-V9iIz/93n6EBJZ9v3MDKD6FivtplRFN9a/e0o7YX0/w="; }; - vendorSha256 = "sha256-NomgHqIiugSISbEtvIbJDn5GRn6Dn72adLPkAvLbUQU="; + vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo="; postInstall = '' install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system @@ -36,6 +36,6 @@ buildGoModule { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne techknowlogick ]; }; }