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

nixpkgs: update; sops-nix: 2023-12-04 -> 2023-12-10

Browse Source 
```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/852e0ea0e8e1bd174bf1af9706f6b855319a5f1d' (2023-12-10)
  → 'github:nixos/nixpkgs/64292b08dc5d1538d7ab88817a90b2713c34c8a0' (2023-12-10)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/e91ece6d2cf5a0ae729796b8f0dedceab5107c3d' (2023-12-04)
  → 'github:Mic92/sops-nix/d806e546f96c88cd9f7d91c1c19ebc99ba6277d9' (2023-12-10)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/dc01248a9c946953ad4d438b0a626f5c987a93e4' (2023-12-03)
  → 'github:NixOS/nixpkgs/b8f33c044e51de6dde3ad80a9676945e0e4e3227' (2023-12-09)
```
This commit is contained in:
Colin 2023-12-10 16:46:51 +00:00
parent a7d3ac95aa
commit b309402784
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -37,11 +37,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1701568804,
"narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=",
"lastModified": 1702148972,
"narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4",
"rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227",
"type": "github"
},
"original": {
@ -53,11 +53,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1702167341,
"narHash": "sha256-Z8I6AMkTJeckedyNzpBQh1m0VVLnQbckPOsIZ6obBMc=",
"lastModified": 1702226623,
"narHash": "sha256-pzrP8qLy6CQk0vpwwDEphC9gn+qkoiS3iNyQJDtQJJs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "852e0ea0e8e1bd174bf1af9706f6b855319a5f1d",
"rev": "64292b08dc5d1538d7ab88817a90b2713c34c8a0",
"type": "github"
},
"original": {
@ -83,11 +83,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1701728052,
"narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=",
"lastModified": 1702177193,
"narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d",
"rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9",
"type": "github"
},
"original": {

11
nixpatches/list.nix
View File

@ -28,11 +28,6 @@ in [
saneCommit = "8631ddfb99aa8e935276b27d55ef5e10f5ab0367";
hash = "sha256-AkxtrCJrf0wpTdty4SOIWBrWwqfG7rBI4ON38BjDi6s=";
})
(fetchpatch' {
title = "gtkcord4: 0.0.12 -> 0.0.16-1";
prUrl = "https://github.com/NixOS/nixpkgs/pull/259394";
hash = "sha256-pEkMxAGPbj6RDj+0lMRcs5KVp1J5kfezzVBhvrQjmrk=";
})
# (fetchpatch' {
# title = "nixos/slskd: allow omitting username from yaml config";
# saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";
@ -201,12 +196,6 @@ in [
# TODO: why doesn't this apply?
# ./2023-03-04-ccache-cross-fix.patch
(fetchpatch' {
title = "bambu-studio: init at 01.06.02.04";
prUrl = "https://github.com/NixOS/nixpkgs/pull/206495";
hash = "sha256-s1KrjjTsGK0+aimFHzPCvkFG0fN/l6Tqlt5l9rmh8iY=";
})
# (fetchpatch' {
# # phoc: 0.25.0 -> 0.27.0
# # TODO: move wayland-scanner & glib to nativeBuildInputs

3
overlays/cross.nix
View File

@ -2295,9 +2295,6 @@ in with final; {
'';
});
# 2023/12/08: upstreaming is out for PR: <https://github.com/NixOS/nixpkgs/pull/273190>
wob = mvToBuildInputs [ cmocka ] prev.wob;
# wrapFirefox = prev.wrapFirefox.override {
# buildPackages = buildPackages // {
# # fixes "extract-binary-wrapper-cmd: line 2: strings: command not found"