From f35608850741b871679e0a894b8346d0a1938d0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 24 Feb 2021 11:17:22 +0000 Subject: [PATCH 01/63] ocamlPackages.alcotest: 1.2.3 -> 1.3.0 Co-authored-by: sternenseemann --- pkgs/development/ocaml-modules/alcotest/default.nix | 4 ++-- pkgs/development/ocaml-modules/alcotest/lwt.nix | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 94626f3c1798..abef3ef7ef46 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "alcotest"; - version = "1.2.3"; + version = "1.3.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz"; - sha256 = "1bmjcivbmd4vib15v4chycgd1gl8js9dk94vzxkdg06zxqd4hp08"; + sha256 = "sha256-efnevbyolTdNb91zr4pHDcvgaLQQSD01wEu2zMM+iaw="; }; propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ]; diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index 82efbe91a069..5a57dc0fcc2e 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, alcotest, logs, ocaml_lwt }: +{ lib, buildDunePackage, alcotest, logs, ocaml_lwt, fmt +, re, cmdliner +}: buildDunePackage { pname = "alcotest-lwt"; inherit (alcotest) version src useDune2; - propagatedBuildInputs = [ alcotest logs ocaml_lwt ]; + propagatedBuildInputs = [ alcotest logs ocaml_lwt fmt ]; doCheck = true; + checkInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; From c2564222c5d0626cb5bf7f3aead74ad61bdcd8d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 00:01:37 +0000 Subject: [PATCH 02/63] terminus_font_ttf: 4.47.0 -> 4.49.1 --- pkgs/data/fonts/terminus-font-ttf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index f9d25a0128ef..1a65798891f5 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "4.47.0"; + version = "4.49.1"; in fetchzip { name = "terminus-font-ttf-${version}"; @@ -18,7 +18,7 @@ in fetchzip { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; - sha256 = "1mnx3vlnl0r15yzsa4zb9qqab4hpi603gdwhlbw960wg03i3xn8z"; + sha256 = "sha256-UaTnCamIRN/3xZsYt5nYzvykXQ3ri94a047sWOJ2RfU="; meta = with lib; { description = "A clean fixed width TTF font"; From c8d210f7a3d44497c8b29edaa747aec6a20b90c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 03:00:26 +0000 Subject: [PATCH 03/63] gitlab-pages: 1.39.0 -> 1.40.0 --- pkgs/servers/http/gitlab-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index a26dd47e0243..c62ad8b75c9c 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-eyg2o/5k7/zagYjkYJOnJrHeoszbRkmdl7UgO+rmKyc="; + sha256 = "sha256-RgWDAvuxqZeFCU+Q2s+FDIM/AroIdnfVq/D5lG4XN7U="; }; - vendorSha256 = "sha256-aedJ7vsv70aybjqBfUnSr4qhlFdY7jUUOSas3vXskpM="; + vendorSha256 = "sha256-HbMM0IHw1DMDlNN1m2EHaG9CXnj9j9xROPQiT2xTGlM="; subPackages = [ "." ]; meta = with lib; { From 19194c50a2da81910a0ddc285736ea476bd67a1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Jun 2021 02:07:44 +0000 Subject: [PATCH 04/63] codeql: 2.5.5 -> 2.5.6 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 25d61d2393e5..a2396314387c 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.5"; + version = "2.5.6"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-M5O2NEGIVPWYKl11yxMMVreEtDO1VqcMkiGGrjNmk3A="; + sha256 = "sha256-YBGKIfBTU7MRm1Om4Jknd5Nu77qJftCgjuohcO/9X/w="; }; nativeBuildInputs = [ From 200d662a3ef3bafbbbf8ff6736d54e12e8657f8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jun 2021 18:20:12 +0000 Subject: [PATCH 05/63] cloud-nuke: 0.1.30 -> 0.2.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index b947fc1ebfe2..ecb6991d3d90 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.30"; + version = "0.2.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uQj14arxDPc8/k1Cvp3T6hqjln30NFk9MzvYy8tAiJ8="; + sha256 = "sha256-FQx5k6HuOf3gKa71LteNGhH2KILUQ+aeKmtQXRwTNYI="; }; - vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; + vendorSha256 = "sha256-VsP1YWvszux7qiRVLRF40NX3qoNOa9yrfRhQAaw7aKI="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; From a174b255dbd32629554f451a28cdffe9aafd79f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 03:34:43 +0000 Subject: [PATCH 06/63] goreleaser: 0.172.0 -> 0.172.1 --- pkgs/tools/misc/goreleaser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index f5ed58f84fd2..18c936befb4c 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.172.0"; + version = "0.172.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QHtxrdmtmvnyMmtpvbEw5VjGz2XN1iqHu+5dHS9yiNo="; + sha256 = "sha256-xTLNAcqvk5GDs9HsNvL+4SPeT8baFMg7J0yW+E8x+Gc="; }; vendorSha256 = "sha256-Zd48I7e5zCbSXz5RVckMXQMpqvf6gAoajx5yLk2ODmU="; From 2578fb9c9f0fea270507e4546a4cbabfc6f130d7 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Thu, 1 Jul 2021 19:15:25 +0200 Subject: [PATCH 07/63] spacevim: 1.6.0 -> 1.7.0 --- .../applications/editors/spacevim/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index 661bec463a78..9f6f895efac4 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -1,8 +1,19 @@ -{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub -, lib, stdenv, formats, runCommand, spacevim_config ? import ./init.nix }: +{ ripgrep +, git +, fzf +, makeWrapper +, vim_configurable +, vimPlugins +, fetchFromGitHub +, lib +, stdenv +, formats +, runCommand +, spacevim_config ? import ./init.nix +}: let - format = formats.toml {}; + format = formats.toml { }; vim-customized = vim_configurable.customize { name = "vim"; # Not clear at the moment how to import plugins such that @@ -14,17 +25,18 @@ let mkdir -p $out cp ${format.generate "init.toml" spacevim_config} $out/init.toml ''; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "spacevim"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; rev = "v${version}"; - sha256 = "sha256-QQdtjEdbuzmf0Rw+u2ZltLihnJt8LqkfTrLDWLAnCLE="; + sha256 = "sha256-TmfPeaGkH1Wq2b5lB29PUYDVddJVN3mBuPAmu9EtiGY="; }; - nativeBuildInputs = [ makeWrapper vim-customized]; + nativeBuildInputs = [ makeWrapper vim-customized ]; buildInputs = [ vim-customized ]; buildPhase = '' From ae852aa5ae5e803efaccfc4d5d7d7a1518391fc8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 2 Jul 2021 04:20:00 +0000 Subject: [PATCH 08/63] postgresqlPackages.postgis: 3.1.2 -> 3.1.3 --- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 81f3f4fee254..4b69aca710ad 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.2"; + version = "3.1.3"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "0ch7gry8a1i9114mlhklxryn7ja3flsz6pxj9r5p09k92xh3gp9c"; + sha256 = "1jwz6hdrym837b7dvn00qmwnbb40a7gr43va409h8fmp7dajksbi"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] From 3f60593bba2fa1e846b9d5a37226738a292462f7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 1 Jul 2021 21:50:41 +0200 Subject: [PATCH 09/63] masterpdfeditor: mark as broken, drop myself from maintainers Upstream seems have (re)moved their tarballs, thus causing the build to fail. I haven't been using this enough frequently to call myself a maintainer, so I'll remove myself from that list, too. --- pkgs/applications/misc/masterpdfeditor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2fd217e3cd6a..72028478e6ee 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai flokli ]; + broken = true; + maintainers = with maintainers; [ cmcdragonkai ]; }; } From 71b306ba1079927e3f57d071bda2b8eaf5aa01a6 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 2 Jul 2021 08:55:21 +0100 Subject: [PATCH 10/63] boundary: 0.3.0 -> 0.4.0 --- pkgs/tools/networking/boundary/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index ab26a39035ea..5c9abf578924 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.3.0"; + version = "0.4.0"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-vBXNDd9p9g1joBMcwt87uI/EIAeKa+QrndCh1kTwZyM="; - aarch64-linux = "sha256-Xompe1Q8Q3gAqpQQT04CWDx/f0Yc8HbnkZQbN+faB0g="; - x86_64-darwin = "sha256-cE4YrZPNAldCR31O3gI4W/y4RgV7+64yL15obb5uRcY="; + x86_64-linux = "sha256-xHvg2Kdm7hoJ7Dwh4pLXJE+EPcl9Zta/00IN3wRnOzU="; + aarch64-linux = "sha256-Kbr7tZjVcYiejy1CB9r10mqG+0serRx+mjPXds2/TJQ="; + x86_64-darwin = "sha256-a8e3gKTTsK5QRAYrB4/DtrFFGM2In73wKEcEMcbeUTI="; }; in fetchzip { From 4d957e8613114d5d7f607febe88c4658e922738e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Jul 2021 11:25:57 +0200 Subject: [PATCH 11/63] pythonPackages.micloud: init at 0.3 --- .../python-modules/micloud/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/micloud/default.nix diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix new file mode 100644 index 000000000000..3b3bf4484497 --- /dev/null +++ b/pkgs/development/python-modules/micloud/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, requests +, tzlocal +}: + +buildPythonPackage rec { + pname = "micloud"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "Squachen"; + repo = "micloud"; + rev = "v_${version}"; + sha256 = "0267zyr79nfb5f9rwdwq3ym258yrpxx1b71xiqmszyz5s83mcixm"; + }; + + propagatedBuildInputs = [ + click + requests + tzlocal + ]; + + # tests require credentials + doCheck = false; + + pythonImportsCheck = [ "micloud" ]; + + meta = with lib; { + description = "Xiaomi cloud connect library"; + homepage = "https://github.com/Squachen/micloud"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d166332109a0..74b8eea2f028 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5235,6 +5235,8 @@ in { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + micloud = callPackage ../development/python-modules/micloud { }; + netmap = callPackage ../development/python-modules/netmap { }; openapi-core = callPackage ../development/python-modules/openapi-core { }; From 6553523fa870c06b51d2f7ec92140d5a693d8cbc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 12:03:46 +0200 Subject: [PATCH 12/63] python3Packages.devolo-home-control-api: 0.17.3 -> 0.17.4 --- .../python-modules/devolo-home-control-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 44a0165d6fd8..751ebaae292c 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.17.3"; + version = "0.17.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "1h7admqb1l28sxwhhkkhw0sfzgpn8zpczvmi3h28f68csflkv379"; + sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; }; propagatedBuildInputs = [ From 218bd6c625682554f8c3ab0f6c9b30eed5616ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Jul 2021 13:06:54 +0200 Subject: [PATCH 13/63] pythonPackages.flask-restx: 0.3.0 -> 0.4.0 https://github.com/python-restx/flask-restx/releases/tag/0.4.0 --- .../python-modules/flask-restx/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index e1de7bf0d3b3..4d0d89d0f146 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -20,16 +20,23 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "0.3.0"; + version = "0.4.0"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = version; - sha256 = "0aj13nd3z71gb8c2kqiaz3f9k7jr0srlvrsx8hpz4nkpki8jiz2s"; + sha256 = "sha256-jM0QJ/klbWh3qho6ZQOH2n1qaguK9C98QIuSfqpI8xA="; }; + postPatch = '' + # https://github.com/python-restx/flask-restx/pull/341 + substituteInPlace requirements/install.pip \ + --replace "Flask>=0.8, <2.0.0" "Flask>=0.8, !=2.0.0" \ + --replace "werkzeug <2.0.0" "werkzeug !=2.0.0" + ''; + propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] ++ lib.optionals isPy27 [ enum34 ]; @@ -42,6 +49,8 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; + pythonImportCheck = [ "flask_restx" ]; + meta = with lib; { homepage = "https://flask-restx.readthedocs.io/en/${version}/"; description = "Fully featured framework for fast, easy and documented API development with Flask"; From 330f8a1629ca8959464fff17c836640c9c0ce370 Mon Sep 17 00:00:00 2001 From: KireinaHoro Date: Fri, 2 Jul 2021 19:56:39 +0800 Subject: [PATCH 14/63] mill: 0.9.6 -> 0.9.8 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 4fbd0365af95..4682fab41db1 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.6"; + version = "0.9.8"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM="; + sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o="; }; nativeBuildInputs = [ makeWrapper ]; From adc5cb1f8a013a94e0cd9723fb14ae03ad309a86 Mon Sep 17 00:00:00 2001 From: Kovacsics Robert Date: Fri, 2 Jul 2021 17:20:55 +0100 Subject: [PATCH 15/63] noweb: fix nawk binary name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The package `nawk` seems to supply the binary `nawk` not `awk`, not sure if this was always thus, or if this is a new change. ``` $ tree `nix eval -f '' --raw nawk` /nix/store/jji0m1by0nks2pdplk6xpwqq0dz8qy2s-nawk-unstable-2021-02-15 ├── bin │ └── nawk └── share └── man └── man1 └── nawk.1.gz ``` --- pkgs/development/tools/literate-programming/noweb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index c02764035161..6847aff097c8 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -57,7 +57,7 @@ lib.fix (noweb: stdenv.mkDerivation rec { # NOTE: substituteInPlace breaks Icon binaries, so make sure the script # uses (n)awk before calling. if grep -q nawk "$f"; then - substituteInPlace "$f" --replace "nawk" "${nawk}/bin/awk" + substituteInPlace "$f" --replace "nawk" "${nawk}/bin/nawk" fi done From 745db4ce64126a91f64b489868e5f76ba220827b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 20:47:39 +0200 Subject: [PATCH 16/63] python3Packages.dbutils: 2.0 -> 2.0.1 --- pkgs/development/python-modules/dbutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 848e5038af8d..294456cc85bd 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { - version = "2.0"; + version = "2.0.1"; pname = "dbutils"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g"; + sha256 = "sha256-Vw590TbBMRb+74vKGGCeP2a4ZoqcPV8hCdh0TERE2GE="; }; checkInputs = [ pytestCheckHook ]; From 74f807d9f01d1b6f1a2db7b7ae9783816c576c59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 21:05:45 +0200 Subject: [PATCH 17/63] python3Packages.deezer-python: 2.2.4 -> 2.3.0 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index cd24ae0fd3e9..926dadd031cf 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "2.2.4"; + version = "2.3.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "11gqmyf350256gbppak2qv20lg2bmszand4kmks93wphq5yp2iiy"; + sha256 = "sha256-pRYC0kJHJ5SKgDdGS1KkQEbv+DkF9oPw/A1GnB0AwfQ="; }; nativeBuildInputs = [ From 070ff032a227ef302949eef375cf7561899ad7e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 21:26:12 +0200 Subject: [PATCH 18/63] python3Packages.dicom2nifti: 2.2.12 -> 2.3.0 --- pkgs/development/python-modules/dicom2nifti/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index a9c2e4e82373..dd43902949ab 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.2.12"; + version = "2.3.0"; disabled = isPy27; # no tests in PyPI dist @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "icometrix"; repo = pname; rev = version; - sha256 = "0ddzaw0yasyi2wsh7a6r73cdcmdfbb0nh0k0n4yxp9vnkw1ag5z4"; + sha256 = "sha256-QSu9CGXFjDpI25Cy6QSbrwiQ2bwsVezCUxSovRLs6AI="; }; propagatedBuildInputs = [ nibabel numpy pydicom scipy setuptools ]; From 4a397269c9d0ef0b731942415f787b2e4053eb2f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Jul 2021 12:58:42 -0700 Subject: [PATCH 19/63] zfs: 2.0.5 -> 2.1.0 --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7d715cc3c092..506cc5e6a3ef 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -195,12 +195,12 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to the latest release. - version = "2.0.5"; + version = "2.1.0"; - sha256 = "0n0d8ab7ibxxa8znfsprh7jxwgighx5g291v7hi8272vfjrmk1mj"; + sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; }; zfsUnstable = common { From 6f1b155d37337dc0cf7dc075b9291f3b2dedca69 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Jul 2021 12:59:20 -0700 Subject: [PATCH 20/63] zfsUnstable: 2.1.0-rc8 -> 2.1.0 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 506cc5e6a3ef..7784aa8e03fe 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -208,9 +208,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc8"; + version = "2.1.0"; - sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac"; + sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; isUnstable = true; }; From f5d06019b75b99d3ec4530146a804af886573724 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 22:10:08 +0200 Subject: [PATCH 21/63] python3Packages.emoji: 1.2.0 -> 1.4.0 --- .../python-modules/emoji/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index ce2beb235116..67c9c7a1abd0 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "emoji"; - version = "1.2.0"; + version = "1.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "18siknldyqvxvjf0nv18m0a1c26ahkg7vmhkij1qayanb0h46vs9"; + src = fetchFromGitHub { + owner = "carpedm20"; + repo = pname; + rev = "v.${version}"; + sha256 = "0xksxdld20sh3c2s6pry1fm2br9xq8ypdq5pf971fpg5pk2f4iy9"; }; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "nosetests"; + disabledTests = [ + "test_emojize_name_only" + ]; + + pythonImportsCheck = [ "emoji" ]; meta = with lib; { description = "Emoji for Python"; - homepage = "https://pypi.python.org/pypi/emoji/"; + homepage = "https://github.com/carpedm20/emoji/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; From cd80a0e160806dbe585a185209aa7b9bbee41d8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 22:13:15 +0200 Subject: [PATCH 22/63] python3Packages.emailthreads: 0.1.0 -> 0.1.3 --- pkgs/development/python-modules/emailthreads/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 36553daff55f..c57e58368ff8 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "emailthreads"; - version = "0.1.0"; + version = "0.1.3"; disabled = !isPy3k; # pypi is missing files for tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "emersion"; repo = "python-emailthreads"; rev = "v${version}"; - sha256 = "17pfal8kbxhs025apkijqbkppw2lljca8x1cwcx49jv60h05c3cn"; + sha256 = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; }; PKGVER = version; From 73e9987d7d056c5753e353dbaa88c8f50a7d5c83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 22:19:57 +0200 Subject: [PATCH 23/63] python3Packages.fabulous: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/fabulous/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix index 6079f22020a2..b357eb0c01b4 100644 --- a/pkgs/development/python-modules/fabulous/default.nix +++ b/pkgs/development/python-modules/fabulous/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fabulous"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jart"; repo = pname; rev = version; - sha256 = "0yxdaz6yayp1a57kdb2i8q7kwwdlwy4a3d0lr012h2ji9m89c8q7"; + sha256 = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; patches = [ From a150d5f6f322ac364fb19e728bb5a8307055758b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 22:33:12 +0200 Subject: [PATCH 24/63] python3Packages.emcee: 3.0.2 -> 3.1.0 --- .../python-modules/emcee/default.nix | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index a4f2bece3497..72cb9a64db0a 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -1,20 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi -, numpy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "emcee"; - version = "3.0.2"; + version = "3.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "035a44d7594fdd03efd10a522558cdfaa080e046ad75594d0bf2aec80ec35388"; + src = fetchFromGitHub { + owner = "dfm"; + repo = pname; + rev = "v${version}"; + sha256 = "1x9y4zwlv6hl7jms2knpa2qrh89ywsl847yb7d93n94gyx2s16p0"; }; - propagatedBuildInputs = [ numpy ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "emcee" ]; meta = with lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; homepage = "https://emcee.readthedocs.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 6ae86bd0f6d0e44f459919ee2c7be7a0877d6b46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 23:38:03 +0200 Subject: [PATCH 25/63] python3Packages.dask: 2021.06.1 -> 2021.06.2 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b51ac1701a2e..208856490b86 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.06.1"; + version = "2021.06.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-wrUqLSmlKhd0NSjWBwbow8aX53ZBTgl2n4lEmvxC3bs="; + sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; }; propagatedBuildInputs = [ From dab21493f86bd73569f6771a94383dff16419533 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 23:38:33 +0200 Subject: [PATCH 26/63] python3Packages.distributed: 2021.6.1 -> 2021.6.2 --- .../python-modules/distributed/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 605e905d4ab4..ce0cf13e9a92 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -6,7 +6,6 @@ , dask , msgpack , psutil -, six , sortedcontainers , tblib , toolz @@ -20,27 +19,39 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.6.1"; + version = "2021.6.2"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-Z79h/WAio5diX2myChx8HPAWe2RB4Ajw7Ybch4XUYFc="; + sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; }; propagatedBuildInputs = [ - click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + bokeh + click + cloudpickle + dask + mpi4py + msgpack + psutil + pyyaml + sortedcontainers + tblib + toolz + tornado + zict ]; # when tested random tests would fail and not repeatably doCheck = false; + pythonImportsCheck = [ "distributed" ]; meta = with lib; { - description = "Distributed computation in Python."; - homepage = "https://distributed.readthedocs.io/en/latest/"; + description = "Distributed computation in Python"; + homepage = "https://distributed.readthedocs.io/"; license = licenses.bsd3; platforms = platforms.x86; # fails on aarch64 maintainers = with maintainers; [ teh costrouc ]; From dd33cc8b9203a448bfbb8a68b79c0749241182c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 23:55:12 +0200 Subject: [PATCH 27/63] python3Packages.diff_cover: 5.2.0 -> 5.4.0 --- .../python-modules/diff_cover/default.nix | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 7eeb378ff417..b77a917702a9 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -1,41 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage , chardet +, fetchPypi , inflect , jinja2 , jinja2_pluralize -, pygments -, six -# test dependencies -, coverage -, mock -, nose , pycodestyle , pyflakes +, pygments , pylint -, pytest +, pytest-mock +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "diff_cover"; - version = "5.2.0"; - - preCheck = '' - export LC_ALL=en_US.UTF-8; - ''; + version = "5.4.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a1cd54232d2e48bd4c1eabc96cfe4a8727a9a92fd2556b52ff8f65bb8adf8768"; + sha256 = "sha256-4iQ9/QcXh/lW8HE6wFZWc6Y57xhAEWu2TQnIUZJNAMs="; }; - propagatedBuildInputs = [ chardet jinja2 jinja2_pluralize pygments six inflect ]; + propagatedBuildInputs = [ + chardet + inflect + jinja2 + jinja2_pluralize + pygments + ]; - checkInputs = [ mock coverage pytest nose pylint pyflakes pycodestyle ]; + checkInputs = [ + pycodestyle + pyflakes + pylint + pytest-mock + pytestCheckHook + ]; - # ignore tests which try to write files - checkPhase = '' - pytest -k 'not added_file_pylint_console and not file_does_not_exist' - ''; + disabledTests = [ + "added_file_pylint_console" + "file_does_not_exist" + ]; + + pythonImportsCheck = [ "diff_cover" ]; meta = with lib; { description = "Automatically find diff lines that need test coverage"; From 9a1a5e8101d08c897054bd47e3d976f77cd5a8a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 00:00:21 +0200 Subject: [PATCH 28/63] python3packages.diff-cover: rename from diff_cover --- .../python-modules/{diff_cover => diff-cover}/default.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{diff_cover => diff-cover}/default.nix (92%) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix similarity index 92% rename from pkgs/development/python-modules/diff_cover/default.nix rename to pkgs/development/python-modules/diff-cover/default.nix index b77a917702a9..7a9e1205979a 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -15,12 +15,13 @@ }: buildPythonPackage rec { - pname = "diff_cover"; + pname = "diff-cover"; version = "5.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "diff_cover"; + inherit version; sha256 = "sha256-4iQ9/QcXh/lW8HE6wFZWc6Y57xhAEWu2TQnIUZJNAMs="; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7ea357116233..09a77cfe6bd7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + diff_cover = diff-cover; # added 2021-07-02 dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5eac97ab1891..9784303b2a70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1921,7 +1921,7 @@ in { dicttoxml = callPackage ../development/python-modules/dicttoxml { }; - diff_cover = callPackage ../development/python-modules/diff_cover { }; + diff-cover = callPackage ../development/python-modules/diff-cover { }; diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; From 37b421ae5bce900e4572c1280d1cbe7c4cf832e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 00:34:18 +0200 Subject: [PATCH 29/63] python3Packages.bashlex: 0.14 -> 0.15 --- pkgs/development/python-modules/bashlex/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 8e29eed2acfd..0ee12c414804 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bashlex"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "idank"; repo = pname; rev = version; - sha256 = "070spmbf53y18miky5chgky4x5h8kp9czkp7dm173klv9pi2cn0k"; + sha256 = "sha256-kKVorAIKlyC9vUzLOlaZ/JrG1kBBRIvLwBmHNj9nx84="; }; checkInputs = [ nose ]; @@ -29,9 +29,11 @@ buildPythonPackage rec { ${python.interpreter} -m nose --with-doctest ''; + pythonImportsCheck = [ "bashlex" ]; + meta = with lib; { description = "Python parser for bash"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/idank/bashlex"; maintainers = with maintainers; [ multun ]; }; From d223a827acfed39239cfd0e9d53907936bc476b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 02:58:13 +0000 Subject: [PATCH 30/63] armadillo: 10.5.2 -> 10.5.3 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 9fdccfb3faa0..fcc64989606e 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.2"; + version = "10.5.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8="; + sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc="; }; nativeBuildInputs = [ cmake ]; From b438e5912ff1ba1780640173bbe4ea9722bf1e3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 03:15:55 +0000 Subject: [PATCH 31/63] _3proxy: 0.9.3 -> 0.9.4 --- pkgs/applications/networking/3proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index f9221d06d022..b83f93b3b68c 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "3proxy"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "z3APA3A"; repo = pname; rev = version; - sha256 = "9aopwyz0U2bYTvx5YWLJo9EE8Xfb51IOguHRJodjpm8="; + sha256 = "sha256-4bLlQ/ULvpjs6fr19yBBln5mRRc+yj+zVLiTs1e/Ypc="; }; makeFlags = [ From c01bfaf2098a744518acca0cc23f8baba449cc86 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 3 Jul 2021 04:20:00 +0000 Subject: [PATCH 32/63] libvmaf: 2.1.1 -> 2.2.0 https://github.com/Netflix/vmaf/releases/tag/v2.2.0 --- pkgs/development/libraries/libvmaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index c4b945bed446..1410822a1ca4 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "0dynk1pmsyf23vfxljaazqkr27vfrvhj3dyjzm06zxpzsn59aif3"; + sha256 = "1jlmivmdzlhizljbmsvqqxnhjfyjh8zxyf5xv6j040vbfj4mf14f"; }; sourceRoot = "source/libvmaf"; From 90bd38ba3507785259aa0058e8fefe8b84b54e18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 04:29:04 +0000 Subject: [PATCH 33/63] brave: 1.26.67 -> 1.26.74 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7d5b437b0acd..7b2acbd6b3da 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.26.67"; + version = "1.26.74"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "Kg6ExXZYdSkyBoivu9h4blytHN9hOc4bUSuFR+1YZOY="; + sha256 = "ULmoUXyPWHCewK4FPP7SX1Ena6n0aM/EWR7ZnMN1ztY="; }; dontConfigure = true; From 70f6d689d5984a6aa4bc62115f78d0e2e54f10bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 06:17:56 +0000 Subject: [PATCH 34/63] cargo-release: 0.15.0 -> 0.15.1 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index bfe003c4890a..a8fc47957066 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-hEpPRAUPHz9lDTJLyDMUAS+dH6hlppvi3Bb3ahnYW9U="; + sha256 = "sha256-bCxfZFFmk1Y1Rs41yZXogIjsnZhS/TzkZNXOixbvONU="; }; - cargoSha256 = "sha256-tOiralZWA21HBTxYWVB1LZH2ArfgY7HB45dVqHoXe/Q="; + cargoSha256 = "sha256-3wSy5WGBLC44Iy3yw2M1f1KpB8KHei+hHuqCGXutgi0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From 0b3d4888bdb125e750ce1d22e27b5098b5d81a9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 06:37:43 +0000 Subject: [PATCH 35/63] eksctl: 0.54.0 -> 0.55.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 32049fd11b65..9af721f02e56 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-hWrSjkEdhb0F5lwFGwjkR2G6gQ8T8HommH2lxJE+0bk="; + sha256 = "sha256-5PrwOR70pSmNPHFSDHRvXNn0pksIQun5jJkcCFsYhCE="; }; - vendorSha256 = "sha256-499c3Y9IUV8lc+O9qcEeFKQDT4QDvOPmu0rmps7M47w="; + vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; doCheck = false; From ef4c72483cfb39515a25f4b1808daa9ec15419ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 09:41:23 +0200 Subject: [PATCH 36/63] python3Packages.confuse: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/confuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 8f1c1754056a..b5e225fa2a2b 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "confuse"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ="; + sha256 = "sha256-kvvKHHBhESDqciNy4MBxwNNCp195a0veS/A0jqSfAi4="; }; propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; From e329096f480da495469933084943ea0dbfb74700 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 09:51:41 +0200 Subject: [PATCH 37/63] python3Packages.confuse: enable tests --- .../python-modules/confuse/default.nix | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index b5e225fa2a2b..2b350be00460 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -1,25 +1,45 @@ { buildPythonPackage , enum34 -, fetchPypi +, fetchFromGitHub +, flit-core , isPy27 , lib , pathlib , pyyaml +, pytestCheckHook }: buildPythonPackage rec { pname = "confuse"; version = "1.5.0"; + format = "flit"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kvvKHHBhESDqciNy4MBxwNNCp195a0veS/A0jqSfAi4="; + src = fetchFromGitHub { + owner = "beetbox"; + repo = pname; + rev = "v${version}"; + sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; }; - propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pyyaml + ] ++ lib.optionals isPy27 [ + enum34 + pathlib + ] ; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "confuse" ]; meta = with lib; { - description = "Confuse is a configuration library for Python that uses YAML."; + description = "Python configuration library for Python that uses YAML"; homepage = "https://github.com/beetbox/confuse"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; From 2e4849b84104b20a275c1ac6cba150c679bc3992 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Sat, 26 Dec 2020 10:55:40 +0100 Subject: [PATCH 38/63] installation-cd-base.nix: Add 'live.nixos.passwd' boot option For interactive SSH access to a system without a (working) keyboard and monitor, without rebuilding the image itself. --- .../administration/boot-problems.section.md | 6 ++++++ .../administration/boot-problems.section.xml | 17 +++++++++++++++++ .../installer/cd-dvd/installation-cd-base.nix | 11 +++++++++++ 3 files changed, 34 insertions(+) diff --git a/nixos/doc/manual/administration/boot-problems.section.md b/nixos/doc/manual/administration/boot-problems.section.md index eb9209602a32..dee83e7ec225 100644 --- a/nixos/doc/manual/administration/boot-problems.section.md +++ b/nixos/doc/manual/administration/boot-problems.section.md @@ -30,6 +30,12 @@ If NixOS fails to boot, there are a number of kernel command line parameters tha : Make systemd very verbose and send log messages to the console instead of the journal. For more parameters recognised by systemd, see systemd(1). +In addition, these arguments are recognised by the live image only: + +`live.nixos.passwd=password` + +: Set the password for the `nixos` live user. This can be used for SSH access if there are issues using the terminal. + Notice that for `boot.shell_on_fail`, `boot.debug1`, `boot.debug1devices`, and `boot.debug1mounts`, if you did **not** select "start the new shell as pid 1", and you `exit` from the new shell, boot will proceed normally from the point where it failed, as if you'd chosen "ignore the error and continue". If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start rescue mode (described above). (Also note that since most units have a 90-second timeout before systemd gives up on them, the `agetty` login prompts should appear eventually unless something is very wrong.) diff --git a/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/nixos/doc/manual/from_md/administration/boot-problems.section.xml index b484d075818a..4ea01e78f32f 100644 --- a/nixos/doc/manual/from_md/administration/boot-problems.section.xml +++ b/nixos/doc/manual/from_md/administration/boot-problems.section.xml @@ -106,6 +106,23 @@ + + In addition, these arguments are recognised by the live image only: + + + + + live.nixos.passwd=password + + + + Set the password for the nixos live user. + This can be used for SSH access if there are issues using the + terminal. + + + + Notice that for boot.shell_on_fail, boot.debug1, diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 6c7ea293e8ac..aecb65b8c576 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,5 +30,16 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; + boot.postBootCommands = '' + for o in $( Date: Sat, 3 Jul 2021 16:30:50 +0700 Subject: [PATCH 39/63] scheme-bytestructures: expand platforms to unix --- .../scheme-modules/scheme-bytestructures/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 67d9e39af62c..5be2fca96fbe 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/TaylanUB/scheme-bytestructures"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 397e068a54c36e9aad2ac8a7e0a53ea0db4c3627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Jul 2021 11:36:19 +0200 Subject: [PATCH 40/63] sqlitebrowser: add wrapGAppsHook Fixes opening file dialogs on non-NixOS: $ ./result/bin/sqlitebrowser [... try to open a file dialog: File -> Open Database ...] (.sqlitebrowser-wrapped:7229): GLib-GIO-ERROR **: 11:27:46.197: Settings schema 'org.gtk.Settings.FileChooser' does not contain a key named 'show-type-column' Trace/breakpoint trap (core dumped) --- pkgs/development/tools/database/sqlitebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 45b5f185880d..9ff5c1b01b87 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake -, qtbase, qttools, sqlite }: +, qtbase, qttools, sqlite, wrapGAppsHook }: mkDerivation rec { pname = "sqlitebrowser"; @@ -18,7 +18,7 @@ mkDerivation rec { # We *really* should get that cleaned up. buildInputs = [ qtbase sqlite ]; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ cmake qttools wrapGAppsHook ]; meta = with lib; { description = "DB Browser for SQLite"; From 4d1ab2f371853c001525061dbe28da0a1c06e066 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 09:37:32 +0000 Subject: [PATCH 41/63] iosevka: 7.0.4 -> 7.0.4 --- pkgs/development/node-packages/node-packages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ea8f2ef7a181..43274c3f3e66 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -126,7 +126,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.2.4.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" From a2f0475b3ff95854948ad0e93d72caf282947bcd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 09:48:16 +0000 Subject: [PATCH 42/63] charis-sil: 5.000 -> 6.000 --- pkgs/data/fonts/charis-sil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 44b40c72b58f..6639cb57d8ba 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n"; + sha256 = "sha256-eMmC893rI42qzZVCI17i9XSAbQzXCK2fHVe5Pf1/VnM="; meta = with lib; { homepage = "https://software.sil.org/charis"; From 16304106ecc6cb7b50d1990075ca4457f50019e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 09:56:07 +0000 Subject: [PATCH 43/63] gifsicle: 1.92 -> 1.93 --- pkgs/tools/graphics/gifsicle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index c05a552f2051..b200f487b232 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "gifsicle"; - version = "1.92"; + version = "1.93"; src = fetchurl { url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz"; - sha256 = "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas"; + sha256 = "sha256-kvZweXMr9MHaCH5q4JBSBYRuWsd3ulyqZtEqc6qUNEc="; }; buildInputs = optionals gifview [ xorgproto libXt libX11 ]; From 866c28f56f8a251122d17072acf3ad7ac58a56a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 12:21:03 +0200 Subject: [PATCH 44/63] python3Packages.cvxpy: 1.1.12 -> 1.1.13 --- pkgs/development/python-modules/cvxpy/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 359ee96f60a9..9068814ffd79 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.12"; + version = "1.1.13"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-tJnr+uT8ZF6VI2IVc//LHFtoVKG1wM4dZqippFhgWAc="; + sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9"; }; propagatedBuildInputs = [ @@ -42,8 +42,10 @@ buildPythonPackage rec { ''; checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "./cvxpy" ]; - # Disable the slowest benchmarking tests, cuts test time in half + + # Disable the slowest benchmarking tests, cuts test time in half disabledTests = [ "test_tv_inpainting" "test_diffcp_sdp_example" @@ -51,6 +53,8 @@ buildPythonPackage rec { "test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155 ]; + pythonImportsCheck = [ "cvxpy" ]; + meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; From 1fd0090f14a5423dff8ef24d8440b0008422a64f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 12:30:23 +0200 Subject: [PATCH 45/63] python3Packages.curio: 1.4 -> 1.5 --- .../python-modules/curio/default.nix | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index fb1eceda7f2b..1a0f4e2d9fe7 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , isPy3k , pytestCheckHook , sphinx @@ -10,31 +9,19 @@ buildPythonPackage rec { pname = "curio"; - version = "1.4"; + version = "1.5"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744"; + sha256 = "sha256-rwghLlkLt9qOTMOcQgEnEUlNwg1iLxYhVbopbMLjvBA="; }; - patches = [ - # Fix the flaky test due to slow moving time on Apple Silicon chips. - # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release. - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch"; - sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4="; - }) - # Same as above - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch"; - sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU="; - }) + checkInputs = [ + pytestCheckHook + sphinx ]; - disabled = !isPy3k; - - checkInputs = [ pytestCheckHook sphinx ]; - __darwinAllowLocalNetworking = true; disabledTests = [ @@ -46,9 +33,11 @@ buildPythonPackage rec { "test_unix_ssl_server" # socket bind error on hydra when built with other packages ]; + pythonImportsCheck = [ "curio" ]; + meta = with lib; { homepage = "https://github.com/dabeaz/curio"; - description = "Library for performing concurrent I/O with coroutines in Python 3"; + description = "Library for performing concurrent I/O with coroutines in Python"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; From ff9aaa4e2e6d98f65a870fe3944dcf8fc54d82cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 12:37:28 +0200 Subject: [PATCH 46/63] python3Packages.crc32c: 2.0.1 -> 2.2.post0 --- pkgs/development/python-modules/crc32c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index dd2c9059ed5f..f4a85fba599f 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.2.post0"; pname = "crc32c"; src = fetchFromGitHub { owner = "ICRAR"; repo = pname; rev = "v${version}"; - sha256 = "0vyac7pchh083h5qdjwhhacfq77frkrq1bjzsn51qv1vwcdrpnrf"; + sha256 = "sha256-0FgNOVpgJTxRALuufZ7Dt1TwuX+zqw35yCq8kmq4RTc="; }; meta = { From b4c419a4390177ca98aa6acd8e3c298d99f8841c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Jul 2021 12:49:56 +0200 Subject: [PATCH 47/63] libxlsxwriter: 1.0.6 -> 1.0.8 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.0.7 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.0.8 --- pkgs/development/libraries/libxlsxwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 4bb80cb04a45..ce9a72f00c1c 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx"; + sha256 = "1z9bkg0pfkzxbpj2rys4mx9wmcxyjjqsg0nbiaabsg455q00plki"; }; nativeBuildInputs = [ From 40efcce8702c274cea33dec1e6a46ca78da3a0a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 10:57:40 +0000 Subject: [PATCH 48/63] flyctl: 0.0.227 -> 0.0.228 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 130ff9c9bcbf..3c61121b0357 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.227"; + version = "0.0.228"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-nql0zK2H0FDQMsnSJSNzC7YmvUZfITHH5p1efFHsj58="; + sha256 = "sha256-h8ZiAabB0IIJoeQMMvOO1lQNMdFYAoTXKcTAPmLP5Sw="; }; preBuild = '' From c0b2241e53f3cb4fbea245da960e23a43d9965fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 3 Jul 2021 13:05:55 +0200 Subject: [PATCH 49/63] nixos/top-level: pass lib to specialisations --- nixos/modules/system/activation/top-level.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 6751ca3f2ee7..4e2f25cd27fc 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -13,7 +13,7 @@ let # !!! fix this children = mapAttrs (childName: childConfig: (import ../../../lib/eval-config.nix { - inherit baseModules specialArgs; + inherit lib baseModules specialArgs; system = config.nixpkgs.initialSystem; modules = (optionals childConfig.inheritParentConfig modules) From d82c7fe1192af8bb511acc0fab50d4ecd6ae02f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 12:26:53 +0000 Subject: [PATCH 50/63] gops: 0.3.18 -> 0.3.19 --- pkgs/development/tools/gops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index d23aa71a8abe..bc9cba9df5f7 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.18"; + version = "0.3.19"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "0534jyravpsj73lgdmw6fns1qaqiw401jlfk04wa0as5sv09rfhy"; + sha256 = "sha256-9QEhc0OVCrIdIY220PDn2+CjUsCF84l6QRQS0HjDEZY="; }; vendorSha256 = null; From 4cea628efbd190a0678a61bd93f87829c0fbcae0 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 3 Jul 2021 13:58:10 +0200 Subject: [PATCH 51/63] gegl: drop the old 0.2 version, make gegl 0.4 default --- pkgs/desktops/gnome/default.nix | 2 - pkgs/development/libraries/gegl/4.0.nix | 121 -------------------- pkgs/development/libraries/gegl/default.nix | 112 ++++++++++++++---- pkgs/top-level/all-packages.nix | 10 +- 4 files changed, 93 insertions(+), 152 deletions(-) delete mode 100644 pkgs/development/libraries/gegl/4.0.nix diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b529a65026d7..ae2255acb911 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -339,8 +339,6 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) gnome-user-docs; # added 2019-11-20 - inherit (pkgs) gegl_0_4; # added 2019-10-31 - inherit (pkgs) gjs; # added 2019-01-05 inherit (pkgs) yelp-tools; # added 2019-11-20 diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix deleted file mode 100644 index 11f4f070c08f..000000000000 --- a/pkgs/development/libraries/gegl/4.0.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, vala -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -, babl -, libpng -, cairo -, libjpeg -, librsvg -, lensfun -, libspiro -, maxflow -, netsurf -, pango -, poly2tri-c -, poppler -, bzip2 -, json-glib -, gettext -, meson -, ninja -, libraw -, gexiv2 -, libwebp -, luajit -, openexr -, OpenCL -, suitesparse -}: - -stdenv.mkDerivation rec { - pname = "gegl"; - version = "0.4.30"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; - }; - - nativeBuildInputs = [ - pkg-config - gettext - meson - ninja - vala - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ]; - - buildInputs = [ - libpng - cairo - libjpeg - librsvg - lensfun - libspiro - maxflow - netsurf.libnsgif - pango - poly2tri-c - poppler - bzip2 - libraw - libwebp - gexiv2 - luajit - openexr - suitesparse - ] ++ lib.optional stdenv.isDarwin OpenCL; - - # for gegl-4.0.pc - propagatedBuildInputs = [ - glib - json-glib - babl - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dmrg=disabled" # not sure what that is - "-Dsdl2=disabled" - "-Dpygobject=disabled" - "-Dlibav=disabled" - "-Dlibv4l=disabled" - "-Dlibv4l2=disabled" - # Disabled due to multiple vulnerabilities, see - # https://github.com/NixOS/nixpkgs/pull/73586 - "-Djasper=disabled" - ]; - - # TODO: Fix missing math symbols in gegl seamless clone. - # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = "-lm"; - - postPatch = '' - chmod +x tests/opencl/opencl_test.sh - patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh - ''; - - # tests fail to connect to the com.apple.fonts daemon in sandboxed mode - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Graph-based image processing framework"; - homepage = "https://www.gegl.org"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index bd67f3e6b7ca..11f4f070c08f 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,43 +1,115 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config +, vala +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib , babl , libpng , cairo , libjpeg , librsvg +, lensfun +, libspiro +, maxflow +, netsurf , pango -, gtk2 +, poly2tri-c +, poppler , bzip2 -, intltool -, libintl -, OpenGL ? null }: +, json-glib +, gettext +, meson +, ninja +, libraw +, gexiv2 +, libwebp +, luajit +, openexr +, OpenCL +, suitesparse +}: stdenv.mkDerivation rec { pname = "gegl"; - version = "0.2.0"; + version = "0.4.30"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2"; - sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; }; - patches = [( fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "gegl-0.2.0-CVE-2012-4433.patch?h=packages/gegl&id=57a60fbda5d7bbbd1cc4767cb0724baa80c5e3e9"; - sha256 = "0p8mxj3w09nn1cc6cbxrd9hx742c5y27903i608wx6ja3kdjis59"; - name = "CVE-2012-4433.patch"; - })]; + nativeBuildInputs = [ + pkg-config + gettext + meson + ninja + vala + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; - # needs fonts otherwise don't know how to pass them - configureFlags = [ "--disable-docs" ]; + buildInputs = [ + libpng + cairo + libjpeg + librsvg + lensfun + libspiro + maxflow + netsurf.libnsgif + pango + poly2tri-c + poppler + bzip2 + libraw + libwebp + gexiv2 + luajit + openexr + suitesparse + ] ++ lib.optional stdenv.isDarwin OpenCL; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] - ++ lib.optional stdenv.isDarwin OpenGL; + # for gegl-4.0.pc + propagatedBuildInputs = [ + glib + json-glib + babl + ]; - nativeBuildInputs = [ pkg-config ]; + mesonFlags = [ + "-Ddocs=true" + "-Dmrg=disabled" # not sure what that is + "-Dsdl2=disabled" + "-Dpygobject=disabled" + "-Dlibav=disabled" + "-Dlibv4l=disabled" + "-Dlibv4l2=disabled" + # Disabled due to multiple vulnerabilities, see + # https://github.com/NixOS/nixpkgs/pull/73586 + "-Djasper=disabled" + ]; - doCheck = false; # fails 3 out of 19 tests + # TODO: Fix missing math symbols in gegl seamless clone. + # It only appears when we use packaged poly2tri-c instead of vendored one. + NIX_CFLAGS_COMPILE = "-lm"; + + postPatch = '' + chmod +x tests/opencl/opencl_test.sh + patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh + ''; + + # tests fail to connect to the com.apple.fonts daemon in sandboxed mode + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18f860ffc514..1415e4fc4f6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5302,9 +5302,7 @@ in gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; - gnome-photos = callPackage ../applications/graphics/gnome-photos { - gegl = gegl_0_4; - }; + gnome-photos = callPackage ../applications/graphics/gnome-photos { }; gnokii = callPackage ../tools/misc/gnokii { }; @@ -15131,10 +15129,6 @@ in }; gegl = callPackage ../development/libraries/gegl { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; - - gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { inherit (darwin.apple_sdk.frameworks) OpenCL; }; @@ -24166,7 +24160,6 @@ in gimp = callPackage ../applications/graphics/gimp { autoreconfHook = buildPackages.autoreconfHook269; - gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -24179,7 +24172,6 @@ in glimpse = callPackage ../applications/graphics/glimpse { autoreconfHook = buildPackages.autoreconfHook269; - gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; From 698a49a14cdccbae29f7e3b190ec09eb488279a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 14:37:19 +0200 Subject: [PATCH 52/63] duckdb: 0.2.2 -> 0.2.7 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 60ccf5aeeb23..e63f2c3cfd68 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.2"; + version = "0.2.7"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "1pzz2zjzpvji5am21vd9kjxj0pnxsjmrsfqrym9h2rk2mi7p2cx8"; + sha256 = "0cnqq2n1424fqg7gfyvrwkk6nvjal2fm5n08xc8q28ynyhq4sfmj"; }; nativeBuildInputs = [ cmake ]; From e197447e564aef3dc5650c5a18b3f883c4d10f49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 14:37:43 +0200 Subject: [PATCH 53/63] python3Packages.duckdb: minor updates --- .../python-modules/duckdb/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 4a4dd279a52e..fd360bfbd120 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -5,7 +5,7 @@ , pandas , pybind11 , setuptools-scm -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -28,18 +28,24 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools-scm - pytestrunner + pytest-runner ]; - propagatedBuildInputs = [ numpy pandas ]; + propagatedBuildInputs = [ + numpy + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "duckdb" ]; meta = with lib; { - description = "DuckDB is an embeddable SQL OLAP Database Management System"; - homepage = "https://pypi.python.org/pypi/duckdb"; + description = "Python binding for DuckDB"; + homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 27d101d2204f7cb07da971dd0cc092c8e636a975 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 02:41:25 +0000 Subject: [PATCH 54/63] babl: 0.1.86 -> 0.1.88 --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index d6e1d75437ef..c0765922de5f 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.86"; + version = "0.1.88"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA="; + sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk="; }; nativeBuildInputs = [ From b7515545b5647ebdef27b52a5d4297b5336c53e7 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 3 Jul 2021 16:47:01 +0300 Subject: [PATCH 55/63] tdesktop: 2.8.3 -> 2.8.4 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 76d149048a3a..189f7a4cabe7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -23,7 +23,7 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.3"; + version = "2.8.4"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -32,7 +32,7 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1ywxsy3a99sdibipriblbzskmkqbnxwrz3lavfdr134wq8w8rjf7"; + sha256 = "sha256-IN3GQgdNM66/GxKa5EGKB/LIkgBxS8Y4mkPBaSEphmw="; }; postPatch = '' From b333bf83d34ba67fb3bb178c73a2967ebba4bc08 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jul 2021 15:40:23 +0200 Subject: [PATCH 56/63] egl-wayland: support cross-compilation --- pkgs/development/libraries/egl-wayland/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index b3654087ffd0..9e7beb0a4f86 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -4,6 +4,7 @@ , pkg-config , meson , ninja +, wayland-scanner , libX11 , mesa , libGL @@ -51,10 +52,15 @@ in stdenv.mkDerivation rec { sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config + wayland-scanner ]; buildInputs = [ From 0b93eb68a2733e5b5ac299cd3753912b0166f3b4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jul 2021 15:45:54 +0200 Subject: [PATCH 57/63] xwayland: support cross-compilation --- pkgs/servers/x11/xorg/xwayland.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 46d7ebfd85a2..c16391a3c504 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -32,6 +32,7 @@ , stdenv , wayland , wayland-protocols +, wayland-scanner , xkbcomp , xkeyboard_config , xorgproto @@ -47,7 +48,16 @@ stdenv.mkDerivation rec { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; buildInputs = [ egl-wayland epoxy From 4c2b069b8ffeff2b89eda1fa92358cebf88aa781 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jul 2021 15:46:36 +0200 Subject: [PATCH 58/63] wlroots: support cross-compilation --- pkgs/development/libraries/wlroots/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 45c2fd228f2d..9dc717c34790 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ From 733756ccfc2e333658f77c657a3cd1c64d2ff1eb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jul 2021 16:32:38 +0200 Subject: [PATCH 59/63] tdesktop: Drop the enchant2 and dee dependencies Ilya Fedin informed me that they aren't required anymore. Thanks :) --- .../instant-messengers/telegram/tdesktop/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 189f7a4cabe7..47aa7c7330f2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo -, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 +, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash +, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk , libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules # Transitive dependencies: @@ -36,8 +36,6 @@ in mkDerivation rec { }; postPatch = '' - substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ - --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' ''; @@ -49,8 +47,8 @@ in mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 + qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash + ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk libtgvoip rnnoise abseil-cpp extra-cmake-modules tg_owt From 9598d61c1f085955625d33c5ffa092c3645257a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 18 Jun 2021 02:17:24 +0000 Subject: [PATCH 60/63] crate2nix: 0.9.0 -> 0.10.0 --- pkgs/development/tools/rust/crate2nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index e68eea50ff3d..a86e531e7f67 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kolloch"; repo = pname; rev = version; - sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; + sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; }; sourceRoot = "source/crate2nix"; - cargoSha256 = "sha256-shWhzCaH8ZttUcq82tA7T1hwNl6F1XJy7ansA5lt+Mw="; + cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; nativeBuildInputs = [ makeWrapper ]; From 567224081c58b54467af8acd32544504678ddcbe Mon Sep 17 00:00:00 2001 From: David Date: Sat, 3 Jul 2021 15:37:10 +0200 Subject: [PATCH 61/63] rebar3-nix: 0.1.0 -> 0.1.1 --- pkgs/development/beam-modules/rebar3-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix index ff248700d783..50bd29658354 100644 --- a/pkgs/development/beam-modules/rebar3-nix/default.nix +++ b/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -1,12 +1,12 @@ { lib, buildRebar3, fetchFromGitHub }: buildRebar3 rec { name = "rebar3_nix"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "erlang-nix"; repo = name; rev = "v${version}"; - sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + sha256 = "10ijc06qvv5hqv0qy3w7mbv9pshdb8bvy0f3phr1vd5hksbk731y"; }; meta = { From ed9db4a7f8b69fea1643a964919fca3b6f9d40fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Jul 2021 18:10:55 +0200 Subject: [PATCH 62/63] doc: fix link to kodi-19.0 announcement Logically re-apply 7afaacf9a8 ("doc: fix link to kodi-19.0 announcement"), because it was lost in the conversion from docbook to markdown, in commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)"). (Hm, apparently we have *both* docbook and markdown? CI failed before I updated the .xml file.) --- nixos/doc/manual/from_md/release-notes/rl-2105.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2105.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index e043bee7761d..db17b4530ab8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -1026,7 +1026,7 @@ self: super: Kodi has been updated to version 19.1 "Matrix". See the - announcement + announcement for further details. diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index e4565b8ca605..3fe792b2143c 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -300,7 +300,7 @@ When upgrading from a previous release, please be aware of the following incompa Regarding the NixOS module, new options for HTTPS inspection have been added and `services.privoxy.extraConfig` has been replaced by the new [services.privoxy.settings](options.html#opt-services.privoxy.settings) (See [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) for the motivation). -- [Kodi](https://kodi.tv/) has been updated to version 19.1 \"Matrix\". See the [announcement](https://kodi.tv/article/kodi-190-matrix-release) for further details. +- [Kodi](https://kodi.tv/) has been updated to version 19.1 \"Matrix\". See the [announcement](https://kodi.tv/article/kodi-19-0-matrix-release) for further details. - The `services.packagekit.backend` option has been removed as it only supported a single setting which would always be the default. Instead new [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) compliant [services.packagekit.settings](options.html#opt-services.packagekit.settings) and [services.packagekit.vendorSettings](options.html#opt-services.packagekit.vendorSettings) options have been introduced. From ede1785d110103d43a75c19db7573ad5808bd3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Jul 2021 18:18:51 +0200 Subject: [PATCH 63/63] doc: point out that nixos-21.05 has gnuradio 3.9 Logically re-apply 64c70a8c4c ("doc: point out that nixos-21.05 has gnuradio 3.9"), because it was lost in the conversion from docbook to markdown, in commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)"). (Apparently we have both .md and .xml release notes now, and CI fails unless they have the same content (after .md processing), so update the .xml file to match...) --- .../from_md/release-notes/rl-2105.section.xml | 14 ++++++++------ nixos/doc/manual/release-notes/rl-2105.section.md | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index db17b4530ab8..f4155d6f8ce6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -101,16 +101,18 @@ GNURadio - 3.8 was + 3.8 and 3.9 were finally packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute - gnuradio and gnuradio3_7 - now point to an externally wrapped by default derivations, - that allow you to also add `extraPythonPackages` to the Python - interpreter used by GNURadio. Missing environmental variables - needed for operational GUI were also added + gnuradio (3.9), + gnuradio3_8 and + gnuradio3_7 now point to an externally + wrapped by default derivations, that allow you to also add + `extraPythonPackages` to the Python interpreter used by + GNURadio. Missing environmental variables needed for + operational GUI were also added (#75478). diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index 3fe792b2143c..49b97c203fe6 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -36,7 +36,7 @@ In addition to numerous new and upgraded packages, this release has the followin The following new services were added since the last release: -- [GNURadio](https://www.gnuradio.org/) 3.8 was [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). +- [GNURadio](https://www.gnuradio.org/) 3.8 and 3.9 were [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` (3.9), `gnuradio3_8` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). - [Keycloak](https://www.keycloak.org/), an open source identity and access management server with support for [OpenID Connect](https://openid.net/connect/), [OAUTH 2.0](https://oauth.net/2/) and [SAML 2.0](https://en.wikipedia.org/wiki/SAML_2.0).