4.0.1
This commit is contained in:
30
flake.lock
generated
30
flake.lock
generated
@@ -1,12 +1,15 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676283394,
|
"lastModified": 1689068808,
|
||||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -17,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677022426,
|
"lastModified": 1690716044,
|
||||||
"narHash": "sha256-dCFSTknONT7Rz5AYHEXrh4kpgSZjqjuu/lXJhJTiS78=",
|
"narHash": "sha256-5rhZK0YMQOK+FaOC72leFXUFuCBxKH5SRzUQqpePqQE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8260d35eb9212c4803a3c612a9f7e29c3434fde2",
|
"rev": "b1b263e5f7f899704c6b592f2096bc8f719dc181",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -35,6 +38,21 @@
|
|||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
6
jdk.nix
6
jdk.nix
@@ -1,8 +1,8 @@
|
|||||||
{ buildPlatform, hostPlatform, jdk11, which, zip, buildPackages }:
|
{ buildPlatform, hostPlatform, jdk17, which, zip, buildPackages }:
|
||||||
|
|
||||||
if buildPlatform == hostPlatform
|
if buildPlatform == hostPlatform
|
||||||
then jdk11
|
then jdk17
|
||||||
else (jdk11.override {
|
else (jdk17.override {
|
||||||
# libIDL does not compile in cross-compile scenarios.
|
# libIDL does not compile in cross-compile scenarios.
|
||||||
enableGnome2 = false;
|
enableGnome2 = false;
|
||||||
}).overrideAttrs (old: {
|
}).overrideAttrs (old: {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
730b96b8acf84f44ed9df46cd58f1bd2e6afd3b498abe62f796da074ca932594
|
edb34f7ad477ccfc5f9b171958139b780d27354384463c4b8e2a9d6d895bb75c
|
||||||
@@ -1 +1 @@
|
|||||||
551451292ead9ca440b0d224d60d7f68629f9949dcec8874effa7991650e31df
|
3e9f77cd84c7431db13ca34b74bb2fb986296f4e11ef917e5e1724b3fd498f60
|
||||||
Reference in New Issue
Block a user