From f79afe59c357cfc1f8eb44b514011f3334bd317b Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Wed, 4 Dec 2024 17:35:06 +0000 Subject: [PATCH] fix: update all flake.locks --- templates/docs/flake.lock | 20 +++++++-------- templates/go/flake.lock | 8 +++--- templates/go/flake.nix | 35 +++++++++++++++---------- templates/go/go.mod | 2 +- templates/haskell/flake.lock | 22 ++++++++-------- templates/haskell/flake.nix | 42 ++++++++++++++---------------- templates/rust/flake.lock | 19 +++++++------- templates/rust/flake.nix | 14 ++++++---- templates/svelte/flake.lock | 50 ++++++++++++++++++------------------ templates/svelte/flake.nix | 47 +++++++++++++++------------------ 10 files changed, 132 insertions(+), 127 deletions(-) diff --git a/templates/docs/flake.lock b/templates/docs/flake.lock index 013e017..b4f7f72 100644 --- a/templates/docs/flake.lock +++ b/templates/docs/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -18,16 +18,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -43,11 +43,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724338379, - "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { diff --git a/templates/go/flake.lock b/templates/go/flake.lock index 604641c..124a788 100644 --- a/templates/go/flake.lock +++ b/templates/go/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1723400035, - "narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a731b45590a5169542990c36ffcde6cebd9a3356", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/templates/go/flake.nix b/templates/go/flake.nix index e6da422..715e90d 100644 --- a/templates/go/flake.nix +++ b/templates/go/flake.nix @@ -2,28 +2,37 @@ description = "Go flake template"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; }; - outputs = { self, nixpkgs }: - let + outputs = { + self, + nixpkgs, + }: let allSystems = [ "x86_64-linux" "aarch64-linux" ]; - forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f { - pkgs = import nixpkgs { inherit system; }; - inherit system; - }); - in - { - packages = forAllSystems ({ pkgs, system }: { - default = pkgs.callPackage ./nix/package.nix { }; + forAllSystems = f: + nixpkgs.lib.genAttrs allSystems (system: + f { + pkgs = import nixpkgs {inherit system;}; + inherit system; + }); + in { + packages = forAllSystems ({ + pkgs, + system, + }: { + default = pkgs.callPackage ./nix/package.nix {}; go-app = self.packages.${system}.default; }); - devShells = forAllSystems ({ pkgs, system }: { - default = pkgs.callPackage ./nix/shell.nix { inherit (self.packages.${system}) go-app; }; + devShells = forAllSystems ({ + pkgs, + system, + }: { + default = pkgs.callPackage ./nix/shell.nix {inherit (self.packages.${system}) go-app;}; }); }; } diff --git a/templates/go/go.mod b/templates/go/go.mod index ecc0a6e..ee8d795 100644 --- a/templates/go/go.mod +++ b/templates/go/go.mod @@ -1,3 +1,3 @@ -module codeberg.org/amadaimbra/flake-template-hell +module codeberg.org/amadaluzia/go-app go 1.22.5 diff --git a/templates/haskell/flake.lock b/templates/haskell/flake.lock index 7d56b6a..b4f7f72 100644 --- a/templates/haskell/flake.lock +++ b/templates/haskell/flake.lock @@ -2,32 +2,32 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1725407940, - "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -43,11 +43,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1725271838, - "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { diff --git a/templates/haskell/flake.nix b/templates/haskell/flake.nix index 646fa35..8ea2cfa 100644 --- a/templates/haskell/flake.nix +++ b/templates/haskell/flake.nix @@ -1,33 +1,29 @@ { - description = "Cool Haskell Project with an unknown purpose"; + description = "Haskell Project Template"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; treefmt.url = "github:numtide/treefmt-nix"; }; - outputs = - inputs@{ nixpkgs, ... }: - let - lib = nixpkgs.lib; - systems = [ "x86_64-linux" ]; - forAllSystems = - f: - lib.genAttrs systems ( - system: + outputs = inputs @ {nixpkgs, ...}: let + inherit (nixpkgs) lib; + systems = ["x86_64-linux"]; + forAllSystems = f: + lib.genAttrs systems ( + system: f { pkgs = import nixpkgs { inherit system; }; } - ); - treefmtEval = forAllSystems ({ pkgs }: inputs.treefmt.lib.evalModule pkgs ./flake/treefmt.nix); - in - { - packages = forAllSystems ({ pkgs }: { - cool-haskell-project = pkgs.callPackage ./flake/package.nix {}; - }); - devShells = forAllSystems ({ pkgs }: { - default = pkgs.callPackage ./flake/shell.nix {}; - }); - formatter = forAllSystems ({ pkgs }: treefmtEval.${pkgs.system}.config.build.wrapper); - }; + ); + treefmtEval = forAllSystems ({pkgs}: inputs.treefmt.lib.evalModule pkgs ./flake/treefmt.nix); + in { + packages = forAllSystems ({pkgs}: { + default = pkgs.callPackage ./flake/package.nix {}; + }); + devShells = forAllSystems ({pkgs}: { + default = pkgs.callPackage ./flake/shell.nix {}; + }); + formatter = forAllSystems ({pkgs}: treefmtEval.${pkgs.system}.config.build.wrapper); + }; } diff --git a/templates/rust/flake.lock b/templates/rust/flake.lock index 5c1674b..787d031 100644 --- a/templates/rust/flake.lock +++ b/templates/rust/flake.lock @@ -2,26 +2,27 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1723673859, - "narHash": "sha256-FLYl6raDlRSUf6o3DkbCg/KkOUBGHcyNKZ0RlzoSLcA=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c55e2908deb848d0e94d8170cb4b0a1e9bc30c8c", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1718428119, - "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -42,11 +43,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1723602049, - "narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=", + "lastModified": 1733279627, + "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ea0bf33a11a26a62c60123c49d96011da396602c", + "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", "type": "github" }, "original": { diff --git a/templates/rust/flake.nix b/templates/rust/flake.nix index 36958f7..eb854d2 100644 --- a/templates/rust/flake.nix +++ b/templates/rust/flake.nix @@ -1,10 +1,14 @@ { description = "Rust Developer Environment"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; rust.url = "github:oxalica/rust-overlay"; }; - outputs = { self, nixpkgs, rust }: let + outputs = { + self, + nixpkgs, + rust, + }: let systems = [ "x86_64-linux" "aarch64-linux" @@ -15,12 +19,12 @@ pkgs = import nixpkgs { inherit system; overlays = [ - (import rust) + (import rust) ]; }; inherit system; in { - rust-app = pkgs.callPackage ./nix/package.nix { }; + rust-app = pkgs.callPackage ./nix/package.nix {}; default = self.packages.${system}.rust-app; }); @@ -28,7 +32,7 @@ pkgs = import nixpkgs { inherit system; overlays = [ - (import rust) + (import rust) ]; }; inherit system; diff --git a/templates/svelte/flake.lock b/templates/svelte/flake.lock index b9a3d21..9de3220 100644 --- a/templates/svelte/flake.lock +++ b/templates/svelte/flake.lock @@ -1,27 +1,27 @@ { - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1725930920, - "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 } diff --git a/templates/svelte/flake.nix b/templates/svelte/flake.nix index 2477df0..7f4c548 100644 --- a/templates/svelte/flake.nix +++ b/templates/svelte/flake.nix @@ -1,31 +1,26 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; - outputs = - { nixpkgs, ... }: - let - lib = nixpkgs.lib; - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - forAllSystems = f: lib.genAttrs systems (system: f { pkgs = nixpkgs.legacyPackages.${system}; }); - in - { - formatter = forAllSystems ({ pkgs }: pkgs.nixfmt-rfc-style); - devShells = forAllSystems ( - { pkgs }: - { - default = pkgs.callPackage ./flake/devshell.nix { }; - } - ); - packages = forAllSystems ( - { pkgs }: - { - svelte-example = pkgs.callPackage ./flake/derivation.nix { }; - } - ); - }; + outputs = {nixpkgs, ...}: let + lib = nixpkgs.lib; + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + forAllSystems = f: lib.genAttrs systems (system: f {pkgs = nixpkgs.legacyPackages.${system};}); + in { + formatter = forAllSystems ({pkgs}: pkgs.nixfmt-rfc-style); + devShells = forAllSystems ( + {pkgs}: { + default = pkgs.callPackage ./flake/devshell.nix {}; + } + ); + packages = forAllSystems ( + {pkgs}: { + svelte-example = pkgs.callPackage ./flake/derivation.nix {}; + } + ); + }; }