format and update

This commit is contained in:
Luc Perkins 2022-07-29 01:21:18 +02:00
parent c06ee195ac
commit e2b0b6b052
No known key found for this signature in database
GPG key ID: 4F102D0C16E232F2
23 changed files with 122 additions and 42 deletions

View file

@ -19,6 +19,9 @@ nix flake init --template github:the-nix-way/dev-templates#go_1_18
# Java
nix flake init --template github:the-nix-way/dev-templates#java
# Kotlin
nix flake init --template github:the-nix-way/dev-templates#kotlin
# Nix
nix flake init --template github:the-nix-way/dev-templates#nix

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -32,7 +32,7 @@
inherit (pkgs) mkShell;
in {
devShells = {
default = pkgs.mkShell {
default = mkShell {
buildInputs = [ dhall ] ++ otherFormats;
shellHook = ''

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -53,6 +53,11 @@
description = "Java development environment";
};
kotlin = {
path = ./kotlin;
description = "Kotlin development environment";
};
nix = {
path = ./nix;
description = "Nix development environment";

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -15,7 +15,7 @@
inherit (pkgs) mkShell;
in {
devShells = {
default = pkgs.mkShell {
default = mkShell {
buildInputs = [ gleamPkg ];
shellHook = ''

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -11,14 +11,14 @@
let
pkgs = import nixpkgs { inherit system; };
inherit (pkgs) mkShell;
java = pkgs.jdk17;
buildTools = with pkgs; [ ant gradle maven ];
inherit (pkgs) mkShell;
in {
devShells = {
default = pkgs.mkShell {
default = mkShell {
buildInputs = [ java ] ++ buildTools;
shellHook = ''

1
kotlin/.envrc Normal file
View file

@ -0,0 +1 @@
use flake .

42
kotlin/flake.lock Normal file
View file

@ -0,0 +1,42 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

29
kotlin/flake.nix Normal file
View file

@ -0,0 +1,29 @@
{
description = "A Nix-flake-based Kotlin development environment";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
kotlin = pkgs.kotlin;
buildTools = with pkgs; [ gradle ];
inherit (pkgs) mkShell;
in {
devShells = {
default = mkShell {
buildInputs = [ kotlin ] ++ buildTools;
shellHook = ''
${kotlin}/bin/kotlin -version
'';
};
};
});
}

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -27,7 +27,7 @@
inherit (pkgs) mkShell;
in {
devShells = {
default = pkgs.mkShell { buildInputs = [ nix ] ++ nixRelatedTools; };
default = mkShell { buildInputs = [ nix ] ++ nixRelatedTools; };
};
});
}

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -18,7 +18,7 @@
yarn = pkgs.yarn;
in {
devShells = {
default = pkgs.mkShell {
default = mkShell {
buildInputs = [ nodejs pnpm (yarn.override { inherit nodejs; }) ];
shellHook = ''

View file

@ -32,11 +32,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -28,7 +28,7 @@
buildTools = with pkgs; [ sbt ];
in {
devShells = {
default = pkgs.mkShell {
default = mkShell {
buildInputs = [ scala jdkPkg ] ++ buildTools;
shellHook = ''

View file

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1659047633,
"narHash": "sha256-zeI+NkJOa665fRrKGpjscfy3Hs4K316q1q7394xbRbw=",
"lastModified": 1659049902,
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "496caa738a16d2bb3607243d9127df718bb50513",
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
"type": "github"
},
"original": {

View file

@ -15,7 +15,7 @@
inherit (pkgs) mkShell;
in {
devShells = {
default = pkgs.mkShell {
default = mkShell {
buildInputs = [ zigPkg ];
shellHook = ''