More JDK specificity
This commit is contained in:
parent
e2b0b6b052
commit
aa143490b1
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -9,12 +9,17 @@
|
|||
outputs = { self, nixpkgs, flake-utils }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
jdk = "jdk17";
|
||||
|
||||
java = pkgs.jdk17;
|
||||
config = {
|
||||
packageOverrides = p: {
|
||||
gradle = (p.gradle.override { java = p.${jdk}; });
|
||||
};
|
||||
};
|
||||
|
||||
pkgs = import nixpkgs { inherit config jdk system; };
|
||||
java = pkgs.${jdk};
|
||||
buildTools = with pkgs; [ ant gradle maven ];
|
||||
|
||||
inherit (pkgs) mkShell;
|
||||
in {
|
||||
devShells = {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -9,16 +9,26 @@
|
|||
outputs = { self, nixpkgs, flake-utils }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
jdk = "jdk17";
|
||||
|
||||
config = {
|
||||
packageOverrides = p: {
|
||||
gradle = (p.gradle.override { java = p.${jdk}; });
|
||||
|
||||
kotlin = (p.kotlin.override { jre = p.${jdk}; });
|
||||
};
|
||||
};
|
||||
|
||||
pkgs = import nixpkgs { inherit config system; };
|
||||
kotlin = pkgs.kotlin;
|
||||
buildTools = with pkgs; [ gradle ];
|
||||
otherTools = with pkgs; [ gcc ncurses patchelf zlib ];
|
||||
|
||||
inherit (pkgs) mkShell;
|
||||
in {
|
||||
devShells = {
|
||||
default = mkShell {
|
||||
buildInputs = [ kotlin ] ++ buildTools;
|
||||
buildInputs = [ kotlin ] ++ buildTools ++ otherTools;
|
||||
|
||||
shellHook = ''
|
||||
${kotlin}/bin/kotlin -version
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -32,11 +32,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1659049902,
|
||||
"narHash": "sha256-eFyEAnwY/9U+8W/6qam++osVH7ec3D7IXGBHKNk6p4g=",
|
||||
"lastModified": 1659050511,
|
||||
"narHash": "sha256-JqDvJv3kiVMvwfA2NVbzmB/dx+LxJWhTXUCi5morzD4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42ad817998d134577ee8788f4cc2c52f04c71f5b",
|
||||
"rev": "57b2048cc8c34f9a2e3a2edc196e9a98efc3862f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
Loading…
Reference in a new issue