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

nixpkgs: update ~10hrs to remove now-upstreamed conky patch

Browse Source 
```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/32f638e62d638c9a0011c0162ed1be4a13d00ea9' (2024-03-10)
  → 'github:nixos/nixpkgs/85e4390bb2db2543b65a61a6fb601819ba331399' (2024-03-10)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/9fc2bd0eef6d2651638656c82fbe0b7a40478c3b' (2024-03-10)
  → 'github:nixos/nixpkgs/c916d4cbac62b2d8b70a3940d3471dbd0c57d2f4' (2024-03-10)
```
This commit is contained in:
Colin
2024-03-10 22:31:33 +00:00
parent d93380938d
commit 73a2c9d923
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@@ -19,11 +19,11 @@
}, },
"nixpkgs-next-unpatched": { "nixpkgs-next-unpatched": {
"locked": { "locked": {
"lastModified": 1710072067, "lastModified": 1710093662,
"narHash": "sha256-bR5I3bkuPZnPzldk63qk4mcn+cetedCNxCRnwFFXDJA=", "narHash": "sha256-6VYhHUUVsQRbrRvrTPNtUaFKn0pwKuE+mU+BOGjhPmY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32f638e62d638c9a0011c0162ed1be4a13d00ea9", "rev": "85e4390bb2db2543b65a61a6fb601819ba331399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -51,11 +51,11 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1710077484, "lastModified": 1710108207,
"narHash": "sha256-yrckbLTj7YA9sQJKGmki7OnfY2dRjQuO55XEEOcL/RI=", "narHash": "sha256-wrflk+FhejffeVo6i5S/cQH5BwS1txIXsnA6ajN9LX8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9fc2bd0eef6d2651638656c82fbe0b7a40478c3b", "rev": "c916d4cbac62b2d8b70a3940d3471dbd0c57d2f4",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
nixpatches/list.nix
View File

@@ -158,11 +158,6 @@ in [
# hash = "sha256-eTwEbVULYjmOW7zUFcTUqvBZqUFjHTKFhvmU2m3XQeo="; # hash = "sha256-eTwEbVULYjmOW7zUFcTUqvBZqUFjHTKFhvmU2m3XQeo=";
# }) # })
(fetchpatch' {
title = "conky: enable Wayland support and cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/278071";
hash = "sha256-e6o+Vjd3KCI9dFj0TdAWyyqfreX8cf0RfYGdyvebYC0=";
})
(fetchpatch' { (fetchpatch' {
title = "gthumb: make the webservices feature be optional"; title = "gthumb: make the webservices feature be optional";
prUrl = "https://github.com/NixOS/nixpkgs/pull/240602"; prUrl = "https://github.com/NixOS/nixpkgs/pull/240602";