From d29162388715cc85db7b3dcca9fe43432f81ff9e Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 16 Jun 2021 01:59:37 +0200 Subject: [PATCH 01/23] visidata: add missing dependencies --- pkgs/applications/misc/visidata/default.nix | 42 ++++++++++++++++----- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index ad49a1b291e2..237e5ee8ae55 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,16 +2,23 @@ , lib , fetchFromGitHub , dateutil -, pyyaml +, pandas +, requests +, lxml , openpyxl , xlrd , h5py -, fonttools -, lxml -, pandas +, psycopg2 , pyshp +, fonttools +, pyyaml +, pdfminer +, vobject +, tabulate +, wcwidth +, zstandard , setuptools -, withPcap ? true, dpkt ? null, dnslib ? null +, withPcap ? true, dpkt, dnslib }: buildPythonApplication rec { pname = "visidata"; @@ -25,15 +32,32 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ + # from visidata/requirements.txt + # packages not (yet) present in nixpkgs are commented dateutil - pyyaml + pandas + requests + lxml openpyxl xlrd h5py - fonttools - lxml - pandas + psycopg2 pyshp + #mapbox-vector-tile + #pypng + fonttools + #sas7bdat + #xport + #savReaderWriter + pyyaml + #namestand + #datapackage + pdfminer + #tabula + vobject + tabulate + wcwidth + zstandard setuptools ] ++ lib.optionals withPcap [ dpkt dnslib ]; From b012d3feefed231b833f5d7c9791097e7da3591b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jun 2021 18:13:47 +0200 Subject: [PATCH 02/23] python3Packages.aioazuredevops: init at 1.3.5 --- .../python-modules/aioazuredevops/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/aioazuredevops/default.nix diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix new file mode 100644 index 000000000000..3568e98a59ec --- /dev/null +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, aiohttp +, click +}: + +buildPythonPackage rec { + pname = "aioazuredevops"; + version = "1.3.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "4c98a995d0516f502ba191fa3ac973ee72b93425e7eab3cdf770516c6e93c780"; + }; + + propagatedBuildInputs = [ + aiohttp + click + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "aioazuredevops.builds" + "aioazuredevops.client" + "aioazuredevops.core" + ]; + + meta = with lib; { + description = "Get data from the Azure DevOps API"; + homepage = "https://github.com/timmo001/aioazuredevops"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 865c6aa8fcb3..0c134e34dd2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -245,6 +245,8 @@ in { aioasuswrt = callPackage ../development/python-modules/aioasuswrt { }; + aioazuredevops = callPackage ../development/python-modules/aioazuredevops { }; + aiocache = callPackage ../development/python-modules/aiocache { }; aiocoap = callPackage ../development/python-modules/aiocoap { }; From b55c21e3093dfcf8187666dc06278bf929a73504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jun 2021 18:14:23 +0200 Subject: [PATCH 03/23] home-assistant: update component-packages.nix --- 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 04d3b5baa4c1..2502ab8def0e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -68,7 +68,7 @@ "awair" = ps: with ps; [ python-awair ]; "aws" = ps: with ps; [ aiobotocore ]; "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; - "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops + "azure_devops" = ps: with ps; [ aioazuredevops ]; "azure_event_hub" = ps: with ps; [ azure-eventhub ]; "azure_service_bus" = ps: with ps; [ azure-servicebus ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip From 96d4da26fb1cb0176998b82e6579ea1b1b800560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jun 2021 18:15:38 +0200 Subject: [PATCH 04/23] home-assistant: test azure_devops component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index eb2fa70bbb92..7850f2bd84c1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -303,6 +303,7 @@ in with py.pkgs; buildPythonApplication rec { "awair" "aws" "axis" + "azure_devops" "azure_event_hub" "bayesian" "binary_sensor" From f9f5f4986ba64b7b60c878c7a9977355327de47d Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Wed, 16 Jun 2021 09:28:09 -0700 Subject: [PATCH 05/23] openjdk11: remove default library path This is a follow up to #123708 which does the similar patch but for OpenJDK11. Please see the linked issue for more detailed rationale. --- pkgs/development/compilers/openjdk/11.nix | 1 + .../openjdk/fix-library-path-jdk11.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index ef593422ff26..40b24056270b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -39,6 +39,7 @@ let ./read-truststore-from-env-jdk10.patch ./currency-date-range-jdk10.patch ./increase-javadoc-heap.patch + ./fix-library-path-jdk11.patch ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch new file mode 100644 index 000000000000..21263dd68926 --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch @@ -0,0 +1,37 @@ +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index 0dbe03349e..847d56778d 100644 +--- a/src/hotspot/os/linux/os_linux.cpp ++++ b/src/hotspot/os/linux/os_linux.cpp +@@ -326,13 +326,13 @@ void os::init_system_properties_values() { + // ... + // 7: The default directories, normally /lib and /usr/lib. + #if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390) +- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" ++ #define DEFAULT_LIBPATH "" + #else +- #define DEFAULT_LIBPATH "/lib:/usr/lib" ++ #define DEFAULT_LIBPATH "" + #endif + + // Base path of extensions installed on the system. +-#define SYS_EXT_DIR "/usr/java/packages" ++#define SYS_EXT_DIR "" + #define EXTENSIONS_DIR "/lib/ext" + + // Buffer that fits several sprintfs. +@@ -392,13 +392,13 @@ void os::init_system_properties_values() { + strlen(v) + 1 + + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, + mtInternal); +- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); ++ sprintf(ld_library_path, "%s", v); + Arguments::set_library_path(ld_library_path); + FREE_C_HEAP_ARRAY(char, ld_library_path); + } + + // Extensions directories. +- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); ++ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); + Arguments::set_ext_dirs(buf); + + FREE_C_HEAP_ARRAY(char, buf); From 8aebc1b9046924491c1d111dce198e85d65c4977 Mon Sep 17 00:00:00 2001 From: Git Machete Release Bot Date: Wed, 16 Jun 2021 17:56:47 +0000 Subject: [PATCH 06/23] gitAndTools.git-machete: 3.1.1 -> 3.2.0 ###### Motivation for this change Update to latest upstream version ###### Things done * [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) * Built on platform(s) * [x] NixOS * [ ] macOS * [ ] other Linux distributions * [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) * [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"` * [x] Tested execution of all binary files (usually in `./result/bin/`) * [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after) * [ ] Ensured that relevant documentation is up to date * [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index f93947d0515b..210c0ca8c3e7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "00f1rq80vya464dkvf3mzs9zpvkz15ki8srwg08snsm5kb7amwlm"; + sha256 = "1bssk0jqspmsvr8kha9l5cslyhjvc50y30wdgavbca256lv75gh8"; }; nativeBuildInputs = [ installShellFiles pbr ]; From 4a8d262c7c485caf9648acb0a6f757a1ccd9e1c3 Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 16 Jun 2021 02:01:11 +0200 Subject: [PATCH 07/23] visidata: enable tests --- pkgs/applications/misc/visidata/default.nix | 32 +++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 237e5ee8ae55..9663d09304f8 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -1,5 +1,6 @@ -{ buildPythonApplication +{ stdenv , lib +, buildPythonApplication , fetchFromGitHub , dateutil , pandas @@ -18,6 +19,7 @@ , wcwidth , zstandard , setuptools +, git , withPcap ? true, dpkt, dnslib }: buildPythonApplication rec { @@ -61,7 +63,33 @@ buildPythonApplication rec { setuptools ] ++ lib.optionals withPcap [ dpkt dnslib ]; - doCheck = false; + checkInputs = [ + git + ]; + + # check phase uses the output bin, which is not possible when cross-compiling + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + + checkPhase = '' + # disable some tests which require access to the network + rm tests/load-http.vd # http + rm tests/graph-cursor-nosave.vd # http + rm tests/messenger-nosave.vd # dns + + # disable some tests which expect Python == 3.6 (not our current version) + # see https://github.com/saulpw/visidata/issues/1014 + rm tests/describe.vd + rm tests/describe-error.vd + rm tests/edit-type.vd + + # tests use git to compare outputs to references + git init -b "test-reference" + git config user.name "nobody"; git config user.email "no@where" + git add .; git commit -m "test reference" + + substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd" + bash dev/test.sh + ''; meta = { inherit version; From 2d5ea14ae3477b20aec583524131acad764efa4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Jun 2021 17:12:19 -0700 Subject: [PATCH 08/23] python3Packages.xmlschema: 1.6.2 -> 1.6.4 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 7008814ba287..6c2118f391b4 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.6.2"; + version = "1.6.4"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "sha256-GL2PlHxKDSEsZwHPBAy+tjBSbKyvlbXUWwXakKPmzSs="; + sha256 = "sha256-0KVGu163t3stCgx7aWW/Ggf6CUW2ZhOOnPU6FfGHfKA="; }; propagatedBuildInputs = [ elementpath ]; From 820ff1508f13da0516c0b2369c22b360068b2381 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Jun 2021 17:37:03 -0700 Subject: [PATCH 09/23] spicetify-cli: 1.2.1 -> 2.2.6 --- pkgs/applications/misc/spicetify-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 62a6d4785f12..e20b95922f9a 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "1.2.1"; + version = "2.2.6"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HASFaPqm/A1QQ4nkd2hgeyqWplwE1RTrWA937rJA5Oo="; + sha256 = "sha256-9g6rkSDjE7x/YprPX0dkzqgpjgED5qBpUUQoVv6fGkk="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; From b3165ac5b8056041859411bdf8cc8d61457f24eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 00:38:03 +0000 Subject: [PATCH 10/23] amidst: 4.6 -> 4.7 --- pkgs/tools/games/amidst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/amidst/default.nix b/pkgs/tools/games/amidst/default.nix index 886ba3752a0b..552efee1537e 100644 --- a/pkgs/tools/games/amidst/default.nix +++ b/pkgs/tools/games/amidst/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "amidst"; - version = "4.6"; + version = "4.7"; src = fetchurl { # TODO: Compile from src url = "https://github.com/toolbox4minecraft/amidst/releases/download/v${version}/amidst-v${lib.replaceStrings [ "." ] [ "-" ] version}.jar"; - sha256 = "0nz6xfhshy36j8k81kqdfbbxih96l7f3s9156f9lmw0mi1qlyzqk"; + sha256 = "sha256-oecRjD7JUuvFym8N/hSE5cbAFQojS6yxOuxpwWRlW9M="; }; dontUnpack = true; From 3c2aaee56fa55f4d1c64edad82dd309c5a84baca Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Jun 2021 17:59:32 -0700 Subject: [PATCH 11/23] yamllint: 1.26.0 -> 1.26.1 --- pkgs/development/python-modules/yamllint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 2178e4d25791..832eb3f6b5b1 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.26.0"; + version = "1.26.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h"; + sha256 = "sha256-h9lGKz7X6d+hnKoXf3p3zZiIs9xARER9auCrIzvNEyQ="; }; propagatedBuildInputs = [ From 0b548037bf06ee8e3876e34c697896c3b434358f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Jun 2021 18:06:59 -0700 Subject: [PATCH 12/23] python3Packages.strictyaml: 1.3.2 -> 1.4.2 --- pkgs/development/python-modules/strictyaml/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index ddc497a64ab6..30028a9599cf 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,15 +7,20 @@ }: buildPythonPackage rec { - version = "1.3.2"; + version = "1.4.2"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "637399fd80dccc95f5287b2606b74098b23c08031b7ec33c5afb314ccbf10948"; + sha256 = "sha256-3bTk6AfdUQybx/xQ/I0Tae1pbtXMktSUtedSuoJ2paI="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "ruamel.yaml==0.17.4" "ruamel.yaml" + ''; + propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; # Library tested with external tool From cb3e33e2f48000496686c7a578b117afd8fb1e0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 02:16:35 +0000 Subject: [PATCH 13/23] ccextractor: 0.88 -> 0.89 --- pkgs/applications/video/ccextractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 881e6b687ef2..aa40291790e1 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "ccextractor"; - version = "0.88"; + version = "0.89"; src = fetchFromGitHub { owner = "CCExtractor"; repo = pname; rev = "v${version}"; - sha256 = "1sya45hvv4d46bk7541yimmafgvgyhkpsvwfz9kv6pm4yi1lz6nb"; + sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A="; }; sourceRoot = "source/src"; From 5fd4f796b4210d691b1f89e1f29043d635cd20e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 02:21:35 +0000 Subject: [PATCH 14/23] charge-lnd: 0.1.2 -> 0.1.3 --- pkgs/applications/blockchains/charge-lnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index 3707b0741b6f..a3341a25b144 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "1m1ic69aj2vlnjlp4ckan8n67r01nfysvq4w6nny32wjkr0zvphr"; + sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y"; }; propagatedBuildInputs = with python3Packages; [ From f7b3116ed6bca79e3c4a4071922173d167b60751 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 17 Jun 2021 12:12:42 +0800 Subject: [PATCH 15/23] linux_xanmod: 5.12.10 -> 5.12.11 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index fafa0e538102..b3cacfc1d45a 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.10"; + version = "5.12.11"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-DxWkknL8kgFmdI+jb5chVnWCz6oDKOw6iuT69zDaDNs="; + sha256 = "sha256-EQ52Leg7i1Xb2b29JbaKFKRE/jKXB48GXhbM/Ay5QTY="; }; extraMeta = { From 620fbddc6ab572cfa8991db0be9bc638d1ed426b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 04:44:49 +0000 Subject: [PATCH 16/23] cgal_5: 5.2.1 -> 5.2.2 --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index bd8edc14a8bb..3ca359b3da5d 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-sJyeehgt84rLX8ZBYIbFgHLG2aJDDHEj5GeVnQhjiOQ="; + sha256 = "sha256-DeTJAAY3OEu+pVazt5es1v3l1nGAfjvE0wQmYISRYoo="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From 8d25d8c55dcdf10a612aac115bd88139d10fc351 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 15 Jun 2021 16:49:18 +1000 Subject: [PATCH 17/23] libslirp: 4.5.0 -> 4.6.0 https://gitlab.freedesktop.org/slirp/libslirp/-/releases/v4.6.0 --- pkgs/development/libraries/libslirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 5da6cf6bbbcb..7180587e8e6b 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UdKBED7xR0gDf3aj3+6I62CnAwGP7XxskaFzWeUUkkk="; + sha256 = "sha256-1Zp1+PW0WtNzRYIA87X42CJeSzVFhi5sGi9/rlUP4Vo="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From bb4697102b18ff2b45240ef2f4260901c6812205 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 15 Jun 2021 16:49:44 +1000 Subject: [PATCH 18/23] slirp4netns: 1.1.10 -> 1.1.11 https://github.com/rootless-containers/slirp4netns/releases/tag/v1.1.11 --- pkgs/tools/networking/slirp4netns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index c24b9a860e17..c08f234ab5b1 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-Qk5a8h9IkLwYRmPL8pFlyVsQ/xMZ2/wkq8zZ7yfrLEQ="; + sha256 = "sha256-Gxcu9XlLPLcFUoCDrMeWJ6SGUSHU9ZKPHq1oBvmNoJ8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From f1cb9e772d89d70ed8dacf946051fb2cd7c93062 Mon Sep 17 00:00:00 2001 From: Samuel Noordhuis Date: Thu, 17 Jun 2021 14:04:42 +1000 Subject: [PATCH 19/23] terraform-docs: 0.13.0 -> 0.14.1 --- .../networking/cluster/terraform-docs/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 54520b54c88e..bc04d283507b 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,23 +1,19 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lx+yp0ybgZfmxvPM2BY2yq39qA6XebcKGrFd0AJa4yg="; + sha256 = "sha256-Jm0ySxn4GFW4iAH3tOIvclcDGJMKzH7m7fhWnAf4+gs="; }; - vendorSha256 = "sha256-qoZUgSSr7jsDVVPBUyfN5Uw4CnH9EnD/4tX+TCSNV0Q="; + vendorSha256 = "sha256-IzmAlthE6SVvGHj72wrY1/KLehOv8Ck9VaTv5jMpt48="; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X main.version=${version}") - ''; - meta = with lib; { description = "A utility to generate documentation from Terraform modules in various output formats"; homepage = "https://github.com/terraform-docs/terraform-docs/"; From 9e4803a7081c2c4853db0e30df034b0ad9c53db8 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 13 Jun 2021 12:58:07 +0200 Subject: [PATCH 20/23] spice: 0.14.2 -> 0.15.0 Fixes CVE-2021-20201. --- .../libraries/spice/correct-meson.patch | 26 ------------------- pkgs/development/libraries/spice/default.nix | 11 +++----- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/spice/correct-meson.patch diff --git a/pkgs/development/libraries/spice/correct-meson.patch b/pkgs/development/libraries/spice/correct-meson.patch deleted file mode 100644 index d3422cb915b3..000000000000 --- a/pkgs/development/libraries/spice/correct-meson.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/meson.build b/meson.build -index 8b8ae8bb..e58c436c 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,7 +2,7 @@ - # project definition - # - project('spice', 'c', -- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(), -+ version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(), - license : 'LGPLv2.1', - meson_version : '>= 0.48') - -diff --git a/server/meson.build b/server/meson.build -index 34d8eef1..988ccab2 100644 ---- a/server/meson.build -+++ b/server/meson.build -@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.') - major = '@0@'.format(version_info[0]) - minor = '@0@'.format(version_info[1]) - micro = version_info[2].to_int() --if not version_info[3].contains('git') -+if not version_info.contains('git') - micro += 1 - endif - micro = '@0@'.format(micro) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ff1f5eb8041a..33677303ddcb 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -26,18 +26,13 @@ stdenv.mkDerivation rec { pname = "spice"; - version = "0.14.2"; + version = "0.15.0"; src = fetchurl { - url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; - sha256 = "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj"; + url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2"; + sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k"; }; - patches = [ - # submitted https://gitlab.freedesktop.org/spice/spice/merge_requests/4 - ./correct-meson.patch - ]; - postPatch = '' patchShebangs build-aux ''; From 6708061975655d43dca265f10865673d5fa2a66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 17 Jun 2021 11:16:37 +0200 Subject: [PATCH 21/23] top-level: fix typo --- pkgs/top-level/stage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 931ad1f01ae9..a7905d0db299 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -151,7 +151,7 @@ let otherPackageSets = self: super: { # This maps each entry in lib.systems.examples to its own package # set. Each of these will contain all packages cross compiled for - # that target system. For instance, pkgsCross.rasberryPi.hello, + # that target system. For instance, pkgsCross.raspberryPi.hello, # will refer to the "hello" package built for the ARM6-based # Raspberry Pi. pkgsCross = lib.mapAttrs (n: crossSystem: From 930ccdeadea6093e0f425636d1240ba365a403c6 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 7 Jun 2021 16:51:13 -0300 Subject: [PATCH 22/23] ocamlPackages.cstruct-async: init 6.0.0 --- pkgs/development/ocaml-modules/cstruct/async.nix | 11 +++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cstruct/async.nix diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix new file mode 100644 index 000000000000..579f12776c08 --- /dev/null +++ b/pkgs/development/ocaml-modules/cstruct/async.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, cstruct, async_unix }: + +buildDunePackage rec { + pname = "cstruct-async"; + inherit (cstruct) src version meta useDune2; + + propagatedBuildInputs = [ + async_unix + cstruct + ]; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 07191c8e96f1..c6172887833b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,6 +217,8 @@ let cstruct = callPackage ../development/ocaml-modules/cstruct {}; + cstruct-async = callPackage ../development/ocaml-modules/cstruct/async.nix { }; + cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { }; cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {}; From 28b48376b992a2126dfa79ddfbcc6c60d5c62438 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 17 Jun 2021 12:29:30 +0200 Subject: [PATCH 23/23] chromiumBeta: 92.0.4515.51 -> 92.0.4515.59 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8edb42470c2f..717bda8a297c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.51", - "sha256": "0x9c5fy95wnri9z0s8pbwyq1lw684n7d70l1s2rp5yxh0snannxg", - "sha256bin64": "036km5dp7asq5n86qx7c9119mdch7sl89lhq1ffss0f4mzcq42yd", + "version": "92.0.4515.59", + "sha256": "0lpmd4sybr9qxqj7ab25xjliaw2dk9njnik51gdffrrwphv9qdxb", + "sha256bin64": "0qq9a3pzyn5d6bagx3py86ksl8n488lmlrmadgam2gb7421jq71a", "deps": { "gn": { "version": "2021-05-07",