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

nixpkgs: 2023-11-28 -> 2023-11-29

Browse Source 
```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/c9702bf40b036c0f1d3d5b0aaf3eee2bf920124c' (2023-11-28)
  → 'github:nixos/nixpkgs/6711380ae7874005d707d7d03830bd5eee40b43b' (2023-11-29)
```
This commit is contained in:
Colin 2023-11-29 13:56:17 +00:00
parent 996b4f8366
commit 36c7f77a98
3 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -53,11 +53,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1701180790,
"narHash": "sha256-kYWcHsk2A1VUpiOvSo7Pq175WnSVeltspTGM2q+Cr3U=",
"lastModified": 1701298762,
"narHash": "sha256-WFJCmIVabZrrV5VICcvXdoYF5WYQ2LbxSjGVQRn09pg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c9702bf40b036c0f1d3d5b0aaf3eee2bf920124c",
"rev": "6711380ae7874005d707d7d03830bd5eee40b43b",
"type": "github"
},
"original": {

34
nixpatches/list.nix
View File

@ -24,32 +24,30 @@ let
);
in [
(fetchpatch' {
title = "fetchFromGitLab: passthru owner and repo";
prUrl = "https://github.com/NixOS/nixpkgs/pull/270393";
hash = "sha256-Kqqfy9Mludc5wr0TSUg9gEOZsfUL65WpF+hy64k33MY=";
title = "ripgrep: fix shell completions when cross compiling";
saneCommit = "8631ddfb99aa8e935276b27d55ef5e10f5ab0367";
hash = "sha256-AkxtrCJrf0wpTdty4SOIWBrWwqfG7rBI4ON38BjDi6s=";
})
# (fetchpatch' {
# title = "nixos/slskd: allow omitting username from yaml config";
# saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";
# hash = "sha256-xQEj/oIfNcE4td9jxzDzhlnIYpncOOdXZuswkmcLNuk=";
# })
# (fetchpatch' {
# title = "nixos/slskd: don't enable nginx unless nginx.enable was set";
# saneCommit = "ea084e5739a68436cc240aeca5c10b92de1e3138";
# hash = "sha256-25zB5eM1WBVEigmrq1mY9GXwEkS/jf5v7BCfmN6Wux4=";
# })
(fetchpatch' {
# out for PR: <https://github.com/NixOS/nixpkgs/pull/270646>
title = "nixos/slskd: allow omitting username from yaml config";
saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";
hash = "sha256-xQEj/oIfNcE4td9jxzDzhlnIYpncOOdXZuswkmcLNuk=";
})
(fetchpatch' {
# out for PR: <https://github.com/NixOS/nixpkgs/pull/270646>
title = "nixos/slskd: don't enable nginx unless nginx.enable was set";
saneCommit = "ea084e5739a68436cc240aeca5c10b92de1e3138";
hash = "sha256-25zB5eM1WBVEigmrq1mY9GXwEkS/jf5v7BCfmN6Wux4=";
title = "nixos/slskd: option fixes";
prUrl = "https://github.com/NixOS/nixpkgs/pull/270646";
hash = "sha256-5brmmPfYp7G+5Dr5q2skWSwkrEwsRAe/UetoN0AqGjY=";
})
(fetchpatch' {
title = "vala: look for files in targetOffset";
prUrl = "https://github.com/NixOS/nixpkgs/pull/267550";
hash = "sha256-Dl9ZQazjXjIbw38Q78otQvgVCB/QZAC1IYoFX0Tuyw0=";
})
(fetchpatch' {
title = "tuba: 0.4.1 -> 0.5.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/269725";
hash = "sha256-U2ipKRCFqczxj2kuIDPPRI/qnObJN/yz160Cvd4VFQ4=";
})
# (fetchpatch' {
# # N.B.: obsoleted by 267550 PR above
# title = "vala: search for vapi files in targetOffset, not hostOffset";

11
overlays/cross.nix
View File

@ -1814,17 +1814,6 @@ in {
# });
# });
ripgrep = prev.ripgrep.overrideAttrs (upstream: {
# 2023/11/27: upstreaming is out for PR: <https://github.com/NixOS/nixpkgs/pull/270521>
# ripgrep generates its own manpage.
# this is only problematic on a non-binfmt machine
preFixup = lib.replaceStrings
[ "$out/bin/rg" ]
[ "${final.stdenv.hostPlatform.emulator final.buildPackages} $out/bin/rg" ]
upstream.preFixup
;
});
# rmlint = prev.rmlint.override {
# # fixes "Checking whether the C compiler works... no"
# # rmlint is scons; it reads the CC environment variable, though, so *may* be cross compilable