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

nixpkgs-bootstrap: 0-unstable-2024-11-16 -> 0-unstable-2024-11-19

Browse Source 
and also simplify my overlays; rework things to be more cache-friendly
This commit is contained in:
Colin
2024-11-22 04:27:52 +00:00
parent 1029e36fed
commit 4b444134a2
9 changed files with 107 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/calls.nix
View File

@@ -42,6 +42,8 @@ in
};
packageUnwrapped = pkgs.rmDbusServicesInPlace ((pkgs.calls.override {
# 46.3 -> 47.xx upgraded gtk3 -> gtk4; nixpkgs package is outdated, so substitute gtk3 deps with gtk4 deps
evolution-data-server = pkgs.evolution-data-server-gtk4;
gtk3 = pkgs.gtk4;
libpeas = pkgs.libpeas2;
wrapGAppsHook3 = pkgs.wrapGAppsHook4;

5
hosts/common/programs/mpv/default.nix
View File

@@ -156,6 +156,11 @@ in
};
packageUnwrapped = pkgs.mpv-unwrapped.wrapper {
mpv = pkgs.mpv-unwrapped.override rec {
# ffmpeg = pkgs.ffmpeg.override {
# # to enable spatial audio, i.e. downmixing 7.1 -> 2.0.
# # but nowadays i route surround staright out of mpv and do the downmixing in pipewire instead.
# withMysofa = true;
# };
# N.B.: populating `self` to `luajit` is necessary for the resulting `lua.withPackages` function to preserve my override.
# i use enable52Compat in order to get `table.unpack`.
# i think using `luajit` here instead of `lua` is optional, just i get better perf with it :)

59
overlays/cross.nix
View File

@@ -215,7 +215,7 @@ in with final; {
# shell = runtimeShell;
# };
# 2024/08/12: upstreaming is blocked on libgweather, via evolution-data-server
# 2024/11/19: upstreaming is blocked on samba (via gvfs/gnome-online-accounts/evolution-data-server)
# fixes: "Exec format error: './calls-scan'"
calls = prev.calls.overrideAttrs (upstream: {
# TODO: try building with mesonEmulatorHook when i upstream this
@@ -226,7 +226,7 @@ in with final; {
mesonFlags = lib.remove "-Dgtk_doc=true" upstream.mesonFlags;
});
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
delfin = (prev.delfin.override {
cargo = crossCargo;
}).overrideAttrs (upstream: {
@@ -236,7 +236,7 @@ in with final; {
];
});
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
dialect = (prev.dialect.override {
blueprint-compiler = wrapBlueprint [
buildPackages.gdk-pixbuf
@@ -277,8 +277,8 @@ in with final; {
cargo = crossCargo; #< fixes openssl not being able to find its library
};
# 2024/11/19: upstreaming is blocked on samba (via gnome-online-accounts)
evolution-data-server = prev.evolution-data-server.overrideAttrs (upstream: {
# 2024/09/01: upstreaming is blocked by libgweather (out for PR)
cmakeFlags = upstream.cmakeFlags ++ [
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
"-DENABLE_TESTS=no"
@@ -375,7 +375,7 @@ in with final; {
];
};
# 2024/08/12: upstreaming is blocked by xdg-desktop-portal
# 2024/11/19: upstreaming is blocked by glycin-loaders
fractal = prev.fractal.override {
cargo = crossCargo;
};
@@ -393,7 +393,7 @@ in with final; {
# outputs = lib.remove "devdoc" upstream.outputs;
# });
# 2024/08/12: upstreaming is blocked by libgweather (out for review) via evolution-data-server
# 2024/11/19: upstreaming is blocked by samba (via gvfs)
geary = prev.geary.overrideAttrs (upstream: {
buildInputs = upstream.buildInputs ++ [
# glib
@@ -402,7 +402,7 @@ in with final; {
];
});
# 2024/09/01: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
glycin-loaders = (prev.glycin-loaders.override {
cargo = crossCargo;
}).overrideAttrs (upstream: {
@@ -422,7 +422,7 @@ in with final; {
# });
# });
# 2024/09/01: upstreaming is blocked on qtx11extras (via zbar)
# 2024/11/19: upstreaming is blocked on qtx11extras (via zbar)
gnome-frog = prev.gnome-frog.override {
blueprint-compiler = wrapBlueprint [
buildPackages.gdk-pixbuf
@@ -435,17 +435,18 @@ in with final; {
];
};
gnome-maps = prev.gnome-maps.overrideAttrs (upstream: {
# 2024/08/12: upstreaming is blocked by libgweather (direct dependency)
postPatch = (upstream.postPatch or "") + ''
# fixes: "ERROR: Program 'gjs' not found or not executable"
substituteInPlace meson.build \
--replace-fail "find_program('gjs')" "find_program('${gjs}/bin/gjs')"
'';
});
# 2024/11/19: upstreaming is unblocked
# out for PR: <https://github.com/NixOS/nixpkgs/pull/357238>
# gnome-maps = prev.gnome-maps.overrideAttrs (upstream: {
# postPatch = (upstream.postPatch or "") + ''
# # fixes: "ERROR: Program 'gjs' not found or not executable"
# substituteInPlace meson.build \
# --replace-fail "find_program('gjs')" "find_program('${gjs}/bin/gjs')"
# '';
# });
# 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig".
# 2024/09/01: upstreaming is blocked on gvfs -> samba
# 2024/11/19: upstreaming is blocked on gvfs -> samba
gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
# gnome-settings-daemon = prev.gnome-settings-daemon.overrideAttrs (orig: {
@@ -536,8 +537,9 @@ in with final; {
# # );
# });
# 2024/11/09: upstreaming is blocked on gssdp
gtk4-layer-shell = mvToBuildInputs [ wayland-protocols ] prev.gtk4-layer-shell;
# 2024/11/19: upstreaming is unblocked
# out for PR: <https://github.com/NixOS/nixpkgs/pull/357230>
# gtk4-layer-shell = mvToBuildInputs [ wayland-protocols ] prev.gtk4-layer-shell;
# out for PR: <https://github.com/NixOS/nixpkgs/pull/263182>
# hspell = prev.hspell.overrideAttrs (upstream: {
@@ -598,7 +600,7 @@ in with final; {
# nativeBuildInputs = lib.remove [ qt6.wrapQtAppsHook ] upstream.nativeBuildInputs;
# });
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
komikku = prev.komikku.override {
blueprint-compiler = wrapBlueprint [
buildPackages.gdk-pixbuf
@@ -671,12 +673,12 @@ in with final; {
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# });
# 2024/08/12: upstreaming blocked on libgweather
# 2024/11/19: upstreaming blocked on glycin-loaders
loupe = prev.loupe.override {
cargo = crossCargo;
};
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
mepo = (prev.mepo.override {
# nixpkgs mepo correctly puts `zig_0_12.hook` in nativeBuildInputs,
# but for some reason that tries to use the host zig instead of the build zig.
@@ -768,7 +770,7 @@ in with final; {
# 2023/07/31: upstreaming is blocked on vpnc cross compilation
# networkmanager-vpnc = mvToNativeInputs [ glib ] prev.networkmanager-vpnc;
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
newsflash = (prev.newsflash.override {
blueprint-compiler = wrapBlueprint [
buildPackages.clapper
@@ -927,7 +929,7 @@ in with final; {
# ];
# } prev.phosh-mobile-settings;
# 2024/09/01: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
pwvucontrol = prev.pwvucontrol.override {
cargo = crossCargo;
};
@@ -1033,13 +1035,13 @@ in with final; {
# };
# });
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is blocked on glycin-loaders
snapshot = prev.snapshot.override {
# fixes "error: linker `cc` not found"
cargo = crossCargo;
};
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
spot = prev.spot.override {
blueprint-compiler = wrapBlueprint [
buildPackages.gdk-pixbuf
@@ -1097,7 +1099,7 @@ in with final; {
# ];
# });
# 2024/08/12: upstreaming is unblocked
# 2024/11/19: upstreaming is unblocked
tangram = (prev.tangram.override {
blueprint-compiler = wrapBlueprint [
buildPackages.gdk-pixbuf
@@ -1137,6 +1139,7 @@ in with final; {
# });
# };
# 2024/11/19: upstreaming is unblocked
video-trimmer = prev.video-trimmer.override {
blueprint-compiler = wrapBlueprint [
buildPackages.gdk-pixbuf
@@ -1245,6 +1248,6 @@ in with final; {
# upstream.postBuild;
# });
# 2024/05/31: upstreaming is blocked on unar (gnustep), unless i also make that optional
# 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
}

88
overlays/preferences.nix
View File

@@ -9,48 +9,56 @@
unfreeIncludeHDCPBlob = false;
};
beam = super.beam.override {
# build erlang without webkit (for servo)
wxGTK32 = wxGTK32.override {
withWebKit = false;
};
};
evolution-data-server = super.evolution-data-server.override {
# OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation
enableOAuth2 = false;
};
# beam = super.beam.override {
# # build erlang without webkit (for servo)
# wxGTK32 = wxGTK32.override {
# withWebKit = false;
# };
# };
ffmpeg = super.ffmpeg.override {
# required by mpv for spatial audio; enable it globally to avoid shipping many ffmpegs
withMysofa = true;
};
# evolution-data-server = super.evolution-data-server.override {
# # OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation
# enableOAuth2 = false;
# };
# evolution-data-server-gtk4 = super.evolution-data-server-gtk4.override {
# # avoid webkitgtk_6_0 build. lol.
# withGtk4 = false;
# };
# ffmpeg = super.ffmpeg.override {
# # required by mpv for spatial audio; enable it globally to avoid shipping many ffmpegs
# # or maybe not: this forces a recompilation of many expensive packages, incl libreoffice and *webkitgtk*.
# # not needed, because *pipewire* does the downmixing.
# # PW uses ffmpeg-headless; not affected by `ffmpeg.override`. it directly calls into `libmysofa`
# withMysofa = true;
# };
ffmpeg-full = super.ffmpeg-full.override {
# saves 20 minutes of build time and cross issues, for unused feature
withSamba = false;
};
gnome-control-center = super.gnome-control-center.override {
# i build goa without the "backend", to avoid webkit_4_1.
# however gnome-control-center *directly* uses goa-backend because it manages the accounts...
# so if you really need gnome-control center, then here we are, re-enabling the goa backend.
gnome-online-accounts = gnome-online-accounts.override {
enableBackend = true;
};
};
# gnome-shell = super.gnome-shell.override {
# evolution-data-server-gtk4 = evolution-data-server-gtk4.override {
# # avoid webkitgtk_6_0 build. lol.
# withGtk4 = false;
# gnome-control-center = super.gnome-control-center.override {
# # i build goa without the "backend", to avoid webkit_4_1.
# # however gnome-control-center *directly* uses goa-backend because it manages the accounts...
# # so if you really need gnome-control center, then here we are, re-enabling the goa backend.
# gnome-online-accounts = gnome-online-accounts.override {
# enableBackend = true;
# };
# };
gnome-online-accounts = super.gnome-online-accounts.override {
# disables the upstream "goabackend" feature -- presumably "Gnome Online Accounts Backend"
# frees us from webkit_4_1, in turn.
enableBackend = false;
gvfs = gvfs.override {
# saves 20 minutes of build time and cross issues, for unused feature
samba = null;
};
# gnome-online-accounts = super.gnome-online-accounts.override {
# # disables the upstream "goabackend" feature -- presumably "Gnome Online Accounts Backend"
# # frees us from webkit_4_1, in turn.
# # XXX(2024-11-19): gnome-online-accounts no longer depends on webkitgtk at all ??
# enableBackend = false;
# # gvfs = super.gvfs.override {
# # # saves 20 minutes of build time and cross issues, for unused feature
# # samba = null;
# # };
# };
gvfs = super.gvfs.override {
# saves 20 minutes of build time and cross issues, for unused feature
samba = null;
};
# phog = super.phog.override {
@@ -63,12 +71,12 @@
withGcrypt = false;
};
swaynotificationcenter = super.swaynotificationcenter.override {
gvfs = gvfs.override {
# saves 20 minutes of build time and cross issues, for unused feature
samba = null;
};
};
# swaynotificationcenter = super.swaynotificationcenter.override {
# gvfs = gvfs.override {
# # saves 20 minutes of build time and cross issues, for unused feature
# samba = null;
# };
# };
# 2023/12/10: zbar barcode scanner: used by megapixels, frog.
# the video component does not cross compile (qt deps), but i don't need that.

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}
}:
mkNixpkgs {
rev = "651e727c688aa214b29ffeee9611b8efddb1e6bc";
sha256 = "sha256-IO3FSgSLNtQOIhjL0FMgjrptT1m2Dy/RaO+0H66kO2k=";
version = "0-unstable-2024-11-16";
rev = "23e89b7da85c3640bbc2173fe04f4bd114342367";
sha256 = "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=";
version = "0-unstable-2024-11-19";
branch = "master";
}

27
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -40,10 +40,15 @@ in
# })
(fetchpatch' {
# merged into *staging* 2024/11/06
name = "gssdp: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/353433";
hash = "sha256-KcntclyvkV8leyZEKkASdF1I2YKGv9Xlr8seL0TDtnQ=";
name = "gnome-maps: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/357238";
hash = "sha256-o2mwpO2b4vTnoqQYAIHpxK/VOwGXR65p25x3HyDte8k=";
})
(fetchpatch' {
name = "gtk4-layer-shell: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/357230";
hash = "sha256-v4OUuzpB8kXIU25r20SKtASEUwz/tgxCQQ6WQL1I/N8=";
})
(fetchpatch' {
@@ -117,13 +122,6 @@ in
# hash = "sha256-cn6ihwO3MyzdpVoJoQNKAHyo8GuGvFP6vr//7r9pzjE=";
})
(fetchpatch' {
name = "passt: support cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/334097";
saneCommit = "3ef36d3aa139f94e8716b0721856c5808937c9f2";
hash = "sha256-w50SLYDgMqNAfq4bgjrd6ugxHbb0VjvHdzhuJl0lzs4=";
})
# (fetchpatch' {
# # branch: 2024-08-11-wip-ffado-cross / pr-ffado-cross-2
# name = "ffado: support cross compilation";
@@ -140,13 +138,6 @@ in
saneCommit = "bd87a38b86f889a6902a356ab415eeead881766b";
})
# (fetchpatch' {
# # 2024/06/08: still outstanding
# name = "hspell: remove build perl from runtime closure";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/263182";
# hash = "sha256-Wau+PB+EUQDvWX8Kycw1sNrM3GkPVjKSS4niIDI0sjM=";
# })
# (fetchpatch' {
# # TODO: send for review once hspell fix is merged <https://github.com/NixOS/nixpkgs/pull/263182>
# # this patch works as-is, but hspell keeps a ref to build perl and thereby pollutes this closure as well.

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}
}:
mkNixpkgs {
rev = "b4c2d75c622d272bf235788ef77b4b83d3530fdb";
sha256 = "sha256-M1Z1qxP4c5GrCJ5XZn/SHGgxucIntY1AMiN60G4GyiM=";
version = "0-unstable-2024-11-16";
rev = "e68fd26555218bcca974054fbfccb407632435b1";
sha256 = "sha256-QvYFqTTiFzntx8jEVDrKB/OkoygutLRlPhNQEJY9oE4=";
version = "0-unstable-2024-11-19";
branch = "staging-next";
}

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}
}:
mkNixpkgs {
rev = "dc2fbd51fd8ca113c2061350c7cffafe8739436f";
sha256 = "sha256-h2RGNk3wD7oStAeXFDepZ6MneZ+qVgy4a4J7YqdzU/M=";
version = "0-unstable-2024-11-16";
rev = "3d310dfd9b987b8676083fe8fef149e257de905c";
sha256 = "sha256-/dSOoGbBsC4MxBsZ6p64OoNWkZnLz1U+iVcnCpPkhu8=";
version = "0-unstable-2024-11-19";
branch = "staging";
}

6
pkgs/by-name/nixpkgs-wayland/package.nix
View File

@@ -7,8 +7,8 @@ let
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixpkgs-wayland";
rev = "5df24321cb56f681c71780e727241246712dff48";
hash = "sha256-tIqOYeSh7Fnua+0UFG2H5JRmZMa4KB1dvG4lHtI9hPg=";
rev = "a3463e8b8e6e68b0bea66d40e3c34d1809508f17";
hash = "sha256-0ImfuQn5h0wnkXjRn/Z2BsnmLul9dG4r9UuXrqLMOQI=";
};
flake = import "${src}/flake.nix";
evaluated = flake.outputs {
@@ -25,7 +25,7 @@ let
in src.overrideAttrs (base: {
# attributes required by update scripts
pname = "nixpkgs-wayland";
version = "0-unstable-2024-11-16";
version = "0-unstable-2024-11-18";
src = src;
# passthru only nixpkgs-wayland's own packages -- not the whole nixpkgs-with-nixpkgs-wayland-as-overlay: