pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub 3aff9fcd ddc361cf
+54
-33
lib/cli.nix
+54
-33
lib/cli.nix
···
1
1
{ lib }:
2
2
3
3
rec {
4
-
/* Automatically convert an attribute set to command-line options.
4
+
/**
5
+
Automatically convert an attribute set to command-line options.
6
+
7
+
This helps protect against malformed command lines and also to reduce
8
+
boilerplate related to command-line construction for simple use cases.
9
+
10
+
`toGNUCommandLine` returns a list of nix strings.
5
11
6
-
This helps protect against malformed command lines and also to reduce
7
-
boilerplate related to command-line construction for simple use cases.
12
+
`toGNUCommandLineShell` returns an escaped shell string.
13
+
14
+
15
+
# Inputs
16
+
17
+
`options`
18
+
19
+
: 1\. Function argument
20
+
21
+
`attrs`
22
+
23
+
: 2\. Function argument
8
24
9
-
`toGNUCommandLine` returns a list of nix strings.
10
-
`toGNUCommandLineShell` returns an escaped shell string.
25
+
26
+
# Examples
27
+
:::{.example}
28
+
## `lib.cli.toGNUCommandLineShell` usage example
29
+
30
+
```nix
31
+
cli.toGNUCommandLine {} {
32
+
data = builtins.toJSON { id = 0; };
33
+
X = "PUT";
34
+
retry = 3;
35
+
retry-delay = null;
36
+
url = [ "https://example.com/foo" "https://example.com/bar" ];
37
+
silent = false;
38
+
verbose = true;
39
+
}
40
+
=> [
41
+
"-X" "PUT"
42
+
"--data" "{\"id\":0}"
43
+
"--retry" "3"
44
+
"--url" "https://example.com/foo"
45
+
"--url" "https://example.com/bar"
46
+
"--verbose"
47
+
]
11
48
12
-
Example:
13
-
cli.toGNUCommandLine {} {
14
-
data = builtins.toJSON { id = 0; };
15
-
X = "PUT";
16
-
retry = 3;
17
-
retry-delay = null;
18
-
url = [ "https://example.com/foo" "https://example.com/bar" ];
19
-
silent = false;
20
-
verbose = true;
21
-
}
22
-
=> [
23
-
"-X" "PUT"
24
-
"--data" "{\"id\":0}"
25
-
"--retry" "3"
26
-
"--url" "https://example.com/foo"
27
-
"--url" "https://example.com/bar"
28
-
"--verbose"
29
-
]
49
+
cli.toGNUCommandLineShell {} {
50
+
data = builtins.toJSON { id = 0; };
51
+
X = "PUT";
52
+
retry = 3;
53
+
retry-delay = null;
54
+
url = [ "https://example.com/foo" "https://example.com/bar" ];
55
+
silent = false;
56
+
verbose = true;
57
+
}
58
+
=> "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'";
59
+
```
30
60
31
-
cli.toGNUCommandLineShell {} {
32
-
data = builtins.toJSON { id = 0; };
33
-
X = "PUT";
34
-
retry = 3;
35
-
retry-delay = null;
36
-
url = [ "https://example.com/foo" "https://example.com/bar" ];
37
-
silent = false;
38
-
verbose = true;
39
-
}
40
-
=> "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'";
61
+
:::
41
62
*/
42
63
toGNUCommandLineShell =
43
64
options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs);
+5
-5
pkgs/applications/misc/1password/default.nix
+5
-5
pkgs/applications/misc/1password/default.nix
···
12
12
if extension == "zip" then fetchzip args else fetchurl args;
13
13
14
14
pname = "1password-cli";
15
-
version = "2.26.0";
15
+
version = "2.26.1";
16
16
sources = rec {
17
-
aarch64-linux = fetch "linux_arm64" "sha256-zWmWeAPtgSR8/3l40K4DPdMm0Pan+J1uNjUaEx+geO4=" "zip";
18
-
i686-linux = fetch "linux_386" "sha256-OOjAMfRTSW+RuD0PPosvxMIPJcPQQok5Wn209sa0tuU=" "zip";
19
-
x86_64-linux = fetch "linux_amd64" "sha256-RwdEeqBFNj5dgBsmC2fiDwUGFWhuqeEL7g60ogFEq1Y=" "zip";
20
-
aarch64-darwin = fetch "apple_universal" "sha256-pwXHax0DBx1UpVmwYytpSikt5xdKZJXrdqvjWyWdUBM=" "pkg";
17
+
aarch64-linux = fetch "linux_arm64" "sha256-dV3VDPjiA9xKbL4tmDJ6T4B8NmPHBB2aKj3HWNGifr4=" "zip";
18
+
i686-linux = fetch "linux_386" "sha256-61zjjg2+UU3cMP+kcn1zXopTdRR2v/Wom3Vtz0/KnUQ=" "zip";
19
+
x86_64-linux = fetch "linux_amd64" "sha256-2Cq0tbdFpvFYSGRmdPclCw4jqfIKPoixv/gZKkBqgH0=" "zip";
20
+
aarch64-darwin = fetch "apple_universal" "sha256-NOCRGKF32tAh5HwwYgm+f3el3l1djqvIHNdpR5NsoM8=" "pkg";
21
21
x86_64-darwin = aarch64-darwin;
22
22
};
23
23
platforms = builtins.attrNames sources;
+20
-5
pkgs/applications/misc/tomato-c/default.nix
+20
-5
pkgs/applications/misc/tomato-c/default.nix
···
1
1
{ lib
2
2
, stdenv
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, libnotify
5
6
, makeWrapper
6
7
, mpv
···
19
20
hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs=";
20
21
};
21
22
23
+
patches = [
24
+
# Adds missing function declarations required by newer versions of clang.
25
+
(fetchpatch {
26
+
url = "https://github.com/gabrielzschmitz/Tomato.C/commit/ad6d4c385ae39d655a716850653cd92431c1f31e.patch";
27
+
hash = "sha256-3ormv59Ce4rOmeyL30QET3CCUIOrRYMquub+eIQsMW8=";
28
+
})
29
+
];
30
+
22
31
postPatch = ''
23
32
substituteInPlace Makefile \
24
-
--replace "sudo " ""
33
+
--replace-fail "sudo " ""
34
+
# Need to define _ISOC99_SOURCE to use `snprintf` on Darwin
35
+
substituteInPlace config.mk \
36
+
--replace-fail -D_POSIX_C_SOURCE -D_ISOC99_SOURCE
25
37
substituteInPlace notify.c \
26
-
--replace "/usr/local" "${placeholder "out"}"
38
+
--replace-fail "/usr/local" "${placeholder "out"}"
27
39
substituteInPlace util.c \
28
-
--replace "/usr/local" "${placeholder "out"}"
40
+
--replace-fail "/usr/local" "${placeholder "out"}"
29
41
substituteInPlace tomato.desktop \
30
-
--replace "/usr/local" "${placeholder "out"}"
42
+
--replace-fail "/usr/local" "${placeholder "out"}"
31
43
'';
32
44
33
45
nativeBuildInputs = [
···
41
53
ncurses
42
54
];
43
55
56
+
makeFlags = [
57
+
"PREFIX=${placeholder "out"}"
58
+
];
59
+
44
60
installFlags = [
45
-
"PREFIX=${placeholder "out"}"
46
61
"CPPFLAGS=$NIX_CFLAGS_COMPILE"
47
62
"LDFLAGS=$NIX_LDFLAGS"
48
63
];
+5
-5
pkgs/applications/networking/browsers/librewolf/src.json
+5
-5
pkgs/applications/networking/browsers/librewolf/src.json
···
1
1
{
2
-
"packageVersion": "123.0.1-1",
2
+
"packageVersion": "124.0.1-1",
3
3
"source": {
4
-
"rev": "123.0.1-1",
5
-
"sha256": "1rw10n0na7v2syf0dqmjl91d6jhnhzb6xbcd13frwclp1v5j0irk"
4
+
"rev": "124.0.1-1",
5
+
"sha256": "1qyhwxc16qsmq3bvsmdwqib47v27fly1szq7jh78dylpib8xgb6f"
6
6
},
7
7
"settings": {
8
8
"rev": "8a499ecdab8a5136faee50aae1fdd48997711de6",
9
9
"sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6"
10
10
},
11
11
"firefox": {
12
-
"version": "123.0.1",
13
-
"sha512": "e9af61c1ca800edd16ab7a0d24c9a36bbb34813ed0a11ff62389aa38fa83deba394bca5d95cdaad55ad29ffa3c0e5d3dd15ac1099f7fa3649f4b6c835b7498c2"
12
+
"version": "124.0.1",
13
+
"sha512": "282c45e5c468419536dd8b81c8ea687b10d8002d7521403330e6eeef49207143bee88a44c3785748d461ed9a72687606f5da14f4dfb98eb40a5cd08a4a12722b"
14
14
}
15
15
}
+2
-2
pkgs/applications/office/planify/default.nix
+2
-2
pkgs/applications/office/planify/default.nix
···
27
27
28
28
stdenv.mkDerivation rec {
29
29
pname = "planify";
30
-
version = "4.5.4";
30
+
version = "4.5.8";
31
31
32
32
src = fetchFromGitHub {
33
33
owner = "alainm23";
34
34
repo = "planify";
35
35
rev = version;
36
-
hash = "sha256-Q7QwsMUlejZStmQNRQntclHSCVQl54dtg8hyvXyM4PM=";
36
+
hash = "sha256-VTBnVVxv3hCyDKJlY/hE8oEDMNuMMWtm+NKzfD3tVzk=";
37
37
};
38
38
39
39
nativeBuildInputs = [
+3
-3
pkgs/applications/version-management/forgejo/default.nix
+3
-3
pkgs/applications/version-management/forgejo/default.nix
···
39
39
in
40
40
buildGoModule rec {
41
41
pname = "forgejo";
42
-
version = "1.21.7-0";
42
+
version = "1.21.8-0";
43
43
44
44
src = fetchFromGitea {
45
45
domain = "codeberg.org";
46
46
owner = "forgejo";
47
47
repo = "forgejo";
48
48
rev = "v${version}";
49
-
hash = "sha256-wYwQnZRIJSbwI+kOPedxnIdfhQ/wWxXpOpdfcFono6k=";
49
+
hash = "sha256-nufhGsibpPrGWpVg75Z6qdzlc1K+p36mMjlS2MtsuAI=";
50
50
};
51
51
52
-
vendorHash = "sha256-Mptfd1WoUXNQkw7sa/GxIO7s5V5/9VmVBtvPCjMsa/4=";
52
+
vendorHash = "sha256-+1apPnqbIfp2Nu1ieI2DdHo4gndZObmcq/Td+ZtkILM=";
53
53
54
54
subPackages = [ "." ];
55
55
+3
-3
pkgs/by-name/bi/bitmagnet/package.nix
+3
-3
pkgs/by-name/bi/bitmagnet/package.nix
···
6
6
7
7
buildGoModule rec {
8
8
pname = "bitmagnet";
9
-
version = "0.7.0";
9
+
version = "0.7.14";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "bitmagnet-io";
13
13
repo = "bitmagnet";
14
14
rev = "v${version}";
15
-
hash = "sha256-lomTfG6Fo4IywI8VMRvv4mBNRxLCq6IQGIuaR61UwOE=";
15
+
hash = "sha256-TaxoQdjdHw8h6w6wKBHL/CVxWFK/RG2tJ//MtUEOwfU=";
16
16
};
17
17
18
-
vendorHash = "sha256-tKU4GoaEwwdbpWjojx+Z/mWxXKjceJPYRg5UTpYzad4=";
18
+
vendorHash = "sha256-y9RfaAx9AQS117J3+p/Yy8Mn5In1jmZmW4IxKjeV8T8=";
19
19
20
20
ldflags = [ "-s" "-w" ];
21
21
+2
-2
pkgs/by-name/fl/flarectl/package.nix
+2
-2
pkgs/by-name/fl/flarectl/package.nix
···
5
5
6
6
buildGoModule rec {
7
7
pname = "flarectl";
8
-
version = "0.90.0";
8
+
version = "0.91.0";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "cloudflare";
12
12
repo = "cloudflare-go";
13
13
rev = "v${version}";
14
-
hash = "sha256-4FgRK8tsds+4EFwYpZB2HrPvXN6LdZjehG2oilhOkVw=";
14
+
hash = "sha256-T9Xv7EDQfaGOIryvH8TVxrOcIrJWUEsnZ7PpU9Lmv3Y=";
15
15
};
16
16
17
17
vendorHash = "sha256-F1fwzzBg60E7B9iPV0gziGB3WE1tcZ/6nMpnEyTjV1g=";
+3
-3
pkgs/development/compilers/erg/default.nix
+3
-3
pkgs/development/compilers/erg/default.nix
···
9
9
10
10
rustPlatform.buildRustPackage rec {
11
11
pname = "erg";
12
-
version = "0.6.32";
12
+
version = "0.6.33";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "erg-lang";
16
16
repo = "erg";
17
17
rev = "v${version}";
18
-
hash = "sha256-l+I6ue824dvZ1AmSS/y+Sh43OstJ5c+8xIXvoVpMFws=";
18
+
hash = "sha256-L154Ci2/Kw1NZcc7Sn2ROhrXBxIjZXr3DHHj4dvPHTI=";
19
19
};
20
20
21
-
cargoHash = "sha256-SRltpqTviC+Dq9pPBuLjctOXOKTYw+zVlvA9wi0iFWg=";
21
+
cargoHash = "sha256-LL+9tu9CnevqOqoYORJ/WxerwPrEEpw/OKhC+0xchIs=";
22
22
23
23
nativeBuildInputs = [
24
24
makeWrapper
+3
-3
pkgs/development/interpreters/risor/default.nix
+3
-3
pkgs/development/interpreters/risor/default.nix
···
7
7
8
8
buildGoModule rec {
9
9
pname = "risor";
10
-
version = "1.3.2";
10
+
version = "1.5.1";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "risor-io";
14
14
repo = "risor";
15
15
rev = "v${version}";
16
-
hash = "sha256-E4Huto3jvPziWEZqHwVBchZYDX/Tuq/TCBvoviin5UY=";
16
+
hash = "sha256-bGlJe61B5jMb1u81NvNMJDW+dNem6bNFT7DJYno5jCk=";
17
17
};
18
18
19
19
proxyVendor = true;
20
-
vendorHash = "sha256-0NYvZhVkDX6WlKN4QFXyrNnEy0sjUQ1Us+iNEPIgNX0=";
20
+
vendorHash = "sha256-eW6eSZp5Msg/u50i1+S2KSzDws0Rq8JBY1Yxzq7/hVo=";
21
21
22
22
subPackages = [
23
23
"cmd/risor"
+2
-2
pkgs/development/interpreters/spidermonkey/102.nix
+2
-2
pkgs/development/interpreters/spidermonkey/102.nix
···
1
1
import ./common.nix {
2
-
version = "102.13.0";
3
-
hash = "sha512-dF9Kd+TImDE/ERGCdNJ1E/S6oWu0LVtx2b0NvolX2/OaX3roRCzXEayptZe8kJwEtEy42QlMV6o04oXmT4NP3g==";
2
+
version = "102.15.1";
3
+
hash = "sha512-vbZrT7ViKvPmBYCjvNRk2Y7xPLONasbJ5fwEblZ6ADzwgBJdd0iVDJHEQv3l6AJMUMQYDS9VGqNSgWCjwFrhhw==";
4
4
}
+1
-2
pkgs/development/libraries/jbig2enc/default.nix
+1
-2
pkgs/development/libraries/jbig2enc/default.nix
+2
-2
pkgs/development/libraries/sentry-native/default.nix
+2
-2
pkgs/development/libraries/sentry-native/default.nix
···
9
9
10
10
stdenv.mkDerivation rec {
11
11
pname = "sentry-native";
12
-
version = "0.7.0";
12
+
version = "0.7.1";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "getsentry";
16
16
repo = "sentry-native";
17
17
rev = version;
18
-
hash = "sha256-e2VjQ3U72X+bwRAi/6StLDWT8tf/MjatnmC/+jCgzTo=";
18
+
hash = "sha256-t1lk0gW72uQrLbeLdvlFzYEvOarbW2ya7sK6Ru3FW+o=";
19
19
};
20
20
21
21
nativeBuildInputs = [
+2
-2
pkgs/development/python-modules/clarifai-grpc/default.nix
+2
-2
pkgs/development/python-modules/clarifai-grpc/default.nix
···
11
11
12
12
buildPythonPackage rec {
13
13
pname = "clarifai-grpc";
14
-
version = "10.2.1";
14
+
version = "10.2.2";
15
15
pyproject = true;
16
16
17
17
disabled = pythonOlder "3.8";
···
20
20
owner = "Clarifai";
21
21
repo = "clarifai-python-grpc";
22
22
rev = "refs/tags/${version}";
23
-
hash = "sha256-8U1e4NOvi2+8GFMXwKiAiCyMYTsfKGW728v0tk6WlgQ=";
23
+
hash = "sha256-beBUluOTu90H2pinBWhb0Q1KmQ0vq23k+ZyCJVoc7ls=";
24
24
};
25
25
26
26
nativeBuildInputs = [
+2
-2
pkgs/development/python-modules/gcal-sync/default.nix
+2
-2
pkgs/development/python-modules/gcal-sync/default.nix
···
14
14
15
15
buildPythonPackage rec {
16
16
pname = "gcal-sync";
17
-
version = "6.0.3";
17
+
version = "6.0.4";
18
18
pyproject = true;
19
19
20
20
disabled = pythonOlder "3.10";
···
23
23
owner = "allenporter";
24
24
repo = "gcal_sync";
25
25
rev = "refs/tags/${version}";
26
-
hash = "sha256-i5K4kJcieugPkXIuDje8tk5TEX6EwDywUB6MByLmukA=";
26
+
hash = "sha256-ufoe9+4zhlixcSGMAhuhJx2Y2vrN036N8UvyP3xuTRQ=";
27
27
};
28
28
29
29
nativeBuildInputs = [
+2
-2
pkgs/development/python-modules/peft/default.nix
+2
-2
pkgs/development/python-modules/peft/default.nix
···
14
14
15
15
buildPythonPackage rec {
16
16
pname = "peft";
17
-
version = "0.9.0";
17
+
version = "0.10.0";
18
18
format = "pyproject";
19
19
20
20
disabled = pythonOlder "3.8";
···
23
23
owner = "huggingface";
24
24
repo = pname;
25
25
rev = "refs/tags/v${version}";
26
-
hash = "sha256-RdWCIR28OqmpA92/5OWA5sCCPQCAWpUzCZpkHvNMj6M=";
26
+
hash = "sha256-Aln5WyDgNnxOUwyhOz9NGsnV1zXt/Rs57ULxR5ZJXNM=";
27
27
};
28
28
29
29
nativeBuildInputs = [ setuptools ];
+2
-2
pkgs/development/python-modules/shap/default.nix
+2
-2
pkgs/development/python-modules/shap/default.nix
···
31
31
32
32
buildPythonPackage rec {
33
33
pname = "shap";
34
-
version = "0.44.1";
34
+
version = "0.45.0";
35
35
pyproject = true;
36
36
37
37
disabled = pythonOlder "3.8";
···
40
40
owner = "slundberg";
41
41
repo = "shap";
42
42
rev = "refs/tags/v${version}";
43
-
hash = "sha256-pC201Q/i3UAuJPZw0H+giebhJKVTmmKfxhFdonmkxtI=";
43
+
hash = "sha256-x8845saPoLsWu3Z8Thkhqo3HeLmfAZANj3KE0ftVqZc=";
44
44
};
45
45
46
46
nativeBuildInputs = [
+2
-2
pkgs/development/python-modules/ubelt/default.nix
+2
-2
pkgs/development/python-modules/ubelt/default.nix
···
15
15
16
16
buildPythonPackage rec {
17
17
pname = "ubelt";
18
-
version = "1.3.4";
18
+
version = "1.3.5";
19
19
pyproject = true;
20
20
21
21
disabled = pythonOlder "3.6";
···
24
24
owner = "Erotemic";
25
25
repo = "ubelt";
26
26
rev = "refs/tags/v${version}";
27
-
hash = "sha256-pvCmmdPRLupMUCiOvfa+JTX8NPFZ/UcXSPEaaDG3eTk=";
27
+
hash = "sha256-pwqqt5Syag4cO6a93+7ZE3eI61yTZGc+NEu/Y0i1U0k=";
28
28
};
29
29
30
30
nativeBuildInputs = [
+2
-2
pkgs/games/fheroes2/default.nix
+2
-2
pkgs/games/fheroes2/default.nix
···
6
6
7
7
stdenv.mkDerivation rec {
8
8
pname = "fheroes2";
9
-
version = "1.0.12";
9
+
version = "1.0.13";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "ihhub";
13
13
repo = "fheroes2";
14
14
rev = version;
15
-
hash = "sha256-FqtxTRgjFqFu4zml6xePXtK8yn/dkHP+5aU2/9S7gSQ=";
15
+
hash = "sha256-uR46G1DISurBk17GQdo+x94F2cP0+157PxjdG2s1Ik4=";
16
16
};
17
17
18
18
nativeBuildInputs = [ imagemagick ];
+3
-3
pkgs/tools/admin/aliyun-cli/default.nix
+3
-3
pkgs/tools/admin/aliyun-cli/default.nix
···
2
2
3
3
buildGoModule rec {
4
4
pname = "aliyun-cli";
5
-
version = "3.0.199";
5
+
version = "3.0.200";
6
6
7
7
src = fetchFromGitHub {
8
8
rev = "v${version}";
9
9
owner = "aliyun";
10
10
repo = pname;
11
11
fetchSubmodules = true;
12
-
sha256 = "sha256-fHp+sLbCsfFGK6FmhiNp7Z2y2k2baP/s4na3zsBOccU=";
12
+
sha256 = "sha256-xUP7zEWq5zTNzDaazmsL2h4QznsE5K3Rzo08qctCA3M=";
13
13
};
14
14
15
-
vendorHash = "sha256-cCjLnJxO6e03vlWIa8OF9wSce4aVNr6ak4mY5rN7TVw=";
15
+
vendorHash = "sha256-t9ukiREUEmW6KK7m5Uv5Ce6n/1GsBLom9H35eEyOBys=";
16
16
17
17
subPackages = [ "main" ];
18
18
+3
-3
pkgs/tools/compression/crabz/default.nix
+3
-3
pkgs/tools/compression/crabz/default.nix
···
6
6
7
7
rustPlatform.buildRustPackage rec {
8
8
pname = "crabz";
9
-
version = "0.9.0";
9
+
version = "0.10.0";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "sstadick";
13
13
repo = pname;
14
14
rev = "v${version}";
15
-
sha256 = "sha256-qKyrAao4b+D9KhK0euNcn2/YyXGeUjgCfdVtDxy6cuQ=";
15
+
sha256 = "sha256-GJHxo4WD/XMudwxOHdNwY1M+b/DFJMpU0uD3sOvO5YU=";
16
16
};
17
17
18
-
cargoHash = "sha256-S3/JDheTBwYS3uEAwwK+bAtzp0LP8FHHxyOnIQkKqlA=";
18
+
cargoHash = "sha256-T+Sdzts7gzkG2EFcKrkVDUIq2V34PBdW3oyxMUcCWaI=";
19
19
20
20
nativeBuildInputs = [ cmake ];
21
21
+3
-3
pkgs/tools/nix/fh/default.nix
+3
-3
pkgs/tools/nix/fh/default.nix
···
10
10
11
11
rustPlatform.buildRustPackage rec {
12
12
pname = "fh";
13
-
version = "0.1.9";
13
+
version = "0.1.10";
14
14
15
15
src = fetchFromGitHub {
16
16
owner = "DeterminateSystems";
17
17
repo = "fh";
18
18
rev = "v${version}";
19
-
hash = "sha256-G2bLYand61E/s652Q+5XSfXdM6XUWixiXRRMd3HvfM4=";
19
+
hash = "sha256-fRaKydMSwd1zl6ptBKvn5ej2pqtI8xi9dioFmR8QA+g=";
20
20
};
21
21
22
-
cargoHash = "sha256-c3XxJQf2uHvj1X/djKyQg2AtrXdROyIVwLeYxFgHDNI=";
22
+
cargoHash = "sha256-iOP5llFtySG8Z2Mj7stt6fYpQWqiQqJuftuYBrbkmyU=";
23
23
24
24
nativeBuildInputs = [
25
25
installShellFiles
-8
pkgs/top-level/all-packages.nix
-8
pkgs/top-level/all-packages.nix
···
15673
15673
gccFun = callPackage ../development/compilers/gcc;
15674
15674
gcc-unwrapped = gcc.cc;
15675
15675
15676
-
pin-to-gcc12-if-gcc13 = pkg:
15677
-
if !(lib.isDerivation pkg) || !(pkg?override) then pkg else
15678
-
pkg.override (previousArgs:
15679
-
lib.optionalAttrs (previousArgs.stdenv.cc.cc.isGNU or false &&
15680
-
lib.versionAtLeast previousArgs.stdenv.cc.cc.version "13.0") {
15681
-
stdenv = gcc12Stdenv;
15682
-
});
15683
-
15684
15676
wrapNonDeterministicGcc = stdenv: ccWrapper:
15685
15677
if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: {
15686
15678
env = old.env // {