From bb610274a8adb9ea71a54278ede65c673fa033ef Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 27 Nov 2024 04:16:17 +0100 Subject: [PATCH] Update flake.lock --- flake.lock | 30 +++++++++++++++--------------- overlays/default.nix | 32 -------------------------------- 2 files changed, 15 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 0c3d0e45..483df361 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732161788, - "narHash": "sha256-ilkOtBbv5onnMOYnLWVpBd6bZHP3xwzagccBk1mW/z4=", + "lastModified": 1732593794, + "narHash": "sha256-VhS+81/eTDiin5ULZLWvqI+9ggI+qXNUSvi3dIQfBX4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3071fc96bc39e58df1c6d48e8008c96f09a00b42", + "rev": "9b7d4fb4739c0bf808d31e2b66b337f1234e4447", "type": "gitlab" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1731814505, - "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index 0385ab6e..703bf1b5 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -20,38 +20,6 @@ } }/pkgs/servers/adguardhome") { }; - # TODO remove when merged https://nixpk.gs/pr-tracker.html?pr=357219 - mission-center = super.callPackage (import "${ - super.fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "dd78a15b79aa3f741d16deadf209f6074938af82"; - sha256 = "sha256-ehZvXwABl3rdLspF4onwwsHHvrwDA4GMQSiq9lFWIaU="; - } - }/pkgs/by-name/mi/mission-center/package.nix") { }; - - # TODO remove when merged https://nixpk.gs/pr-tracker.html?pr=357362 - prowlarr = super.callPackage (import "${ - super.fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "e65ba64c2920d4cc69b5af1cbfa211149948e711"; - sha256 = "sha256-+xVnB8BUDgp8GAZfphvny2Y0c5qw+td6W8WqVhtJcQE="; - } - }/pkgs/servers/prowlarr") { }; - - # TODO remove when merged https://nixpk.gs/pr-tracker.html?pr=357555 - libreoffice-fresh = let - src = super.fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "4a79221efa1f1a4c8cf08b25107328f2b994c517"; - sha256 = "sha256-GmOROBqOgNWoem1DvclxPflFE+R+1jrHbae3QOacYj0="; - }; - in super.callPackage (import "${src}/pkgs/applications/office/libreoffice/wrapper.nix") { - unwrapped = super.callPackage (import "${src}/pkgs//applications/office/libreoffice") { variant = "fresh"; }; - }; - # TODO remove when merged https://nixpk.gs/pr-tracker.html?pr=358983 tautulli = super.python3Packages.callPackage (import "${ super.fetchFromGitHub {