From fb1255720c575db455857b89bdb61eb2da22cd82 Mon Sep 17 00:00:00 2001 From: willifan <willifan@proton.me> Date: Fri, 31 May 2024 23:51:48 +0200 Subject: [PATCH] switched to nixpkgs 24.05 stable --- flake.lock | 47 +++++++++++++++++---------------- flake.nix | 6 ++--- users/willifan/applications.nix | 1 - 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index edfa268..41d9f52 100644 --- a/flake.lock +++ b/flake.lock @@ -42,26 +42,43 @@ ] }, "locked": { - "lastModified": 1716847642, - "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -71,29 +88,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", "hardware": "hardware", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 0f53742..9f16c5d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,13 +4,13 @@ inputs = { # NixOS official package source, using the nixos-23.11 branch here - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; hardware.url = "github:nixos/nixos-hardware"; # Declarative dotfile management home-manager = { - url = "github:nix-community/home-manager/"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix index 068d33a..fd7a511 100644 --- a/users/willifan/applications.nix +++ b/users/willifan/applications.nix @@ -28,7 +28,6 @@ prusa-slicer gimp - cinnamon.nemo-fileroller ];