From 284802c2794e16c871d052b951accb69010bb229 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 11:24:21 +0000 Subject: [PATCH 01/99] bitwarden: 1.27.1 -> 1.28.1 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index e0bbad3486ca..7d7afa624931 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.27.1"; + x86_64-linux = "1.28.1"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-CqyIARPHri018AOgI1rFJ9Td3K8OamXVgupAINME7BY="; + x86_64-linux = "sha256-vyEbISZDTN+CHqSEtElzfg4M4i+2RjUux5vzwJw8/dc="; }.${system} or ""; meta = with lib; { From 5d919971f8a80599b96eaebd23bedd52b67d7afd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 03:42:47 +0000 Subject: [PATCH 02/99] jackett: 0.18.545 -> 0.18.582 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index baa1461df82e..4814f956411d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.545"; + version = "0.18.582"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-aHb7bhqagf60YkzL5II/mGPeUibH655QH8Qx3+EqWjY="; + sha256 = "sha256-WwTeUvBD790CP+mph2xKm/m7csYQgmXgJa4TLn5nsVI="; }; nativeBuildInputs = [ makeWrapper ]; From 2c063fe250e019a44eba31e4f7857d0e35065b5b Mon Sep 17 00:00:00 2001 From: piegames Date: Wed, 8 Sep 2021 22:49:05 +0200 Subject: [PATCH 03/99] gnomeExtensions: add patch framework It's like Haskell's overlay system, but way more primitive. We simply pre-define some package overrides that are required for an automatically packaged extension to work. Ideally, all (or almost all) currently manually pacakged extensions will work this way. Since these are mostly just a few lines each, there is no need to split this up into a lot of small files. --- .../gnome/extensions/buildGnomeExtension.nix | 7 +++++-- pkgs/desktops/gnome/extensions/default.nix | 21 ++++++++++++------- .../gnome/extensions/extensionPatches.nix | 14 +++++++++++++ 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 pkgs/desktops/gnome/extensions/extensionPatches.nix diff --git a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix index 3be7f5c8789a..d661c853bbc1 100644 --- a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix +++ b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix @@ -36,9 +36,12 @@ let echo "${metadata}" | base64 --decode > $out/metadata.json ''; }; - buildCommand = '' + dontBuild = true; + installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ - cp -r -T $src $out/share/gnome-shell/extensions/${uuid} + cp -r -T . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = { description = builtins.head (lib.splitString "\n" description); diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index f98e2fb4e67a..2e5e2ade43e2 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -60,17 +60,24 @@ in rec { gnome38Extensions = mapUuidNames (produceExtensionsList "38"); gnome40Extensions = mapUuidNames (produceExtensionsList "40"); - gnomeExtensions = lib.recurseIntoAttrs ( - (mapReadableNames - (lib.attrValues (gnome40Extensions // (callPackages ./manuallyPackaged.nix {}))) - ) - // lib.optionalAttrs (config.allowAliases or true) { + gnomeExtensions = lib.trivial.pipe gnome40Extensions [ + # Apply some custom patches for automatically packaged extensions + (callPackage ./extensionPatches.nix {}) + # Add all manually packaged extensions + (extensions: extensions // (callPackages ./manuallyPackaged.nix {})) + # Map the extension UUIDs to readable names + (lib.attrValues) + (mapReadableNames) + # Add some aliases + (extensions: extensions // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; remove-dropdown-arrows = throw "gnomeExtensions.remove-dropdown-arrows removed since 2021-05-25: The extensions has not seen an update sine GNOME 3.34. Furthermore, the functionality it provides is obsolete as of GNOME 40."; - } - ); + }) + # Make the set "public" + lib.recurseIntoAttrs + ]; } diff --git a/pkgs/desktops/gnome/extensions/extensionPatches.nix b/pkgs/desktops/gnome/extensions/extensionPatches.nix new file mode 100644 index 000000000000..21c75ebf1966 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/extensionPatches.nix @@ -0,0 +1,14 @@ +{ + lib, + ddcutil, + gjs, +}: +# A set of overrides for automatically packaged extensions that require some small fixes. +# The input must be an attribute set with the extensions' UUIDs as keys and the extension +# derivations as values. Output is the same, but with patches applied. +# +# Note that all source patches refer to the built extension as published on extensions.gnome.org, and not +# the upstream repository's sources. +super: super // { + +} From 0ce4ae676a817d028af86931ccd4a23f4e9fb4eb Mon Sep 17 00:00:00 2001 From: piegames Date: Wed, 8 Sep 2021 22:52:32 +0200 Subject: [PATCH 04/99] gnomeExtensions.brightness-control-using-ddcutil: Fix paths Fixes #136111. --- pkgs/desktops/gnome/extensions/extensionPatches.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/gnome/extensions/extensionPatches.nix b/pkgs/desktops/gnome/extensions/extensionPatches.nix index 21c75ebf1966..2188e06d4338 100644 --- a/pkgs/desktops/gnome/extensions/extensionPatches.nix +++ b/pkgs/desktops/gnome/extensions/extensionPatches.nix @@ -11,4 +11,12 @@ # the upstream repository's sources. super: super // { + "display-brightness-ddcutil@themightydeity.github.com" = super."display-brightness-ddcutil@themightydeity.github.com".overrideAttrs (old: { + # Has a hard-coded path to a run-time dependency + # https://github.com/NixOS/nixpkgs/issues/136111 + postPatch = '' + substituteInPlace "extension.js" --replace "/usr/bin/ddcutil" "${ddcutil}/bin/ddcutil" + ''; + }); + } From 48064d95d944709a7eb679c0129c424c63c52371 Mon Sep 17 00:00:00 2001 From: piegames Date: Wed, 8 Sep 2021 22:52:58 +0200 Subject: [PATCH 05/99] gnomeExtensions.screenshot-tool: Fix paths Fixes #136112. --- pkgs/desktops/gnome/extensions/extensionPatches.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome/extensions/extensionPatches.nix b/pkgs/desktops/gnome/extensions/extensionPatches.nix index 2188e06d4338..182bdf6ecdfb 100644 --- a/pkgs/desktops/gnome/extensions/extensionPatches.nix +++ b/pkgs/desktops/gnome/extensions/extensionPatches.nix @@ -19,4 +19,14 @@ super: super // { ''; }); + "gnome-shell-screenshot@ttll.de" = super."gnome-shell-screenshot@ttll.de".overrideAttrs (old: { + # Requires gjs + # https://github.com/NixOS/nixpkgs/issues/136112 + postPatch = '' + for file in *.js; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + done + ''; + }); + } From 2de33b718400ee76eba738cdec846fc25ca4287a Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 11 Sep 2021 01:18:07 +0200 Subject: [PATCH 06/99] gnomeExtensions.tilingGnome: remove unstable in pname We want the pname to match a potential automatic packaging (if the extension is updated to support a more recent GNOME version) as closely as possible. --- pkgs/desktops/gnome/extensions/tilingnome/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index 42c6467dba80..fbf89ffa19c9 100644 --- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-tilingnome-unstable"; + pname = "gnome-shell-extension-tilingnome"; version = "unstable-2019-09-19"; src = fetchFromGitHub { From d06d273721d31fe9084281d82e5a3e276882a80a Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 22 Sep 2021 03:14:04 +0200 Subject: [PATCH 07/99] bespokesynth: init at 1.0.0 --- .../audio/bespokesynth/default.nix | 113 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/applications/audio/bespokesynth/default.nix diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix new file mode 100644 index 000000000000..c3c33267f65d --- /dev/null +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -0,0 +1,113 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, fetchzip +, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor +, libGL, python3, ncurses, libusb1 +, gtk3, webkitgtk, curl, xvfb-run, makeWrapper + # "Debug", or "Release" +, buildType ? "Release" +}: + +let + projucer = stdenv.mkDerivation rec { + pname = "projucer"; + version = "5.4.7"; + + src = fetchFromGitHub { + owner = "juce-framework"; + repo = "JUCE"; + rev = version; + sha256= "0qpiqfwwpcghk7ij6w4vy9ywr3ryg7ppg77bmd7783kxg6zbhj8h"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype libX11 libXrandr libXinerama libXext gtk3 webkitgtk + libjack2 curl + ]; + preBuild = '' + cd extras/Projucer/Builds/LinuxMakefile + ''; + makeFlags = [ "CONFIG=${buildType}" ]; + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp -a build/Projucer $out/bin/Projucer + ''; + }; + + # equal to vst-sdk in ../oxefmsynth/default.nix + vst-sdk = stdenv.mkDerivation rec { + name = "vstsdk3610_11_06_2018_build_37"; + src = fetchzip { + url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip"; + sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; + }; + installPhase = '' + cp -r . $out + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bespokesynth"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "awwbees"; + repo = pname; + rev = "v${version}"; + sha256 = "04b2m40jszphslkd4850jcb8qwls392lwy3lc6vlj01h4izvapqk"; + }; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + xvfb-run sh -e < Date: Thu, 23 Sep 2021 04:48:54 +0000 Subject: [PATCH 08/99] mustache-go: 1.2.2 -> 1.3.0 --- pkgs/development/tools/mustache-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index ee8edfdf5b0e..ddf2a851b7d4 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mustache-go"; - version = "1.2.2"; + version = "1.3.0"; goPackagePath = "github.com/cbroglie/mustache"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cbroglie"; repo = "mustache"; rev = "v${version}"; - sha256 = "sha256-ziWfkRUHYYyo1FqVVXFFDlTsBbsn59Ur9YQi2ZnTSRg="; + sha256 = "sha256-Z33hHOcx2K34v3j/qFD1VqeuUaqH0jqoMsVZQnLFx4U="; }; meta = with lib; { From 835d63ad0768a07409a19814182cd6e56673e504 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Sep 2021 15:54:46 +0200 Subject: [PATCH 09/99] python3Packages.faraday-agent-parameters-types: init at 1.0.1 --- .../default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/faraday-agent-parameters-types/default.nix diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix new file mode 100644 index 000000000000..ba0e120442cc --- /dev/null +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, marshmallow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "faraday-agent-parameters-types"; + version = "1.0.1"; + + src = fetchPypi { + pname = "faraday_agent_parameters_types"; + inherit version; + sha256 = "0q2cngxgkvl74mhkibvdsvjjrdfd7flxd6a4776wmxkkn0brzw66"; + }; + + propagatedBuildInputs = [ + marshmallow + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + pythonImportsCheck = [ "faraday_agent_parameters_types" ]; + + meta = with lib; { + description = "Collection of Faraday agent parameters types"; + homepage = "https://github.com/infobyte/faraday_agent_parameters_types"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f138448c155f..6d2ed6084337 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2506,6 +2506,8 @@ in { falcon = callPackage ../development/python-modules/falcon { }; + faraday-agent-parameters-types = callPackage ../development/python-modules/faraday-agent-parameters-types { }; + faraday-plugins = callPackage ../development/python-modules/faraday-plugins { }; fastapi = callPackage ../development/python-modules/fastapi { }; From 5becb56f71fb25384fa5742b828126fad7632860 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 01:51:12 +0000 Subject: [PATCH 10/99] star: 2.7.8a -> 2.7.9a --- pkgs/applications/science/biology/star/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 9ad53502cd76..4328bbd975a8 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.8a"; + version = "2.7.9a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "sha256-2qqdCan67bcoUGgr5ro2LGGHDAyS/egTrT8pWX1chX0="; + sha256 = "sha256-p1yaIbSGu8K5AkqJj0BAzuoWsXr25eCNoQmLXYQeg4E="; }; sourceRoot = "source/source"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Spliced Transcripts Alignment to a Reference"; homepage = "https://github.com/alexdobin/STAR"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.arcadio ]; }; } From 49041cd82eeae4d8413c79a10e46d8a1d9e8c083 Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 24 Sep 2021 20:42:18 +0200 Subject: [PATCH 11/99] gnomeExtensions: rename extensionPatches.nix to extensionOverrides.nix --- pkgs/desktops/gnome/extensions/default.nix | 2 +- .../extensions/{extensionPatches.nix => extensionOverrides.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/gnome/extensions/{extensionPatches.nix => extensionOverrides.nix} (100%) diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 2e5e2ade43e2..2937cf6ac798 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -62,7 +62,7 @@ in rec { gnomeExtensions = lib.trivial.pipe gnome40Extensions [ # Apply some custom patches for automatically packaged extensions - (callPackage ./extensionPatches.nix {}) + (callPackage ./extensionOverrides.nix {}) # Add all manually packaged extensions (extensions: extensions // (callPackages ./manuallyPackaged.nix {})) # Map the extension UUIDs to readable names diff --git a/pkgs/desktops/gnome/extensions/extensionPatches.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix similarity index 100% rename from pkgs/desktops/gnome/extensions/extensionPatches.nix rename to pkgs/desktops/gnome/extensions/extensionOverrides.nix From 0a915303c66c45bd8d144d2d19fa087af2300c95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 13:00:47 +0200 Subject: [PATCH 12/99] python3Packages.fjaraskupan: init at 1.0.1 --- .../python-modules/fjaraskupan/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/fjaraskupan/default.nix diff --git a/pkgs/development/python-modules/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix new file mode 100644 index 000000000000..a65daa55f651 --- /dev/null +++ b/pkgs/development/python-modules/fjaraskupan/default.nix @@ -0,0 +1,41 @@ +{ lib +, bleak +, buildPythonPackage +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fjaraskupan"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "elupus"; + repo = pname; + rev = version; + sha256 = "0r6l9cbl41ddg4mhw9g9rly9r7s70sscg1ysb99bsi8z6xml9za3"; + }; + + propagatedBuildInputs = [ + bleak + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "fjaraskupan" ]; + + meta = with lib; { + description = "Python module for controlling Fjäråskupan kitchen fans"; + homepage = "https://github.com/elupus/fjaraskupan"; + 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 50803af17df7..d7e1ab27b8a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2615,6 +2615,8 @@ in { fixtures = callPackage ../development/python-modules/fixtures { }; + fjaraskupan = callPackage ../development/python-modules/fjaraskupan { }; + flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; flake8 = callPackage ../development/python-modules/flake8 { }; From b822dbfc40bb7a84210ee469155048e8d22f93bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 13:01:27 +0200 Subject: [PATCH 13/99] 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 b1363880f9f8..ce1251def700 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -267,7 +267,7 @@ "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; - "fjaraskupan" = ps: with ps; [ ]; # missing inputs: fjaraskupan + "fjaraskupan" = ps: with ps; [ fjaraskupan ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ pymodbus ]; "flic" = ps: with ps; [ pyflic ]; From 64f34af1f4482abff0a31bc355aa9d7e7fa0a53b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 13:02:30 +0200 Subject: [PATCH 14/99] home-assistant: enable fjaraskupan tests --- 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 27c34e10e382..a74c3a0fa94c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -361,6 +361,7 @@ in with py.pkgs; buildPythonApplication rec { "filter" "fireservicerota" "firmata" + "fjaraskupan" "flick_electric" "flo" "flume" From a65f5cdce8bb91f87bb8517f21cecf913c0c26e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 15:02:18 +0200 Subject: [PATCH 15/99] python3Packages.mbddns: init at 0.1.2 --- .../python-modules/mbddns/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/mbddns/default.nix diff --git a/pkgs/development/python-modules/mbddns/default.nix b/pkgs/development/python-modules/mbddns/default.nix new file mode 100644 index 000000000000..05137b56b004 --- /dev/null +++ b/pkgs/development/python-modules/mbddns/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mbddns"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "thinkl33t"; + repo = "mb-ddns"; + rev = version; + sha256 = "13xzkprqk1v0zlzx4a0n9zzpnlb1g2h6pc62ms66fj72lsmjynj7"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "mbddns" ]; + + meta = with lib; { + description = "Mythic Beasts Dynamic DNS updater"; + homepage = "https://github.com/thinkl33t/mb-ddns"; + 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 50803af17df7..0a3c80a93b43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4512,6 +4512,8 @@ in { inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; + mbddns = callPackage ../development/python-modules/mbddns { }; + mccabe = callPackage ../development/python-modules/mccabe { }; mcstatus = callPackage ../development/python-modules/mcstatus { }; From b4ea8f7439dbd72ee6008a2049933b1367252cb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 15:03:15 +0200 Subject: [PATCH 16/99] 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 b1363880f9f8..d5a7de66bf03 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -551,7 +551,7 @@ "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; - "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns + "mythicbeastsdns" = ps: with ps; [ mbddns ]; "nad" = ps: with ps; [ nad-receiver ]; "nam" = ps: with ps; [ nettigo-air-monitor ]; "namecheapdns" = ps: with ps; [ defusedxml ]; From de5ffe51f6f67285c6096a2b6e8e4a2151a8822a Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sun, 26 Sep 2021 17:24:35 +0300 Subject: [PATCH 17/99] plasma5: load kwayland-integration plugin Signed-off-by: Yaroslav Bolyukin --- .../services/x11/desktop-managers/plasma5.nix | 1 + .../0001-platform-plugins-path.patch | 50 ------------------- .../kde-frameworks/kwindowsystem/default.nix | 6 --- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d8dc2675f068..16b82f972cbd 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -264,6 +264,7 @@ in kwallet-pam kwalletmanager kwayland + kwayland-integration kwidgetsaddons kxmlgui kxmlrpcclient diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch deleted file mode 100644 index 0093eb556bfd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 9 Dec 2020 10:01:59 -0600 -Subject: [PATCH] platform plugins path - ---- - src/pluginwrapper.cpp | 27 +++++++++++++-------------- - 1 file changed, 13 insertions(+), 14 deletions(-) - -diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp -index a255d83..9699b08 100644 ---- a/src/pluginwrapper.cpp -+++ b/src/pluginwrapper.cpp -@@ -25,20 +25,19 @@ static QStringList pluginCandidates() - { - QStringList ret; - const auto paths = QCoreApplication::libraryPaths(); -- for (const QString &path : paths) { -- static const QStringList searchFolders{ -- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), -- QStringLiteral("/kf5/kwindowsystem"), -- }; -- for (const QString &searchFolder : searchFolders) { -- QDir pluginDir(path + searchFolder); -- if (!pluginDir.exists()) { -- continue; -- } -- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -- for (const QString &entry : entries) { -- ret << pluginDir.absoluteFilePath(entry); -- } -+ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH); -+ static const QStringList searchFolders { -+ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), -+ QStringLiteral("/kf5/kwindowsystem"), -+ }; -+ for (const QString &searchFolder : searchFolders) { -+ QDir pluginDir(path + searchFolder); -+ if (!pluginDir.exists()) { -+ continue; -+ } -+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -+ for (const QString &entry : entries) { -+ ret << pluginDir.absoluteFilePath(entry); - } - } - return ret; --- -2.28.0 - diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 409293093382..7643572a7ec0 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -10,11 +10,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; - patches = [ - ./0001-platform-plugins-path.patch - ]; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" - ''; outputs = [ "out" "dev" ]; } From 7dad6965ddc958a19299d7b615bbb5dace6ac2e9 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 23 Sep 2021 15:37:00 -0300 Subject: [PATCH 18/99] python3Packages.gigalixir: init 1.2.3 --- .../python-modules/gigalixir/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/gigalixir/default.nix diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix new file mode 100644 index 000000000000..089c4240f293 --- /dev/null +++ b/pkgs/development/python-modules/gigalixir/default.nix @@ -0,0 +1,55 @@ +{ buildPythonApplication +, click +, fetchPypi +, git +, httpretty +, lib +, qrcode +, pygments +, pyopenssl +, pytestCheckHook +, requests +, rollbar +, stripe +, sure +}: + +buildPythonApplication rec { + pname = "gigalixir"; + version = "1.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b7a9aed7e61a3828f5a11774803edc39358e2ac463b3b5e52af267f3420dc66"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ + click + requests + stripe + rollbar + pygments + qrcode + pyopenssl + ]; + + checkInputs = [ + httpretty + sure + pytestCheckHook + git + ]; + + pythonImportsCheck = [ "gigalixir" ]; + + meta = with lib; { + description = "Gigalixir Command-Line Interface"; + homepage = "https://github.com/gigalixir/gigalixir-cli"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2361851b5017..d646c0d71726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24080,6 +24080,8 @@ with pkgs; fnott = callPackage ../applications/misc/fnott { }; + gigalixir = with python3Packages; toPythonApplication gigalixir; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; go-motion = callPackage ../development/tools/go-motion { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f138448c155f..e34e8060aec4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2960,6 +2960,8 @@ in { gidgethub = callPackage ../development/python-modules/gidgethub { }; + gigalixir = callPackage ../development/python-modules/gigalixir { }; + gin-config = callPackage ../development/python-modules/gin-config { }; gios = callPackage ../development/python-modules/gios { }; From c0b0beb28ae718d4468c2f0e3978f637753ad69e Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 23 Sep 2021 15:44:56 -0300 Subject: [PATCH 19/99] python3Packages.rollbar: init 0.16.2 --- .../python-modules/rollbar/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/rollbar/default.nix diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix new file mode 100644 index 000000000000..60787d5158ad --- /dev/null +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -0,0 +1,47 @@ +{ aiocontextvars +, blinker +, buildPythonPackage +, fetchPypi +, httpx +, lib +, mock +, pytestCheckHook +, requests +, six +, unittest2 +, webob +}: + +buildPythonPackage rec { + pname = "rollbar"; + version = "0.16.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "aa3b570062dd8dfb0e11537ba858f9e1633a604680e062a525434b8245540f87"; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ + webob + blinker + unittest2 + mock + httpx + aiocontextvars + pytestCheckHook + ]; + + pythonImportsCheck = [ "rollbar" ]; + + meta = with lib; { + description = "Error tracking and logging from Python to Rollbar"; + homepage = "https://github.com/rollbar/pyrollbar"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e34e8060aec4..db176df215a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7945,6 +7945,8 @@ in { rokuecp = callPackage ../development/python-modules/rokuecp { }; + rollbar = callPackage ../development/python-modules/rollbar { }; + roman = callPackage ../development/python-modules/roman { }; roombapy = callPackage ../development/python-modules/roombapy { }; From ec4a1591007265384c0f036e265e5e38eff83231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 27 Sep 2021 17:28:35 +0200 Subject: [PATCH 20/99] transmission: fixes to make one test work again Broken by 37134b607 (PR #134007). --- pkgs/applications/networking/p2p/transmission/default.nix | 3 ++- pkgs/tools/networking/miniupnpc/default.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 6e1367a6b4e5..312023566b02 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation { include include include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ - curl libevent openssl pcre zlib + curl libevent openssl pcre zlib libnatpmp miniupnpc ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] )}" @@ -116,6 +116,7 @@ in stdenv.mkDerivation { ''; passthru.tests = { + apparmor = nixosTests.transmission; # starts the service with apparmor enabled smoke-test = nixosTests.bittorrent; }; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 9fe476906bc6..0182440a8eb7 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -19,6 +19,8 @@ let makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; + postInstall = ''chmod +x "$out"/lib/libminiupnpc.so''; + meta = with lib; { homepage = "http://miniupnp.free.fr/"; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; From b6a84c133b702f79678f6774aa62b700d9a9b678 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 28 Sep 2021 09:12:35 +0900 Subject: [PATCH 21/99] thunderbird-bin: 91.1.1 -> 91.1.2 --- .../thunderbird-bin/release_sources.nix | 522 +++++++++--------- 1 file changed, 261 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index de453c4d19f3..1cdce2638beb 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.1.1"; + version = "91.1.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/af/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/af/thunderbird-91.1.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ba98ba0ac513e9f8ca047bd08b38e2391d5b67b4195c2c1ac7d90498e148ad6b"; + sha256 = "f786ba47061600b2a4fce6dc537e4d5f41ef7e496ddd24e06e5cf2d2bc7ae615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ar/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ar/thunderbird-91.1.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3514eadb52d000429f16417d3af5ce648cfdeaa583bb3602623f40abfca72fec"; + sha256 = "70e13fa57939ec35fed7e537c282411e022e2e596af298ff68ed06d29149ad44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ast/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ast/thunderbird-91.1.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c630ab402c6f166181474b0e7299dc24ff0de5ce92fa0894adbc3dbaf8878f59"; + sha256 = "22ac54e15cc8d89412f26906b10d7274a90d86f298948998dabbbb63000fd9bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/be/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/be/thunderbird-91.1.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "9f484652940fec35d9adad996e80092cedabc789952e083107b405992b1ecf9d"; + sha256 = "bb59b38220fc5a2e429df9bf521610678b7b3c7e47e4a3208c9e0e54860ae098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/bg/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/bg/thunderbird-91.1.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f784957e36cb9a92083c275eec887d3a6847439281e94346e5bf0e065ec23366"; + sha256 = "7a0d50876f51664074b6eefd20dc727cea2d4a0feceb721c63fa9e3872ea6d07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/br/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/br/thunderbird-91.1.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2817bf350195954464db3a936db3a3730c2d33dfea9333165e69418b627d575d"; + sha256 = "8a49fe9b26d1a5c5b3c28209cbb6d81e785235f4e1b24e4638cf5a5fa720d68e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ca/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ca/thunderbird-91.1.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "176b8f2463267ad2aed07ca6966609c600615763caba662ac68c45b5d36e367c"; + sha256 = "380d655a39c7f20067045cf2ec75e5bca0ba0e8291d187fd87ac42abbbce7dc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cak/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cak/thunderbird-91.1.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7ff8fc736dd4232801d0e50b154747827cc818fe76782b219d683a8b2bba8969"; + sha256 = "ff12816d6dac6311b2f0a358ee4a30e80d3a346c9a2fc08c9c4d72b2e7421b03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cs/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cs/thunderbird-91.1.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b6763048e3fab66a4f08fd8c868d7c9c51258c540801546546b7da3b2ea64693"; + sha256 = "fc8ed1c83b76329aecd9b6b7b4c2278b2703dc267ef25ad973deefff01cbb29d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cy/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cy/thunderbird-91.1.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "810213d5f90387bd6f46436b1479b977248ec043235f2f97b7e8d0a3b296eaec"; + sha256 = "50e10c11f341b75e4ca464911a7229d22073d72b53731ba92cbd39c52694e0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/da/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/da/thunderbird-91.1.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2c85f4ea05fb03aaf88f4cb028375a628061f2699adde13f78cf6e76b7564e7d"; + sha256 = "1c041fb7c71e9d0f07c82652129a6b48f2f633a7781c41a3c439dec1d7fcabee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/de/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/de/thunderbird-91.1.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9a05ca5400224fbf0923a331e1ba986d38038df24340c6aee695c24f96f75e0e"; + sha256 = "c9ed27ee3f1a631c6a7d7a5a854e48f3285b9f01c81bc9ee3611bbdd9f483cdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/dsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/dsb/thunderbird-91.1.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e06a84821ba0354e4d5efe0e080734e39f376ba3e1f1c385ab939fd4cb84301c"; + sha256 = "3c00604247dee961915f2aff628bd7d1f53c4f7e48bb848ef6065e41f189495d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/el/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/el/thunderbird-91.1.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "32a1de995a05495721a4c6a6a74ec27b68c03d7b2121ea7d6ce6d295ceb8d328"; + sha256 = "b9ad1ab6b7d33f477f51e4337d914f8f8d2f6d7bc1b3b884d8b71b17547c3fa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-CA/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-CA/thunderbird-91.1.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "95f2dd81dc1958f2acd8a801fe7a87dfa0a00c6b91b8bd669f8e3caf6d90aad2"; + sha256 = "80e6b5785d334bec69455ca5f5039bbd4fbebd663ea91d17d0fbe8e33d747670"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-GB/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-GB/thunderbird-91.1.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3177bce52669f44ae58ca447b54a86329cdb5b8006199e86fa66b5bfe96ac8a3"; + sha256 = "da2388577784df3faad7b40566e2e1eab2b95dd9455a1e4e3ee43433f4fb189e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-US/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-US/thunderbird-91.1.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c0331b86ef72bae3d769ca977b0c9adeb9a29145dab1eb0013f4d88fa9caeedc"; + sha256 = "1354e3ad2989749fe79b404ccae3002de8b4e269c98388d9abebe456f3de47d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-AR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/es-AR/thunderbird-91.1.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e2aee8223131a46bf99140ebdb56ab76ca03eb5eb66dfbee75f23520d95d1971"; + sha256 = "f51d4a1109d30d4857673575aef173026e2c90fc7ece6835a34a0e792672cf8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-ES/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/es-ES/thunderbird-91.1.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c8e189dc7a57d47c6dba9e4cda3068b327fa10cff3818e97a4942c71c1d0cc87"; + sha256 = "38196b265eeaef2222e624e2fb0cb7742b2171965aa0725b3d524e9199ea4f91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/et/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/et/thunderbird-91.1.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "76e094d63467fb36622b64361f86041f0e6361a4fb1f1702c8a0e88bc57cfc96"; + sha256 = "ab3b04c02b730f92db4f24daac688e1966349cf4c978ed06138285fcb2d72769"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/eu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/eu/thunderbird-91.1.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8f09dc4bbbb76b660acf4664f4fb083a50de6523842171b4fe9558e7255c8bbf"; + sha256 = "4431e16f70b6182b1ec2bed64d149ffc7e46f1b2536268e973eb984439eda400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fi/thunderbird-91.1.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d7dba3916342bfefe549ad21a70a438c8f2031fc5f0085fc4e236d0f8d07c948"; + sha256 = "8ee9b2983d1f214f4589d7d99d1ac1a577f92dd3cc73f516dcc050079ed85904"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fr/thunderbird-91.1.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4088b924197a6baf7ea3ee233d566b9799cbab955a135bc870eaf6e08ce70915"; + sha256 = "b614dadf34774ebf45c88ae0c72c6d8779beb8310a8353aedeca1a493178c376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fy-NL/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fy-NL/thunderbird-91.1.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "59cd7d50cdbb7867f746b137ec8f70407ae649b03e86a73a2be642eab9256be4"; + sha256 = "00693bbfda9377d2695fc8c7c242b0e4a3c1b745e8779ebabe5686eca4fc928a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ga-IE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ga-IE/thunderbird-91.1.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "10936f6c941d8c94eea200c1c3bb8919066714129eb3b34d67df87c9b93f331c"; + sha256 = "00d26b39726e2de2e799b3dff97c79a590f712f3347232600d1f2771523d0ab4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gd/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/gd/thunderbird-91.1.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4ee24daec40780a8148092c96140575e7e5d1169fd37ffc6d46879f76f976f80"; + sha256 = "d9a35fbf9f4069c6f4dd796c8f9465053413d806093d1456e643c9bdb081ad45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/gl/thunderbird-91.1.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "0126bc6b167b8bcb2135e02c289f26aed82e4ab8dc820fa9468ebb41fd05604d"; + sha256 = "9e7f237b55f81a44a984be4b4e1001c8ffd7742eb14e654397e80b4e4b765d0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/he/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/he/thunderbird-91.1.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "58ae78aee2da5f8a33edf8c87a743ea7f3da6702f25682869db9bbfcb53d4df5"; + sha256 = "b86d479dd64ac86d43fbfb54c8ec36ea6b4516ded0383f81b78c11365290f21b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hr/thunderbird-91.1.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "c4543e54a9fa59906c64b8830e4ce6218279872e6beafeb67d13250159eca8f0"; + sha256 = "cb7e8d0dd04c5883f2ec0f47d81a751b901e0036f151ab1c0f3043ba7ebf4a74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hsb/thunderbird-91.1.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cded10c83585c5d6ebdae4a0740262f43203b7a9252144a6f97eb6b329cea95a"; + sha256 = "d3141a413d82814067de2791091473e0b44f8939825cc3071b1fbe86e08dd49a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hu/thunderbird-91.1.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f6dcdab2dad04a9210f509a62da49ec5269bf5c9f40e74cf9d2f43edb0abd422"; + sha256 = "b76860152f68b2dfabef9847c83356af34b8fb1913d0d55a397be3d4e4e08b31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hy-AM/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hy-AM/thunderbird-91.1.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b3f8a1b6d4576dbf660bee6404b97babeb04bf0c1c6ff27aab25a073436f43a4"; + sha256 = "5aa35ed5d577befb7a37d5407bc7ff78c54314a7e5ed77bda588bd74111e263b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/id/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/id/thunderbird-91.1.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e1bfada3b7d33e01462cc303b22298850c5923f42e8ca656cdf5b2dc72c00745"; + sha256 = "0bb53b2cbed8a9412c6776435381d5c859a9993b4bd2cdf5ecd4145d13776d09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/is/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/is/thunderbird-91.1.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "602ee80721bfa921805c1fff2b0802d7845d7970645cbb839e5d0f6e25b5fe65"; + sha256 = "566058b39d98a777cb1c333b66cac66851d0c369918e58c592b8e0151b778f6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/it/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/it/thunderbird-91.1.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7e55d0b20027e23d3340a593beeebac0fead2dd0d048133b2e42dbb33288c4c5"; + sha256 = "b88fb1b473a7b0b1a4af08a09aadf5b7502f03462a1f4661ed2897c2705e5b4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ja/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ja/thunderbird-91.1.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "df67309b344f46f9ead5939a2f0f7bc34b90bf4cfa4cc28a662391146951c4a0"; + sha256 = "6b69cd834280b36182656bd97b117c3f70bbcd947ab25e1936294a85149d3501"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ka/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ka/thunderbird-91.1.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0992f5884dec1431a1c82e289195db7561a8089e7cd7d8fb940c0435e365b6f2"; + sha256 = "87d8bc04c278d8c675665d0211917a854d43a17d24173627703268a785ff2206"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kab/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/kab/thunderbird-91.1.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "37eb0b67bb564762f8c88fac75c9ef8a51ad4ca302e3bc5f4d99ff799a141309"; + sha256 = "fad11f653198314683faaa758422506d27706b6dca90a4d5b0d3693810843fba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/kk/thunderbird-91.1.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "16fcf81dd18c51826d3a93e6393c820227322ad4cceaa668a22fcf79d9fe0773"; + sha256 = "67469c2c4e1352db94339687f93c0afefe41244bfc952d77c2e41e31a652f095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ko/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ko/thunderbird-91.1.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4e6b0bb94ae1442b987b5e98ef287f6cdd354d13ecbb14dfc25b04ba17b3961d"; + sha256 = "93bb5a6973bbd0eaac721ffd59c19edce400471c08d76aa629b2fe66fc98ddf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lt/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/lt/thunderbird-91.1.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "03364e6f6104f083bd38dbd65c1d451186757e07460840a1fc8ed8d71f00cc8b"; + sha256 = "f4dda73c80cee8aaceee0f4ea0956303f9a50aa2431c6eb8a34d7d22b5fe53e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lv/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/lv/thunderbird-91.1.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4da6a4e457aadb58819c3b44432c5a5ff17f2be378fb461d859a92768e2c4b7e"; + sha256 = "65325a804f5aec439501bd70e5423d56ddc5a10636b639e8db85ce8881c1586e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ms/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ms/thunderbird-91.1.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8aae1245c40ba4b7682f5d26f3b90d9b5cfe53fbd00a755e699ddcea6ac5164f"; + sha256 = "f2715978bc8e2d7878f8ec47b4a29cccaa42a24bd97f013f6b66aaf47db83359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nb-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nb-NO/thunderbird-91.1.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d279ee97817a87a87b8848f6cce8e1b0a9643095dbf46e3632df6242f9b05b23"; + sha256 = "c252fdee3a9d9c43b46786c528bb8ac39203b7d7c746f9c9f04287cb1253ded6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nl/thunderbird-91.1.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f1d58f439aa8276b5baa475e696a6eedb484059eef66ed8ab6ea27f66182d53a"; + sha256 = "1708531ca0b765292206fa9c533200266f5eb48fbbc74daade404bdcbfdcc750"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nn-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nn-NO/thunderbird-91.1.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "703745b4b07778058a8ed8d4072700033f268ea513abc9f4dc7d1cdcf07c9c2c"; + sha256 = "dc26c1333787accc73624bc5bac820af1743ea30d85e9da9a0c30f6b9b0c3bcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pa-IN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pa-IN/thunderbird-91.1.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "46d756ecb4d5e566dc4a72115874b32bce8eba5de141448d461d795b0c81e78c"; + sha256 = "fc508dd719c18c250560b5d4fc4672ce83a9f52b6103d3f33034eca89ed2935f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pl/thunderbird-91.1.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7384fd09796d727f82dd9f92b3faa67d53c415c01b44c885a998039eda703545"; + sha256 = "eb54040a841d0da1e84dd2a6ba3c894a57d40fdb0bf99f21b7fbbe3ea8cd755c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-BR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pt-BR/thunderbird-91.1.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dcd97601965c25f43fc10bf59c5ccd3d62439ad3f1ed724c379951d2b514df72"; + sha256 = "45226857a691f8568c769f652820eb5b86b0928c271b2751014bd6e7ab29ab80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-PT/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pt-PT/thunderbird-91.1.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "225c2c87e5e18a987c1cad74622ace48bcda9dac7d420694f91c0c30757bfa23"; + sha256 = "532f18bbe7fc09793bd688e5bc48c65658e2a48285b97c611b68611e9f13257d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/rm/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/rm/thunderbird-91.1.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "07ca0312828ee92b9d04ca5e62f6f4f65260faba80da1da5365a2614edd43dae"; + sha256 = "8d0f2ec43e6e00118d7c1d5877bfbc5b5c87a8e449a0358acc6e71244a0716b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ro/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ro/thunderbird-91.1.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3cee1abefb6bcd9508a14e0b03e14f30b6aba95245ba79993d293fc92a3f7bb4"; + sha256 = "dbfd5500b337132ab14266d2b87224c917086afe3f210127d73848d360299241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ru/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ru/thunderbird-91.1.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e6491ab33fa05012206b22223f78e2f6f575f9e99d33159f0c853b538c3ab9ce"; + sha256 = "06f6077ba98fc2605718266e57b9c5c54c3d7901f2b7233f38d7fd02d6d063a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sk/thunderbird-91.1.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b4cc3471da1cd3f1f9146bf5ba9d33f706df6d2988375a7f148223eba2cb88e5"; + sha256 = "af1224613b3e962265d83b154cbf69053906197f2b7f12e5004ad862bef09aaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sl/thunderbird-91.1.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a83b61af2283d3c694ede815faaa0abfb3e6b7a346d9d984dbf3e50856532473"; + sha256 = "597cd2732960eadd0121c4089a703cc86a0d9a361ff024fe047c8c624dc05afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sq/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sq/thunderbird-91.1.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6562243bd3ca68b6b09c12745111c36a269e60593c5c458e04da12a9f1cfe7dc"; + sha256 = "c107fb5653cb7adfa79aad501e585943159fa9297ef360b193075a9b49e91d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sr/thunderbird-91.1.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "2b8dee91bfe25480f1a7b12b3825e2445b369d6125df9a13271ef6a6af015db8"; + sha256 = "33964cc6308a8e7ebc154c057f90729a92d2a9127f9d8c4592f884531d094334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sv-SE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sv-SE/thunderbird-91.1.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "113e0ebd096ef5ea225c76e930cbdc58f2b529b39fe799310098abefa4652ee1"; + sha256 = "91fa282c3baee03653ffe5164844e06a9813a40c360ef24e94ff525638f187de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/th/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/th/thunderbird-91.1.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "71b62b60167d06a02fcc90017b33d65c757d18d05fbf689607631ff1783941ce"; + sha256 = "99ea8b61e102c3394073f3a817d3eeddc3cedb51436b66303730394f362e91f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/tr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/tr/thunderbird-91.1.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ab7f254131c8fdcc040d06d29ffdb0da6d95b9970f7640851bbdad337af0bd0a"; + sha256 = "bb1d417239c31c6ae9bf62cd545f2fad316915ce6bcb707f2deb65f0cc24425c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/uk/thunderbird-91.1.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6da1aa51763b3acb2015eb78b50d5d6cc080bd606e2afdcf181d84095b0cedc3"; + sha256 = "8464520b025c29dcf3376d7c47d6c7596ff60eeabe63fc5c41082ceb4fbe148c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uz/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/uz/thunderbird-91.1.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "933513bdc1b1137dc627ec4895c3299d3633a105eadf2216b682fe36554c5f5b"; + sha256 = "d4ba9eaafed3d475dd0fe3a7df7f9910fe3a95a74b9a83f2a00aa73441ae8a64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/vi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/vi/thunderbird-91.1.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8f3eb2210a070983d87e6d5ec9908cabfdd012a4691443c39cbf2212d79e2394"; + sha256 = "8c7f222e0c65ad2daaf37ab46fbe58e005aa89379a0a87f4b2a5f19528e0e5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-CN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/zh-CN/thunderbird-91.1.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "0faa621dba2d2725bcd6b2a337feac5ee2d6bf66900ce30e1e5abbcddc15ca45"; + sha256 = "1cc053e2e9e751ca14da4a09c276d2c78f61ef4e7d74ac4019849f6ebc044d0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-TW/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/zh-TW/thunderbird-91.1.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e236b7d2b9187a0ac780d7e0821cf29138d5f03321248e4edab0d1f2a7267cc7"; + sha256 = "b77a3eb6d1e51388d1b084956b7cc579e1e3c8ed2bc72d7943ac5d6188e43938"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/af/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/af/thunderbird-91.1.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "624e9894eba97eafff7241dd73c2edd685e0786ba3e12f525980012d7dbae0e6"; + sha256 = "c2015b0cfa07309ca6afe5fefb24c1393a397b1d592dd80ec8b62bd4ef8a3d35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ar/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ar/thunderbird-91.1.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "62f250a1925e8b3cf2c98fe877b7b5a6d559d3fafb1320312fc765630c23a71b"; + sha256 = "f36b4e7452ae39bd2bf63231ab884356c7b77d6015993e09046b3d6a63443920"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ast/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ast/thunderbird-91.1.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "102b2e3d812eb4737f3d4ab63e2b696cb7cc2478ad438bed5c19299d65dc5ac6"; + sha256 = "600d102bbb18bac81e3d50c9ef9a578820b0fa1ba2a6f6d756da6e391fe0f241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/be/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/be/thunderbird-91.1.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ed15b0cc8c4d0dcc4071ccdc602fd796c5dc42a027f26595d1d8df2ab10267ba"; + sha256 = "46032acc1c16e2c9bd7905799db6253cb16fb6269bb79edf6141b9d2bd5c0b15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/bg/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/bg/thunderbird-91.1.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "234f8ff03dbf19bd9100663ee517fa1630d0e7bd00953a056d5085021fa90324"; + sha256 = "d21bfe3ad0c2c900de1ab9a88d62fc74c4c1767bb41121159c5c0c9bfe270a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/br/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/br/thunderbird-91.1.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "34c578de385448cad19dc368a04d0285cfb1520c31477f6eacc10ffa2e81a02d"; + sha256 = "8e20c1ce0867bafde00c3e8fc55d5841a14e91fa8039fc7259269da8bfbd4373"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ca/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ca/thunderbird-91.1.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c3d3dfdeaa72254d02b12f72c83a95a2904a13f2e0c721d3baa5da0dd76bc2c8"; + sha256 = "175bfb1b0ef94897ecd359c54a2767ca039a259300a5716211fa0c0593b81023"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cak/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cak/thunderbird-91.1.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "7cf60b8ecc692696081115f1df65f9976613ef34b57d412a6d3333a18400aa3c"; + sha256 = "65cf8763200cd10cbc016c9d447703b640c52165c691a604092376de09dc1376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cs/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cs/thunderbird-91.1.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "59f01da4722c4317f80a7174f85fff9ba60a8341d589ef2cc27c565a529af2f5"; + sha256 = "8d019c4f92f60c44f1340f96892c0a4060d4ceb86d188f5f81911d92ff2957f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cy/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cy/thunderbird-91.1.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "470e65ebf016cd8fdcba1ad405df36d556c6fa43c23856b88d6da3fc58f80d81"; + sha256 = "29049a5f4849f7e2bde8ec122de33edb7c86e87eca46b72086e53caedcad7ef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/da/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/da/thunderbird-91.1.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d1e95c7744d5058354e8626c361b7d529fefb2032cf380f8f129e84243221b9d"; + sha256 = "39d9b429b8ee92b045abf48a605e32a577da1f61459b597698f87b1972993f2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/de/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/de/thunderbird-91.1.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dbb632f5fe3a3ea2ffce78ef8984e78debf2b0d09ec42bfd1b642a7fd68dc93a"; + sha256 = "b8ccae9622a8fa684c48a39a409af461238325d91db5edd8d9ecbeaebf2fa999"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/dsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/dsb/thunderbird-91.1.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ab5d84870b77376fee50b082e14f2d5ce915f9041a63f09519ea5b8ab2c8c990"; + sha256 = "a32e1ec050968c94c2b2c1c175d13629fb5feda14e91a0e6c78a9e1bf4092ebe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/el/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/el/thunderbird-91.1.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a96a8d96484b441210b98e768462237ad2e4306bcb20412028613f480160fcd3"; + sha256 = "7599c18f5c79d6aebb652308fa3fa9b13a4883c0dfc47e8bef6b6c118a2ed909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-CA/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-CA/thunderbird-91.1.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f43fa2abb60bdeb571ec665d8f5779b049d3270f05e01e43795408e450240d85"; + sha256 = "47c49908cf59a8fa6ec1de512cd01907412cfc5b0f56709611b71eb0b3e6cdee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-GB/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-GB/thunderbird-91.1.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6c3c9f1c8f4e3f6cc6008cec83e5c234f797762ae05cdfe7dd7e95794f3fa007"; + sha256 = "9f379c2837dab6ece5306117065ddb1f19d3fa08900d5ed63abc34fff8755dda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-US/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-US/thunderbird-91.1.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a6c3f8b935f8c5e185e621aed1725b82db1007c977949fb9f786b86bf024dffb"; + sha256 = "97aaf105ff5fd3ac8b2b85ba0de87b1fe6ba01f647d32571b787591ba5f6e1cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-AR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/es-AR/thunderbird-91.1.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e431f72359b602e4bb784626bda3f4526eda6ee5bddbe51d5c67fb62325da237"; + sha256 = "4db46b699d6a65fe482dd8f7bde005b5a4cccfbe7ef777f23f1aa57577d33a33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-ES/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/es-ES/thunderbird-91.1.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3f7ccfb4b86b11583289036792e78d080f558d8d58d1b11929664952076ed152"; + sha256 = "0a63e85f6992ce683f35ecfe6f0e10854fd8cada33f8a2e066d5ab140ef8c401"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/et/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/et/thunderbird-91.1.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4d224ed49c4cc300e22add49b79931b753155f5052d7d0572a3b99833351feb3"; + sha256 = "522ec0185345054abf61b84dfdb36ce3dbe01c70f5bae11aa17321d18091d759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/eu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/eu/thunderbird-91.1.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "84ec201b40080de068c9a2d9ca4effb360102d34970964813f4335187fa0c472"; + sha256 = "c4e28df0193175149303d80617f04df4d229d8eee2a75129b315a0c23b22aba5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fi/thunderbird-91.1.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "633a45dd1dd870dd0d486715328152ee092a5297f95f35ad4ac8c1a0fa59caba"; + sha256 = "046b39db1f3f7c4fbe23e93053d43fe81e1b8751bb0558ad1bad3a50ab698673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fr/thunderbird-91.1.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1a5e668cdfc500652d3429ecddd987993c60032de0dd570c14256642927910e9"; + sha256 = "39d15a1aa3f7c3e360e817baeb3747a49ae8f42d1b46208832eccb0107ca1b3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fy-NL/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fy-NL/thunderbird-91.1.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "86d52dfe0a63c7f066f4d6b677d1b2d1025b60d7ca556f2cce074ac529d49948"; + sha256 = "17c971a57634050faa9fe747055a671ac1ae0022a9b06a957eb05f7bb64f31cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ga-IE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ga-IE/thunderbird-91.1.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0a116945f0ce9f51feb9658756bbb706830709155d21f4d32be5bb9c2ba3924b"; + sha256 = "58c17ea964de2b60440bb1a078222ab5b6199b83fa5f2854926b9f0c2a6cb3d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gd/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/gd/thunderbird-91.1.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ddf29128560baf824d5ab984cc4c219318d62d1f6946c83f1e281bf59dfde046"; + sha256 = "4ee45ae272d53f523d2855083f27a0ce005d93ca95d13c2037621a87c294413c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/gl/thunderbird-91.1.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "28e291c985d8b618bb88a65995f0c523d18a231bd9e3020b743815754d2f761a"; + sha256 = "68012e665dea95fd4ce4f76dee0b246d2f94890e5a9b3c797e93ae7d450adc58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/he/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/he/thunderbird-91.1.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "daecfd126e4e7f7eed943c715b7e0e17fb1b17b55963211130a2326bdeaf2fa9"; + sha256 = "57125635f8fe2cb50cfe9aecdfe06502cce9c746b346083b329d5e1123d4956d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hr/thunderbird-91.1.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f685cf4629e13337795d25f7e75bf2f24abca87e35e41c62b0f48613a2e57365"; + sha256 = "f6f28200c32cc2faa4a4e4a49eed5b4343586b52ca123dbce43d32a1c5059835"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hsb/thunderbird-91.1.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d9161bb816887e1fc2296dcd942f0fb4736f86bc8a8122f61caeffac75b0c19f"; + sha256 = "6290282252b9a61fc7ffb1e29b14f31c87832bd60a066c73f9966a10f75ac327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hu/thunderbird-91.1.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "80e69465e6afd1b50a695b30fcfdc13ad2c051e75fcec666276935874e79d5fe"; + sha256 = "fbd6be01153d67870565fc7230fba7b4a1f6151eeda54e84008b0943acfc4564"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hy-AM/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hy-AM/thunderbird-91.1.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a1aff21e7b07bcc20685d906d69d6b2515983263d90d2a2533e58d6c74046fbf"; + sha256 = "3bfb7979fbfbf0cbdecb8b8030dd209a6e18020ff34a30223ce893c0cfe0a282"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/id/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/id/thunderbird-91.1.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e911dd870b7a33d50278597a6cd1970c15578716f97a1ca90bac2813c4aabcb6"; + sha256 = "4a8801e97b001c0e30ffc4f4a7c712017c1b1a96bf226ddc341728b22599920d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/is/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/is/thunderbird-91.1.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ec91be584ef82def938d295925b1231f7ea50bf9e171d90ce74ae575970c5e5b"; + sha256 = "871a6393a716c4c8b2255a8903a4584c8ad4a7f5e1423550d3d96b9866929433"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/it/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/it/thunderbird-91.1.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "971d7ff2f20926b9148ac6386f2d5824a1443b3a4618e67cf4c30c14f126d711"; + sha256 = "8919dbd9e7b0155de288322f10bbb664189d03c1442657d07d577b33cfce0929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ja/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ja/thunderbird-91.1.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "17526869e3234f885f2078c98a8442b2dd5a019a529d31e0bb6df5b6be24be8b"; + sha256 = "42e1e1a2b55c97b05ec5424f6318d286f7fa497276ff745c6c221ee2b4c072cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ka/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ka/thunderbird-91.1.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "945beaab6b2bac56b13f7329b98fe6bf621fa9f3c022b3568dfa43bdce6e422c"; + sha256 = "4da9353667f109938ebc6740039a915f67d518c109915c1ed42f1552c3be719d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kab/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/kab/thunderbird-91.1.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "39b6835112c58cba3b5e4b2f6964dbd9982c8146f0290aed9b13b10ae159bdd5"; + sha256 = "87c960236895eb1af70d2f50a839e55befc6486c4883d786b14a67e569c396ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/kk/thunderbird-91.1.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a5c4fcd5d4e91c52814b2e8c6b0b239e0c430ea6169b351b33beb2b0736fa94b"; + sha256 = "38fdc0aa8fe98d83e52cf266776ebe7a52d7c80e98bc2372afcdeaf709ee8a06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ko/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ko/thunderbird-91.1.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "97e5ae5cd2def5410de5b8a3194f77c53fc4ecb17572e9925a4bff56cb2ca73e"; + sha256 = "c960038e1764cc3a0203e2cdf8349ecfee951dbeb470cb58b66c66f0542ee790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lt/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/lt/thunderbird-91.1.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2fc8d9d3fe286efa337d98d033b43d9d0b1c7fec15e566ed6ae98272df6adbb3"; + sha256 = "6387197f1fa9095d64ef3e7c73272f0e0a4a7b857d4be29899bfe2c7aa88a5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lv/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/lv/thunderbird-91.1.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3a480801c29e7661b73a01d1d29455bbaa4f228a749da467400ebe0c973c5150"; + sha256 = "66021a590bb89b9fb50c90bc07788cbbb3d1acaceac5ebf562805d39bb59be3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ms/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ms/thunderbird-91.1.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "143e04a636d4e3df7ebab4a26419f0df6131a911c7b158848a1a0f4a51b8c6f5"; + sha256 = "a120efceac13b976b77a49dd2883f66a03c13f3243a53b66afbb372b87c15b16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nb-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nb-NO/thunderbird-91.1.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4f3f731b0a9b2dd7496b9cf9e3df7c54924f821b8afd404848b8bee4c37db7c6"; + sha256 = "ac5f404b3635b9b327458eb461148d94b52501621e78f2fafeff09c019651948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nl/thunderbird-91.1.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d6b758c9a5aff775088ebfe3c696d6275ecb2b2a4b7129ab3b79b23fe773e49a"; + sha256 = "f9dbbb9789a81ee6a40756039afefe542e1369b5de15d4ea728bd5fb5326c728"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nn-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nn-NO/thunderbird-91.1.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "89bdee0a436d53cba1acddc9187b8bf7036d3f8b2d6f8a60a1f7d1e7aae4687a"; + sha256 = "36d0cf0f3132f5365a9cfe5b2175ac6f42dbe25c41a03fbd177509b2cf13abce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pa-IN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pa-IN/thunderbird-91.1.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "9def18033f40abd87764ee12a0c9a104df9ffbf5813b398251d86b26676aa57a"; + sha256 = "776c3c215fd0e66eb81c2c91855233c4a7476aad534de555a6317b6a4f664b67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pl/thunderbird-91.1.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e69e2f319a7691af209e517f7624a10e942c052fbff40cbe3e0cf057d5e8ce60"; + sha256 = "ba2aa2dda6c477f3ecb06d0f1d223928adc9a82e46432055783741064cf1e8f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-BR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pt-BR/thunderbird-91.1.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ce0a025976a058e01dcec3c7c22005cc8061dd118cbb5766e34e1fa2e2d24ee6"; + sha256 = "314023714b6babde392b8a30d11e67fe5af9f47e2738d63a6231aa72e6e0b792"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-PT/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pt-PT/thunderbird-91.1.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0e46088f48739f26d94f92aeef401f136006f0cfc67b9445573539f08e9175fa"; + sha256 = "ea5895b796bbdf9ed5be1277dc0f32c70abb46f37a7d48ecacf39e7b7a5af082"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/rm/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/rm/thunderbird-91.1.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7efd235fd88601a74d2e6a2d9e481fbb011e4a3695128997754d97917a94669d"; + sha256 = "d295f9390b7dedec8592751142a42bc134ff3fca5a228d084eb176677c15c4bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ro/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ro/thunderbird-91.1.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9ada46d39f4eedb097b177d2c443dccc05af71a12f370b202aa0bf259c0cd7c5"; + sha256 = "b4504dd29ce68009c78b7194914c20d41024f92420564d6f4f34369717a49a90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ru/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ru/thunderbird-91.1.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0e4d029183f9125a4d1efe81cba348155336a37267db346436698430808a3da6"; + sha256 = "a8ba363a9bee130d05d028a84bfc10e8614ac3e3ee7e747d4987691d25423bb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sk/thunderbird-91.1.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a4712e2e477bb96bcb69eb8ea96200f81b1eb829db3675844380f68b1d264915"; + sha256 = "347a0e3e794bebc570aac65005edef1c311d7685d9b7ee4559121945cec1a40e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sl/thunderbird-91.1.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "46f4f3dfe12614ceb8a249a4d38df2b40728082ce0448af03c2949f0d81d1969"; + sha256 = "1ae4c2615d9fc4e6b1ab270988de63ff425779945684811a1c9093940e7a9d0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sq/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sq/thunderbird-91.1.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c5209bea51a081b6707ee79640ab663b3975af8c1bb26df05e480f5ad6dba723"; + sha256 = "207fb12cf9415e5a66bee33ee2f50adb970343b90bdde2c00c5b149e9ec829ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sr/thunderbird-91.1.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8cb6bb676a7143f10d5c666e41398b4045f32ca13bfd6a322d308f6b05dda441"; + sha256 = "45e7cb91506dfe353d86b8c6ae172b4a925f6b9ee631b542bc9a0fc77315d482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sv-SE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sv-SE/thunderbird-91.1.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "33736665f7c38a62ed65340acead5435599dcbb8c7892ce939664662168078cf"; + sha256 = "634b1581237baa140d8711458cff99e979b3e33316b24925c6e5700da9603127"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/th/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/th/thunderbird-91.1.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0fd5af0ffc983f58c85756274d9d94f26a44c32aff3852b22ac0554375b8eac3"; + sha256 = "a09336e75d270e9fdfaefd4f9e90cddf1f5135602998bfdd9a198e3f1544838c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/tr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/tr/thunderbird-91.1.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6f8318a023062b306a64cc615bbffb96d06b608c625a0134f28d60629f5986c8"; + sha256 = "37874416c7bdd2c2b4303a55d14a82ce55a7d8cc6d51bc3b3d215489be3bc055"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/uk/thunderbird-91.1.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "fede0c129370c93df5cb9e9f5e9bef69c6ad6bb96db11bdb520c743183ea2b41"; + sha256 = "faa0c411431a9b27a7c58c0c394804d3125e4f4e927387df8580c37738c2db44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uz/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/uz/thunderbird-91.1.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "23db48eaf9101a4a838487ab4f31d7504036b0204a1624e0ac750bba6de24437"; + sha256 = "095e56a0fa0e85bebe9bc0044fc13f5da67c7267461b27fb8024947da3f423ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/vi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/vi/thunderbird-91.1.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "55ec78e15967365bc41fc2b1469af78cc9300a0365587ec72463e9e97958020b"; + sha256 = "cae3582b504a38497dc63ba25d4be45e450b14cb588a9f52919d0fb4a5a04446"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-CN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/zh-CN/thunderbird-91.1.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "008216b04c79fb96686a747f9756caa2cc02aa052e7e682b0ba9bef0138d2ef6"; + sha256 = "58d542c3ceb5e36a83e424250c171477543bcd046f325c89b06f76090410b633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-TW/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/zh-TW/thunderbird-91.1.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "bb222c6f9c8e5ed7681fa920ff6bb6e9d1262e16efb994dd5976e575e4f54a7c"; + sha256 = "13dfa3e7a8b5a69ab9072c21eb22373ff36bd54c9c7c39c3480681bd911043c0"; } ]; } From 4e815405dd144879ececa8aa49204482a9543870 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 28 Sep 2021 09:12:47 +0900 Subject: [PATCH 22/99] thunderbird: 91.1.1 -> 91.1.2 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1aca35d56b19..26c9c873ea66 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.1.1"; + version = "91.1.2"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2da102f9ec42489fc785ccdabcc7fdbc826f2df5e8e76c65866a44a221e762f59647ea265fe4907c18f0d3f1e04199e809235b4587ea17bdc1155e829f57ff2f"; + sha512 = "f211ce2469f60862b1d641b5e165292d98db53695ab715090034c1ee2be7b04931f8e5e856b08b0c8c789e4d98df291d59283c257a38b556c0b4b0b63baa539f"; }; patches = [ ]; From 052ca807c6cf6387e4116874d2a898e378342f8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Sep 2021 14:58:37 +0200 Subject: [PATCH 23/99] python3Packages.sunwatcher: init at 0.2.1 --- .../python-modules/sunwatcher/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/sunwatcher/default.nix diff --git a/pkgs/development/python-modules/sunwatcher/default.nix b/pkgs/development/python-modules/sunwatcher/default.nix new file mode 100644 index 000000000000..ee3a2e200b17 --- /dev/null +++ b/pkgs/development/python-modules/sunwatcher/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "sunwatcher"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0swmvmmbfb914k473yv3fc4zizy2abq2qhd7h6lixli11l5wfjxv"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "sunwatcher" ]; + + meta = with lib; { + description = "Python module for the SolarLog HTTP API"; + homepage = "https://bitbucket.org/Lavode/sunwatcher/src/master/"; + 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 e6bc727b0849..5e92d1a66808 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8745,6 +8745,8 @@ in { sunpy = callPackage ../development/python-modules/sunpy { }; + sunwatcher = callPackage ../development/python-modules/sunwatcher { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; supervisor = callPackage ../development/python-modules/supervisor { }; From 04e470ae05c1444456fdbda2857e96a158c3cf5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Sep 2021 15:02:09 +0200 Subject: [PATCH 24/99] 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 39a5ed3e2bea..753465c7ed07 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -795,7 +795,7 @@ "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "solaredge" = ps: with ps; [ solaredge stringcase ]; "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local - "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher + "solarlog" = ps: with ps; [ sunwatcher ]; "solax" = ps: with ps; [ solax ]; "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; From a708db61348a43406ac240efc63c88fd00cfbd83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Sep 2021 15:44:05 +0200 Subject: [PATCH 25/99] python3Packages.asmog: init at 0.0.6 --- .../python-modules/asmog/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/asmog/default.nix diff --git a/pkgs/development/python-modules/asmog/default.nix b/pkgs/development/python-modules/asmog/default.nix new file mode 100644 index 000000000000..a1d8c340ba68 --- /dev/null +++ b/pkgs/development/python-modules/asmog/default.nix @@ -0,0 +1,38 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asmog"; + version = "0.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "14b8hdxcks6qyrqpp4mm77fvzznbskqn7fw9qgwgcqx81pg45iwk"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project doesn't ship the tests + # https://github.com/kstaniek/python-ampio-smog-api/issues/2 + doCheck = false; + + pythonImportsCheck = [ "asmog" ]; + + meta = with lib; { + description = "Python module for Ampio Smog Sensors"; + homepage = "https://github.com/kstaniek/python-ampio-smog-api"; + 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 bf39935714aa..eae0c58e7ef3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -579,6 +579,8 @@ in { asgiref = callPackage ../development/python-modules/asgiref { }; + asmog = callPackage ../development/python-modules/asmog { }; + asn1 = callPackage ../development/python-modules/asn1 { }; asn1ate = callPackage ../development/python-modules/asn1ate { }; From a02160a2817db56b47bb91ef3513c34572b5ac0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Sep 2021 15:46:45 +0200 Subject: [PATCH 26/99] 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 c9e77c914168..bb234a87dc7a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -33,7 +33,7 @@ "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; - "ampio" = ps: with ps; [ ]; # missing inputs: asmog + "ampio" = ps: with ps; [ asmog ]; "analytics" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; From 180f7099015a2a7bee53294d9c3b7c8ac284f55c Mon Sep 17 00:00:00 2001 From: Terin Stock Date: Mon, 27 Sep 2021 22:49:34 -0700 Subject: [PATCH 27/99] stgit: 1.1 -> 1.3 --- .../git-and-tools/stgit/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 4393a9dc51ce..02888b3f87ef 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -4,6 +4,7 @@ , python3Packages , asciidoc , docbook_xsl +, docbook_xml_dtd_45 , git , perl , xmlto @@ -11,16 +12,16 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "sha256-gfPf1yRmx1Mn1TyCBWmjQJBgXLlZrDcew32C9o6uNYk="; + sha256 = "0wa3ba7afnbb1h08n9xr0cqsg93rx0qd9jv8a34mmpp0lpijmjw6"; }; - nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl ]; + nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; format = "other"; @@ -34,6 +35,14 @@ python3Packages.buildPythonApplication rec { --replace http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \ ${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl done + + substituteInPlace Documentation/texi.xsl \ + --replace http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd \ + ${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd + + cat > stgit/_version.py < Date: Wed, 29 Sep 2021 00:46:39 +0800 Subject: [PATCH 28/99] source-han-*: install instead of ln libreoffice doesn't work with fonts symlink --- pkgs/data/fonts/source-han/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 28ec08f63b6d..7b6bef0198da 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -19,8 +19,7 @@ let version = lib.removeSuffix "R" rev; buildCommand = '' - mkdir -p $out/share/fonts/opentype/source-han-${family} - ln -s ${ttc} $out/share/fonts/opentype/source-han-${family}/SourceHan${Family}.ttc + install -m444 -Dt $out/share/fonts/opentype/source-han-${family} ${ttc} ''; meta = { From 8fc3c06c6c5882187b470732b93f55f6227cd99f Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 28 Sep 2021 20:01:28 +0200 Subject: [PATCH 29/99] miniflux: 2.0.31 -> 2.0.33 --- pkgs/servers/miniflux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index fe61e5fc8b84..a550ba9ae827 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.31"; + version = "2.0.33"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "sha256-01v5gwUv0SfX/9AJgo4HiBcmoCfQbnKIGcS26IebU2Q="; + sha256 = "0vcfpy71gdvd0z20v6d36l3yvmnm4nmfplivw9yjzv8kbnf9mabc"; }; - vendorSha256 = "sha256-69iTdrjgBmJHeVa8Tq47clQR5Xhy4rWcp2OwS4nIw/c="; + vendorSha256 = "1j4jskcply9mxz9bggw1c6368k22rga6f3f6mgs1pklz5v7r7n2j"; nativeBuildInputs = [ installShellFiles ]; From f0b20bad9cb42db3223c88290a2163faaaca7976 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 27 Jun 2021 05:54:04 +0200 Subject: [PATCH 30/99] coreboot-toolchain: Init at 4.14 Signed-off-by: Felix Singer --- .../tools/misc/coreboot-toolchain/default.nix | 100 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 102 insertions(+) create mode 100644 pkgs/development/tools/misc/coreboot-toolchain/default.nix diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix new file mode 100644 index 000000000000..3c22e0d64ebc --- /dev/null +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -0,0 +1,100 @@ +{ lib, stdenvNoCC, fetchurl, fetchgit, + gnumake, patch, zlib, git, bison, + flex, gnat11, curl, perl +}: + +let + version_coreboot = "4.14"; + + version_gmp = "6.2.0"; + version_mpfr = "4.1.0"; + version_mpc = "1.2.0"; + version_gcc = "8.3.0"; + version_binutils = "2.35.1"; + version_acpica = "20200925"; + version_nasm = "2.15.05"; + + tar_name_gmp = "gmp-${version_gmp}.tar.xz"; + tar_gmp = fetchurl { + url = "https://ftpmirror.gnu.org/gmp/${tar_name_gmp}"; + sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5"; + }; + + tar_name_mpfr = "mpfr-${version_mpfr}.tar.xz"; + tar_mpfr = fetchurl { + url = "https://ftpmirror.gnu.org/mpfr/${tar_name_mpfr}"; + sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; + }; + + tar_name_mpc = "mpc-${version_mpc}.tar.gz"; + tar_mpc = fetchurl { + url = "https://ftpmirror.gnu.org/mpc/${tar_name_mpc}"; + sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; + }; + + tar_name_gcc = "gcc-${version_gcc}.tar.xz"; + tar_gcc = fetchurl { + url = "https://ftpmirror.gnu.org/gcc/gcc-${version_gcc}/${tar_name_gcc}"; + sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; + }; + + tar_name_binutils = "binutils-${version_binutils}.tar.xz"; + tar_binutils = fetchurl { + url = "https://ftpmirror.gnu.org/binutils/${tar_name_binutils}"; + sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w"; + }; + + tar_name_acpica = "acpica-unix2-${version_acpica}.tar.gz"; + tar_acpica = fetchurl { + url = "https://acpica.org/sites/acpica/files/${tar_name_acpica}"; + sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w"; + }; + + tar_name_nasm = "nasm-${version_nasm}.tar.bz2"; + tar_nasm = fetchurl { + url = "https://www.nasm.us/pub/nasm/releasebuilds/${version_nasm}/${tar_name_nasm}"; + sha256 = "1l1gxs5ncdbgz91lsl4y7w5aapask3w02q9inayb2m5bwlwq6jrw"; + }; + + tar_coreboot_name = "coreboot-${version_coreboot}.tar.xz"; + tar_coreboot = fetchurl { + url = "https://coreboot.org/releases/${tar_coreboot_name}"; + sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr"; + }; +in stdenvNoCC.mkDerivation rec { + name = "coreboot-toolchain"; + version = version_coreboot; + src = tar_coreboot; + + nativeBuildInputs = [ perl curl gnumake git bison ]; + + buildInputs = [ gnat11 flex zlib ]; + + enableParallelBuilding = true; + dontConfigure = true; + dontInstall = true; + + patchPhase = '' + mkdir util/crossgcc/tarballs + ln -s ${tar_gmp} util/crossgcc/tarballs/${tar_name_gmp} + ln -s ${tar_mpfr} util/crossgcc/tarballs/${tar_name_mpfr} + ln -s ${tar_mpc} util/crossgcc/tarballs/${tar_name_mpc} + ln -s ${tar_gcc} util/crossgcc/tarballs/${tar_name_gcc} + ln -s ${tar_binutils} util/crossgcc/tarballs/${tar_name_binutils} + ln -s ${tar_acpica} util/crossgcc/tarballs/${tar_name_acpica} + ln -s ${tar_nasm} util/crossgcc/tarballs/${tar_name_nasm} + patchShebangs util/genbuild_h/genbuild_h.sh util/crossgcc/buildgcc + ''; + + buildPhase = '' + make crossgcc-i386 CPUS=$NIX_BUILD_CORES DEST=$out + ''; + + meta = with lib; { + homepage = "https://www.coreboot.org"; + description = "coreboot toolchain"; + license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ]; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffec1ea5c52f..8c4569a12b89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11679,6 +11679,8 @@ with pkgs; pscid = nodePackages.pscid; + coreboot-toolchain = callPackage ../development/tools/misc/coreboot-toolchain { }; + remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; From 6b7280c7cd5ae205a760c16f6618124ce682c6c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Sep 2021 23:20:55 +0200 Subject: [PATCH 31/99] python3Packages.async-upnp-client: 0.21.3 -> 0.22.4 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index f9256b11ae78..a4cd45ccde0a 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.21.3"; + version = "0.22.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-85MdzvNac199pZObhfGv33ycgzt4nr9eHYvSjMW6kq8="; + sha256 = "sha256-bo01BMBf2AWpJPkHdAMpxz6UtHYs02TwNOOCKn/HLmI="; }; propagatedBuildInputs = [ From d8ff7944ede3210c2172b87517803e25b8ed4736 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Sep 2021 23:45:37 +0200 Subject: [PATCH 32/99] grocy: 3.1.1 -> 3.1.2 ChangeLog: https://github.com/grocy/grocy/releases/tag/v3.1.2 --- pkgs/servers/grocy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index a417b8e38f7e..d8c73ad39b90 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-xoYjaZF7Frz+QPZ37fBSbgXTwsR/+Na+XsP5tfATgNg="; + sha256 = "sha256-Kw2UA3jJEfGPr9jMnDmJ4GW87fwM80pQpqTz9ugXzow="; }; nativeBuildInputs = [ unzip ]; From e8ec90a29be33e4fef38b5582febe4194a34eabf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Sep 2021 12:31:16 +0200 Subject: [PATCH 33/99] python3Packages.pycontrol4: 0.1.0 -> 0.3.0 --- pkgs/development/python-modules/pycontrol4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index 93f7dcdc0a23..009bb446028a 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "0.1.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "lawtancool"; repo = "pyControl4"; rev = "v${version}"; - sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d"; + sha256 = "sha256-z7MDz9fGwZY4JcqabeYFGZ9nsRU2qa5LYnNQx/ae/4Y="; }; propagatedBuildInputs = [ From 9ac537d08b9fe91575518868f5e0645e9e31fc29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Sep 2021 15:52:08 +0200 Subject: [PATCH 34/99] python3Packages.WazeRouteCalculator: 0.12 -> 0.13 --- .../python-modules/WazeRouteCalculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 6da500413f0e..3f31bb1648d8 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "WazeRouteCalculator"; - version = "0.12"; + version = "0.13"; src = fetchPypi { inherit pname version; - sha256 = "889fe753a530b258bd23def65616666d32c48d93ad8ed211dadf2ed9afcec65b"; + sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg="; }; propagatedBuildInputs = [ requests ]; From fcceea469fd8086e52265d958d0f71d20a6ba217 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Sep 2021 16:20:27 +0200 Subject: [PATCH 35/99] python3Packages.wazeroutecalculator: rename --- .../default.nix | 20 +++++++++++++------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{WazeRouteCalculator => wazeroutecalculator}/default.nix (60%) diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/wazeroutecalculator/default.nix similarity index 60% rename from pkgs/development/python-modules/WazeRouteCalculator/default.nix rename to pkgs/development/python-modules/wazeroutecalculator/default.nix index 3f31bb1648d8..dd8409624648 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/wazeroutecalculator/default.nix @@ -1,24 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi -, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: buildPythonPackage rec { - pname = "WazeRouteCalculator"; + pname = "wazeroutecalculator"; version = "0.13"; src = fetchPypi { - inherit pname version; + pname = "WazeRouteCalculator"; + inherit version; sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # there are no tests doCheck = false; + pythonImportsCheck = [ "WazeRouteCalculator" ]; + meta = with lib; { description = "Calculate actual route time and distance with Waze API"; homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0c375a664999..039b921ee982 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ sphinxcontrib_plantuml = sphinxcontrib-plantuml; topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 + WazeRouteCalculator = wazeroutecalculator; # 2021-09-29 websocket_client = websocket-client; zc_buildout221 = zc_buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 686dd8c0f363..a2394b188735 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9527,7 +9527,7 @@ in { wavedrom = callPackage ../development/python-modules/wavedrom { }; - WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { }; From db58f62dab8fdba1ca31def9ed92313b6ff70562 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Sep 2021 16:22:01 +0200 Subject: [PATCH 36/99] 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 39a5ed3e2bea..05bc351a029a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -961,7 +961,7 @@ "waterfurnace" = ps: with ps; [ waterfurnace ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ibm-watson ]; - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; + "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; "webostv" = ps: with ps; [ aiopylgtv ]; From 0901b41056f5dde3fb01a9998145ff8b7ca11136 Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 29 Sep 2021 22:27:04 +0800 Subject: [PATCH 37/99] source-han-sans: 2.001 -> 2.004 --- pkgs/data/fonts/source-han/default.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 7b6bef0198da..9f6947213a70 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -31,11 +31,29 @@ let }; in { - sans = makePackage { + sans = let + rev = "2.004R"; family = "sans"; - description = "sans-serif"; - rev = "2.001R"; - sha256 = "101p8q0sagf1sd1yzwdrmmxvkqq7j0b8hi0ywsfck9w56r4zx54y"; + Family = "Sans"; + zip = fetchzip { + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc.zip"; + stripRoot = false; + sha256 = "0z852kzb84vqk57icfaxbfxhf43awcn8w39byfypxaxigzhy78l7"; + }; + in stdenvNoCC.mkDerivation { + pname = "source-han-sans"; + version = lib.removeSuffix "R" rev; + + buildCommand = '' + install -m444 -Dt $out/share/fonts/opentype/source-han-sans ${zip}/SourceHanSans.ttc + ''; + + meta = { + description = "An open source Pan-CJK sans-serif typeface"; + homepage = "https://github.com/adobe-fonts/source-han-${family}"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ taku0 emily ]; + }; }; serif = makePackage { From 4368954e3bf74a71af22991c577e7d06a8746041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 29 Sep 2021 16:45:26 +0200 Subject: [PATCH 38/99] limesctl: init at 2.0.0 --- pkgs/applications/misc/limesctl/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/limesctl/default.nix diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix new file mode 100644 index 000000000000..24a16eeb8b1f --- /dev/null +++ b/pkgs/applications/misc/limesctl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "limesctl"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sapcc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-fhmGVgJ/4xnf6pe8aXxx1KEmLInxm54my+qgSU4Vc/k="; + }; + + vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "CLI for Limes"; + homepage = "https://github.com/sapcc/limesctl"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e0b07f89e5..0ef769e27f1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24758,6 +24758,8 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; + limesctl = callPackage ../applications/misc/limesctl { }; + linssid = libsForQt5.callPackage ../applications/networking/linssid { }; deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { }; From 410b86569652c7ce635e073a5b35558edd495777 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 29 Sep 2021 18:02:49 +0300 Subject: [PATCH 39/99] =?UTF-8?q?nnn:=204.2=20=E2=86=92=204.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 159ecb9f5526..8999c3b8f95e 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ICUF/LJhsbzDz9xZig1VE6TdG3u0C6Jf/61RoAjx3KI="; + sha256 = "sha256-kiLmdEyOnD1wPS2GuFF5nTK9tgUOI6PVCzCRZXdObEo="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); From c294019fa3fafd7d70ad1d73ce5ecc40d5981baf Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 29 Sep 2021 11:10:32 -0400 Subject: [PATCH 40/99] gobang: init at 0.1.0-alpha.5 --- .../tools/database/gobang/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/database/gobang/default.nix diff --git a/pkgs/development/tools/database/gobang/default.nix b/pkgs/development/tools/database/gobang/default.nix new file mode 100644 index 000000000000..dc861337c252 --- /dev/null +++ b/pkgs/development/tools/database/gobang/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "gobang"; + version = "0.1.0-alpha.5"; + + src = fetchFromGitHub { + owner = "tako8ki"; + repo = pname; + rev = "v${version}"; + sha256 = "02glb3hlprpdc72ji0248a7g0vr36yxr0gfbbms2m25v251dyaa6"; + }; + + cargoSha256 = "sha256-Tiefet5gLpiuYY6Scg5fjnaPiZfVl5Gy2oZFdhgNRxY="; + + meta = with lib; { + description = "A cross-platform TUI database management tool written in Rust"; + homepage = "https://github.com/tako8ki/gobang"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5462c9f43f9c..27a393b39d05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11753,6 +11753,8 @@ with pkgs; go-junit-report = callPackage ../development/tools/go-junit-report { }; + gobang = callPackage ../development/tools/database/gobang { }; + gogetdoc = callPackage ../development/tools/gogetdoc { }; gox = callPackage ../development/tools/gox { }; From 4b6778192ea6360ce5c837e5bdde060c55c0d535 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 29 Sep 2021 11:37:07 -0400 Subject: [PATCH 41/99] svgcleaner: 0.9.2 -> 0.9.5 --- pkgs/tools/graphics/svgcleaner/Cargo.lock | 256 +++++++++++++++++++++ pkgs/tools/graphics/svgcleaner/default.nix | 17 +- 2 files changed, 267 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/graphics/svgcleaner/Cargo.lock diff --git a/pkgs/tools/graphics/svgcleaner/Cargo.lock b/pkgs/tools/graphics/svgcleaner/Cargo.lock new file mode 100644 index 000000000000..8daf4c4f83b5 --- /dev/null +++ b/pkgs/tools/graphics/svgcleaner/Cargo.lock @@ -0,0 +1,256 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "error-chain" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" + +[[package]] +name = "fern" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" +dependencies = [ + "chrono", + "log", +] + +[[package]] +name = "float-cmp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be876712b52d3970d361df27210574630d8d44d6461f0b55745d56e88ac10b0" +dependencies = [ + "num", +] + +[[package]] +name = "libc" +version = "0.2.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "num" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" +dependencies = [ + "num-integer", + "num-iter", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ + "siphasher", +] + +[[package]] +name = "simplecss" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135685097a85a64067df36e28a243e94a94f76d829087ce0be34eeb014260c0e" + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] +name = "svgcleaner" +version = "0.9.5" +dependencies = [ + "clap", + "error-chain", + "fern", + "log", + "svgdom", +] + +[[package]] +name = "svgdom" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac5d235d251b4266fb95bdf737fe0c546b26327a127e35ad33effdd78cb2e83" +dependencies = [ + "error-chain", + "float-cmp", + "log", + "simplecss", + "svgparser", +] + +[[package]] +name = "svgparser" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90b2a4d5f7d25526c750e436fb5a224e06579f32581515bf511b37210007a3cb" +dependencies = [ + "error-chain", + "log", + "phf", + "xmlparser", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi", +] + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xmlparser" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4fb8cb7e78fcf5055e751eae348c81bba17b6c84c8ed9fc5f6cf60e3e15d4aa" +dependencies = [ + "error-chain", + "log", +] diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 4224bde72345..48902f322e2f 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "svgcleaner"; - version = "0.9.2"; + version = "0.9.5"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = "svgcleaner"; rev = "v${version}"; - sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f"; + sha256 = "sha256-nc+lKL6CJZid0WidcBwILhn81VgmmFrutfKT5UffdHA="; }; - cargoSha256 = "172kdnd11xb2qkklqdkdcwi3g55k0d67p8g8qj7iq34bsnfb5bnr"; + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock; + ''; meta = with lib; { description = "A tool for tidying and optimizing SVGs"; homepage = "https://github.com/RazrFalcon/svgcleaner"; - license = licenses.gpl2; - maintainers = [ maintainers.mehandes ]; + changelog = "https://github.com/RazrFalcon/svgcleaner/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mehandes ]; }; } From cc9e7f0b047cbf2d9928edc387754c0bccfc525c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 29 Sep 2021 17:48:06 +0200 Subject: [PATCH 42/99] exim: 4.94.2 -> 4.95 --- pkgs/servers/mail/exim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 702808f950a2..c69e699a3a76 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "exim"; - version = "4.94.2"; + version = "4.95"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - sha256 = "0x4j698gsawm8a3bz531pf1k6izyxfvry4hj5wb0aqphi7y62605"; + sha256 = "0rzi0kc3qiiaw8vnv5qrpwdvvh4sr5chns026xy99spjzx9vd76c"; }; nativeBuildInputs = [ pkg-config ]; From 8b1e1396225790a0a1fb7961a4848c773737cff9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 Sep 2021 01:38:30 +0300 Subject: [PATCH 43/99] photoflow: mark as broken --- pkgs/applications/graphics/photoflow/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 79a171d6fc3f..46e5ce420a78 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -86,5 +86,9 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # sse3 is not supported on aarch64 badPlatforms = [ "aarch64-linux" ]; + # added 2021-09-30 + # upstream seems pretty dead + #/build/source/src/operations/denoise.cc:30:10: fatal error: vips/cimg_funcs.h: No such file or directory + broken = true; }; } From 1f7f87396ca180543b997a3a8806212da8a3fd67 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 29 Sep 2021 22:30:41 +0200 Subject: [PATCH 44/99] chromiumDev: 96.0.4651.0 -> 96.0.4655.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c789e04957aa..42a17c7163f4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "96.0.4651.0", - "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6", - "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9", + "version": "96.0.4655.0", + "sha256": "00gax7xqi1n4jiqwpff43c43mpqb5jakckwdfbgwhrp6h35xxdv1", + "sha256bin64": "1xyyz6p4qllzyd6wbdbhs6kp062dz40i03wrlsggb919bgp7ivnw", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-13", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "de86ec4176235871a7cb335756987e41246dae4a", + "sha256": "0mlnsqcj06azz5cpwlafi5gg6pvf2s6x9qq02zl1sm2h288y152g" } } }, From 8bcd17d6a859b44b24e5ef5d14e0fc6a2eaf9c69 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 30 Sep 2021 01:45:05 +0200 Subject: [PATCH 45/99] terraform_1_0: 1.0.7 -> 1.0.8 - https://github.com/hashicorp/terraform/releases/tag/v1.0.8 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5e2253aaa622..85b6cf679a9a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.7"; - sha256 = "115gb4mqz7lzyb80psbfy10k4h09fbvb1l8iz7kg63ajx69fnasy"; + version = "1.0.8"; + sha256 = "1755m3h9iz086znjpkhxjbyl3jaxpsqmk73infn9wbhql8pq2wil"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; From c4035d7234d3b020e230f1094ae1e5efd64d7aa0 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 29 Sep 2021 17:10:21 -0700 Subject: [PATCH 46/99] saleae-logic-2: add desktop item --- .../tools/misc/saleae-logic-2/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 80c722221164..6318dbb3ff63 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, gtk3 }: +{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; version = "2.3.37"; @@ -6,6 +6,15 @@ let url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; sha256 = "0jclzd4s1r6h2p1r0vhmzz3jnwpp7d41g70lcamrsxidxrmm8d45"; }; + desktopItem = makeDesktopItem { + inherit name; + exec = name; + icon = "Logic"; + comment = "Software for Saleae logic analyzers"; + desktopName = "Saleae Logic"; + genericName = "Logic analyzer"; + categories = "Development"; + }; in appimageTools.wrapType2 { inherit name src; @@ -17,6 +26,9 @@ appimageTools.wrapType2 { '' mkdir -p $out/etc/udev/rules.d cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ + mkdir -p $out/share/pixmaps + ln -s ${desktopItem}/share/applications $out/share/ + cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png ''; profile = '' From e5b3f1774423af475f7019a22d8c72d180ef6f2d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 30 Sep 2021 08:51:45 +0800 Subject: [PATCH 47/99] pantheon.gala: 6.2.0 -> 6.2.1 --- .../pantheon/desktop/gala/default.nix | 9 +--- ...ession-crash-when-taking-screenshots.patch | 50 ------------------- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 665007fcd634..db757b1aa4ae 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g"; + sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f"; }; passthru = { @@ -75,11 +75,6 @@ stdenv.mkDerivation rec { patches = [ ./plugins-dir.patch - # https://github.com/elementary/gala/pull/1259 - # https://github.com/NixOS/nixpkgs/issues/139404 - # Remove this patch when it is included in a new release - # of gala OR when we no longer use mutter 3.38 for pantheon - ./fix-session-crash-when-taking-screenshots.patch ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch b/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch deleted file mode 100644 index f2393a804bcf..000000000000 --- a/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sat, 25 Sep 2021 23:21:01 +0800 -Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38 - ---- - src/ScreenshotManager.vala | 5 ++--- - vapi/mutter-clutter.vapi | 2 +- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala -index 3ffb0123..388fee1a 100644 ---- a/src/ScreenshotManager.vala -+++ b/src/ScreenshotManager.vala -@@ -354,12 +354,11 @@ namespace Gala { - paint_flags |= Clutter.PaintFlag.FORCE_CURSORS; - } - -- unowned var data = image.get_data (); - if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) { - wm.stage.paint_to_buffer ( - {x, y, width, height}, - scale, -- ref data, -+ image.get_data (), - image.get_stride (), - Cogl.PixelFormat.BGRA_8888_PRE, - paint_flags -@@ -368,7 +367,7 @@ namespace Gala { - wm.stage.paint_to_buffer ( - {x, y, width, height}, - scale, -- ref data, -+ image.get_data (), - image.get_stride (), - Cogl.PixelFormat.ARGB_8888_PRE, - paint_flags -diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi -index 5b778cb2..95de24be 100644 ---- a/vapi/mutter-clutter.vapi -+++ b/vapi/mutter-clutter.vapi -@@ -7336,7 +7336,7 @@ namespace Clutter { - [Version (since = "1.2")] - public bool get_use_alpha (); - #if HAS_MUTTER338 -- public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref unowned uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; -+ public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; - public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags); - #else - [Version (since = "0.4")] From c779050edb56f5958d28af7aec444c14f6a18163 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 29 Sep 2021 21:35:44 -0500 Subject: [PATCH 48/99] poetry2nix: 1.20.0 -> 1.21.0 --- pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 5 ++++- pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 22ab12149285..dae0a02b6175 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.20.0"; + version = "1.21.0"; inherit (poetryLib) isCompatible readTOML moduleName; @@ -339,6 +339,9 @@ lib.makeScope pkgs.newScope (self: { ) { inherit app; }; }; + # Extract position from explicitly passed attrs so meta.position won't point to poetry2nix internals + pos = builtins.unsafeGetAttrPos (lib.elemAt (lib.attrNames attrs) 0) attrs; + meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) { inherit (pyProject.tool.poetry) description; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index daf536561f11..ab1a5324c98e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -156,6 +156,12 @@ self: super: } ); + cheroot = super.cheroot.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + colour = super.colour.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; @@ -547,6 +553,7 @@ self: super: self.pytestrunner self.cryptography self.pyjwt + self.setuptools-scm-git-archive ]; } ); From 953566041065b510dfa83bfab5899a88ee07da79 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 16 Sep 2021 18:10:20 -0700 Subject: [PATCH 49/99] bochs: Enable nogui display backend --- pkgs/applications/virtualization/bochs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 41ab5ef2c990..1f02219c8314 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { "--with-rfb=no" "--with-vncsrv=no" + "--with-nogui" # These will always be "yes" on NixOS "--enable-ltdl-install=yes" From 93d737f732c15fe0afa94196f2e92645eaaa223d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 05:21:11 +0000 Subject: [PATCH 50/99] python38Packages.ephem: 4.0.0.2 -> 4.1 --- pkgs/development/python-modules/ephem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index a859f509f347..4a8085e0d72b 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.0.0.2"; + version = "4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0D3nPr9qkWgdWX61tdQ7z28MZ+KSu6L5qXRzS08VdX4="; + sha256 = "c076794a511a34b5b91871c1cf6374dbc323ec69fca3f50eb718f20b171259d6"; }; checkInputs = [ From 824043e09c9421d6750f60abca9b23d7699868ea Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Sep 2021 22:00:31 +0200 Subject: [PATCH 51/99] =?UTF-8?q?ocamlPackages.uucd:=2013.0.0=20=E2=86=92?= =?UTF-8?q?=2014.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.uucp: 13.0.0 → 14.0.0 --- pkgs/development/ocaml-modules/uucd/default.nix | 6 +++--- pkgs/development/ocaml-modules/uucp/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index f5d932336150..244f3f36dc39 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "13.0.0"; + version = "14.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1fg77hg4ibidkv1x8hhzl8z3rzmyymn8m4i35jrdibb8adigi8v2"; + sha256 = "sha256:0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index bb70ff6a4b7e..2e8a360d4550 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -2,7 +2,7 @@ let pname = "uucp"; - version = "13.0.0"; + version = "14.0.0"; webpage = "https://erratique.ch/software/${pname}"; minimumOCamlVersion = "4.03"; doCheck = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-OPpHbCOC/vMFdyHwyhCSisUv2PyO8xbeY2oq1a9HbqY="; + sha256 = "sha256:1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj"; }; buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; From 265006a49312a5f2251a961c64f843aaa2306f9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 05:56:55 +0000 Subject: [PATCH 52/99] python38Packages.holidays: 0.11.3 -> 0.11.3.1 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 0c435357f95c..7ac02fa05ac9 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.11.3"; + version = "0.11.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b7bff8f9d7090656aee3c54c252c9e356785ee566c67de4af800ddbfa888bc77"; + sha256 = "4855afe0ebf428efbcf848477828b889f8515be7f4f15ae26682919369d92774"; }; propagatedBuildInputs = [ From 1dd8f94d72c3b66bce210fd205b471dda2dca814 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 08:35:10 +0200 Subject: [PATCH 53/99] python3Packages.mypy-boto3-builder: 5.4.0 -> 5.5.0 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index e0a67d4f6505..0a8252234569 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "5.4.0"; + version = "5.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-PS2MMpI/ezjHnI6vUoHTt0uuuB/w94OrOYBLNCpSxIE="; + sha256 = "sha256-cFe8d6w28VFTNyj/ABWHkFQDfnM4aTrNZ+WUw5g8H5I="; }; nativeBuildInputs = [ From 36e96619438ba8a08f6080dbb53ab34aa1bb63f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 08:50:00 +0200 Subject: [PATCH 54/99] home-assistant: enable mythicbeastsdns tests --- 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 27c34e10e382..cb019b92fdc7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -518,6 +518,7 @@ in with py.pkgs; buildPythonApplication rec { "my" "myq" "mysensors" + "mythicbeastsdns" "nam" "namecheapdns" "neato" From d62a56529049d0cece44261f09fff1dc7b7a6042 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 30 Sep 2021 10:41:20 +0800 Subject: [PATCH 55/99] haruna: 0.6.3 -> 0.7.2 --- pkgs/applications/video/haruna/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 3e45dd62d683..a9e87861365c 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -1,10 +1,11 @@ { lib -, fetchFromGitHub +, fetchFromGitLab , mkDerivation , breeze-icons , breeze-qt5 , cmake , extra-cmake-modules +, ffmpeg-full , kcodecs , kconfig , kcoreaddons @@ -26,18 +27,20 @@ mkDerivation rec { pname = "haruna"; - version = "0.6.3"; + version = "0.7.2"; - src = fetchFromGitHub { - owner = "g-fb"; + src = fetchFromGitLab { + owner = "multimedia"; repo = "haruna"; - rev = version; - sha256 = "sha256-gJCLc8qJolv4Yufm/OBCTTEpyoodtySAqKH+zMHCoLU="; + rev = "v${version}"; + sha256 = "sha256-0s4v3YJhSssp2S9mppMXq0AtWXPIaqOYWPmJgKjXjDE="; + domain = "invent.kde.org"; }; buildInputs = [ breeze-icons breeze-qt5 + ffmpeg-full kcodecs kconfig kcoreaddons From e6276d6da39a636f74b78db54480b40d8e8165ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 07:47:30 +0000 Subject: [PATCH 56/99] python38Packages.cupy: 9.4.0 -> 9.5.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index c165c9af7a20..c3b06b7d9caa 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "9.4.0"; + version = "9.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4402bd33a051e82f6888dab088a8d657714ca6d1e945b513dcc513a95a435bd5"; + sha256 = "2e85c3ac476c80c78ce94cae8786cc82a615fc4d1b0d380f16b9665d2cc5d187"; }; preConfigure = '' From 443fba3566be4480d1ad463d4acf482270257173 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 08:05:21 +0000 Subject: [PATCH 57/99] python38Packages.cx_Freeze: 6.7 -> 6.8.1 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 42fa8fd8ddca..2f1797bf4fed 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.7"; + version = "6.8.1"; src = fetchPypi { inherit pname version; - sha256 = "050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"; + sha256 = "3f16d3d40f7f2e1f6032132170d8fd4ba2f4f9ea419f13d7a68091bbe1949583"; }; disabled = pythonOlder "3.5"; From 155362f36cd92cff3ccf91ffd4322d51d4bb568e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 10:10:44 +0200 Subject: [PATCH 58/99] python3Packages.somecomfort: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/somecomfort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somecomfort/default.nix b/pkgs/development/python-modules/somecomfort/default.nix index c5f1ad73fcda..621da7ae8db0 100644 --- a/pkgs/development/python-modules/somecomfort/default.nix +++ b/pkgs/development/python-modules/somecomfort/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "somecomfort"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "681f44449e8c0a923305aa05aa5262f4d2304a6ecea496caa8d5a51b724a0fef"; + sha256 = "sha256-CbV8NOpCXzVz0dBKhUclUCPrD4530zv5HIYxsbNO+OA="; }; propagatedBuildInputs = [ From 27983d14543382a70293fd4bbc449cdc52e0d0df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 10:20:06 +0200 Subject: [PATCH 59/99] python3Packages.pynobo: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/pynobo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index 52cada827817..e70010901ef5 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pynobo"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "echoromeo"; repo = pname; rev = "v${version}"; - sha256 = "0f98qm9vp7f0hqaxhihv7y5swciyp60222la44f4936g0rvs005x"; + sha256 = "sha256-tcDSI5GODV53o4m35B4CXscVCnwt7gqRu7qohEnvyz8="; }; # Project has no tests From 1e97c325b3f3a28cb6e156941f4876385f6fd19e Mon Sep 17 00:00:00 2001 From: 239 <239@pm.me> Date: Thu, 30 Sep 2021 10:34:16 +0200 Subject: [PATCH 60/99] pcloud: 1.9.5 -> 1.9.7 --- pkgs/applications/networking/pcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index b2eb18bd7b1a..50a26ef50f6a 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -26,13 +26,13 @@ let pname = "pcloud"; - version = "1.9.5"; - code = "XZy4VwXZjkvoMGM3x6kCTkIGLFYVKjqKbefX"; + version = "1.9.7"; + code = "XZ0FAtXZNxFJbda6KhLejU9tKAg4N0TEqx3V"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-GuO4wsSRT6WMlqYs2X+5oA7CykHb/NmhZ7UGA1FA6y4="; + hash = "sha256-6eMRFuZOLcoZd2hGw7QV+kAmzE5lK8uK6ZpGs4n7/zw="; }; appimageContents = appimageTools.extractType2 { From 4236dfe203c24c1cee4b6705fed9c36e90115e8b Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 30 Sep 2021 10:34:51 +0200 Subject: [PATCH 61/99] jre_minimal: document how to use a headless JDK For a smaller image --- doc/languages-frameworks/java.section.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md index 77919d43f748..371bdf6323fb 100644 --- a/doc/languages-frameworks/java.section.md +++ b/doc/languages-frameworks/java.section.md @@ -72,6 +72,15 @@ in ... ``` +You can also specify what JDK your JRE should be based on, for example +selecting a 'headless' build to avoid including a link to GTK+: + +```nix +my_jre = pkgs.jre_minimal.override { + jdk = jdk11_headless; +}; +``` + Note all JDKs passthru `home`, so if your application requires environment variables like `JAVA_HOME` being set, that can be done in a generic fashion with the `--set` argument of `makeWrapper`: From c2b15153a8f982fda721034cb9e62e0b01768008 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 20 Sep 2021 22:31:09 +0200 Subject: [PATCH 62/99] electrs: 0.8.12 -> 0.9.0 --- pkgs/applications/blockchains/electrs/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index ec135b7e931d..e5fdca521ddd 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -1,22 +1,24 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , llvmPackages , rocksdb +, Security }: rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.12"; + version = "0.9.0"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "0kd5zki9f1pnwscnvd921dw0lc45nfkwk23l33nzdjn005lmsw7v"; + sha256 = "04dqbn2nfzllxfcn3v9vkfy2hn2syihijr575621r1pj65pcgf8y"; }; - cargoSha256 = "1l8dwjwj21crxampzj5c0k98xnisgy3d9c3dkgf5vaybrcp04k85"; + cargoSha256 = "0hl8q62lankrab8gq9vxmkn68drs0hw5pk0q6aiq8fxsb63dzsw0"; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; @@ -27,6 +29,8 @@ rustPlatform.buildRustPackage rec { ROCKSDB_LIB_DIR = "${rocksdb}/lib"; cargoBuildFlags = "--no-default-features"; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; homepage = "https://github.com/romanz/electrs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7075fd5d714..da2694eee48f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28850,7 +28850,9 @@ with pkgs; eclair = callPackage ../applications/blockchains/eclair { }; - electrs = callPackage ../applications/blockchains/electrs { }; + electrs = callPackage ../applications/blockchains/electrs { + inherit (darwin.apple_sdk.frameworks) Security; + }; elements = libsForQt5.callPackage ../applications/blockchains/elements { miniupnpc = miniupnpc_2; From 6703f159a79e066f751c66968becbe68f2c6bfc0 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 30 Sep 2021 10:40:16 +0100 Subject: [PATCH 63/99] ko: 0.8.3 -> 0.9.3 Co-authored-by: NickCao --- pkgs/development/tools/ko/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 614b5d4c9df4..ab206a090bb1 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,23 +7,32 @@ buildGoModule rec { pname = "ko"; - version = "0.8.3"; + version = "0.9.3"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc="; + sha256 = "sha256-cIrlhhk5Lt0Qt7q7rKw8EXrJqZWZEjrEUyHOvHiT6bs="; }; vendorSha256 = null; - # Don't build the legacy main.go or test dir - excludedPackages = "\\(cmd/ko\\|test\\)"; + nativeBuildInputs = [ installShellFiles ]; + # Pin so that we don't build the several other development tools + subPackages = "."; + ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ]; checkInputs = [ git ]; preCheck = '' + # Feed in all the tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + getGoDirs() { + go list ./... + } + # resolves some complaints from ko export GOROOT="$(go env GOROOT)" git init From a41e19ca718eeabc2e9205e72608f50a933e9648 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 30 Sep 2021 12:23:18 +0200 Subject: [PATCH 64/99] chromiumBeta: 95.0.4638.17 -> 95.0.4638.32 --- .../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 c789e04957aa..74dde613ead9 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": "95.0.4638.17", - "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", - "sha256bin64": "0h88gd8y4i2jmvhiwadbq6hzqygddym8jy1fhzp8qnwfhc30qm4m", + "version": "95.0.4638.32", + "sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr", + "sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0", "deps": { "gn": { "version": "2021-08-11", From 2e262587ae0810ebb4f1e65d1d73efb72a5d74a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 10:44:02 +0000 Subject: [PATCH 65/99] python38Packages.google-cloud-spanner: 3.10.0 -> 3.11.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 1832978aab31..bb74540b0f55 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.10.0"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "49b946f9ae67ebae69d39f1f4ceabe88971b880b92277ce037651db49e5cf167"; + sha256 = "8ffb36f3c1392213c9dff57f1dcb18810f6e805898ee7b4626a4da2b9b6c4b63"; }; propagatedBuildInputs = [ From 22aad26526a06d85079d4488ade82dea451e07ce Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 30 Sep 2021 19:00:22 +0800 Subject: [PATCH 66/99] source-han-*: use fetchzip instead of mkDerivation --- pkgs/data/fonts/source-han/default.nix | 77 +++++++++++--------------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 9f6947213a70..e24bc8ae0dd3 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -1,72 +1,61 @@ { stdenvNoCC , lib , fetchzip -, fetchurl }: let - makePackage = { family, description, rev, sha256 }: let - Family = + makePackage = + { family + , description + , rev + , sha256 + , postFetch ? '' + install -m444 -Dt $out/share/fonts/opentype/source-han-${family} $downloadedFile + '' + , zip ? "" + }: + let Family = lib.toUpper (lib.substring 0 1 family) + lib.substring 1 (lib.stringLength family) family; + in + fetchzip { + name = "source-han-${family}-${lib.removeSuffix "R" rev}"; - ttc = fetchurl { - url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc"; - inherit sha256; + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; + inherit sha256 postFetch; + + meta = { + description = "An open source Pan-CJK ${description} typeface"; + homepage = "https://github.com/adobe-fonts/source-han-${family}"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ taku0 emily ]; + }; }; - in stdenvNoCC.mkDerivation { - pname = "source-han-${family}"; - version = lib.removeSuffix "R" rev; - - buildCommand = '' - install -m444 -Dt $out/share/fonts/opentype/source-han-${family} ${ttc} - ''; - - meta = { - description = "An open source Pan-CJK ${description} typeface"; - homepage = "https://github.com/adobe-fonts/source-han-${family}"; - license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ taku0 emily ]; - }; - }; in { - sans = let - rev = "2.004R"; + sans = makePackage { family = "sans"; - Family = "Sans"; - zip = fetchzip { - url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc.zip"; - stripRoot = false; - sha256 = "0z852kzb84vqk57icfaxbfxhf43awcn8w39byfypxaxigzhy78l7"; - }; - in stdenvNoCC.mkDerivation { - pname = "source-han-sans"; - version = lib.removeSuffix "R" rev; - - buildCommand = '' - install -m444 -Dt $out/share/fonts/opentype/source-han-sans ${zip}/SourceHanSans.ttc + description = "sans-serif"; + rev = "2.004R"; + sha256 = "052d17hvz435zc4r2y1p9cgkkgn0ps8g74mfbvnbm1pv8ykj40m9"; + postFetch = '' + mkdir -p $out/share/fonts/opentype/source-han-sans + unzip $downloadedFile -d $out/share/fonts/opentype/source-han-sans ''; - - meta = { - description = "An open source Pan-CJK sans-serif typeface"; - homepage = "https://github.com/adobe-fonts/source-han-${family}"; - license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ taku0 emily ]; - }; + zip = ".zip"; }; serif = makePackage { family = "serif"; description = "serif"; rev = "1.001R"; - sha256 = "1d968h30qvvwy3s77m9y3f1glq8zlr6bnfw00yinqa18l97n7k45"; + sha256 = "0nnsb2w140ih0cnp1fh7s4csvzp9y0cavz9df2ryhv215mh9z4m0"; }; mono = makePackage { family = "mono"; description = "monospaced"; rev = "1.002"; - sha256 = "1haqffkcgz0cc24y8rc9bg36v8x9hdl8fdl3xc8qz14hvr42868c"; + sha256 = "010h1y469c21bjavwdmkpbwk3ny686inz8i062wh1dhcv8cnqk3c"; }; } From 81328a0f6a3fe95fbdb500e551e14d3c4a8f0a70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 13:02:13 +0200 Subject: [PATCH 67/99] python3Packages.total-connect-client: 2021.7.1 -> 2021.8.3 --- .../python-modules/total-connect-client/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 93d401bf9a6d..4463b9fcc9f3 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2021.7.1"; + version = "2021.8.3"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - sha256 = "sha256-F7qVvQVU6OlVU98zmFSQ1SLVCAx+lhz+cFS//d0SHUQ="; + sha256 = "sha256-2iTH/Him4iMZadkmBR8Rwlt3RCqDXzR6ZqNHciNiHIk="; }; propagatedBuildInputs = [ @@ -28,6 +28,11 @@ buildPythonPackage rec { export PYTHONPATH="total_connect_client:$PYTHONPATH" ''; + disabledTests = [ + # Tests require network access + "tests_request" + ]; + pythonImportsCheck = [ "total_connect_client" ]; meta = with lib; { From 97dc734ab591b8b26e0d2f9c54dd5d6eac022a00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 11:24:44 +0000 Subject: [PATCH 68/99] python38Packages.imbalanced-learn: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/imbalanced-learn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index aad2e3e07a45..bb29504d63e6 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w"; + sha256 = "eaf576b1ba3523a0facf3aaa483ca17e326301e53e7678c54d73b7e0250edd43"; }; propagatedBuildInputs = [ scikit-learn ]; From b5da25f1c9edbbcc01b9dd19e95d6eb149498463 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 13:50:29 +0200 Subject: [PATCH 69/99] dnstake: init at 0.0.2 (#139869) Co-authored-by: Sandro --- pkgs/tools/networking/dnstake/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/dnstake/default.nix diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/tools/networking/dnstake/default.nix new file mode 100644 index 000000000000..d32cf0fedbbb --- /dev/null +++ b/pkgs/tools/networking/dnstake/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dnstake"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "pwnesia"; + repo = pname; + rev = "v${version}"; + sha256 = "0mjwnb0zyqnwk26f32v9vqxc9k6zcks9nn1595mf2hck5xwn86yk"; + }; + + vendorSha256 = "1xhzalx1x8js449w1qs2qdwbnz2s8mmypz9maj7jzl5mqfyhlwlp"; + + meta = with lib; { + description = "Tool to check missing hosted DNS zones"; + homepage = "https://github.com/pwnesia/dnstake"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7b13fadbf0b..837882aed9a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32766,6 +32766,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + dnstake = callPackage ../tools/networking/dnstake {}; + dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; }; From f94419a3a87be8adad25bb81662aefa9384a8226 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 30 Sep 2021 14:03:13 +0200 Subject: [PATCH 70/99] libva-utils: 2.12.0 -> 2.13.0 --- pkgs/development/libraries/libva/utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 6b5246d09ef2..05ba3519ff4c 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1a4d75gc7rcfwpsh7fn8mygvi4w0jym4szdhw6jpfywvll37lffi"; + sha256 = "0ahbwikdb0chf76whm62zz0a7zqil3gzsxmq38ccbqlmnnyjkbbb"; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 802321a44282f7bf716fce0e4a14ac46d607456e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 30 Sep 2021 14:08:54 +0200 Subject: [PATCH 71/99] signal-desktop: 5.17.2 -> 5.18.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4c9a1b30e670..48ba14824cfa 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.17.2"; # Please backport all updates to the stable channel. + version = "5.18.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1fmn2i6k3zh3d37234yxbawzf85fa66xybcli7xffli39czxbcj3"; + sha256 = "1pajv9f6xl06597322swkjzhfqvlfavsbhbn1xnvy4r28i84mp7d"; }; nativeBuildInputs = [ From 37d2d14c04c2b6aadb63ca9a19f0c5e9bde7c057 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Wed, 8 Sep 2021 13:45:52 +0200 Subject: [PATCH 72/99] friture: fix desktop item friture: remove trailing whitespace friture: use substituteInPlace instead of patch file friture: fix --- pkgs/applications/audio/friture/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index 8383bdbebc67..7d891834ed7f 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -36,6 +36,18 @@ in py.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; + postInstall = '' + substituteInPlace $out/share/applications/friture.desktop --replace usr/bin/friture friture + + for size in 16 32 128 256 512 + do + mkdir -p $out/share/icons/hicolor/$size\x$size + cp $src/resources/images/friture.iconset/icon_$size\x$size.png $out/share/icons/hicolor/$size\x$size/friture.png + done + mkdir -p $out/share/icons/hicolor/scalable/apps/ + cp $src/resources/images-src/window-icon.svg $out/share/icons/hicolor/scalable/apps/friture.svg + ''; + meta = with lib; { description = "A real-time audio analyzer"; homepage = "https://friture.org/"; From 2e13a9cc6d8420e7d778127b36ff0ad6a8158f33 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 30 Sep 2021 14:25:26 +0200 Subject: [PATCH 73/99] electrs: fix missing metrics feature With electrs 0.9.0, option `--no-default-features` disables the `metrics` feature, which brakes electrs option `--monitoring-addr`. Fix this by removing `--no-default-features`, which is no longer needed for dynamic linking in 0.9.0. --- pkgs/applications/blockchains/electrs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index e5fdca521ddd..ae06fe7ff2ba 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec { # link rocksdb dynamically ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - cargoBuildFlags = "--no-default-features"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 1320843aade014d9c199296c6dc0528de11451cd Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 29 Sep 2021 17:58:20 +0900 Subject: [PATCH 74/99] pict-rs: fixes --- pkgs/servers/web-apps/pict-rs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 96c8a83175bf..6338b6195455 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; - buildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' wrapProgram "$out/bin/pict-rs" \ @@ -36,7 +37,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "a simple image hosting service"; + description = "A simple image hosting service"; homepage = "https://git.asonix.dog/asonix/pict-rs"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ happysalada ]; From 8346dc04b31bc4ade35bd15a72e6cc40c8ac2f73 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 30 Sep 2021 21:15:08 +0900 Subject: [PATCH 75/99] pict-rs: add initial module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/pict-rs.md | 88 +++++++++++ nixos/modules/services/web-apps/pict-rs.nix | 50 ++++++ nixos/modules/services/web-apps/pict-rs.xml | 162 ++++++++++++++++++++ nixos/tests/pict-rs.nix | 17 ++ 5 files changed, 318 insertions(+) create mode 100644 nixos/modules/services/web-apps/pict-rs.md create mode 100644 nixos/modules/services/web-apps/pict-rs.nix create mode 100644 nixos/modules/services/web-apps/pict-rs.xml create mode 100644 nixos/tests/pict-rs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4f48ee5a80a5..bff7b83ea711 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -991,6 +991,7 @@ ./services/web-apps/nextcloud.nix ./services/web-apps/nexus.nix ./services/web-apps/node-red.nix + ./services/web-apps/pict-rs.nix ./services/web-apps/plantuml-server.nix ./services/web-apps/plausible.nix ./services/web-apps/pgpkeyserver-lite.nix diff --git a/nixos/modules/services/web-apps/pict-rs.md b/nixos/modules/services/web-apps/pict-rs.md new file mode 100644 index 000000000000..4b622049909d --- /dev/null +++ b/nixos/modules/services/web-apps/pict-rs.md @@ -0,0 +1,88 @@ +# Pict-rs {#module-services-pict-rs} + +pict-rs is a a simple image hosting service. + +## Quickstart {#module-services-pict-rs-quickstart} + +the minimum to start pict-rs is + +```nix +services.pict-rs.enable = true; +``` + +this will start the http server on port 8080 by default. + +## Usage {#module-services-pict-rs-usage} + +pict-rs offers the following endpoints: +- `POST /image` for uploading an image. Uploaded content must be valid multipart/form-data with an + image array located within the `images[]` key + + This endpoint returns the following JSON structure on success with a 201 Created status + ```json + { + "files": [ + { + "delete_token": "JFvFhqJA98", + "file": "lkWZDRvugm.jpg" + }, + { + "delete_token": "kAYy9nk2WK", + "file": "8qFS0QooAn.jpg" + }, + { + "delete_token": "OxRpM3sf0Y", + "file": "1hJaYfGE01.jpg" + } + ], + "msg": "ok" + } + ``` +- `GET /image/download?url=...` Download an image from a remote server, returning the same JSON + payload as the `POST` endpoint +- `GET /image/original/{file}` for getting a full-resolution image. `file` here is the `file` key from the + `/image` endpoint's JSON +- `GET /image/details/original/{file}` for getting the details of a full-resolution image. + The returned JSON is structured like so: + ```json + { + "width": 800, + "height": 537, + "content_type": "image/webp", + "created_at": [ + 2020, + 345, + 67376, + 394363487 + ] + } + ``` +- `GET /image/process.{ext}?src={file}&...` get a file with transformations applied. + existing transformations include + - `identity=true`: apply no changes + - `blur={float}`: apply a gaussian blur to the file + - `thumbnail={int}`: produce a thumbnail of the image fitting inside an `{int}` by `{int}` + square using raw pixel sampling + - `resize={int}`: produce a thumbnail of the image fitting inside an `{int}` by `{int}` square + using a Lanczos2 filter. This is slower than sampling but looks a bit better in some cases + - `crop={int-w}x{int-h}`: produce a cropped version of the image with an `{int-w}` by `{int-h}` + aspect ratio. The resulting crop will be centered on the image. Either the width or height + of the image will remain full-size, depending on the image's aspect ratio and the requested + aspect ratio. For example, a 1600x900 image cropped with a 1x1 aspect ratio will become 900x900. A + 1600x1100 image cropped with a 16x9 aspect ratio will become 1600x900. + + Supported `ext` file extensions include `png`, `jpg`, and `webp` + + An example of usage could be + ``` + GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 + ``` + which would create a 256x256px JPEG thumbnail and blur it +- `GET /image/details/process.{ext}?src={file}&...` for getting the details of a processed image. + The returned JSON is the same format as listed for the full-resolution details endpoint. +- `DELETE /image/delete/{delete_token}/{file}` or `GET /image/delete/{delete_token}/{file}` to + delete a file, where `delete_token` and `file` are from the `/image` endpoint's JSON + +## Missing {#module-services-pict-rs-missing} + +- Configuring the secure-api-key is not included yet. The envisioned basic use case is consumption on localhost by other services without exposing the service to the internet. diff --git a/nixos/modules/services/web-apps/pict-rs.nix b/nixos/modules/services/web-apps/pict-rs.nix new file mode 100644 index 000000000000..e1847fbd5314 --- /dev/null +++ b/nixos/modules/services/web-apps/pict-rs.nix @@ -0,0 +1,50 @@ +{ lib, pkgs, config, ... }: +with lib; +let + cfg = config.services.pict-rs; +in +{ + meta.maintainers = with maintainers; [ happysalada ]; + # Don't edit the docbook xml directly, edit the md and generate it: + # `pandoc pict-rs.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > pict-rs.xml` + meta.doc = ./pict-rs.xml; + + options.services.pict-rs = { + enable = mkEnableOption "pict-rs server"; + dataDir = mkOption { + type = types.path; + default = "/var/lib/pict-rs"; + description = '' + The directory where to store the uploaded images. + ''; + }; + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + The IPv4 address to deploy the service to. + ''; + }; + port = mkOption { + type = types.port; + default = 8080; + description = '' + The port which to bind the service to. + ''; + }; + }; + config = lib.mkIf cfg.enable { + systemd.services.pict-rs = { + environment = { + PICTRS_PATH = cfg.dataDir; + PICTRS_ADDR = "${cfg.address}:${toString cfg.port}"; + }; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + StateDirectory = "pict-rs"; + ExecStart = "${pkgs.pict-rs}/bin/pict-rs"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/pict-rs.xml b/nixos/modules/services/web-apps/pict-rs.xml new file mode 100644 index 000000000000..bf129f5cc2ac --- /dev/null +++ b/nixos/modules/services/web-apps/pict-rs.xml @@ -0,0 +1,162 @@ + + Pict-rs + + pict-rs is a a simple image hosting service. + +
+ Quickstart + + the minimum to start pict-rs is + + +services.pict-rs.enable = true; + + + this will start the http server on port 8080 by default. + +
+
+ Usage + + pict-rs offers the following endpoints: - + POST /image for uploading an image. Uploaded + content must be valid multipart/form-data with an image array + located within the images[] key + + +This endpoint returns the following JSON structure on success with a 201 Created status +```json +{ + "files": [ + { + "delete_token": "JFvFhqJA98", + "file": "lkWZDRvugm.jpg" + }, + { + "delete_token": "kAYy9nk2WK", + "file": "8qFS0QooAn.jpg" + }, + { + "delete_token": "OxRpM3sf0Y", + "file": "1hJaYfGE01.jpg" + } + ], + "msg": "ok" +} +``` + + + + + GET /image/download?url=... Download an + image from a remote server, returning the same JSON payload as + the POST endpoint + + + + + GET /image/original/{file} for getting a + full-resolution image. file here is the + file key from the /image + endpoint’s JSON + + + + + GET /image/details/original/{file} for + getting the details of a full-resolution image. The returned + JSON is structured like so: + json { "width": 800, "height": 537, "content_type": "image/webp", "created_at": [ 2020, 345, 67376, 394363487 ] } + + + + + GET /image/process.{ext}?src={file}&... + get a file with transformations applied. existing + transformations include + + + + + identity=true: apply no changes + + + + + blur={float}: apply a gaussian blur to + the file + + + + + thumbnail={int}: produce a thumbnail of + the image fitting inside an {int} by + {int} square using raw pixel sampling + + + + + resize={int}: produce a thumbnail of + the image fitting inside an {int} by + {int} square using a Lanczos2 filter. + This is slower than sampling but looks a bit better in + some cases + + + + + crop={int-w}x{int-h}: produce a cropped + version of the image with an {int-w} by + {int-h} aspect ratio. The resulting + crop will be centered on the image. Either the width or + height of the image will remain full-size, depending on + the image’s aspect ratio and the requested aspect ratio. + For example, a 1600x900 image cropped with a 1x1 aspect + ratio will become 900x900. A 1600x1100 image cropped with + a 16x9 aspect ratio will become 1600x900. + + + + + Supported ext file extensions include + png, jpg, and + webp + + + An example of usage could be + GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 + which would create a 256x256px JPEG thumbnail and blur it + + + + + GET /image/details/process.{ext}?src={file}&... + for getting the details of a processed image. The returned + JSON is the same format as listed for the full-resolution + details endpoint. + + + + + DELETE /image/delete/{delete_token}/{file} + or GET /image/delete/{delete_token}/{file} + to delete a file, where delete_token and + file are from the /image + endpoint’s JSON + + + +
+
+ Missing + + + + Configuring the secure-api-key is not included yet. The + envisioned basic use case is consumption on localhost by other + services without exposing the service to the internet. + + + +
+ diff --git a/nixos/tests/pict-rs.nix b/nixos/tests/pict-rs.nix new file mode 100644 index 000000000000..432fd6a50ccd --- /dev/null +++ b/nixos/tests/pict-rs.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + { + name = "pict-rs"; + meta.maintainers = with lib.maintainers; [ happysalada ]; + + machine = { ... }: { + environment.systemPackages = with pkgs; [ curl jq ]; + services.pict-rs.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("pict-rs") + machine.wait_for_open_port("8080") + ''; + }) From 963773eafa5e390ecd01069de0ab40d79f2eb4f7 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:06:08 +0200 Subject: [PATCH 76/99] zellij: 0.18.0 -> 0.18.1 --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index d56823f01735..7c56f43ca16f 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-yWDXCEdESRI/ynaBSxHi0lk5SE3i8GC+8OKDc+kgO1U="; + sha256 = "sha256-r9RZVmWKJJLiNSbSQPVJPR5koLR6DoAwlitTiQOc1fI="; }; - cargoSha256 = "sha256-wmASt5+whRM9rAoy9/uykQJTnxEiVfpJwD4W8/ukdVk="; + cargoSha256 = "sha256-xaC9wuT21SYH7H8/d4usDjHeojNZ2d/NkqMqNlQQ1n0="; nativeBuildInputs = [ installShellFiles From 41f22bd5c727b670819b0b1933a284425b182c25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 13:15:09 +0000 Subject: [PATCH 77/99] python38Packages.mypy-boto3-s3: 1.18.50 -> 1.18.51 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index e7544f44ea60..9bcb20595e0c 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.50"; + version = "1.18.51"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "338052d36825c3ecb7575de16374b3c60f49129544120f463398545835af9cd0"; + sha256 = "3e932af8f4b400df54f93ec48da31c365d2068b31e4e8d04705510f787e6a5f6"; }; propagatedBuildInputs = [ From 3a07e14fe9c6077209cd4f12bacb23d601985677 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 30 Sep 2021 15:16:22 +0200 Subject: [PATCH 78/99] nvme-cli: 1.14 -> 1.15 Update version to 1.15. Signed-off-by: Felix Singer --- pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 3a3065084881..57d59c27b6e6 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0dpadz945482srqpsbfx1bh7rc499fgpyzz1flhk9g9xjbpapkzc"; + sha256 = "0qr1wa163cb7z6g083nl3zcc28mmlbxh1m97pd54bp3gyrhmdhhr"; }; nativeBuildInputs = [ pkg-config ]; From c3e39c51a71ea2df84091ebef954cf5cd7057121 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 30 Sep 2021 16:23:05 +0300 Subject: [PATCH 79/99] nextcloud-client: 3.3.4 -> 3.3.5 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 152cfb55e240..d3612321c352 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-9RumsGpPHWa3EQXobBC3RcDUqwHCKiff+ngpTXKLyaE="; + sha256 = "sha256-kqNN9P0G/Obi/8PStmLxImQdqkhLnJoFZ7dLpqe11TI="; }; patches = [ From 1d696ae86febb3b074987c67f318167d1ce2782e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 13:51:51 +0000 Subject: [PATCH 80/99] python38Packages.packet-python: 1.44.0 -> 1.44.1 --- pkgs/development/python-modules/packet-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index c63c6df86f9f..6c7935c39b9a 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.44.0"; + version = "1.44.1"; src = fetchPypi { inherit pname version; - sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38"; + sha256 = "ec0f40465fad5260a1b2c1ad39dc12c5df65828e171bf2aafb13c1c3883628ba"; }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; From becb04784c1e06f96e70a0135deb2e0dd79c4d70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 17:01:51 +0200 Subject: [PATCH 81/99] python3Packages.millheater: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/millheater/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 3c68a5767231..f24be421914f 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.5.2"; + version = "0.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "0ndfxdg10m9mahnwbs66dnyc1lr8q7vs71y6zwxlc0h27hr3gr0d"; + sha256 = "sha256-goKJLI1iUHR6CrciwzsOHyN7EjdLHJufDVuA9Qa9Ftk="; }; propagatedBuildInputs = [ From 6431f7316fed74810bbc13c69ed718d7f7075064 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 08:04:35 -0700 Subject: [PATCH 82/99] python38Packages.tensorboard-plugin-wit: quote homepage (#140034) --- .../python-modules/tensorboard-plugin-wit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix index b0966ca2c7c0..ec4a63f65d43 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "What-If Tool TensorBoard plugin."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; From c0a8ff18be21f289cf65dc3da15e99df698425bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 08:14:12 -0700 Subject: [PATCH 83/99] python38Packages.lazy_import: quote homepage (#140031) --- pkgs/development/python-modules/lazy_import/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index fe35126ea26c..8cfd377a4efa 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "lazy_import provides a set of functions that load modules, and related attributes, in a lazy fashion."; - homepage = https://github.com/mnmelo/lazy_import; + homepage = "https://github.com/mnmelo/lazy_import"; license = licenses.gpl3; maintainers = [ maintainers.marenz ]; }; From ffea254935c36683607aeb95f281a5eb0158313f Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 30 Sep 2021 09:15:20 -0600 Subject: [PATCH 84/99] heisenbridge: 1.2.0 -> 1.2.1 https://github.com/hifi/heisenbridge/releases/tag/v1.2.1 --- pkgs/servers/heisenbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 37b95cf8c942..f0f2009fad14 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "1.2.0"; + version = "1.2.1"; # Use the release tarball because it has the version set correctly using the # version.txt file. src = fetchurl { url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz"; - sha256 = "sha256-xSqtgUlB7/4QWsq5+8YhxxfQyufpuscIIROJnlnFZn0="; + sha256 = "sha256-w+8gsuPlnT1pl+jiZFBYcIAN4agIAcvwkmdysj3+RAQ="; }; propagatedBuildInputs = with python3Packages; [ From e3b85ac8bc72b12670804962305ec4b3985bf29e Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 30 Sep 2021 16:15:59 +0100 Subject: [PATCH 85/99] clj-kondo: 2021.03.31 -> 2021.09.25 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 5484652d384d..45348b562c1d 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2021.03.31"; + version = "2021.09.25"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-XSs0u758wEuaqZvFIevBrL61YNPUJ9Sc1DS+O9agj94="; + sha256 = "sha256-kS6bwsYH/cbjJlIeiDAy6QsAw+D1uHp26d4NBLfStjg="; }; dontUnpack = true; From e1f3bc6204d9317f21237fd765deac2d70a1f410 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Thu, 30 Sep 2021 16:42:53 +0100 Subject: [PATCH 86/99] mopidy-mpris: 3.0.2 -> 3.0.3 --- pkgs/applications/audio/mopidy/mpris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 6327ba020bf9..6bacfee627ca 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-mpris"; - version = "3.0.2"; + version = "3.0.3"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-MPRIS"; - sha256 = "0mmdaikw00f43gzjdbvlcvzff6yppm7v8mv012r79adzd992q9y0"; + sha256 = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; }; propagatedBuildInputs = [ From 62d2fc1ccae90859243351474a9e9e0614bc017d Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 30 Sep 2021 16:43:37 +0100 Subject: [PATCH 87/99] leiningen: 2.9.6 -> 2.9.7 --- .../tools/build-managers/leiningen/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 90b17ed9bba9..592564878e2e 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,16 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.6"; + version = "2.9.7"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0a8lq0yalar8szw155cxa8kywnk6yvakwi3xmxm1ahivn7i5hjq9"; + sha256 = "sha256-948g0ZMfAoJw53vA8MAKWg76Tst6VnYwSjSuT0aeKB0="; }; jarsrc = fetchurl { - # NOTE: This is actually a .jar, Github has issues - url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip"; - sha256 = "1f3hb57rqp9qkh5n2wf65dvxraf21y15s3g643f2fhzc7vvl7ia1"; + url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar"; + sha256 = "sha256-gvAUFKzs3bsOvW1XFQW7Zxpv0JMja82sJGjP5fLqqAI="; }; JARNAME = "${pname}-${version}-standalone.jar"; From c642999add458f1761e66aafeb19d8c504ab89c5 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 30 Sep 2021 15:43:54 +0000 Subject: [PATCH 88/99] expolitdb: 2021-09-29 -> 2021-09-30 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 6bdb52d68191..f83ebc928da6 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-29"; + version = "2021-09-30"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-7SV7qLREyOPCTn9CFjxmdfIJUb4VO82KsUQvVKPfEpA="; + sha256 = "sha256-chGmv6zeiYKNY8oA54FmVU7RGXd+uM6MHfUQXb6YfqE="; }; installPhase = '' From c4112ea936a3b681f3983079de84586b571c59b4 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Thu, 30 Sep 2021 16:45:50 +0100 Subject: [PATCH 89/99] mopidy-mpd: 3.0.0 -> 3.2.0 --- pkgs/applications/audio/mopidy/mpd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index d686d4928989..ab7e33ea3e37 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; - version = "3.0.0"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0prjli4352521igcsfcgmk97jmzgbfy4ik8hnli37wgvv252wiac"; + sha256 = "sha256-oZvKr61lyu7CmXP2A/xtYng1FIUPyveVJMqUuv6UnaM="; }; propagatedBuildInputs = [mopidy]; From 008e12644853b85e8e0741e5815aa4fcf3df3423 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Thu, 30 Sep 2021 16:46:22 +0100 Subject: [PATCH 90/99] mopidy-ytmusic: init at 0.3.2 --- pkgs/applications/audio/mopidy/default.nix | 2 ++ pkgs/applications/audio/mopidy/ytmusic.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/mopidy/ytmusic.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 0deecaec7ff6..971b226bc81d 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -37,5 +37,7 @@ lib.makeScope newScope (self: with self; { mopidy-youtube = callPackage ./youtube.nix { }; + mopidy-ytmusic = callPackage ./ytmusic.nix { }; + mopidy-subidy = callPackage ./subidy.nix { }; }) diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix new file mode 100644 index 000000000000..92b754147852 --- /dev/null +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -0,0 +1,26 @@ +{ lib, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-ytmusic"; + version = "0.3.2"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-YTMusic"; + sha256 = "sha256-BZtW+qHsTnOMj+jdAFI8ZMwGxJc9lNosgPJZGbt4JgU="; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.ytmusicapi + python3Packages.pytube + ]; + + doCheck = false; + + meta = with lib; { + description = "Mopidy extension for playing music from YouTube Music"; + license = licenses.asl20; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6cc3ddcb33c..7d56f8ea4c41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26091,7 +26091,8 @@ with pkgs; mopidy-spotify-tunigo mopidy-subidy mopidy-tunein - mopidy-youtube; + mopidy-youtube + mopidy-ytmusic; motif = callPackage ../development/libraries/motif { }; From 209b1e43471a853883ca3c862006894585baeb01 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Thu, 30 Sep 2021 17:52:42 +0200 Subject: [PATCH 91/99] gocryptfs: ensure fusermount setuid wrapper is used if present --- pkgs/tools/filesystems/gocryptfs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 8cb9d58bc4ea..2211d0e3103e 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -51,9 +51,11 @@ buildGoModule rec { popd ''; + # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, + # as the setuid wrapper is required to use gocryptfs as non-root on NixOS postInstall = '' wrapProgram $out/bin/gocryptfs \ - --prefix PATH : ${lib.makeBinPath [ fuse ]} + --suffix PATH : ${lib.makeBinPath [ fuse ]} ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs ''; From 589e03f109092a3ba97781fd0533110bf78a3f97 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Sep 2021 18:00:08 +0200 Subject: [PATCH 92/99] diffoscope: 183 -> 185 ChangeLog: https://diffoscope.org/news/diffoscope-184-released/ ChangeLog: https://diffoscope.org/news/diffoscope-185-released/ --- pkgs/tools/misc/diffoscope/default.nix | 9 +++++++-- pkgs/tools/misc/diffoscope/fix-tests.patch | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/misc/diffoscope/fix-tests.patch diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index bf5d4601475a..1733e1309b40 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,17 +9,22 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "183"; + version = "185"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-XFFrRmCpE2UvZRCELfPaotLklyjLiCDWkyFWkISOHZM="; + sha256 = "sha256-Spw7/+vQ1jd3rMZ792du04di0zleRNp8LUEki1374O8="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch + + # due to https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/953a599c2b903298b038b34abf515cea69f4fc19 + # the version detection of LLVM is broken and the comparison result is compared against + # the expected result from LLVM 10 (rather than 7 which is our default). + ./fix-tests.patch ]; postPatch = '' diff --git a/pkgs/tools/misc/diffoscope/fix-tests.patch b/pkgs/tools/misc/diffoscope/fix-tests.patch new file mode 100644 index 000000000000..b5566cb932f7 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/fix-tests.patch @@ -0,0 +1,14 @@ +diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py +index 8d201ab..05960aa 100644 +--- a/tests/comparators/test_rlib.py ++++ b/tests/comparators/test_rlib.py +@@ -81,9 +81,6 @@ def rlib_dis_expected_diff(): + if actual_ver >= "7.0": + diff_file = "rlib_llvm_dis_expected_diff_7" + +- if actual_ver >= "10.0": +- diff_file = "rlib_llvm_dis_expected_diff_10" +- + return get_data(diff_file) + + From f848a875360ccf9bd72467879b8370119c88d5dd Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Thu, 30 Sep 2021 18:06:43 +0200 Subject: [PATCH 93/99] tailscale: add support for Darwin Open source tailscale client is supported on Darwin and works just fine: https://github.com/tailscale/tailscale/wiki/Tailscaled-on-macOS --- pkgs/servers/tailscale/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 1a592494f154..67e18f104d74 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }: buildGoModule rec { pname = "tailscale"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-66akb1ru2JJe23Cr8q9mkMmmgqtezqh+Mc8aA+Rovb8="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; @@ -25,7 +25,7 @@ buildGoModule rec { ldflags = [ "-X tailscale.com/version.Long=${version}" "-X tailscale.com/version.Short=${version}" ]; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables ]} wrapProgram $out/bin/tailscale --suffix PATH : ${lib.makeBinPath [ procps ]} @@ -36,7 +36,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://tailscale.com"; description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; - platforms = platforms.linux; license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; From ad7eb5b4e60f2343142c52e272b112faa0feaa5e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 30 Sep 2021 09:21:13 -0300 Subject: [PATCH 94/99] higan: 110 -> 115+unstable=2021-08-18 --- .../emulators/higan/0001-change-flags.diff | 25 --- .../emulators/higan/001-include-cmath.patch | 8 + .../higan/002-sips-to-png2icns.patch | 24 +++ pkgs/misc/emulators/higan/default.nix | 203 ++++++++++-------- pkgs/top-level/all-packages.nix | 1 - 5 files changed, 144 insertions(+), 117 deletions(-) delete mode 100644 pkgs/misc/emulators/higan/0001-change-flags.diff create mode 100644 pkgs/misc/emulators/higan/001-include-cmath.patch create mode 100644 pkgs/misc/emulators/higan/002-sips-to-png2icns.patch diff --git a/pkgs/misc/emulators/higan/0001-change-flags.diff b/pkgs/misc/emulators/higan/0001-change-flags.diff deleted file mode 100644 index 745bba5d518d..000000000000 --- a/pkgs/misc/emulators/higan/0001-change-flags.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur higan-110-old/higan/GNUmakefile higan-110-new/higan/GNUmakefile ---- higan-110-old/higan/GNUmakefile 2020-04-15 11:06:00.279935557 -0300 -+++ higan-110-new/higan/GNUmakefile 2020-04-15 11:08:32.982417291 -0300 -@@ -11,7 +11,7 @@ - include $(nall.path)/GNUmakefile - - ifeq ($(platform),local) -- flags += -march=native -+ flags += - endif - - ifeq ($(platform),windows) -diff -Naur higan-110-old/nall/GNUmakefile higan-110-new/nall/GNUmakefile ---- higan-110-old/nall/GNUmakefile 2020-04-15 11:06:00.396935154 -0300 -+++ higan-110-new/nall/GNUmakefile 2020-04-15 11:10:37.738011488 -0300 -@@ -127,7 +127,8 @@ - - # linux settings - ifeq ($(platform),linux) -- options += -ldl -+ flags += $(CXXFLAGS) -+ options += $(LDFLAGS) -ldl - endif - - # bsd settings diff --git a/pkgs/misc/emulators/higan/001-include-cmath.patch b/pkgs/misc/emulators/higan/001-include-cmath.patch new file mode 100644 index 000000000000..67644e656aa7 --- /dev/null +++ b/pkgs/misc/emulators/higan/001-include-cmath.patch @@ -0,0 +1,8 @@ +diff -Naur source-old/higan/fc/ppu/ppu.cpp source-new/higan/fc/ppu/ppu.cpp +--- source-old/higan/fc/ppu/ppu.cpp 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/higan/fc/ppu/ppu.cpp 2021-09-29 22:23:19.107527772 -0300 +@@ -1,3 +1,4 @@ ++#include + #include + + namespace higan::Famicom { diff --git a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch b/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch new file mode 100644 index 000000000000..0585c8a38c72 --- /dev/null +++ b/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch @@ -0,0 +1,24 @@ +diff -Naur source-old/higan-ui/GNUmakefile source-new/higan-ui/GNUmakefile +--- source-old/higan-ui/GNUmakefile 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/higan-ui/GNUmakefile 2021-09-29 22:35:35.744721052 -0300 +@@ -61,7 +61,7 @@ + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + endif + + verbose: nall.verbose ruby.verbose hiro.verbose all; +diff -Naur source-old/icarus/GNUmakefile source-new/icarus/GNUmakefile +--- source-old/icarus/GNUmakefile 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/icarus/GNUmakefile 2021-09-29 22:35:53.639846113 -0300 +@@ -26,7 +26,7 @@ + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + endif + + verbose: hiro.verbose nall.verbose all; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 8e10b7bb3154..558cb53c3d5d 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,135 +1,156 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config -, libX11, libXv -, udev -, libGLU, libGL, SDL2 -, libao, openal, libpulseaudio +{ lib +, stdenv +, fetchFromGitHub +, SDL2 , alsa-lib -, gtk2, gtksourceview +, gtk3 +, gtksourceview3 +, libGL +, libGLU +, libX11 +, libXv +, libao +, libpulseaudio +, openal +, pkg-config , runtimeShell +, udev # Darwin dependencies -, libicns, Carbon, Cocoa, OpenGL, OpenAL}: +, libicns +, Carbon +, Cocoa +, OpenAL +, OpenGL +}: -let - inherit (lib) optionals; -in stdenv.mkDerivation rec { - pname = "higan"; - version = "110"; + version = "115+unstable=2021-08-18"; src = fetchFromGitHub { owner = "higan-emu"; repo = "higan"; - rev = "v${version}"; - sha256 = "11rvm53c3p2f6zk8xbyv2j51xp8zmqnch7zravhj3fk590qrjrr2"; + rev = "9bf1b3314b2bcc73cbc11d344b369c31562aff10"; + hash = "sha256-HZItJ97x20OjFKv2OVbMja7g+c1ZXcgcaC/XDe3vMZM="; }; - patches = [ ./0001-change-flags.diff ]; - postPatch = '' - sed '1i#include ' -i higan/fc/ppu/ppu.cpp + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + libicns + ]; - for file in icarus/GNUmakefile higan/target-higan/GNUmakefile; do - substituteInPlace "$file" \ - --replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \ - 'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png' - done - ''; + buildInputs = [ + SDL2 + libao + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + gtk3 + gtksourceview3 + libGL + libGLU + libX11 + libXv + libpulseaudio + openal + udev + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + OpenAL + OpenGL + ]; - nativeBuildInputs = [ pkg-config ] - ++ optionals stdenv.isDarwin [ libicns ]; + patches = [ + # Includes cmath header + ./001-include-cmath.patch + # Uses png2icns instead of sips + ./002-sips-to-png2icns.patch + ]; - buildInputs = [ SDL2 libao ] - ++ optionals stdenv.isLinux [ alsa-lib udev libpulseaudio openal - gtk2 gtksourceview libX11 libXv - libGLU libGL ] - ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]; + dontConfigure = true; + + enableParallelBuilding = true; buildPhase = '' - make compiler=c++ -C higan openmp=true target=higan - make compiler=c++ -C genius openmp=true - make compiler=c++ -C icarus openmp=true + runHook preBuild + + make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \ + platform=linux openmp=true hiro=gtk3 build=accuracy local=false \ + cores="cv fc gb gba md ms msx ngp pce sfc sg ws" -C higan-ui + make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \ + platform=linux openmp=true hiro=gtk3 -C icarus + + runHook postBuild ''; - installPhase = (if stdenv.isDarwin then '' - mkdir "$out" - mv higan/out/higan.app "$out"/ - mv icarus/out/icarus.app "$out"/ - mv genius/out/genius.app "$out"/ + installPhase = '' + runHook preInstall + + '' + (if stdenv.isDarwin then '' + mkdir ${placeholder "out"} + mv higan/out/higan.app ${placeholder "out"}/ + mv icarus/out/icarus.app ${placeholder "out"}/ '' else '' - install -dm 755 "$out"/bin "$out"/share/applications "$out"/share/pixmaps + install -d ${placeholder "out"}/bin + install higan-ui/out/higan -t ${placeholder "out"}/bin/ + install icarus/out/icarus -t ${placeholder "out"}/bin/ - install -m 755 higan/out/higan -t "$out"/bin/ - install -m 644 higan/target-higan/resource/higan.desktop \ - -t $out/share/applications/ - install -m 644 higan/target-higan/resource/higan.svg \ - $out/share/pixmaps/higan-icon.svg - install -m 644 higan/target-higan/resource/higan.png \ - $out/share/pixmaps/higan-icon.png + install -d ${placeholder "out"}/share/applications + install higan-ui/resource/higan.desktop -t ${placeholder "out"}/share/applications/ + install icarus/resource/icarus.desktop -t ${placeholder "out"}/share/applications/ - install -m 755 icarus/out/icarus -t "$out"/bin/ - install -m 644 icarus/data/icarus.desktop -t $out/share/applications/ - install -m 644 icarus/data/icarus.svg $out/share/pixmaps/icarus-icon.svg - install -m 644 icarus/data/icarus.png $out/share/pixmaps/icarus-icon.png - - install -m 755 genius/out/genius -t "$out"/bin/ - install -m 644 genius/data/genius.desktop -t $out/share/applications/ - install -m 644 genius/data/genius.svg $out/share/pixmaps/genius-icon.svg - install -m 644 genius/data/genius.png $out/share/pixmaps/genius-icon.png + install -d ${placeholder "out"}/share/pixmaps + install higan/higan/resource/higan.svg ${placeholder "out"}/share/pixmaps/higan-icon.svg + install higan/higan/resource/logo.png ${placeholder "out"}/share/pixmaps/higan-icon.png + install icarus/resource/icarus.svg ${placeholder "out"}/share/pixmaps/icarus-icon.svg + install icarus/resource/icarus.png ${placeholder "out"}/share/pixmaps/icarus-icon.png '') + '' - mkdir -p "$out"/share/higan "$out"/share/icarus - cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/System/ "$out"/share/higan/ - cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - icarus/Database icarus/Firmware $out/share/icarus/ - ''; + install -d ${placeholder "out"}/share/higan + cp -rd extras/ higan/System/ ${placeholder "out"}/share/higan/ - fixupPhase = let - dest = if stdenv.isDarwin - then "\\$HOME/Library/Application Support/higan" - else "\\$HOME/higan"; - in '' + install -d ${placeholder "out"}/share/icarus + cp -rd icarus/Database icarus/Firmware ${placeholder "out"}/share/icarus/ + '' + ( # A dirty workaround, suggested by @cpages: # we create a first-run script to populate # $HOME with all the stuff needed at runtime - - mkdir -p "$out"/bin - cat < $out/bin/higan-init.sh + let + dest = if stdenv.isDarwin + then "\\$HOME/Library/Application Support/higan" + else "\\$HOME/higan"; + in '' + mkdir -p ${placeholder "out"}/bin + cat < ${placeholder "out"}/bin/higan-init.sh #!${runtimeShell} - cp --recursive --update $out/share/higan/System/ "${dest}"/ + cp --recursive --update ${placeholder "out"}/share/higan/System/ "${dest}"/ EOF - chmod +x $out/bin/higan-init.sh + chmod +x ${placeholder "out"}/bin/higan-init.sh + '') + '' + + runHook postInstall ''; meta = with lib; { + homepage = "https://github.com/higan-emu/higan"; description = "An open-source, cycle-accurate multi-system emulator"; longDescription = '' - higan is a multi-system game console emulator. The purpose of higan is to - serve as hardware documentation in source code form: it is meant to be as - accurate and complete as possible, with code that is easy to read and - understand. + higan is a multi-system emulator, originally developed by Near, with an + uncompromising focus on accuracy and code readability. - It currently supports the following systems: - - Famicom + Famicom Disk System - - Super Famicom + Super Game Boy - - Game Boy + Game Boy Color - - Game Boy Advance + Game Boy Player - - SG-1000 + SC-3000 - - Master System + Game Gear - - Mega Drive + Mega CD - - PC Engine + SuperGrafx - - MSX + MSX2 - - ColecoVision - - Neo Geo Pocket + Neo Geo Pocket Color - - WonderSwan + WonderSwan Color + SwanCrystal + Pocket Challenge V2 + It currently emulates the following systems: Famicom, Famicom Disk System, + Super Famicom, Super Game Boy, Game Boy, Game Boy Color, Game Boy Advance, + Game Boy Player, SG-1000, SC-3000, Master System, Game Gear, Mega Drive, + Mega CD, PC Engine, SuperGrafx, MSX, MSX2, ColecoVision, Neo Geo Pocket, + Neo Geo Pocket Color, WonderSwan, WonderSwan Color, SwanCrystal, Pocket + Challenge V2. ''; - homepage = "https://byuu.org/higan/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } -# TODO: Qt and GTK3+ support +# TODO: select between Qt, GTK2 and GTK3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f91cf812e3c..5bd4305a4fbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32571,7 +32571,6 @@ with pkgs; }; higan = callPackage ../misc/emulators/higan { - inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; From 4725dfecf6e987d32d5035e93abb2299653bb72d Mon Sep 17 00:00:00 2001 From: Jon Roberts Date: Wed, 29 Sep 2021 22:57:05 -0500 Subject: [PATCH 95/99] google-java-format: fix for jdk 16 JDK 16 requires some extra flags to actually format code: https://github.com/google/google-java-format#jdk-16 --- .../tools/google-java-format/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index 626a3b5271d0..0d939760760c 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -17,11 +17,17 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/{bin,share/google-java-format} - install -D ${src} $out/share/google-java-format/google-java-format.jar + mkdir -p $out/{bin,share/${pname}} + install -D ${src} $out/share/${pname}/google-java-format-${version}-all-deps.jar - makeWrapper ${jre}/bin/java $out/bin/google-java-format \ - --add-flags "-jar $out/share/google-java-format/google-java-format.jar" + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --argv0 ${pname} \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" \ + --add-flags "-jar $out/share/${pname}/google-java-format-${version}-all-deps.jar" runHook postInstall ''; From e3066b5e9f649082456211782075b5044a68d30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 30 Sep 2021 20:36:40 +0200 Subject: [PATCH 96/99] vmTools: fixup after adding the `img` package --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde403f4af89..05a5e2797357 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -707,7 +707,8 @@ with pkgs; inherit (darwin) signingUtils; }; - vmTools = callPackage ../build-support/vm { }; + # No callPackage. In particular, we don't want `img` *package* in parameters. + vmTools = makeOverridable (import ../build-support/vm) { inherit pkgs lib; }; releaseTools = callPackage ../build-support/release { }; From 073cc84c9b87157d2df46dbc3deaaddb6fe77e42 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Sep 2021 09:43:48 -0600 Subject: [PATCH 97/99] ocamlformat-rpc-lib: init at 0.19.0 Signed-off-by: Rudi Grinberg --- .../ocamlformat-rpc-lib/default.nix | 23 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix diff --git a/pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix b/pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix new file mode 100644 index 000000000000..9a1d26f21f0c --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildDunePackage, csexp, sexplib0 }: + +buildDunePackage rec { + pname = "ocamlformat-rpc-lib"; + version = "0.19.0"; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; + sha256 = "sha256-YvxGqujwpKM85/jXcm1xCb/2Fepvy1DRSC8h0g7lD0Y="; + }; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + propagatedBuildInputs = [ csexp sexplib0 ]; + + meta = with lib; { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code (RPC mode)"; + license = licenses.mit; + maintainers = with maintainers; [ Zimmi48 marsam ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1afd58ad6f8a..3d67ef92f5a2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -847,6 +847,8 @@ let frontc = callPackage ../development/ocaml-modules/frontc { }; + ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat-rpc-lib { }; + ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; ocaml-freestanding = callPackage ../development/ocaml-modules/ocaml-freestanding { }; From f1132b0ff1e3b7f4fc3a8dfece06607854c7fbaa Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Sep 2021 09:44:25 -0600 Subject: [PATCH 98/99] ocaml-lsp: 1.7.0 -> 1.8.3 Signed-off-by: Rudi Grinberg --- pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 4 ++-- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index a6867aac63ad..004b7854107e 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -12,8 +12,8 @@ let params = if lib.versionAtLeast ocaml.version "4.12" then { - version = "1.7.0"; - sha256 = "1va2zj41znsr94bdw485vak96zrcvqwcrqf1sy8zipb6hdhbchya"; + version = "1.8.3"; + sha256 = "sha256-WO9ap78XZxJCi04LEBX+r21nfL2UdPiCLRMrJSI7FOk="; } else { version = "1.4.1"; sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 869e9f633540..cd01116b8209 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -13,6 +13,7 @@ , pp , csexp , cmdliner +, ocamlformat-rpc-lib }: buildDunePackage rec { @@ -35,7 +36,7 @@ buildDunePackage rec { buildInputs = if lib.versionAtLeast version "1.7.0" then - [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ] + [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ cppo ppx_yojson_conv_lib From 48eba3e35c10d11b709af420f96a346022a6fc55 Mon Sep 17 00:00:00 2001 From: Delta Date: Mon, 27 Sep 2021 23:38:43 +0200 Subject: [PATCH 99/99] ocamlPackages.lustre-v6: init at 6.103.3 --- lib/licenses.nix | 5 +++ maintainers/maintainer-list.nix | 4 +++ .../ocaml-modules/lustre-v6/default.nix | 28 +++++++++++++++++ .../ocaml-modules/lutils/default.nix | 25 +++++++++++++++ .../ocaml-modules/rdbg/default.nix | 31 +++++++++++++++++++ pkgs/tools/misc/ledit/default.nix | 29 +++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ pkgs/top-level/ocaml-packages.nix | 6 ++++ 8 files changed, 132 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lustre-v6/default.nix create mode 100644 pkgs/development/ocaml-modules/lutils/default.nix create mode 100644 pkgs/development/ocaml-modules/rdbg/default.nix create mode 100644 pkgs/tools/misc/ledit/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 772985f9509d..bde2aaca2ee5 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -240,6 +240,11 @@ in mkLicense lset) ({ fullName = "CeCILL Free Software License Agreement v2.0"; }; + cecill21 = { + spdxId = "CECILL-2.1"; + fullName = "CeCILL Free Software License Agreement v2.1"; + }; + cecill-b = { spdxId = "CECILL-B"; fullName = "CeCILL-B Free Software License Agreement"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 13c23576dae6..0326ca7a9824 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2599,6 +2599,10 @@ githubId = 202798; name = "Pierre Bourdon"; }; + delta = { + email = "d4delta@outlook.fr"; + name = "Delta"; + }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix new file mode 100644 index 000000000000..34feaf85c3f3 --- /dev/null +++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl, ocaml_extlib, lutils, rdbg }: + +buildDunePackage rec { + pname = "lustre-v6"; + version = "6.103.3"; + + useDune2 = true; + + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.6.103.3.tgz"; + sha512 = "8d452184ee68edda1b5a50717e6a5b13fb21f9204634fc5898280e27a1d79c97a6e7cc04424fc22f34cdd02ed3cc8774dca4f982faf342980b5f9fe0dc1a017d"; + }; + + propagatedBuildInputs = [ + ocaml_extlib + lutils + rdbg + ]; + + meta = with lib; { + homepage = "http://www-verimag.imag.fr/lustre-v6.html"; + description = "Lustre V6 compiler"; + license = lib.licenses.cecill21; + maintainers = [ lib.maintainers.delta ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix new file mode 100644 index 000000000000..492a987dc9cc --- /dev/null +++ b/pkgs/development/ocaml-modules/lutils/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchurl, num }: + +buildDunePackage rec { + pname = "lutils"; + version = "1.51.2"; + + useDune2 = true; + + minimalOCamlVersion = "4.02"; + + src = fetchurl { + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.1.51.2.tgz"; + sha512 = "f94696be379c62e888410ec3d940c888ca4b607cf59c2e364e93a2a694da65ebe6d531107198b795e80eecc3c6865eedb02659c7e7c4e15c9b28d74aa35d09f8"; + }; + + propagatedBuildInputs = [ + num + ]; + + meta = with lib; { + homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"; + description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)"; + license = lib.licenses.cecill21; + }; +} diff --git a/pkgs/development/ocaml-modules/rdbg/default.nix b/pkgs/development/ocaml-modules/rdbg/default.nix new file mode 100644 index 000000000000..9b33678590d5 --- /dev/null +++ b/pkgs/development/ocaml-modules/rdbg/default.nix @@ -0,0 +1,31 @@ +{ lib, buildDunePackage, fetchurl, num, lutils, ounit}: + +buildDunePackage rec { + pname = "rdbg"; + version = "1.196.12"; + + useDune2 = true; + + minimalOCamlVersion = "4.07"; + + src = fetchurl { + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.1.196.12.tgz"; + sha512 = "8e88034b1eda8f1233b4990adc9746782148254c93d8d0c99c246c0d50f306eeb6aa4afcfca8834acb3e268860647f47a24cc6a2d29fb45cac11f098e2ede275"; + }; + + buildInputs = [ + num + ounit + ]; + + propagatedBuildInputs = [ + lutils + ]; + + meta = with lib; { + homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/rdbg"; + description = "A programmable debugger that targets reactive programs for which a rdbg-plugin exists. Currently two plugins exist : one for Lustre, and one for Lutin (nb: both are synchronous programming languages)"; + license = lib.licenses.cecill21; + maintainers = [ lib.maintainers.delta ]; + }; +} diff --git a/pkgs/tools/misc/ledit/default.nix b/pkgs/tools/misc/ledit/default.nix new file mode 100644 index 000000000000..18efb8c95285 --- /dev/null +++ b/pkgs/tools/misc/ledit/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchzip, ocaml, camlp5}: + +stdenv.mkDerivation { + pname = "ledit"; + version = "2.04"; + + src = fetchzip { + url = "http://pauillac.inria.fr/~ddr/ledit/distrib/src/ledit-2.04.tgz"; + sha512 = "16vlv6rcsddwrvsqqiwxdfv5rxvblhrx0k84g7pjibi0an241yx8aqf8cj4f4sgl5xfs3frqrdf12zqwjf2h4jvk8jyhyar8n0nj3g0"; + }; + + preBuild = '' + mkdir -p $out/bin + substituteInPlace Makefile --replace /bin/rm rm --replace BINDIR=/usr/local/bin BINDIR=$out/bin + ''; + + buildInputs = [ + ocaml + camlp5 + ]; + + meta = with lib; { + homepage = "http://pauillac.inria.fr/~ddr/ledit/"; + description = "A line editor, allowing to use shell commands with control characters like in emacs"; + license = licenses.bsd3; + maintainers = [ maintainers.delta ]; + broken = lib.versionOlder ocaml.version "4.03"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 819108f9efc8..7fbbf150eee8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6919,6 +6919,10 @@ with pkgs; leatherman = callPackage ../development/libraries/leatherman { }; + ledit = callPackage ../tools/misc/ledit { + inherit (ocamlPackages) camlp5; + }; + ledmon = callPackage ../tools/system/ledmon { }; leela = callPackage ../tools/graphics/leela { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3d67ef92f5a2..c9ab3fc2ab85 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -627,6 +627,10 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; + lustre-v6 = callPackage ../development/ocaml-modules/lustre-v6 { }; + + lutils = callPackage ../development/ocaml-modules/lutils { }; + luv = callPackage ../development/ocaml-modules/luv { inherit (pkgs) file; }; @@ -1182,6 +1186,8 @@ let randomconv = callPackage ../development/ocaml-modules/randomconv { }; + rdbg = callPackage ../development/ocaml-modules/rdbg { }; + re = callPackage ../development/ocaml-modules/re { }; react = callPackage ../development/ocaml-modules/react { };