cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Jan Tojnar 2022-09-08 13:02:48 +02:00
commit 0fb668fe0a
38 changed files with 350 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/audio/puddletag/default.nix
View file

@ -39,6 +39,7 @@ python3Packages.buildPythonApplication rec {
--replace share/pixmaps share/icons --replace share/pixmaps share/icons
cp requirements.in requirements.txt cp requirements.in requirements.txt
sed -i requirements.txt -e 's/^chromaprint$//'
'' + lib.concatMapStringsSep "\n" '' + lib.concatMapStringsSep "\n"
(e: '' (e: ''
sed -i requirements.txt -e 's/^${e}.*/${e}/' sed -i requirements.txt -e 's/^${e}.*/${e}/'
@ -49,7 +50,6 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
pyacoustid pyacoustid
chromaprint
configobj configobj
levenshtein levenshtein
lxml lxml

4
pkgs/applications/networking/cluster/argocd-autopilot/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "argocd-autopilot"; pname = "argocd-autopilot";
version = "0.4.5"; version = "0.4.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj-labs"; owner = "argoproj-labs";
repo = "argocd-autopilot"; repo = "argocd-autopilot";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-0UQpqQ0qvBuTGI6xG+y/f9JijA4CukdqvQbr0KFir1c="; sha256 = "sha256-qlxs0dafmGbJdsBgFJGpaEkcKVyOoSeiQknqzJwUs8A=";
}; };
vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q="; vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q=";

4
pkgs/applications/networking/flexget/default.nix
View file

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "flexget"; pname = "flexget";
version = "3.3.24"; version = "3.3.25";
# Fetch from GitHub in order to use `requirements.in` # Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flexget"; owner = "flexget";
repo = "flexget"; repo = "flexget";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-AjYX9f7v6lxMO6vTjAanDMluvGDAvTwcvcq/fwMzSfk="; hash = "sha256-kfpri6AFNb9GcAIDVhFV1uSDSNNSopReWRKuvWifcTU=";
}; };
postPatch = '' postPatch = ''

6
pkgs/applications/networking/juju/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "juju"; pname = "juju";
version = "2.9.33"; version = "2.9.34";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juju"; owner = "juju";
repo = "juju"; repo = "juju";
rev = "juju-${version}"; rev = "juju-${version}";
sha256 = "sha256-BK5fTPV4glBg4a4QI5L3ZBmWYGrfLDx6hAOzlNbMxJU="; sha256 = "sha256-oytnWzIsxLOeQvy1iSWysyMQuJ3vTnv7Ot9izOvgPHg=";
}; };
vendorSha256 = "sha256-xBlGqHmAX08LlHmZ9Vr+j06Cf2soIPDFJKZh36ku8cw="; vendorSha256 = "sha256-1/EnIPUufPwJqH24mqok5ijMenaPUldHBx8dOydECj8=";
# Disable tests because it attempts to use a mongodb instance # Disable tests because it attempts to use a mongodb instance
doCheck = false; doCheck = false;

5
pkgs/applications/virtualization/crun/default.nix
View file

@ -11,7 +11,6 @@
, yajl , yajl
, nixosTests , nixosTests
, criu , criu
, fetchpatch
}: }:
let let
@ -39,13 +38,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crun"; pname = "crun";
version = "1.5"; version = "1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-eirCENgt25VRPub7c9cxYQ1uFxYbzm75cJ1v4r6O/+k="; sha256 = "sha256-JO07bF2Xucz8lSvj7om17a/NT0I7Vru1vayZhPDFLIw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/applications/virtualization/ecs-agent/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "amazon-ecs-agent"; pname = "amazon-ecs-agent";
version = "1.62.2"; version = "1.63.0";
goPackagePath = "github.com/aws/${pname}"; goPackagePath = "github.com/aws/${pname}";
subPackages = [ "agent" ]; subPackages = [ "agent" ];
@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}"; rev = "v${version}";
owner = "aws"; owner = "aws";
repo = pname; repo = pname;
sha256 = "sha256-pxlszIIxq86Dnz+lnD8s9QUJSbx6lpMutHd7gXeqcJ4="; sha256 = "sha256-SDDfwFnnoq2fCeg+wfJsczXb4dDChgyfsNrZkwGMHCc=";
}; };
meta = with lib; { meta = with lib; {

106
pkgs/data/fonts/nerdfonts/shas.nix
View file

@ -1,55 +1,55 @@
{ {
"3270" = "1bzrgc3iksm9n8gxljwbgzm0ch115vvafiwrih2n5caz8wvs86qn"; "3270" = "0k33cnwbsi9wkrmfm4ps455gg81ihlldmk5mk4k9p7bkvxzcgpb9";
"Agave" = "1xkl9xjqlm1g2864sf4z5bcxhfaxmszvhm4lbp6cnkzg0m1chypj"; "Agave" = "1xnhl8idwx1ivj8k1dnz1ca4k1cx2irbazavr1b2zlixxbjq2vhq";
"AnonymousPro" = "1g8p6g9rfm7adazii5swrn1m0w733wlbclqq4r0xbykn1gdghbmz"; "AnonymousPro" = "01ab38j5wnkjjfh91van4p7s3qb0rmdbcah9njmxj7swqr30q66r";
"Arimo" = "01gijkyfs97ij7iraajgbkvhnj1cxjyppw9q5y67fwgz8wa22q2j"; "Arimo" = "0p3dh1sgpq1gjlz0blav8j5jf9gsrg4pg63qk0raw3kyzpwp9liq";
"AurulentSansMono" = "1hy8gf2h552vr4fnr53pn5biqnwakw15yqwlswi8g4l3jxp0f1xi"; "AurulentSansMono" = "06hi0xravvpmzww2i233jzf3nrqwkxmmybbpcamwswbgxg2sakc8";
"BigBlueTerminal" = "0avczgq4dl1kgyp0c7j53asmqmggjd9cmcq190fc4n10d7g6n98w"; "BigBlueTerminal" = "0pizwa8mf2mlzh85zxfy0ns7rk1792fvjgj2ldvz4kryjj3sdi4f";
"BitstreamVeraSansMono" = "1k01qsgsyqazlyl4z3qswq4rd8nh8ksarhrrjn1z88h150ynd3lh"; "BitstreamVeraSansMono" = "1664srkg1i1n7w1iv93a25bg588qxqgpdnw1prf3gryl5zxj5wcd";
"CascadiaCode" = "0r8c93f6ysqwl6bsb3avjnhx20fcxz6ng0mwddhcaz14dhl9y0q6"; "CascadiaCode" = "01q4kdmb6wz3rjph3i12i7rhiipj9vfzmlbxmvcmvxdvnq5g5x5l";
"CodeNewRoman" = "1b1lb66pxalhmr64y0vc75n1ngwkllsam771qwsjycr6crraqzjm"; "CodeNewRoman" = "0sw4hnr36l2yb3yhgxkmrn98ch6ywkxfqybv7vdqh1g44l81fx6z";
"Cousine" = "172aagpkfzdnja7dpvlampjzgw9w3r0pd8z0ppnkhj98xcpk680d"; "Cousine" = "1w2m7sgm0f9kzhbkd7hfb63n3y7kv4m3j97a52imp5sk6w4gc3w4";
"DaddyTimeMono" = "1khfqbicxl19dh1hky541vk1n0j41w2qaxw4ih8z8hdzdwz8frz0"; "DaddyTimeMono" = "1vs0cvdhyrn7dhd1q58bnpz5vk1i0bnx31ijydkpdl09y9nfg60q";
"DejaVuSansMono" = "1s40g91frl0ngak0q0qp0vh9nbkh22mlf25ly248aq46k3kqswv6"; "DejaVuSansMono" = "0hl4ajgqlx3vlgbdzm6817n3hq1xnyjj2gazv5xl7w3n98cvnpph";
"DroidSansMono" = "1m2pnhs9rlf4kspxk0x3c22v0c1byidblmhm2b0kg284jjml9rql"; "DroidSansMono" = "14i1ssd2c67dnkg67lbv4dxsnidbg9fqnn4jn4bz7ll9yz3g1zmn";
"FantasqueSansMono" = "0yslgnr1gjqx4bm9ld7z9lmqqvivswqx5byilggr42v1m7dnayc1"; "FantasqueSansMono" = "1sfw2x9g30qbivn6ixlafazp2bcxndjy27wfc8xz8da7df14qdww";
"FiraCode" = "0bwfxrkpjpgh832bprch4kzrr03d0raf3cgl7n3w3n8a4d806hb3"; "FiraCode" = "1653r5bcsgkrxfncv02fpp4iw9k608hg6fnqg6s8mks2gip2w610";
"FiraMono" = "08swhnqyz334202dcd8dzjf800kd3n3dq26wajmcphlps269y2p6"; "FiraMono" = "1hrac6asm7rppm4nslfcr9vx53xhhyanqknqzcixf2zy19ggizr9";
"FontPatcher" = "1icakcp6p805d2afa5vaynrhyxsvl7p1j2dyfgxplqgsfclj2cs1"; "FontPatcher" = "1s9mrm3bfs1s3syx4jbqgcc7f5dx7xand3cxdcqr8p002aba9ds9";
"Go-Mono" = "01yy8mcffa6pz6hj6cwrdlsqhc6fbsnd2npqzi8zlx32qdzsrkj3"; "Go-Mono" = "00lcl89f3730mg4vvm4kj96v9q15wkpqqdhy5lhsxbrhzg4f3qxa";
"Gohu" = "0dyxam4rmpfjw59x5b2c1mdg3jcvjsgjcdpw83gih261d05kmx13"; "Gohu" = "1nv2s3x40rdj5bc8w65y0gbjwdxwa2fvkbxvqqaqn3slylcx95w7";
"Hack" = "0rjxy98b16qxam8nr00cj4cd82jq0r23p2wymn9g3vy6bl836bvl"; "Hack" = "1csr6gfkfc1zq7r6kq851apd9yy7vlyqa06dx8q4h7ym11nin0qz";
"Hasklig" = "0qpq14allkr3x5i1sfbpaa9n6ilb6f9hy4z5r0i2vj1qbksbdffb"; "Hasklig" = "00jm7dfh66ip8cmrxq9fq60hhncivijjvyayx5yc63y1vzfgp08s";
"HeavyData" = "1zk4vilqq1v5hw687an57mf1msrj6iyin1kbm4b38jcq1d7wc5sp"; "HeavyData" = "12pm75w65mgjmmkfxbqv5k78k7jnvpmphywpc6k852wj72f09dl1";
"Hermit" = "043hqz5mxjghpfg5kninavy6p24r4i4ryhj89bhpwrgq6vbpbk7l"; "Hermit" = "0mqy6c94smi900zhc1liml8z4h1a5if9n0fvd0afiidpmpb7x02l";
"iA-Writer" = "0l3bbpdiw20vxqmpaf42zvcsj08hjl644qjkpp9z53a184jxsad5"; "iA-Writer" = "173wdcqw7aqwnsrg1af902fa4jvyix35n0a4cwabbj4x28516liq";
"IBMPlexMono" = "00cib33fxwdq48b26hm3vg6svwmmpr7rb537002h21ykvyw7my2n"; "IBMPlexMono" = "0fadrcjiribzk3vcc3k80bddffr63b28ikrv9qrppbkwc846xiq5";
"Inconsolata" = "00y47m077pwhx4165ifgdqxbdsigy0y6f9p6y4py8qz8jnfimc9i"; "Inconsolata" = "18sndnds39j7af8hj1v20jky79mln50l6rab60fgq8a5v01kbkls";
"InconsolataGo" = "103lf5dy65k6ik87sr91iji44ali81mf18af7vw8qr5w9j3v88m1"; "InconsolataGo" = "1gbbbgyka597ygmdxd65hphsvhx1rp0g13hsr2r88rw08iavqg16";
"InconsolataLGC" = "0f598lnywpv8s6m9dzhklk490f5lq5ykfxaql9q6yp5fg7d9pc6z"; "InconsolataLGC" = "1izxzlsgdiz10rbf0kbrcjc8cy7nvsnkcb4fpcq4k95n7kl6mpck";
"Iosevka" = "14mk8n7w2mjdrwzz4hf3zdkqvkm2zkk3l91kx0lldyfyapdz0z1i"; "Iosevka" = "0cb9qpnnr5n0h628xv7b2ir76j1mcz9rscx9prqavasnhz963in9";
"JetBrainsMono" = "1f0x9zpmvsr4hmxchxpyy470qrcl232ljd13dhf6skm50702vpar"; "JetBrainsMono" = "0yzfha4i7di90631axyqcqgbc95x3lhnp6l3a36rw5qx11c6r6wb";
"Lekton" = "0zj7rvz9bi9apsb068vf04lhggif78s4mwvgi85vpi8wsncj2df5"; "Lekton" = "04sgkdds9cgw60z0a2gb13sfm0vkiv172j9biv9f0a70bn0bxkda";
"LiberationMono" = "0syx7jgglxvaif7rp0kh1ywyyza5frssd20zphj42bdf6pcladgm"; "LiberationMono" = "0aq2bjkxic78d59zn9wqnjb9yqmpr1w19lm73wh5xssaqbxr590n";
"Lilex" = "0gxlmylri3251zd76hkql6ck7x07x5yn3jcbg8ccq1vnw402v1vl"; "Lilex" = "0b56dq7nfmx8l47cgx6p39vbhnhf0w0kh06s6zavrgv0v6g2h0rg";
"Meslo" = "160z4v8pvpqk1zw1flanspcdmjb5bdpfmhkz8gv6ywflmlhnf87s"; "Meslo" = "0wjfd1kf442cw1c1zqjydf8pg2ajl2h0is3ilnvbyi1d8jr3pp59";
"Monofur" = "125bnmz2a0xm1qcyqpf72cm44bw5rqf06mcp8n982md27lckypcn"; "Monofur" = "1lmkaz72yc6azk32qbcv34bwj3fwkdh2dy4ik0zaxbld186gmwyi";
"Monoid" = "1zr6wh3zkgm5azys75szbzagnkj840czzz50fs8j5vi2j5x1gqzx"; "Monoid" = "0kay83hwbl5k2kl8ms34m5bidigclrf3cppxh73w6y82y8vgi2wz";
"Mononoki" = "15g910k4w5gdd6c4hrnxapb2irbpnlx2yvhmifnmmisyrvzpqdg1"; "Mononoki" = "01cxiimrsk8bznv7jbnvl1klyva6f91s7rn1sl0wzj0sjxli9lnn";
"MPlus" = "0f5s9jxk7c9g9h5vrfh4b14w5pfzpidna8k5zpaqj1xz8m80ry98"; "MPlus" = "1z1r7i1fpbglkplpllljakms5080vzqz2yjx5f3xyggixj9c1gnw";
"NerdFontsSymbolsOnly" = "0qxx0p4fija26aqya8az9vjwprbncjdpl9cnl756ap8db8ymrf4q"; "NerdFontsSymbolsOnly" = "1nb9bhl16lwvr58phcj0hyrzdxqv45gycj6a1nl95pcqy76a06zz";
"Noto" = "03q8sar4vw0fscrvmnphr82mgh6ijgmsmw04ci4x4kz0371zbvbs"; "Noto" = "1wjz60pjs6h1wkwrblw3afs6bafj8zmdy3fan9xlrmh9wp15l0qg";
"OpenDyslexic" = "13yg3skw55vi721mbymcnyxwmlf92jzwankj7ggf6fzmmw9r72j8"; "OpenDyslexic" = "07q50mdg6axs5957h0ggn6krk9hcxiyr2fh9cfw1ybnh979425fx";
"Overpass" = "0rnwzvd1zfwybf1gvxbqac4nl2rb2fpdpjj86qrydrjnszd5r1rf"; "Overpass" = "0kxw9qqp9a9nh5ir0ll34965k15nyrs708ffry6bvccy6sl723n4";
"ProFont" = "0fkhzkqs3srsdhi3rgpvsqdifhsbfydw8q5h2s40v6jqaq6i7pv0"; "ProFont" = "04dy3rngh4c4a2yy8b6pyh0ck6xmiwxwhbbgm77bdspp40b5m9bc";
"ProggyClean" = "0smdg5sawy5ykph0whj2q4s89c08czfdfp7w5ipc3pzq598d0ahz"; "ProggyClean" = "0jzs0qiav8fqiz69djl14sa06j5q3mcnprwl52gki3wbbp0inshr";
"RobotoMono" = "0wy99prkr1anhc5d1gd4dbvvi2krhcjh4nx9ib2fvw374fmys4mx"; "RobotoMono" = "1grszlqbwdb27d02g4gcyiqbz2sigzqhs0m3fvapq7by9pp2cwq6";
"ShareTechMono" = "09xg72wgkgl68hygbzndvizjshnir661jwz0iyx0nhsqsmfpg8gh"; "ShareTechMono" = "1m3hy87wbxdf2zljygns9876m30xkvf81vcv2fvd0kg79lll84vp";
"SourceCodePro" = "1g9kj8gpsc3lqj8cik7zisfsm28jvmh29r399wc4aaaz41hcpigr"; "SourceCodePro" = "0cf7a1v5hi7wg50wh886d84fql4jbm504v1mzkzdwfy70j7l8dm7";
"SpaceMono" = "128pg00ay5n2havfjk116a0gfqqdlm5xy30akgjszhgsnpfg214x"; "SpaceMono" = "1a3srh177r80190sa4jswp2paqasv0fsx09i2vkzqms07pd69j7p";
"Terminus" = "02yf6id9nnxm2li1s9izvcbqzrhznh1041lh604dvkxqnnriq6n4"; "Terminus" = "1qa9hjjjw3xn4qk5sqifxd87q5xgawwd9d2yh62b9n1rpgi37cip";
"Tinos" = "0ksx8x4917kl7h6y4lk7mwq1s2ag5zjjyz9amc2w80qxfdqwgc1m"; "Tinos" = "14kpcimzrx1zzv4y0w78n2kdl83hm33vmprikg1cmbbypn0k2d9y";
"Ubuntu" = "1mlkpsnwj5bgkw1671v939pnb1shk31nj6pm7p73bjrvihwgdbwz"; "Ubuntu" = "0hc71ybi7bnbblzzn86p4l8waagzgqsa5q1pfgm534j1bhn3gr02";
"UbuntuMono" = "1g51a9giv096hnd7jr3xgbnhx7m4andfd0jm892f99n65fqy2x6y"; "UbuntuMono" = "0mjcyriww7j0gc2lsmxn266x2jlly2hzzl2l70ywj83wxkv0qnva";
"VictorMono" = "1gaf7ysd9gqhksbvb877n3qiki3iny2dgkfpgfwl4p8nzrxcn8jm"; "VictorMono" = "0n46glk3036i9cjz8gnlmlyx4p7ynk10i647q1zdjlsnk6yiy9i1";
} }

2
pkgs/data/fonts/nerdfonts/version.nix
View file

@ -1 +1 @@
"2.2.1" "2.2.2"

6
pkgs/desktops/gnome/core/evolution-data-server/default.nix
View file

@ -7,7 +7,7 @@
, coccinelle , coccinelle
, pkg-config , pkg-config
, gnome , gnome
, update-script-combinators , _experimental-update-script-combinators
, python3 , python3
, gobject-introspection , gobject-introspection
, gettext , gettext
@ -158,9 +158,9 @@ stdenv.mkDerivation rec {
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
}; };
updateGsettingsPatch = update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;
in in
update-script-combinators.sequence [ _experimental-update-script-combinators.sequence [
updateSource updateSource
updateGsettingsPatch updateGsettingsPatch
]; ];

4
pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
View file

@ -9,14 +9,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-dash-to-dock"; pname = "gnome-shell-extension-dash-to-dock";
version = "72"; version = "73";
# Temporarily switched to commit hash because stable version is buggy. # Temporarily switched to commit hash because stable version is buggy.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "micheleg"; owner = "micheleg";
repo = "dash-to-dock"; repo = "dash-to-dock";
rev = "extensions.gnome.org-v${version}"; rev = "extensions.gnome.org-v${version}";
sha256 = "Cds5Fc+rnvoy01GTZBS7qPh8UC9ekrNBOs+IEkDNkJw="; sha256 = "/NOJWjotfYPujS5G7/zv1OLzfSW0MB+oIRsx9/LSEdA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/compilers/terra/default.nix
View file

@ -32,13 +32,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "terra"; pname = "terra";
version = "1.0.5"; version = "1.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terralang"; owner = "terralang";
repo = "terra"; repo = "terra";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "080h718y3r3ca6jlxc985g3dac4q5ysqcalg3h0jl9bxm6rssv50"; sha256 = "1bs76ibzb469rlqs7slw8pm65csjq1nf0lqh6i9kcvbzavmdfds7";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A low-level counterpart to Lua"; description = "A low-level counterpart to Lua";
homepage = "https://terralang.org/"; homepage = "https://terralang.org/";
platforms = platforms.x86_64 ++ platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ]; maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ];
license = licenses.mit; license = licenses.mit;
}; };

4
pkgs/development/interpreters/clojure/babashka.nix
View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec { buildGraalvmNativeImage rec {
pname = "babashka"; pname = "babashka";
version = "0.9.160"; version = "0.9.162";
src = fetchurl { src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-mLP9Jg18iNj4FMDAoa9n3jf5A3G+JekywDJBHM4HEwc="; sha256 = "sha256-eSn3E5opJO+7dVay+j5xEkCIKJvmymozZGVD+vAzO4A=";
}; };
executable = "bb"; executable = "bb";

4
pkgs/development/libraries/fcft/default.nix
View file

@ -20,14 +20,14 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcft"; pname = "fcft";
version = "3.1.3"; version = "3.1.4";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "dnkl"; owner = "dnkl";
repo = "fcft"; repo = "fcft";
rev = version; rev = version;
sha256 = "sha256-HDXq9/otJc64AHRNERyzLyurMH89ijT1NRPjp1+T0GY="; sha256 = "sha256-kSzUZR/5PcYTxPWNh/zAwLQbfeW/44u2elEmGR3NYcM=";
}; };
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];

7
pkgs/development/python-modules/faraday-plugins/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "faraday-plugins"; pname = "faraday-plugins";
version = "1.6.8"; version = "1.7.0";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "infobyte"; owner = "infobyte";
repo = "faraday_plugins"; repo = "faraday_plugins";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-nRt2rcP/UldnNzDxANQDCzuqkFCU4LQxfWarqyc5a5Y="; hash = "sha256-KAfy2AQWZYFT/+rX8dNe8aWTFI0kkGg5IaSHhwYGk3A=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -52,6 +52,9 @@ buildPythonPackage rec {
# Fail because of missing faraday # Fail because of missing faraday
"test_detect_report" "test_detect_report"
"test_process_report_summary" "test_process_report_summary"
# JSON parsing issue
"test_process_report_ignore_info"
"test_process_report_tags"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

55
pkgs/development/python-modules/sensorpro-ble/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, bluetooth-data-tools
, bluetooth-sensor-state-data
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
, sensor-state-data
}:
buildPythonPackage rec {
pname = "sensorpro-ble";
version = "0.5.0";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-B5WtOl1Va2rqm6PZEUCYakN7mE2zz/edGj+TtwDcS+Y=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
bluetooth-data-tools
bluetooth-sensor-state-data
sensor-state-data
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [
"sensorpro_ble"
];
meta = with lib; {
description = "Library for Sensorpro BLE devices";
homepage = "https://github.com/Bluetooth-Devices/sensorpro-ble";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

55
pkgs/development/python-modules/tilt-ble/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, bluetooth-sensor-state-data
, buildPythonPackage
, fetchFromGitHub
, home-assistant-bluetooth
, poetry-core
, pytestCheckHook
, pythonOlder
, sensor-state-data
}:
buildPythonPackage rec {
pname = "tilt-ble";
version = "0.2.2";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-inr2cPl627w2klSqScMg3dvofIkX3hGb44+Go6ah/6I=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
bluetooth-sensor-state-data
home-assistant-bluetooth
sensor-state-data
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=tilt_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [
"tilt_ble"
];
meta = with lib; {
description = "Library for Tilt BLE devices";
homepage = "https://github.com/Bluetooth-Devices/tilt-ble";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/tools/bazelisk/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "bazelisk"; pname = "bazelisk";
version = "1.13.1"; version = "1.13.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4Xtopf+4WtD29eCyjbQfQjxVYZIDZ4JvB8UOXDn9rwg="; sha256 = "sha256-/6px3S03HJ5W03phGzJTzZ0ROcfA9eKXP+xfBrix1DM=";
}; };
vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg="; vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg=";

4
pkgs/development/tools/bundletool/default.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "bundletool"; pname = "bundletool";
version = "1.11.1"; version = "1.11.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
sha256 = "sha256-Zlk6wUQBftst8Tx+dAT67/WBID1BHD4aSAvRcGO9ErE="; sha256 = "sha256-MCZW642cjuC0XQ0MXnLlyQEJft3z1gaZaXYD1qIiffg=";
}; };
dontUnpack = true; dontUnpack = true;

20
pkgs/servers/adguardhome/bins.nix
View file

@ -1,23 +1,23 @@
{ fetchurl, fetchzip }: { fetchurl, fetchzip }:
{ {
x86_64-darwin = fetchzip { x86_64-darwin = fetchzip {
sha256 = "sha256-QS/GMUXZ3FlBDfgLXEUeqWb4jNDXaRpRlieWjxmMe5U="; sha256 = "sha256-2QGXyXHU2p7DFKDWyau2+SCzaQnM+o0EbYqHFnErXX4=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_darwin_amd64.zip"; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_amd64.zip";
}; };
aarch64-darwin = fetchzip { aarch64-darwin = fetchzip {
sha256 = "sha256-LQcIlQUbL7fDQQKKEr5HdL87O/dv7sD4ESqAxfeMo28="; sha256 = "sha256-16XJUh78B45d1uuLi1xcFeti6CvGUkXYUVe4pS/hhXs=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_darwin_arm64.zip"; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_arm64.zip";
}; };
i686-linux = fetchurl { i686-linux = fetchurl {
sha256 = "sha256-VIvQ+dhPi+gCGoCwwmnNscFPqfTCNqZdZsMYFYSFCuE="; sha256 = "sha256-ML9WSJwQTC8F07MOTQBpZXH/tHSlbQEzAofGpjHZrLU=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_386.tar.gz"; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_386.tar.gz";
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
sha256 = "sha256-aTZ/nfzJBJX7pV/xn/7QwPvK95GY5DIzeNs4O/6UBDw="; sha256 = "sha256-fGSBfQzlYQbsZExOqsxa2Zdb/gvo0c9O313ziSkvOjY=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_amd64.tar.gz"; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_amd64.tar.gz";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
sha256 = "sha256-aYPMMjI7azFtGUvPy2KnS0o7lTmtsOaOVgIFCWkfNi4="; sha256 = "sha256-WR8omfW5udMmXNKuUIfqdXvggumG4Pb1gESJV9YZ9rc=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_arm64.tar.gz"; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_arm64.tar.gz";
}; };
} }

2
pkgs/servers/adguardhome/default.nix
View file

@ -7,7 +7,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "adguardhome"; pname = "adguardhome";
version = "0.107.11"; version = "0.107.12";
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
installPhase = '' installPhase = ''

4
pkgs/servers/jackett/default.nix
View file

@ -9,13 +9,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jackett"; pname = "jackett";
version = "0.20.1768"; version = "0.20.1850";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "fyaAz17PSyenf8fHl9M3cFrCgKNGJ/7arzDseh4twQw="; sha256 = "lELuwSC0TKsnU5zsUsA0ihBxsJv/IiAs9tf+Yi5aL8E=";
}; };
projectFile = "src/Jackett.Server/Jackett.Server.csproj"; projectFile = "src/Jackett.Server/Jackett.Server.csproj";

4
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "check_ssl_cert"; pname = "check_ssl_cert";
version = "2.41.0"; version = "2.42.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matteocorti"; owner = "matteocorti";
repo = "check_ssl_cert"; repo = "check_ssl_cert";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dJWxOUw+G3U19HSeL9rebWGdilQnNC9x89e99vFbp0s="; hash = "sha256-BfHqVuTjgcObJm6bFwlXgHdcc1IalpY9opTamHqB0Zs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/shells/carapace/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "carapace"; pname = "carapace";
version = "0.8.10"; version = "0.8.10";

49
pkgs/shells/nushell/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, runCommand
, rustPlatform , rustPlatform
, openssl , openssl
, zlib , zlib
@ -10,10 +11,12 @@
, xorg , xorg
, libiconv , libiconv
, AppKit , AppKit
, Foundation
, Security , Security
# darwin.apple_sdk.sdk
, sdk
, nghttp2 , nghttp2
, libgit2 , libgit2
, cargo-edit
, withExtraFeatures ? true , withExtraFeatures ? true
, testers , testers
, nushell , nushell
@ -21,39 +24,41 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nushell"; pname = "nushell";
version = "0.65.0"; version = "0.67.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-KgXhmAOJaAvmNuDqSaW+h6GF5rWYgj8/wn+vz9V9S7M="; sha256 = "sha256-O5uM27DvcpwlZStFFLYRDRtFXzAzUdG7v0phK9LJsSo=";
}; };
cargoSha256 = "sha256-YqtM/1p6oP0+E0rYSFPeCbof06E81eC2PZIwkU7J0I4="; cargoSha256 = "sha256-eGUI+/Vmqv+BCIQCGoF4Egf3oNyonM3tpt1R3EjIocQ=";
# Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
# `parquet`, for dataframe support), which by default has an impure build # enable pkg-config feature of zstd
# (git submodule for the `zstd` C library). The `pkg-config` feature flag cargoPatches = [ ./zstd-pkg-config.patch ];
# fixes this, but it's hard to invoke this in the right place, because of
# the indirect dependencies. So add a direct dependency on `zstd-sys` here
# at the top level, along with this feature flag, to ensure that when
# `zstd-sys` is transitively invoked, it triggers a pure build using the
# system `zstd` library provided above.
depsExtraArgs = { nativeBuildInputs = [ cargo-edit ]; };
# cargo add has been merged in to cargo so the above can be removed once 1.62.0 is available in nixpkgs
# https://github.com/rust-lang/cargo/pull/10472
cargoUpdateHook = ''
cargo add zstd-sys --features pkg-config --offline
# write the change to the lockfile
cargo update --package zstd-sys --offline
'';
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]
++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];
buildInputs = [ openssl zstd ] buildInputs = [ openssl zstd ]
++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
Foundation
(
# Pull a header that contains a definition of proc_pid_rusage().
# (We pick just that one because using the other headers from `sdk` is not
# compatible with our C++ standard library. This header is already in
# the standard library on aarch64)
# See also:
# https://github.com/shanesveller/nixpkgs/tree/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/development/libraries/webkitgtk/default.nix
# https://github.com/shanesveller/nixpkgs/blob/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/tools/system/btop/default.nix#L32-L38
runCommand "${pname}_headers" { } ''
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
''
)
] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
buildFeatures = lib.optional withExtraFeatures "extra"; buildFeatures = lib.optional withExtraFeatures "extra";

31
pkgs/shells/nushell/zstd-pkg-config.patch Normal file
View file

@ -0,0 +1,31 @@
diff --git a/Cargo.lock b/Cargo.lock
index d4c2ebe3a..bc78478c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2641,6 +2641,7 @@ dependencies = [
"wax",
"which",
"windows",
+ "zstd",
]
[[package]]
@@ -5604,4 +5605,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
dependencies = [
"cc",
"libc",
+ "pkg-config",
]
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 8a9d29562..374ffa153 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -89,6 +89,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] }
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
sqlparser = { version = "0.16.0", features = ["serde"], optional = true }
+zstd = { version = "*", features = [ "pkg-config" ] }
+
[target.'cfg(unix)'.dependencies]
umask = "2.0.0"
users = "0.11.0"

6
pkgs/tools/graphics/unpaper/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, ffmpeg_4, libxslt }: { lib, stdenv, fetchurl, buildPackages, pkg-config, ffmpeg_4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unpaper"; pname = "unpaper";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13"; sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config buildPackages.libxslt.bin ];
buildInputs = [ ffmpeg_4 libxslt ]; buildInputs = [ ffmpeg_4 ];
meta = with lib; { meta = with lib; {
homepage = "https://www.flameeyes.eu/projects/unpaper"; homepage = "https://www.flameeyes.eu/projects/unpaper";

4
pkgs/tools/misc/fluent-bit/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fluent-bit"; pname = "fluent-bit";
version = "1.9.7"; version = "1.9.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fluent"; owner = "fluent";
repo = "fluent-bit"; repo = "fluent-bit";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mEQmlKPnCcom7/WogRw9HUvaO3NaOM4mFKBRKPWnx1E="; sha256 = "sha256-qHfEcLqCajGFXlEP6as7kvqFUcEAr74UZ9zSAL+OC/I=";
}; };
nativeBuildInputs = [ cmake flex bison ]; nativeBuildInputs = [ cmake flex bison ];

6
pkgs/tools/misc/watchexec/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "watchexec"; pname = "watchexec";
version = "1.20.5"; version = "1.20.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "cli-v${version}"; rev = "cli-v${version}";
sha256 = "sha256-x1weerTOpD4g1Fbm5erbS4S87ZjygF2X3MyyXl+9DXw="; sha256 = "sha256-IF0VnFh3UeJ6pB/DvwlKXzivZqRYzOE4/39qHNcPVcc=";
}; };
cargoSha256 = "sha256-hyPIdMVUXc03B8opcqq7y0wS1rqCfOQ1W5M8jDUqr0k="; cargoSha256 = "sha256-9XUZL34yHNIOq9Z9xP2+h8C4KUMkl8wAZbKnzppn300=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

4
pkgs/tools/security/cfripper/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "cfripper"; pname = "cfripper";
version = "1.12.0"; version = "1.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Skyscanner"; owner = "Skyscanner";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-qrZlCxNLO+q5n/FS/5b51QZVg4ZDwrgWpcKVp/JLTws="; hash = "sha256-SJY3Js0nxKCVRKwU240KSLuaUy4+LlC8cwDeyxl6D2U=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

4
pkgs/tools/security/crlfsuite/default.nix
View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "crlfsuite"; pname = "crlfsuite";
version = "2.1.2"; version = "2.5.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nefcore"; owner = "Nefcore";
repo = "CRLFsuite"; repo = "CRLFsuite";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-Olwt19HauTG2HuG4Pro0ImVbQtWqCgx9gV+2RtePT/8="; sha256 = "sha256-mK20PbVGhTEjhY5L6coCzSMIrG/PHHmNq30ZoJEs6uI=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

6
pkgs/tools/security/graphw00f/default.nix
View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "graphw00f"; pname = "graphw00f";
version = "1.1.2"; version = "1.1.8";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dolevf"; owner = "dolevf";
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
hash = "sha256-DzpSbaGYtRXtRjZBn9rgZumuCqdZ/auKiWO5/TYIE34="; hash = "sha256-stTCUHt9UCu1QuxDPB8a26LsrHNttyoVd0tmS7e2t2Y=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

2
pkgs/tools/security/metasploit/Gemfile
View file

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.14" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.16"

39
pkgs/tools/security/metasploit/Gemfile.lock
View file

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 349b7d4bf192254eac191cc2603f9553a8d6da1b revision: 0a155b3db11d611a08e58861bafdf7c66720b119
ref: refs/tags/6.2.14 ref: refs/tags/6.2.16
specs: specs:
metasploit-framework (6.2.14) metasploit-framework (6.2.16)
actionpack (~> 6.0) actionpack (~> 6.0)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -57,7 +57,6 @@ GIT
rb-readline rb-readline
recog recog
redcarpet redcarpet
reline (= 0.2.5)
rex-arch rex-arch
rex-bin_tools rex-bin_tools
rex-core rex-core
@ -77,7 +76,7 @@ GIT
rex-text rex-text
rex-zip rex-zip
ruby-macho ruby-macho
ruby_smb (~> 3.1.0) ruby_smb (~> 3.2.0)
rubyntlm rubyntlm
rubyzip rubyzip
sinatra sinatra
@ -130,8 +129,8 @@ GEM
arel-helpers (2.14.0) arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8) activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.622.0) aws-partitions (1.626.0)
aws-sdk-core (3.136.0) aws-sdk-core (3.140.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
@ -176,7 +175,7 @@ GEM
eventmachine (>= 1.0.0.beta.4) eventmachine (>= 1.0.0.beta.4)
erubi (1.11.0) erubi (1.11.0)
eventmachine (1.2.7) eventmachine (1.2.7)
faker (2.22.0) faker (2.23.0)
i18n (>= 1.8.11, < 2) i18n (>= 1.8.11, < 2)
faraday (2.5.2) faraday (2.5.2)
faraday-net_http (>= 2.0, < 3.1) faraday-net_http (>= 2.0, < 3.1)
@ -206,8 +205,8 @@ GEM
i18n (1.12.0) i18n (1.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
io-console (0.5.11) io-console (0.5.11)
irb (1.3.6) irb (1.4.1)
reline (>= 0.2.5) reline (>= 0.3.0)
jmespath (1.6.1) jmespath (1.6.1)
jsobfu (0.4.2) jsobfu (0.4.2)
rkelly-remix rkelly-remix
@ -220,11 +219,11 @@ GEM
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
metasm (1.0.5) metasm (1.0.5)
metasploit-concern (4.0.4) metasploit-concern (4.0.5)
activemodel (~> 6.0) activemodel (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
railties (~> 6.0) railties (~> 6.0)
metasploit-credential (5.0.8) metasploit-credential (5.0.9)
metasploit-concern metasploit-concern
metasploit-model metasploit-model
metasploit_data_models (>= 5.0.0) metasploit_data_models (>= 5.0.0)
@ -316,7 +315,7 @@ GEM
recog (2.3.23) recog (2.3.23)
nokogiri nokogiri
redcarpet (3.5.1) redcarpet (3.5.1)
reline (0.2.5) reline (0.3.1)
io-console (~> 0.5) io-console (~> 0.5)
rex-arch (0.1.14) rex-arch (0.1.14)
rex-text rex-text
@ -331,7 +330,7 @@ GEM
metasm metasm
rex-arch rex-arch
rex-text rex-text
rex-exploitation (0.1.35) rex-exploitation (0.1.36)
jsobfu jsobfu
metasm metasm
rex-arch rex-arch
@ -345,25 +344,25 @@ GEM
rex-arch rex-arch
rex-ole (0.1.7) rex-ole (0.1.7)
rex-text rex-text
rex-powershell (0.1.96) rex-powershell (0.1.97)
rex-random_identifier rex-random_identifier
rex-text rex-text
ruby-rc4 ruby-rc4
rex-random_identifier (0.1.8) rex-random_identifier (0.1.9)
rex-text rex-text
rex-registry (0.1.4) rex-registry (0.1.4)
rex-rop_builder (0.1.4) rex-rop_builder (0.1.4)
metasm metasm
rex-core rex-core
rex-text rex-text
rex-socket (0.1.41) rex-socket (0.1.42)
rex-core rex-core
rex-sslscan (0.1.7) rex-sslscan (0.1.8)
rex-core rex-core
rex-socket rex-socket
rex-text rex-text
rex-struct2 (0.1.3) rex-struct2 (0.1.3)
rex-text (0.2.39) rex-text (0.2.44)
rex-zip (0.1.4) rex-zip (0.1.4)
rex-text rex-text
rexml (3.2.5) rexml (3.2.5)
@ -371,7 +370,7 @@ GEM
ruby-macho (3.0.0) ruby-macho (3.0.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
ruby_smb (3.1.7) ruby_smb (3.2.0)
bindata bindata
openssl-ccm openssl-ccm
openssl-cmac openssl-cmac

4
pkgs/tools/security/metasploit/default.nix
View file

@ -15,13 +15,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.2.14"; version = "6.2.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-eWM5gAnF3WepXsf2bSfjwr4Tsz4nnuZVllNWj7ko5cM="; sha256 = "sha256-9zrtNoxj8gBEzqOlA3wpEh5f8XEEM3tuJUs5Zd+/Dbw=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

62
pkgs/tools/security/metasploit/gemset.nix
View file

@ -104,20 +104,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1py4q91ll3v7ylcqflgd190y40d3ixgrhpln011gr5adgbzg9hr6"; sha256 = "0xnljfcxvrb5h5r5ri14635syd3q8wwkawa69gx9yfk96g6pwbbd";
type = "gem"; type = "gem";
}; };
version = "1.622.0"; version = "1.626.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "111zdfl6p1n949rvsfr0c88k9yzpibrcd8fihyshbibc2w06qj2b"; sha256 = "1m83xyasynybmb16cvg2njfpkpz2qam3j5sd571z6mc43l55mknv";
type = "gem"; type = "gem";
}; };
version = "3.136.0"; version = "3.140.0";
}; };
aws-sdk-ec2 = { aws-sdk-ec2 = {
groups = ["default"]; groups = ["default"];
@ -344,10 +344,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47";
type = "gem"; type = "gem";
}; };
version = "2.22.0"; version = "2.23.0";
}; };
faraday = { faraday = {
groups = ["default"]; groups = ["default"];
@ -514,10 +514,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0s4yjh5p1n05cm3pglh3g4ssrgy67x2bn3bsl0sydbm8mlf3xivr"; sha256 = "1a7hkcvnyfcmzxz36qnfk84grl7m4xrv2vzg5pyhzqwxmgcrhrja";
type = "gem"; type = "gem";
}; };
version = "1.3.6"; version = "1.4.1";
}; };
jmespath = { jmespath = {
groups = ["default"]; groups = ["default"];
@ -594,32 +594,32 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1m7dykwravbjdq4zs1z5lqdwrmfjsswjg7iygn4a187xn9ml1rj6"; sha256 = "0sqjv9sqj628zdbb9xlwsmaq9fy52gxwv8ggpvib3sfi1ckvwgn1";
type = "gem"; type = "gem";
}; };
version = "4.0.4"; version = "4.0.5";
}; };
metasploit-credential = { metasploit-credential = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08w1yhjybrdrn7rv77j4d58w9m8fdh4l5kaw7wsikv1zzcjdqwrl"; sha256 = "1ydwdnjv2jf455ygdh3i6jqyc622mniby6fbjkvg997j29v0y7a3";
type = "gem"; type = "gem";
}; };
version = "5.0.8"; version = "5.0.9";
}; };
metasploit-framework = { metasploit-framework = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "349b7d4bf192254eac191cc2603f9553a8d6da1b"; rev = "0a155b3db11d611a08e58861bafdf7c66720b119";
sha256 = "1hz552wqymjkjrayd7i77sri7gn2wcknvxn7bslngpf51603jqvr"; sha256 = "1g0dpzgnafab4mp7ncq4f7qmy7hj55y079d3rr201wk3ihvfsfpp";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.2.14"; version = "6.2.16";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -1057,10 +1057,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bf86g8a761mp516349gzmvxkafj36nznczznb3flkn4a84dlk3k"; sha256 = "1izlsziflj70kgwfy2d72jfr7bhrzamnhbq8gxjn8xdz0wvdj0di";
type = "gem"; type = "gem";
}; };
version = "0.2.5"; version = "0.3.1";
}; };
rex-arch = { rex-arch = {
groups = ["default"]; groups = ["default"];
@ -1107,10 +1107,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1hnwjilqyx39w0vi94ixj6qa2nlmb0z69f57vdb2xw3z9q29jlsl"; sha256 = "0j2lp6kz4a67n7dk7kxlxx8kc32dfdbrz649hhqj47k15nafnyy1";
type = "gem"; type = "gem";
}; };
version = "0.1.35"; version = "0.1.36";
}; };
rex-java = { rex-java = {
groups = ["default"]; groups = ["default"];
@ -1157,20 +1157,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1a9ky6gp8r6xymdcgnf7paqphy07m9alw28y1lhzg760h8a1kvc6"; sha256 = "08nx34nfvv19snpamgsb2x8j37mbharr25hhvk8zlqlrm3x6lk0x";
type = "gem"; type = "gem";
}; };
version = "0.1.96"; version = "0.1.97";
}; };
rex-random_identifier = { rex-random_identifier = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zy8zkkv530iqzsc7apx4hq9ij30h5628slkmc80aqzva9z0fm0d"; sha256 = "0cpni5hnc3r6bi2n6zx8h6vi0mv99zabw4rggyy95cbwf6smmaxp";
type = "gem"; type = "gem";
}; };
version = "0.1.8"; version = "0.1.9";
}; };
rex-registry = { rex-registry = {
groups = ["default"]; groups = ["default"];
@ -1197,20 +1197,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ws7xj7898ba2ib3c2ww2g6df1jyjny42smndqb5sa4gfzynkcfp"; sha256 = "0hh6izmxym6qjgs5n1jmqr5bvmhk17sqfi33a19pny2rxhbsfacp";
type = "gem"; type = "gem";
}; };
version = "0.1.41"; version = "0.1.42";
}; };
rex-sslscan = { rex-sslscan = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "128y9xrb2nv8ccs85lav8wcydp8239y04ad7mjkc43r59hhkx74p"; sha256 = "01lxd8zjkgzrr93dry1as7x7ir3n924fz6z1pplwm68jfcqvzw0v";
type = "gem"; type = "gem";
}; };
version = "0.1.7"; version = "0.1.8";
}; };
rex-struct2 = { rex-struct2 = {
groups = ["default"]; groups = ["default"];
@ -1227,10 +1227,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0za2rihc8d1hr4g5gqabpdd19npah0mmh93wylrh503hiwq7ljsv"; sha256 = "10bhagqrc930w8q23sgvjgz5gnwmwrllc6bd7jbmpnaxyfr0lnwp";
type = "gem"; type = "gem";
}; };
version = "0.2.39"; version = "0.2.44";
}; };
rex-zip = { rex-zip = {
groups = ["default"]; groups = ["default"];
@ -1297,10 +1297,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0y6yz3zpf64hrz5pa43jhrk8jxl2iivsirh7n7gzy6gfbxxmvssb"; sha256 = "0iyp4j0j2bd0barp7057mr7280921c05ij2ygr1715lj1p9j4h5x";
type = "gem"; type = "gem";
}; };
version = "3.1.7"; version = "3.2.0";
}; };
rubyntlm = { rubyntlm = {
groups = ["default"]; groups = ["default"];

6
pkgs/tools/system/gdu/default.nix
View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gdu"; pname = "gdu";
version = "5.15.0"; version = "5.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dundee"; owner = "dundee";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XfBmxAuhGt5SYl4D8pf+FnB3R5Hg/G72r4pYgIrL2mg="; sha256 = "sha256-e2fZJ1HRoi2uMyCWgjPIXs6Q6neg8XEqtC8YcUev+60=";
}; };
vendorSha256 = "sha256-w+nOoEtEtRjXakrVV3aLj+clhyqgL5cJ6iu689cJeKs="; vendorSha256 = "sha256-42hXOF/jeOc7WXqq6nBgYv5Qjypszxp9IboxchKQbN8=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

5
pkgs/top-level/all-packages.nix
View file

@ -124,7 +124,7 @@ with pkgs;
genericUpdater = callPackage ../common-updater/generic-updater.nix { }; genericUpdater = callPackage ../common-updater/generic-updater.nix { };
update-script-combinators = callPackage ../common-updater/combinators.nix { }; _experimental-update-script-combinators = callPackage ../common-updater/combinators.nix { };
gitUpdater = callPackage ../common-updater/git-updater.nix { }; gitUpdater = callPackage ../common-updater/git-updater.nix { };
@ -24579,7 +24579,8 @@ with pkgs;
nsh = callPackage ../shells/nsh { }; nsh = callPackage ../shells/nsh { };
nushell = callPackage ../shells/nushell { nushell = callPackage ../shells/nushell {
inherit (darwin.apple_sdk.frameworks) AppKit Security; inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security;
inherit (darwin.apple_sdk) sdk;
}; };
nettools = if stdenv.isLinux nettools = if stdenv.isLinux

4
pkgs/top-level/python-packages.nix
View file

@ -9918,6 +9918,8 @@ in {
sensor-state-data = callPackage ../development/python-modules/sensor-state-data { }; sensor-state-data = callPackage ../development/python-modules/sensor-state-data { };
sensorpro-ble = callPackage ../development/python-modules/sensorpro-ble { };
sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { }; sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { };
sentencepiece = callPackage ../development/python-modules/sentencepiece { sentencepiece = callPackage ../development/python-modules/sentencepiece {
@ -10898,6 +10900,8 @@ in {
tilestache = callPackage ../development/python-modules/tilestache { }; tilestache = callPackage ../development/python-modules/tilestache { };
tilt-ble = callPackage ../development/python-modules/tilt-ble { };
timeago = callPackage ../development/python-modules/timeago { }; timeago = callPackage ../development/python-modules/timeago { };
timecop = callPackage ../development/python-modules/timecop { }; timecop = callPackage ../development/python-modules/timecop { };