From e788a09be9180a8c818f9edaa440710d760968e3 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Sat, 20 Aug 2022 13:06:53 +0300 Subject: [PATCH] Change input style in templates --- clojure/flake.lock | 29 ++++------------------- clojure/flake.nix | 10 ++++---- cue/flake.lock | 29 ++++------------------- cue/flake.nix | 10 ++++---- dhall/flake.lock | 29 ++++------------------- dhall/flake.nix | 10 ++++---- elixir/flake.lock | 29 ++++------------------- elixir/flake.nix | 10 ++++---- elm/flake.lock | 29 ++++------------------- elm/flake.nix | 10 ++++---- flake.nix | 19 +++++---------- gleam/flake.lock | 29 ++++------------------- gleam/flake.nix | 10 ++++---- go1.17/flake.lock | 29 ++++------------------- go1.17/flake.nix | 10 ++++---- go1.18/flake.lock | 29 ++++------------------- go1.18/flake.nix | 10 ++++---- hashi/flake.lock | 29 ++++------------------- hashi/flake.nix | 10 ++++---- haskell/flake.lock | 29 ++++------------------- haskell/flake.nix | 10 ++++---- java/flake.lock | 29 ++++------------------- java/flake.nix | 10 ++++---- kotlin/flake.lock | 29 ++++------------------- kotlin/flake.nix | 10 ++++---- nickel/flake.lock | 29 ++++------------------- nickel/flake.nix | 10 ++++---- nim/flake.lock | 29 ++++------------------- nim/flake.nix | 10 ++++---- nix/flake.lock | 29 ++++------------------- nix/flake.nix | 10 ++++---- node/flake.lock | 29 ++++------------------- node/flake.nix | 10 ++++---- ocaml/flake.lock | 29 ++++------------------- ocaml/flake.nix | 10 ++++---- opa/flake.lock | 29 ++++------------------- opa/flake.nix | 10 ++++---- protobuf/flake.lock | 29 ++++------------------- protobuf/flake.nix | 10 ++++---- python/flake.lock | 57 +++++++++++++++------------------------------ python/flake.nix | 8 +++---- ruby/flake.lock | 29 ++++------------------- ruby/flake.nix | 10 ++++---- rust/flake.lock | 29 ++++------------------- rust/flake.nix | 8 +++---- scala/flake.lock | 29 ++++------------------- scala/flake.nix | 10 ++++---- zig/flake.lock | 29 ++++------------------- zig/flake.nix | 10 ++++---- 49 files changed, 280 insertions(+), 699 deletions(-) diff --git a/clojure/flake.lock b/clojure/flake.lock index 12feb3c..070c1f3 100644 --- a/clojure/flake.lock +++ b/clojure/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/clojure/flake.nix b/clojure/flake.nix index b11a1d2..cef77df 100644 --- a/clojure/flake.nix +++ b/clojure/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Clojure development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let jdk = "jdk17"; diff --git a/cue/flake.lock b/cue/flake.lock index 12feb3c..070c1f3 100644 --- a/cue/flake.lock +++ b/cue/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/cue/flake.nix b/cue/flake.nix index 9afbf7e..7674a4b 100644 --- a/cue/flake.nix +++ b/cue/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Cue development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) cue mkShell; diff --git a/dhall/flake.lock b/dhall/flake.lock index 12feb3c..070c1f3 100644 --- a/dhall/flake.lock +++ b/dhall/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/dhall/flake.nix b/dhall/flake.nix index 2ec0c44..33ce1f7 100644 --- a/dhall/flake.nix +++ b/dhall/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Dhall development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; dhall = pkgs.dhall; diff --git a/elixir/flake.lock b/elixir/flake.lock index 12feb3c..070c1f3 100644 --- a/elixir/flake.lock +++ b/elixir/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/elixir/flake.nix b/elixir/flake.nix index ac8c9df..1c84ba3 100644 --- a/elixir/flake.nix +++ b/elixir/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Elixir development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; diff --git a/elm/flake.lock b/elm/flake.lock index 12feb3c..070c1f3 100644 --- a/elm/flake.lock +++ b/elm/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/elm/flake.nix b/elm/flake.nix index 39237bd..2c1b65d 100644 --- a/elm/flake.nix +++ b/elm/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Elm development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) mkShell; diff --git a/flake.nix b/flake.nix index 3098c8d..8463827 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, flake-utils, nixpkgs }: { templates = { cue = { @@ -120,10 +120,6 @@ description = "Zig development environment"; }; }; - - lib = { - inherit flake-utils nixpkgs; - }; } // flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; @@ -139,16 +135,13 @@ ( cd $dir ${exec "nix"} flake update # Update flake.lock - ${exec "direnv"} reload # Make sure things work after the update + ${ + exec "direnv" + } reload # Make sure things work after the update ) done ''; in { - devShells = { - default = mkShell { - buildInputs = [ format update ]; - }; - }; - } - ); + devShells = { default = mkShell { buildInputs = [ format update ]; }; }; + }); } diff --git a/gleam/flake.lock b/gleam/flake.lock index 12feb3c..070c1f3 100644 --- a/gleam/flake.lock +++ b/gleam/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/gleam/flake.nix b/gleam/flake.nix index 2f059eb..5ecfc62 100644 --- a/gleam/flake.nix +++ b/gleam/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Gleam development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; gleamPkg = pkgs.gleam; diff --git a/go1.17/flake.lock b/go1.17/flake.lock index 12feb3c..070c1f3 100644 --- a/go1.17/flake.lock +++ b/go1.17/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/go1.17/flake.nix b/go1.17/flake.nix index fbd0620..4253458 100644 --- a/go1.17/flake.nix +++ b/go1.17/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Go 1.17 development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; goPkg = pkgs.go_1_17; diff --git a/go1.18/flake.lock b/go1.18/flake.lock index 12feb3c..070c1f3 100644 --- a/go1.18/flake.lock +++ b/go1.18/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/go1.18/flake.nix b/go1.18/flake.nix index e9261c6..872e00d 100644 --- a/go1.18/flake.nix +++ b/go1.18/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Go 1.18 development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; goPkg = pkgs.go_1_18; diff --git a/hashi/flake.lock b/hashi/flake.lock index 12feb3c..070c1f3 100644 --- a/hashi/flake.lock +++ b/hashi/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/hashi/flake.nix b/hashi/flake.nix index 0124e8f..0b500f9 100644 --- a/hashi/flake.nix +++ b/hashi/flake.nix @@ -2,11 +2,13 @@ description = "A Nix-flake-based development environment for Terraform, Packer, and Nomad"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; diff --git a/haskell/flake.lock b/haskell/flake.lock index 12feb3c..070c1f3 100644 --- a/haskell/flake.lock +++ b/haskell/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/haskell/flake.nix b/haskell/flake.nix index 071cf05..2341236 100644 --- a/haskell/flake.nix +++ b/haskell/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Haskell development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) cabal-install ghc mkShell; diff --git a/java/flake.lock b/java/flake.lock index 12feb3c..070c1f3 100644 --- a/java/flake.lock +++ b/java/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/java/flake.nix b/java/flake.nix index a397dd0..366c7b2 100644 --- a/java/flake.nix +++ b/java/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Java development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let jdk = pkgs.jdk17; diff --git a/kotlin/flake.lock b/kotlin/flake.lock index 12feb3c..070c1f3 100644 --- a/kotlin/flake.lock +++ b/kotlin/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/kotlin/flake.nix b/kotlin/flake.nix index 03501f8..cd73b0e 100644 --- a/kotlin/flake.nix +++ b/kotlin/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Kotlin development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let jdk = pkgs.jdk17; diff --git a/nickel/flake.lock b/nickel/flake.lock index 12feb3c..070c1f3 100644 --- a/nickel/flake.lock +++ b/nickel/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/nickel/flake.nix b/nickel/flake.nix index e1d405a..99a0474 100644 --- a/nickel/flake.nix +++ b/nickel/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Protobuf development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) mkShell nickel; diff --git a/nim/flake.lock b/nim/flake.lock index 12feb3c..070c1f3 100644 --- a/nim/flake.lock +++ b/nim/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/nim/flake.nix b/nim/flake.nix index 1623b9d..3924050 100644 --- a/nim/flake.nix +++ b/nim/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Nim development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) mkShell nim; diff --git a/nix/flake.lock b/nix/flake.lock index 12feb3c..070c1f3 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/nix/flake.nix b/nix/flake.nix index 0a10cc5..28c6667 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Nix development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; diff --git a/node/flake.lock b/node/flake.lock index 12feb3c..070c1f3 100644 --- a/node/flake.lock +++ b/node/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/node/flake.nix b/node/flake.nix index 8ca0060..5b42201 100644 --- a/node/flake.nix +++ b/node/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Node.js development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let nodeOverlay = self: super: rec { nodejs = super.nodejs-18_x; diff --git a/ocaml/flake.lock b/ocaml/flake.lock index 12feb3c..070c1f3 100644 --- a/ocaml/flake.lock +++ b/ocaml/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/ocaml/flake.nix b/ocaml/flake.nix index 7f79d05..9a9a76e 100644 --- a/ocaml/flake.nix +++ b/ocaml/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based OCaml development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) mkShell; diff --git a/opa/flake.lock b/opa/flake.lock index 12feb3c..070c1f3 100644 --- a/opa/flake.lock +++ b/opa/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/opa/flake.nix b/opa/flake.nix index 09d2d58..3372026 100644 --- a/opa/flake.nix +++ b/opa/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Open Policy Agent development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) conftest mkShell open-policy-agent; diff --git a/protobuf/flake.lock b/protobuf/flake.lock index 12feb3c..070c1f3 100644 --- a/protobuf/flake.lock +++ b/protobuf/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/protobuf/flake.nix b/protobuf/flake.nix index 8b1f9a6..f5bb93d 100644 --- a/protobuf/flake.nix +++ b/protobuf/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Protobuf development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) buf mkShell protobuf; diff --git a/python/flake.lock b/python/flake.lock index 1119910..8b8f4fc 100644 --- a/python/flake.lock +++ b/python/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -52,7 +33,7 @@ "mach-nix": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pypi-deps-db": "pypi-deps-db" }, "locked": { @@ -70,22 +51,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1643805626, "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", @@ -100,6 +65,21 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, "pypi-deps-db": { "flake": false, "locked": { @@ -118,8 +98,9 @@ }, "root": { "inputs": { - "dev": "dev", - "mach-nix": "mach-nix" + "flake-utils": "flake-utils", + "mach-nix": "mach-nix", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/python/flake.nix b/python/flake.nix index 6059635..df8e739 100644 --- a/python/flake.nix +++ b/python/flake.nix @@ -2,13 +2,13 @@ description = "A Nix-flake-based Python development environment"; inputs = { - dev.url = "github:the-nix-way/dev-templates"; + flake-utils.url = "github:numtide/flake-utils"; mach-nix.url = "github:/DavHau/mach-nix"; + nixpkgs.url = "github:NixOS/nixpkgs"; }; - outputs = { self, dev, mach-nix }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, mach-nix, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) mkShell; diff --git a/ruby/flake.lock b/ruby/flake.lock index 12feb3c..070c1f3 100644 --- a/ruby/flake.lock +++ b/ruby/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/ruby/flake.nix b/ruby/flake.nix index 8b795f6..693674c 100644 --- a/ruby/flake.nix +++ b/ruby/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Ruby development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) mkShell; diff --git a/rust/flake.lock b/rust/flake.lock index e83683e..ba716fd 100644 --- a/rust/flake.lock +++ b/rust/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -51,16 +32,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -83,7 +63,8 @@ }, "root": { "inputs": { - "dev": "dev", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } }, diff --git a/rust/flake.nix b/rust/flake.nix index 8fbfa82..7b86a2b 100644 --- a/rust/flake.nix +++ b/rust/flake.nix @@ -2,13 +2,13 @@ description = "A Nix-flake-based Rust development environment"; inputs = { - dev.url = "github:the-nix-way/dev-templates"; + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; rust-overlay.url = "github:oxalica/rust-overlay"; }; - outputs = { self, dev, rust-overlay }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs, rust-overlay }: + flake-utils.lib.eachDefaultSystem (system: let overlays = [ (import rust-overlay) ]; diff --git a/scala/flake.lock b/scala/flake.lock index 12feb3c..070c1f3 100644 --- a/scala/flake.lock +++ b/scala/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/scala/flake.nix b/scala/flake.nix index 88f8cd9..3ff7544 100644 --- a/scala/flake.nix +++ b/scala/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Scala development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let jdk = "jdk17"; diff --git a/zig/flake.lock b/zig/flake.lock index 12feb3c..070c1f3 100644 --- a/zig/flake.lock +++ b/zig/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "dev": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660405218, - "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", - "owner": "the-nix-way", - "repo": "dev-templates", - "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", - "type": "github" - }, - "original": { - "owner": "the-nix-way", - "repo": "dev-templates", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -36,23 +17,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660375717, - "narHash": "sha256-U/wSSm6eMfNoMG2Rq48+KPwJIq8bfuW/qcf5digYZ8g=", + "lastModified": 1660984654, + "narHash": "sha256-fDcsh8rm2o8cj+WFL8Y2cAqnsej0UGJa+Sy8U2nFg0Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65c15b0a26593a77e65e4212d8d9f58d83844f07", + "rev": "392c83491dcc21d17ab8ea1f809f8f7bd567a5a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "dev": "dev" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } } }, diff --git a/zig/flake.nix b/zig/flake.nix index 62d458f..58e0992 100644 --- a/zig/flake.nix +++ b/zig/flake.nix @@ -1,11 +1,13 @@ { description = "A Nix-flake-based Zig development environment"; - inputs = { dev.url = "github:the-nix-way/dev-templates"; }; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs"; + }; - outputs = { self, dev }: - let inherit (dev.lib) flake-utils nixpkgs; - in flake-utils.lib.eachDefaultSystem (system: + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; zigPkg = pkgs.zig;