From 7f0dea39c874c3e191273105cd3902c8a92c5868 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 6 Dec 2022 12:33:23 +0100 Subject: [PATCH 01/71] authy: 2.2.1 -> 2.2.2 I don't know if they even have a public changelog, so I can't link it here, but the version number is higher! --- pkgs/applications/misc/authy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 2b6cd7049a5c..e5514f736cd2 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.2.1"; - rev = "11"; + version = "2.2.2"; + rev = "12"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM="; + sha256 = "sha256-vSbqT2s5lLEU1SSDaC+sS6qt446iSKYUgKudO5WMOu4="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; From 9ca6696f2cac074214e55c887a4c81a6e2feb6e8 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 17 Dec 2022 03:51:18 -0500 Subject: [PATCH 02/71] ruffle: nightly-2022-09-26 -> nightly-2022-12-16 --- pkgs/applications/emulators/ruffle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 80dc86643eb8..3ae67cd7132e 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2022-09-26"; + version = "nightly-2022-12-16"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "sha256-o0geKXODFRPKN4JgW+Sg16uPhBS5rrlMCmFSc9AcNPQ="; + sha256 = "sha256-VOaXn/dJB0AbuZ8owBbUYEPrL/H8DM73MhwhBjxq2Pg="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { "''${gappsWrapperArgs[@]}" ''; - cargoSha256 = "sha256-erqBuU66k7SGG9ueyYEINjeXbyC7A2I/r1bBqdsJemY="; + cargoSha256 = "sha256-h5qshincT48zYvbNLMXcvxw7Ovupnn9c93lpqY7oNtc="; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; From 9b8bcfcf158a405332f91483b941a892aaf498d2 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Mon, 2 Jan 2023 22:44:01 +0200 Subject: [PATCH 03/71] teleport: 10.3.1 -> 11.1.4 --- .../from_md/release-notes/rl-2305.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/servers/teleport/default.nix | 14 +++++++------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index ea3be31a2060..4bc7a3b1f331 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -211,6 +211,16 @@ stage-2. + + + teleport has been upgraded to major version + 11. Please see upstream + upgrade + instructions and + release + notes. + + The EC2 image module previously detected and activated diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index df0ec622e56e..a9c8aca8df30 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -57,6 +57,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. +- `teleport` has been upgraded to major version 11. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and [release notes](https://goteleport.com/docs/changelog/#1100). + - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 8cc67a1ff6ec..ac08b5958231 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -23,13 +23,13 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - hash = "sha256-F5v3/eKPLhSxW7FImTbE+QMtfn8w5WVTrxMWhgNr3YA="; + hash = "sha256-8S+r5pd8icOljGkxqLsZKmh4+nIwPQErs7RK88q0vOQ="; }; - version = "10.3.1"; + version = "11.1.4"; rdpClient = rustPlatform.buildRustPackage rec { pname = "teleport-rdpclient"; - cargoHash = "sha256-Xmabjoq1NXxXemeR06Gg8R/HwdSE+rsxxX645pQ3SuI="; + cargoHash = "sha256-XuJTdpb2eIeXnVtuSOlHjZQ8PpwxK4/4siK2S2h6xIw="; inherit version src; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; @@ -53,16 +53,16 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - # Submodule rev from https://github.com/gravitational/teleport/tree/v10.3.1 - rev = "6710dcd0dc19ad101bac3259c463ef940f2ab1f3"; - hash = "sha256-A13FSpgJODmhugAwy4kqiDw4Rihr//DhQX/bjwaeo2A="; + # Submodule rev from https://github.com/gravitational/teleport/tree/v11.1.4 + rev = "5f2597d5987804d37e61da8ae9d1a5a2d6b43ef4"; + hash = "sha256-meRinI4VsJuRoJznVULHL38bUIu352lf5LRPLlef1OA="; }; in buildGoModule rec { pname = "teleport"; inherit src version; - vendorHash = "sha256-2Zrd3CbZvxns9lNVtwaaor1mi97IhPc+MRJhj3rU760="; + vendorHash = "sha256-nlwBjeh0BlZ3vUQxvaYW0aK5Y2YK1gEar9s1IMJJEMY="; subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "libfido2" "webassets_embed" ] From a946ae14b47fe8b0620e115cedf8d4568995495d Mon Sep 17 00:00:00 2001 From: sohalt Date: Wed, 4 Jan 2023 17:21:47 +0100 Subject: [PATCH 04/71] pkgs/graalvm: add graaljs installable --- pkgs/development/compilers/graalvm/community-edition/update.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/graalvm/community-edition/update.nix b/pkgs/development/compilers/graalvm/community-edition/update.nix index 05963150eaca..8bb31c792dda 100644 --- a/pkgs/development/compilers/graalvm/community-edition/update.nix +++ b/pkgs/development/compilers/graalvm/community-edition/update.nix @@ -67,6 +67,7 @@ let "ruby-installable-svm" = ".jar"; "wasm-installable-svm" = ".jar"; "python-installable-svm" = ".jar"; + "js-installable-svm" = ".jar"; }.${productName}; # getProductSuffix :: String -> String @@ -77,6 +78,7 @@ let "ruby-installable-svm" = "https://github.com/oracle/truffleruby/releases/download"; "wasm-installable-svm" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; "python-installable-svm" = "https://github.com/graalvm/graalpython/releases/download"; + "js-installable-svm" = "https://github.com/oracle/graaljs/releases/download"; }.${productName}; # getDevUrl :: String From 05e665a9adb58d5ad2292a1b7751385060cabd36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 22:25:26 +0000 Subject: [PATCH 05/71] seer: 1.11 -> 1.14 --- pkgs/development/tools/misc/seer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix index db88c615e6ee..e44d8a9ce118 100644 --- a/pkgs/development/tools/misc/seer/default.nix +++ b/pkgs/development/tools/misc/seer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seer"; - version = "1.11"; + version = "1.14"; src = fetchFromGitHub { owner = "epasveer"; repo = "seer"; rev = "v${version}"; - sha256 = "sha256-HIRNCcE1EhxsiJ5/MQZgR7IXaeM4rWoepPhALXoW7Hw="; + sha256 = "sha256-IxFG+OhRhPRPSyGFJh559Tz2E7aMOtpphm9GbYS0dRA="; }; preConfigure = '' From 297a1eb83ac9e2585388b94f59b14b058692929f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 22:38:35 +0000 Subject: [PATCH 06/71] apache-jena: 4.6.1 -> 4.7.0 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 738f110403d3..cd30a12fb3fe 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.6.1"; + version = "4.7.0"; src = fetchurl { url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "sha256-XCExqN0S5aIeLUNkAXjBHPW/fvj+MxQP3GEOP9gSdLE="; + sha256 = "sha256-3tJRJ9UHsOYfWvwPZHp+hkRZxb0RODchJjQMAZ3lkuY="; }; nativeBuildInputs = [ makeWrapper From f5c7c70dde720e990fa7e0748d1dc4764d6e4406 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 13 Jan 2023 06:39:29 +0000 Subject: [PATCH 07/71] whalebird: 4.6.5 -> 4.7.4 changelog: notable changes: - close image preview when user clicks outside the image (3733) - Fix search accounts (3742) - Fix to set poll expire (3739, 3730) - update domainFormat validation to accept single character domains like c.im (3775) - Fix account id when move settings from profile (3805, 3772) - Fix showReblogs/showReplies form value (3834, 3774) - new translations: Basque, Hungarian, Persian Icelandic --- pkgs/applications/misc/whalebird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 1de667f132e3..472f7ad42a50 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.6.5"; + version = "4.7.4"; src = let downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; - sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0="; + sha256 = "sha256-jRtlnKlrh6If9wy3FqVBtctQO3rZJRwceUWAPmieT4A="; } else if stdenv.system == "aarch64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; - sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc="; + sha256 = "sha256-gWCBH2zfhJdJ3XUAxvZ0+gBHye5uYCUgX1BDEoaruxY="; } else throw "Whalebird is not supported for ${stdenv.system}"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Necessary steps to find the tray icon asar extract opt/Whalebird/resources/app.asar "$TMP/work" substituteInPlace $TMP/work/dist/electron/main.js \ - --replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + --replace "qt,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar runHook postBuild From 7fdc4345297e6c01eacbfd125547a0d218064398 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 13 Jan 2023 16:20:59 +0100 Subject: [PATCH 08/71] lucenepp: add darwin support --- pkgs/development/libraries/lucene++/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 08a348505006..7755692d2c04 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; }) + (fetchpatch { + name = "fix-visibility-on-mac.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch"; + sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4="; + }) ]; postPatch = '' @@ -47,6 +52,6 @@ stdenv.mkDerivation rec { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; license = with lib.licenses; [ asl20 lgpl3Plus ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From 7f2fb535b496eff6d03b5050a419c292205b732a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 13 Jan 2023 20:17:22 +0100 Subject: [PATCH 09/71] poedit: 3.1.1 -> 3.2.2 --- pkgs/tools/text/poedit/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 37fc346eb0a9..a8bc284ccf00 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK32, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "3.1.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "vslavik"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkg-config ]; - buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK32 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; @@ -45,5 +45,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ dasj19 ]; + # configure: error: GTK+ build of wxWidgets is required + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 212f49362096..dbc1ff085aee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10810,7 +10810,7 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { - wxGTK30 = wxGTK30.override { withWebKit = true; }; + wxGTK32 = wxGTK32.override { withWebKit = true; }; }; polaris = callPackage ../servers/polaris { }; From d3b25c422a1a06a702ef9e3875c9c42defc37b1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 07:31:10 +0000 Subject: [PATCH 10/71] cargo-watch: 8.1.2 -> 8.3.0 --- pkgs/development/tools/rust/cargo-watch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 5cc3fa39eade..51303745780e 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.1.2"; + version = "8.3.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zhOYKvsCK5am4Ystt3+cPAQM77IlIBJysAEix5cXKbI="; + sha256 = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4="; }; - cargoSha256 = "sha256-OAOzrGS8n0jfUiQyIAHWLJMEkRINyasgkIjiLw977LE="; + cargoHash = "sha256-kR12j0Z7nXfwh9nPT35/LpkK56a8D1gvVkl9/2s6rIQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; From 8f76011059f06fd744384cc562740e79b1dfc71e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 20:01:57 +0000 Subject: [PATCH 11/71] fdm: 2.1 -> 2.2 --- pkgs/tools/networking/fdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 7e66fde03034..c67ceec69e8c 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdm"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "nicm"; repo = pname; rev = version; - sha256 = "sha256-w7jgFq/uWGTF8+CsQCwXKu3eJ7Yjp1WWY4DGQhpBFmQ="; + sha256 = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; }; nativeBuildInputs = [ autoreconfHook ]; From 6b545991b9f27489c550f9c1c602ab879fd18548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 05:13:38 +0000 Subject: [PATCH 12/71] unpoller: 2.4.1 -> 2.7.10 --- pkgs/servers/monitoring/unpoller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index a49fef47f549..79aa5a50409c 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.4.1"; + version = "2.7.10"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-t4f7iAIOg19n1aKG0tQy/GHNXdVAEnaRyTXMZY+1IUw="; + hash = "sha256-zwrVMQI/zn+UtaXZyZr1wGkBP/KKDKvE/YjLR5rbK0o="; }; - vendorHash = "sha256-GUzMu3ltdmFCKKWi9Hlr39rNe5uPnZpwQfhVAHtbeiw="; + vendorHash = "sha256-SjZQnVG7j2zbPCr4AeF9vZkmd7eEocmnCQKFH09qSng="; ldflags = [ "-w" "-s" From 936ea6635fe71175490c6df165167451b8bfcc69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 07:21:43 +0000 Subject: [PATCH 13/71] ogre: 13.5.3 -> 13.6.0 --- pkgs/development/libraries/ogre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 34cb8d21f839..ebd1d89803c1 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "13.5.3"; + version = "13.6.0"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - sha256 = "sha256-fjgMAuIA7rm3Gt2z//kPkc7LOcfddoFgY38B7bs6zZo="; + sha256 = "sha256-yPIrF0jSeWXQ67U/QDgeQnMPvxsyaecyiW964kLsDAE="; }; nativeBuildInputs = [ From 33b2ad57c889f706b753932062d6392f57558500 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 28 Oct 2022 01:17:52 +0200 Subject: [PATCH 14/71] openiscsi: 2.1.7 -> 2.1.8 autotools -> meson > support for make/autoconf is still in place but is deprecated - https://github.com/open-iscsi/open-iscsi/releases/tag/2.1.8 --- pkgs/os-specific/linux/open-iscsi/default.nix | 77 ++++++++++--------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 32b3e636ac56..38912e0aa215 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,55 +1,60 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf, nixosTests -}: +{ stdenv +, lib +, fetchFromGitHub +, meson +, pkg-config +, ninja +, perl +, util-linux +, open-isns +, openssl +, kmod +, systemd +, runtimeShell +, nixosTests }: stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.7"; - - nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; - buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; + version = "2.1.8"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw="; + hash = "sha256-JzSyX9zvUkhCEpNwTMneTZpCRgaYxHZ1wP215YnMI78="; }; - DESTDIR = "$(out)"; - - NIX_LDFLAGS = "-lkmod -lsystemd"; - NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; + nativeBuildInputs = [ + meson + pkg-config + ninja + perl + ]; + buildInputs = [ + kmod + (lib.getLib open-isns) + openssl + systemd + util-linux + ]; preConfigure = '' - # Remove blanket -Werror. Fails for minor error on gcc-11. - substituteInPlace usr/Makefile --replace ' -Werror ' ' ' + patchShebangs . ''; - # avoid /usr/bin/install - makeFlags = [ - "INSTALL=install" - "SED=sed" - "prefix=/" - "manprefix=/share" + prePatch = '' + substituteInPlace etc/systemd/iscsi-init.service.template \ + --replace /usr/bin/sh ${runtimeShell} + sed -i '/install_dir: db_root/d' meson.build + ''; + + mesonFlags = [ + "-Discsi_sbindir=${placeholder "out"}/sbin" + "-Drulesdir=${placeholder "out"}/etc/udev/rules.d" + "-Dsystemddir=${placeholder "out"}/lib/systemd" + "-Ddbroot=/etc/iscsi" ]; - installFlags = [ - "install" - ]; - - postInstall = '' - cp usr/iscsistart $out/sbin/ - for f in $out/lib/systemd/system/*; do - substituteInPlace $f --replace /sbin $out/bin - done - $out/sbin/iscsistart -v - ''; - - postFixup = '' - sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login - ''; - passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; }; meta = with lib; { From 2dedd1b74305b00b7bf9a1c25789a569b9dba2e1 Mon Sep 17 00:00:00 2001 From: gbtb Date: Sun, 1 Jan 2023 19:29:42 +1000 Subject: [PATCH 15/71] gsmartcontrol: 1.1.3 -> 1.1.4 --- pkgs/tools/misc/gsmartcontrol/default.nix | 12 ++++++--- pkgs/tools/misc/gsmartcontrol/fix-paths.patch | 25 ------------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index e52ae44a83f9..a1c163f6784e 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,18 +1,22 @@ { fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: stdenv.mkDerivation rec { - version="1.1.3"; pname = "gsmartcontrol"; + version = "1.1.4"; src = fetchurl { - url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; - sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn"; + url = "https://github.com/ashaduri/gsmartcontrol/releases/download/v${version}/gsmartcontrol-${version}.tar.bz2"; + sha256 = "sha256-/ECfK4qEzEC7ED1sgkAbnUwBgtWjsiPJOVnHrWYZGEc="; }; patches = [ ./fix-paths.patch ]; + postPatch = '' + substituteInPlace data/org.gsmartcontrol.policy --replace "/usr/sbin" $out/bin + ''; + nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = "https://gsmartcontrol.sourceforge.io/"; + homepage = "https://gsmartcontrol.shaduri.dev/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [qknight]; platforms = with lib.platforms; linux; diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch index 905b63bee0c4..b8ec19eb2563 100644 --- a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch +++ b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch @@ -1,14 +1,3 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -475,6 +475,7 @@ - - - AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \ -+ data/org.gsmartcontrol.policy \ - data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \ - debian.dist/changelog \ - src/gsc_winres.rc src/gsmartcontrol.exe.manifest \ diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in --- a/data/gsmartcontrol-root.in +++ b/data/gsmartcontrol-root.in @@ -30,20 +19,6 @@ diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in export PATH="$EXTRA_PATHS:$PATH" -diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in -rename from data/org.gsmartcontrol.policy -rename to data/org.gsmartcontrol.policy.in ---- a/data/org.gsmartcontrol.policy -+++ b/data/org.gsmartcontrol.policy.in -@@ -12,7 +12,7 @@ - auth_admin - auth_admin - -- /usr/sbin/gsmartcontrol -+ @prefix@/bin/gsmartcontrol - true - - diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am From 608528afe6cde19f8aad7aa7308d027b16131994 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 17 Jan 2023 08:14:00 +0100 Subject: [PATCH 16/71] libvirt: 8.10.0 -> 9.0.0 --- ...n-patch-in-an-install-prefix-for-building-on-nix.patch | 4 +++- pkgs/development/libraries/libvirt/default.nix | 8 ++++---- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index b8d8ddcb1411..75d2ac1f0873 100644 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -305,7 +305,7 @@ diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 39f0f615cc..5f6f30f82b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') +@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ @@ -326,6 +326,7 @@ index 39f0f615cc..5f6f30f82b 100644 - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'passt', - runstatedir / 'libvirt' / 'qemu' / 'slirp', - runstatedir / 'libvirt' / 'qemu' / 'swtpm', + install_prefix + confdir / 'qemu', @@ -345,6 +346,7 @@ index 39f0f615cc..5f6f30f82b 100644 + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'passt', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 8f4479a763be..2a56a0cde209 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -42,7 +42,7 @@ , attr ? null , audit ? null , dmidecode ? null -, fuse ? null +, fuse3 ? null , kmod ? null , libapparmor ? null , libcap_ng ? null @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "8.10.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-MboJLQ0R3l9lUQDjNVACvmxISjypvfxxMHSKF0+k6WM="; + sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8="; fetchSubmodules = true; }; @@ -201,7 +201,7 @@ stdenv.mkDerivation rec { acl attr audit - fuse + fuse3 libapparmor libcap_ng libnl diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index f3dd61f84948..f56fcd0e9ac1 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "8.10.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-f2ZWBNCgylKQCmbLCaJsIb5alvZDRZUWQAMOMsxwGbk="; + sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 58940bb1e5ae..ab7154805998 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22646,12 +22646,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "8.10.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-rVTofRtnYDF5CmWp3SB2+kJZz4u6+OTzNAUwiDrqdTo="; + hash = "sha256-QiaB272kxs/Y3/l8KbFy8f9iyOCxhzfA/h2FnfGzmE4="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From b6b55b60a811d7c9a8fe6da917de7e44963bc7f8 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 17 Jan 2023 15:56:01 +0100 Subject: [PATCH 17/71] firejail: 0.9.70 -> 0.9.72 --- pkgs/os-specific/linux/firejail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 7b7abdb8441c..9ab8eac772ce 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "firejail"; - version = "0.9.70"; + version = "0.9.72"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "sha256-x1txt0uER66bZN6BD6c/31Zu6fPPwC9kl/3bxEE6Ce8="; + sha256 = "sha256-XAlb6SSyY2S1iWDaulIlghQ16OGvT/wBCog95/nxkog="; }; nativeBuildInputs = [ From a2abc3f3eb2dfff288d1b4325f17598e9e33f795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 08:27:18 +0000 Subject: [PATCH 18/71] python310Packages.libcloud: 3.6.1 -> 3.7.0 --- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 7ebfe30ac937..817afce5cd1c 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D6zzIGVoQwyZjaQOm7rG06DE/IDdUWdNnnlLOBRQEgw="; + sha256 = "sha256-FIqeUAaWVEMqfTSZeVTpFDTdOOv2iDLrnHXUQrPmL60="; }; propagatedBuildInputs = [ From 454302cf2a36b08369aefd1094a5c42f88e5be9b Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 19 Jan 2023 11:15:43 +0100 Subject: [PATCH 19/71] raspberrypi-eeprom: 2022.12.07-138a1 -> 2023.01.11-138c0 https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2023.01.11-138c0 --- pkgs/os-specific/linux/raspberrypi-eeprom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 63ab388eb61f..3c19db403917 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "2022.12.07-138a1"; + version = "2023.01.11-138c0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "v${version}"; - hash = "sha256-/Q9zj/Hn/8S7bF1CN6ZCg705VYU+QUagNr4RNgZl+oA="; + hash = "sha256-z3VyqdSkvxAgVmtMI/Is9qYrOeDXlyVLwHSSC2+AxcA="; }; buildInputs = [ python3 ]; From 4dcc68db48813c751fa1ed0e3aea79d73eb52e4d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 19 Jan 2023 11:22:21 +0100 Subject: [PATCH 20/71] pikchr: unstable-2022-06-20 -> unstable-2022-12-07 use fetchfossil --- pkgs/tools/graphics/pikchr/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index c8c1bd8d9515..aed3d485c4ad 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -1,16 +1,17 @@ { lib , stdenv -, fetchurl +, fetchfossil }: stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2022-06-20"; + version = "unstable-2022-12-07"; - src = fetchurl { - url = "https://pikchr.org/home/tarball/d9ee756594b6eb64/pikchr.tar.gz"; - sha256 = "sha256-ML+gymFrBay1kly7NYsxo0I1qNMoZPzNI3ClBTrWlHw="; + src = fetchfossil { + url = "https://pikchr.org/home"; + rev = "21ca6b843d65c404"; + sha256 = "sha256-fp06GqpLa/szRCS54KJ+SkT602oWvK3KyDFFjTmpNfI="; }; # can't open generated html files From 915fc2d3de2c5a153fdfb2ade20fca98e22d7495 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 11:26:07 +0000 Subject: [PATCH 21/71] python310Packages.moderngl-window: 2.4.1 -> 2.4.2 --- pkgs/development/python-modules/moderngl_window/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 6888356ec431..8bb104da185e 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "moderngl_window"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; - rev = version; - sha256 = "12a5nl01c9b1ww7sj7i02xa7zmlrgg8jvi8cz004hw98kjcs9li8"; + rev = "refs/tags/${version}"; + sha256 = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; From cb1d6d326d75c97c117cff0ffddbb5860c185558 Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Thu, 19 Jan 2023 13:47:53 +0100 Subject: [PATCH 22/71] vcg: 1.0.1 -> 2022.02 --- pkgs/development/libraries/vcg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index d8c83bf54a8a..8b86df2e1c10 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vcg"; - version = "1.0.1"; + version = "2022.02"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; - rev = "v${version}"; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + rev = version; + sha256 = "sha256-XCjbVlgE0C9UagPj4fraA7BNsM6ONKo66aKQ87gQOfE="; }; propagatedBuildInputs = [ eigen ]; From 99e2e1f12c8e441f4a25d6b1c0528f8fb7c42132 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 13:47:58 +0000 Subject: [PATCH 23/71] python310Packages.pulumi-aws: 5.26.0 -> 5.27.0 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 1a23ac33ed98..816dfc028883 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.26.0"; + version = "5.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-2sx8a+ga77asp5onfjcGLm+3hCHdCXzFNmmgqzEJfJE="; + hash = "sha256-JNiklXAAyHFLdspglGLokmHOiffDS1I5igsmupla1Qo="; }; sourceRoot = "${src.name}/sdk/python"; From bcfa56c577878344d66580235cb42fe1593a9375 Mon Sep 17 00:00:00 2001 From: firefly-cpp Date: Thu, 19 Jan 2023 15:42:52 +0100 Subject: [PATCH 24/71] python310Packages.tcxreader: 0.4.2 -> 0.4.4 --- pkgs/development/python-modules/tcxreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tcxreader/default.nix b/pkgs/development/python-modules/tcxreader/default.nix index ec4abfd886d4..8fac95d4fa2a 100644 --- a/pkgs/development/python-modules/tcxreader/default.nix +++ b/pkgs/development/python-modules/tcxreader/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "tcxreader"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "alenrajsp"; repo = "tcxreader"; rev = "v${version}"; - hash = "sha256-YJDuyInO5FCIdz7xE29qOpuH6rPKvO4FZChjgXdc+Aw="; + hash = "sha256-UJ6F+GcdF0b2gALQWepLyCnWm+6RKBRnBt1eJNoRRzo="; }; checkInputs = [ From 6fde676f8f5f4711498443284eded91f4f7e4cfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 14:47:07 +0000 Subject: [PATCH 25/71] python310Packages.oci: 2.90.0 -> 2.90.2 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 361eefdfd7d1..90910e93d146 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.90.0"; + version = "2.90.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-pDLG8w5YfjmiP5JYDWoSLC0NGTfJ2Zmkz4Ed8zAB1pY="; + hash = "sha256-8HqvJx4H4cLkAXuaEUmlOjiuYD7WmVT0Xvsktc/IfCE="; }; propagatedBuildInputs = [ From c24c83244f77eaf5b560267f571783c9b7dd9a0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 15:05:22 +0000 Subject: [PATCH 26/71] python310Packages.textual: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/textual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 856ec4e652e2..158e4664dbd2 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.9.1"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-a32H5X3VsfYuU1TkOH5uGn1eDLvGUDI6WhXEQ0AKwq8="; + sha256 = "sha256-T71Jmgj/hgLOcSHu5QyqdZ7dYpLjhTQqDBdQgiaGXA8="; }; nativeBuildInputs = [ From ec628a12443a82b1692dac4cb8b69c76d480afd3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Jan 2023 17:37:26 +0100 Subject: [PATCH 27/71] python3Packages.xmldiff: 2.4 -> 2.5 --- .../python-modules/xmldiff/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xmldiff/default.nix b/pkgs/development/python-modules/xmldiff/default.nix index 5d9120872242..27f66eb1e5dc 100644 --- a/pkgs/development/python-modules/xmldiff/default.nix +++ b/pkgs/development/python-modules/xmldiff/default.nix @@ -1,24 +1,35 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , lxml , setuptools -, six , pytestCheckHook }: buildPythonPackage rec { pname = "xmldiff"; - version = "2.4"; + version = "2.5"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bb6iDOHyyWeGg7zODDupmB+H2StwnRkOAYvL8Efsz2M="; + sha256 = "sha256-bF8wvGXOboHZpwo8sCafe6YYUv1sqnoPv8Dt8zs8txc="; }; - propagatedBuildInputs = [ lxml setuptools six ]; + propagatedBuildInputs = [ + lxml + setuptools + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xmldiff" + ]; meta = with lib; { description = "Creates diffs of XML files"; From fa85c4f3a6403252862c995bcd264b38006e1ab9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 17:08:15 +0000 Subject: [PATCH 28/71] python310Packages.docplex: 2.24.232 -> 2.25.236 --- pkgs/development/python-modules/docplex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 3a7c5f74a439..1d3c53c95d51 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.24.232"; + version = "2.25.236"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "sha256-Mo4Ih/2ltIonP37BDyCi0fY2bkPt2ij1F0A1Ws1sF1g="; + sha256 = "sha256-JWkUtMAROk4cePMuogx9dtyO/ihv6JAnDnXPrVD+UQ8="; }; propagatedBuildInputs = [ From 03d90a9acb1e5d2e7640f556478dfa0ff3d7eb46 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Jan 2023 12:19:25 -0500 Subject: [PATCH 29/71] cargo-generate: 0.17.5 -> 0.17.6 Diff: https://github.com/cargo-generate/cargo-generate/compare/v0.17.5...v0.17.6 Changelog: https://github.com/cargo-generate/cargo-generate/blob/v0.17.6/CHANGELOG.md --- pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++--- pkgs/development/tools/rust/cargo-generate/no-vendor.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index d8fdd4e0d900..4db3af1fff03 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.17.5"; + version = "0.17.6"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-VKhlPg4H04HdfIgXCXx560oFRwxPotGnGfczZ8PfVog="; + sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM="; }; # patch Cargo.toml to not vendor libgit2 and openssl cargoPatches = [ ./no-vendor.patch ]; - cargoSha256 = "sha256-TbmivH9LXwESpqk2RFEZYZRDlLyuAyek8JxQEROsPYs="; + cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch index b7788d3d656c..c8233cd5dd3d 100644 --- a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch +++ b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch @@ -4,8 +4,8 @@ [dependencies] clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false } --git2 = { version = "0.15", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } -+git2 = { version = "0.15", features = ["ssh", "https"], default-features = false } +-git2 = { version = "0.16", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } ++git2 = { version = "0.16", features = ["ssh", "https"], default-features = false } console = "0.15" dialoguer = "0.10" dirs = "4.0" From 61d761be8db7da4f6dc36454e84c9097c063fe4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Thu, 19 Jan 2023 18:37:24 +0100 Subject: [PATCH 30/71] pulumiPackages.pulumi-azure-native: 1.85.0 -> 1.92.0 --- pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix index 932c9392c225..5dcd156d555b 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix @@ -4,10 +4,10 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-azure-native"; - version = "1.85.0"; + version = "1.92.0"; rev = "v${version}"; - hash = "sha256-12JjDHYCxx/eQBIGpMO9FnjYFu54QT80zvivDYiHWjM="; - vendorHash = "sha256-RhZBvFjleVxskFcuNZcjcq9Hc+bLfBL9PsZg5rIPJ3Y="; + hash = "sha256-eSHD7ckiHJJoqJFeSlwxl063QRRTtiWdpu1m9OVRhoA="; + vendorHash = "sha256-DI92fCe8HPwjERkBVlOebZpvCreq9850OeERDkiayz8="; cmdGen = "pulumi-gen-azure-native"; cmdRes = "pulumi-resource-azure-native"; extraLdflags = [ From 7b4f6522ee3a2584b69e04fdbf2cf79996f7c443 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 17:42:55 +0000 Subject: [PATCH 31/71] checkSSLCert: 2.57.0 -> 2.58.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 bd1a5f2758a7..a734c6543310 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.57.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-N+VkdVeJ6UdRPFUFmIpZoL/Mc8MkTd+hAPjha5pimt8="; + hash = "sha256-nQE3UMZcIR063JuZkTN49imDYQGGnNzE1yaeR4k4mWY="; }; nativeBuildInputs = [ From 6387f47a54094d85b6fbdac87a623c87ebe9a024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Jan 2023 11:02:29 -0800 Subject: [PATCH 32/71] python310Packages.ytmusicapi: 0.24.1 -> 0.25.0 https://github.com/sigma67/ytmusicapi/releases/tag/0.25.0 --- pkgs/development/python-modules/ytmusicapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 53a6b1846d93..a2adbeb87d29 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.24.1"; + version = "0.25.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8NYutkZwR8tQzsVzYsOo6HdkiZ6WbIconDjcOwgs3PM="; + hash = "sha256-hpX/qmRRwvCE0N5jIWl6AZkcYaVViK30nPbJwyZD+rM="; }; nativeBuildInputs = [ From 0a22920a9757c7bfc27d948ab56a06e8cf24a8a4 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 19 Jan 2023 20:18:44 +0100 Subject: [PATCH 33/71] steam-run: add libxcrypt to FHS environment Required by some games. --- pkgs/games/steam/fhsenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index ea9db37cbddf..614d9823f9ff 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -97,6 +97,7 @@ in buildFHSUserEnv rec { libdrm libxkbcommon # paradox launcher libvorbis # Dead Cells + libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 mono xorg.xkeyboardconfig xorg.libpciaccess From 6885007b2b4bbb506ba2a88f9d5b988db1090043 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Jan 2023 14:47:21 -0500 Subject: [PATCH 34/71] onefetch: 2.14.2 -> 2.15.1 Diff: https://github.com/o2sh/onefetch/compare/2.14.2...2.15.1 Changelog: https://github.com/o2sh/onefetch/blob/v2.15.1/CHANGELOG.md --- pkgs/tools/misc/onefetch/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 934ef186ba1c..cbdbf46d9c06 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , cmake , installShellFiles , pkg-config @@ -15,30 +14,22 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.14.2"; + version = "2.15.1"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = version; - sha256 = "sha256-LiX91GMJdmhosCZcL3JlzYRieqeQs+YWMAtKTzSBzZY="; + sha256 = "sha256-3wXZBPYths3+Vhtq4W2BTR47V63o0bq++fWLIpWrm7Y="; }; - cargoSha256 = "sha256-D1GVwNpuqoiwJsWAZfTR9qUC1xuHR+O0bq9rxmgkYXk="; + cargoSha256 = "sha256-xBw2OMJMale4MWRyy6v0E0ZE4A98QXLyRu0k7L+9q8k="; cargoPatches = [ # enable pkg-config feature of zstd ./zstd-pkg-config.patch ]; - patches = [ - (fetchpatch { - name = "use-iso-time-for-snapshot-tests"; - url = "https://github.com/o2sh/onefetch/commit/b8b0320d2d271bb10053403092833a26e57134d1.patch"; - hash = "sha256-LnC+UCvSwMePC4jBjrTKnbyypNvHHNevB2v4y+hv8Pc="; - }) - ]; - nativeBuildInputs = [ cmake installShellFiles pkg-config ]; buildInputs = [ zstd ] From 2bc5625877e3abc803cdf37316b5a3af723f1fb7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 17 Jan 2023 21:00:38 +0100 Subject: [PATCH 35/71] nixos-install: remove root requirement for bind mount This moves the creation of the bind mount inside the `nixos-enter` invocation. The command are executed in an unshared mount namespace, so they can be run as an unprivileged user. --- .../modules/installer/tools/nixos-install.sh | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 9f609cefe6ea..20fec525e70b 100755 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -188,17 +188,6 @@ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ mkdir -m 0755 -p "$mountPoint/etc" touch "$mountPoint/etc/NIXOS" -# Create a bind mount for each of the mount points inside the target file -# system. This preserves the validity of their absolute paths after changing -# the root with `nixos-enter`. -# Without this the bootloader installation may fail due to options that -# contain paths referenced during evaluation, like initrd.secrets. -if (( EUID == 0 )); then - mount --rbind --mkdir "$mountPoint" "$mountPoint$mountPoint" - mount --make-rslave "$mountPoint$mountPoint" - trap 'umount -R "$mountPoint$mountPoint" && rmdir "$mountPoint$mountPoint"' EXIT -fi - # Switch to the new system configuration. This will install Grub with # a menu default pointing at the kernel/initrd/etc of the new # configuration. @@ -206,7 +195,20 @@ if [[ -z $noBootLoader ]]; then echo "installing the boot loader..." # Grub needs an mtab. ln -sfn /proc/mounts "$mountPoint"/etc/mtab - NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot + export mountPoint + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF' + # Create a bind mount for each of the mount points inside the target file + # system. This preserves the validity of their absolute paths after changing + # the root with `nixos-enter`. + # Without this the bootloader installation may fail due to options that + # contain paths referenced during evaluation, like initrd.secrets. + # when not root, re-execute the script in an unshared namespace + mount --rbind --mkdir / "$mountPoint" + mount --make-rslave "$mountPoint" + /run/current-system/bin/switch-to-configuration boot + umount -R "$mountPoint" && rmdir "$mountPoint" +EOF +)" fi # Ask the user to set a root password, but only if the passwd command From 4ed98937701a960f2faddd87119b411f17c4cacf Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 19 Jan 2023 19:18:19 +0100 Subject: [PATCH 36/71] nixos/systemd-boot: improve initrd-secrets error messages This is the equivalent of eccc1e5b but for systemd-boot --- .../systemd-boot/systemd-boot-builder.py | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index ea3577f138c2..6741e9d8452b 100755 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -42,7 +42,7 @@ def system_dir(profile: Optional[str], generation: int, specialisation: Optional else: return d -BOOT_ENTRY = """title @distroName@{profile}{specialisation} +BOOT_ENTRY = """title {title} version Generation {generation} {description} linux {kernel} initrd {initrd} @@ -106,14 +106,29 @@ def describe_generation(generation_dir: str) -> str: return description -def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], machine_id: str) -> None: +def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], + machine_id: str, current: bool) -> None: kernel = copy_from_profile(profile, generation, specialisation, "kernel") initrd = copy_from_profile(profile, generation, specialisation, "initrd") + + title = "@distroName@{profile}{specialisation}".format( + profile=" [" + profile + "]" if profile else "", + specialisation=" (%s)" % specialisation if specialisation else "") + try: append_initrd_secrets = profile_path(profile, generation, specialisation, "append-initrd-secrets") subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) except FileNotFoundError: pass + except subprocess.CalledProcessError: + if current: + print("failed to create initrd secrets!", file=sys.stderr) + sys.exit(1) + else: + print("warning: failed to create initrd secrets " + f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr) + print("note: this is normal after having removed " + "or renamed a file in `boot.initrd.secrets`", file=sys.stderr) entry_file = "@efiSysMountPoint@/loader/entries/%s" % ( generation_conf_filename(profile, generation, specialisation)) generation_dir = os.readlink(system_dir(profile, generation, specialisation)) @@ -123,8 +138,7 @@ def write_entry(profile: Optional[str], generation: int, specialisation: Optiona with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: - f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "", - specialisation=" (%s)" % specialisation if specialisation else "", + f.write(BOOT_ENTRY.format(title=title, generation=generation, kernel=kernel, initrd=initrd, @@ -281,10 +295,11 @@ def main() -> None: remove_old_entries(gens) for gen in gens: try: - write_entry(*gen, machine_id) + is_default = os.readlink(system_dir(*gen)) == args.default_config + write_entry(*gen, machine_id, current=is_default) for specialisation in get_specialisations(*gen): - write_entry(*specialisation, machine_id) - if os.readlink(system_dir(*gen)) == args.default_config: + write_entry(*specialisation, machine_id, current=is_default) + if is_default: write_loader_conf(*gen) except OSError as e: profile = f"profile '{gen.profile}'" if gen.profile else "default profile" From b139c467e968c3d84422e0f3198214beac120e77 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 19 Jan 2023 20:50:59 +0100 Subject: [PATCH 37/71] Revert "Revert "nixos/tests/installer: test relative paths in initrd secrets"" This reverts commit 8d45d82c71b91872e853f0bce3ed69993508ec5e. The tests shold pass now that systemd-boot handles failures in initrd for older boot entries. --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 50b85560e12c..3adfa979edcc 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -51,7 +51,7 @@ let boot.loader.systemd-boot.enable = true; ''} - boot.initrd.secrets."/etc/secret" = /etc/nixos/secret; + boot.initrd.secrets."/etc/secret" = ./secret; users.users.alice = { isNormalUser = true; From eb5de171c29744138fe23c5807046a35a11b7db2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Jan 2023 16:05:20 -0500 Subject: [PATCH 38/71] felix-fm: 2.2.2 -> 2.2.3 Diff: https://github.com/kyoheiu/felix/compare/v2.2.2...v2.2.3 Changelog: https://github.com/kyoheiu/felix/blob/v2.2.3/CHANGELOG.md --- pkgs/applications/file-managers/felix-fm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 7f1707713258..03e3ed9e5d6b 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VKesly7Jp1PgukArNKvDGzSRh7DaL3A/Dub3dLR6ET4="; + sha256 = "sha256-VQTZj2BCdV2TnXrYRaJqrf9sR35zsojmeoe7t+I3kyQ="; }; - cargoSha256 = "sha256-7+4SIBnu4R2mbH2nWBX9BmJL1n8t46d1vrMpNaUHAo4="; + cargoSha256 = "sha256-jH2BaPiGanBOlOU7JQZ0c0ObCaVURpjvmx2m92Fbdm4="; nativeBuildInputs = [ pkg-config ]; From ea3ccb1c7b28c28ed7603f587e8e0200092a450d Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Jan 2023 18:40:48 -0500 Subject: [PATCH 39/71] cargo-lock: 8.0.2 -> 8.0.3 Changelog: https://github.com/rustsec/rustsec/blob/cargo-lock/v8.0.3/cargo-lock/CHANGELOG.md --- pkgs/development/tools/rust/cargo-lock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/development/tools/rust/cargo-lock/default.nix index 608faf92a5a8..b5347f46379f 100644 --- a/pkgs/development/tools/rust/cargo-lock/default.nix +++ b/pkgs/development/tools/rust/cargo-lock/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lock"; - version = "8.0.2"; + version = "8.0.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-I64LXY8e8ztICS6AKfrNr/7Ntap7ESjindNWEeny6ZA="; + sha256 = "sha256-Xh39gaiTC3g1FHVWqUr8PR/MzeoRaGlCmGZZZnHB4Kc="; }; - cargoSha256 = "sha256-Yy7KQvPeyw5YSzUmoxUJAueVzkfQqDPE1j2+L+KifpU="; + cargoSha256 = "sha256-gf9KDzGKjZt4p5ldZShH4lOwrieJeI2WJQ8hU4hhGJE="; buildFeatures = [ "cli" ]; From 9a34bb217efae8470d39b36f7ad118f810d0c57b Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 10 Dec 2022 21:44:43 +0200 Subject: [PATCH 40/71] nixos/no-x-libs: add more replacements all-packages: change -nox overrides to callPackage's so there is no infinite recursion when replacing the package with a overlay --- nixos/modules/config/no-x-libs.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 9c83a44d7b0e..a1257bbdaf60 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -32,13 +32,17 @@ with lib; dbus = super.dbus.override { x11Support = false; }; ffmpeg_4 = super.ffmpeg_4-headless; ffmpeg_5 = super.ffmpeg_5-headless; + # dep of graphviz, libXpm is optional for Xpm support + gd = super.gd.override { withXorg = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + gpsd = super.gpsd.override { guiSupport = false; }; + graphviz = super.graphviz-nox; gst_all_1 = super.gst_all_1 // { gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; }; }; - gpsd = super.gpsd.override { guiSupport = false; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; + libdevil = super.libdevil-nox; libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; limesuite = super.limesuite.override { withGui = false; }; @@ -51,9 +55,13 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; + pango = super.pango.override { x11Support = false; }; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); + stoken = super.stoken.override { withGTK3 = false; }; + # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 + util-linux = super.util-linux.override { translateManpages = false; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 354fa60ea1e9..006775304c7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7763,7 +7763,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - graphviz-nox = graphviz.override { + graphviz-nox = callPackage ../tools/graphics/graphviz { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; withXorg = false; libdevil = libdevil-nox; }; @@ -20643,6 +20644,7 @@ with pkgs; }; libdevil-nox = libdevil.override { + inherit (darwin.apple_sdk.frameworks) OpenGL; withXorg = false; }; From 7c37d64da7f3a83b2998c13fc01feb9b9bdf87d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 23:58:39 +0000 Subject: [PATCH 41/71] sftpgo: 2.4.2 -> 2.4.3 --- pkgs/servers/sftpgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index 6af33c31dbf8..a55967920fe3 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-bI4IiYzVorocITkip+Xev3t7vGeMVmqCZn7oR1mAPpI="; + hash = "sha256-cSA7ndpIV3VvIZTBa9NCIlJn57EtT1qxrB0UsMENUS0="; }; - vendorHash = "sha256-+i6jUImDMrsDnIPjIp8uM2BR1IYMqWG1OmvA2w/AfVQ="; + vendorHash = "sha256-C45KA+9tdj+fR3DUBLdG2dGzT59zuAJczpKVoiAZ7lg="; ldflags = [ "-s" From ec09a471594510aaa0e6045888f0242ef999753c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 00:54:27 +0000 Subject: [PATCH 42/71] trufflehog: 3.24.0 -> 3.25.2 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 09dc5a1dfaa6..c5356e13b019 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.24.0"; + version = "3.25.2"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-MFGOw7SuTCf4no5iUxppaNjsDvhsuQQXcXutE3L7iRk="; + hash = "sha256-0cYaW55BF05tXCci76Eivn2rHMMJdjXl5WUkxvXbbnk="; }; vendorHash = "sha256-UqoFEvixSk42UTMswc8tUDVxYVkfgkern3NeDyiUMMw="; From 7a85f4dac81dbc9b7c72a40d822bd34b6b068cde Mon Sep 17 00:00:00 2001 From: Erik Rodriguez Date: Thu, 19 Jan 2023 22:12:10 -0300 Subject: [PATCH 43/71] bitwarden-menu: init at 0.4.1 --- .../misc/bitwarden-menu/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/bitwarden-menu/default.nix diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix new file mode 100644 index 000000000000..95ec2826a52a --- /dev/null +++ b/pkgs/applications/misc/bitwarden-menu/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pynput +, xdg +}: + +buildPythonApplication rec { + pname = "bitwarden-menu"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OC+MHEiUU6bDT2wSSDtu0KnwDwBpbLTBta0xjfuzlOI="; + }; + + propagatedBuildInputs = [ + pynput + xdg + ]; + + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}"; + description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database."; + homepage = "https://github.com/firecat53/bitwarden-menu"; + license = licenses.mit; + maintainers = [ maintainers.rodrgz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f2c773f6a4f..bcc40c0e9cc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2860,6 +2860,8 @@ with pkgs; inherit (nodePackages) bitwarden-cli; + bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; + inherit (nodePackages) concurrently; bklk = callPackage ../applications/misc/bklk { }; From 65fccfbd9bf4b901b9e33b36e15077aff57f35f6 Mon Sep 17 00:00:00 2001 From: Tristan Date: Thu, 19 Jan 2023 21:12:07 -0500 Subject: [PATCH 44/71] hubble: mark not broken on darwin --- pkgs/applications/networking/cluster/hubble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index e6e5e6c1ce6c..a78950dde0a3 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Network, Service & Security Observability for Kubernetes using eBPF"; license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; From 6b424b3fd67a90f99f4a950b61e79ba503ac2c83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 02:48:02 +0000 Subject: [PATCH 45/71] python310Packages.google-cloud-org-policy: 1.5.0 -> 1.7.0 --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 8f708fc65213..5a0147c855e4 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.5.0"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fA8O/pdUNgY3dwj17D7aoHUjzaXpMmL3w0TU6A6gqHo="; + hash = "sha256-V1Fpm8P4XD0USNNG1oD6OFrOeDcJyEvYPaHcWKQhLCQ="; }; propagatedBuildInputs = [ From 4c1873e256236d252ef5f85f3b151c595f15cefe Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 19 Jan 2023 20:42:12 -0500 Subject: [PATCH 46/71] gitea: 1.18.1 -> 1.18.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 894f14ba440a..b1373a7098b1 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -15,12 +15,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.18.1"; + version = "1.18.2"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-FUliQ77P0WiwB1dWHDY3FjeJdHhUAcs/97JKXBdEdl0="; + hash = "sha256-NqlY5s3tZT9HO6X0knlTPwoY6tMsYm9SyH3CEZpIcy0="; }; patches = [ From be9ed47199d366fdffb79bc1f3d1727c205930f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 04:32:39 +0000 Subject: [PATCH 47/71] python310Packages.flask-restx: 1.0.3 -> 1.0.5 --- pkgs/development/python-modules/flask-restx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index f68b41e45b69..c5298a9d68ec 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.0.3"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-restx"; repo = pname; - rev = version; - sha256 = "sha256-fodoGeVSNw4XZrVt907H20OJQIR8FlfINvEPWOkZQqI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-9CIAPsV0SJaBlNZZtWkqhhCJ/a1QEgbTkrCEBnuDVDo="; }; propagatedBuildInputs = [ From 16021d8f665ccc63a60de44b3fd8da79f1c6274e Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Jan 2023 23:34:07 -0500 Subject: [PATCH 48/71] ruff: 0.0.226 -> 0.0.227 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.226...v0.0.227 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.227 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index fcad6097d063..3f3218c7834b 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.226"; + version = "0.0.227"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1JLzDkwcC1EnJfJ03h3NZT+NxKMzhmCsDY2ATjgqM8w="; + sha256 = "sha256-tV8a90wTTU6/4StpGAgVvdmrmSFo/GGzyecUsMhM6Nk="; }; - cargoSha256 = "sha256-JK89z52fMV3BC2UO90F2j5fV5Skp7yN0vtTf4YOHnVs="; + cargoSha256 = "sha256-S3mbXlsQsJQpJNbJHfvXHH/mQJUNz0V0cENZi3ciF/s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From a12fd9257712d19ddcc2dd5cf7b7aebd8e0e13dc Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 19 Jan 2023 23:52:59 -0500 Subject: [PATCH 49/71] python310Packages.pylibjpeg-libjpeg: init at 1.3.3 --- .../pylibjpeg-libjpeg/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix new file mode 100644 index 000000000000..245cb35aba84 --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "pylibjpeg-libjpeg"; + version = "1.3.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = pname; + rev = "refs/tags/v.${version}"; + hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cython]; + + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ + pytestCheckHook + ]; + doCheck = false; # tests try to import 'libjpeg.data', which errors + + pythonImportsCheck = [ + "libjpeg" + ]; + + meta = with lib; { + description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; + homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; + license = licenses.gpl3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 982236532ca8..97d9073bda11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8199,6 +8199,8 @@ self: super: with self; { inherit (pkgs) libusb1; }; + pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { }; + pyliblo = callPackage ../development/python-modules/pyliblo { }; pylibmc = callPackage ../development/python-modules/pylibmc { }; From 94ce6278f9947e81ba1e918abba2be1121fe1448 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 19 Jan 2023 23:24:19 -0500 Subject: [PATCH 50/71] python310Packages.dcmstack: 0.8 -> 0.9; unbreak --- .../python-modules/dcmstack/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index ee554a6e2bd7..45b7fa0f5599 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,34 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast -, nose +, pythonOlder +, pytestCheckHook , nibabel , pydicom +, pylibjpeg-libjpeg }: buildPythonPackage rec { pname = "dcmstack"; - version = "0.8"; - - disabled = pythonAtLeast "3.8"; - # https://github.com/moloney/dcmstack/issues/67 + version = "0.9"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "moloney"; repo = pname; - rev = "v${version}"; - sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p"; + rev = "refs/tags/v${version}"; + hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs="; }; - propagatedBuildInputs = [ nibabel pydicom ]; + propagatedBuildInputs = [ + nibabel + pydicom + pylibjpeg-libjpeg + ]; - checkInputs = [ nose ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/moloney/dcmstack"; From e37e1460563910bfc1c57078c7c67897c548bddc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 20 Jan 2023 13:43:19 +0800 Subject: [PATCH 51/71] linuxPackages.cryptodev: cleanup and fix cross compilation --- pkgs/os-specific/linux/cryptodev/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index cc3a1d81109e..2fe98f8b801d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - prefix = "\${out}"; + makeFlags = kernel.makeFlags ++ [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + "prefix=$(out)" + ]; meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; From 05c9552d2ee86f30c333c77060056a94403eb5c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 08:48:48 +0100 Subject: [PATCH 52/71] trufflehog: specify license --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index c5356e13b019..43a97f8c8005 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/v${version}"; - license = with licenses; [ agpl3 ]; - maintainers = with maintainers; [ ]; + license = with licenses; [ agpl3Only ]; + maintainers = with maintainers; [ fab ]; }; } From f5f1b04aea5753d1d9157756516175531569ad2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 07:54:38 +0000 Subject: [PATCH 53/71] adguardhome: 0.107.21 -> 0.107.22 --- pkgs/servers/adguardhome/bins.nix | 20 ++++++++++---------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index b7b75ca39780..b8ff3a699139 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-ViWbvpGU6mk9N8Nstn0urZrcd8JIPs9Ok9806+vUvy0="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-grxGXMskjpNHcL61xgX02ouxFodxnzuhORby0wcZM7E="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-ixfeTi2Y44Om7RCKZOw3oJX+FiwTT+s7MSSqowyNKUU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-J98fqxPlr8XZMll63GC5G8SvzOS6egViHATKSKCfYQ4="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-EZzZ8Z6N+wctI/ncLjIAvFgQN1YWOnywhihxF+C6MOs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-09HyY9WL2vzA5L0nDG/ByHs/fWj+GiJUy3Rq9yWd4Ak="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-xU5PxscqBEGNCgA241UbhJcxlNXpCxbFeU7bfmSqf7I="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-1mFOlerwTOLUQGiVX1nyFfMC1vl7W0c+P/xnPjNTrYE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-ajhvvxYwttEaCQXL4WaDcjzk8g0krhIXJv5VHEEdfqg="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-eoITV5oAyGJBn607lfJgH/1C0dHkoEIvk3x6rKxKn+k="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 34bbe8655c82..f179c974a6e1 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.21"; + version = "0.107.22"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From a73e4385d1b36676f774c0a2ff8350470b30c5e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 08:01:33 +0000 Subject: [PATCH 54/71] python310Packages.python-snap7: 1.2 -> 1.3 --- pkgs/development/python-modules/python-snap7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 8322d1c4d379..069b57bd8c89 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.2"; + version = "1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gijzelaerr"; repo = "python-snap7"; rev = "refs/tags/${version}"; - hash = "sha256-xkkJE3wTqS6spwEmQ+HBY1Szao1VFoqmQ041vnAYuqQ="; + hash = "sha256-90WwgqPHsHbuQUY49cSQblN1jfoLydiG0dm1aMF/NCA="; }; propagatedBuildInputs = [ From cb19facaf838fa1a07ce1a93e4bef3571a968492 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 20 Jan 2023 05:40:45 -0300 Subject: [PATCH 55/71] jrnl: 3.0 -> 3.3 - fix build - drop tzlocal and add rich replaces - add myself as maintainer --- pkgs/applications/misc/jrnl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 141db33e8b1f..ba9f69eb6627 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "3.0"; + version = "3.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-e2w0E8t6s0OWx2ROme2GdyzWhmCc6hnMfSdLTZqt3bg="; }; nativeBuildInputs = with python3.pkgs; [ @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' + --replace 'rich = "^12.2.0"' 'rich = ">=12.2.0, <14.0.0"' ''; preCheck = '' @@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ zalakain ]; + maintainers = with maintainers; [ bryanasdev000 zalakain ]; }; } From 5466e855fa48d89006663250b1d269d6aa39b279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 08:56:21 +0000 Subject: [PATCH 56/71] python310Packages.zope_filerepresentation: 5.0.0 -> 6.0 --- .../python-modules/zope_filerepresentation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 4792a09e26b2..6539143a007a 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.filerepresentation"; - version = "5.0.0"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "1mp2r80v6ns92j089l7ngh8l9fk95g2661vkp4vqw7c71irs9g1z"; + sha256 = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs="; }; propagatedBuildInputs = [ zope_interface zope_schema ]; From daa247f1a5916cc56cf713e1949d7c8aa36fc8e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 10:18:54 +0000 Subject: [PATCH 57/71] python310Packages.bottleneck: 1.3.5 -> 1.3.6 --- pkgs/development/python-modules/bottleneck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 5774397e24f2..c31ac24a9417 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Bottleneck"; inherit version; - hash = "sha256-LA0nr+RTUfb0IYkzYmIYBPp96hT+KaeOqlLUMj9kbec="; + hash = "sha256-vBXiVF1CgtbyUpWX3xvW5MXwxEKWs/hCW8g1MFvZQ8k="; }; propagatedBuildInputs = [ From 537f5f549d75758d110c7b7d2dc859255b581413 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 11:56:37 +0100 Subject: [PATCH 58/71] python310Packages.odp-amsterdam: 5.0.0 -> 5.0.1 Diff: https://github.com/klaasnicolaas/python-odp-amsterdam/compare/refs/tags/v5.0.0...v5.0.1 --- pkgs/development/python-modules/odp-amsterdam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 30c98144906b..d5fd4c2de3ea 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-zVnM4KYH4R6n2y9IAaYGOZVPnc8RuT/S2bseKJBO9bg="; + hash = "sha256-gRfOZwUguQgoROnqQuQWKOgubR3wjcf7Yfje2+4+CB0="; }; postPatch = '' From 48cff6766280f9e07c043c2b8a38173bf8e0d3c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 11:58:42 +0100 Subject: [PATCH 59/71] python310Packages.odp-amsterdam: update meta --- pkgs/development/python-modules/odp-amsterdam/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index d5fd4c2de3ea..67de7000a3bd 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -50,7 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; - homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; + homepage = "https://github.com/klaasnicolaas/python-odp-amsterdam"; + changelog = "https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 5689ba1eb04f61b967c36f341d14b30dca6dba73 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 20 Jan 2023 11:04:32 +0000 Subject: [PATCH 60/71] d2: 0.1.5 -> 0.1.6 --- pkgs/tools/text/d2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 326e5b18ba73..53cb9b876f42 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-z7R3lseEPWtBl5wjpMK8okQG31L1k2R/+B9M25TrI6s="; + hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM="; }; - vendorHash = "sha256-t94xCNteYRpbV2GzrD4ppD8xfUV1HTJPkipEzr36CaM="; + vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU="; ldflags = [ "-s" From 952b1a0704135d1a44529c168ca64bac17bf11d2 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 20 Jan 2023 12:25:07 +0100 Subject: [PATCH 61/71] got: 0.79 -> 0.81 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 00b49f2957ad..392551aace3e 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.79"; + version = "0.81"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw="; + sha256 = "sha256-ayPXOtqJIJAzDTY1T4rw9GF7KvfI2XJ/c9uo4Fs8db8="; }; nativeBuildInputs = [ pkg-config bison ]; From e3848c1ec442b94fd115ebe9fc31d5c499e90ff5 Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Fri, 20 Jan 2023 13:08:22 +0100 Subject: [PATCH 62/71] openmvg: 2.0 -> unstable-2022-12-30 (#211560) --- pkgs/applications/science/misc/openmvg/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 81c377a91c78..1e20e5896363 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -8,14 +8,14 @@ , enableDocs ? false }: stdenv.mkDerivation rec { - version = "2.0"; + version = "unstable-2022-12-30"; pname = "openmvg"; src = fetchFromGitHub { owner = "openmvg"; repo = "openmvg"; - rev = "v${version}"; - sha256 = "sha256-6F/xUgZpqY+v6CpwTBhIXI4JdT8HVB0P5JzOL66AVd8="; + rev = "e1bbfe801986cd7171f36443a1573b0f69f3702d"; + sha256 = "sha256-DngfmejNFw5pogTo7Ec5aUey2LUQIojvJybLmtCfvVY="; fetchSubmodules = true; }; @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.isDarwin && stdenv.isx86_64; description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ mdaiter ]; }; } From 429c27c9d6b628c49a2be0f02eaef8d67add1b38 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername <111183546+GenericNerdyUsername@users.noreply.github.com> Date: Fri, 20 Jan 2023 12:08:34 +0000 Subject: [PATCH 63/71] python310Packages.edalize: fix build (#211601) --- pkgs/development/python-modules/edalize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 796213693286..e0e6ffa85838 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -6,7 +6,6 @@ , pandas , pytestCheckHook , which -, verilog , yosys }: @@ -34,12 +33,13 @@ buildPythonPackage rec { pandas which yosys - verilog ]; pythonImportsCheck = [ "edalize" ]; disabledTestPaths = [ + "tests/test_questa_formal.py" + "tests/test_slang.py" "tests/test_apicula.py" "tests/test_ascentlint.py" "tests/test_diamond.py" From dea00a05788086671cbfa284e54642ee6d9d25a7 Mon Sep 17 00:00:00 2001 From: dantefromhell <90508808+dantefromhell@users.noreply.github.com> Date: Fri, 20 Jan 2023 12:18:40 +0000 Subject: [PATCH 64/71] factorio-experimental: 1.1.74 -> 1.1.76 (#211452) Co-authored-by: dantefromhell --- pkgs/games/factorio/versions.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 629f18406846..2dceedf776ba 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.74.tar.xz", + "name": "factorio_alpha_x64-1.1.76.tar.xz", "needsAuth": true, - "sha256": "0ygnqlw92gz2s2c4pdhb11lvh86d7byhw5l3qw1fjsx0xv3qnxrs", + "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/alpha/linux64", - "version": "1.1.74" + "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", + "version": "1.1.76" }, "stable": { "name": "factorio_alpha_x64-1.1.74.tar.xz", @@ -20,12 +20,12 @@ }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.69.tar.xz", + "name": "factorio_demo_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29", + "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/demo/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.76/demo/linux64", + "version": "1.1.76" }, "stable": { "name": "factorio_demo_x64-1.1.69.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.74.tar.xz", + "name": "factorio_headless_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "1lqxprmai3vrm3hf9zdj9c9c6w05086nzn0vy88zy7xm2dgw7ylv", + "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/headless/linux64", - "version": "1.1.74" + "url": "https://factorio.com/get-download/1.1.76/headless/linux64", + "version": "1.1.76" }, "stable": { "name": "factorio_headless_x64-1.1.74.tar.xz", From 7a05f9de7d4ca8e8ccc9ec19d8ccd76afd23c146 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 20 Jan 2023 14:31:54 +0100 Subject: [PATCH 65/71] gccgo: wrap go binary (#207670) --- pkgs/build-support/cc-wrapper/default.nix | 1 + pkgs/build-support/cc-wrapper/go-wrapper.sh | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/build-support/cc-wrapper/go-wrapper.sh diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d1c57a77a58c..06aabf2a6f3e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -264,6 +264,7 @@ stdenv.mkDerivation { + optionalString cc.langGo or false '' wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo + wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go ''; strictDeps = true; diff --git a/pkgs/build-support/cc-wrapper/go-wrapper.sh b/pkgs/build-support/cc-wrapper/go-wrapper.sh new file mode 100644 index 000000000000..5dfc5d2b73fc --- /dev/null +++ b/pkgs/build-support/cc-wrapper/go-wrapper.sh @@ -0,0 +1,11 @@ +#! @shell@ +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +export GCCGO="@out@/bin/gccgo" + +exec @prog@ "$@" From de640e137a3bd32f8db942693793b050385a8b49 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 20 Jan 2023 14:33:04 +0100 Subject: [PATCH 66/71] gitlab-runner: 15.7.2 -> 15.8.0 (#211591) https://gitlab.com/gitlab-org/gitlab-runner/blob/v15.8.0/CHANGELOG.md --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a4e319020b69..14984ba9519e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.7.2"; + version = "15.8.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorSha256 = "sha256-lZAESAJ7ZRjHW6MD/xm3rOczK0h8EfmRAAVxRbVLu/k="; + vendorSha256 = "sha256-YHBp6Grm+atGne/5Ia/1H2xQRODmfWsMGCqHAIE9P4k="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-NiBQQ36F8aYi1Uk3P0UgBy4Pai6Coz3oQDvWWOGGQNw="; + sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g="; }; patches = [ From aa7d5394a818abee6cbb35413184bd419e08087a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 20 Jan 2023 15:48:51 +0100 Subject: [PATCH 67/71] pdns-recursor: 4.8.0 -> 4.8.1 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 566f2ab015ff..a41581d934c6 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "zLkBehp4jpXpSOeyQO+NtTropQe5FfJgGI7zQ/f2i9w="; + sha256 = "17A0RwCSV+US8B/MRsvbnIWbZyocmyP684LocHZbDw0="; }; nativeBuildInputs = [ pkg-config ]; From b3dead4ffbd5b35ba38022c6be733212bb737b2e Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Thu, 19 Jan 2023 13:41:47 +0100 Subject: [PATCH 68/71] openmvs: init at 2.1.0 --- .../science/misc/openmvs/default.nix | 34 +++++++++++++++++++ pkgs/development/libraries/CGAL/4.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/applications/science/misc/openmvs/default.nix diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix new file mode 100644 index 000000000000..031f1655b0af --- /dev/null +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }: + +let + boostWithZstd = boost.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ zstd ]; + }); +in +stdenv.mkDerivation rec { + version = "2.1.0"; + pname = "openmvs"; + + src = fetchFromGitHub { + owner = "cdcseacave"; + repo = "openmvs"; + rev = "v${version}"; + sha256 = "sha256-eqNprBgR0hZnbLKLZLJqjemKxHhDtGblmaSxYlmegsc="; + fetchSubmodules = true; + }; + + # SSE is enabled by default + cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; + + buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = { + description = "Open Multi-View Stereo reconstruction library"; + homepage = "https://github.com/cdcseacave/openMVS"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bouk ]; + }; +} diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index 9c0305ec077d..d30492c89061 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./cgal_path.patch # Pull upstream fix for c++17 (gcc-12): # https://github.com/CGAL/cgal/pull/6109 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c4edafb0e0b..718e941b508c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10289,6 +10289,8 @@ with pkgs; openmvg = callPackage ../applications/science/misc/openmvg { }; + openmvs = callPackage ../applications/science/misc/openmvs { }; + openntpd = callPackage ../tools/networking/openntpd { }; openntpd_nixos = openntpd.override { From e72146804abedf0f3c38e33115369a2509fb6676 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 20 Jan 2023 18:04:58 +0100 Subject: [PATCH 69/71] pkgsMusl.go: bootstrap with gccgo (#207681) --- pkgs/development/compilers/go/1.18.nix | 4 ++-- pkgs/development/compilers/go/1.19.nix | 4 ++-- pkgs/development/compilers/go/1.20.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index b6f0c371cb01..46c5e8b31003 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -17,7 +17,7 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; + goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo118Module; }; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 28cced9451a7..afe4072641f0 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -17,7 +17,7 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; + goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo119Module; }; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index 009ecb8bf42a..134ca0f5b668 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -17,7 +17,7 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap117.nix { }; + goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap117.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo120Module; }; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild From f5e63a0e9e4b1846964dcaa61a5325b7b70a3a39 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 19 Jan 2023 21:39:04 +0000 Subject: [PATCH 70/71] bintools: add isGNU and isLLVM attributes --- pkgs/build-support/bintools-wrapper/default.nix | 3 ++- pkgs/development/compilers/llvm/10/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/11/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/12/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/13/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/14/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/7/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/8/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/9/bintools/default.nix | 7 ++++++- pkgs/development/compilers/llvm/git/bintools/default.nix | 7 ++++++- 10 files changed, 56 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 6b9d6e905bf2..45ae3eba9b44 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -25,6 +25,7 @@ , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" +, isGNU ? bintools.isGNU or false, isLLVM ? bintools.isLLVM or false , buildPackages ? {} , targetPackages ? {} , useMacosReexportHack ? false @@ -108,7 +109,7 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix suffixSalt; - inherit bintools libc nativeTools nativeLibc nativePrefix; + inherit bintools libc nativeTools nativeLibc nativePrefix isGNU isLLVM; emacsBufferSetup = pkgs: '' ; We should handle propagation here too diff --git a/pkgs/development/compilers/llvm/10/bintools/default.nix b/pkgs/development/compilers/llvm/10/bintools/default.nix index a9d4f5fffc09..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/10/bintools/default.nix +++ b/pkgs/development/compilers/llvm/10/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/11/bintools/default.nix b/pkgs/development/compilers/llvm/11/bintools/default.nix index a9d4f5fffc09..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/11/bintools/default.nix +++ b/pkgs/development/compilers/llvm/11/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/12/bintools/default.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix index a9d4f5fffc09..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/12/bintools/default.nix +++ b/pkgs/development/compilers/llvm/12/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix index 13223f051be7..b6ee7b4dc25c 100644 --- a/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix index 13223f051be7..b6ee7b4dc25c 100644 --- a/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/7/bintools/default.nix b/pkgs/development/compilers/llvm/7/bintools/default.nix index a9d4f5fffc09..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/7/bintools/default.nix +++ b/pkgs/development/compilers/llvm/7/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/8/bintools/default.nix b/pkgs/development/compilers/llvm/8/bintools/default.nix index a9d4f5fffc09..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/8/bintools/default.nix +++ b/pkgs/development/compilers/llvm/8/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/9/bintools/default.nix b/pkgs/development/compilers/llvm/9/bintools/default.nix index a9d4f5fffc09..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/9/bintools/default.nix +++ b/pkgs/development/compilers/llvm/9/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/git/bintools/default.nix b/pkgs/development/compilers/llvm/git/bintools/default.nix index 6a12d776aca1..303faf7bbb61 100644 --- a/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/pkgs/development/compilers/llvm/git/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) From 4ed0e1a743dbd92f865e6c7a4980bdf55b40df46 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 19 Jan 2023 21:40:06 +0000 Subject: [PATCH 71/71] gcc: use as(1) from binutils with LLVM bintools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LLVM does not provide a drop-in replacement for as(1). This makes it possible to build a GNU Fortran cross compiler from GNU to LLVM — e.g. buildPackages.gfortran for { system = "aarch64-linux"; useLLVM = true; } --- pkgs/development/compilers/gcc/10/default.nix | 4 ++-- pkgs/development/compilers/gcc/11/default.nix | 4 ++-- pkgs/development/compilers/gcc/12/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.8/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.9/default.nix | 4 ++-- pkgs/development/compilers/gcc/6/default.nix | 4 ++-- pkgs/development/compilers/gcc/7/default.nix | 4 ++-- pkgs/development/compilers/gcc/8/default.nix | 4 ++-- pkgs/development/compilers/gcc/9/default.nix | 4 ++-- pkgs/development/compilers/gcc/common/configure-flags.nix | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index b2c2ac9875aa..2751501901f2 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -202,7 +202,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 0724eedc29c8..265e696523da 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -206,7 +206,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 4287e4d67d45..7e1847ebba98 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , libucontext ? null @@ -250,7 +250,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index e0c30f35a13d..042e561a2e36 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -12,7 +12,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -207,7 +207,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl cloog enableLTO diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index d886cc84ecaf..8420cfdde7d5 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -12,7 +12,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -227,7 +227,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl cloog enableLTO diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index f82070153b78..66b53c6d5b5e 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -14,7 +14,7 @@ , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , gnatboot ? null @@ -238,7 +238,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 076eec21a142..8fd990f95ffb 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -11,7 +11,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -206,7 +206,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 18054c8c19b9..2dc141b529fc 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -11,7 +11,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -188,7 +188,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7cdde48667f6..9b5f4504db8e 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -201,7 +201,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 8e444d54bf39..9c88e2182ff9 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -5,7 +5,7 @@ , threadsCross , version -, gmp, mpfr, libmpc, isl +, binutils, gmp, mpfr, libmpc, isl , cloog ? null , enableLTO @@ -51,7 +51,7 @@ let crossConfigureFlags = # Ensure that -print-prog-name is able to find the correct programs. [ - "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-as=${if targetPackages.stdenv.cc.bintools.isLLVM then binutils else targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ (if crossStageStatic then [