From 0650ab3e9c676b30cbcf053e1f45b78c6bf6ba0e Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Mon, 2 Oct 2023 12:26:29 +0200 Subject: [PATCH] nix: update --- nix/flake.lock | 40 +++++++++++++++++++++++----------------- nix/flake.nix | 50 ++++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index ea34b26..eaa2803 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -23,15 +23,16 @@ ] }, "locked": { - "lastModified": 1695224363, - "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "owner": "nix-community", "repo": "home-manager", - "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", + "rev": "07682fff75d41f18327a871088d20af2710d4744", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -39,14 +40,16 @@ "nix-matlab": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1695049269, - "narHash": "sha256-rzazOd6qjUTvBLIA17lsVh9+3OlZBxJ4Q9cQ+2ZIZzY=", + "lastModified": 1696172474, + "narHash": "sha256-7Ie0IDjl1wpnNjLc/fM7K5Oy8gfqO5ZjtiOKwxhe1+4=", "owner": "doronbehar", "repo": "nix-matlab", - "rev": "652975232174ac8c74755c15b94ae478ecb2052e", + "rev": "3f6b151e799d6544f527858713cfc1db7caeebcd", "type": "gitlab" }, "original": { @@ -57,25 +60,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694948089, - "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", + "lastModified": 1696039360, + "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", + "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -89,7 +94,8 @@ "inputs": { "home-manager": "home-manager", "nix-matlab": "nix-matlab", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/nix/flake.nix b/nix/flake.nix index f85d8ad..c471d8b 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -1,27 +1,29 @@ - { - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; +{ + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.nix-matlab.url = "gitlab:doronbehar/nix-matlab"; - # inputs.home-manager.url = "github:nix-community/home-manager"; + inputs.home-manager = { + url = "github:nix-community/home-manager/release-23.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + inputs.nix-matlab = { + url = "gitlab:doronbehar/nix-matlab"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - outputs = { self, nixpkgs, home-manager, nix-matlab, ... }@inputs: - let - system = "x86_64-linux"; - in { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - # inherit system; - specialArgs = { inherit inputs system; }; - modules = [ - # Overlays-module makes "pkgs.unstable" available in configuration.nix - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ nix-matlab.overlay ]; - }) - ./configuration.nix - ]; - }; + outputs = { self, nixpkgs, nix-matlab, ... }@inputs: + let system = "x86_64-linux"; + in { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + # inherit system; + specialArgs = { inherit inputs system; }; + modules = [ + # Overlays-module makes "pkgs.unstable" available in configuration.nix + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ nix-matlab.overlay ]; + }) + ./configuration.nix + ]; }; - } + }; +}