From cd13a2074b6c8c909b1f73cc641e2481d921db02 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Fri, 24 Jun 2022 20:43:40 +0300 Subject: [PATCH 1/6] nixos/network-interfaces-scripted: don't bindTo absent network-setup.service --- nixos/modules/tasks/network-interfaces-scripted.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index dce72b36fc50..f44dafc9706a 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -85,12 +85,14 @@ let hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "") || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != ""); - networkLocalCommands = { + needNetworkSetup = cfg.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null; + + networkLocalCommands = lib.mkIf needNetworkSetup { after = [ "network-setup.service" ]; bindsTo = [ "network-setup.service" ]; }; - networkSetup = lib.mkIf (config.networking.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null) + networkSetup = lib.mkIf needNetworkSetup { description = "Networking Setup"; after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; From 9c98a3908de7bf4bf48009bfc5045ba8c43a3ed0 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 18 Jul 2022 17:31:13 +0200 Subject: [PATCH 2/6] git-annex: wrap with coreutils on all platforms Co-authored-by: sternenseemann --- .../development/haskell-modules/configuration-nix.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c05a207e89e9..3679e6d891bd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -535,9 +535,7 @@ self: super: builtins.intersectAttrs super { }) (addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark); - git-annex = let - pathForDarwin = pkgs.lib.makeBinPath [ pkgs.coreutils ]; - in overrideCabal (drv: pkgs.lib.optionalAttrs (!pkgs.stdenv.isLinux) { + git-annex = overrideCabal (drv: { # This is an instance of https://github.com/NixOS/nix/pull/1085 # Fails with: # gpg: can't connect to the agent: File name too long @@ -545,11 +543,12 @@ self: super: builtins.intersectAttrs super { substituteInPlace Test.hs \ --replace ', testCase "crypto" test_crypto' "" '' + (drv.postPatch or ""); - # On Darwin, git-annex mis-detects options to `cp`, so we wrap the - # binary to ensure it uses Nixpkgs' coreutils. + # Ensure git-annex uses the exact same coreutils it saw at build-time. + # This is especially important on Darwin but also in Linux environments + # where non-GNU coreutils are used by default. postFixup = '' wrapProgram $out/bin/git-annex \ - --prefix PATH : "${pathForDarwin}" + --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.coreutils ]}" '' + (drv.postFixup or ""); buildTools = [ pkgs.buildPackages.makeWrapper From 7e9e6145e68face7eeab9be4466743001fce5882 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 18 Jul 2022 17:35:25 +0200 Subject: [PATCH 3/6] git-annex: wrap with lsof Required by the assistant at runtime: ``` $ nix-shell --pure -p git git-annex $ git annex assistant git-annex: The lsof command is needed for watch mode to be safe, and is not in PATH. To override lsof checks to ensure that files are not open for writing when added to the annex, you can use --force Be warned: This can corrupt data in the annex, and make fsck complain. ``` --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3679e6d891bd..f16a2c439f1a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -548,7 +548,7 @@ self: super: builtins.intersectAttrs super { # where non-GNU coreutils are used by default. postFixup = '' wrapProgram $out/bin/git-annex \ - --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.coreutils ]}" + --prefix PATH : "${pkgs.lib.makeBinPath (with pkgs; [ coreutils lsof ])}" '' + (drv.postFixup or ""); buildTools = [ pkgs.buildPackages.makeWrapper From f2c952b68837c2437b88039ff01149bb0954e6e0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 18 Jul 2022 07:32:36 -0400 Subject: [PATCH 4/6] pythonModules.polars: mark as broken --- .../python-modules/polars/default.nix | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 5b1e1a5ecbb5..dd9dbc114b23 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -49,7 +49,36 @@ buildPythonPackage { # ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + # Adding cmake to nativeBuildInputs and using `dontUseCmakeConfigure = true;` + # The following error still happens + + # Compiling arrow2 v0.10.1 (https://github.com/ritchie46/arrow2?branch=polars#da703ae3) + # error[E0554]: `#![feature]` may not be used on the stable release channel + # --> /build/polars-0.13.19-vendor.tar.gz/arrow2/src/lib.rs:8:39 + # | + # 8 | #![cfg_attr(feature = "simd", feature(portable_simd))] + # | ^^^^^^^^^^^^^ + # error: aborting due to previous error + # For more information about this error, try `rustc --explain E0554`. + # error: could not compile `arrow2` due to 2 previous errors + # warning: build failed, waiting for other jobs to finish... + # maturin failed + # Caused by: Failed to build a native library through cargo + # Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` + # error: builder for '/nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv' failed with exit code 1; + # last 10 log lines: + # > error: aborting due to previous error + # > + # > + # > For more information about this error, try `rustc --explain E0554`. + # > + # > error: could not compile `arrow2` due to 2 previous errors + # > warning: build failed, waiting for other jobs to finish... + # > maturin failed + # > Caused by: Failed to build a native library through cargo + # > Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` + # For full logs, run 'nix log /nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv'. + broken = true; description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; homepage = "https://github.com/pola-rs/polars"; license = licenses.asl20; From 69902951316a59601d04c392e115e1953a7afce1 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 18 Jul 2022 18:15:15 -0400 Subject: [PATCH 5/6] vector: 0.23.0 -> 0.22.3 --- pkgs/tools/misc/vector/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 0fe8734d4ca7..08617255a23f 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -24,13 +24,13 @@ , features ? ([ "sinks" "sources" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] + ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ] ++ lib.optional stdenv.targetPlatform.isUnix "unix") }: let pname = "vector"; - version = "0.23.0"; + version = "0.22.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y1RysuCWvdbqckW54r1uH/K9YTuAZk8T4M3HRGFm0EM="; + sha256 = "sha256-62oPttkdahTeMsd9lpd9/tc95kluVJuWxzP94i+gWhA="; }; - cargoSha256 = "sha256-VBmJfRCwSv3t5DPzVj92ajGYk5Ju8xqr4v7IDU17498="; + cargoSha256 = "sha256-WWX47pbva7ZmPR6hBstJ5VqOwu3mkhhsHK3LHHqQjDE="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From 5d3aac18a259249fdb6f01ae30eca05d691f7f0f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:53:21 +1000 Subject: [PATCH 6/6] clusterctl: 1.1.5 -> 1.2.0 https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.2.0 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index c2b313d442e3..f09afe7b65d5 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-Nnfy8KOMJqg2sXrNDZlrcrpWfc70sXL1tNlXSgg5ZZg="; + sha256 = "sha256-udlIylkaNZIkJS6TgJemmQr/o73i87Nt8pL2Pbe+AqA="; }; - vendorSha256 = "sha256-zRdtd/mE9AQtqw9Z/Tatd9vEx9l/XSFge8sOLbS/Wrs="; + vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg="; subPackages = [ "cmd/clusterctl" ];