calibre: unbreak, pull in from main nixpkgs again

Revert "calibre: continue to pull in from nixos-24.05 for now"
This reverts commit f9e5a42ca9.
2024-11-27 01:18:11 +01:00 · 2024-11-27 00:56:02 +01:00
3 changed files with 1 additions and 19 deletions
--- 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",
--- 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 = {
--- 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
    dino
    zotero
    ding
Author	SHA1	Message	Date
Trolli Schmittlauch	e7bcda274c	calibre: unbreak, pull in from main nixpkgs again	2024-11-27 01:18:11 +01:00
Trolli Schmittlauch	1dc8be97d2	Revert "calibre: continue to pull in from nixos-24.05 for now" This reverts commit `f9e5a42ca9`.	2024-11-27 00:56:02 +01:00