From ac2e3ef2709cb2ee0be5fff77ceb55a653a89e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 9 Feb 2021 09:11:44 +0100 Subject: [PATCH 01/29] firefox/wrapper: clean up plugin related code --- .../networking/browsers/firefox/wrapper.nix | 57 +++++++------------ 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 96a4e15adf8..ed88bf587d5 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -51,27 +51,6 @@ let alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; - # FIXME: This should probably be an assertion now? - plugins = - let - removed = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - in if removed != [] then - throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." - else - [] - ; - nativeMessagingHosts = ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) @@ -164,7 +143,24 @@ let # # ############################# - in stdenv.mkDerivation { + # TODO: remove this after the next release (21.03) + configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ + "enableAdobeFlash" + "enableAdobeReader" + "enableBluejeans" + "enableDjvu" + "enableFriBIDPlugin" + "enableGoogleTalkPlugin" + "enableMPlayer" + "enableVLC" + "icedtea" + "jre" + ]; + pluginsError = + "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; + + in if configPlugins != [] then throw pluginsError else + (stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { @@ -262,12 +258,9 @@ let makeWrapper "$oldExe" \ "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \ - --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ - --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix PATH ':' "${xdg-utils}/bin" \ - --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ @@ -351,9 +344,6 @@ let preferLocalBuild = true; - # Let each plugin tell us (through its `mozillaPlugin') attribute - # where to find the plugin in its tree. - plugins = map (x: x + x.mozillaPlugin) plugins; libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; gtk_modules = map (x: x + x.gtkModule) gtk_modules; @@ -362,14 +352,9 @@ let disallowedRequisites = [ stdenv.cc ]; meta = browser.meta // { - description = - browser.meta.description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)) - + ")"; + description = browser.meta.description; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }; -in - lib.makeOverridable wrapper + }); +in lib.makeOverridable wrapper From 4b228e605367d9a61e2688b098e8ea5a4419c642 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Feb 2021 00:28:59 +0000 Subject: [PATCH 02/29] docker-credential-gcr: 2.0.2 -> 2.0.4 --- pkgs/tools/admin/docker-credential-gcr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 7fb128caa19..48851c3784b 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "docker-credential-gcr"; - version = "2.0.2"; + version = "2.0.4"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "0m7jx669yf27z2g9gw9vwncpwldrcb3ldlf1xhvbwbijnc2jk866"; + sha256 = "sha256-yG8gpsD1KZBSbJnnNTXgZah/mcrOUH1O37s7AGpeHjQ="; }; meta = with lib; { From 9c318e6d570e368d91b1e75164541dda34cb754a Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 15 Feb 2021 11:08:29 -0500 Subject: [PATCH 03/29] newsflash: add explanation for no-post-install.patch --- .../networking/feedreaders/newsflash/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index e8a76b3d491..37b34a39f07 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -31,6 +31,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26"; patches = [ + # Post install tries to generate an icon cache & update the + # desktop database. The gtk setup hook drop-icon-theme-cache.sh + # would strip out the icon cache and the desktop database wouldn't + # be included in $out. They will generated by xdg.mime.enable & + # gtk.iconCache.enable instead. ./no-post-install.patch ]; From 8696e999ac0a9f735a085e57eb71cbfaf65f10f4 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 30 Jan 2021 12:51:09 -0500 Subject: [PATCH 04/29] newsflash: 1.1.1 -> 1.2.0 --- .../networking/feedreaders/newsflash/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 37b34a39f07..9c3b70ed86b 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "newsflash"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd"; + hash = "sha256-ilaWkwy3uL/GWUg5lTLVG9zbpGXvjSFyciY8M+vy4k4="; }; - cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26"; + cargoHash = "sha256-kqhGoAMXt+KK5CJ1sKeMtattIQCcqV7YC7DD3TmaYyg="; patches = [ # Post install tries to generate an icon cache & update the @@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec { ]; postPatch = '' - chmod +x build-aux/cargo.sh patchShebangs . ''; From 919109017dd7f286fc8da938e4304478e118017e Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 7 Feb 2021 22:31:29 -0500 Subject: [PATCH 05/29] newsflash: 1.2.0 -> 1.2.1 --- .../networking/feedreaders/newsflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 9c3b70ed86b..24b6f4a82f4 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "newsflash"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-ilaWkwy3uL/GWUg5lTLVG9zbpGXvjSFyciY8M+vy4k4="; + hash = "sha256-5GuQoLMQ6p4B5vnY5Viad3rjkyZX3aWeVeycozM7pCE="; }; - cargoHash = "sha256-kqhGoAMXt+KK5CJ1sKeMtattIQCcqV7YC7DD3TmaYyg="; + cargoHash = "sha256-xBH3+VTV6hlF1sg/Iaw6Z64Z8VpUhpbAHn/S/L9ymOI="; patches = [ # Post install tries to generate an icon cache & update the From 1196443fb2316004f5773d066d56d6d4630cd118 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 14 Feb 2021 14:55:19 -0500 Subject: [PATCH 06/29] newsflash: 1.2.1 -> 1.2.2 --- .../networking/feedreaders/newsflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 24b6f4a82f4..2223b8f5492 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "newsflash"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-5GuQoLMQ6p4B5vnY5Viad3rjkyZX3aWeVeycozM7pCE="; + hash = "sha256-TeheK14COX1NIrql74eI8Wx4jtpUP1eO5mugT5LzlPY="; }; - cargoHash = "sha256-xBH3+VTV6hlF1sg/Iaw6Z64Z8VpUhpbAHn/S/L9ymOI="; + cargoHash = "sha256-Fbj4sabrwpfa0QNEN4l91y/6AuPIKu7QPzYNUO6RtU0="; patches = [ # Post install tries to generate an icon cache & update the From 44f6502712d6d4e639f7d56e9dc68acea6d62787 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Feb 2021 16:09:10 +0000 Subject: [PATCH 07/29] sd-local: 1.0.20 -> 1.0.21 --- pkgs/development/tools/sd-local/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index bfe496e3cbf..16a01a641c7 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.20"; + version = "1.0.21"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SKBSsS8WPsr5/42IMueLkfJCrOQIO/ODlhTp+xrmQ/4="; + sha256 = "sha256-cYglIobBldfFNavso8sLdqHzoWcl6qTurxGRMdoLqGc="; }; vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20="; From 720e063f2e065ab19b12af756d9611043f4df866 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Feb 2021 10:33:10 +0000 Subject: [PATCH 08/29] gpxsee: 8.5 -> 8.6 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 5ea01dfa19f..fad86b8974f 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.5"; + version = "8.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-ygBM8HtCF8d4KVOakP4ssFyTgAsPQDfjAMJaEqo+Ml4="; + sha256 = "sha256-RAqTwi65YskQhsjlHxQqy50R5s8z2yriWLkrg5J/eTc="; }; patches = (substituteAll { From 5c589a2743b1861d838c831e2747da8ee08b4556 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 14:51:52 +0100 Subject: [PATCH 09/29] python3Packages.pychannels: init at 1.2.2 --- .../python-modules/pychannels/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pychannels/default.nix diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix new file mode 100644 index 00000000000..0c5e290334d --- /dev/null +++ b/pkgs/development/python-modules/pychannels/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pychannels"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "fancybits"; + repo = pname; + rev = version; + sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "pychannels" ]; + + meta = with lib; { + description = "Python library for interacting with the Channels app"; + homepage = "https://github.com/fancybits/pychannels"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce152..acc7dfadb92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5311,6 +5311,8 @@ in { pycfdns = callPackage ../development/python-modules/pycfdns { }; + pychannels = callPackage ../development/python-modules/pychannels { }; + pychart = callPackage ../development/python-modules/pychart { }; pychef = callPackage ../development/python-modules/pychef { }; From bce61c2cd42059fc8fee4084754de9b2b6169804 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 14:55:25 +0100 Subject: [PATCH 10/29] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ce7fbfb6064..dbeee40337b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -110,7 +110,7 @@ "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; - "channels" = ps: with ps; [ ]; # missing inputs: pychannels + "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; From 8fbe61b9cdcd536c209c3f277d4d6bfc48b93532 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Fri, 19 Feb 2021 14:59:41 +0100 Subject: [PATCH 11/29] fluxcd: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 767ac70c56f..d82c6b45742 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1xxw6zk0lk4is220lydcx57mrsw6pk2rirsp4wjzvawjlv7wdv25"; + sha256 = "1yrjgjagh7jfzgvnj9wr71mk34x7yf66fwyby73f1pfi2cg49nhp"; }; vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr"; From 1765eb0addc3bbaa47a3db856fc9ddbdc188b658 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 15:34:10 +0100 Subject: [PATCH 12/29] python3Packages.python-velbus: init 2.1.2 --- .../python-modules/python-velbus/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/python-velbus/default.nix diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix new file mode 100644 index 00000000000..a02edfdc1f6 --- /dev/null +++ b/pkgs/development/python-modules/python-velbus/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +}: + +buildPythonPackage rec { + pname = "python-velbus"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "thomasdelaet"; + repo = pname; + rev = "v${version}"; + sha256 = "0dv7dsjp5li87ispdphaz7jd0a9xc328rxwawf2f58b1ii904xr4"; + }; + + propagatedBuildInputs = [ pyserial ]; + + # Project has not tests + doCheck = false; + pythonImportsCheck = [ "velbus" ]; + + meta = with lib; { + description = "Python library to control the Velbus home automation system"; + homepage = "https://github.com/thomasdelaet/python-velbus"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce152..4629801288e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6493,6 +6493,8 @@ in { python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + python-velbus = callPackage ../development/python-modules/python-velbus { }; + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; python-vlc = callPackage ../development/python-modules/python-vlc { }; From e4a759f5e8f3e6a5e6fb5342029edfc16f30d7a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 15:34:30 +0100 Subject: [PATCH 13/29] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ce7fbfb6064..9fa5bab12ea 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -894,7 +894,7 @@ "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp - "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus + "velbus" = ps: with ps; [ python-velbus ]; "velux" = ps: with ps; [ pyvlx ]; "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch "vera" = ps: with ps; [ pyvera ]; From 0fe18bce743265e777faea889264e1334a559605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 15:46:57 +0100 Subject: [PATCH 14/29] python3Packages.asyncio-dgram: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/asyncio-dgram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index 14c800f568b..2360d170f38 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; + sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o="; }; # OSError: AF_UNIX path too long From 37147ed3d824d1cc7b1022b6dc04a587ca1458b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 15:56:51 +0100 Subject: [PATCH 15/29] python3Packages.mcstatus: init at 5.1.1 --- .../python-modules/mcstatus/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mcstatus/default.nix diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix new file mode 100644 index 00000000000..f8ddac600a6 --- /dev/null +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -0,0 +1,49 @@ +{ lib +, asyncio-dgram +, buildPythonPackage +, click +, dnspython +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "mcstatus"; + version = "5.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Dinnerbone"; + repo = pname; + rev = "release-${version}"; + sha256 = "1a3qrl6w76ayqkl1knaz5ai0brrzpjfdk33lyb1n1p7gnc73nhlr"; + }; + + propagatedBuildInputs = [ + asyncio-dgram + click + dnspython + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt --replace "dnspython3" "dnspython" + ''; + + pythonImportsCheck = [ "mcstatus" ]; + + meta = with lib; { + description = "Python library for checking the status of Minecraft servers"; + homepage = "https://github.com/Dinnerbone/mcstatus"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce152..8c22f1cb509 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4006,6 +4006,8 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; + mcstatus = callPackage ../development/python-modules/mcstatus { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; From 15ef03f88ec3e5564abf20f2dce523daab03fee4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 15:57:08 +0100 Subject: [PATCH 16/29] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ce7fbfb6064..334ca860a12 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -499,7 +499,7 @@ "mikrotik" = ps: with ps; [ librouteros ]; "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus + "minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ]; "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; From 53b2a693f7124f1d839ab0a4fcdd74234c270eb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 18:18:11 +0100 Subject: [PATCH 17/29] python3Packages.getmac: switch to pytestCheckHook and fix build --- .../python-modules/getmac/default.nix | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 51ce0ef0503..483539bc221 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -1,5 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest, pytest-benchmark, pytest-mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-benchmark +, pytest-mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "getmac"; @@ -7,19 +12,32 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GhostofGoes"; - repo = "getmac"; + repo = pname; rev = version; sha256 = "08d4iv5bjl1s4i9qhzf3pzjgj1rgbwi0x26qypf3ycgdj0a6gvh2"; }; - checkInputs = [ pytest pytest-benchmark pytest-mock ]; - checkPhase = '' - pytest --ignore tests/test_cli.py - ''; + checkInputs = [ + pytestCheckHook + pytest-benchmark + pytest-mock + ]; + + disabledTests = [ + # Disable CLI tests + "test_cli_main_basic" + "test_cli_main_verbose" + "test_cli_main_debug" + "test_cli_multiple_debug_levels" + # Disable test that require network access + "test_uuid_lanscan_iface" + ]; + + pythonImportsCheck = [ "getmac" ]; meta = with lib; { + description = "Python package to get the MAC address of network interfaces and hosts on the local network"; homepage = "https://github.com/GhostofGoes/getmac"; - description = "Pure-Python package to get the MAC address of network interfaces and hosts on the local network."; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; From 99a074aa71c0e56de7a57c9c5a3131021efbdcb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 18:24:02 +0100 Subject: [PATCH 18/29] python3Packages.pymysensors: init at 0.20.1 --- .../python-modules/pymysensors/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/pymysensors/default.nix diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix new file mode 100644 index 00000000000..bbfeec3a36c --- /dev/null +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, click +, crcmod +, fetchFromGitHub +, getmac +, intelhex +, paho-mqtt +, pyserial +, pyserial-asyncio +, pytest-sugar +, pytest-timeout +, pytestCheckHook +, pythonOlder +, voluptuous +}: + +buildPythonPackage rec { + pname = "pymysensors"; + version = "0.20.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "theolind"; + repo = pname; + rev = version; + sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy"; + }; + + propagatedBuildInputs = [ + click + crcmod + getmac + intelhex + paho-mqtt + pyserial + pyserial-asyncio + voluptuous + ]; + + checkInputs = [ + pytest-sugar + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "mysensors" ]; + + meta = with lib; { + description = "Python API for talking to a MySensors gateway"; + homepage = "https://github.com/theolind/pymysensors"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce152..73efe1ea129 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5718,6 +5718,8 @@ in { pymyq = callPackage ../development/python-modules/pymyq { }; + pymysensors = callPackage ../development/python-modules/pymysensors { }; + pymysql = callPackage ../development/python-modules/pymysql { }; pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; From ab75447925762ee9859ed86c178adb080c59b20b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 18:24:29 +0100 Subject: [PATCH 19/29] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ce7fbfb6064..95397bae577 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -523,7 +523,7 @@ "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 From 569b2425e5809918d6b4708898c8880dc568dc1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 17:41:39 +0100 Subject: [PATCH 20/29] python3Packages.pyxiaomigateway: init at 0.13.4 --- .../pyxiaomigateway/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pyxiaomigateway/default.nix diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix new file mode 100644 index 00000000000..1d3a83177ed --- /dev/null +++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cryptography +}: + +buildPythonPackage rec { + pname = "pyxiaomigateway"; + version = "0.13.4"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "PyXiaomiGateway"; + rev = version; + sha256 = "1xg89sdds04wgil88ihs84cjr3df6lajjbkyb1aymj638ibdyqns"; + }; + + propagatedBuildInputs = [ cryptography ]; + + # Tests are not mocking the gateway completely + doCheck = false; + pythonImportsCheck = [ "xiaomi_gateway" ]; + + meta = with lib; { + description = "Python library to communicate with the Xiaomi Gateway"; + homepage = "https://github.com/Danielhiversen/PyXiaomiGateway/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce152..6ada0b7803d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6636,6 +6636,8 @@ in { pyxeoma = callPackage ../development/python-modules/pyxeoma { }; + pyxiaomigateway = callPackage ../development/python-modules/pyxiaomigateway { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); From 043e5065a18e2e0790fbaed1f4f0b4a02c794bb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 17:47:53 +0100 Subject: [PATCH 21/29] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ce7fbfb6064..c5a9ff3096e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -948,7 +948,7 @@ "xeoma" = ps: with ps; [ pyxeoma ]; "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway + "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv "xmpp" = ps: with ps; [ slixmpp ]; From d0cb896be289633c81120116abb81d5dbc8cfe80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Feb 2021 19:15:36 +0100 Subject: [PATCH 22/29] pythonPackages.geoip2: remove unused input --- pkgs/development/python-modules/geoip2/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 69b5d2f97fb..05a73c31675 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, lib, fetchPypi, isPy27 , aiohttp , maxminddb -, mock , mocket , requests , requests-mock From f5977d20b30c972edd1454f43df3ed1c4f4348d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Feb 2021 19:15:45 +0100 Subject: [PATCH 23/29] pythonPackages.lazr-restfulclient: prepare tests --- .../python-modules/lazr-restfulclient/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix index 93956c51b25..cb78dfff1a2 100644 --- a/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -8,6 +8,10 @@ , setuptools , six , wadllib +, fixtures +, lazr-uri +, pytestCheckHook +, wsgi-intercept }: buildPythonPackage rec { @@ -23,7 +27,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; - doCheck = false; # requires to package lazr.restful, lazr.authentication, and wsgi_intercept + # E ModuleNotFoundError: No module named 'lazr.uri' + doCheck = false; + checkInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ]; pythonImportsCheck = [ "lazr.restfulclient" ]; From fe6531961ff63e148454436fd0d00a84bb3599df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Feb 2021 19:15:54 +0100 Subject: [PATCH 24/29] pythonPackages.sopel: remove unused input --- pkgs/development/python-modules/sopel/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 7b549933588..c541751bd24 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -6,7 +6,6 @@ , pyenchant , pygeoip , pytestCheckHook -, python , pytz , sqlalchemy , xmltodict From 3a3344c9edbd280d6e71cde7572625d95f941e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Feb 2021 19:16:01 +0100 Subject: [PATCH 25/29] pythonPackages.wsgi-intercept: init at 1.9.2 --- .../python-modules/wsgi-intercept/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/wsgi-intercept/default.nix diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix new file mode 100644 index 00000000000..7303a27f5b3 --- /dev/null +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, six, httplib2, py, pytestCheckHook, requests, urllib3 }: + +buildPythonPackage rec { + pname = "wsgi-intercept"; + version = "1.9.2"; + + src = fetchPypi { + pname = "wsgi_intercept"; + inherit version; + sha256 = "1b6251d03jnhqywr54bzj9fnc3qzp2kvz22asxpd27jy984qx21n"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ httplib2 py pytestCheckHook requests urllib3 ]; + + disabledTests = [ + "test_http_not_intercepted" + "test_https_not_intercepted" + "test_https_no_ssl_verification_not_intercepted" + ]; + + pythonImportsCheck = [ "wsgi_intercept" ]; + + meta = with lib; { + description = "wsgi_intercept installs a WSGI application in place of a real URI for testing"; + homepage = "https://github.com/cdent/wsgi-intercept"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce152..80fe8979369 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8370,6 +8370,8 @@ in { ws4py = callPackage ../development/python-modules/ws4py { }; + wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; From d51ec7e83d045a7afb65341c3edce35bad41d187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Fri, 19 Feb 2021 20:14:14 +0100 Subject: [PATCH 26/29] miniflux: fix link to docs --- nixos/modules/services/web-apps/miniflux.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 304712d0efc..62906d5e6a0 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -44,7 +44,7 @@ in ''; description = '' Configuration for Miniflux, refer to - + for documentation on the supported values. ''; }; From c79edb5eb0e1ee60da6bacb55febcd15928b20b9 Mon Sep 17 00:00:00 2001 From: Karim Vergnes Date: Fri, 19 Feb 2021 21:50:32 +0100 Subject: [PATCH 27/29] maintainer: update email for thesola10 --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 747ce847541..d9c43e61be1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9324,7 +9324,7 @@ name = "Jan Beinke"; }; thesola10 = { - email = "thesola10@bobile.fr"; + email = "me@thesola.io"; github = "thesola10"; githubId = 7287268; keys = [{ From 2a424cd02d73a5bae8ded9d83fbb2388d4a5b9d9 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Fri, 19 Feb 2021 15:09:07 -0600 Subject: [PATCH 28/29] factorio: 1.1.21 -> 1.1.25 --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index a8f49d59954..810332a9752 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.21.tar.xz", + "name": "factorio_alpha_x64-1.1.25.tar.xz", "needsAuth": true, - "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", + "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/alpha/linux64", + "version": "1.1.25" }, "stable": { - "name": "factorio_alpha_x64-1.1.21.tar.xz", + "name": "factorio_alpha_x64-1.1.25.tar.xz", "needsAuth": true, - "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", + "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/alpha/linux64", + "version": "1.1.25" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.21.tar.xz", + "name": "factorio_demo_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", + "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/demo/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/demo/linux64", + "version": "1.1.25" }, "stable": { - "name": "factorio_demo_x64-1.1.21.tar.xz", + "name": "factorio_demo_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", + "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/demo/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/demo/linux64", + "version": "1.1.25" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.21.tar.xz", + "name": "factorio_headless_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", + "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/headless/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/headless/linux64", + "version": "1.1.25" }, "stable": { - "name": "factorio_headless_x64-1.1.21.tar.xz", + "name": "factorio_headless_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", + "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/headless/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/headless/linux64", + "version": "1.1.25" } } } From b76422aaed5d29dbd07c88bfae4ae80cade04184 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 19 Feb 2021 16:29:33 -0800 Subject: [PATCH 29/29] alacritty: 0.7.1 -> 0.7.2 --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 71986e6ec6f..b14b874d60c 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "8alCFtr+3aJsqQ2Ra8u5/SRHfDvMq2kRvRCKo/zwMK0="; + sha256 = "sha256-VXV6w4OnhJBmvMKl7CynbhI9LclTKaSr+5DhHXMwSsc="; }; - cargoSha256 = "kqRlxieChnhWtYYf67gi+2bncIzO56xpnv2uLjcINVM="; + cargoSha256 = "sha256-PWnNTMNZKxsfS1OAXe4G3zjfg5gK1SMTc0JJrW90iSM="; nativeBuildInputs = [ cmake