update to nixpkgs/staging-next
``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/1e2590679d0ed2cee2736e8b80373178d085d263' (2023-03-09) → 'github:nixos/nixpkgs/140a35879a1bec9907a15a66b6350e0efbef5239' (2023-03-11) • Updated input 'uninsane-dot-org': 'git+https://git.uninsane.org/colin/uninsane?ref=refs%2fheads%2fmaster&rev=9b549e42da18218e46d1bf217b5eb81c0c4caf11' (2023-03-10) → 'git+https://git.uninsane.org/colin/uninsane?ref=refs%2fheads%2fmaster&rev=a8aa5ac6e6b5a5fb76c116caf8a1dd94d078bac2' (2023-03-11) ```
This commit is contained in:
parent
e386406bc1
commit
3146214a9f
16
flake.lock
16
flake.lock
|
@ -82,16 +82,16 @@
|
|||
},
|
||||
"nixpkgs-unpatched": {
|
||||
"locked": {
|
||||
"lastModified": 1678380223,
|
||||
"narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=",
|
||||
"lastModified": 1678536071,
|
||||
"narHash": "sha256-bj38dJO1KfHGbC8F0C3UKBPhAstqMcQed0GiFZnaNKA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1e2590679d0ed2cee2736e8b80373178d085d263",
|
||||
"rev": "140a35879a1bec9907a15a66b6350e0efbef5239",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "staging-next",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -134,11 +134,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678438369,
|
||||
"narHash": "sha256-GfhWNvAfNZpvP5RZo1yetgJ5+eAp+zlkjS2+YJqN8fs=",
|
||||
"lastModified": 1678521821,
|
||||
"narHash": "sha256-BlFdD28AeizJRa4DtnwxqZqvBTvsXIrf3kiI26Q3J1A=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "9b549e42da18218e46d1bf217b5eb81c0c4caf11",
|
||||
"revCount": 173,
|
||||
"rev": "a8aa5ac6e6b5a5fb76c116caf8a1dd94d078bac2",
|
||||
"revCount": 175,
|
||||
"type": "git",
|
||||
"url": "https://git.uninsane.org/colin/uninsane"
|
||||
},
|
||||
|
|
|
@ -22,7 +22,8 @@
|
|||
# nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11";
|
||||
|
||||
# <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
|
||||
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
|
||||
|
||||
# nixpkgs = {
|
||||
# url = "./nixpatches";
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
# it's a revert of nixpkgs commit dcf630c172df2a9ecaa47c77f868211e61ae8e52
|
||||
# ./2023-01-30-mesa-cma-leak.patch
|
||||
# upgrade to 22.3.6 instead
|
||||
./2023-02-28-mesa-22.3.6.patch
|
||||
# ./2023-02-28-mesa-22.3.6.patch
|
||||
|
||||
# fix qt6.qtbase and qt6.qtModule to cross-compile.
|
||||
# unfortunately there's some tangle that makes that difficult to do via the normal `override` facilities
|
||||
|
@ -38,10 +38,10 @@
|
|||
./2023-03-04-ccache-cross-fix.patch
|
||||
|
||||
# 2023-03-09: phosh: 0.23 -> 0.25.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/nixpkgs/pull/219355.diff";
|
||||
hash = "sha256-hx2keVWuokla2Oi92zoXsnjVuwakxL2cB55ctzlO8OQ=";
|
||||
})
|
||||
# (fetchpatch {
|
||||
# url = "https://github.com/NixOS/nixpkgs/pull/219355.diff";
|
||||
# hash = "sha256-hx2keVWuokla2Oi92zoXsnjVuwakxL2cB55ctzlO8OQ=";
|
||||
# })
|
||||
|
||||
./2023-03-10-hase.patch
|
||||
|
||||
|
|
Loading…
Reference in New Issue