diff --git a/hosts/common/programs/errno.nix b/hosts/common/programs/errno.nix index c87293a8d..e518e47a6 100644 --- a/hosts/common/programs/errno.nix +++ b/hosts/common/programs/errno.nix @@ -3,17 +3,13 @@ sane.programs.errno = { # packageUnwrapped = pkgs.linkIntoOwnPackage pkgs.moreutils "bin/errno"; # actually, don't build all of moreutils because not all of it builds for cross targets. - # some of this can be simplified after packageUnwrapped = pkgs.moreutils.overrideAttrs (base: { makeFlags = (base.makeFlags or []) ++ [ "BINS=errno" "MANS=errno.1" "PERLSCRIPTS=errno" #< Makefile errors if empty, but this works :) - "INSTALL_BIN=install" ]; - #v disable the perl-specific stuff - propagatedBuildInputs = []; - postInstall = ""; + buildInputs = []; #< errno has no runtime perl deps, and they don't cross compile, so disable them. }); sandbox.method = "landlock"; diff --git a/pkgs/additional/nixpkgs/default.nix b/pkgs/additional/nixpkgs/default.nix index 63437fc4d..09c85c979 100644 --- a/pkgs/additional/nixpkgs/default.nix +++ b/pkgs/additional/nixpkgs/default.nix @@ -27,12 +27,12 @@ }: let lock = { - master.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474"; - master.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78="; - staging.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474"; - staging.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78="; - staging-next.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474"; - staging-next.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78="; + master.rev = "a0e6ea95efe196c07d146f4400e5602191903a40"; + master.sha256 = "sha256-jHrmQfUnkIkpni5t5PjatcXeecOB7aUkkHlja7bE+ss="; + staging.rev = "a0e6ea95efe196c07d146f4400e5602191903a40"; + staging.sha256 = "sha256-jHrmQfUnkIkpni5t5PjatcXeecOB7aUkkHlja7bE+ss="; + staging-next.rev = "a0e6ea95efe196c07d146f4400e5602191903a40"; + staging-next.sha256 = "sha256-jHrmQfUnkIkpni5t5PjatcXeecOB7aUkkHlja7bE+ss="; }; lock' = lock."${variant}"; unpatchedSrc = fetchzip { @@ -81,7 +81,7 @@ in src.overrideAttrs (base: { # attributes needed for update scripts pname = "nixpkgs"; - version = "24.05-unstable-2024-07-10"; + version = "24.05-unstable-2024-07-14"; passthru = (base.passthru or {}) // nixpkgs // { src = unpatchedSrc // { inherit (lock') rev;