colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2024-07-10 -> 2024-07-14

Browse Source
This commit is contained in:
Colin
2024-07-14 22:09:44 +00:00
parent a926cbee46
commit 7b0a4c11ec
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/common/programs/errno.nix
View File

@@ -3,17 +3,13 @@
sane.programs.errno = { sane.programs.errno = {
# packageUnwrapped = pkgs.linkIntoOwnPackage pkgs.moreutils "bin/errno"; # packageUnwrapped = pkgs.linkIntoOwnPackage pkgs.moreutils "bin/errno";
# actually, don't build all of moreutils because not all of it builds for cross targets. # actually, don't build all of moreutils because not all of it builds for cross targets.
# some of this can be simplified after <https://github.com/NixOS/nixpkgs/pull/316446>
packageUnwrapped = pkgs.moreutils.overrideAttrs (base: { packageUnwrapped = pkgs.moreutils.overrideAttrs (base: {
makeFlags = (base.makeFlags or []) ++ [ makeFlags = (base.makeFlags or []) ++ [
"BINS=errno" "BINS=errno"
"MANS=errno.1" "MANS=errno.1"
"PERLSCRIPTS=errno" #< Makefile errors if empty, but this works :) "PERLSCRIPTS=errno" #< Makefile errors if empty, but this works :)
"INSTALL_BIN=install"
]; ];
#v disable the perl-specific stuff buildInputs = []; #< errno has no runtime perl deps, and they don't cross compile, so disable them.
propagatedBuildInputs = [];
postInstall = "";
}); });
sandbox.method = "landlock"; sandbox.method = "landlock";

14
pkgs/additional/nixpkgs/default.nix
View File

@@ -27,12 +27,12 @@
}: }:
let let
lock = { lock = {
master.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474"; master.rev = "a0e6ea95efe196c07d146f4400e5602191903a40";
master.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78="; master.sha256 = "sha256-jHrmQfUnkIkpni5t5PjatcXeecOB7aUkkHlja7bE+ss=";
staging.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474"; staging.rev = "a0e6ea95efe196c07d146f4400e5602191903a40";
staging.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78="; staging.sha256 = "sha256-jHrmQfUnkIkpni5t5PjatcXeecOB7aUkkHlja7bE+ss=";
staging-next.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474"; staging-next.rev = "a0e6ea95efe196c07d146f4400e5602191903a40";
staging-next.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78="; staging-next.sha256 = "sha256-jHrmQfUnkIkpni5t5PjatcXeecOB7aUkkHlja7bE+ss=";
}; };
lock' = lock."${variant}"; lock' = lock."${variant}";
unpatchedSrc = fetchzip { unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
src.overrideAttrs (base: { src.overrideAttrs (base: {
# attributes needed for update scripts # attributes needed for update scripts
pname = "nixpkgs"; pname = "nixpkgs";
version = "24.05-unstable-2024-07-10"; version = "24.05-unstable-2024-07-14";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;