From 195fe01e8bd258b5f4475203c9fd72b69c87a22f Mon Sep 17 00:00:00 2001 From: Alex Brandt Date: Mon, 30 Nov 2020 20:56:33 +0000 Subject: [PATCH 01/37] nixos/nixpkgs/docs: fix typo in assertOneOf example This example was confusing at first because the element the message indicated wasn't in the list of possible values was but the possible values didn't match up either. This ensures the example is consistent with the logic being presented. --- doc/functions/library/asserts.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/functions/library/asserts.xml b/doc/functions/library/asserts.xml index 10891039e869..7c94222ef139 100644 --- a/doc/functions/library/asserts.xml +++ b/doc/functions/library/asserts.xml @@ -103,7 +103,7 @@ stderr> assert failed Ensuring a user provided a possible value false stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl" ]]> From 92840f5dde8c101cb5bca6f819534278aeda9e6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 13:32:10 +0100 Subject: [PATCH 02/37] python3Packages.factory_boy: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/factory_boy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index a953632f9fd7..f81245b69829 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "factory_boy"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "ded73e49135c24bd4d3f45bf1eb168f8d290090f5cf4566b8df3698317dc9c08"; + sha256 = "0nsw2mdjk8sqds3qsix4cf19ws6i0fak79349pw2581ryc7w0720"; }; propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; From c4ab252be997f32536a18bc6eb13ede98eaede79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 13:53:47 +0100 Subject: [PATCH 03/37] python3Packages.factory_boy: enable tests --- .../python-modules/factory_boy/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index f81245b69829..17893967d9b8 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -1,10 +1,13 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, django , faker -, python -, ipaddress +, fetchPypi +, flask +, flask_sqlalchemy +, mongoengine +, pytestCheckHook +, sqlalchemy }: buildPythonPackage rec { @@ -16,10 +19,20 @@ buildPythonPackage rec { sha256 = "0nsw2mdjk8sqds3qsix4cf19ws6i0fak79349pw2581ryc7w0720"; }; - propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; + propagatedBuildInputs = [ faker ]; - # tests not included with pypi release - doCheck = false; + checkInputs = [ + django + flask + flask_sqlalchemy + mongoengine + pytestCheckHook + sqlalchemy + ]; + + # Checks for MongoDB requires an a running DB + disabledTests = [ "MongoEngineTestCase" ]; + pythonImportsCheck = [ "factory" ]; meta = with lib; { description = "A Python package to create factories for complex objects"; From 69486ada688177209c4d238f3236ecc363588cc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 13:55:46 +0100 Subject: [PATCH 04/37] python3Packages.factory_boy: update meta --- pkgs/development/python-modules/factory_boy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 17893967d9b8..845e27dcc447 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -35,9 +35,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "factory" ]; meta = with lib; { - description = "A Python package to create factories for complex objects"; - homepage = "https://github.com/rbarrois/factory_boy"; - license = licenses.mit; + description = "Python package to create factories for complex objects"; + homepage = "https://github.com/rbarrois/factory_boy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; - } From 0dfbd51cfca46fad70faad6841971038221ff654 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 6 Feb 2021 16:36:39 +0100 Subject: [PATCH 05/37] cfitsio: 3.47 -> 3.49 Fixes CVE-2018-3848 and CVE-2018-3849. --- pkgs/development/libraries/cfitsio/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 28bb0761777c..a430bc317930 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,21 +1,18 @@ -{ fetchurl, lib, stdenv - -# Optional dependencies -, bzip2 ? null }: +{ fetchurl, lib, stdenv, bzip2 }: stdenv.mkDerivation rec { pname = "cfitsio"; - version = "3.47"; + version = "3.49"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "1vzlxnrjckz78p2wf148v2z3krkwnykfqvlj42sz3q711vqid1a1"; + sha256 = "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav"; }; buildInputs = [ bzip2 ]; patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; + configureFlags = "--with-bzip2=${bzip2.out}"; hardeningDisable = [ "format" ]; From 8a6dc4580f1c96bd087016f83017cd5bee069a61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 16:06:36 +0000 Subject: [PATCH 06/37] operator-sdk: 1.3.0 -> 1.4.0 --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index c09331de5980..34d6abb7273d 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4="; + sha256 = "sha256-KxYGXwK6wF5MDY+zrSdcQqBYkSdnxOCYudTh+TwTkm8="; }; - vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk="; + vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30="; doCheck = false; From 88130e419cade2b2ed3a2cf583dd8a5d84420cbe Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 6 Feb 2021 16:12:47 +0000 Subject: [PATCH 07/37] go-bindata: unstable-2015-10-23 -> 3.22.0 Use maintained version at https://github.com/kevinburke/go-bindata --- pkgs/development/tools/go-bindata/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 3b73c5273159..fc44efca8289 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,22 +1,23 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "go-bindata"; - version = "unstable-2015-10-23"; + version = "3.22.0"; - goPackagePath = "github.com/jteeuwen/go-bindata"; + goPackagePath = "github.com/kevinburke/go-bindata"; src = fetchFromGitHub { - owner = "jteeuwen"; - repo = "go-bindata"; - rev = "a0ff2567cfb70903282db057e799fd826784d41d"; - sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v"; + owner = "kevinburke"; + repo = pname; + rev = "v${version}"; + sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; }; - excludedPackages = "testdata"; + subPackages = [ "go-bindata" ]; meta = with lib; { - homepage = "https://github.com/jteeuwen/go-bindata"; + homepage = "https://github.com/kevinburke/go-bindata"; + changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; license = licenses.cc0; From a66639068bf05a5a7efc957cf7dd8409cc78782f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 6 Feb 2021 16:14:45 +0000 Subject: [PATCH 08/37] influxdb2: use now maintained go-bindata --- pkgs/servers/nosql/influxdb2/default.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 627cd6d627d2..bace331e05c8 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -73,28 +73,12 @@ let --replace /out $out ''; }; - - # Can't use the nixpkgs version of go-bindata, it's an ancient - # ancestor of this more modern one. - bindata = buildGoPackage { - pname = "go-bindata"; - version = "v3.22.0"; - src = fetchFromGitHub { - owner = "kevinburke"; - repo = "go-bindata"; - rev = "v3.22.0"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; - }; - - goPackagePath = "github.com/kevinburke/go-bindata"; - subPackages = [ "go-bindata" ]; - }; in buildGoModule { pname = "influxdb"; version = version; src = src; - nativeBuildInputs = [ bindata pkg-config ]; + nativeBuildInputs = [ go-bindata pkg-config ]; vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a"; subPackages = [ "cmd/influxd" "cmd/influx" ]; From cc77f910fc1a06b7cb7eb43639c5904540483c70 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 16:22:28 +0000 Subject: [PATCH 09/37] osu-lazer: 2021.129.0 -> 2021.205.1 --- pkgs/games/osu-lazer/default.nix | 4 +- pkgs/games/osu-lazer/deps.nix | 228 ++++++++++++------------------- 2 files changed, 91 insertions(+), 141 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4ce123c78c08..e3c22ae73283 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.129.0"; + version = "2021.205.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "AVx842Zq3mq59VCPdF94mcx5uOr70SmkV/tMNkNyMSY="; + sha256 = "US8auytRXqtYGGNi+vxIzxCxpetWYeUkBRjgtJkPpMs="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 9e61cb9674e8..b670ce0c5ed8 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -1,9 +1,4 @@ { fetchNuGet }: [ - (fetchNuGet { - name = "Dapper"; - version = "2.0.78"; - sha256 = "13xgi8prsa3y67hx644yflamwakjv8vsk5m15v407clsl2r4g0bp"; - }) (fetchNuGet { name = "DeltaCompressionDotNet"; version = "2.0.0.0"; @@ -16,8 +11,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.169"; - sha256 = "0rs9fjr65432qckmzx4djlwsnc2yqwwwnjszqwnm3z2pv8dm7zrf"; + version = "1.0.175"; + sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -286,8 +281,13 @@ }) (fetchNuGet { name = "MessagePack"; - version = "1.7.3.7"; - sha256 = "1wyxl49i9crb247q3c84gnf4985gai8qxa8x3a22rcfxzzx29mjr"; + version = "2.2.85"; + sha256 = "1y0h8bd0drnlsqf1bvrdiv9j1892zqf1rmyclfjzs49klpf0xphk"; + }) + (fetchNuGet { + name = "MessagePack.Annotations"; + version = "2.2.85"; + sha256 = "00wajml6iy3wid8mixh3jmm6dapfjbccwq95m8qciika4pyd4lq9"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; @@ -296,79 +296,69 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.10"; - sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.11"; - sha256 = "04f37gxcd8hpkfmz5sssgwa20hfr3y5b093bqqz7yaxcqvdn54x4"; + version = "5.0.2"; + sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; - version = "3.1.10"; - sha256 = "1sni7hjpylamxaf98insalx3jj2k8skb02mhkmamxxj2488r2p9j"; + version = "5.0.2"; + sha256 = "0295a87ilrdg43sil5wli74x7jy4apibqdk1fxam8kzj99whl5sk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; - version = "3.1.10"; - sha256 = "19mddj0dpy4j6fwh8b1q7aznnckjrkpvbqiyq4sq4z7lcgw6pbq6"; + version = "5.0.2"; + sha256 = "094zjf6h5dh87kznmmz7w4s1y37rw52vaz2h4jk4i4ik7hpijd0w"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.10"; - sha256 = "1y6zf2qgph6ga59272msywdv2xrycg56wz50bjm5pivmh6wv9240"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.11"; - sha256 = "07mv432cgr1sclvrw5ah70wajxfgqlaxgnf99vca4r9a9a1i185a"; + version = "5.0.2"; + sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; - version = "3.1.10"; - sha256 = "1s352srycksfnvz5hhi7himpg2gn39iw2gizlc3g30w6pvy8p29c"; + version = "5.0.2"; + sha256 = "18pdw4h1j93wzcvlj87jy7n5sxkwlj69nnb7a2qxkc40jvm18ran"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; - version = "3.1.10"; - sha256 = "1289624ilk45ca8rkyvirqdjsg9jsnqn8dzbjr6f83641fi73s69"; + version = "5.0.2"; + sha256 = "1rg3cpqr3yx5hn233c6cmmiry5v49fglfii7ryi1cf6rwqpdqn5l"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.10"; - sha256 = "0c6lim7my3alq43xxqkgykba068hjlzdcif6c956irailijc0smw"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.11"; - sha256 = "0za69spf44df7xl0s82bk4spi80yjqxqncgfs5aqa15rjncg3d6l"; + version = "5.0.2"; + sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; - version = "3.1.10"; - sha256 = "0qzdpblmgqm3bl5wr14igkqp35zwx4wdkwlh55xm4v3hzhq6l46m"; + version = "5.0.2"; + sha256 = "0p9kv2iayhz8y68r30mhzssv0m087v243ai7aax7jd44rqiv1w5i"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; - version = "3.1.11"; - sha256 = "15l2l5gmiwn90hl8d1w2lx2x5scx69rr7kph8liigs8vm3q95qx9"; + version = "5.0.2"; + sha256 = "1f0mjw0swiaxk4iqf7n598d51w40lwdbap4nlc0sv0vw3nklnlzp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; - version = "3.1.10"; - sha256 = "114zrd732c452x3dy26ll7vhbsqkk9pdrb5f2jqn8nkhf2xg2bda"; + version = "5.0.2"; + sha256 = "01wi2q5sjazvax8d4gbcggsr7n801m4cx6jcqljv0r4cmz4y478a"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + version = "1.0.0"; + sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "5.0.0"; + sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; + }) (fetchNuGet { name = "Microsoft.Build.Framework"; version = "15.3.409"; @@ -509,31 +499,16 @@ version = "2.2.0"; sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.10"; - sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.10"; - sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.10"; - sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; @@ -541,8 +516,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.10"; - sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; + version = "5.0.1"; + sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; @@ -551,13 +526,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.10"; - sha256 = "0c9p32jd8fi5k02nbp7ilj0jmnl63kq2464acpsb6ajs4837c02q"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.11"; - sha256 = "097myz6cynk0y5xgashj9mkcliamdsljazg2hh3w407d197wzh6a"; + version = "5.0.0"; + sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; @@ -571,8 +541,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; - version = "3.1.10"; - sha256 = "1lf1hgpk0d5g9mv68f9b2cp6jhpnc4a6bflc1f2mn9x4dvmpv2wi"; + version = "5.0.0"; + sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; @@ -581,8 +551,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.10"; - sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; + version = "5.0.0"; + sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; @@ -596,13 +566,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Options"; - version = "3.1.10"; - sha256 = "0kmh12w0y4bf2jnmbbxk10mqnynjqa5qks5pa0zg4vsnfscj8i95"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.11"; - sha256 = "1k78gc5mwcixjc99h7hvx1qal6i5y67lrciwqqzdl1xk7rl6pjw4"; + version = "5.0.0"; + sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; @@ -611,13 +576,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; - version = "3.1.10"; - sha256 = "0a3f35427hpai0wq1wlqpn4m5aacfddkq25hp71nwlz5zm1dqfmk"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.11"; - sha256 = "1iy52c74jiki0i557qkjciywj7s6nnvbqx22i6p464fm925kwm4q"; + version = "5.0.0"; + sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; @@ -644,11 +604,6 @@ version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.1"; - sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; - }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; @@ -906,18 +861,8 @@ }) (fetchNuGet { name = "Sentry"; - version = "2.1.8"; - sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn"; - }) - (fetchNuGet { - name = "Sentry.PlatformAbstractions"; - version = "1.1.1"; - sha256 = "10mxyxmyjpr0y1ik2j55pp7ifn101sw319cbpf28i2xbfp0cvcaj"; - }) - (fetchNuGet { - name = "Sentry.Protocol"; - version = "2.1.8"; - sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l"; + version = "3.0.1"; + sha256 = "1nmqwprp2xv9d8llfncyw94nfws9nwb7zj0sqrd6lv1mfgaxraql"; }) (fetchNuGet { name = "SharpCompress"; @@ -926,8 +871,8 @@ }) (fetchNuGet { name = "SharpCompress"; - version = "0.26.0"; - sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; + version = "0.27.1"; + sha256 = "1lhljszs94i1ssl831ik1a51n2pshf27nsjm78acnw1y1qnkm5pd"; }) (fetchNuGet { name = "SharpFNT"; @@ -1119,6 +1064,11 @@ version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "5.0.0"; + sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + }) (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; @@ -1236,13 +1186,8 @@ }) (fetchNuGet { name = "System.IO.Pipelines"; - version = "4.7.3"; - sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; - }) - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.7.4"; - sha256 = "09gv2nz35vmmcjrfj1ppxx32v772i0mb369v7lwqr8mz14zhh86r"; + version = "5.0.1"; + sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { name = "System.Linq"; @@ -1274,11 +1219,6 @@ version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.2"; - sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; - }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; @@ -1359,6 +1299,11 @@ version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.6.0"; + sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; @@ -1381,8 +1326,8 @@ }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; - version = "4.7.0"; - sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; + version = "4.6.0"; + sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) (fetchNuGet { name = "System.Reflection.Extensions"; @@ -1464,6 +1409,11 @@ version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; + }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; @@ -1519,11 +1469,6 @@ version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; @@ -1636,8 +1581,8 @@ }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; - version = "4.7.1"; - sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; + version = "5.0.0"; + sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; @@ -1651,13 +1596,18 @@ }) (fetchNuGet { name = "System.Text.Encodings.Web"; - version = "4.7.1"; - sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; + version = "5.0.0"; + sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) (fetchNuGet { name = "System.Text.Json"; - version = "4.7.2"; - sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + version = "5.0.0"; + sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "5.0.1"; + sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; }) (fetchNuGet { name = "System.Text.RegularExpressions"; @@ -1681,8 +1631,8 @@ }) (fetchNuGet { name = "System.Threading.Channels"; - version = "4.7.1"; - sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + version = "5.0.0"; + sha256 = "11z28x3cawry60l5phkqrvavm0mshz84n4c79hrz0p65lq8jpxgs"; }) (fetchNuGet { name = "System.Threading.Tasks"; @@ -1704,6 +1654,11 @@ version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; @@ -1724,11 +1679,6 @@ version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { - name = "System.ValueTuple"; - version = "4.3.0"; - sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; - }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; From cc4c52a42b993cf361363670579fcf810c54b546 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Feb 2021 18:01:52 +0100 Subject: [PATCH 10/37] python3Packages.dulwich: 0.20.15 -> 0.20.18 --- .../python-modules/dulwich/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 5d4ac94f7fa0..4cc3f34929b7 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, urllib3, certifi -, gevent, geventhttpclient, mock, fastimport -, git, glibcLocales }: +{ lib +, stdenv +, buildPythonPackage +, certifi +, fastimport +, fetchPypi +, gevent +, geventhttpclient +, git +, glibcLocales +, mock +, urllib3 +}: buildPythonPackage rec { - version = "0.20.15"; + version = "0.20.18"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "1248942fr12av2rkzpm2fq0qn6rajvv2lcgq65h8kby27qvp65zv"; + sha256 = "sha256-ATE4f5uZrsxprJhlWzkx8q1D2lPTpj4FD6Om1iYKxVQ="; }; LC_ALL = "en_US.UTF-8"; @@ -21,6 +30,8 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ "dulwich" ]; + meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; longDescription = '' @@ -29,7 +40,7 @@ buildPythonPackage rec { ''; homepage = "https://www.dulwich.io/"; changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS"; - license = with licenses; [ asl20 gpl2Plus]; + license = with licenses; [ asl20 gpl2Plus ]; maintainers = with maintainers; [ koral ]; }; } From 07d514af562f71502f5028d0d3e9d42ed61ed724 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 6 Feb 2021 12:11:38 -0500 Subject: [PATCH 11/37] python3Packages.phonopy: 2.8.1 -> 2.9.1 --- .../python-modules/phonopy/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 2259fcd7ba52..e68516fb07f7 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -1,19 +1,26 @@ -{ lib, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pyyaml +, matplotlib +, h5py +, spglib +, pytestCheckHook +}: buildPythonPackage rec { pname = "phonopy"; - version = "2.8.1"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "28864b04adb900597705f1367a100da869af835088bdd13f1693c4382259f128"; + sha256 = "1jaizhkb59ixknvc75nrhfq51bh75912q8ay36bxpf4g5hzyhw3a"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; checkInputs = [ pytestCheckHook ]; - # flakey due to floating point inaccuracy - disabledTests = [ "test_NaCl" ]; # prevent pytest from importing local directory preCheck = '' From e9ec2804f6cdf9d16f13afdd215a87a0fcd53d18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 19:15:45 +0000 Subject: [PATCH 12/37] so: 0.4.2 -> 0.4.3 --- pkgs/development/tools/so/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index 99f9cdcd936f..cd52f319bb94 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "so"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "samtay"; repo = pname; rev = "v${version}"; - sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + sha256 = "sha256-WAUPB4hhvroE1/8nQcgLVWgGyXcFh7qxdFg6UtQzM9A="; }; - cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + cargoSha256 = "sha256-wt6ClN9fpEAETk3kYeQRieTXnZQe4JEnQiA8CG4ZLog="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ From ec6b0f81c3c618bc8d9985152326492a52bd5728 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 20:02:47 +0000 Subject: [PATCH 13/37] stern: 1.13.1 -> 1.14.0 --- pkgs/applications/networking/cluster/stern/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 29aa7d41f32a..962647993447 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "0fj6a52wb0jv5bz2j2wq3ljnlxnsj9bg3kbzgkz0vh0b63zyn782"; + sha256 = "sha256-8l/Tr+IxR3yPmt9hI70XuUQ4YEYzRTMLbo8BsngoU60="; }; - vendorSha256 = "14nrdaaby74bjbk777hr82p0ybzk3spc59lbrjn9z0q3hc0p4vaf"; + vendorSha256 = "sha256-pvFT4A7bDBvBf1odyv3z4inw1/IsvOA+++OPbfNjzxM="; nativeBuildInputs = [ installShellFiles ]; From 1a3a6c4bc846dfe3e99e096e64142fd96ea49fa1 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 6 Feb 2021 12:32:51 -0800 Subject: [PATCH 14/37] doctest: enable on all platforms --- pkgs/development/libraries/doctest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 702015e5d38f..233e01e03803 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; }; From 81073e51335628ca3449b3b90b2fa4654a17df6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 21:05:43 +0000 Subject: [PATCH 15/37] taskwarrior-tui: 0.9.6 -> 0.9.10 --- pkgs/applications/misc/taskwarrior-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 5c5192ebb288..530d60c76313 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.9.6"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "1w8x3qfw7p4q8srdbamqlrz5nsilyd0dy87jp7kq2n7yxsrbyh4x"; + sha256 = "sha256-NQzZhWoLeDF7iTgIljbVi0ULAe7DeIn45Cu6bgFCfKQ="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "0b69qyb74r9may6n61i5a5nzwhxpaij6y40bq6kh8rzdwy0awwx7"; + cargoSha256 = "sha256-9qfqQ7zFw+EwY7o35Y6RhBJ8h5eXnTAsdbqo/w0zO5w="; meta = with lib; { description = "A terminal user interface for taskwarrior "; From 973260c8c4a45665a93ee9ecae05bb0798c32279 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Feb 2021 22:14:30 +0100 Subject: [PATCH 16/37] python3Packages.pyopenuv: init at 2.0.1 --- .../python-modules/pyopenuv/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/pyopenuv/default.nix diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix new file mode 100644 index 000000000000..a5414021b259 --- /dev/null +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyopenuv"; + version = "2.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytest-aiohttp + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyopenuv" ]; + + meta = with lib; { + description = "Python API to retrieve data from openuv.io"; + homepage = "https://github.com/bachya/pyopenuv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d66eaaa5b0a..516004404a3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5719,6 +5719,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopenuv = callPackage ../development/python-modules/pyopenuv { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; pyosf = callPackage ../development/python-modules/pyosf { }; From 4ab9f2b30eb34ec7446723c5216375b0cce18ddc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Feb 2021 22:14:56 +0100 Subject: [PATCH 17/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d6aebd0cd452..e28cefc4eaa7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -592,7 +592,7 @@ "opensensemap" = ps: with ps; [ opensensemap-api ]; "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw - "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv + "openuv" = ps: with ps; [ pyopenuv ]; "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio From cc57a50d41fe52432268fe7f92a9aeeda32d5bbf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 22:04:30 +0000 Subject: [PATCH 18/37] tickrs: 0.7.1 -> 0.9.0 --- pkgs/applications/misc/tickrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 856fa60d8e63..942384f78f7c 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.7.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z"; + sha256 = "sha256-FCELPt7aBKD+mf5w9HuJqKPw64qBLgdbLIfGZEB19OI="; }; - cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n"; + cargoSha256 = "sha256-GsK0T9BfIqr0N4wxIhvvTmNEC6I2j3XPeAJMJjRiZKU="; nativeBuildInputs = [ perl ]; From 522574791ff1766ffe05aff467644af7bef9b795 Mon Sep 17 00:00:00 2001 From: Connor Date: Sat, 6 Feb 2021 17:27:41 -0500 Subject: [PATCH 19/37] wmutils-core: 1.1 -> 1.5 --- pkgs/tools/X11/wmutils-core/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index c8f3bd52c3e9..9250a10064ff 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, libxcb }: +{ lib, stdenv, fetchurl, libxcb, xcbutil, xcb-util-cursor }: stdenv.mkDerivation rec { pname = "wmutils-core"; - version = "1.1"; + version = "1.5"; src = fetchurl { url = "https://github.com/wmutils/core/archive/v${version}.tar.gz"; - sha256 = "0aq95khs154j004b79w9rgm80vpggxfqynha5rckm2cx20d1fa5s"; + sha256 = "0wk39aq2lrnc0wjs8pv3cigw3lwy2qzaw0v61bwknd5wabm25bvj"; }; - buildInputs = [ libxcb ]; + buildInputs = [ libxcb xcbutil xcb-util-cursor ]; installFlags = [ "PREFIX=$(out)" ]; From 8dd08295d5a6cc3fd03a249c5ce3ef1c4abbc5fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 23:21:16 +0000 Subject: [PATCH 20/37] ultralist: 1.5.1 -> 1.7.0 --- pkgs/applications/misc/ultralist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix index 2943fe29f4a0..af2b6be2b2ff 100644 --- a/pkgs/applications/misc/ultralist/default.nix +++ b/pkgs/applications/misc/ultralist/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ultralist"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ultralist"; repo = "ultralist"; rev = version; - sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp"; + sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; vendorSha256 = null; From 425d6c7cb997563a6f50925f7eeeb4dce5c90de9 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 6 Feb 2021 12:26:18 -0800 Subject: [PATCH 21/37] b4: init at 0.6.2 Signed-off-by: William Casarin Reviewed-by: Xinglu Chen Reviewed-by: Matthias Beyer Message-Id: 20210206202618.32583-1-jb55@jb55.com Link: https://lists.sr.ht/~andir/nixpkgs-dev/patches/20096 --- pkgs/development/tools/b4/default.nix | 36 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/b4/default.nix diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix new file mode 100644 index 000000000000..8210f7c409a5 --- /dev/null +++ b/pkgs/development/tools/b4/default.nix @@ -0,0 +1,36 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "b4"; + version = "0.6.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"; + }; + + preConfigure = '' + substituteInPlace setup.py \ + --replace 'requests~=2.24' 'requests~=2.25' + ''; + + # tests make dns requests and fails + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + requests + dnspython + dkimpy + + # These may be required in the future for other patch attestation features + #pycryptodomex~=3.9.9 + #PyNaCl + ]; + + meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; + license = licenses.gpl2Only; + description = "A helper utility to work with patches made available via a public-inbox archive"; + maintainers = with maintainers; [ jb55 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bf3fd5e4b93..120b01ec88e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11687,6 +11687,8 @@ in avrdude = callPackage ../development/tools/misc/avrdude { }; + b4 = callPackage ../development/tools/b4 { }; + babeltrace = callPackage ../development/tools/misc/babeltrace { }; bam = callPackage ../development/tools/build-managers/bam {}; From 16c10f8b05a8f09d7646d006784d7aa17cd0c678 Mon Sep 17 00:00:00 2001 From: Jakob Leifhelm Date: Sun, 7 Feb 2021 10:15:58 +0100 Subject: [PATCH 22/37] haskell-language-server: default ghc 8.10.2 -> 8.10.3 --- .../tools/haskell/haskell-language-server/withWrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 09cb60901e43..4203564ae4a5 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "865" "884" "8102" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "865" "884" "8103" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is From 442a8644feeafeca8c6f8825161ca38d25e841cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 10:07:00 +0000 Subject: [PATCH 23/37] imagemagick7: 7.0.10-46 -> 7.0.10-61 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index ee608b7538ff..58c47721b6b1 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-46"; - sha256 = "019l1qv8ds8hvyjwi1g21293a7v28bxf8ycnvr9828kpdhf4jxaa"; + version = "7.0.10-61"; + sha256 = "sha256-c/90N5H9iz5JYmn7/ynHgSOAmO5NTtkxajChZvjfMP8="; patches = []; }; in From c42ed4c89101304a6befb57adc45de558b2178a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Feb 2021 11:09:06 +0100 Subject: [PATCH 24/37] python3Packages.pyotp: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/pyotp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index ed25a3ecbe73..16916666a0d5 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.5.1"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2a54d393aff3a244b566d78d597c9cb42e91b3b12f3169cec89d9dfff1c9c5bc"; + sha256 = "d28ddfd40e0c1b6a6b9da961c7d47a10261fb58f378cb00f05ce88b26df9c432"; }; pythonImportsCheck = [ "pyotp" ]; meta = with lib; { description = "Python One Time Password Library"; - homepage = "https://github.com/pyotp/pyotp"; + homepage = "https://github.com/pyauth/pyotp"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 9b2976a62f193c2c2bc4a89d59a973520b8eb636 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Feb 2021 11:14:53 +0100 Subject: [PATCH 25/37] python3Packages.twilio: 6.43.0 -> 6.51.1 --- .../python-modules/twilio/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ff4bb845c899..56f3ba29ddf1 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pyjwt, pysocks, pytz, requests, six, nose, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, pyjwt +, pysocks +, pytz +, requests +, six +}: buildPythonPackage rec { pname = "twilio"; - version = "6.43.0"; + version = "6.51.1"; + # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0p2chrzakqx5694g305j0klh9lxlclm5qp0qjm6wqicivyybggzg"; + sha256 = "sha256-OHtmUFm/9GkpIzz0DdSdlHyBFRIgu8GxQ4S4VMJik9o="; }; buildInputs = [ nose mock ]; propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + pythonImportsCheck = [ "twilio" ]; + meta = with lib; { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; From d55603f11d36ae38ca76dec8d95bc55d2115f104 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 6 Feb 2021 14:41:26 +0100 Subject: [PATCH 26/37] chromium: Remove the Adobe Flash Player plugin support The Flash support was completely removed in Chromium M88: - https://www.chromium.org/flash-roadmap#TOC-Flash-Support-Removed-from-Chromium-Target:-Chrome-88---Jan-2021- - https://chromestatus.com/feature/5643527180517376 See #110314. --- .../networking/browsers/chromium/default.nix | 9 +- .../networking/browsers/chromium/plugins.nix | 92 ------------------- 2 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/plugins.nix diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 900e823bb75d..79899d822b00 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,7 +12,6 @@ , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true -, enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -45,10 +44,6 @@ let browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; - plugins = callPackage ./plugins.nix { - inherit enablePepperFlash; - }; - ungoogled-chromium = callPackage ./ungoogled.nix {}; }; @@ -166,7 +161,6 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; libPath = lib.makeLibraryPath [ libva pipewire_0_2 ]; in with lib; '' @@ -174,8 +168,7 @@ in stdenv.mkDerivation { eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ - ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \ - ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} ed -v -s "$out/bin/chromium" << EOF 2i diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix deleted file mode 100644 index 355f56331720..000000000000 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, gcc -, jshon -, glib -, nspr -, nss -, fetchzip -, enablePepperFlash ? false - -, upstream-info -}: - -with lib; - -let - mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; - - # Generate a shell fragment that emits flags appended to the - # final makeWrapper call for wrapping the browser's main binary. - # - # Note that this is shell-escaped so that only the variable specified - # by the "output" attribute is substituted. - mkPluginInfo = { output ? "out", allowedVars ? [ output ] - , flags ? [], envVars ? {} - }: let - shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; - shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; - # We need to triple-escape "val": - # * First because makeWrapper doesn't do any quoting of its arguments by - # itself. - # * Second because it's passed to the makeWrapper call separated by IFS but - # not by the _real_ arguments, for example the Widevine plugin flags - # contain spaces, so they would end up as separate arguments. - # * Third in order to be correctly quoted for the "echo" call below. - shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; - mkFlag = flag: ["--add-flags" (shEsc flag)]; - mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; - envList = mapAttrsToList mkEnvVar envVars; - quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); - in '' - mkdir -p "''$${output}/nix-support" - echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" - ''; - - flash = stdenv.mkDerivation rec { - pname = "flashplayer-ppapi"; - version = "32.0.0.465"; - - src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1"; - stripRoot = false; - }; - - patchPhase = '' - chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - installPhase = '' - flashVersion="$( - "${jshon}/bin/jshon" -F manifest.json -e version -u - )" - - install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" - - ${mkPluginInfo { - allowedVars = [ "out" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" - "--ppapi-flash-version=@flashVersion@" - ]; - }} - ''; - - dontStrip = true; - - meta = { - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = platforms.x86_64; - }; - }; - -in { - enabled = optional enablePepperFlash flash; -} From 0d0aeb8ed5bbdad8d01786444a07ad459c03868e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Feb 2021 12:50:05 +0100 Subject: [PATCH 27/37] metasploit: 6.0.28 -> 6.0.29 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 52 +++++++------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 80 ++++++++++++--------- 4 files changed, 75 insertions(+), 63 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 71f6b1a4c6db..7ffbb5c03235 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.28" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.29" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index a42529d4efca..926d955d2e85 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 84ecddbbed1f1957b8684c2027bb8a3e5eb163a0 - ref: refs/tags/6.0.28 + revision: f54a838fa686f495854a71cb32fadcb1853b6201 + ref: refs/tags/6.0.29 specs: - metasploit-framework (6.0.28) + metasploit-framework (6.0.29) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.27) + metasploit-payloads (= 2.0.28) metasploit_data_models - metasploit_payloads-mettle (= 1.0.5) + metasploit_payloads-mettle (= 1.0.6) mqtt msgpack nessus_rest @@ -124,23 +124,23 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.422.0) - aws-sdk-core (3.111.2) + aws-partitions (1.424.0) + aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.221.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-ec2 (1.224.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.46.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-iam (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -183,10 +183,10 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.7) + i18n (1.8.8) concurrent-ruby (~> 1.0) io-console (0.5.7) - irb (1.3.2) + irb (1.3.3) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) @@ -214,7 +214,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.27) + metasploit-payloads (2.0.28) metasploit_data_models (4.1.1) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -224,7 +224,7 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) - metasploit_payloads-mettle (1.0.5) + metasploit_payloads-mettle (1.0.6) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.3) @@ -238,7 +238,7 @@ GEM net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nio4r (2.5.4) + nio4r (2.5.5) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -260,7 +260,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.2.0) + puma (5.2.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -281,10 +281,10 @@ GEM thor (>= 0.19.0, < 2.0) rake (13.0.3) rb-readline (0.5.5) - recog (2.3.18) + recog (2.3.19) nokogiri redcarpet (3.5.1) - reline (0.2.2) + reline (0.2.3) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -294,7 +294,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.14) + rex-core (0.1.15) rex-encoder (0.1.5) metasm rex-arch @@ -374,6 +374,7 @@ GEM unf_ext (0.0.7.7) warden (1.2.9) rack (>= 2.0.9) + webrick (1.7.0) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -381,7 +382,8 @@ GEM xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) - xmlrpc (0.3.1) + xmlrpc (0.3.2) + webrick zeitwerk (2.4.2) PLATFORMS diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f50c29aebb75..e11b1dd29908 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.28"; + version = "6.0.29"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-EX3rwg8aMEb1opw/y1+Dai/1SmrfmZye5TWM3w9YiuM="; + sha256 = "sha256-QDgInLW/uOBGf0ioPPBMUZv/c9tA7OtTOfp2CEAjf24="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e8d8e01b6d55..d33ca7ce03fb 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,60 +114,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01j13abaxzi32gbdrm1v292kh331rlgcr6w1jl78hpcw6hp74r99"; + sha256 = "1dxyx3pnih7g23hq794ldapsszddcmldxf6pq3z99q4d8rg8rrqp"; type = "gem"; }; - version = "1.422.0"; + version = "1.424.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; type = "gem"; }; - version = "3.111.2"; + version = "3.112.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwd98gmnakz9bkn5kqn5wbk5q2iz7hsbd1xi8256f6ppw07wzi3"; + sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; type = "gem"; }; - version = "1.221.0"; + version = "1.224.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j0llz7m9qymfn54vim99k0fjg6vsw71ylcagz1csay6qkjxipg7"; + sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; type = "gem"; }; - version = "1.46.0"; + version = "1.47.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.41.0"; + version = "1.42.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; type = "gem"; }; - version = "1.87.0"; + version = "1.88.0"; }; aws-sigv4 = { groups = ["default"]; @@ -424,10 +424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; + sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; type = "gem"; }; - version = "1.8.7"; + version = "1.8.8"; }; io-console = { groups = ["default"]; @@ -444,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2"; + sha256 = "00c95xk8c9wzcs5imsrm85jk06y8l4dbnzhvqap98nprr9mxxnvl"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; jmespath = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "84ecddbbed1f1957b8684c2027bb8a3e5eb163a0"; - sha256 = "1qwab07xz31mwng9r6fzd95gabvahdgwngwwlbslcc0s1z1fnz8i"; + rev = "f54a838fa686f495854a71cb32fadcb1853b6201"; + sha256 = "0vkz4d00hxps759ypv20vdrzz6si9kq3ra28gx3f1f5znnf0hf20"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.28"; + version = "6.0.29"; }; metasploit-model = { groups = ["default"]; @@ -546,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2"; + sha256 = "1xln6zgdiimrbwjbdhi9008bjhmwqm13zky4310pvr7g8riffwqx"; type = "gem"; }; - version = "2.0.27"; + version = "2.0.28"; }; metasploit_data_models = { groups = ["default"]; @@ -566,10 +566,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq"; + sha256 = "1mxhybic6myh993fs4jmp0hz998ryf362y0b33wqanff1n8aj75k"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; method_source = { groups = ["default"]; @@ -696,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + sha256 = "0xbrmq1pvmszrwf40lzwmf8krs2b56720i7wsz9gh274qljkzklf"; type = "gem"; }; - version = "2.5.4"; + version = "2.5.5"; }; nokogiri = { groups = ["default"]; @@ -816,10 +816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fmcz4dp7ggkv1h4n51vn1gq0r4zbkw7sr2ssl4ws1khb86grkv5"; + sha256 = "10kj484ppkjdg1j8jac4bxdv1082bd6g6xhrj70chlp7lkgl8ggh"; type = "gem"; }; - version = "5.2.0"; + version = "5.2.1"; }; racc = { groups = ["default"]; @@ -916,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69"; + sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i"; type = "gem"; }; - version = "2.3.18"; + version = "2.3.19"; }; redcarpet = { groups = ["default"]; @@ -936,10 +936,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x"; + sha256 = "18xpix2hn4x4hihn0fjsv6i7jr7zjfbwzs94hwn48klyq3yrym2h"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.3"; }; rex-arch = { groups = ["default"]; @@ -966,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw"; + sha256 = "1bjz0mhxijvfq535hpzswr83yrq3ghkkmqna63yjsabh61qpxx16"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.15"; }; rex-encoder = { groups = ["default"]; @@ -1341,6 +1341,16 @@ }; version = "1.2.9"; }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; + }; websocket-driver = { groups = ["default"]; platforms = []; @@ -1386,10 +1396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1"; + sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; zeitwerk = { groups = ["default"]; From 58d49db69d7f9e7782dee9324589aec7109c6f19 Mon Sep 17 00:00:00 2001 From: Jan Beinke Date: Sun, 7 Feb 2021 12:41:12 +0100 Subject: [PATCH 28/37] nixos/snapserver: Fix buffer options not coercible to str --- nixos/modules/services/audio/snapserver.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index f614f0ba3e10..940ff57d7c19 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -48,8 +48,8 @@ let ++ [ "--stream.port ${toString cfg.port}" ] ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}" ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${cfg.streamBuffer}" - ++ optionalNull cfg.buffer "--stream.buffer ${cfg.buffer}" + ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${toString cfg.streamBuffer}" + ++ optionalNull cfg.buffer "--stream.buffer ${toString cfg.buffer}" ++ optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ] From 50457fa4de37968efcd7a4112e5af7cd23e9ff42 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 7 Feb 2021 12:33:37 +0000 Subject: [PATCH 29/37] kube3d: 4.1.0 -> 4.1.1 --- pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index e55df3c4c30d..d20da00f76ac 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "4.1.0"; + version = "4.1.1"; excludedPackages = "tools"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-hhgZpX6nM5viGW37gxejO1SRRlN9+m8F6j9EV9/6ApM="; + sha256 = "sha256-ZdPBlGlrgSJQlp6sWUeXm34+O30WtXHy5hvye40qew0="; }; vendorSha256 = null; From 3c347959355cb9fabd081c2b9e84b363e8132b5e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 31 Jan 2021 22:54:02 +0100 Subject: [PATCH 30/37] =?UTF-8?q?ocamlPackages.kafka:=200.4=20=E2=86=92=20?= =?UTF-8?q?0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/kafka/default.nix | 20 +++++++++---------- pkgs/development/ocaml-modules/kafka/lwt.nix | 19 ++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 3 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/ocaml-modules/kafka/lwt.nix diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 66055dca66e6..7636942033a9 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -1,26 +1,24 @@ -{ lib, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, - rdkafka, zlib }: +{ lib, fetchurl, buildDunePackage +, rdkafka, zlib }: buildDunePackage rec { pname = "kafka"; - version = "0.4"; + version = "0.5"; - src = fetchFromGitHub { - owner = "didier-wenzek"; - repo = "ocaml-kafka"; - rev = version; - sha256 = "0lb8x0wh7sf8v9mjwhq32azjz54kw49fsjfb7m76z4nhxfkjw5hy"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; + sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; }; - buildInputs = [ base cmdliner ocaml_lwt zlib ]; - propagatedBuildInputs = [ rdkafka zlib ]; meta = with lib; { homepage = "https://github.com/didier-wenzek/ocaml-kafka"; description = "OCaml bindings for Kafka"; license = licenses.mit; - maintainers = [ maintainers.rixed ]; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix new file mode 100644 index 000000000000..a6cef66b2761 --- /dev/null +++ b/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -0,0 +1,19 @@ +{ buildDunePackage +, kafka +, lwt +, cmdliner +}: + +buildDunePackage rec { + pname = "kafka_lwt"; + + inherit (kafka) version useDune2 src; + + buildInputs = [ cmdliner ]; + + propagatedBuildInputs = [ kafka lwt ]; + + meta = kafka.meta // { + description = "OCaml bindings for Kafka, Lwt bindings"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b979599e6307..c0faba640a26 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -506,6 +506,8 @@ let kafka = callPackage ../development/ocaml-modules/kafka { }; + kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; + ke = callPackage ../development/ocaml-modules/ke { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; From 6eee9edff9fa90826665fe8ecd80902e1054d538 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Feb 2021 14:42:29 +0100 Subject: [PATCH 31/37] python3Packages.pikepdf: 2.2.0 -> 2.5.2 --- .../python-modules/pikepdf/default.nix | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 38efe0a49b0a..8ed27ea962ed 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -1,4 +1,5 @@ -{ attrs +{ lib +, attrs , buildPythonPackage , defusedxml , fetchPypi @@ -6,29 +7,28 @@ , isPy3k , lxml , pillow +, psutil , pybind11 -, pytestCheckHook +, pytest-cov , pytest-helpers-namespace , pytest-timeout -, pytest_xdist -, pytestrunner +, pytest-xdist +, pytestCheckHook , python-dateutil , python-xmp-toolkit -, python3 , qpdf +, setuptools-scm , setuptools-scm-git-archive -, setuptools_scm -, lib }: buildPythonPackage rec { pname = "pikepdf"; - version = "2.2.0"; + version = "2.5.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78"; + sha256 = "sha256-j8PpeyTa+9SxrAV8jxRMGEZ85V00KhqMQmiIkOrVjvM="; }; buildInputs = [ @@ -38,36 +38,34 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm-git-archive - setuptools_scm + setuptools-scm ]; checkInputs = [ attrs hypothesis - pillow - pytestCheckHook pytest-helpers-namespace pytest-timeout - pytest_xdist - pytestrunner + pytest-xdist + psutil + pytest-cov + pytestCheckHook python-dateutil python-xmp-toolkit ]; - propagatedBuildInputs = [ defusedxml lxml ]; - - postPatch = '' - sed -i \ - -e 's/^pytest .*/pytest/g' \ - -e 's/^attrs .*/attrs/g' \ - -e 's/^hypothesis .*/hypothesis/g' \ - requirements/test.txt - ''; + propagatedBuildInputs = [ + defusedxml + lxml + pillow + ]; preBuild = '' HOME=$TMPDIR ''; + pythonImportsCheck = [ "pikepdf" ]; + meta = with lib; { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf"; From 3a5ab43771919af14396defa611cf42e0fb28077 Mon Sep 17 00:00:00 2001 From: Milan Date: Sun, 7 Feb 2021 15:13:15 +0100 Subject: [PATCH 32/37] viu: 1.2.1 -> 1.3.0 (#112287) --- pkgs/tools/graphics/viu/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 39b12326e806..39aa8fe06e05 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv"; + sha256 = "1n1qwlh1zinq5ngx04cvs69z8zr12yywr70vbrc946kbh4hx6pk9"; }; - # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 + + # tests need an interactive terminal doCheck = false; - cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr"; + cargoSha256 = "0bdjfcyx2cwz68gcx0393h4ysccarfp02pvvp0a5xgkq11bad0r0"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; From 1c39662e6304f6c8d9a0984bed0bf7b57ceeb8b3 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 2 Mar 2020 00:52:16 +0530 Subject: [PATCH 33/37] stdenv: Improve/fix FreeBSD support Able to bootstrap stdenv on FreeBSD by compiling various dependencies using built-in FreeBSD tools so mostly works now Closes: https://github.com/NixOS/nixpkgs/pull/81459 --- .../bintools-wrapper/default.nix | 1 + pkgs/stdenv/freebsd/default.nix | 194 +++++++++++++++- pkgs/stdenv/freebsd/trivial-bootstrap.sh | 210 ++++++------------ pkgs/stdenv/freebsd/trivial-builder.nix | 13 ++ pkgs/stdenv/freebsd/trivial-builder.sh | 10 + 5 files changed, 272 insertions(+), 156 deletions(-) create mode 100644 pkgs/stdenv/freebsd/trivial-builder.nix create mode 100755 pkgs/stdenv/freebsd/trivial-builder.sh diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 48a3ebb32dfe..8fef2ca6624c 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -64,6 +64,7 @@ let else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" + else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 38b168c0e72d..5aadfd81a20f 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,11 +1,170 @@ { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] }: assert crossSystem == localSystem; -let inherit (localSystem) system; in - - +let inherit (localSystem) system; + fetchURL = import ; + trivialBuilder = (import ./trivial-builder.nix); + make = trivialBuilder rec { + inherit (localSystem) system; + name = "make"; + ver = "4.3"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + bash = trivialBuilder rec { + inherit (localSystem) system; + name = "bash"; + ver = "4.4.18"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "08vz660768mnnax7n8d4d85jxafwdmsxsi7fh0hzvmafbvn9wkb0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + coreutils = trivialBuilder rec { + inherit (localSystem) system; + name = "coreutils"; + ver = "8.31"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + findutils = trivialBuilder rec { + inherit (localSystem) system; + name = "findutils"; + ver = "4.7.0"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + diffutils = trivialBuilder rec { + inherit (localSystem) system; + name = "diffutils"; + ver = "3.7"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsigsegv-prefix" + ]; + }; + grep = trivialBuilder rec { + inherit (localSystem) system; + name = "grep"; + ver = "3.4"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--disable-perl-regexp" + "--without-libsegsegv-prefix" + ]; + }; + patch = trivialBuilder rec { + inherit (localSystem) system; + name = "patch"; + ver = "2.7.6"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"; + }; + gawk = trivialBuilder rec { + inherit (localSystem) system; + name = "gawk"; + ver = "5.0.1"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + configureArgs = [ "--disable-nls" + "--disable-mpfr" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsegsegv-prefix" + ]; + }; + cpio = trivialBuilder rec { + inherit (localSystem) system; + name = "cpio"; + ver = "2.13"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "126vyg4a8wcdwh6npgvxy6gq433bzgz3ph37hmjpycc4r7cp0x78"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + sed = trivialBuilder rec { + inherit (localSystem) system; + name = "sed"; + ver = "4.8"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + cacert = fetchURL rec { + url = "https://curl.haxx.se/ca/cacert-2020-01-01.pem"; + sha256 = "07q808n307gzaga93abpf6an7c3rd35p18psdc1dd83lspgp1xxd"; + executable = false; + }; + curl = trivialBuilder rec { + inherit (localSystem) system; + name = "curl"; + ver = "7.68.0"; + url = "https://curl.haxx.se/download/${name}-${ver}.tar.xz"; + sha256 = "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p"; + configureArgs = [ "--disable-nls" + "--disable-ares" + "--disable-debug" + "--disable-ldap" + "--disable-ldaps" + "--disable-rtsp" + "--disable-dict" + "--disable-telnet" + "--disable-tftp" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--disable-manual" + "--disable-verbose" + "--disable-sspi" + "--disable-tls-srp" + "--disable-unix-sockets" + "--without-brotli" + "--without-gnutls" + "--without-mbedtls" + "--without-wolfssl" + "--without-bearssl" + "--without-libidn2" + "--without-librtmp" + "--without-nghttp2" + "--with-ssl=/usr" + "--with-ca-bundle=${cacert}" + ]; + }; + bashExe = "${bash}/bin/bash"; +in [ ({}: { @@ -13,11 +172,14 @@ let inherit (localSystem) system; in bootstrapTools = derivation { inherit system; + inherit make bash coreutils findutils + diffutils grep patch gawk cpio sed + curl; name = "trivial-bootstrap-tools"; - builder = "/usr/local/bin/bash"; + builder = bashExe; args = [ ./trivial-bootstrap.sh ]; - + buildInputs = [ make ]; mkdir = "/bin/mkdir"; ln = "/bin/ln"; }; @@ -52,6 +214,8 @@ let inherit (localSystem) system; in (prevStage: { __raw = true; + inherit (prevStage) bootstrapTools; + stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; inherit config; @@ -66,7 +230,7 @@ let inherit (localSystem) system; in (prevStage: { inherit config overlays; - stdenv = import ../generic { + stdenv = import ../generic rec { name = "stdenv-freebsd-boot-3"; inherit config; @@ -75,16 +239,30 @@ let inherit (localSystem) system; in initialPath shell fetchurlBoot; cc = import ../../build-support/cc-wrapper { + inherit lib; nativeTools = true; nativePrefix = "/usr"; nativeLibc = true; stdenvNoCC = prevStage.stdenv; + buildPackages = { + inherit (prevStage) stdenv; + }; cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "/usr"; + outPath = prevStage.bootstrapTools; }; isClang = true; + bintools = import ../../build-support/bintools-wrapper { + inherit lib; + stdenvNoCC = prevStage.stdenv; + nativeTools = true; + nativeLibc = true; + propagateDoc = false; + nativePrefix = "/usr"; + bintools = { name = "${name}-binutils"; + outPath = prevStage.bootstrapTools; }; + }; }; preHook = "export NIX_NO_SELF_RPATH=1"; diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh index fbff4575e5a4..34b4dbabc2bb 100644 --- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh +++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh @@ -3,9 +3,9 @@ set -o nounset set -o pipefail echo Building the trivial bootstrap environment... -echo -echo Needed FreeBSD packages: -echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils +#echo +#echo Needed FreeBSD packages: +#echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils $mkdir -p $out/bin @@ -28,14 +28,36 @@ ln () { fi } -ln /usr/local/bin/bash +ln $bash/bin/bash +ln $make/bin/make + ln /bin/sh -ln /usr/local/bin/gmake make +for i in b2sum base32 base64 basename basenc cat chcon chgrp chmod \ + chown chroot cksum comm cp csplit cut date dd df dir dircolors \ + dirname du echo env expand expr factor false fmt fold install \ + groups head hostid id join kill link ln logname ls md5sum mkdir \ + mkfifo mknod mktemp mv nice nl nohup nproc numfmt od paste pathchk \ + pinky pr printenv printf ptx pwd readlink realpath rm rmdir runcon \ + seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf \ + sleep sort split stat stdbuf stty sum sync tac tee test timeout \ + touch tr true truncate tsort tty uname unexpand uniq unlink uptime \ + users vdir wc who whoami yes +do + ln "$coreutils/bin/$i" "$i" +done -ln /usr/local/bin/lbzip2 +for i in find xargs; do + ln "$findutils/bin/$i" "$i" +done -ln /usr/local/bin/gdiff diff +for i in diff diff3 sdiff; do + ln "$diffutils/bin/$i" "$i" +done + +for i in grep egrep fgrep; do + ln "$grep/bin/$i" "$i" +done ln /usr/bin/locale @@ -45,160 +67,52 @@ ln /usr/bin/hexdump # for bitcoin ln /usr/bin/bzip2 ln /usr/bin/bunzip2 -ln /usr/bin/bzcat ln /usr/bin/bzip2recover ln /usr/bin/xz ln /usr/bin/unxz -ln /usr/bin/xzcat ln /usr/bin/lzma ln /usr/bin/unlzma -ln /usr/bin/lzcat -ln /usr/local/bin/gcp cp -ln /usr/local/bin/gdd dd -ln /usr/local/bin/gmv mv -ln /usr/local/bin/grm rm -ln /usr/local/bin/gls ls -ln /bin/ps ps -ln /usr/local/bin/gcat cat -ln /usr/local/bin/gecho echo -ln /usr/local/bin/gexpr expr -ln /usr/local/bin/gtest test -ln /usr/local/bin/gdate date -ln /usr/local/bin/gchmod chmod -ln /usr/local/bin/grmdir rmdir -ln /usr/local/bin/gsleep sleep -ln /bin/hostname hostname - -ln /usr/local/bin/gid id -ln /usr/local/bin/god od -ln /usr/local/bin/gtr tr -ln /usr/local/bin/gwc wc -ln /usr/local/bin/gcut cut -ln /usr/bin/cmp cmp -ln /usr/local/bin/gsed sed -ln /usr/local/bin/gtar tar -ln /usr/local/bin/xar xar -ln /usr/local/bin/gawk awk -ln /usr/local/bin/genv env -ln /usr/local/bin/gtee tee -ln /usr/local/bin/gcomm comm -ln /usr/local/bin/gcpio cpio -ln /usr/local/bin/curl curl -ln /usr/local/bin/gfind find -ln /usr/local/bin/grep grep # other grep is in /usr/bin +ln /bin/ps +ln /bin/hostname +ln /usr/bin/cmp +ln $sed/bin/sed +ln /usr/bin/tar tar +ln $gawk/bin/gawk +ln $gawk/bin/gawk awk +ln $cpio/bin/cpio +ln $curl/bin/curl curl ln /usr/bin/gzip ln /usr/bin/gunzip -ln /usr/bin/zcat -ln /usr/local/bin/ghead head ln /usr/bin/tail tail # note that we are not using gtail!!! -ln /usr/local/bin/guniq uniq ln /usr/bin/less less -ln /usr/local/bin/gtrue true -# ln /usr/bin/diff diff # we are using gdiff (see above) -ln /usr/local/bin/egrep egrep -ln /usr/local/bin/fgrep fgrep -ln /usr/local/bin/gpatch patch -ln /usr/local/bin/guname uname -ln /usr/local/bin/gtouch touch -ln /usr/local/bin/gsplit split -ln /usr/local/bin/gxargs xargs +ln $patch/bin/patch patch ln /usr/bin/which which -ln /usr/local/bin/ginstall install -ln /usr/local/bin/gbasename basename -ln /usr/local/bin/gdirname dirname -ln /usr/local/bin/greadlink readlink -ln /usr/local/bin/gln ln -ln /usr/local/bin/gyes yes -ln /usr/local/bin/gwhoami whoami -ln /usr/local/bin/gvdir vdir -ln /usr/local/bin/gusers users -ln /usr/local/bin/guptime uptime -ln /usr/local/bin/gunlink unlink -ln /usr/local/bin/gtty tty -ln /usr/local/bin/gunexpand unexpand -ln /usr/local/bin/gtsort tsort -ln /usr/local/bin/gtruncate truncate -ln /usr/local/bin/gtimeout timeout -ln /usr/local/bin/gtac tac -ln /usr/local/bin/gsync sync -ln /usr/local/bin/gsum sum -ln /usr/local/bin/gstty stty -ln /usr/local/bin/gstdbuf stdbuf -ln /usr/local/bin/gsort sort -ln /usr/local/bin/gruncon runcon -ln /usr/local/bin/gseq seq -ln /usr/local/bin/gsha1sum sha1sum -ln /usr/local/bin/gsha224sum sha224sum -ln /usr/local/bin/gsha256sum sha256sum -ln /usr/local/bin/gsha384sum sha384sum -ln /usr/local/bin/gsha512sum sha512sum -ln /usr/local/bin/gshred shred -ln /usr/local/bin/gshuf shuf -ln /usr/local/bin/grealpath realpath -ln "/usr/local/bin/g[" "[" -ln /usr/local/bin/gbase64 base64 -ln /usr/local/bin/gchcon chcon -ln /usr/local/bin/gchgrp chgrp -ln /usr/local/bin/gchown chown -ln /usr/local/bin/gchroot chroot -ln /usr/local/bin/gcksum cksum -ln /usr/local/bin/gcsplit csplit -ln /usr/local/bin/gdf df -ln /usr/local/bin/gdircolors dircolors -ln /usr/local/bin/gdu du -ln /usr/local/bin/gexpand expand -ln /usr/local/bin/gfactor factor -ln /usr/local/bin/gfalse false -ln /usr/local/bin/gfmt fmt -ln /usr/local/bin/gfold fold -ln /usr/local/bin/ggroups groups -ln /usr/local/bin/ghostid hostid -ln /usr/local/bin/gjoin join -ln /usr/local/bin/gkill kill -ln /usr/local/bin/glink link -ln /usr/local/bin/glogname logname -ln /usr/local/bin/gmd5sum md5sum -ln /usr/local/bin/gmkdir mkdir -ln /usr/local/bin/gmkfifo mkfifo -ln /usr/local/bin/gmknod mknod -ln /usr/local/bin/gmktemp mktemp -ln /usr/local/bin/gnice nice -ln /usr/local/bin/gnl nl -ln /usr/local/bin/gnohup nohup -ln /usr/local/bin/gnproc nproc -ln /usr/local/bin/gnumfmt numfmt -ln /usr/local/bin/gnustat nustat -ln /usr/local/bin/gpaste paste -ln /usr/local/bin/gpathchk pathchk -ln /usr/local/bin/gpinky pinky -ln /usr/local/bin/gpr pr -ln /usr/local/bin/gprintenv printenv -ln /usr/local/bin/gprintf printf -ln /usr/local/bin/gptx ptx -ln /usr/local/bin/gpwd pwd - -# binutils +## binutils # pkg info -l binutils | grep usr/local/bin -ln /usr/local/bin/addr2line -ln /usr/local/bin/ar -ln /usr/local/bin/as -ln /usr/local/bin/c++filt -ln /usr/local/bin/dwp -ln /usr/local/bin/elfedit -ln /usr/local/bin/gprof -ln /usr/local/bin/ld -ln /usr/local/bin/ld.bfd -ln /usr/local/bin/ld.gold -ln /usr/local/bin/nm -ln /usr/local/bin/objcopy -ln /usr/local/bin/objdump -ln /usr/local/bin/ranlib -ln /usr/local/bin/readelf -ln /usr/local/bin/size -ln /usr/local/bin/strings -ln /usr/local/bin/strip +ln /usr/bin/addr2line +ln /usr/bin/ar +ln /usr/bin/as +ln /usr/bin/c++filt +#ln /usr/bin/dwp +#ln /usr/bin/elfedit +ln /usr/bin/gprof +ln /usr/bin/ld +#ln /usr/bin/ld.bfd +#ln /usr/bin/ld.gold +ln /usr/bin/nm +ln /usr/bin/objcopy +ln /usr/bin/objdump +ln /usr/bin/ranlib +ln /usr/bin/readelf +ln /usr/bin/size +ln /usr/bin/strings +ln /usr/bin/strip + +ln /usr/bin/cc +ln /usr/bin/cpp +ln /usr/bin/c++ #pkg info -l llvm37 | grep usr/local/bin diff --git a/pkgs/stdenv/freebsd/trivial-builder.nix b/pkgs/stdenv/freebsd/trivial-builder.nix new file mode 100644 index 000000000000..64265081f542 --- /dev/null +++ b/pkgs/stdenv/freebsd/trivial-builder.nix @@ -0,0 +1,13 @@ +{ system, name, ver, url, sha256, configureArgs ? [], executable ? false } : + +let fetchURL = import ; + +in derivation { + inherit system configureArgs; + name = "trivial-bootstrap-${name}-${ver}"; + dname = "${name}-${ver}"; + src = fetchURL { + inherit url sha256 executable; + }; + builder = ./trivial-builder.sh; +} diff --git a/pkgs/stdenv/freebsd/trivial-builder.sh b/pkgs/stdenv/freebsd/trivial-builder.sh new file mode 100755 index 000000000000..ac5601b5ba0c --- /dev/null +++ b/pkgs/stdenv/freebsd/trivial-builder.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + +tar -zxvf $src +cd $dname +mkdir -p $out/bin +./configure --prefix=$out $configureArgs +make +make install From 56dc6a7f0870ed543f4cc19a6193072588f47818 Mon Sep 17 00:00:00 2001 From: Ashlynn Anderson Date: Sun, 7 Feb 2021 11:00:42 -0500 Subject: [PATCH 34/37] releaseTools.debBuild: remove double lib in args Seems to have been added during some sweeping changes, but breaks calling `releaseTools.debBuild` --- pkgs/build-support/release/debian-build.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 2544d5c740c2..4c2d82ce630b 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -2,7 +2,6 @@ # that contains a Debian-like (i.e. dpkg-based) OS. { name ? "debian-build" -, lib , diskImage , src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false From 1626c49714485897187a033914321a0dbfa4bd1f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 27 Jan 2021 00:28:04 +0000 Subject: [PATCH 35/37] gnupg: drop obsolete Emacs syntax highlighting fix Emacs + nix-mode highlights this file just fine without this comment for me, so I assume the problem in nix-mode has been fixed in the five years since this comment was added. --- pkgs/tools/security/gnupg/22.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 90ae4300fa64..1030ce3e7910 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in '' + lib.optionalString ( stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; #" fix Emacs syntax highlighting :-( + ''; pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; configureFlags = [ From 8d1f23cdd311c37810bcec30fc099ca3fa9345c9 Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky Date: Fri, 1 Jan 2021 19:58:30 +0200 Subject: [PATCH 36/37] dwm-git: 20180602 -> 20200303 --- pkgs/applications/window-managers/dwm/git.nix | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix index 71e91b6093b3..a13fc78fbfb4 100644 --- a/pkgs/applications/window-managers/dwm/git.nix +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: - -let - name = "dwm-git-20180602"; -in +{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, writeText, patches ? [ ] +, conf ? null }: stdenv.mkDerivation { - inherit name; + pname = "dwm-git"; + version = "20200303"; src = fetchgit { url = "git://git.suckless.org/dwm"; - rev = "b69c870a3076d78ab595ed1cd4b41cf6b03b2610"; - sha256 = "10i079h79l4gdch1qy2vrrb2xxxkgkjmgphr5r9a75jbbagwvz0k"; + rev = "61bb8b2241d4db08bea4261c82e27cd9797099e7"; + sha256 = "1j3vly8dln35vnwnwwlaa8ql9fmnlmrv43jcyc8dbfhfxiw6f34l"; }; buildInputs = [ libX11 libXinerama libXft ]; @@ -20,18 +18,19 @@ stdenv.mkDerivation { # Allow users set their own list of patches inherit patches; - # Allow users to override the entire config file AFTER appying the patches - postPatch = lib.optionalString (conf!=null) '' - echo -n '${conf}' > config.def.h - ''; - - buildPhase = "make"; + # Allow users to set the config.def.h file containing the configuration + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf then + conf + else + writeText "config.def.h" conf; + in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; meta = with lib; { homepage = "https://suckless.org/"; description = "Dynamic window manager for X, development version"; license = licenses.mit; - maintainers = with maintainers; [xeji]; + maintainers = with maintainers; [ xeji ]; platforms = platforms.unix; }; } From 77ffc4c2413dc4e1d269e1ec65d4b005188f8536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Feb 2021 18:01:34 +0100 Subject: [PATCH 37/37] pbpst: drop (#112127) has been marked as broken since October 2019 --- pkgs/applications/misc/pbpst/default.nix | 50 ------------------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 52 deletions(-) delete mode 100644 pkgs/applications/misc/pbpst/default.nix diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix deleted file mode 100644 index 68b1908e5150..000000000000 --- a/pkgs/applications/misc/pbpst/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ llvmPackages, lib, stdenv, fetchFromGitHub -, python36Packages, which, pkg-config, curl, git, gettext, jansson - -# Optional overrides -, maxFileSize ? 64 # in MB -, provider ? "https://ptpb.pw/" -}: - -llvmPackages.stdenv.mkDerivation rec { - version = "unstable-2018-01-11"; - name = "pbpst-${version}"; - - src = fetchFromGitHub { - owner = "HalosGhost"; - repo = "pbpst"; - rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346"; - sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm"; - }; - - nativeBuildInputs = [ - python36Packages.sphinx - which - pkg-config - curl - git - gettext - ]; - buildInputs = [ curl jansson ]; - - patchPhase = '' - patchShebangs ./configure - - # Remove hardcoded check for libs in /usr/lib/ - sed -e '64,67d' -i ./configure - ''; - - configureFlags = [ - "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes - "--provider=${provider}" - ]; - - meta = with lib; { - description = "A command-line libcurl C client for pb deployments"; - inherit (src.meta) homepage; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ tmplt ]; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90b3cad110ec..c905b2e9fec0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2664,8 +2664,6 @@ in pbgopy = callPackage ../tools/text/pbgopy { }; - pbpst = callPackage ../applications/misc/pbpst { }; - pbzx = callPackage ../tools/compression/pbzx { }; pcb2gcode = callPackage ../tools/misc/pcb2gcode { };