From aa143490b158008cb17879d10e2fa3530f7d8fdf Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 29 Jul 2022 01:34:22 +0200 Subject: [PATCH] More JDK specificity --- dhall/flake.lock | 6 +++--- elixir/flake.lock | 6 +++--- gleam/flake.lock | 6 +++--- go1.17/flake.lock | 6 +++--- go1.18/flake.lock | 6 +++--- java/flake.lock | 6 +++--- java/flake.nix | 11 ++++++++--- kotlin/flake.lock | 6 +++--- kotlin/flake.nix | 14 ++++++++++++-- nix/flake.lock | 6 +++--- node/flake.lock | 6 +++--- rust/flake.lock | 6 +++--- scala/flake.lock | 6 +++--- zig/flake.lock | 6 +++--- 14 files changed, 56 insertions(+), 41 deletions(-) diff --git a/dhall/flake.lock b/dhall/flake.lock index d6b9406..280b29c 100644 --- a/dhall/flake.lock +++ b/dhall/flake.lock @@ -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": { diff --git a/elixir/flake.lock b/elixir/flake.lock index d6b9406..280b29c 100644 --- a/elixir/flake.lock +++ b/elixir/flake.lock @@ -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": { diff --git a/gleam/flake.lock b/gleam/flake.lock index d6b9406..280b29c 100644 --- a/gleam/flake.lock +++ b/gleam/flake.lock @@ -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": { diff --git a/go1.17/flake.lock b/go1.17/flake.lock index d6b9406..280b29c 100644 --- a/go1.17/flake.lock +++ b/go1.17/flake.lock @@ -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": { diff --git a/go1.18/flake.lock b/go1.18/flake.lock index d6b9406..280b29c 100644 --- a/go1.18/flake.lock +++ b/go1.18/flake.lock @@ -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": { diff --git a/java/flake.lock b/java/flake.lock index d6b9406..280b29c 100644 --- a/java/flake.lock +++ b/java/flake.lock @@ -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": { diff --git a/java/flake.nix b/java/flake.nix index fea142d..92c81e4 100644 --- a/java/flake.nix +++ b/java/flake.nix @@ -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 = { diff --git a/kotlin/flake.lock b/kotlin/flake.lock index d6b9406..280b29c 100644 --- a/kotlin/flake.lock +++ b/kotlin/flake.lock @@ -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": { diff --git a/kotlin/flake.nix b/kotlin/flake.nix index 6ed3c88..1490627 100644 --- a/kotlin/flake.nix +++ b/kotlin/flake.nix @@ -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 diff --git a/nix/flake.lock b/nix/flake.lock index d6b9406..280b29c 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -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": { diff --git a/node/flake.lock b/node/flake.lock index d6b9406..280b29c 100644 --- a/node/flake.lock +++ b/node/flake.lock @@ -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": { diff --git a/rust/flake.lock b/rust/flake.lock index df7d7c7..b9a5adf 100644 --- a/rust/flake.lock +++ b/rust/flake.lock @@ -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": { diff --git a/scala/flake.lock b/scala/flake.lock index d6b9406..280b29c 100644 --- a/scala/flake.lock +++ b/scala/flake.lock @@ -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": { diff --git a/zig/flake.lock b/zig/flake.lock index d6b9406..280b29c 100644 --- a/zig/flake.lock +++ b/zig/flake.lock @@ -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": {