pyrox.dev
lol
Merge master into staging-next
authored by
github-actions[bot]
and committed by
GitHub
5efb7d8d
909d63d2
+314
-162
-1
maintainers/team-list.nix
-1
maintainers/team-list.nix
+2
-2
pkgs/applications/editors/cudatext/default.nix
+2
-2
pkgs/applications/editors/cudatext/default.nix
···
38
38
in
39
39
stdenv.mkDerivation rec {
40
40
pname = "cudatext";
41
-
version = "1.133.5";
41
+
version = "1.137.2";
42
42
43
43
src = fetchFromGitHub {
44
44
owner = "Alexey-T";
45
45
repo = "CudaText";
46
46
rev = version;
47
-
sha256 = "sha256-0QWYitlOS3x7BQpFTYDAjIgkw83IkRFfA/slyEvQUnw=";
47
+
sha256 = "sha256-OiLYXx1sBkEJpMPTa/45QPHLtmeI6ZLles7GfjEBGtQ=";
48
48
};
49
49
50
50
postPatch = ''
+12
-12
pkgs/applications/editors/cudatext/deps.json
+12
-12
pkgs/applications/editors/cudatext/deps.json
···
6
6
},
7
7
"ATBinHex-Lazarus": {
8
8
"owner": "Alexey-T",
9
-
"rev": "2021.02.13",
10
-
"sha256": "1p2r2q1al6rcsdbbg8ilm4xn6w48bj348khxdmpak7vfwx9741h8"
9
+
"rev": "2021.07.02",
10
+
"sha256": "sha256-XSt2XfHMiF/ZIf07M65u+k5FjacyToL0rWbpcflKcuY="
11
11
},
12
12
"ATFlatControls": {
13
13
"owner": "Alexey-T",
14
-
"rev": "2021.05.16",
15
-
"sha256": "sha256-oQW0M8Sx1bC+keOWivXwlD5SDKJuO5Sk/3HiO9HvJtY="
14
+
"rev": "2021.07.09",
15
+
"sha256": "sha256-hVoHH29JLPy3qq73e5EV4bxERcizocO4RBgvqD+VhWo="
16
16
},
17
17
"ATSynEdit": {
18
18
"owner": "Alexey-T",
19
-
"rev": "2021.05.31",
20
-
"sha256": "sha256-4B6/I0CH9gfslwUbCTTI4kycgTHUjLGtVrCctfO6gRo="
19
+
"rev": "0cf6e09f673beb3a25d6957c97eeeee37024617b",
20
+
"sha256": "sha256-oqxzORNva7tZXNlI/mSe722p6Tbkf7Ie6GPL3TxjV98="
21
21
},
22
22
"ATSynEdit_Cmp": {
23
23
"owner": "Alexey-T",
24
-
"rev": "2021.05.03",
25
-
"sha256": "sha256-zns83XA2SslHRGqa3iro0phIBlz5/neJ34TTYAKhX5Q="
24
+
"rev": "2021.07.09",
25
+
"sha256": "sha256-w5f1s8yjkYfDqAcKISRgJd3fe+f2NyO3ZtFLLfiBm2Q="
26
26
},
27
27
"EControl": {
28
28
"owner": "Alexey-T",
29
-
"rev": "2021.05.27",
30
-
"sha256": "sha256-D0UBK69V28Izs9FgevtvX6vyDU7KpfIGJqcqpWaxU9E="
29
+
"rev": "2021.07.02",
30
+
"sha256": "sha256-PndvBiqdqw681AC6q33UWdzUvcYHxj1WuYsVFi2HK7c="
31
31
},
32
32
"ATSynEdit_Ex": {
33
33
"owner": "Alexey-T",
34
-
"rev": "2021.05.27",
35
-
"sha256": "sha256-1zhSB6bgeW5G6RAZvhznNTpRk0uEDZnLXsk+cgElKLw="
34
+
"rev": "2021.07.09",
35
+
"sha256": "sha256-QCG9i26m3v9J4uO1I1BiDwBerH4iX1rAJuNqx+gHLnA="
36
36
},
37
37
"Python-for-Lazarus": {
38
38
"owner": "Alexey-T",
+2
-2
pkgs/applications/misc/moonlight-qt/default.nix
+2
-2
pkgs/applications/misc/moonlight-qt/default.nix
···
20
20
21
21
stdenv.mkDerivation rec {
22
22
pname = "moonlight-qt";
23
-
version = "3.1.1";
23
+
version = "3.1.4";
24
24
25
25
src = fetchFromGitHub {
26
26
owner = "moonlight-stream";
27
27
repo = pname;
28
28
rev = "v${version}";
29
-
sha256 = "1bz4wjl8zydw46bh2mdbrsx8prh2fw0cmzqliy912fdz5aal2b74";
29
+
sha256 = "1sg8svb6xvkczp9slqnlm0b6k0z3bzdi4zzvwzzy21kpj6im9002";
30
30
fetchSubmodules = true;
31
31
};
32
32
+2
-2
pkgs/applications/misc/urlscan/default.nix
+2
-2
pkgs/applications/misc/urlscan/default.nix
···
2
2
3
3
python3Packages.buildPythonApplication rec {
4
4
pname = "urlscan";
5
-
version = "0.9.5";
5
+
version = "0.9.6";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "firecat53";
9
9
repo = pname;
10
10
rev = version;
11
-
sha256 = "16g7dzvjcfhaz52wbmcapamy55l7vfhgizqy3m8dv9gkmy8vap89";
11
+
sha256 = "D+WJ1HG1gXIFtIpaqazFqC9Y4GBCUsz88U8q8W9tHFA=";
12
12
};
13
13
14
14
propagatedBuildInputs = [ python3Packages.urwid ];
+7
-8
pkgs/applications/networking/charles/default.nix
+7
-8
pkgs/applications/networking/charles/default.nix
···
1
-
{
2
-
lib, stdenv
1
+
{ lib
2
+
, stdenv
3
3
, makeWrapper
4
4
, makeDesktopItem
5
5
, fetchurl
···
49
49
meta = with lib; {
50
50
description = "Web Debugging Proxy";
51
51
homepage = "https://www.charlesproxy.com/";
52
-
maintainers = [ maintainers.kalbasit ];
53
-
license = lib.licenses.unfree;
54
-
platforms = lib.platforms.linux ++ lib.platforms.darwin;
52
+
maintainers = with maintainers; [ kalbasit ];
53
+
license = licenses.unfree;
54
+
platforms = platforms.unix;
55
55
};
56
56
};
57
57
58
58
in {
59
59
charles4 = (generic {
60
-
version = "4.6.1";
61
-
sha256 = "1kl83jjj5wjhdpj34gcj04vf1asxlqlfx9zi91ln4v90swlaaclv";
60
+
version = "4.6.2";
61
+
sha256 = "0r5rann7cq665ih0pa66k52081gylk85ashrwq1khbv2jf80yy52";
62
62
platform = "_amd64";
63
63
jdk = jdk11;
64
64
});
···
68
68
jdk = jdk8.jre;
69
69
});
70
70
}
71
-
+3
-3
pkgs/applications/networking/cluster/fluxcd/default.nix
+3
-3
pkgs/applications/networking/cluster/fluxcd/default.nix
···
1
1
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
2
2
3
3
let
4
-
version = "0.16.0";
4
+
version = "0.16.1";
5
5
6
6
manifests = fetchzip {
7
7
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
···
19
19
owner = "fluxcd";
20
20
repo = "flux2";
21
21
rev = "v${version}";
22
-
sha256 = "sha256-r9Tg6aU8aIA87Mw+HFMdPe9uC+3bfGOnuAIrmB1nlRs=";
22
+
sha256 = "sha256-OjbyDg+3dSJco162NubK12pbmwib6uGlJQxVaJOzSig=";
23
23
};
24
24
25
-
vendorSha256 = "sha256-zaOOwgljqhmIXZPZSMgMsVi02bBqQOag+6uVhxKsu9U=";
25
+
vendorSha256 = "sha256-GPbuHv/Xi9sWWZ6SIlW8cm5bY1gTO41vygx2C8dEt0k=";
26
26
27
27
nativeBuildInputs = [ installShellFiles ];
28
28
+8
-4
pkgs/applications/networking/termius/default.nix
+8
-4
pkgs/applications/networking/termius/default.nix
···
12
12
13
13
stdenv.mkDerivation rec {
14
14
pname = "termius";
15
-
version = "7.1.0";
15
+
version = "7.15.1";
16
16
17
17
src = fetchurl {
18
-
url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb";
19
-
sha256 = "801579b931ca0ad5340085df8863042336e2b609dd1cd6771260c873f3d2bb73";
18
+
# Termius switched to using non-versioned downloads https://s3.amazonaws.com/termius.desktop.autoupdate/linux/Termius.deb
19
+
url = "https://web.archive.org/web/20210710174019/https://s3.amazonaws.com/termius.desktop.autoupdate/linux/Termius.deb";
20
+
sha256 = "16zc7ywz3hl1awkc4wk0rd94nsy55l98j2yzfdxcjiixky4gk8wn";
20
21
};
21
22
22
23
desktopItem = makeDesktopItem {
···
41
42
unpackPhase = "dpkg-deb -x $src .";
42
43
43
44
installPhase = ''
45
+
runHook preInstall
46
+
44
47
mkdir -p "$out/bin"
45
48
cp -R "opt" "$out"
46
49
cp -R "usr/share" "$out/share"
···
48
51
# Desktop file
49
52
mkdir -p "$out/share/applications"
50
53
cp "${desktopItem}/share/applications/"* "$out/share/applications"
54
+
55
+
runHook postInstall
51
56
'';
52
57
53
58
runtimeDependencies = [ (lib.getLib udev) ];
···
58
63
'';
59
64
60
65
meta = with lib; {
61
-
broken = true;
62
66
description = "A cross-platform SSH client with cloud data sync and more";
63
67
homepage = "https://termius.com/";
64
68
downloadPage = "https://termius.com/linux/";
+1
-1
pkgs/applications/virtualization/open-vm-tools/default.nix
+1
-1
pkgs/applications/virtualization/open-vm-tools/default.nix
···
82
82
better management of, and seamless user interactions with, guests.
83
83
'';
84
84
license = licenses.gpl2;
85
-
platforms = [ "x86_64-linux" "i686-linux" ];
85
+
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
86
86
maintainers = with maintainers; [ joamaki ];
87
87
};
88
88
}
+67
-57
pkgs/development/arduino/platformio/core.nix
+67
-57
pkgs/development/arduino/platformio/core.nix
···
1
-
{ stdenv, lib, buildPythonApplication
2
-
, ajsonrpc
3
-
, bottle
4
-
, click
5
-
, click-completion
6
-
, colorama
1
+
{ stdenv, lib, python3
2
+
, fetchFromGitHub
7
3
, git
8
-
, jsondiff
9
-
, lockfile
10
-
, marshmallow
11
-
, pyelftools
12
-
, pyserial
13
-
, pytest
14
-
, requests
15
-
, semantic-version
16
4
, spdx-license-list-data
17
-
, starlette
18
-
, tabulate
19
-
, tox
20
-
, uvicorn
21
-
, wsproto
22
-
, zeroconf
23
5
, version, src
24
6
}:
25
7
26
8
let
27
-
args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [
9
+
python = python3.override {
10
+
packageOverrides = self: super: {
11
+
aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
12
+
version = "0.6.0";
13
+
src = oldAttrs.src.override {
14
+
inherit version;
15
+
sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092";
16
+
};
17
+
});
18
+
19
+
click = super.click.overridePythonAttrs (oldAttrs: rec {
20
+
version = "7.1.2";
21
+
src = oldAttrs.src.override {
22
+
inherit version;
23
+
sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj";
24
+
};
25
+
});
26
+
27
+
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
28
+
version = "0.13.2";
29
+
src = fetchFromGitHub {
30
+
owner = "encode";
31
+
repo = "uvicorn";
32
+
rev = version;
33
+
sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9";
34
+
};
35
+
});
36
+
};
37
+
};
38
+
in
39
+
with python.pkgs; buildPythonApplication rec {
40
+
pname = "platformio";
41
+
inherit version src;
42
+
43
+
propagatedBuildInputs = [
44
+
ajsonrpc
45
+
bottle
46
+
click
47
+
click-completion
48
+
colorama
49
+
git
50
+
lockfile
51
+
marshmallow
52
+
pyelftools
53
+
pyserial
54
+
requests
55
+
semantic-version
56
+
starlette
57
+
tabulate
58
+
uvicorn
59
+
wsproto
60
+
zeroconf
61
+
];
62
+
63
+
HOME = "/tmp";
64
+
65
+
checkInputs = [
66
+
jsondiff
67
+
pytestCheckHook
68
+
tox
69
+
];
70
+
71
+
pytestFlagsArray = (map (e: "--deselect tests/${e}") [
28
72
"commands/test_ci.py::test_ci_boards"
29
73
"commands/test_ci.py::test_ci_build_dir"
30
74
"commands/test_ci.py::test_ci_keep_build_dir"
···
88
132
"commands/test_update.py"
89
133
"test_maintenance.py"
90
134
"test_ino2cpp.py"
91
-
]));
92
-
93
-
in buildPythonApplication rec {
94
-
pname = "platformio";
95
-
inherit version src;
96
-
97
-
propagatedBuildInputs = [
98
-
ajsonrpc
99
-
bottle
100
-
click
101
-
click-completion
102
-
colorama
103
-
git
104
-
lockfile
105
-
marshmallow
106
-
pyelftools
107
-
pyserial
108
-
requests
109
-
semantic-version
110
-
starlette
111
-
tabulate
112
-
uvicorn
113
-
wsproto
114
-
zeroconf
135
+
]) ++ [
136
+
"tests"
115
137
];
116
-
117
-
HOME = "/tmp";
118
-
119
-
checkInputs = [ pytest tox jsondiff ];
120
-
121
-
checkPhase = ''
122
-
runHook preCheck
123
-
124
-
py.test -v tests ${args}
125
-
126
-
runHook postCheck
127
-
'';
128
138
129
139
patches = [
130
140
./fix-searchpath.patch
+4
-2
pkgs/development/libraries/java/saxon/default.nix
+4
-2
pkgs/development/libraries/java/saxon/default.nix
···
1
-
{ lib, stdenv, fetchurl, unzip, jre }:
1
+
{ lib, stdenv, fetchurl, unzip, jre, jre8 }:
2
2
3
3
let
4
-
common = { pname, version, src, description
4
+
common = { pname, version, src, description, java ? jre
5
5
, prog ? null, jar ? null, license ? lib.licenses.mpl20 }:
6
6
stdenv.mkDerivation {
7
7
name = "${pname}-${version}";
···
45
45
description = "XSLT 1.0 processor";
46
46
# http://saxon.sourceforge.net/saxon6.5.3/conditions.html
47
47
license = lib.licenses.mpl10;
48
+
java = jre8;
48
49
};
49
50
50
51
saxonb_8_8 = common {
···
56
57
sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8";
57
58
};
58
59
description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0";
60
+
java = jre8;
59
61
};
60
62
61
63
saxonb_9_1 = common {
+3
-3
pkgs/development/tools/analysis/frama-c/default.nix
+3
-3
pkgs/development/tools/analysis/frama-c/default.nix
···
31
31
32
32
stdenv.mkDerivation rec {
33
33
pname = "frama-c";
34
-
version = "23.0-rc1";
34
+
version = "23.0";
35
35
slang = "Vanadium";
36
36
37
37
src = fetchurl {
38
-
url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
39
-
sha256 = "1z9f9a217bav3vfc99kq57d5rza6j7hr91ndviwkgcaib6wc5hcv";
38
+
url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
39
+
sha256 = "0pdm3y2nfyjhpnicv1pg9j48llq86dmb591d2imnafp4xfqani0s";
40
40
};
41
41
42
42
preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
+3
-3
pkgs/development/tools/stylua/default.nix
+3
-3
pkgs/development/tools/stylua/default.nix
···
8
8
9
9
rustPlatform.buildRustPackage rec {
10
10
pname = "stylua";
11
-
version = "0.9.3";
11
+
version = "0.10.0";
12
12
13
13
src = fetchFromGitHub {
14
14
owner = "johnnymorganz";
15
15
repo = pname;
16
16
rev = "v${version}";
17
-
sha256 = "1xpl3nxiln6hxxjd9nx99h4qijjym3afxm5nalw40p152h8zgig4";
17
+
sha256 = "03w976fghqs2kswab5bridpr2p6hgldjyfd3l4kz0p5h98f3wzvf";
18
18
};
19
19
20
-
cargoSha256 = "012zv1myackwk0x73l6ri7zzrzwdkd970hh4p30b590bmsam6sb9";
20
+
cargoSha256 = "1311ly02r6c2rqx0ssd6hpbw3sp0ffrf37bzdm66chxnh8cr83sj";
21
21
22
22
cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]
23
23
++ lib.optionals luauSupport [ "--features" "luau" ];
+1
-1
pkgs/games/dwarf-fortress/default.nix
+1
-1
pkgs/games/dwarf-fortress/default.nix
···
40
40
# The latest Dwarf Fortress version. Maintainers: when a new version comes
41
41
# out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
42
42
# this.
43
-
latestVersion = "0.47.04";
43
+
latestVersion = "0.47.05";
44
44
45
45
# Converts a version to a package name.
46
46
versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
+7
pkgs/games/dwarf-fortress/dfhack/default.nix
+7
pkgs/games/dwarf-fortress/dfhack/default.nix
···
71
71
xmlRev = "036b662a1bbc96b4911f3cbe74dfa1243b6459bc";
72
72
prerelease = false;
73
73
};
74
+
"0.47.05" = {
75
+
dfHackRelease = "0.47.05-r1";
76
+
sha256 = "sha256-B0iv7fpIcnaO8sx9wPqI7/WuyLK15p8UYlYIcF5F5bw=";
77
+
xmlRev = "11c379ffd31255f2a1415d98106114a46245e1c3";
78
+
prerelease = false;
79
+
};
80
+
74
81
};
75
82
76
83
release =
+14
pkgs/games/dwarf-fortress/game.json
+14
pkgs/games/dwarf-fortress/game.json
···
121
121
"legacy_s": "19ai7lvxx0y3iha9qrbl5krric547rzs6vm4ibk8x61vv97jrbd8",
122
122
"legacy32": "0lli6s1g7yj3p3h26ajgq3h619n88qn6s7amyz6z8w7hyzfi7wij",
123
123
"legacy32_s": "1wzxbzgln9pmsk2nchrl94d2yd09xdgynmjl4qwcaqzkrnf3sfqc"
124
+
},
125
+
"0.47.05": {
126
+
"linux": "18zwmz2nsgwjxbr2yd9jcrgw6l5b481hh1848cgn5nfpnzdscx5c",
127
+
"linux32": "1jbav7ghsjsxd6cdp6f2x5qn83zc8707dqan5sp73fp6mbj2jasl",
128
+
"osx": "092z1vhc5sbdc5irggdz5ai7rxifmg4yhy33aicpsjcnvcmajydw",
129
+
"osx32": "0lpbwfiagp0zp280aw3fmj8938w5fc5r9gibzk2h86jy63ps29ww",
130
+
"win": "0bbk7j3d4h2wn9hmbsbbbbr0ajf3ddlprxfaajfbnbiyv72cpn9s",
131
+
"win_s": "0nl7c9dpfx7jjpy7y52z8h3kiy4cpax1m58apbcfyy95an4jz8s4",
132
+
"win32": "08ka1lklly82h4mr770y9p0a21x9dx6jqvjgxdsxj5979f26il1v",
133
+
"win32_s": "06w844zxzx3lfykibgkk4gbg4xymnqraj1ikv4mzlv31l727a1x4",
134
+
"legacy": "042a0gbad3cp5dwhnrzg3vr9w48b8ybqgxgw5i9rk4c1i0gjjpw2",
135
+
"legacy_s": "1rb7h8lzlsjs08rvhhl3nwbrpj54zijijp4y0qdp4vyzsig6nisk",
136
+
"legacy32": "0ayw09x9smihh8qp5pdvr6vvhwkvcqz36h3lh4g1b5kzxj7g9cyf",
137
+
"legacy32_s": "10gfxlysfs9gyi1mv52idp5xk45g9h517g2jq4a8cqp2j7594v9c"
124
138
}
125
139
}
+2
-1
pkgs/games/dwarf-fortress/game.nix
+2
-1
pkgs/games/dwarf-fortress/game.nix
+20
-20
pkgs/games/dwarf-fortress/themes/themes.json
+20
-20
pkgs/games/dwarf-fortress/themes/themes.json
···
1
1
[
2
2
{
3
3
"name": "afro-graphics",
4
-
"version": "47.04",
5
-
"sha256": "1x1ir0qi3g8wgzwm1pnrkrqb6lhnjq87vs30l8kva6y5wr4sz7q0"
4
+
"version": "47.05",
5
+
"sha256": "0gqrxb4bbx1h93xjz4ygd7yp8g5barj2zc6y7xvr94ww8b9a2r28"
6
6
},
7
7
{
8
8
"name": "autoreiv",
···
21
21
},
22
22
{
23
23
"name": "gemset",
24
-
"version": "47.04",
25
-
"sha256": "015nkkdnpykhz6a1n8qi3wgap19a4wavz4n2xbvfa4g770lcjd92"
24
+
"version": "47.05",
25
+
"sha256": "1ivsbj71w3zwxnaz0405xhqhn4yzdfziijc0s0vmbmcphhhqnjaj"
26
26
},
27
27
{
28
28
"name": "ironhand",
29
-
"version": "47.04",
30
-
"sha256": "0x3hi1isgc2cv7c3qz87rm7ik0kbd748djpnghvjdqpj3a0n1ih2"
29
+
"version": "47.05",
30
+
"sha256": "003yrwishkzf6nvr6xlldbnd3x7rf5ds7l91mc0npdq1lcl0br9w"
31
31
},
32
32
{
33
33
"name": "jolly-bastion",
···
36
36
},
37
37
{
38
38
"name": "mayday",
39
-
"version": "47.04a",
40
-
"sha256": "1hpj40762n81grsddg3nc5jxc0bqmy2xamxvsgxzb2bx0b7akz0w"
39
+
"version": "47.05",
40
+
"sha256": "17sdvr9a98xx5r2nrr3m4jlddvlb4h6qlch8r23g9g4mj0hsifnj"
41
41
},
42
42
{
43
43
"name": "meph",
44
-
"version": "47.04_v5.5.0_V1.1.2",
45
-
"sha256": "0q8hfm66rag61qd2hab7lsr4nyg52bn1hvy6bl7z6kv4yj5cra50"
44
+
"version": "47.05_v5.5.1-V",
45
+
"sha256": "1kiqxiqw686dii5x7zav2nsw15csg0grv4h8hrb764rl4fw6x9nl"
46
46
},
47
47
{
48
48
"name": "obsidian",
49
-
"version": "47.04a",
50
-
"sha256": "0y5kmj362i9y8w1n5d1nx80yq88c0xqps9i02gvnls6r421a4nms"
49
+
"version": "47.05",
50
+
"sha256": "1dkwdwm52fsj4gqqqr5vppbsk8a4kd3i7d3qawawgl0qn6q139xs"
51
51
},
52
52
{
53
53
"name": "phoebus",
54
-
"version": "47.04a",
55
-
"sha256": "1ihbqs5a3b8pydbcynblvgw2bxkgr9hhpmgjlji7a7zvz8m6h6pw"
54
+
"version": "47.05",
55
+
"sha256": "18pn3dqyk9hp82gva92c6y3vk52s366rrx74rdnvahswdr5dmq4d"
56
56
},
57
57
{
58
58
"name": "rally-ho",
59
-
"version": "47.04",
60
-
"sha256": "0pmvpfbj07ll674lw7mjgkb4kgjk4mxr82fjq4ppvwrnzx6vi2g0"
59
+
"version": "47.05",
60
+
"sha256": "1h3jqq0yq2rbzbl70sq85lgdpwswczpay16kqfwq1n8zdisl4gqn"
61
61
},
62
62
{
63
63
"name": "spacefox",
64
-
"version": "47.04",
65
-
"sha256": "0sk3k5bcpfl2xind4vfrgzbcqqbw0mg47pm3d3h44vi6hl3bdaqj"
64
+
"version": "47.05a",
65
+
"sha256": "1y1rbsxr1m0mb2k02q6gh24c4nyqc9lw98dvfckp2bzc5f9cx3ks"
66
66
},
67
67
{
68
68
"name": "taffer",
···
76
76
},
77
77
{
78
78
"name": "vettlingr",
79
-
"version": "1.4a",
80
-
"sha256": "1p4y0dm52rb49dnmcnivddlsd94m4gr1pxn04fpjbrvck22klgpj"
79
+
"version": "47.05",
80
+
"sha256": "0s1vy3ssp1hk8f6wlkz09xy5v747dpbsgw5vi6i1mq3lnlcy68vq"
81
81
},
82
82
{
83
83
"name": "wanderlust",
+6
pkgs/games/dwarf-fortress/twbt/default.nix
+6
pkgs/games/dwarf-fortress/twbt/default.nix
···
50
50
sha256 = "092dgp8fh1j4nqr9wbzn89ib1nhscclr8m91lfxsvg0mgn7j8xlv";
51
51
prerelease = true;
52
52
};
53
+
"0.47.05" = {
54
+
twbtRelease = "6.xx";
55
+
dfhackRelease = "0.47.05-beta1";
56
+
sha256 = "sha256-Y6G0qBMHvotp/oyiqANlzXZVklL270dhskd135PnE9Q=";
57
+
prerelease = true;
58
+
};
53
59
};
54
60
55
61
release =
+12
-2
pkgs/games/dwarf-fortress/unfuck.nix
+12
-2
pkgs/games/dwarf-fortress/unfuck.nix
···
12
12
, ncurses
13
13
, glib
14
14
, gtk2
15
+
, gtk3
15
16
, libsndfile
16
17
, zlib
17
18
, dfVersion
···
58
59
unfuckRelease = "0.47.04";
59
60
sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9";
60
61
};
62
+
"0.47.05" = {
63
+
unfuckRelease = "0.47.04";
64
+
sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9";
65
+
};
61
66
};
62
67
63
68
release =
···
90
95
glew
91
96
openalSoft
92
97
ncurses
93
-
gtk2
94
98
libsndfile
95
99
zlib
96
100
libGL
97
-
];
101
+
]
102
+
# switched to gtk3 in 0.47.05
103
+
++ (if lib.versionOlder release.unfuckRelease "0.47.05" then [
104
+
gtk2
105
+
] else [
106
+
gtk3
107
+
]);
98
108
99
109
# Don't strip unused symbols; dfhack hooks into some of them.
100
110
dontStrip = true;
+3
-3
pkgs/games/papermc/default.nix
+3
-3
pkgs/games/papermc/default.nix
···
1
1
{ lib, stdenv, fetchurl, bash, jre }:
2
2
let
3
-
mcVersion = "1.16.5";
4
-
buildNum = "771";
3
+
mcVersion = "1.17.1";
4
+
buildNum = "97";
5
5
jar = fetchurl {
6
6
url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
7
-
sha256 = "1lmlfhigbzbkgzfq6knglka0ccf4i32ch25gkny0c5fllmsnm08l";
7
+
sha256 = "sha256:0d7q6v5w872phcgkha7j5sxniqq9wqbh1jxdvyvy6d2jl74g1gzw";
8
8
};
9
9
in stdenv.mkDerivation {
10
10
pname = "papermc";
+12
pkgs/misc/vim-plugins/generated.nix
+12
pkgs/misc/vim-plugins/generated.nix
···
1508
1508
meta.homepage = "https://github.com/konfekt/fastfold/";
1509
1509
};
1510
1510
1511
+
feline-nvim = buildVimPluginFrom2Nix {
1512
+
pname = "feline-nvim";
1513
+
version = "2021-07-11";
1514
+
src = fetchFromGitHub {
1515
+
owner = "famiu";
1516
+
repo = "feline.nvim";
1517
+
rev = "4c04c967691d028b4056f726735db329039cdff2";
1518
+
sha256 = "18z9dl58mfmffysr8g5drd6iy79fwn463lagp629cdghrjxcq65c";
1519
+
};
1520
+
meta.homepage = "https://github.com/famiu/feline.nvim/";
1521
+
};
1522
+
1511
1523
fennel-vim = buildVimPluginFrom2Nix {
1512
1524
pname = "fennel-vim";
1513
1525
version = "2020-11-15";
+1
pkgs/misc/vim-plugins/vim-plugin-names
+1
pkgs/misc/vim-plugins/vim-plugin-names
+1
-1
pkgs/os-specific/linux/kernel/manual-config.nix
+1
-1
pkgs/os-specific/linux/kernel/manual-config.nix
···
119
119
# This way kernels can be bit-by-bit reproducible depending on settings
120
120
# (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled).
121
121
# See also https://kernelnewbies.org/BuildId
122
-
sed -i Makefile -e 's|--build-id|--build-id=none|'
122
+
sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|'
123
123
124
124
patchShebangs scripts/ld-version.sh
125
125
'';
+2
-2
pkgs/tools/misc/cod/default.nix
+2
-2
pkgs/tools/misc/cod/default.nix
···
13
13
14
14
vendorSha256 = "0ann1fbh8rqys3rwbz5h9mfnvkpqiw5rgkd4c30y99706h2dzv4i";
15
15
16
-
buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ];
16
+
ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ];
17
17
18
18
doCheck = false;
19
19
20
20
meta = with lib; {
21
21
description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output";
22
-
homepage = src.meta.homepage;
22
+
homepage = "https://github.com/dim-an/cod/";
23
23
license = licenses.asl20;
24
24
maintainers = with maintainers; [ SuperSandro2000 ];
25
25
};
+15
-4
pkgs/tools/misc/esphome/default.nix
+15
-4
pkgs/tools/misc/esphome/default.nix
···
8
8
}:
9
9
10
10
let
11
-
esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
11
+
python = python3.override {
12
+
packageOverrides = self: super: {
13
+
esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
14
+
};
15
+
};
12
16
in
13
-
python3.pkgs.buildPythonApplication rec {
17
+
with python.pkgs; buildPythonApplication rec {
14
18
pname = "esphome";
15
19
version = "1.19.4";
16
20
···
49
53
# They have validation functions like:
50
54
# - validate_cryptography_installed
51
55
# - validate_pillow_installed
52
-
propagatedBuildInputs = with python3.pkgs; [
56
+
propagatedBuildInputs = [
53
57
click
54
58
colorama
55
59
cryptography
···
73
77
"--set ESPHOME_USE_SUBPROCESS ''"
74
78
];
75
79
76
-
checkInputs = with python3.pkgs; [
80
+
checkInputs = [
77
81
hypothesis
78
82
mock
79
83
pytest-asyncio
80
84
pytest-mock
81
85
pytest-sugar
82
86
pytestCheckHook
87
+
];
88
+
89
+
disabledTestPaths = [
90
+
# requires hypothesis 5.49, we have 6.x
91
+
# ImportError: cannot import name 'ip_addresses' from 'hypothesis.provisional'
92
+
"tests/unit_tests/test_core.py"
93
+
"tests/unit_tests/test_helpers.py"
83
94
];
84
95
85
96
postCheck = ''
+46
-5
pkgs/tools/misc/infracost/default.nix
+46
-5
pkgs/tools/misc/infracost/default.nix
···
1
-
{ lib, buildGoModule, fetchFromGitHub, terraform }:
1
+
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, terraform }:
2
2
3
3
buildGoModule rec {
4
4
pname = "infracost";
···
10
10
repo = "infracost";
11
11
sha256 = "sha256-3AH/VUKIno/jObep5GNfIpyOW5TcfZ5UZyornJWTGOw=";
12
12
};
13
+
vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8=";
13
14
14
-
vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8=";
15
+
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
16
+
17
+
# Install completions post-install
18
+
nativeBuildInputs = [ installShellFiles ];
15
19
16
20
checkInputs = [ terraform ];
17
-
checkPhase = "make test";
21
+
checkPhase = ''
22
+
runHook preCheck
23
+
make test
24
+
runHook postCheck
25
+
'';
26
+
27
+
postInstall = ''
28
+
# panic if .config directory can't be accessed
29
+
# https://github.com/infracost/infracost/pull/862
30
+
export HOME="$TMPDIR"
31
+
mkdir -p "$HOME/.config/infracost"
32
+
export INFRACOST_SKIP_UPDATE_CHECK=true
33
+
34
+
installShellCompletion --cmd infracost \
35
+
--bash <($out/bin/infracost completion --shell bash) \
36
+
--fish <($out/bin/infracost completion --shell fish) \
37
+
--zsh <($out/bin/infracost completion --shell zsh)
38
+
'';
39
+
40
+
doInstallCheck = true;
41
+
installCheckPhase = ''
42
+
runHook preInstallCheck
43
+
44
+
export HOME="$TMPDIR"
45
+
mkdir -p "$HOME/.config/infracost"
46
+
export INFRACOST_SKIP_UPDATE_CHECK=true
47
+
48
+
$out/bin/infracost --help
49
+
$out/bin/infracost --version | grep "v${version}"
50
+
51
+
runHook postInstallCheck
52
+
'';
18
53
19
54
meta = with lib; {
55
+
homepage = "https://infracost.io";
56
+
changelog = "https://github.com/infracost/infracost/releases/tag/v${version}";
20
57
description = "Cloud cost estimates for Terraform in your CLI and pull requests";
21
-
homepage = "https://github.com/infracost/infracost";
58
+
longDescription = ''
59
+
Infracost shows hourly and monthly cost estimates for a Terraform project.
60
+
This helps developers, DevOps et al. quickly see the cost breakdown and
61
+
compare different deployment options upfront.
62
+
'';
22
63
license = [ licenses.asl20 ];
23
-
maintainers = [ maintainers.davegallant ];
64
+
maintainers = with maintainers; [ davegallant jk ];
24
65
};
25
66
}
+20
pkgs/tools/misc/lilo/default.nix
+20
pkgs/tools/misc/lilo/default.nix
···
1
+
{ stdenv, lib, fetchurl, dev86, sharutils }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "lilo";
5
+
version = "24.2";
6
+
src = fetchurl {
7
+
url = "https://www.joonet.de/lilo/ftp/sources/${pname}-${version}.tar.gz";
8
+
hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE=";
9
+
};
10
+
nativeBuildInputs = [ dev86 sharutils ];
11
+
DESTDIR = placeholder "out";
12
+
13
+
meta = with lib; {
14
+
homepage = "https://www.joonet.de/lilo/";
15
+
description = "Linux bootloader";
16
+
license = licenses.bsd3;
17
+
platforms = platforms.linux;
18
+
maintainers = with maintainers; [ kaction ];
19
+
};
20
+
}
+8
-8
pkgs/tools/security/wpscan/Gemfile.lock
+8
-8
pkgs/tools/security/wpscan/Gemfile.lock
···
1
1
GEM
2
2
remote: https://rubygems.org/
3
3
specs:
4
-
activesupport (6.1.3.2)
4
+
activesupport (6.1.4)
5
5
concurrent-ruby (~> 1.0, >= 1.0.2)
6
6
i18n (>= 1.6, < 2)
7
7
minitest (>= 5.1)
···
9
9
zeitwerk (~> 2.3)
10
10
addressable (2.7.0)
11
11
public_suffix (>= 2.0.2, < 5.0)
12
-
cms_scanner (0.13.4)
12
+
cms_scanner (0.13.5)
13
13
ethon (~> 0.14.0)
14
14
get_process_mem (~> 0.2.5)
15
-
nokogiri (~> 1.11.0)
15
+
nokogiri (~> 1.11.4)
16
16
opt_parse_validator (~> 1.9.4)
17
17
public_suffix (~> 4.0.3)
18
18
ruby-progressbar (>= 1.10, < 1.12)
···
20
20
typhoeus (>= 1.3, < 1.5)
21
21
xmlrpc (~> 0.3)
22
22
yajl-ruby (~> 1.4.1)
23
-
concurrent-ruby (1.1.8)
23
+
concurrent-ruby (1.1.9)
24
24
ethon (0.14.0)
25
25
ffi (>= 1.15.0)
26
-
ffi (1.15.1)
26
+
ffi (1.15.3)
27
27
get_process_mem (0.2.7)
28
28
ffi (~> 1.0)
29
29
i18n (1.8.10)
30
30
concurrent-ruby (~> 1.0)
31
31
mini_portile2 (2.5.3)
32
32
minitest (5.14.4)
33
-
nokogiri (1.11.6)
33
+
nokogiri (1.11.7)
34
34
mini_portile2 (~> 2.5.0)
35
35
racc (~> 1.4)
36
36
opt_parse_validator (1.9.4)
···
46
46
tzinfo (2.0.4)
47
47
concurrent-ruby (~> 1.0)
48
48
webrick (1.7.0)
49
-
wpscan (3.8.17)
50
-
cms_scanner (~> 0.13.3)
49
+
wpscan (3.8.18)
50
+
cms_scanner (~> 0.13.5)
51
51
xmlrpc (0.3.2)
52
52
webrick
53
53
yajl-ruby (1.4.1)
+5
-3
pkgs/tools/security/wpscan/default.nix
+5
-3
pkgs/tools/security/wpscan/default.nix
···
11
11
--prefix PATH : ${lib.makeBinPath [ curl ]}
12
12
'';
13
13
14
+
passthru.updateScript = ./update.sh;
15
+
14
16
meta = with lib; {
15
17
description = "Black box WordPress vulnerability scanner";
16
-
homepage = "https://wpscan.org/";
17
-
license = licenses.unfreeRedistributable;
18
+
homepage = "https://wpscan.org/";
19
+
license = licenses.unfreeRedistributable;
18
20
maintainers = with maintainers; [ nyanloutre manveru ];
19
-
platforms = platforms.unix;
21
+
platforms = platforms.unix;
20
22
};
21
23
}
+12
-12
pkgs/tools/security/wpscan/gemset.nix
+12
-12
pkgs/tools/security/wpscan/gemset.nix
···
5
5
platforms = [];
6
6
source = {
7
7
remotes = ["https://rubygems.org"];
8
-
sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr";
8
+
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
9
9
type = "gem";
10
10
};
11
-
version = "6.1.3.2";
11
+
version = "6.1.4";
12
12
};
13
13
addressable = {
14
14
dependencies = ["public_suffix"];
···
27
27
platforms = [];
28
28
source = {
29
29
remotes = ["https://rubygems.org"];
30
-
sha256 = "1xzkbk6a93sdhshzlkx1dcpln3fcw2apccb7g6jha0g1im7yhgcj";
30
+
sha256 = "15qh28drxkyv294l1qcpsghfa875p71q0vkmmv5l6fbmpapmllrk";
31
31
type = "gem";
32
32
};
33
-
version = "0.13.4";
33
+
version = "0.13.5";
34
34
};
35
35
concurrent-ruby = {
36
36
groups = ["default"];
37
37
platforms = [];
38
38
source = {
39
39
remotes = ["https://rubygems.org"];
40
-
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
40
+
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
41
41
type = "gem";
42
42
};
43
-
version = "1.1.8";
43
+
version = "1.1.9";
44
44
};
45
45
ethon = {
46
46
dependencies = ["ffi"];
···
58
58
platforms = [];
59
59
source = {
60
60
remotes = ["https://rubygems.org"];
61
-
sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi";
61
+
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
62
62
type = "gem";
63
63
};
64
-
version = "1.15.1";
64
+
version = "1.15.3";
65
65
};
66
66
get_process_mem = {
67
67
dependencies = ["ffi"];
···
111
111
platforms = [];
112
112
source = {
113
113
remotes = ["https://rubygems.org"];
114
-
sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";
114
+
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
115
115
type = "gem";
116
116
};
117
-
version = "1.11.6";
117
+
version = "1.11.7";
118
118
};
119
119
opt_parse_validator = {
120
120
dependencies = ["activesupport" "addressable"];
···
206
206
platforms = [];
207
207
source = {
208
208
remotes = ["https://rubygems.org"];
209
-
sha256 = "0jdn2v5cmxlzq9nkzh5lqnqr0mbiyn87g6bfc0074m19m38g19r9";
209
+
sha256 = "01ig3fbxxm0gnvqkzmsc4zcipijprrw5xs84rnwp50w0crww842c";
210
210
type = "gem";
211
211
};
212
-
version = "3.8.17";
212
+
version = "3.8.18";
213
213
};
214
214
xmlrpc = {
215
215
dependencies = ["webrick"];
+11
pkgs/tools/security/wpscan/update.sh
+11
pkgs/tools/security/wpscan/update.sh
···
1
+
#!/usr/bin/env nix-shell
2
+
#! nix-shell -i bash -p bash bundix bundler
3
+
4
+
set -e
5
+
6
+
cd "$(dirname "${BASH_SOURCE[0]}")"
7
+
8
+
rm -f Gemfile.lock Gemfile.lock
9
+
bundler lock
10
+
BUNDLE_GEMFILE=Gemfile bundler lock --lockfile=Gemfile.lock
11
+
bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix