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

flake/nixpkgs: 2023-05-22 -> 2023-05-24

Browse Source 
```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/7084250df3d7f9735087d3234407f3c1fc2400e3' (2023-05-22)
  → 'github:nixos/nixpkgs/f91ee3065de91a3531329a674a45ddcb3467a650' (2023-05-24)
```
This commit is contained in:
Colin
2023-05-26 17:22:57 +00:00
parent 3c40fa6982
commit 66156829d9
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -82,11 +82,11 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1684754342, "lastModified": 1684935479,
"narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "rev": "f91ee3065de91a3531329a674a45ddcb3467a650",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
nixpatches/list.nix
View File

@@ -129,14 +129,6 @@ in [
hash = "sha256-+g3XhmBt/udhbBDiVyfWnfXKvZTvDurlvPblQ9HYp3s="; hash = "sha256-+g3XhmBt/udhbBDiVyfWnfXKvZTvDurlvPblQ9HYp3s=";
}) })
(fetchpatch' {
# 2023/05/24: merged upstream
# hare: unstable-2023-03-15 -> unstable-2023-04-23
# + harec: unstable-2023-02-18 -> unstable-2023-04-25
prUrl = "https://github.com/NixOS/nixpkgs/pull/233732";
hash = "sha256-SGDKvsMiK3Pq57JEj/MamDBX5jBXwV/E5jclKO2NAUs=";
})
# (fetchpatch' { # (fetchpatch' {
# title = "hare-json: init at unstable-2023-01-31"; # title = "hare-json: init at unstable-2023-01-31";
# saneCommit = "260f9c6ac4e3564acbceb46aa4b65fbb652f8e23"; # saneCommit = "260f9c6ac4e3564acbceb46aa4b65fbb652f8e23";

4
overlays/cross.nix
View File

@@ -1135,6 +1135,10 @@ in {
mvToNativeInputs [ final.gettext final.glib ] prev.xdg-desktop-portal-gnome mvToNativeInputs [ final.gettext final.glib ] prev.xdg-desktop-portal-gnome
) )
); );
# "fatal error: urcu.h: No such file or directory"
# xfsprogs wants to compile things for the build target (BUILD_CC)
# xfsprogs = useEmulatedStdenv prev.xfsprogs;
xfsprogs = addNativeInputs [ final.liburcu ] prev.xfsprogs;
# webkitgtk = prev.webkitgtk.override { stdenv = final.ccacheStdenv; }; # webkitgtk = prev.webkitgtk.override { stdenv = final.ccacheStdenv; };
# webp-pixbuf-loader = prev.webp-pixbuf-loader.override { # webp-pixbuf-loader = prev.webp-pixbuf-loader.override {
# # fixes "Builder called die: Cannot wrap '/nix/store/kpp8qhzdjqgvw73llka5gpnsj0l4jlg8-gdk-pixbuf-aarch64-unknown-linux-gnu-2.42.10/bin/gdk-pixbuf-thumbnailer' because it is not an executable file" # # fixes "Builder called die: Cannot wrap '/nix/store/kpp8qhzdjqgvw73llka5gpnsj0l4jlg8-gdk-pixbuf-aarch64-unknown-linux-gnu-2.42.10/bin/gdk-pixbuf-thumbnailer' because it is not an executable file"