From 1dc8be97d2497271384c8919e203b84f140fd332 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Nov 2024 00:56:02 +0100 Subject: [PATCH] Revert "calibre: continue to pull in from nixos-24.05 for now" This reverts commit f9e5a42ca94e8d64235ff825000bcb3d61a877c5. --- flake.lock | 17 ----------------- flake.nix | 1 - home/modules/packages.nix | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 99f93a3..6800461 100644 --- a/flake.lock +++ b/flake.lock @@ -192,22 +192,6 @@ "type": "github" } }, - "nixos-2405": { - "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1731797098, @@ -340,7 +324,6 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", - "nixos-2405": "nixos-2405", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index fddebc0..0fac46e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index dbc1e22..83b203b 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -150,7 +150,7 @@ let chromium falkon thunderbird - inputs.nixos-unstable.legacyPackages.${system}.calibre # FIXME: test failure in 24.11 + #calibre # FIXME: using bin due to failing tests dino zotero ding