From c68afdd97ab2436781606960ea7becd4369591c9 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 24 Apr 2024 05:21:02 +0530 Subject: [PATCH] feat(nix): update to latest --- default.nix | 2 +- flake.lock | 45 +++++++++++++++++++++++++++++++++------------ flake.nix | 13 ++++++++++--- shell.nix | 2 +- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/default.nix b/default.nix index 80aeb43..77573a3 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ (import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in fetchTarball { url = - "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + "https://github.com/nix-community/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; sha256 = lock.nodes.flake-compat.locked.narHash; }) { src = ./.; }).defaultNix diff --git a/flake.lock b/flake.lock index d3e69c0..10c756f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,26 +3,31 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "nix-community", "repo": "flake-compat", "type": "github" } }, "flake-utils": { + "inputs": { + "systems": [ + "systems" + ] + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -33,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675758091, - "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "lastModified": 1713805509, + "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "type": "github" }, "original": { @@ -51,7 +56,23 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1687694171, + "narHash": "sha256-m4E0xN69qKj/oKOj8OtiZcSFpFlO8paI6E3Wo5oXDJc=", + "owner": "msfjarvis", + "repo": "flake-systems", + "rev": "7876462a5f60841e8b2712ad20dc18470f448e8d", + "type": "github" + }, + "original": { + "owner": "msfjarvis", + "repo": "flake-systems", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 984ec35..0a7c403 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,16 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; + + systems.url = "github:msfjarvis/flake-systems"; + + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "systems"; + }; + flake-compat = { - url = "github:edolstra/flake-compat"; + url = "github:nix-community/flake-compat"; flake = false; }; }; @@ -18,6 +25,6 @@ pkgs = import nixpkgs {inherit system;}; in { devShells.default = - pkgs.mkShell {nativeBuildInputs = with pkgs; [nodejs-16_x yarn];}; + pkgs.mkShell {nativeBuildInputs = with pkgs; [nodejs yarn];}; }); } diff --git a/shell.nix b/shell.nix index fa2a56c..e187e24 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,6 @@ (import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in fetchTarball { url = - "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + "https://github.com/nix-community/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; sha256 = lock.nodes.flake-compat.locked.narHash; }) { src = ./.; }).shellNix