From a714a2c188b46e52e9db2061c0fb7244f76081cc Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 27 Apr 2024 16:01:52 +1000
Subject: [PATCH] flake: switch back to upstream nixpkgs-update
---
flake.lock | 32 ++++++++++++++++++++++++--------
flake.nix | 4 ++--
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/flake.lock b/flake.lock
index fd82c63..431b904 100644
--- a/flake.lock
+++ b/flake.lock
@@ -142,21 +142,21 @@
"inputs": {
"mmdoc": [],
"nixpkgs": "nixpkgs_2",
- "runtimeDeps": [
- "nixpkgs"
+ "runtimeDeps": "runtimeDeps",
+ "treefmt-nix": [
+ "treefmt-nix"
]
},
"locked": {
- "lastModified": 1713663182,
- "narHash": "sha256-HmO5ghj2eNnN9NnYUPE26x/KJ6F21ALMWp6pEE/cVRE=",
- "owner": "qowoz",
+ "lastModified": 1714270547,
+ "narHash": "sha256-s77XshW+9EoghBWmOf0tFVQZ+8rX4+bOCz0StL+TkvQ=",
+ "owner": "nix-community",
"repo": "nixpkgs-update",
- "rev": "dbab69bed4129965501948d1c0193fb4bea2d707",
+ "rev": "df23e62c3322a6471671ec8cb4ad0da36ab7f8a7",
"type": "github"
},
"original": {
- "owner": "qowoz",
- "ref": "patches",
+ "owner": "nix-community",
"repo": "nixpkgs-update",
"type": "github"
}
@@ -228,6 +228,22 @@
"treefmt-nix": "treefmt-nix"
}
},
+ "runtimeDeps": {
+ "locked": {
+ "lastModified": 1714247354,
+ "narHash": "sha256-6dFKqP/aCKIdpOgqgIQUrRT0NOfVc14ftNcdELa4Pu4=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "c8d7c8a78fb516c0842cc65346506a565c88014d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable-small",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"sops-nix": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 7f1e70e..23fcdb0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,9 +21,9 @@
# actually not used when using the modules but than nothing ever will try to fetch this nixpkgs variant
srvos.inputs.nixpkgs.follows = "nixpkgs";
- nixpkgs-update.url = "github:qowoz/nixpkgs-update/patches";
- nixpkgs-update.inputs.runtimeDeps.follows = "nixpkgs";
+ nixpkgs-update.url = "github:nix-community/nixpkgs-update";
nixpkgs-update.inputs.mmdoc.follows = "";
+ nixpkgs-update.inputs.treefmt-nix.follows = "treefmt-nix";
nixpkgs-update-github-releases.url = "github:nix-community/nixpkgs-update-github-releases";
nixpkgs-update-github-releases.flake = false;