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

update to nixpkgs/staging-next

Browse Source 
```
• 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:
Colin 2023-03-11 13:22:28 +00:00
parent e386406bc1
commit 3146214a9f
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock
View File

@ -82,16 +82,16 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1678380223, "lastModified": 1678536071,
"narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=", "narHash": "sha256-bj38dJO1KfHGbC8F0C3UKBPhAstqMcQed0GiFZnaNKA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e2590679d0ed2cee2736e8b80373178d085d263", "rev": "140a35879a1bec9907a15a66b6350e0efbef5239",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "staging-next",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -134,11 +134,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1678438369, "lastModified": 1678521821,
"narHash": "sha256-GfhWNvAfNZpvP5RZo1yetgJ5+eAp+zlkjS2+YJqN8fs=", "narHash": "sha256-BlFdD28AeizJRa4DtnwxqZqvBTvsXIrf3kiI26Q3J1A=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "9b549e42da18218e46d1bf217b5eb81c0c4caf11", "rev": "a8aa5ac6e6b5a5fb76c116caf8a1dd94d078bac2",
"revCount": 173, "revCount": 175,
"type": "git", "type": "git",
"url": "https://git.uninsane.org/colin/uninsane" "url": "https://git.uninsane.org/colin/uninsane"
}, },

3
flake.nix
View File

@ -22,7 +22,8 @@
# nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11"; # nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11";
# <https://github.com/nixos/nixpkgs/tree/nixos-unstable> # <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 = { # nixpkgs = {
# url = "./nixpatches"; # url = "./nixpatches";

10
nixpatches/list.nix
View File

@ -28,7 +28,7 @@
# it's a revert of nixpkgs commit dcf630c172df2a9ecaa47c77f868211e61ae8e52 # it's a revert of nixpkgs commit dcf630c172df2a9ecaa47c77f868211e61ae8e52
# ./2023-01-30-mesa-cma-leak.patch # ./2023-01-30-mesa-cma-leak.patch
# upgrade to 22.3.6 instead # 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. # 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 # 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-04-ccache-cross-fix.patch
# 2023-03-09: phosh: 0.23 -> 0.25.1 # 2023-03-09: phosh: 0.23 -> 0.25.1
(fetchpatch { # (fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/219355.diff"; # url = "https://github.com/NixOS/nixpkgs/pull/219355.diff";
hash = "sha256-hx2keVWuokla2Oi92zoXsnjVuwakxL2cB55ctzlO8OQ="; # hash = "sha256-hx2keVWuokla2Oi92zoXsnjVuwakxL2cB55ctzlO8OQ=";
}) # })
./2023-03-10-hase.patch ./2023-03-10-hase.patch