From 478276838a689d3a48c0a8dbb3707f961bc1d35d Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Thu, 8 Sep 2022 14:41:57 +0200 Subject: [PATCH 01/42] unvanquished: 0.53.1 -> 0.53.2 Release notes: https://unvanquished.net/unvanquished-0-53-2-refinements/ --- pkgs/games/unvanquished/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index e1d090f5d3d..5a088f34a4c 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -33,7 +33,7 @@ }: let - version = "0.53.1"; + version = "0.53.2"; binary-deps-version = "6"; src = fetchFromGitHub { @@ -41,7 +41,7 @@ let repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-AWXuPXOhhPfdDrcyZF5o7uBnieSCGhwCzOYN8MjgTl8="; + sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -119,7 +119,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-+mO4HQwFfy7SeGrN4R52KOr/uNQXkHMvYir3k0l5rDo="; + outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ="; outputHashMode = "recursive"; nativeBuildInputs = [ aria2 cacert ]; From b639e033e05dcb0182f119a99b0664c497dbdc6d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 20 Sep 2022 16:00:37 +0200 Subject: [PATCH 02/42] trellis: 2021-12-14 -> unstable-2022-09-14 --- .../development/embedded/fpga/trellis/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index 32a4bcdac07..566bf5bdf75 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -1,30 +1,27 @@ { lib, stdenv, fetchFromGitHub, python3, boost, cmake }: let - rev = "2f06397673bbca3da11928d538b8ab7d01c944c6"; + rev = "488f4e71073062de314c55a037ede7cf03a3324c"; # git describe --tags - realVersion = "1.0-534-g${builtins.substring 0 7 rev}"; + realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}"; in stdenv.mkDerivation rec { pname = "trellis"; - version = "2021-12-14"; + version = "unstable-2022-09-14"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis"; inherit rev; - hash = "sha256-m5CalAIbzY2bhOvpBbPBeLZeDp+itk1HlRsSmtiddaA="; + hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw="; name = "trellis"; }) (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis-db"; - # note: the upstream submodule points to revision 0ee729d20eaf, - # but that's just the tip of the branch that was merged into master. - # fdf4bf275a is the merge commit itself - rev = "fdf4bf275a7402654bc643db537173e2fbc86103"; - sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA="; + rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa"; + hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0="; name = "trellis-database"; }) ]; From 7bcf01fd98d92a478a3e0acec05730dd848ff0d4 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 20 Sep 2022 16:01:53 +0200 Subject: [PATCH 03/42] nextpnr: 0.3 -> 0.4 https://github.com/YosysHQ/nextpnr/releases/tag/nextpnr-0.4 --- pkgs/development/compilers/nextpnr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 078f3e7cce5..bbecfff831f 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "0.3"; + version = "0.4"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; rev = "${pname}-${version}"; - hash = "sha256-q4h1TNAn66fJou8abNFowRbGXZTBfz5x+H5Q/psMvIw="; + hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY="; name = "nextpnr"; }) (fetchFromGitHub { From cc01712ac0589583bbd1088557782a30db8ba316 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 22 Sep 2022 18:21:05 +0200 Subject: [PATCH 04/42] wordpress: 6.0.1 -> 6.0.2 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index cc13317b0be..30877acd1de 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-9nhZaASqidfNySgIYpOEZOqyWurr/vqRrhdeFao+8FQ="; + sha256 = "sha256-UG5FYlJowBy71DJHgoDE1/lIIndp0qx1yFlDIeMV0Og="; }; installPhase = '' From 0b0cef29155cd5e4a97961ccd35b56ab3e80d4d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 04:55:33 +0000 Subject: [PATCH 05/42] batik: 1.14 -> 1.15 --- pkgs/applications/graphics/batik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index a88209bfbd8..b1259a543c7 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "batik"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; - sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg="; + sha256 = "sha256-NYo7+8DikUmDsioM1Q1YW1s3KwsQeTnwIKDr+RHxxyo="; }; meta = with lib; { From dca09e9ad56ef8197949088701348928dfa672a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 01:02:33 +0200 Subject: [PATCH 06/42] vikunja-frontend: 0.19.0 -> 0.19.1 --- pkgs/servers/web-apps/vikunja/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index b46241931c6..96a948a301c 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-pdUNPfGgbSMyXcS2HKMekIiIzJ3GutHCs0gFVkHN9yc="; + sha256 = "sha256-Kf55M1m/NBQhgaul/4seDMdPFU8jhgOwTNAzdgVg2OQ="; }; nativeBuildInputs = [ unzip ]; From 2601ae56fbbfd80dce8dcbf4fc341a33c752fb8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 01:03:44 +0200 Subject: [PATCH 07/42] vikunja-api: 0.19.0 -> 0.19.2 --- pkgs/servers/web-apps/vikunja/api.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index c78459936c0..fddfa33ca60 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.19.0"; + version = "0.19.2"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-1BxkQFiAqH+n8yzQn0+5cd/Z6oEBbGuK1pu1qt8CUbk="; + sha256 = "sha256-KI/RgtyjO+LdsoZ0JMo7xHeINpUAd5nDvd/WiWYEA6c="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "fzk22B7KpXfGS+8GF6J3ydmFyvP7oelRuiF+IveYdg4="; + vendorSha256 = "sha256-ZEmZeIB+uL1/JWEfBd7gZuGNF95pdiJfu5+FY2+sL64="; # checks need to be disabled because of needed internet for some checks doCheck = false; From 2b5e24bd8eac1d802d6bed8974e5547ba5d1cadb Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 26 Sep 2022 09:46:54 +0200 Subject: [PATCH 08/42] calibre: 5.42.0 -> 5.44.0 --- pkgs/applications/misc/calibre/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d25998cb17b..1d26881868e 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -27,11 +27,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.42.0"; + version = "5.44.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg="; + hash = "sha256-b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -40,12 +40,12 @@ mkDerivation rec { (fetchpatch { name = "0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; - sha256 = "sha256:1h2hl4z9qm17crms4d1lq2cq44cnxbga1dv6qckhxvcg6pawxg3l"; + sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; }) (fetchpatch { - name = "0007-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch"; - sha256 = "sha256:18wps7fn0cpzb7gf78f15pmbaff4vlygc9g00hq7zynfa4pcgfdg"; + name = "0006-Hardening-Qt-code.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; + sha256 = "sha256-/X6iZZFxv4793h2yYI3UAz0mLNEmKpdVrmOnABFT0tE="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; From 164c6900f9930254a3dcbaf7547ad40417751128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Sep 2022 11:39:15 +0000 Subject: [PATCH 09/42] checkSSLCert: 2.47.0 -> 2.48.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index d3d0b09d8dc..e248e3fbbd1 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.47.0"; + version = "2.48.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-8Xzu9uyShhJ/gmEs60qJ9W+00NSTCpNe2nqa9aT19ng="; + hash = "sha256-uaDeg7Dph99NWN0pKHrffBYOOzN8/1fW2YBEE8vnYMs="; }; nativeBuildInputs = [ From c54f882b31d99e247b6b343e440f8c53790ce11e Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Mon, 26 Sep 2022 14:39:25 +0200 Subject: [PATCH 10/42] dioxus-cli: init at 0.1.4 --- .../tools/rust/dioxus-cli/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/rust/dioxus-cli/default.nix diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix new file mode 100644 index 00000000000..40cef21c476 --- /dev/null +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -0,0 +1,22 @@ +{ fetchCrate, lib, rustPlatform, openssl, pkg-config }: +rustPlatform.buildRustPackage rec { + pname = "dioxus-cli"; + version = "0.1.4"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-SnmDOMxc+39LX6kOzma2zA6T91UGCnvr7WWhX+wXnLo="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoSha256 = "sha256-Mf/WtOO/vFuhg90DoPDwOZ6XKj423foHZ8vHugXakb0="; + + meta = with lib; { + description = "CLI tool for developing, testing, and publishing Dioxus apps"; + homepage = "https://dioxuslabs.com"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ xanderio ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cfba9daf29..51a57f66d0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16425,6 +16425,8 @@ with pkgs; dive = callPackage ../development/tools/dive { }; + dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { }; + doclifter = callPackage ../development/tools/misc/doclifter { }; docutils = with python3Packages; toPythonApplication docutils; From 30ccd36bc511c005b83dcd3e2a8b3d63cdc3de71 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 26 Sep 2022 18:34:59 +0200 Subject: [PATCH 11/42] wordpress: Add passthru.updateScript Co-authored-by: Moritz Hedtke --- pkgs/servers/web-apps/wordpress/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index cc13317b0be..f9ae8bda890 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests, writeScript }: stdenv.mkDerivation rec { pname = "wordpress"; @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { inherit (nixosTests) wordpress; }; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts jq + set -eu -o pipefail + version=$(curl --globoff "https://api.wordpress.org/core/version-check/1.7/" | jq -r '.offers[0].version') + update-source-version wordpress $version + ''; + meta = with lib; { homepage = "https://wordpress.org"; description = "WordPress is open source software you can use to create a beautiful website, blog, or app"; From 6f572f7685c2c4935dbf831d8d0822a3c2188a9e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Sep 2022 12:24:08 -0400 Subject: [PATCH 12/42] doctave: init at 0.4.2 --- .../misc/doctave/cargo-lock.patch | 11 +++++++ pkgs/applications/misc/doctave/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/applications/misc/doctave/cargo-lock.patch create mode 100644 pkgs/applications/misc/doctave/default.nix diff --git a/pkgs/applications/misc/doctave/cargo-lock.patch b/pkgs/applications/misc/doctave/cargo-lock.patch new file mode 100644 index 00000000000..b9b7797bc35 --- /dev/null +++ b/pkgs/applications/misc/doctave/cargo-lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -295,7 +295,7 @@ dependencies = [ + + [[package]] + name = "doctave" +-version = "0.4.0" ++version = "0.4.2" + dependencies = [ + "alphanumeric-sort", + "ascii", diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix new file mode 100644 index 00000000000..454c6bea331 --- /dev/null +++ b/pkgs/applications/misc/doctave/default.nix @@ -0,0 +1,30 @@ +{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "doctave"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "doctave"; + repo = pname; + rev = version; + sha256 = "1780pqvnlbxxhm7rynnysqr0vihdkwmc6rmgp43bmj1k18ar4qgj"; + }; + + # Cargo.lock is outdated + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + ]; + + meta = with lib; { + description = "A batteries-included developer documentation site generator"; + homepage = "https://github.com/doctave/doctave"; + changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7297191de..9f4bca51b52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5766,6 +5766,10 @@ with pkgs; dockbarx = callPackage ../applications/misc/dockbarx { }; + doctave = callPackage ../applications/misc/doctave { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + dog = callPackage ../tools/system/dog { }; dogdns = callPackage ../tools/networking/dogdns { From 8b5767a72c720c35bbfa2de56ea65d18e9a339e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Sep 2022 18:23:42 +0000 Subject: [PATCH 13/42] jellyfin-ffmpeg: 5.1.1-1 -> 5.1.1-2 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index d24ca8de9f9..5df230b081a 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,13 +8,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.1-1"; + version = "5.1.1-2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-WxUADm5z6SH6Xegi2dhhien5IBY/Y/ZZaXr7MdOvpYA="; + sha256 = "sha256-aviluHVNGxbWkmJ6mnlFbtRKKb0FoKkNw0Bgl+tmqyA="; }; configureFlags = old.configureFlags ++ [ From ea17cda54cc214d7e20e1a3b944a80ebe9cbbfcf Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Sep 2022 14:31:01 -0400 Subject: [PATCH 14/42] argc: init at 0.11.0 --- pkgs/development/tools/argc/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/argc/default.nix diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix new file mode 100644 index 00000000000..e6b83c575a1 --- /dev/null +++ b/pkgs/development/tools/argc/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "argc"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "sigoden"; + repo = pname; + rev = "v${version}"; + sha256 = "1gzsp08x54bsvzjm09cr1lgdr5mq1gzs36x2fjd710ixwcf9fcb6"; + }; + + cargoSha256 = "sha256-LIQ/j4NMYwrwBQkEYlrqRobrfkPERwtWZqT8pwSoICA="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion completions/argc.{bash,zsh} + ''; + + meta = with lib; { + description = "A tool to handle sh/bash cli parameters"; + homepage = "https://github.com/sigoden/argc"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7297191de..85987d2f95e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2865,6 +2865,8 @@ with pkgs; aptdec = callPackage ../development/libraries/aptdec {}; + argc = callPackage ../development/tools/argc { }; + aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; From b5eb4520cd25e0a680445b5aa2656f26cd1f8e05 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Sep 2022 13:14:58 -0400 Subject: [PATCH 15/42] fw: init at 2.16.1 --- pkgs/tools/misc/fw/default.nix | 39 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/misc/fw/default.nix diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/tools/misc/fw/default.nix new file mode 100644 index 00000000000..c3cdc828996 --- /dev/null +++ b/pkgs/tools/misc/fw/default.nix @@ -0,0 +1,39 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libgit2 +, openssl +, stdenv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "fw"; + version = "2.16.1"; + + src = fetchFromGitHub { + owner = "brocode"; + repo = pname; + rev = "v${version}"; + sha256 = "1nhkirjq2q9sxg4k2scy8vxlqa9ikvr5lid0f22vws07vif4kkfs"; + }; + + cargoSha256 = "sha256-iD3SBSny0mYpmVEInYaylHn0AbtIqTOwJHdFeq3UBaM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + OPENSSL_NO_VENDOR = 1; + USER = "nixbld"; + + meta = with lib; { + description = "A workspace productivity booster"; + homepage = "https://github.com/brocode/fw"; + license = licenses.wtfpl; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7297191de..6db313eaf5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1508,6 +1508,10 @@ with pkgs; fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; + fw = callPackage ../tools/misc/fw { + inherit (darwin.apple_sdk.frameworks) Security; + }; + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; From c8785ded90f9d459ba5ebc61290da36f268c82ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Sep 2022 18:50:34 +0000 Subject: [PATCH 16/42] kubevirt: 0.57.0 -> 0.57.1 --- pkgs/tools/virtualization/kubevirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index 99217a2f584..ebca6151336 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "0.57.0"; + version = "0.57.1"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-+35z953dgb6lJpC/8+VcrHLY6yXINoDxq6GxkEEVOgU="; + sha256 = "sha256-b832NNAoLYiHfvAm2eWGa8Odlppj8hLKl7jQA09s+4k="; }; vendorSha256 = null; From 1a47f0e43a15b638e623d8d921d3a3e6dd978a55 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Sep 2022 15:04:39 -0400 Subject: [PATCH 17/42] teip: init at 2.0.0 --- pkgs/tools/text/teip/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/text/teip/default.nix diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/tools/text/teip/default.nix new file mode 100644 index 00000000000..2b069179965 --- /dev/null +++ b/pkgs/tools/text/teip/default.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchCrate, installShellFiles, perl }: + +rustPlatform.buildRustPackage rec { + pname = "teip"; + version = "2.0.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-fME+tS8wcC6mk5FjuDJpFWWhIsiXV4kuybSqj9awFUM="; + }; + + cargoSha256 = "sha256-wrfS+OEYF60nOhtrnmk7HKqVuAJQFaiT0GM+3OoZ3Wk="; + + nativeBuildInputs = [ installShellFiles ]; + + checkInputs = [ perl ]; + + postInstall = '' + installManPage man/teip.1 + installShellCompletion --zsh completion/zsh/_teip + ''; + + meta = with lib; { + description = "A tool to bypass a partial range of standard input to any command"; + homepage = "https://github.com/greymd/teip"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7297191de..63a314ae8df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11563,6 +11563,8 @@ with pkgs; teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; + teip = callPackage ../tools/text/teip { }; + telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport { From 35372e110341f0006173a6afeb7a82432fa86b23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Sep 2022 20:27:19 +0000 Subject: [PATCH 18/42] minio: 2022-09-22T18-57-27Z -> 2022-09-25T15-44-53Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index fb3be9d56a4..1a8a2b251c0 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-09-22T18-57-27Z"; + version = "2022-09-25T15-44-53Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-y8FgfUQG5vuBCqLmTtiIdpduJhfLZ7oSvOgPBYV+sQY="; + sha256 = "sha256-ygDE7oqNddC+7kIkGu3QuswQp1Mh441rHvwF2JIKOzE="; }; - vendorSha256 = "sha256-zXEGukIHfb9CX+GJFcpVwo2UFZSJoc8Iq6olDKqh/gM="; + vendorSha256 = "sha256-nl7lQ+PnfEgEnc/g2PIpsSQH18v/YF5yw+tlIYWNP1A="; doCheck = false; From 5a03d9cad41d0df40c09f3707a99dafd927ac01b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 00:19:07 +0000 Subject: [PATCH 19/42] rust-analyzer-unwrapped: 2022-09-19 -> 2022-09-26 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index cdf9de2323a..2cbf183ef41 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-09-19"; - cargoSha256 = "sha256-GoGnhO1WaDpNrxyOj2xJPirwmsZ2IESDmA7orryupfo="; + version = "2022-09-26"; + cargoSha256 = "sha256-Wq5fI/ohoTHEjx0wa8De2uh8cG5+92H+vAfDa25JilY="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-aG6JOn3BG/2U1zuusB4bwLnPMXNoAeDSL8MWUCDLvl8="; + sha256 = "sha256-aCHudrXd8DKocehX6aWzlbZv4bq2l7MFXhM/wc2NdmI="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From 91b102380531935472629ec0e1cc4892cda3fcb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 03:44:24 +0000 Subject: [PATCH 20/42] wasmtime: 1.0.0 -> 1.0.1 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 7cc44d999dc..f21eb9b2643 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e5YEHVALk6wJ76dl68mT+ncztU2FjpFqTp6YS9Gsz2c="; + sha256 = "sha256-dQ5RAeJYEfU/WcHf9Xz1jjetlEePB1oHDAbKpzqkda4="; fetchSubmodules = true; }; - cargoSha256 = "sha256-q0eS5vPOh/VhC+oke2GeZX18GmrHwrsaMXcHK0jBZ7A="; + cargoSha256 = "sha256-0xEMlt1d6E+APf6SQ23E+mS/U4f0ziRpn2tTF9nSbx4="; cargoBuildFlags = [ "--package wasmtime-cli" From 2f96a8dabfb8b9b28bd00282210c47cb8af73e93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 05:31:43 +0000 Subject: [PATCH 21/42] colima: 0.4.4 -> 0.4.5 --- pkgs/applications/virtualization/colima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 6b6d1364f75..cec54e0b2ed 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "colima"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "bSBaSS+rVkFqTSdyegdE/F0X5u7yvF/nHslAO3xgD6I="; + sha256 = "sha256-hoxEf62EPD/WFXW6qbPCvEwViwmme3pSBfjeKOLsGjc="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-jDzDwK7qA9lKP8CfkKzfooPDrHuHI4OpiLXmX9vOpOg="; + vendorSha256 = "sha256-tsMQMWEkTE1NhevcqBETGWiboqL6QTepgnIo4B5Y4wQ="; CGO_ENABLED = 1; From 99b0e4bb64c7d37bba3111f736330907ad52701c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 06:14:45 +0000 Subject: [PATCH 22/42] dasel: 1.26.1 -> 1.27.0 --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 732ec9eee1e..d0777901b21 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-7DQJiwszE+qGcyyOZd9Zzg9PPc79HTYk8knI7upduts="; + sha256 = "sha256-bVAW8DrLqZKm9/iLleFxIMVkxaqhgdKwQUSEPpYhwt8="; }; vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; From 0132cbf58d51aaf5b076315e318c4aa08bf2d41e Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 21 Sep 2022 23:39:31 +0200 Subject: [PATCH 23/42] qpdf: 10.6.3 -> 11.1.0 Signed-off-by: Florian Brandes --- pkgs/development/libraries/qpdf/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 8e46b2d3577..b3b22735c0e 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,29 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }: +{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, cmake, perl }: stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.6.3"; + version = "11.1.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; - rev = "release-qpdf-${version}"; - hash = "sha256-SiZA8T7N1SWlbCFosSqFosLDV/3Q7+ywvgq1iB4umdg="; + rev = "v${version}"; + hash = "sha256-T06BLtDZN6ulJ9Po3LN1RlI6q8ddAfo95RAhyfrn+qg="; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ zlib libjpeg ]; - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--with-random=/dev/urandom"; - - preCheck = '' + preConfigure = '' patchShebangs qtest/bin/qtest-driver + patchShebangs run-qtest + # qtest needs to know where the source code is + substituteInPlace CMakeLists.txt --replace "run-qtest" "run-qtest --top $src --code $src --bin $out" ''; doCheck = true; - enableParallelBuilding = true; meta = with lib; { homepage = "http://qpdf.sourceforge.net/"; From 0a14c08223c4bd430517756d89d8750b89945e9e Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 21 Sep 2022 23:41:41 +0200 Subject: [PATCH 24/42] python3Packages.pikepdf: 5.4.2 -> 6.0.2 Signed-off-by: Florian Brandes --- .../python-modules/pikepdf/default.nix | 8 ++--- .../python-modules/pikepdf/paths.patch | 33 +++++++------------ 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 886b1ffb82a..256c30919a0 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "5.4.2"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM="; + hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w="; }; patches = [ @@ -51,10 +51,8 @@ buildPythonPackage rec { ]; postPatch = '' - sed -i 's|\S*/opt/homebrew.*|pass|' setup.py - substituteInPlace setup.py \ - --replace setuptools_scm_git_archive "" + --replace "shims_enabled = not cflags_defined" "shims_enabled = False" ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index 5f21da38fae..43e472f5598 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -12,33 +12,24 @@ index 2a170c6..5ee3ba1 100644 check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index be390a1..3818ec3 100644 +index 28c596b..aff3565 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py -@@ -31,7 +31,7 @@ def extract_jbig2( +@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: output_path = Path(tmpdir) / "outfile" - + args = [ - "jbig2dec", + "@jbig2dec@", "--embedded", "--format", "png", -@@ -64,7 +64,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: - output_path = Path(tmpdir) / "outfile" - - args = [ -- "jbig2dec", -+ "@jbig2dec@", - "--embedded", - "--format", - "png", -@@ -100,7 +100,7 @@ def extract_jbig2_bytes( - - def _check_jbig2dec_available() -> None: # pragma: no cover - try: -- proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii') -+ proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii') - except (CalledProcessError, FileNotFoundError) as e: - raise DependencyError("jbig2dec - not installed or not found") from e - else: +@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): + def _version(self) -> Version: + try: + proc = run( +- ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii' ++ ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii' + ) + except (CalledProcessError, FileNotFoundError) as e: + raise DependencyError("jbig2dec - not installed or not found") from e From 83df2f2a9f52732581a5a0e840c5fea17e54fb7f Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 22 Sep 2022 01:01:46 +0200 Subject: [PATCH 25/42] pdfmixtool: 1.0.2 -> 1.1 - add patch to fix build with newer qpdf version tracked upstream https://gitlab.com/scarpetta/pdfmixtool/-/issues/81 Signed-off-by: Florian Brandes --- pkgs/applications/office/pdfmixtool/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix index 7d874015dc2..c8f6ce6de10 100644 --- a/pkgs/applications/office/pdfmixtool/default.nix +++ b/pkgs/applications/office/pdfmixtool/default.nix @@ -1,23 +1,25 @@ { lib , mkDerivation , fetchFromGitLab +, fetchpatch , cmake , pkg-config , qtbase , qttools , qpdf , podofo +, imagemagick }: mkDerivation rec { pname = "pdfmixtool"; - version = "1.0.2"; + version = "1.1"; src = fetchFromGitLab { owner = "scarpetta"; repo = pname; rev = "v${version}"; - sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467"; + hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc="; }; nativeBuildInputs = [ @@ -26,12 +28,22 @@ mkDerivation rec { ]; buildInputs = [ + imagemagick qtbase qttools qpdf podofo ]; + patches = [ + # fix incompatibility with qpdf11 + (fetchpatch { + url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff"; + hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g="; + }) + + ]; + meta = with lib; { description = "An application to split, merge, rotate and mix PDF files"; homepage = "https://gitlab.com/scarpetta/pdfmixtool"; From e79ac5627518c17a194e44f0a9452de4fbecce56 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 21 Sep 2022 16:45:21 +0200 Subject: [PATCH 26/42] paperless-ngx: 1.8.0 -> 1.9.1 Signed-off-by: Florian Brandes --- .../office/paperless-ngx/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index e85f13b892f..41be39ee131 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -26,17 +26,12 @@ let src = fetchFromGitHub { owner = "paperless-ngx"; repo = "django-q"; - sha256 = "sha256-aoDuPig8Nf8fLzn7GjBn69aF2zH2l8gxascAu9lIG3U="; - rev = "71abc78fdaec029cf71e9849a3b0fa084a1678f7"; + hash = "sha256-alu7tZwUn77xhUF9c/aGmwRwO//mR/FucXjvXUl/6ek="; + rev = "8b5289d8caf36f67fb99448e76ead20d5b498c1b"; }; # due to paperless-ngx modification of the pyproject.toml file # the patch is not needed any more - patches = []; - }); - - # django-extensions 3.1.5 is required, but its tests are incompatible with Django 4 - django-extensions = super.django-extensions.overridePythonAttrs (_: { - doCheck = false; + patches = [ ]; }); aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { @@ -62,12 +57,12 @@ let in python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.8.0"; + version = "1.9.1"; # Fetch the release tarball instead of a git ref because it contains the prebuilt fontend src = fetchurl { url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-BLfhh04RvBJFRQiPXkMl8XlWqZOWKmjjl+6lZ326stU="; + hash = "sha256-KWq3zUES8klXexNO9krlqZKZEajOhkTHF13t/3rxrPc="; }; format = "other"; @@ -116,6 +111,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { inotifyrecursive joblib langdetect + pkgs.libmysqlclient lxml msgpack numpy From 51d61ceee4203bded7269c1c8a1bbee6e00e18ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 14:42:30 +0000 Subject: [PATCH 27/42] k9s: 0.26.5 -> 0.26.6 --- pkgs/applications/networking/cluster/k9s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 629db361931..77cf0e9c5e1 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.26.5"; + version = "0.26.6"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-IARb8MGFIg2X5rOipQyM2qL3fXa6xRS58cavR4ytH+k="; + sha256 = "sha256-cWk2K1+j5P14TO7YSTY9/1RT2HjG9BtfsFJy+cg9EDs="; }; ldflags = [ From 21667ec81c19382f8f5f2a13144ee65228dae284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 27 Sep 2022 11:49:20 -0300 Subject: [PATCH 28/42] xfce.xfce4-cpugraph-plugin: use mkXfceDerivation --- .../xfce4-cpugraph-plugin/default.nix | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index 33bdb052b6a..8a2cd770944 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -1,57 +1,36 @@ { lib -, stdenv -, fetchurl -, pkg-config -, intltool -, glib +, mkXfceDerivation , exo +, gtk3 , libXtst -, xorgproto +, libxfce4ui , libxfce4util , xfce4-panel -, libxfce4ui , xfconf -, gtk3 -, hicolor-icon-theme -, xfce +, xorgproto }: -let +mkXfceDerivation rec { category = "panel-plugins"; -in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; version = "1.2.6"; - - src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k="; - }; - - nativeBuildInputs = [ - pkg-config - intltool - ]; + rev-prefix = "xfce4-cpugraph-plugin-"; + odd-unstable = false; + sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY="; buildInputs = [ - glib exo + gtk3 libXtst - xorgproto - libxfce4util libxfce4ui + libxfce4util xfce4-panel xfconf - gtk3 - hicolor-icon-theme + xorgproto ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; - meta = with lib; { - homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; description = "CPU graph show for Xfce panel"; - license = licenses.gpl2Plus; - platforms = platforms.linux; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } From 88943ee302df9d7be54b0c98c748058249cfb3ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 15:42:12 +0000 Subject: [PATCH 29/42] macchina: 6.1.5 -> 6.1.6 --- pkgs/tools/misc/macchina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index c102b83dc7f..9342acdee78 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "6.1.5"; + version = "6.1.6"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-420Ng/LgmcYPH5q0boDaBjlWgLSeySXW/BTOp9+2XgA="; + sha256 = "sha256-0wPMx3IMYhB3XxSsTRqKIsNCGghnRcpwZloHjLxjlMo="; }; - cargoSha256 = "sha256-uRgHKj3EeT1Nq7j5koOovZJTVoVPVeBL8wLogJJoCfU="; + cargoSha256 = "sha256-QaqRIc3eKp7Wy5798wCCA4hk9Twa5Nr1mXTIxf+Hy/Q="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; From 326b8f7d8f0619cf48b5a5db18270e10b91b623c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Sep 2022 17:26:53 +0200 Subject: [PATCH 30/42] matrix-synapse: 1.67.0 -> 1.68.0 https://github.com/matrix-org/synapse/releases/tag/v1.68.0 Uses poetry-core to build the package. Drops setuptools-rust from runtime dependencies, because they are checked at startup, which breaks because we do a clear separation of concerns. Fixes a misconception about the tests, that were until now always run against the source module. This breaks with the introduction of the rust components, because they're not available in the source module. Adds missing pre and post hooks to checkPhase. --- pkgs/servers/matrix-synapse/default.nix | 35 ++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 699c2e083b2..bb970bb959f 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, openssl +{ lib, stdenv, python3, openssl, rustPlatform , enableSystemd ? stdenv.isLinux, nixosTests , enableRedis ? true , callPackage @@ -11,13 +11,35 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.67.0"; + version = "1.68.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY="; + hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo="; + }; + + postPatch = '' + # Remove setuptools_rust from runtime dependencies + # https://github.com/matrix-org/synapse/blob/v1.68.0/pyproject.toml#L177-L185 + sed -i '/^setuptools_rust =/d' pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + rustPlatform.cargoSetupHook + setuptools-rust + ] ++ (with rustPlatform.rust; [ + cargo + rustc + ]); + buildInputs = [ openssl ]; propagatedBuildInputs = [ @@ -63,7 +85,14 @@ buildPythonApplication rec { doCheck = !stdenv.isDarwin; checkPhase = '' + runHook preCheck + + # remove src module, so tests use the installed module instead + rm -rf ./synapse + PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests + + runHook postCheck ''; passthru.tests = { inherit (nixosTests) matrix-synapse; }; From 17e962f507c43a3343ea8eb47cc04e5f37f9bc06 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 27 Sep 2022 11:21:52 -0500 Subject: [PATCH 31/42] Revert "swiProlog: 8.3.29 -> 8.5.17" This reverts commit b1d7a2d1a73d3d804492b8e2e8da22aa96fcb567. --- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 80400516fc8..d53d1426a94 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -34,7 +34,7 @@ }: let - version = "8.5.17"; + version = "8.3.29"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl-devel"; rev = "V${version}"; - sha256 = "sha256-n1o6eG40DHnmNXuifQC6UFwGzuiL22V++0qRmq1RSzc="; + sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU="; fetchSubmodules = true; }; From ab31d8e6560854e4a77b007b0500c08012a87151 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 17:24:43 +0000 Subject: [PATCH 32/42] nebula: 1.6.0 -> 1.6.1 --- pkgs/tools/networking/nebula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index ef19d770b45..521c8ff2f20 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nebula"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JUFMcqu24YK1FjaNPkQLOtkyEhvqZPXZyFV+HBAKn5w="; + sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0="; }; vendorSha256 = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0="; From 69b1fcd4e0abec4d896d911f18a1857986e23786 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 17:40:52 +0000 Subject: [PATCH 33/42] oh-my-posh: 11.0.1 -> 11.1.1 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 9350d7ee83b..b3a56fb9d09 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "11.0.1"; + version = "11.1.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ovbhU23m4idWOSmdzPh5RH5/DxPjzsk1qqccIzGjNY4="; + sha256 = "sha256-6BTH4wiiiQEP8DMq+pYHizIgnJrj8bO3i/RIwvqAYbQ="; }; vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E="; From a2bcf8564d4367c4210e060dd8b3b75acb4c96ed Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 30 Dec 2021 11:55:51 -0800 Subject: [PATCH 34/42] nixos/openrgb: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/openrgb.nix | 52 +++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 nixos/modules/services/hardware/openrgb.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5568577909b..50446e3ee59 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -455,6 +455,7 @@ ./services/hardware/lcd.nix ./services/hardware/lirc.nix ./services/hardware/nvidia-optimus.nix + ./services/hardware/openrgb.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix ./services/hardware/power-profiles-daemon.nix diff --git a/nixos/modules/services/hardware/openrgb.nix b/nixos/modules/services/hardware/openrgb.nix new file mode 100644 index 00000000000..12438f01e52 --- /dev/null +++ b/nixos/modules/services/hardware/openrgb.nix @@ -0,0 +1,52 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + cfg = config.services.hardware.openrgb; +in { + options.services.hardware.openrgb = { + enable = mkEnableOption (lib.mdDoc "OpenRGB server"); + + package = mkOption { + type = types.package; + default = pkgs.openrgb; + defaultText = literalMD "pkgs.openrgb"; + description = lib.mdDoc "Set version of openrgb package to use."; + }; + + motherboard = mkOption { + type = types.nullOr (types.enum [ "amd" "intel" ]); + default = null; + description = lib.mdDoc "CPU family of motherboard. Allows for addition motherboard i2c support."; + }; + + server.port = mkOption { + type = types.port; + default = 6742; + description = lib.mdDoc "Set server port of openrgb."; + }; + + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + + boot.kernelModules = [ "i2c-dev" ] + ++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix" ] + ++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ]; + + systemd.services.openrgb = { + description = "OpenRGB server daemon"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}"; + Restart = "always"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ jonringer ]; +} From 3c0d465d9a7aabae38f992bdeb712fd70b6076a9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 31 Dec 2021 11:41:46 -0800 Subject: [PATCH 35/42] nixos/doc/rl-22.11: Add mention of openrgb option being added --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index cdf6e999940..566001c06bf 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -233,6 +233,13 @@ services.languagetool. + + + OpenRGB, + a FOSS tool for controlling RGB lighting. Available as + services.hardware.openrgb.enable. + + Outline, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 607e5cfeb4d..8ab9f27edb9 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -85,6 +85,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. Available as [services.languagetool](options.html#opt-services.languagetool.enable). +- [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services-hardware-openrgb-enable). + - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). - [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). From cc89e76d76e3fdcdc2378af3306b85a7b443acff Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 27 Sep 2022 15:21:39 -0400 Subject: [PATCH 36/42] arrow-cpp: Fix building x86_64-darwin on aarch_64-darwin (#193207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building x86_64-darwin emulated via Rosetta on aarch64-darwin, all tests would fail with > Illegal instruction: 4 this resolves that by never using Jemalloc on Darwin, since even though `isAarch64` is false, it might “really” be aarch64-darwin. --- pkgs/development/libraries/arrow-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index d3b736fbe0f..a72ebc29309 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -39,7 +39,7 @@ , zstd , enableShared ? !stdenv.hostPlatform.isStatic , enableFlight ? true -, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) +, enableJemalloc ? !stdenv.isDarwin # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions # see https://github.com/boostorg/process/issues/55 From fe0266a102fb5fe01c5fac6a446d78d9536bdc44 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 27 Sep 2022 21:46:13 +0200 Subject: [PATCH 37/42] prisma-engines: 4.2.1 -> 4.4.0 --- pkgs/development/tools/database/prisma-engines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 25674c76a8b..969a04b3d19 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,19 +13,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.2.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-TlKjAfpygQq2c77d6ZoMIBtWC0bAiMiKygFkh5GrBBc="; + sha256 = "sha256-gk+psYNSC5Xy6R3aUF0E9TyJgJ78+EMvz/xnPgN3+RY="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-KkCq7h6qqh37LvA4wQYjLk/LPKCg5Wgl6tEhH55qh8M="; + cargoSha256 = "sha256-BiQMoY2hd5q05YZBrTrHlKDtWlOkyfWjjNB/8F2+lXg="; nativeBuildInputs = [ pkg-config ]; From 39ed1df4d69f3db30456551c76fa45494e8df6ec Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 27 Sep 2022 21:46:28 +0200 Subject: [PATCH 38/42] nodePackages.prisma: 4.2.1 -> 4.4.0 --- pkgs/development/node-packages/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 62a3daea839..0f01d97852b 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -353,7 +353,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-HuYqnTDgH8atjPGtYmY0Ql9XrrJnfW7daG1PtAJRW0E6gJxc50lY3vrIDn0yjMR3TvRlypjTcspQX8DT+xD4Sg=="; + sha512 = "sha512-l/QKLmLcKJQFuc+X02LyICo0NWTUVaNNZ00jKJBqwDyhwMAhboD1FWwYV50rkH4Wls0RviAJSFzkC2ZrfawpfA=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ From c8b98cecd7a2885729ba6d52058f194a57a3c3b5 Mon Sep 17 00:00:00 2001 From: TNE <38938720+JustTNE@users.noreply.github.com> Date: Tue, 27 Sep 2022 22:40:41 +0200 Subject: [PATCH 39/42] zerotierone: Use pre-vendored cargo dependencies (#193093) ZeroTierOne already vendors the dependencies for us, so there is no point in doing it twice. Unfortunately, the ZeroTierOne developers forgot to specify rust-jwt in the cargo configuration file, so we have to manually do that to allow it to work as intended. --- pkgs/tools/networking/zerotierone/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 5faebe9bdad..05e9651bcb3 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -26,13 +26,6 @@ let in stdenv.mkDerivation { inherit pname version src; - cargoDeps = rustPlatform.fetchCargoTarball { - src = "${src}/zeroidc"; - name = "${pname}-${version}"; - sha256 = "sha256-8K4zAXo85MT4pfIsg7DZAO+snfwzdo2TozVw17KhX4Q="; - }; - postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock"; - preConfigure = '' patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ @@ -41,12 +34,17 @@ in stdenv.mkDerivation { substituteInPlace ./make-linux.mk \ --replace '-march=armv6zk' "" \ --replace '-mcpu=arm1176jzf-s' "" + + # Upstream does not define the cargo settings necessary to use the vendorized rust-jwt version, so it has to be added manually. + # Can be removed once ZeroTierOne's zeroidc no longer uses a git url in Cargo.toml for jwt + echo '[source."https://github.com/glimberg/rust-jwt"] +git = "https://github.com/glimberg/rust-jwt" +replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml ''; nativeBuildInputs = [ pkg-config ronn - rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc ]; From 33bc0765a5e6d66e2ef3d3ee9dedfe02ff31a95c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 15 Sep 2022 20:35:48 -0700 Subject: [PATCH 40/42] stage.nix: revert deletion of gcc.abi="elfv2" from 82ff1f5 Commit 82ff1f5db12f862e226e84254e54a10879f1629b in #182807 removed two lines from stage.nix which were responsible for making sure the `gcc` for `pkgsStatic` on powerpc64 was built with the `--with-abi=elfv2` flag. Unfortunately this causes build failures for `pkgsCross.ppc64.pkgsStatic`, as reported here: https://github.com/NixOS/nixpkgs/pull/182807#issuecomment-1247268226 This commit reverts the deletion. Unfortunately ugly kludges like this are necessary because nixpkgs' `lib/systems/` doesn't understand the difference between a libc and an abi. So we have no clean way to tell nixpkgs "musl on big-endian powerpc64 always uses the ELFv2 ABI" -- it thinks that musl is an ABI. Until that gets fixed there is no better way to add the flag. --- pkgs/top-level/stage.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 21bbb52cc63..e78197bd036 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -259,6 +259,8 @@ let crossSystem = { isStatic = true; parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed; + } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { + gcc.abi = "elfv2"; }; }); }; From 0a49bd5b430d76bf388b445737e3d11833cbb55f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 21:18:04 +0000 Subject: [PATCH 41/42] python310Packages.fakeredis: 1.9.1 -> 1.9.3 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 864a5e47f21..1677e990170 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.9.1"; + version = "1.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-3jsTNwxUZzkNxutYqK8lI37Cexrii6QydikW/TkUqbk="; + hash = "sha256-tZ+t4s5V8Na2Lt/TlkdJi7vZxlxAaMbk3MvxUhdQOLs="; }; nativeBuildInputs = [ From f28b6e5468f8bd60f3fb20901a64a986bde52b05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Sep 2022 21:37:18 +0000 Subject: [PATCH 42/42] snakemake: 7.14.1 -> 7.14.2 --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 114826a778b..956b98ffd5f 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.14.1"; + version = "7.14.2"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o2pERzt6wU/EiXBc9kI2qn9PhXGyvNiEWbSRzI85R8c="; + hash = "sha256-4XduybmDmlux3zvjbN1ouaJ1PkNO8h6vHuxgZ3YLBrw="; }; propagatedBuildInputs = with python3.pkgs; [