From 31220281739c7b6432f3533313a0fa0164f232c0 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 2 Jan 2025 16:33:21 -0600 Subject: [PATCH] fix systems --- flake.lock | 7 +++---- flake.nix | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 79bfa7e..110d1e4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,15 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1735697839, - "narHash": "sha256-0Acw0UaLi+VNThsmeX8zOKi000DFrYXNnrgpOpk2+MM=", + "lastModified": 1735854365, + "narHash": "sha256-pNb03vdsQmn0jS5dKAdx2DFZ2QH4RRvrIzZxqpfMcS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5eaa5fdf06d2b15d373b82c0f3a1ec1c6cab02ae", + "rev": "cd9f495ef7584a714938915d3fe9327c2735d7e4", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0aaa022..0ece3c3 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ # Nixpkgs / NixOS version to use. inputs = { # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - nixpkgs.url = "github:nixos/nixpkgs/master"; + nixpkgs.url = "github:nixos/nixpkgs"; rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; @@ -155,7 +155,7 @@ # Utilities inherit (nixpkgs) lib; # Define the systems to support (all Linux systems exposed by nixpkgs) - systems = lib.intersectLists lib.systems.flakeExposed lib.platforms.linux; + systems = lib.unique (lib.concatLists [ lib.systems.flakeExposed lib.platforms.linux ]); forAllSystems = lib.genAttrs systems; # Create a mapping from system to corresponding nixpkgs : https://nixos.wiki/wiki/Overlays#In_a_Nix_flake nixpkgsFor = forAllSystems (system: (nixpkgs.legacyPackages.${system}.extend rustOverlay));