From 1d95c7c6b3369acd887f7db63c88fbfaee99bc94 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 6 Dec 2024 10:20:48 +0100 Subject: [PATCH] flake.*: upgrade to nixpkgs 24.11 Signed-off-by: Elias Naur --- flake.lock | 46 +++++++++++++++------------------------------- flake.nix | 8 +------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 886be818..51c3e4ef 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1701721028, - "narHash": "sha256-2z4YrdHPLoMZNWR1MPOjNZMqPg057i1eZXaYI6RTahQ=", + "lastModified": 1733430059, + "narHash": "sha256-o3O5tjrMMebRLuHQt7BbEw3jZgWRW5vnOptNXv8WdO4=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "c923f9ec0f4dd0d7dc725dc5b73fbf03658e50dd", + "rev": "d2f3c1ea99c0bea9d28a0e59daeb482f50d4cd35", "type": "github" }, "original": { @@ -27,15 +27,14 @@ "nixpkgs": [ "android", "nixpkgs" - ], - "systems": "systems" + ] }, "locked": { - "lastModified": 1701697687, - "narHash": "sha256-dLLE5wQBVv+pIb4bWmKFSw2DvLVyuEk0F7ng6hpZPSU=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "c3bd77911391eb1638af6ce773de86da57ee6df5", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -46,14 +45,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -64,16 +63,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701282334, - "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "NixOS", - "ref": "23.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -98,21 +97,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fbc30fa3..af3f7a5d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ description = "Gio build environment"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; android.url = "github:tadfisher/android-nixpkgs"; android.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -47,12 +47,6 @@ xorg.libXfixes libGL pkg-config - ] else if stdenv.isDarwin then [ - darwin.apple_sdk_11_0.frameworks.Foundation - darwin.apple_sdk_11_0.frameworks.Metal - darwin.apple_sdk_11_0.frameworks.QuartzCore - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.MacOSX-SDK ] else [ ]); } // (if stdenv.isLinux then { LD_LIBRARY_PATH = "${vulkan-loader}/lib";