From 7b91240adb5d60adfec19be235665a180dd797a4 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 22 Jan 2025 15:52:23 +0200 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NickCao/nixpkgs/c33276ce1de3b420ef1f40b23f0f2c321127c0f4' (2024-09-18) → 'github:NixOS/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab' (2025-01-21) • Updated input 'nixpkgs-native': 'github:NickCao/nixpkgs/c33276ce1de3b420ef1f40b23f0f2c321127c0f4' (2024-09-18) → 'github:NixOS/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab' (2025-01-21) --- flake.lock | 24 ++++++++++++------------ flake.nix | 10 ++-------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 9db51a2..284f471 100644 --- a/flake.lock +++ b/flake.lock @@ -2,32 +2,32 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1726682892, - "narHash": "sha256-OUVU/tA6qzvlBU6ntMDWQ34pr3Rt8r7H2dda0PAdfC4=", - "owner": "NickCao", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "c33276ce1de3b420ef1f40b23f0f2c321127c0f4", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { - "owner": "NickCao", - "ref": "riscv", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-native": { "locked": { - "lastModified": 1726682892, - "narHash": "sha256-OUVU/tA6qzvlBU6ntMDWQ34pr3Rt8r7H2dda0PAdfC4=", - "owner": "NickCao", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "c33276ce1de3b420ef1f40b23f0f2c321127c0f4", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { - "owner": "NickCao", - "ref": "riscv", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 6f305c1..bc35de1 100644 --- a/flake.nix +++ b/flake.nix @@ -4,17 +4,11 @@ extra-trusted-public-keys = [ "cache.ztier.link-1:3P5j2ZB9dNgFFFVkCQWT3mh0E+S3rIWtZvoql64UaXM=" ]; }; - inputs.nixpkgs.url = "github:NickCao/nixpkgs/riscv"; - inputs.nixpkgs-native.url = "github:NickCao/nixpkgs/riscv"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs-native.url = "github:NixOS/nixpkgs/nixos-unstable"; outputs = inputs: { overlays.native-fixes = self: super: { - cryptsetup = super.cryptsetup.overrideAttrs (old: { - doCheck = false; - }); - pixman = super.pixman.overrideAttrs (old: { - doCheck = false; - }); }; overlays.firmware = self: super: let