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

nix flake update: nixpkgs 2023-03-09 (nixos-unstable) -> 2023-03-28 (staging); others

Browse Source 
this will break moby; will work to re-enable

```
• Updated input 'mobile-nixos':
    'github:nixos/mobile-nixos/9a0c317a027d1c085c641fe6df1f51b71880b720' (2023-03-03)
  → 'github:nixos/mobile-nixos/7a6e97e3af73c4cca87e12c83abcb4913dac7dbc' (2023-03-22)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/1e2590679d0ed2cee2736e8b80373178d085d263' (2023-03-09)
  → 'github:nixos/nixpkgs/f027fe965cc27f258e9f7ffd3d0cec011e51a41c' (2023-03-28)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/1568702de0d2488c1e77011a9044de7fadec80c4' (2023-03-10)
  → 'github:Mic92/sops-nix/4740f80ca6e756915aaaa0a9c5fbb61ba09cc145' (2023-03-26)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/d51554151a91cd4543a7620843cc378e3cbc767e' (2023-03-04)
  → 'github:NixOS/nixpkgs/da26ae9f6ce2c9ab380c0f394488892616fc5a6a' (2023-03-25)
```
This commit is contained in:
Colin
2023-03-28 06:03:20 +00:00
parent 50cec94164
commit e90a8b7b6e
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock generated
View File

@@ -18,11 +18,11 @@
"mobile-nixos": { "mobile-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1677879564, "lastModified": 1679516998,
"narHash": "sha256-luJTRYY1zEoN5fSGwbZxq66IE1kdrqOq0/iBWzw7gOI=", "narHash": "sha256-w4baQlS84X8Lf0E5RN0nGkx03luDuV1X0+jWMAXm6fs=",
"owner": "nixos", "owner": "nixos",
"repo": "mobile-nixos", "repo": "mobile-nixos",
"rev": "9a0c317a027d1c085c641fe6df1f51b71880b720", "rev": "7a6e97e3af73c4cca87e12c83abcb4913dac7dbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -66,11 +66,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1677948530, "lastModified": 1679748960,
"narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=", "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d51554151a91cd4543a7620843cc378e3cbc767e", "rev": "da26ae9f6ce2c9ab380c0f394488892616fc5a6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -82,16 +82,16 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1678380223, "lastModified": 1679983302,
"narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=", "narHash": "sha256-vJe9Fct7k3NSnh0KVQAdS+hZQTKbei7xVJXBRQ4e7zY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e2590679d0ed2cee2736e8b80373178d085d263", "rev": "f027fe965cc27f258e9f7ffd3d0cec011e51a41c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "staging",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -113,11 +113,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1678440572, "lastModified": 1679799335,
"narHash": "sha256-zfL09Yy6H7QQwfacCPL0gOfWpVkTbE5jXJh5oZmGf8g=", "narHash": "sha256-YrnDyftm0Mk4JLuw3sDBPNfSjk054N0dqQx8FW4JqDM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1568702de0d2488c1e77011a9044de7fadec80c4", "rev": "4740f80ca6e756915aaaa0a9c5fbb61ba09cc145",
"type": "github" "type": "github"
}, },
"original": { "original": {

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";
# nixpkgs = { # nixpkgs = {
# url = "./nixpatches"; # url = "./nixpatches";

12
nixpatches/list.nix
View File

@@ -28,21 +28,17 @@
# 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
./2023-03-03-qtbase-cross-compile.patch ./2023-03-03-qtbase-cross-compile.patch
# let ccache cross-compile # let ccache cross-compile
./2023-03-04-ccache-cross-fix.patch # TODO: why doesn't this apply?
# ./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=";
})
# TODO: point to upstream PR
./2023-03-10-hase.patch ./2023-03-10-hase.patch
# # kaiteki: init at 2022-09-03 # # kaiteki: init at 2022-09-03