From 57e7a01eb362489d764af75806b469d69614b11b Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Mon, 6 Dec 2021 13:36:56 +1000 Subject: [PATCH 01/23] openrussian-cli: force lua 5.3 And some cleanups. --- pkgs/misc/openrussian-cli/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index ce9a9e49c4ca..24c0b6bece78 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { dontConfigure = true; - # Disable check as it's too slow. - # doCheck = true; - - #This is needed even though it's the default for some reason. - checkTarget = "check"; - # Can't use "make install" here installPhase = '' runHook preInstall diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 297236b8f8e5..4f5102516541 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8286,7 +8286,9 @@ with pkgs; openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; - openrussian-cli = callPackage ../misc/openrussian-cli { }; + openrussian-cli = callPackage ../misc/openrussian-cli { + luaPackages = lua53Packages; + }; opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; From f60f1c92cdd5642c4fee2136ac7f2177ed8f22cf Mon Sep 17 00:00:00 2001 From: Eason0210 Date: Sun, 12 Dec 2021 16:19:04 +0800 Subject: [PATCH 02/23] tdlib: 1.7.9 -> 1.7.10 --- pkgs/development/libraries/tdlib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index efad8832a31b..c1040c942ce4 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.7.9"; + version = "1.7.10"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; - # https://github.com/tdlib/td/issues/1718 - rev = "7d41d9eaa58a6e0927806283252dc9e74eda5512"; - sha256 = "09b7srbfqi4gmg5pdi398pr0pxihw4d3cw85ycky54g862idzqs8"; + # https://github.com/tdlib/td/issues/1790 + rev = "a53cb30e99f937cfd64e0266fa558785a184a553"; + sha256 = "FX+66JRsigauLq2JLx0InWiedGeQJ9+ox+D/Bqik9ik="; }; buildInputs = [ gperf openssl readline zlib ]; From 9cd9d846bfd8ab197dae8b8df142f5e3fd645aab Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 14 Dec 2021 17:11:58 +0100 Subject: [PATCH 03/23] krankerl: 0.13.2 > 0.13.3 --- pkgs/development/tools/krankerl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/development/tools/krankerl/default.nix index c44677235d95..0061ca60bfcc 100644 --- a/pkgs/development/tools/krankerl/default.nix +++ b/pkgs/development/tools/krankerl/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "krankerl"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "ChristophWurst"; repo = "krankerl"; rev = "v${version}"; - sha256 = "sha256-Kol39AtM5m6FC+s5SDbQhWuASkGbeXPlmSGb7axEuK8="; + sha256 = "sha256-/zRO+CVYQgx9/j14zgNm/ABzLprt0OYne+O6hOEjSEw="; }; - cargoSha256 = "sha256-bPcKe3vE3VIjLJ4iYdF3Gt0sID09gRpxG5TpTGWhnPs="; + cargoSha256 = "sha256-LWQRFgDxl2yxP+v1TUENaTGrA/udh84AJvWIkfTJezM="; nativeBuildInputs = [ pkg-config From b83dac8bd1650fbaa8bf210cca3bc283495db14d Mon Sep 17 00:00:00 2001 From: Madoura Date: Wed, 15 Dec 2021 07:10:49 -0600 Subject: [PATCH 04/23] ares: init at 126 --- pkgs/misc/emulators/ares/default.nix | 84 +++++++++++++++++++++++++ pkgs/misc/emulators/ares/fix-ruby.patch | 27 ++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 113 insertions(+) create mode 100644 pkgs/misc/emulators/ares/default.nix create mode 100644 pkgs/misc/emulators/ares/fix-ruby.patch diff --git a/pkgs/misc/emulators/ares/default.nix b/pkgs/misc/emulators/ares/default.nix new file mode 100644 index 000000000000..33a7858455d6 --- /dev/null +++ b/pkgs/misc/emulators/ares/default.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, alsa-lib +, gtksourceview3 +, libXv +, openal +, libpulseaudio +, libao +, udev +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "ares"; + version = "126"; + + src = fetchFromGitHub { + owner = "ares-emulator"; + repo = "ares"; + rev = "v${version}"; + sha256 = "1rj4vmz8lvpmfc6wni7222kagnw9f6jda9rcb6qky2kpizlp2d24"; + }; + + parallel-rdp = fetchFromGitHub { + owner = "Themaister"; + repo = "parallel-rdp-standalone"; + rev = "0dcebe11ee79288441e40e145c8f340d81f52316"; + sha256 = "1avp4wyfkhk5yfjqx5w3jbqghn2mq5la7k9248kjmnp9n9lip6w9"; + }; + + patches = [ + ./fix-ruby.patch + ]; + + enableParallelBuilding = true; + dontConfigure = true; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + gtksourceview3 + libXv + openal + libpulseaudio + libao + udev + SDL2 + ]; + + buildPhase = '' + runHook preBuild + + rm -rf ares/n64/vulkan/parallel-rdp + ln -sf ${parallel-rdp} ares/n64/vulkan/parallel-rdp + make -C desktop-ui -j $NIX_BUILD_CORES openmp=true vulkan=true local=false hiro=gtk3 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/{applications,ares,pixmaps}} + cp desktop-ui/out/ares $out/bin + cp desktop-ui/resource/ares.desktop $out/share/applications + cp desktop-ui/resource/{ares{.ico,.png},font.png} $out/share/pixmaps + cp -r ares/{Shaders,System} $out/share/ares + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://ares.dev"; + description = "Open-source multi-system emulator with a focus on accuracy and preservation"; + license = licenses.isc; + maintainers = with maintainers; [ Madouura ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/emulators/ares/fix-ruby.patch b/pkgs/misc/emulators/ares/fix-ruby.patch new file mode 100644 index 000000000000..01bd57ebaadd --- /dev/null +++ b/pkgs/misc/emulators/ares/fix-ruby.patch @@ -0,0 +1,27 @@ +diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile +index e85a51701..7fca89e0f 100644 +--- a/ruby/GNUmakefile ++++ b/ruby/GNUmakefile +@@ -8,19 +8,9 @@ ifeq ($(ruby),) + ruby += audio.openal + ruby += input.quartz #input.carbon + else ifeq ($(platform),linux) +- pkg_check1 = $(if $(shell test -e /usr/lib/lib$1.so && echo 1),$2) +- pkg_check2 = $(if $(shell test -e /usr/lib/$(shell uname -m)-linux-gnu/lib$1.so && echo 1),$2) +- pkg_check = $(call pkg_check1,$1,$2) $(call pkg_check2,$1,$2) +- ruby += video.glx video.glx2 video.xshm +- ruby += $(call pkg_check,Xv,video.xvideo) +- ruby += audio.oss audio.alsa +- ruby += $(call pkg_check,openal,audio.openal) +- ruby += $(call pkg_check,pulse,audio.pulseaudio) +- ruby += $(call pkg_check,pulse-simple,audio.pulseaudiosimple) +- ruby += $(call pkg_check,ao,audio.ao) +- ruby += input.xlib +- ruby += $(call pkg_check,udev,input.udev) +- ruby += $(call pkg_check,SDL2,input.sdl) ++ ruby += video.glx video.glx2 video.xshm video.xvideo ++ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao ++ ruby += input.xlib input.udev input.sdl + else ifeq ($(platform),bsd) + pkg_check = $(if $(shell test -e /usr/local/lib/lib$1.so && echo 1),$2) + ruby += video.glx video.glx2 video.xshm diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 884890c46ac9..2015ad06a285 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32219,6 +32219,8 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; + ares = callPackage ../misc/emulators/ares { }; + atari800 = callPackage ../misc/emulators/atari800 { }; ataripp = callPackage ../misc/emulators/atari++ { }; From b6fac27fd26c8444c0588e5c2850bf060a0f7ba6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Dec 2021 17:21:49 +0100 Subject: [PATCH 05/23] python3Packages.aiohue: 3.0.3 -> 3.0.5 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index a4c6536308b9..b0f748e77d60 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "3.0.3"; + version = "3.0.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ajDwA8zFBQdFeI3oUBBWQZA13PNust21BWxrsB7PcTQ="; + sha256 = "sha256-qOtfr6rrV+E/vdY3AprJ5G7p+VzYDVk1aq9/F0O0mLE="; }; propagatedBuildInputs = [ From fa3b9378300e87ed841cd379aa760e3d8b1dd995 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Dec 2021 17:22:18 +0100 Subject: [PATCH 06/23] python3Packages.google-nest-sdm: 0.4.6 -> 0.4.8 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index c9812875278b..a4520a6847d2 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "0.4.6"; + version = "0.4.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-oMYCBmqDTPcGHwP3LFYX3CdbHw2hg41EQQv8iiv+ljE="; + sha256 = "sha256-HHjCML/55jthqZ5WjNNsldr+8nul8bd8N9aNAoe/iBw="; }; propagatedBuildInputs = [ From f08e50d54a07df888d3acf219c910472d4e328fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Dec 2021 17:22:35 +0100 Subject: [PATCH 07/23] python3Packages.pysmappee: 0.2.27 -> 0.2.29 --- pkgs/development/python-modules/pysmappee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix index 028d591ac924..c2322819ae45 100644 --- a/pkgs/development/python-modules/pysmappee/default.nix +++ b/pkgs/development/python-modules/pysmappee/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pysmappee"; - version = "0.2.27"; + version = "0.2.29"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "sha256-CzdkeC53ye+IMeGUiD1mK84h2ruC1/ZpjlDjuWMVoyQ="; + sha256 = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E="; }; propagatedBuildInputs = [ From a7c72bdc912a16cbdda2d5fa3d730526c8771796 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Wed, 15 Dec 2021 17:51:13 +0100 Subject: [PATCH 08/23] platformio: 5.2.3 -> 5.2.4 --- pkgs/development/embedded/platformio/core.nix | 24 +++++++++---------- .../embedded/platformio/default.nix | 4 ++-- .../use-local-spdx-license-list.patch | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 7d586760548e..711d31be3650 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -9,6 +9,16 @@ let python = python3.override { packageOverrides = self: super: { + aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { + version = "0.8.0"; + src = fetchFromGitHub { + owner = "Tinche"; + repo = "aiofiles"; + rev = "v${version}"; + sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap"; + }; + }); + asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec { version = "3.4.1"; src = fetchFromGitHub { @@ -41,22 +51,12 @@ let }); uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; rev = version; - sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r"; - }; - }); - - zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { - version = "0.36.13"; - src = fetchFromGitHub { - owner = "jstasiak"; - repo = "python-zeroconf"; - rev = version; - sha256 = "aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c="; + sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; }; }); }; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index ab2b989696c1..5bbc54916369 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.2.3"; + version = "5.2.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "0wbmwawn25srkyrd6hwrgli1himzsj08vbm76fgnpqdc84n78ckl"; + sha256 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9"; }; self = { diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index e8239150f380..b56018902858 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.14" +- version = "3.15" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version From 1b49fdf58022ed6f0e6777c0a1583b6a279d9c99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Dec 2021 18:33:15 +0100 Subject: [PATCH 09/23] home-assistant: 2021.12.1 -> 2021.12.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b990786091a5..ca59eed348bd 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.12.1"; + version = "2021.12.2"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8c3ac00f8933..4c34e5a7fc49 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -252,7 +252,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.12.1"; + hassVersion = "2021.12.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -269,7 +269,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:11qlalfzykbq5ydn2cagkqcbvdjkmjcdpp6lgiys9lyrw1rxycnb"; + hash = "sha256:0rb6kwvrjq258qv8xh4qbpw3n91bb263dcqp3f1dg45n8mbcdr60"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f5e2d3ceb619..b7090d01fc36 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20211212.0"; + version = "20211215.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cYh8xBUS8rb2koNAq8JwWtrOHSF1jC5v0lq+W1SwiXI="; + sha256 = "sha256-G2w+L+tQi47JOygYZ1+VtC96FBPet5klkW0LUeaxWBY="; }; # there is nothing to strip in this package From 17f683542ba5c6caad3a51c4f994c04655d3da29 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Dec 2021 20:18:18 +0100 Subject: [PATCH 10/23] esphome: 2021.12.0 -> 2021.12.1 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 26fe3c459ccb..9e6981c27880 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -17,14 +17,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.12.0"; + version = "2021.12.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-OiqY72XuzkdVxrUyPwAgH/Lnrht4lTlLYOirjF9UpjM="; + sha256 = "sha256-sxGlvbWlHrAVjCIKx4WsnmKQN4iOVfX+vnkntqceHDA="; }; patches = [ From cf3a2f50dc84e4a05c334f8246edd2fa36784b61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Dec 2021 23:06:00 +0100 Subject: [PATCH 11/23] logmap: init at unstable-2021-12-15 --- pkgs/tools/security/logmap/default.nix | 34 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/security/logmap/default.nix diff --git a/pkgs/tools/security/logmap/default.nix b/pkgs/tools/security/logmap/default.nix new file mode 100644 index 000000000000..d6d4cb0f1a54 --- /dev/null +++ b/pkgs/tools/security/logmap/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "logmap"; + version = "unstable-2021-12-15"; + format = "other"; + + src = fetchFromGitHub { + owner = "zhzyker"; + repo = pname; + rev = "5040707b4ae260830072de93ccd6a23615073abf"; + sha256 = "sha256-LOGjK5l/gaKObWbC9vaLruE8DdDsabztnEW/TjvCdtE="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + ]; + + installPhase = '' + runHook preInstall + install -vD ${pname}.py $out/bin/${pname} + runHook postInstall + ''; + + meta = with lib; { + description = "Tools for fuzzing Log4j2 jndi injection"; + homepage = "https://github.com/zhzyker/logmap"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9471a61f9b4..ca2b518d510c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7479,6 +7479,8 @@ with pkgs; logcheck = callPackage ../tools/system/logcheck { }; + logmap = callPackage ../tools/security/logmap { }; + logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { }; logkeys = callPackage ../tools/security/logkeys { }; From 421a62671e0e47f734412916b21667e0411b6ca0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 16 Dec 2021 10:53:34 +1000 Subject: [PATCH 12/23] delta: 0.11.2 -> 0.11.3 https://github.com/dandavison/delta/releases/tag/0.11.3 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 3b1c648144d3..ed01e9259f7a 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-GboG7Ia27CTisY0YCFiAhzoCMxMAXlCeAPll19+JoxM="; + sha256 = "sha256-qpoXUzXRcsUi1WHZAYGgnEaNxBYEQAdkXAz7YPiPae8="; }; - cargoSha256 = "sha256-JEIMZFDEWaKXfe4OzaAxMop0XYQAcz8L7hcTBD8DJio="; + cargoSha256 = "sha256-eds2W47+lOwO/HHKR+IjXOJOD8p1OYkk5qilDYTOUyk="; nativeBuildInputs = [ installShellFiles ]; From b90fd7cfb2b6d3c7693b4e49be621da747f15dc3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 15 Dec 2021 19:08:18 -0600 Subject: [PATCH 13/23] archivy: 1.4.0 -> 1.6.0 --- pkgs/applications/misc/archivy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index fd58ea48e554..550baba69829 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -53,11 +53,11 @@ with py.pkgs; buildPythonApplication rec { pname = "archivy"; - version = "1.4.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0="; + sha256 = "sha256-97ACQ3qp9ciw0kHwKwmatzCBl4XZr+6poejBM/0D4k8="; }; # Relax some dependencies From 9678aa21264af08614d71ecd17838be0b0aecbd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Dec 2021 04:15:51 +0000 Subject: [PATCH 14/23] python38Packages.pykeyatome: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/pykeyatome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index 8dd6d7fc45d4..b1890388faf6 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.1.2"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "sha256-5aKZaS+BFKR1ldAY3BlS/oqYGz1C+ZRkNL9ez/etWh4="; + sha256 = "173bf4nrj4jqp2119gfmbra7rhbr30bkjkd44rw9450nmpfmh7pk"; }; propagatedBuildInputs = [ From f7d43fde7aa9be92c50115d9f76d4745185ac966 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Dec 2021 06:00:33 +0000 Subject: [PATCH 15/23] python38Packages.pytest-httpserver: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/pytest-httpserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 5a5c3b1449f2..cd07a104038c 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "sha256-JwH9HZgU1YVR+dEETbM1xrqYcxaTZsWDSVI6WM907UA="; + sha256 = "87561c4fa6a7bc306d76d1979a3eb9d54eb26bfb2f3f51f1643bf3c090ce629d"; }; propagatedBuildInputs = [ werkzeug ]; From 05766e24ad9bfd514fcf760a58cceae072014992 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Dec 2021 08:41:25 +0100 Subject: [PATCH 16/23] checkov: 2.0.660 -> 2.0.664 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index db12b5caf3ce..4e621abc533b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.660"; + version = "2.0.664"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-ebVOEtJTlYaj9sYJsJ8BBxx+2PSyzbwivQIph3slaho="; + sha256 = "sha256-t7u47gkUtn9EwBWtz97GkiM8tyGCFk4S5UTQ+OosI2o="; }; nativeBuildInputs = with py.pkgs; [ From 4dafe447f041f1aa030322bb3506ce1f5298b297 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Dec 2021 09:01:22 +0100 Subject: [PATCH 17/23] log4j-vuln-scanner: 0.7.1 -> 0.8.1 --- pkgs/tools/security/log4j-vuln-scanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix index ae51ecef192f..778edf1d2ca6 100644 --- a/pkgs/tools/security/log4j-vuln-scanner/default.nix +++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "log4j-vuln-scanner"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "hillu"; repo = "local-log4j-vuln-scanner"; rev = "v${version}"; - sha256 = "sha256-YEXYZtjcZTl+9IgRuSRK/pvnISuW6Jbwuv+dqr4pork="; + sha256 = "sha256-qmm+5UATARuKyZltiVtIp/jOn0eUenWt7ztIfrN4q+0="; }; vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; From 11f5352bbecc1b6e1fddf004857c90da2ea5082b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 16 Dec 2021 01:00:31 -0800 Subject: [PATCH 18/23] coqPackages.category-theory: Set highest compatibility to coq 8.14 (#150559) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * coqPackages.category-theory: Set highest compatibility to coq 8.14 * coqPackages.category-theory: 20210730 → 20211213 Co-authored-by: Vincent Laporte --- pkgs/development/coq-modules/category-theory/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index d24cf1479307..ae3f7e809fb6 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -5,6 +5,8 @@ with lib; mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; + release."20211213".rev = "449e30e929d56f6f90c22af2c91ffcc4d79837be"; + release."20211213".sha256 = "sha256:0vgfmph5l1zn6j4b851rcm43s8y9r83swsz07rpzhmfg34pk0nl0"; release."20210730".rev = "d87937faaf7460bcd6985931ac36f551d67e11af"; release."20210730".sha256 = "04x7433yvibxknk6gy4971yzb4saa3z4dnfy9n6irhyafzlxyf0f"; release."20190414".rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; @@ -14,7 +16,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.13"; out = "20210730"; } + { case = range "8.10" "8.14"; out = "20211213"; } { case = range "8.8" "8.9"; out = "20190414"; } { case = range "8.6" "8.7"; out = "20180709"; } ] null; From 377603450a23c561c7c3b95a8ef1e97fb913c625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 16 Dec 2021 11:14:29 +0100 Subject: [PATCH 19/23] topgrade: 8.0.3 -> 8.1.2 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index deb9f9070051..99d6a0100e56 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "8.0.3"; + version = "8.1.2"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yk8mW07VmABq4XSOcNKYSs04xpZQfzdDBeQFGFP6u/Y="; + sha256 = "sha256-2ID3VVT4cQ1yZAD2WVKqkoE7qbe2nNMp1nlwfTxmlZo="; }; - cargoSha256 = "sha256-rX4ZfcGlKe+v9UvvfWODaulAVkUbq2jvtuHP504uiX4="; + cargoSha256 = "sha256-o1V6u7FmP+p+ApL0AmaqTQTZ2f0sZTpx2ro4lR/DFi8="; buildInputs = lib.optional stdenv.isDarwin Foundation; From 1b8f795c9431edb70ced32475419469006e9e994 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 14 Dec 2021 13:19:39 +1000 Subject: [PATCH 20/23] .github/workflows/editorconfig.yml: 2.3.5 -> 2.4.0 --- .github/workflows/editorconfig.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 445f0fcbaf8f..28e20d6c9458 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -31,7 +31,8 @@ jobs: - uses: cachix/install-nix-action@v16 with: # nixpkgs commit is pinned so that it doesn't break - nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz + # editorconfig-checker 2.4.0 + nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '' - name: Checking EditorConfig From 014236e9c9e12d4ffa5e9bb245a0bd57423fcdfd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 15 Dec 2021 07:45:23 +1000 Subject: [PATCH 21/23] nixos/kubernetes: don't import `` --- nixos/tests/kubernetes/default.nix | 2 +- nixos/tests/kubernetes/dns.nix | 2 +- nixos/tests/kubernetes/e2e.nix | 2 +- nixos/tests/kubernetes/rbac.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/kubernetes/default.nix b/nixos/tests/kubernetes/default.nix index 90b73c68a76d..60ba482758fb 100644 --- a/nixos/tests/kubernetes/default.nix +++ b/nixos/tests/kubernetes/default.nix @@ -1,5 +1,5 @@ { system ? builtins.currentSystem -, pkgs ? import { inherit system; } +, pkgs ? import ../../.. { inherit system; } }: let dns = import ./dns.nix { inherit system pkgs; }; diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 79e35bfec5a4..3fd1dd31f746 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -1,4 +1,4 @@ -{ system ? builtins.currentSystem, pkgs ? import { inherit system; } }: +{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }: with import ./base.nix { inherit system; }; let domain = "my.zyx"; diff --git a/nixos/tests/kubernetes/e2e.nix b/nixos/tests/kubernetes/e2e.nix index 175d8413045e..fb29d9cc6953 100644 --- a/nixos/tests/kubernetes/e2e.nix +++ b/nixos/tests/kubernetes/e2e.nix @@ -1,4 +1,4 @@ -{ system ? builtins.currentSystem, pkgs ? import { inherit system; } }: +{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }: with import ./base.nix { inherit system; }; let domain = "my.zyx"; diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 99194a69c261..ca73562256e4 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -1,4 +1,4 @@ -{ system ? builtins.currentSystem, pkgs ? import { inherit system; } }: +{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }: with import ./base.nix { inherit system; }; let From 435043c9240398c7868470a0e9665e2f7303f702 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 15 Dec 2021 07:43:39 +1000 Subject: [PATCH 22/23] lima: 0.7.4 -> 0.8.0 https://github.com/lima-vm/lima/releases/tag/v0.8.0 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index f22109b791d8..d6eba5f1029e 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pn8GtFAZMQyFjOpn6blNBoDgQL7X1gaYjGsQHwvMzaQ="; + sha256 = "sha256-bO7o3z9E7mGiUtlqI+mhhh+D6CG9j3BZ7IB8o/LDUPM="; }; - vendorSha256 = "sha256-egZFJSGnFYfOcBMNNEsPV6ngf3ddoYCSntnuloYfpxo="; + vendorSha256 = "sha256-MDmRkGa1m3YuUbffCwoChG0Fg74jyuQQ6ljfDlLatjI="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From f069a6d3a1b6a2fcc87033c7984bfe65746bc706 Mon Sep 17 00:00:00 2001 From: Zhu Chuang Date: Thu, 16 Dec 2021 19:51:36 +0800 Subject: [PATCH 23/23] standardnotes: 3.8.18 -> 3.9.5 (#148518) --- .../editors/standardnotes/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index d3ff564b8f0d..4191f6fbd20c 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -2,19 +2,20 @@ , fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: let - version = "3.8.18"; + version = "3.9.5"; pname = "standardnotes"; name = "${pname}-${version}"; + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; plat = { - i386-linux = "i386"; + i686-linux = "i386"; x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system}; + }.${stdenv.hostPlatform.system} or throwSystem; sha256 = { - i386-linux = "1xiypsmvpk8i6kab862pipbdfb0y5d5355hdwjmva7v7g26aa7h7"; - x86_64-linux = "03qlxlgyypnvcr40jh6i4wriyax2jbfhrb798cq0n7qlc1y4pg8r"; - }.${stdenv.hostPlatform.system}; + i686-linux = "sha256-7Mo8ELFV6roZ3IYWBtB2rRDAzJrq4ht9f1v6uohsauw="; + x86_64-linux = "sha256-9VPYII9E8E3yL7UuU0+GmaK3qxWX4bwfACDl7F7sngo="; + }.${stdenv.hostPlatform.system} or throwSystem; src = fetchurl { url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-linux-${plat}.AppImage"; @@ -60,7 +61,7 @@ in appimageTools.wrapType2 rec { ''; homepage = "https://standardnotes.org"; license = licenses.agpl3; - maintainers = with maintainers; [ mgregoire ]; - platforms = [ "i386-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ mgregoire chuangzhu ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; }