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

nixpkgs: 2024-04-18 -> 2024-04-19; nixpkgs-wayland, sops-nix 

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/19d2eb80a0e23daf1c4a8cf25b1011fbdb2260fb' (2024-04-18)
  → 'github:nixos/nixpkgs/6ad1fe08582fcdfedb2cb7c31b4a016a227bd38a' (2024-04-19)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/457c34178411e0072e59564ee7986e86255a6eff' (2024-04-18)
  → 'github:nixos/nixpkgs/40d15ed86dd08eff6a29e0a9abc416001d19cd67' (2024-04-19)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/7867aa617c6eb205b1ac1b71d98cd18a2561bb18' (2024-04-17)
  → 'github:nix-community/nixpkgs-wayland/ab0f8d391a960764348935e6497fc62ba0d2378d' (2024-04-19)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/cc535d07cbcdd562bcca418e475c7b1959cefa4b' (2024-04-15)
  → 'github:Mic92/sops-nix/b94c6edbb8355756c53efc8ca3874c63622f287a' (2024-04-18)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/c27f3b6d8e29346af16eecc0e9d54b1071eae27e' (2024-04-13)
  → 'github:NixOS/nixpkgs/8494ae076b7878d61a7d2d25e89a847fe8f8364c' (2024-04-18)
```
This commit is contained in:
Colin 2024-04-19 07:32:37 +00:00
parent b7d2020f10
commit 1bd715e57e
3 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock
View File

@ -167,11 +167,11 @@
},
"nixpkgs-next-unpatched": {
"locked": {
"lastModified": 1713420083,
"narHash": "sha256-+lfbR1d6sBQixUlUnLOYzonVfIhRIZUS9JGDmatTOYA=",
"lastModified": 1713509686,
"narHash": "sha256-+KTWLlpdMWm4NB84FckwXSOlSQqMe0VfO15961OAkOs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "19d2eb80a0e23daf1c4a8cf25b1011fbdb2260fb",
"rev": "6ad1fe08582fcdfedb2cb7c31b4a016a227bd38a",
"type": "github"
},
"original": {
@ -183,11 +183,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1713042715,
"narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=",
"lastModified": 1713434076,
"narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e",
"rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c",
"type": "github"
},
"original": {
@ -199,11 +199,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1713417819,
"narHash": "sha256-SE+yAvXUGBJHOHMpet9Y17JEruHTSwtIDi5YnIJkEwg=",
"lastModified": 1713509575,
"narHash": "sha256-dmScKTWcg0ws1NS1X97KwYZvlIfHzRjlJk+rhZZ8pCY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "457c34178411e0072e59564ee7986e86255a6eff",
"rev": "40d15ed86dd08eff6a29e0a9abc416001d19cd67",
"type": "github"
},
"original": {
@ -223,11 +223,11 @@
]
},
"locked": {
"lastModified": 1713374035,
"narHash": "sha256-jI36qoDyYFFJ46jk8MOpmCLKLaQ1FkIO4UaLo0trNS0=",
"lastModified": 1713511008,
"narHash": "sha256-sYDbRU/A5a3c9wbBvRPPuRLX8Sbc8bTxQSPahHxTIv8=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "7867aa617c6eb205b1ac1b71d98cd18a2561bb18",
"rev": "ab0f8d391a960764348935e6497fc62ba0d2378d",
"type": "github"
},
"original": {
@ -254,11 +254,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1713174909,
"narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=",
"lastModified": 1713457024,
"narHash": "sha256-31MpStyXedDL1fvuOvn6iz3JURSVShDtDVMyP1PTjtc=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b",
"rev": "b94c6edbb8355756c53efc8ca3874c63622f287a",
"type": "github"
},
"original": {

5
hosts/common/net/default.nix
View File

@ -60,8 +60,5 @@
networking.networkmanager.plugins = lib.mkForce [];
# keyfile.path = where networkmanager should look for connection credentials
networking.networkmanager.extraConfig = ''
[keyfile]
path=/var/lib/NetworkManager/system-connections
'';
networking.networkmanager.settings.keyfile.path = "/var/lib/NetworkManager/system-connections";
}

18
nixpatches/list.nix
View File

@ -32,18 +32,13 @@ in [
# etc, where "date" is like "20240228181608"
# and can be found with `nix-repl > :lf . > lastModifiedDate`
(fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/304862";
title = "trust-dns: 0.24.0 -> 0.24.1";
hash = "sha256-PvNBY2ekVTokWiAnhVo/NtDfLjUBvg/Ri/DPz3BMOHA=";
})
(fetchpatch' {
# NECESSARY FOR DINO CALLS TO WORK ON AARCH64: <https://gitlab.freedesktop.org/gstreamer/orc/-/issues/64>
prUrl = "https://github.com/NixOS/nixpkgs/pull/291661";
title = "orc: 0.4.36 -> 0.4.38";
hash = "sha256-ULav0vt3QlI8lKcCVKP986H/GjBZqUYLwOHJ3XppAeo=";
merged.staging = "20240406000000";
merged.staging-next = "20240418000000";
})
(fetchpatch' {
@ -52,6 +47,7 @@ in [
title = "gnupg: fix cross compilation";
hash = "sha256-d3kD2/UyMzzdBkiEdWtCibbWiPWBZLUWRry1TMkS25g=";
merged.staging = "20240326000000";
merged.staging-next = "20240418000000";
})
(fetchpatch' {
@ -85,11 +81,11 @@ in [
# prUrl = "https://github.com/NixOS/nixpkgs/pull/262268";
# hash = "sha256-TxQiR+OS4YriLNViTg4H78Z3f3IjBVodiFAkOUCeNic=";
# })
(fetchpatch' {
title = "rpm: 4.18.1 -> 4.19.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/260558";
hash = "sha256-kwod+6SbUZechzbmu1D4Hlh6pYiPD18wcqetk0OIOrA=";
})
# (fetchpatch' {
# title = "rpm: 4.18.1 -> 4.19.0";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/260558";
# hash = "sha256-kwod+6SbUZechzbmu1D4Hlh6pYiPD18wcqetk0OIOrA=";
# })
# (fetchpatch' {
# # XXX: doesn't cleanly apply; fetch `firefox-pmos-mobile` branch from my git instead