From 3daa5df0d9ec7eccede4a82c8c60bf76a931241a Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 13 Dec 2021 00:17:01 +0100 Subject: [PATCH 001/111] nordzy-icon-theme: init at unstable-2021-12-14 nordzy-icon-theme: init at 5c247a4f19cf9849615631d1bf77727b945b634e nordzy-icon-theme: etc Fixed adding multiple themes nordzy-icon-theme: init at unstable-2021-12-14 --- pkgs/data/icons/nordzy-icon-theme/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/data/icons/nordzy-icon-theme/default.nix diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix new file mode 100644 index 000000000000..97575eedb1d9 --- /dev/null +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, fetchFromGitHub +, lib +, bash +, gtk3 +, nordzy-themes ? [ "all" ] # Override this to only install selected themes +}: + +let + themes-arg-string = lib.strings.concatMapStrings (theme: "-t ${theme} ") nordzy-themes; +in +stdenv.mkDerivation rec { + pname = "nordzy-icon-theme"; + version = "unstable-2021-12-14"; + + src = fetchFromGitHub { + owner = "alvatip"; + repo = "Nordzy-icon"; + rev = "5c247a4f19cf9849615631d1bf77727b945b634e"; + sha256 = "Jqn5CF80xlYJ7H4qI1VEj91vcKPPoMXP5+sPs0ksiC4="; + }; + + nativeBuildInputs = [ gtk3 ]; + + postPatch = '' + substituteInPlace install.sh \ + --replace /bin/bash ${bash}/bin/bash + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + ./install.sh --dest $out/share/icons \ + -n Nordzy \ + -t ${themes-arg-string} + + runHook postInstall + ''; + + dontFixup = true; + + meta = with lib; { + description = "A free and open source icon theme using the Nord color palette and based on WhiteSur and Numix Icon Theme"; + homepage = "https://github.com/alvatip/Nordzy-icon"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ + alexnortung + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65508b727f21..7e2624734571 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23546,6 +23546,8 @@ with pkgs; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; + nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { }; + inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; From 35b60b25aa588fe30e236a44cfeacb5a5a69c1a9 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Tue, 14 Dec 2021 21:38:37 +0100 Subject: [PATCH 002/111] nordzy-icon-theme: etc Updated platforms to only limux x86_64 --- pkgs/data/icons/nordzy-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 97575eedb1d9..2c8813ce5df3 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "A free and open source icon theme using the Nord color palette and based on WhiteSur and Numix Icon Theme"; homepage = "https://github.com/alvatip/Nordzy-icon"; license = licenses.gpl3; - platforms = platforms.all; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ alexnortung ]; From b5e918b5d2fe126836e665f03077e300ad42d1b0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 Dec 2021 21:27:52 -0500 Subject: [PATCH 003/111] pythonPackages.python-keycloak: init at 0.26.1 --- .../python-keycloak/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/python-keycloak/default.nix diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix new file mode 100644 index 000000000000..8e436b4eb7e5 --- /dev/null +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, python-jose +, httmock +}: + +buildPythonPackage rec { + pname = "python-keycloak"; + version = "0.26.1"; + + src = fetchFromGitHub { + owner = "marcospereirampj"; + repo = "python-keycloak"; + rev = version; + sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo="; + }; + + propagatedBuildInputs = [ + requests + python-jose + ]; + + checkInputs = [ + httmock + ]; + + checkPhase = '' + python -m unittest discover + ''; + + pythonImportsCheck = [ "keycloak" ]; + + meta = with lib; { + description = "Provides access to the Keycloak API"; + homepage = "https://github.com/marcospereirampj/python-keycloak"; + license = licenses.mit; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d4fa594870f..ef1917e10259 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5977,6 +5977,8 @@ in { python-kasa = callPackage ../development/python-modules/python-kasa { }; + python-keycloak = callPackage ../development/python-modules/python-keycloak { }; + python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { }; python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; From 236074ea759894518beda3eb0ef91070bdfdf0e9 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sat, 25 Dec 2021 10:55:34 +0100 Subject: [PATCH 004/111] nordzy-icon-theme: etc set platforms to all, and added nordzy-theme-name argument --- pkgs/data/icons/nordzy-icon-theme/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 2c8813ce5df3..5c06b5c8767b 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -3,6 +3,7 @@ , lib , bash , gtk3 +, nordzy-theme-name ? "Nordzy" , nordzy-themes ? [ "all" ] # Override this to only install selected themes }: @@ -23,8 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; postPatch = '' - substituteInPlace install.sh \ - --replace /bin/bash ${bash}/bin/bash + patchShebangs install.sh ''; installPhase = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons ./install.sh --dest $out/share/icons \ - -n Nordzy \ + -n ${nordzy-theme-name} \ -t ${themes-arg-string} runHook postInstall @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "A free and open source icon theme using the Nord color palette and based on WhiteSur and Numix Icon Theme"; homepage = "https://github.com/alvatip/Nordzy-icon"; license = licenses.gpl3; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; maintainers = with maintainers; [ alexnortung ]; From 9d6b9ddac5cebd17a99c397389c4f836c1d175dd Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sat, 25 Dec 2021 11:26:04 +0100 Subject: [PATCH 005/111] nordzy-icon-theme: etc Using stdvenvNoCC. Patching away the call to gtk-update-icon-cache, thus there is no longer any need for gtk3. --- pkgs/data/icons/nordzy-icon-theme/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 5c06b5c8767b..13c8d154f88f 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenvNoCC , fetchFromGitHub , lib , bash @@ -10,7 +10,7 @@ let themes-arg-string = lib.strings.concatMapStrings (theme: "-t ${theme} ") nordzy-themes; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "nordzy-icon-theme"; version = "unstable-2021-12-14"; @@ -21,10 +21,12 @@ stdenv.mkDerivation rec { sha256 = "Jqn5CF80xlYJ7H4qI1VEj91vcKPPoMXP5+sPs0ksiC4="; }; - nativeBuildInputs = [ gtk3 ]; - + # In the post patch phase we should fir st make sure to patch shebangs. + # We can also remove the gtk-update-icon-cache since the cache will later be built by the system. postPatch = '' patchShebangs install.sh + substituteInPlace install.sh \ + --replace "gtk-update-icon-cache" "#" ''; installPhase = '' @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons ./install.sh --dest $out/share/icons \ -n ${nordzy-theme-name} \ - -t ${themes-arg-string} + ${themes-arg-string} runHook postInstall ''; From e0bc5ad7d9391e136e86e5a9f57991f6cfd934c4 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Tue, 28 Dec 2021 08:59:42 +0100 Subject: [PATCH 006/111] nordzy-icon-theme: etc Removed unnecessary input. Set platforms to linux only. Using gtk3 again and making sure the cache is not removed. --- pkgs/data/icons/nordzy-icon-theme/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 13c8d154f88f..cf87bb01cc11 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenvNoCC , fetchFromGitHub , lib -, bash , gtk3 , nordzy-theme-name ? "Nordzy" , nordzy-themes ? [ "all" ] # Override this to only install selected themes @@ -21,14 +20,17 @@ stdenvNoCC.mkDerivation { sha256 = "Jqn5CF80xlYJ7H4qI1VEj91vcKPPoMXP5+sPs0ksiC4="; }; - # In the post patch phase we should fir st make sure to patch shebangs. - # We can also remove the gtk-update-icon-cache since the cache will later be built by the system. + # In the post patch phase we should first make sure to patch shebangs. postPatch = '' patchShebangs install.sh - substituteInPlace install.sh \ - --replace "gtk-update-icon-cache" "#" ''; + nativeBuildInputs = [ + gtk3 + ]; + + dontDropIconThemeCache = true; + installPhase = '' runHook preInstall @@ -46,7 +48,7 @@ stdenvNoCC.mkDerivation { description = "A free and open source icon theme using the Nord color palette and based on WhiteSur and Numix Icon Theme"; homepage = "https://github.com/alvatip/Nordzy-icon"; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ alexnortung ]; From a94e7b51e49d748872524e21fbb79b4d1401a52f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Jan 2022 08:55:40 +0000 Subject: [PATCH 007/111] python38Packages.holidays: 0.11.3.1 -> 0.12 --- 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 10d333301641..ecefce19aede 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.11.3.1"; + version = "0.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SFWv4Ov0KO+8+EhHeCi4ifhRW+f08VriZoKRk2nZJ3Q="; + sha256 = "d99f2b6ddc5bfab7b7f8bbed457a82104f8980122a04b982bfc0e4f8820a1d46"; }; propagatedBuildInputs = [ From 5d70684de97030ee565ddd902e4b1659861f5ca3 Mon Sep 17 00:00:00 2001 From: jmc-figueira Date: Mon, 3 Jan 2022 04:07:18 +0000 Subject: [PATCH 008/111] maintainers: add jmc-figueira --- maintainers/maintainer-list.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 48d8973e9224..c48e694f4cc6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5665,6 +5665,26 @@ githubId = 8900; name = "Johan Magnus Jonsson"; }; + jmc-figueira = { + email = "business+nixos@jmc-figueira.dev"; + github = "jmc-figueira"; + githubId = 6634716; + name = "João Figueira"; + keys = [ + + # GitHub signing key + { + longkeyid = "rsa4096/0xDC7AE56AE98E02D7"; + fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; + } + + # Email encryption + { + longkeyid = "ed25519/0x197F9A632D139E30"; + fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; + } + ]; + }; jmettes = { email = "jonathan@jmettes.com"; github = "jmettes"; From abdbf22a30cf51bc2bc4d2ed3e8de96acae672db Mon Sep 17 00:00:00 2001 From: jmc-figueira Date: Mon, 3 Jan 2022 04:10:16 +0000 Subject: [PATCH 009/111] wine-wayland: added derivation for building the experimental Wayland driver for Wine --- nixos/tests/wine.nix | 2 +- pkgs/misc/emulators/wine/default.nix | 11 +++++++++-- pkgs/misc/emulators/wine/sources.nix | 15 +++++++++++++++ pkgs/misc/emulators/wine/wayland.nix | 21 +++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 +++++- pkgs/top-level/wine-packages.nix | 3 +++ 7 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 pkgs/misc/emulators/wine/wayland.nix diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index c46c7d338b2e..18ad759b5515 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -35,7 +35,7 @@ let }; }; - variants = [ "base" "full" "minimal" "staging" "unstable" ]; + variants = [ "base" "full" "minimal" "staging" "unstable" "wayland" ]; in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 023d013740dd..5884d36dc8c4 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,7 +1,7 @@ ## Configuration: # Control you default wine config in nixpkgs-config: # wine = { -# release = "stable"; # "stable", "unstable", "staging" +# release = "stable"; # "stable", "unstable", "staging", "wayland" # build = "wineWow"; # "wine32", "wine64", "wineWow" # }; # Make additional configurations on demand: @@ -67,4 +67,11 @@ in if wineRelease == "staging" then wineUnstable = wine-build wineBuild "unstable"; } else - wine-build wineBuild wineRelease + (if wineRelease == "wayland" then + callPackage ./wayland.nix { + wineWayland = wine-build wineBuild "wayland"; + inherit vulkanSupport vkd3dSupport; + } + else + wine-build wineBuild wineRelease + ) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 41b019461a81..93d617a78964 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -10,6 +10,8 @@ let fetchurl = args@{url, sha256, ...}: pkgs.fetchurl { inherit url sha256; } // args; fetchFromGitHub = args@{owner, repo, rev, sha256, ...}: pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args; + fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}: + pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args; in rec { stable = fetchurl rec { @@ -73,6 +75,19 @@ in rec { disabledPatchsets = [ ]; }; + wayland = fetchFromGitLab rec { + version = "7.0-rc2"; + sha256 = "sha256-FU9L8cyIIfFQ+8f/AUg7IT+RxTpyNTuSfL0zBnur0SA="; + domain = "gitlab.collabora.com"; + owner = "alf"; + repo = "wine"; + rev = "95f0154c96a4b7d81e783ee5ba2f5d9cc7cda351"; + + inherit (unstable) gecko32 gecko64; + + inherit (unstable) mono; + }; + winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases version = "20210825"; diff --git a/pkgs/misc/emulators/wine/wayland.nix b/pkgs/misc/emulators/wine/wayland.nix new file mode 100644 index 000000000000..4dd4c9bd3b18 --- /dev/null +++ b/pkgs/misc/emulators/wine/wayland.nix @@ -0,0 +1,21 @@ +{ lib, callPackage, wineWayland, vulkanSupport, vkd3dSupport }: + +with callPackage ./util.nix {}; + +(lib.overrideDerivation wineWayland (self: { + buildInputs = (toBuildInputs wineWayland.pkgArches (pkgs: [ pkgs.wayland pkgs.libxkbcommon pkgs.wayland-protocols pkgs.wayland.dev pkgs.libxkbcommon.dev ])) ++ (lib.subtractLists (toBuildInputs wineWayland.pkgArches (pkgs: [ pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXcursor pkgs.xorg.libXrandr pkgs.xorg.libXrender pkgs.xorg.libXxf86vm pkgs.xorg.libXcomposite pkgs.xorg.libXext ])) self.buildInputs); + + name = "${self.name}-wayland"; + + configureFlags = self.configureFlags + ++ [ "--with-wayland" ] + ++ lib.optionals vulkanSupport [ "--with-vulkan" ] + ++ lib.optionals vkd3dSupport [ "--with-vkd3d" ]; + +})) // { + meta = wineWayland.meta // { + description = "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)"; + platforms = (lib.remove "x86_64-darwin" wineWayland.meta.platforms); + maintainers = wineWayland.meta.maintainers ++ [ lib.maintainers.jmc-figueira ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a3edb07ffbbb..44da808136ff 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1036,6 +1036,7 @@ mapAliases ({ weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11 wineStaging = wine-staging; # added 2018-01-08 + wineWayland = wine-wayland; winusb = woeusb; # added 2017-12-22 winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 568322e003f5..25224bc03271 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33652,7 +33652,7 @@ with pkgs; inherit wineBuild; inherit (callPackage ./wine-packages.nix {}) - minimal base full stable stableFull unstable unstableFull staging stagingFull fonts; + minimal base full stable stableFull unstable unstableFull staging stagingFull wayland waylandFull fonts; }); winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); @@ -33666,6 +33666,10 @@ with pkgs; wineRelease = "staging"; }); + wine-wayland = lowPrio (winePackages.full.override { + wineRelease = "wayland"; + }); + winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index fff2d73110c3..5dbfd2d54136 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -58,4 +58,7 @@ rec { staging = base.override { wineRelease = "staging"; }; stagingFull = full.override { wineRelease = "staging"; }; + + wayland = base.override { wineRelease = "wayland"; }; + waylandFull = full.override { wineRelease = "wayland"; }; } From 052832e9be1de6e23805301f8e7300c45baa51db Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 13 Jan 2022 17:09:04 -0500 Subject: [PATCH 010/111] theLoungePlugins: recurseIntoAttrs --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c6b077248a0..adddfb17225b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10167,9 +10167,9 @@ with pkgs; getPackagesWithPrefix = prefix: mapAttrs' (name: pkg: nameValuePair (removePrefix ("thelounge-" + prefix + "-") name) pkg) (filterAttrs (name: _: hasPrefix ("thelounge-" + prefix + "-") name) pkgs); in - { - plugins = getPackagesWithPrefix "plugin"; - themes = getPackagesWithPrefix "theme"; + recurseIntoAttrs { + plugins = recurseIntoAttrs (getPackagesWithPrefix "plugin"); + themes = recurseIntoAttrs (getPackagesWithPrefix "theme"); }; thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; From c4367451b3d62b6abd78cdfc676df7bf5111b0da Mon Sep 17 00:00:00 2001 From: jmc-figueira Date: Thu, 13 Jan 2022 22:59:25 +0000 Subject: [PATCH 011/111] wine-wayland: fixed wineWow builds with wayland support --- pkgs/misc/emulators/wine/builder-wow.sh | 5 ++-- pkgs/misc/emulators/wine/default.nix | 6 ++++- pkgs/misc/emulators/wine/wayland.nix | 33 ++++++++++++++++--------- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index c006db3116b5..0dd3194dc536 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -1,6 +1,7 @@ ## build described at http://wiki.winehq.org/Wine64 source $stdenv/setup +preFlags="${configureFlags}" unpackPhase cd $TMP/$sourceRoot @@ -11,14 +12,14 @@ mkdir -p $TMP/wine-wow $TMP/wine64 cd $TMP/wine64 sourceRoot=`pwd` -configureFlags="--enable-win64" +configureFlags="${preFlags} --enable-win64" configurePhase buildPhase # checkPhase cd $TMP/wine-wow sourceRoot=`pwd` -configureFlags="--with-wine64=../wine64" +configureFlags="${preFlags} --with-wine64=../wine64" configurePhase buildPhase # checkPhase diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 5884d36dc8c4..32e860d4d080 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,6 +7,8 @@ # Make additional configurations on demand: # wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; { lib, stdenv, callPackage, + pkgs, + pkgsi686Linux, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", pngSupport ? false, @@ -70,7 +72,9 @@ else (if wineRelease == "wayland" then callPackage ./wayland.nix { wineWayland = wine-build wineBuild "wayland"; - inherit vulkanSupport vkd3dSupport; + inherit pulseaudioSupport vulkanSupport vkd3dSupport; + + pkgArches = lib.optionals (wineBuild == "wine32" || wineBuild == "wineWow") [ pkgsi686Linux ] ++ lib.optionals (wineBuild == "wine64" || wineBuild == "wineWow") [ pkgs ]; } else wine-build wineBuild wineRelease diff --git a/pkgs/misc/emulators/wine/wayland.nix b/pkgs/misc/emulators/wine/wayland.nix index 4dd4c9bd3b18..cf8ed2758d06 100644 --- a/pkgs/misc/emulators/wine/wayland.nix +++ b/pkgs/misc/emulators/wine/wayland.nix @@ -1,21 +1,30 @@ -{ lib, callPackage, wineWayland, vulkanSupport, vkd3dSupport }: +{ stdenv, lib, callPackage, wineWayland, pkgArches, pulseaudioSupport, vulkanSupport, vkd3dSupport }: with callPackage ./util.nix {}; -(lib.overrideDerivation wineWayland (self: { - buildInputs = (toBuildInputs wineWayland.pkgArches (pkgs: [ pkgs.wayland pkgs.libxkbcommon pkgs.wayland-protocols pkgs.wayland.dev pkgs.libxkbcommon.dev ])) ++ (lib.subtractLists (toBuildInputs wineWayland.pkgArches (pkgs: [ pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXcursor pkgs.xorg.libXrandr pkgs.xorg.libXrender pkgs.xorg.libXxf86vm pkgs.xorg.libXcomposite pkgs.xorg.libXext ])) self.buildInputs); +(wineWayland.overrideAttrs (old: rec { + name = "${old.name}-wayland"; - name = "${self.name}-wayland"; + buildInputs = (toBuildInputs pkgArches (pkgs: [ pkgs.wayland pkgs.libxkbcommon pkgs.wayland-protocols pkgs.wayland.dev pkgs.libxkbcommon.dev ])) ++ (lib.subtractLists (toBuildInputs pkgArches (pkgs: [ pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXcursor pkgs.xorg.libXrandr pkgs.xorg.libXrender pkgs.xorg.libXxf86vm pkgs.xorg.libXcomposite pkgs.xorg.libXext ])) old.buildInputs); - configureFlags = self.configureFlags + NIX_LDFLAGS = toString (map (path: "-rpath " + path) ( + map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) + # libpulsecommon.so is linked but not found otherwise + ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") + (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) + ++ (map (x: "${lib.getLib x}/share/wayland-protocols") + (toBuildInputs pkgArches (pkgs: [ pkgs.wayland-protocols ]))) + )); + + configureFlags = old.configureFlags ++ [ "--with-wayland" ] ++ lib.optionals vulkanSupport [ "--with-vulkan" ] ++ lib.optionals vkd3dSupport [ "--with-vkd3d" ]; -})) // { - meta = wineWayland.meta // { - description = "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)"; - platforms = (lib.remove "x86_64-darwin" wineWayland.meta.platforms); - maintainers = wineWayland.meta.maintainers ++ [ lib.maintainers.jmc-figueira ]; - }; -} + + meta = old.meta // { + description = "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)"; + platforms = (lib.remove "x86_64-darwin" old.meta.platforms); + maintainers = old.meta.maintainers ++ [ lib.maintainers.jmc-figueira ]; + }; +})) From 3a97cc72f7f7870e23acae1ce0639e7c85ff5886 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Wed, 12 Jan 2022 02:13:36 +0100 Subject: [PATCH 012/111] ryujinx: 1.0.7105 -> 1.0.7168 --- pkgs/misc/emulators/ryujinx/default.nix | 11 ++++--- pkgs/misc/emulators/ryujinx/deps.nix | 43 +++++++++++++------------ pkgs/misc/emulators/ryujinx/updater.sh | 2 +- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 49a1c190b54a..2f684257114a 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -1,20 +1,23 @@ { lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems -, libX11, libgdiplus, ffmpeg +, dotnetCorePackages, libX11, libgdiplus, ffmpeg , SDL2_mixer, openal, libsoundio, sndio, pulseaudio , gtk3, gdk-pixbuf, wrapGAppsHook }: buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7105"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7168"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "b9d83cc97ee1cb8c60d9b01c162bab742567fe6e"; - sha256 = "0plchh8f9xhhza1wfw3ys78f0pa1bh3898fqhfhcc0kxb39px9is"; + rev = "6e0799580f0d1b473a79471c5d365c6524d97a86"; + sha256 = "145sn9xkjxj79292faypcdmpmbxm1w70q0iprg6pfymf9920gvfv"; }; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + projectFile = "Ryujinx.sln"; nugetDeps = ./deps.nix; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 5d4f1d8d7abb..991d00a5a4b8 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -11,22 +11,25 @@ (fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { pname = "LibHac"; version = "0.13.3"; sha256 = "0mh7q1i9wk5mj7xc1rbsasfmd0d1y6xs5m4nllmclk4drzkzsi56"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "062zb8gqbzxq2xrmr8lbl215pnhw1fdidq43m975vsfgzmqrga8f"; }) + (fetchNuGet { pname = "LibHac"; version = "0.14.3"; sha256 = "13pv5dwffj8c2mfibra3hkd1pgg5cj075sf48kgp82y501l25q5m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.12"; sha256 = "173zymcac00rjb0l4yvksglj32b6fnwxzi60kpi0ki3z3a2k8kd3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "1s4klc4p5wiqiiqcfqyi56cci9f29b588h52vj7na7gfqry4b51l"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0"; sha256 = "188cbx99ahvksap9w20943p62fmzxa6fl133w4r7c6bjpsrm29a4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.0"; sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1njh3iky5wyxdrisz8xfpy7kzbsrvzfhpdl01xbavvz189x4ajqp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) @@ -36,9 +39,7 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) @@ -104,16 +105,16 @@ (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build7"; sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build9"; sha256 = "121zmh0byi22qsc9b25wv58kwcq6pmk7zf4f2rfafmdjvwx8bkxc"; }) (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.0.17-build18"; sha256 = "0j0vs6075c4fniydqxhpp18pg3x679mq463x4gxqgkri3vhpj4vl"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.3.0"; sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.2"; sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) - (fetchNuGet { pname = "SPB"; version = "0.0.3-build15"; sha256 = "0h00yi2j65q31r5npsziq2rpiw832vf9r72j1hjqibp2l5m6v6yw"; }) + (fetchNuGet { pname = "SPB"; version = "0.0.4-build17"; sha256 = "0arp7mwdn1w67qx8a0m90xh8waj15154ynswrbsp5w4wmzkcss1i"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "5.0.0"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) @@ -131,13 +132,14 @@ (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.1"; sha256 = "14h722wq58k1wmgxmpws91xc7kh8109ijw0hcxjq9qkbhbi6pwmb"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.15.0"; sha256 = "0kzc9rqwn8xgixwm1z5zajf6bapa2rvi9lv8vgz7hlp1lgi964zk"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) @@ -149,7 +151,7 @@ (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Management"; version = "5.0.0"; sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s"; }) + (fetchNuGet { pname = "System.Management"; version = "6.0.0"; sha256 = "0ra1g75ykapg6i5y0za721kpjd6xcq6dalijkdm6fsxxmz8iz4dr"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) @@ -188,10 +190,10 @@ (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) @@ -200,7 +202,6 @@ (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) diff --git a/pkgs/misc/emulators/ryujinx/updater.sh b/pkgs/misc/emulators/ryujinx/updater.sh index 16bfa3083aa1..0861414f0bf4 100755 --- a/pkgs/misc/emulators/ryujinx/updater.sh +++ b/pkgs/misc/emulators/ryujinx/updater.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_5 +#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From b20c4c3b9f27f393106feccdb2618373cefd88e4 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Tue, 18 Jan 2022 19:15:38 +0100 Subject: [PATCH 013/111] opensupaplex: init at 7.1.2 --- pkgs/games/opensupaplex/default.nix | 89 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/games/opensupaplex/default.nix diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/games/opensupaplex/default.nix new file mode 100644 index 000000000000..44fc219bef91 --- /dev/null +++ b/pkgs/games/opensupaplex/default.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, makeDesktopItem +, copyDesktopItems +, testVersion +, opensupaplex +, SDL2 +, SDL2_mixer +}: + +let + # Doesn't seem to be included in tagged releases, but does exist on master. + icon = fetchurl { + url = "https://raw.githubusercontent.com/sergiou87/open-supaplex/b102548699cf16910b59559f689ecfad88d2a7d2/open-supaplex.svg"; + sha256 = "sha256-nKeSBUGjSulbEP7xxc6smsfCRjyc/xsLykH0o3Rq5wo="; + }; +in +stdenv.mkDerivation rec { + pname = "opensupaplex"; + version = "7.1.2"; + + src = fetchFromGitHub { + owner = "sergiou87"; + repo = "open-supaplex"; + rev = "v${version}"; + sha256 = "sha256-hP8dJlLXE5J/oxPhRkrrBl1Y5e9MYbJKi8OApFM3+GU="; + }; + + nativeBuildInputs = [ + SDL2 # For "sdl2-config" + copyDesktopItems + ]; + buildInputs = [ SDL2_mixer ]; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = [ + "-DFILE_DATA_PATH=${placeholder "out"}/lib/opensupaplex" + "-DFILE_FHS_XDG_DIRS" + ]; + + preBuild = '' + # Makefile is located in this directory + pushd linux + ''; + + postBuild = '' + popd + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib,share/icons/hicolor/scalable/apps} + + install -D ./linux/opensupaplex $out/bin/opensupaplex + cp -R ./resources $out/lib/opensupaplex + cp ${icon} $out/share/icons/hicolor/scalable/apps/open-supaplex.svg + + runHook postInstall + ''; + + passthru.tests.version = testVersion { + package = opensupaplex; + command = "opensupaplex --help"; + version = "v${version}"; + }; + + desktopItems = [(makeDesktopItem { + name = "opensupaplex"; + exec = meta.mainProgram; + icon = "open-supaplex"; + desktopName = "OpenSupaplex"; + comment = meta.description; + categories = "Application;Game;"; + })]; + + meta = with lib; { + description = "A decompilation of Supaplex in C and SDL"; + homepage = "https://github.com/sergiou87/open-supaplex"; + changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${version}.txt"; + license = licenses.gpl3Only; + maintainers = [ maintainers.ivar ]; + platforms = platforms.linux; # Many more are supported upstream, but only linux is tested. + mainProgram = "opensupaplex"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8ae72acf459..a23ab710f2b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19225,6 +19225,8 @@ with pkgs; opensubdiv = callPackage ../development/libraries/opensubdiv { }; + opensupaplex = callPackage ../games/opensupaplex { }; + open-wbo = callPackage ../applications/science/logic/open-wbo {}; openwsman = callPackage ../development/libraries/openwsman {}; From 60d76ea50b3aca12d114d2d2595170b3cbd5b846 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Jan 2022 15:27:12 +0000 Subject: [PATCH 014/111] topydo: 0.13 -> 0.14 --- pkgs/applications/misc/topydo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index c591c969ca9b..352d21361b04 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "topydo"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "bram85"; repo = pname; rev = version; - sha256 = "0b3dz137lpbvpjvfy42ibqvj3yk526x4bpn819fd11lagn77w69r"; + sha256 = "1lpfdai0pf90ffrzgmmkadbd86rb7250i3mglpkc82aj6prjm6yb"; }; propagatedBuildInputs = [ From 884daaafcb7ebe9afe7405cd79154dec6d89ad2c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 20 Jan 2022 12:01:09 +0100 Subject: [PATCH 015/111] nixos/dokuwiki: Minor code cleanup --- nixos/modules/services/web-apps/dokuwiki.nix | 44 +++++++++----------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 392748a93e0a..30913ced8849 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -249,33 +249,29 @@ in { # interface options = { - services.dokuwiki = mkOption { - type = types.submodule { + services.dokuwiki = { - options.sites = mkOption { - type = types.attrsOf (types.submodule siteOpts); - default = {}; - description = "Specification of one or more DokuWiki sites to serve"; - }; - - options.webserver = mkOption { - type = types.enum [ "nginx" "caddy" ]; - default = "nginx"; - description = '' - Whether to use nginx or caddy for virtual host management. - - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. - - Further apache2 configuration can be done by adapting services.httpd.virtualHosts.<name>. - See for further information. - ''; - }; + sites = mkOption { + type = types.attrsOf (types.submodule siteOpts); + default = {}; + description = "Specification of one or more DokuWiki sites to serve"; }; - default = {}; - description = "DokuWiki configuration"; - }; + webserver = mkOption { + type = types.enum [ "nginx" "caddy" ]; + default = "nginx"; + description = '' + Whether to use nginx or caddy for virtual host management. + + Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. + See for further information. + + Further apache2 configuration can be done by adapting services.httpd.virtualHosts.<name>. + See for further information. + ''; + }; + + }; }; # implementation From 1bbd4180131dbb45c59c441c14ce596a9037e0a0 Mon Sep 17 00:00:00 2001 From: David Houston Date: Thu, 20 Jan 2022 11:35:23 -0500 Subject: [PATCH 016/111] nixos/quorum: Patch test to not run indefinitely As written, the nixos/quorum module will simply run forever, and has been timing out in Hydra. Implement a fix for such by changing the final statement from a wait_until_succeeds to simply succeed, forcing the test to succeed or fail instead of run indefinitely. --- nixos/tests/quorum.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index 498b55ace7af..ed659f54bf48 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -72,8 +72,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_until_succeeds("systemctl restart quorum") machine.wait_for_unit("quorum.service") machine.sleep(15) - machine.wait_until_succeeds( - 'geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep 0x9377bc3936de934c497e22917b81aa8774ac3bb0' - ) + machine.succeed('geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep 0x9377bc3936de934c497e22917b81aa8774ac3bb0') ''; }) From a7c72013c8816f769f387c2e6d5ff76d801d145d Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 20 Jan 2022 19:58:19 +0100 Subject: [PATCH 017/111] nixosTests.quorum: use less opaque strings and more nix objects --- nixos/tests/quorum.nix | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index ed659f54bf48..64c1c76e402d 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -1,4 +1,29 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ pkgs, ... }: +let + keystore = { + address = "9377bc3936de934c497e22917b81aa8774ac3bb0"; + crypto = { + cipher = "aes-128-ctr"; + ciphertext = "ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c"; + cipherparams = { + iv = "2a09f7a72fd6dff7c43150ff437e6ac2"; + }; + kdf = "scrypt"; + kdfparams = { + dklen = 32; + n = 262144; + p = 1; + r = 8; + salt = "d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027"; + }; + mac = "a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3"; + }; + id = "89e847a3-1527-42f6-a321-77de0a14ce02"; + version = 3; + }; + keystore-file = pkgs.writeText "keystore-file" (builtins.toJSON keystore); +in +{ name = "quorum"; meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; @@ -64,7 +89,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() machine.wait_until_succeeds("mkdir -p /var/lib/quorum/keystore") machine.wait_until_succeeds( - 'echo \{\\"address\\":\\"9377bc3936de934c497e22917b81aa8774ac3bb0\\",\\"crypto\\":\{\\"cipher\\":\\"aes-128-ctr\\",\\"ciphertext\\":\\"ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c\\",\\"cipherparams\\":\{\\"iv\\":\\"2a09f7a72fd6dff7c43150ff437e6ac2\\"\},\\"kdf\\":\\"scrypt\\",\\"kdfparams\\":\{\\"dklen\\":32,\\"n\\":262144,\\"p\\":1,\\"r\\":8,\\"salt\\":\\"d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027\\"\},\\"mac\\":\\"a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3\\"\},\\"id\\":\\"89e847a3-1527-42f6-a321-77de0a14ce02\\",\\"version\\":3\}\\" > /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--9377bc3936de934c497e22917b81aa8774ac3bb0' + 'cp ${keystore-file} /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--${keystore.address}' ) machine.wait_until_succeeds( "echo fe2725c4e8f7617764b845e8d939a65c664e7956eb47ed7d934573f16488efc1 > /var/lib/quorum/nodekey" @@ -72,6 +97,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_until_succeeds("systemctl restart quorum") machine.wait_for_unit("quorum.service") machine.sleep(15) - machine.succeed('geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep 0x9377bc3936de934c497e22917b81aa8774ac3bb0') + machine.succeed('geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep ${keystore.address}') ''; }) From ffccc4c558bcf0739e8b8df9109753af4702041f Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 20 Jan 2022 19:58:42 +0100 Subject: [PATCH 018/111] nixosTests.quorum: use succeed everywhere --- nixos/tests/quorum.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index 64c1c76e402d..31669eb7fc38 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -87,14 +87,14 @@ in testScript = '' start_all() - machine.wait_until_succeeds("mkdir -p /var/lib/quorum/keystore") - machine.wait_until_succeeds( + machine.succeed("mkdir -p /var/lib/quorum/keystore") + machine.succeed( 'cp ${keystore-file} /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--${keystore.address}' ) - machine.wait_until_succeeds( + machine.succeed( "echo fe2725c4e8f7617764b845e8d939a65c664e7956eb47ed7d934573f16488efc1 > /var/lib/quorum/nodekey" ) - machine.wait_until_succeeds("systemctl restart quorum") + machine.succeed("systemctl restart quorum") machine.wait_for_unit("quorum.service") machine.sleep(15) machine.succeed('geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep ${keystore.address}') From 74f85d3714d5af52f199114af65012d531be730b Mon Sep 17 00:00:00 2001 From: jmc-figueira Date: Fri, 21 Jan 2022 03:47:23 +0000 Subject: [PATCH 019/111] wine-wayland: fixed vkd3d dependency in wineWow builds and standardized the derivation As recommended by @FlorianFranzen, the derivation for wine-wayland builds was moved from a separate "patch-like" derivation to base.nix, by setting the appropriate supportFlags. This was also done to solve an issue when building wineWow builds, where they would fail due to the 32-bit vkd3d not being linked appropriately. --- pkgs/misc/emulators/wine/base.nix | 34 ++++++++++++++++++++------- pkgs/misc/emulators/wine/default.nix | 16 +++---------- pkgs/misc/emulators/wine/packages.nix | 8 ++++++- pkgs/misc/emulators/wine/wayland.nix | 30 ----------------------- 4 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 pkgs/misc/emulators/wine/wayland.nix diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index fa5c4afdc298..30bb898ebb92 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -4,19 +4,24 @@ autoconf, hexdump, perl, supportFlags, patches, + vkd3dArches, buildScript ? null, configureFlags ? [] }: with import ./util.nix { inherit lib; }; let - vkd3d = callPackage ./vkd3d.nix {}; patches' = patches; + prevName = name; + prevPlatforms = platforms; + prevConfigFlags = configureFlags; in stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; }) // rec { - inherit name src configureFlags; + inherit src; + + name = if supportFlags.waylandSupport then "${prevName}-wayland" else prevName; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; @@ -36,7 +41,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals supportFlags.mingwSupport mingwGccs; buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: - [ pkgs.freetype pkgs.perl pkgs.xorg.libX11 ] + [ pkgs.freetype pkgs.perl ] ++ lib.optional stdenv.isLinux pkgs.libcap ++ lib.optional pngSupport pkgs.libpng ++ lib.optional jpegSupport pkgs.libjpeg @@ -66,7 +71,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional faudioSupport pkgs.faudio - ++ lib.optional vkd3dSupport vkd3d + ++ vkd3dArches ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav (gst-plugins-bad.override { enableZbar = false; }) ]) @@ -79,12 +84,20 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon ]) - ++ lib.optionals stdenv.isLinux (with pkgs.xorg; [ - libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext + ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ + libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext + ]) + ++ lib.optionals waylandSupport (with pkgs; [ + wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev ]))); patches = [ ] ++ patches'; + configureFlags = prevConfigFlags + ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] + ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] + ++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ]; + # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. @@ -93,6 +106,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) + ++ lib.optionals supportFlags.waylandSupport (map (x: "${lib.getLib x}/share/wayland-protocols") + (toBuildInputs pkgArches (pkgs: [ pkgs.wayland-protocols ]))) )); # Don't shrink the ELF RPATHs in order to keep the extra RPATH @@ -146,11 +161,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { passthru = { inherit pkgArches; }; meta = { - inherit version platforms; + inherit version; homepage = "https://www.winehq.org/"; license = with lib.licenses; [ lgpl21Plus ]; - description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = with lib.maintainers; [ avnik raskin bendlas ]; + description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; + platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; + maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; mainProgram = "wine"; }; }) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 32e860d4d080..52b571a61255 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,8 +7,6 @@ # Make additional configurations on demand: # wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; { lib, stdenv, callPackage, - pkgs, - pkgsi686Linux, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", pngSupport ? false, @@ -47,6 +45,7 @@ faudioSupport ? false, vkd3dSupport ? false, mingwSupport ? wineRelease != "stable", + waylandSupport ? wineRelease == "wayland", embedInstallers ? false # The Mono and Gecko MSI installers }: @@ -60,7 +59,7 @@ let wine-build = build: release: gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport - vkd3dSupport mingwSupport embedInstallers; + vkd3dSupport mingwSupport waylandSupport embedInstallers; }; }); @@ -69,13 +68,4 @@ in if wineRelease == "staging" then wineUnstable = wine-build wineBuild "unstable"; } else - (if wineRelease == "wayland" then - callPackage ./wayland.nix { - wineWayland = wine-build wineBuild "wayland"; - inherit pulseaudioSupport vulkanSupport vkd3dSupport; - - pkgArches = lib.optionals (wineBuild == "wine32" || wineBuild == "wineWow") [ pkgsi686Linux ] ++ lib.optionals (wineBuild == "wine64" || wineBuild == "wineWow") [ pkgs ]; - } - else - wine-build wineBuild wineRelease - ) + wine-build wineBuild wineRelease diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index c4fec3360e1f..cb857daef0a6 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -3,12 +3,16 @@ supportFlags }: -let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); +let + src = lib.getAttr wineRelease (callPackage ./sources.nix {}); + vkd3d = pkgs.callPackage ./vkd3d.nix {}; + vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix {}; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { name = "wine-${version}"; inherit src version supportFlags patches; pkgArches = [ pkgsi686Linux ]; + vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; geckos = [ gecko32 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; monos = [ mono ]; @@ -18,6 +22,7 @@ in with src; { name = "wine64-${version}"; inherit src version supportFlags patches; pkgArches = [ pkgs ]; + vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; monos = [ mono ]; @@ -29,6 +34,7 @@ in with src; { inherit src version supportFlags patches; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; + vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ]; geckos = [ gecko32 gecko64 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; monos = [ mono ]; diff --git a/pkgs/misc/emulators/wine/wayland.nix b/pkgs/misc/emulators/wine/wayland.nix deleted file mode 100644 index cf8ed2758d06..000000000000 --- a/pkgs/misc/emulators/wine/wayland.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, callPackage, wineWayland, pkgArches, pulseaudioSupport, vulkanSupport, vkd3dSupport }: - -with callPackage ./util.nix {}; - -(wineWayland.overrideAttrs (old: rec { - name = "${old.name}-wayland"; - - buildInputs = (toBuildInputs pkgArches (pkgs: [ pkgs.wayland pkgs.libxkbcommon pkgs.wayland-protocols pkgs.wayland.dev pkgs.libxkbcommon.dev ])) ++ (lib.subtractLists (toBuildInputs pkgArches (pkgs: [ pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXcursor pkgs.xorg.libXrandr pkgs.xorg.libXrender pkgs.xorg.libXxf86vm pkgs.xorg.libXcomposite pkgs.xorg.libXext ])) old.buildInputs); - - NIX_LDFLAGS = toString (map (path: "-rpath " + path) ( - map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) - # libpulsecommon.so is linked but not found otherwise - ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") - (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) - ++ (map (x: "${lib.getLib x}/share/wayland-protocols") - (toBuildInputs pkgArches (pkgs: [ pkgs.wayland-protocols ]))) - )); - - configureFlags = old.configureFlags - ++ [ "--with-wayland" ] - ++ lib.optionals vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals vkd3dSupport [ "--with-vkd3d" ]; - - - meta = old.meta // { - description = "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)"; - platforms = (lib.remove "x86_64-darwin" old.meta.platforms); - maintainers = old.meta.maintainers ++ [ lib.maintainers.jmc-figueira ]; - }; -})) From 0ac894e7d1d91e32fdcdc901229f16f27f321374 Mon Sep 17 00:00:00 2001 From: jmc-figueira Date: Fri, 21 Jan 2022 18:23:57 +0000 Subject: [PATCH 020/111] wine-wayland: disabled Xinerama support for Wayland builds, removing needless dependencies --- pkgs/misc/emulators/wine/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 30bb898ebb92..ee17898fb72e 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio - ++ lib.optional xineramaSupport pkgs.xorg.libXinerama + ++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optional sdlSupport pkgs.SDL2 From 75cb365fa2695c98db5571f74997117ca6012cd9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 23 Jan 2022 04:20:00 +0000 Subject: [PATCH 021/111] gay: fix package --- pkgs/tools/misc/gay/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/gay/default.nix b/pkgs/tools/misc/gay/default.nix index 3c034e43a8e9..799473a4b9f2 100644 --- a/pkgs/tools/misc/gay/default.nix +++ b/pkgs/tools/misc/gay/default.nix @@ -1,7 +1,7 @@ -{ lib, python39Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -python39Packages.buildPythonApplication rec { - name = "gay"; +python3Packages.buildPythonApplication rec { + pname = "gay"; version = "1.2.8"; src = fetchFromGitHub { @@ -21,6 +21,5 @@ python39Packages.buildPythonApplication rec { homepage = "https://github.com/ms-jpq/gay"; maintainers = with maintainers; [ CodeLongAndProsper90 ]; license = licenses.mit; - platforms = platforms.all; }; } From 4409b9f3c1a13c9359425ff6893dabf9ebaad7b7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 23 Jan 2022 04:20:00 +0000 Subject: [PATCH 022/111] git-revise: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/git-revise/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index a6dd3ecb7c80..b4a771a4c3be 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -2,25 +2,26 @@ , buildPythonPackage , pythonOlder , git +, gnupg , fetchFromGitHub , pytestCheckHook }: buildPythonPackage rec { pname = "git-revise"; - version = "0.6.0"; + version = "0.7.0"; # Missing tests on PyPI src = fetchFromGitHub { owner = "mystor"; repo = pname; rev = "v${version}"; - sha256 = "03v791yhips9cxz9hr07rhsgxfhwyqq17rzi7ayjhwvy65s4hzs9"; + sha256 = "sha256-xV1Z9O5FO4Q/XEpNwnX31tbv8CrXY+wF1Ltpfq+ITRg="; }; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - checkInputs = [ git pytestCheckHook ]; + checkInputs = [ git gnupg pytestCheckHook ]; meta = with lib; { description = "Efficiently update, split, and rearrange git commits"; From fd6b95db2263e80269834e2508302de4aed025d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 23 Jan 2022 12:11:05 +0100 Subject: [PATCH 023/111] nixos/tests: add missing tests Some tests from the `nixos/tests` folder were missing in the `all-tests.nix` file. This meant they couldn't be run from the `nixosTests` attribute set and therefore not be linked to their packages. --- nixos/tests/all-tests.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 93950277c279..b1aa0569e684 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -54,6 +54,7 @@ in borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {}; + brscan5 = handleTest ./brscan5.nix {}; btrbk = handleTest ./btrbk.nix {}; buildbot = handleTest ./buildbot.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; @@ -121,6 +122,7 @@ in docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; + doh-proxy-rust = handleTest ./doh-proxy-rust.nix {}; dokuwiki = handleTest ./dokuwiki.nix {}; domination = handleTest ./domination.nix {}; dovecot = handleTest ./dovecot.nix {}; @@ -130,6 +132,7 @@ in ecryptfs = handleTest ./ecryptfs.nix {}; ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; + emacs-daemon = handleTest ./emacs-daemon.nix {}; engelsystem = handleTest ./engelsystem.nix {}; enlightenment = handleTest ./enlightenment.nix {}; env = handleTest ./env.nix {}; @@ -141,6 +144,7 @@ in etesync-dav = handleTest ./etesync-dav.nix {}; fancontrol = handleTest ./fancontrol.nix {}; fcitx = handleTest ./fcitx {}; + fenics = handleTest ./fenics.nix {}; ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job @@ -157,6 +161,7 @@ in fsck = handleTest ./fsck.nix {}; ft2-clone = handleTest ./ft2-clone.nix {}; gerrit = handleTest ./gerrit.nix {}; + geth = handleTest ./geth.nix {}; ghostunnel = handleTest ./ghostunnel.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; gitea = handleTest ./gitea.nix {}; @@ -181,6 +186,7 @@ in hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; + haka = handleTest ./haka.nix {}; handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; @@ -219,14 +225,19 @@ in iodine = handleTest ./iodine.nix {}; ipfs = handleTest ./ipfs.nix {}; ipv6 = handleTest ./ipv6.nix {}; + iscsi-multipath-root = handleTest ./iscsi-multipath-root.nix {}; iscsi-root = handleTest ./iscsi-root.nix {}; + isso = handleTest ./isso.nix {}; jackett = handleTest ./jackett.nix {}; jellyfin = handleTest ./jellyfin.nix {}; jenkins = handleTest ./jenkins.nix {}; + jenkins-cli = handleTest ./jenkins-cli.nix {}; jibri = handleTest ./jibri.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; k3s = handleTest ./k3s.nix {}; + k3s-single-node = handleTest ./k3s-single-node.nix {}; + k3s-single-node-docker = handleTest ./k3s-single-node-docker.nix {}; kafka = handleTest ./kafka.nix {}; kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {}; kbd-update-search-paths-patch = handleTest ./kbd-update-search-paths-patch.nix {}; @@ -274,6 +285,7 @@ in matrix-conduit = handleTest ./matrix-conduit.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; mattermost = handleTest ./mattermost.nix {}; + mediatomb = handleTest ./mediatomb.nix {}; mediawiki = handleTest ./mediawiki.nix {}; meilisearch = handleTest ./meilisearch.nix {}; memcached = handleTest ./memcached.nix {}; @@ -286,6 +298,7 @@ in misc = handleTest ./misc.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; mod_perl = handleTest ./mod_perl.nix {}; + molly-brown = handleTest ./molly-brown.nix {}; mongodb = handleTest ./mongodb.nix {}; moodle = handleTest ./moodle.nix {}; morty = handleTest ./morty.nix {}; @@ -379,6 +392,7 @@ in php74 = handleTest ./php { php = pkgs.php74; }; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; + pict-rs = handleTest ./pict-rs.nix {}; pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; @@ -420,12 +434,16 @@ in rasdaemon = handleTest ./rasdaemon.nix {}; redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; + resolv = handleTest ./resolv.nix {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic = handleTest ./restic.nix {}; + riak = handleTest ./riak.nix {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; + rstudio-server = handleTest ./rstudio-server.nix {}; + rsyncd = handleTest ./rsyncd.nix {}; rsyslogd = handleTest ./rsyslogd.nix {}; rxe = handleTest ./rxe.nix {}; sabnzbd = handleTest ./sabnzbd.nix {}; @@ -446,6 +464,7 @@ in smokeping = handleTest ./smokeping.nix {}; snapcast = handleTest ./snapcast.nix {}; snapper = handleTest ./snapper.nix {}; + soapui = handleTest ./soapui.nix {}; sogo = handleTest ./sogo.nix {}; solanum = handleTest ./solanum.nix {}; solr = handleTest ./solr.nix {}; @@ -482,6 +501,7 @@ in systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-unit-path = handleTest ./systemd-unit-path.nix {}; taskserver = handleTest ./taskserver.nix {}; + teeworlds = handleTest ./teeworlds.nix {}; telegraf = handleTest ./telegraf.nix {}; teleport = handleTest ./teleport.nix {}; thelounge = handleTest ./thelounge.nix {}; @@ -525,6 +545,7 @@ in vscodium = discoverTests (import ./vscodium.nix); wasabibackend = handleTest ./wasabibackend.nix {}; wiki-js = handleTest ./wiki-js.nix {}; + wine = handleTest ./wine.nix {}; wireguard = handleTest ./wireguard {}; without-nix = handleTest ./without-nix.nix {}; wmderland = handleTest ./wmderland.nix {}; From fdf7ede344318318f82594b0d8a7012667eba1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Wed, 19 Jan 2022 17:09:38 +0100 Subject: [PATCH 024/111] lib/options: Add mkPackageOption This is a squashed commit. These are the original commit messages: lib/options: Add mkPackageOption lib/options: Add missing semicolon lib/options.nix: Make mkPackageOption more complicated lib/options: Fix indent. & spacing lib/options.nix: Remove example and align comment lib/options: ravenous overuse of arguments lib/options: Format better lib/options: Add default examplePath decl lib/options: Make better mkPackageOption function lib/options: Remove trailing whitespace lib/options: Improve mkPackageOptions lib/options: Remove pkgs prefixing Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> lib/options: Slim down mkPackageOption further lib/options: mkPackageOption: Add "pkgs." to example lib/options: mkPackageOption: Make name & pkgs single arguments lib/options: mkPackageOption: Swap name & pkgs lib/options: Remove unnecessary import Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> --- lib/options.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/options.nix b/lib/options.nix index 53001a3113f9..b3a011168c3b 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -26,6 +26,7 @@ let take ; inherit (lib.attrsets) + attrByPath optionalAttrs ; inherit (lib.strings) @@ -99,6 +100,24 @@ rec { type = lib.types.bool; }; + /* Creaties an Option attribute set for an option that specifies the + package a module should use. + + The argument default is an attribute set path in pkgs. + */ + mkPackageOption = pkgs: name: + { default ? [ name ], example ? null }: + let default' = if !isList default then [ default ] else default; + in mkOption { + type = lib.types.package; + description = "The ${name} package to use."; + default = attrByPath default' + (throw "${concatStringsSep "." default'} cannot be found in pkgs") pkgs; + defaultText = literalExpression ("pkgs." + concatStringsSep "." default'); + ${if example != null then "example" else null} = literalExpression + (if isList example then "pkgs." + concatStringsSep "." example else example); + }; + /* This option accepts anything, but it does not produce any result. This is useful for sharing a module across different module sets From 4860df782f173cf63492150c9c57af902c731d7d Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 23 Jan 2022 10:08:02 -0500 Subject: [PATCH 025/111] python3Packages.pymdown-extensions: init at 9.1 --- .../pymdown-extensions/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/development/python-modules/pymdown-extensions/default.nix diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix new file mode 100644 index 000000000000..49fa42a30e34 --- /dev/null +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, markdown +, pyyaml +, pygments +}: + +let + extensions = [ + "arithmatex" + "b64" + "betterem" + "caret" + "critic" + "details" + "emoji" + "escapeall" + "extra" + "highlight" + "inlinehilite" + "keys" + "magiclink" + "mark" + "pathconverter" + "progressbar" + "saneheaders" + "smartsymbols" + "snippets" + "striphtml" + "superfences" + "tabbed" + "tasklist" + "tilde" + ]; +in +buildPythonPackage rec { + pname = "pymdown-extensions"; + version = "9.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "facelessuser"; + repo = "pymdown-extensions"; + rev = version; + sha256 = "sha256-II8Po8144h3wPFrzMbOB/qiCm2HseYrcZkyIZFGT+ek="; + }; + + patches = [ + # this patch is needed to allow tests to pass for later versions of the + # markdown dependency + # + # it can be removed after the next pymdown-extensions release + (fetchpatch { + url = "https://github.com/facelessuser/pymdown-extensions/commit/8ee5b5caec8f9373e025f50064585fb9d9b71f86.patch"; + sha256 = "sha256-jTHNcsV0zL0EkSTSj8zCGXXtpUaLnNPldmL+krZj3Gk="; + }) + ]; + + propagatedBuildInputs = [ markdown pygments ]; + + checkInputs = [ + pytestCheckHook + pyyaml + ]; + + pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions; + + meta = with lib; { + description = "Extensions for Python Markdown."; + homepage = "https://facelessuser.github.io/pymdown-extensions/"; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee0f264dc294..d489714f6b89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7035,6 +7035,8 @@ in { pymdstat = callPackage ../development/python-modules/pymdstat { }; + pymdown-extensions = callPackage ../development/python-modules/pymdown-extensions { }; + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; pymediaroom = callPackage ../development/python-modules/pymediaroom { }; From c423629183792da33e61c0f4ab9df4f2b77f2825 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sun, 23 Jan 2022 17:23:06 +0100 Subject: [PATCH 026/111] nordzy-icon-theme: unstable-2021-12-14 -> unstable-2022-01-23 Added Jdupes and made a lot of formatting. Co-authored-by: romildo --- pkgs/data/icons/nordzy-icon-theme/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index cf87bb01cc11..11113bb6a503 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -2,22 +2,19 @@ , fetchFromGitHub , lib , gtk3 -, nordzy-theme-name ? "Nordzy" +, jdupes , nordzy-themes ? [ "all" ] # Override this to only install selected themes }: -let - themes-arg-string = lib.strings.concatMapStrings (theme: "-t ${theme} ") nordzy-themes; -in stdenvNoCC.mkDerivation { pname = "nordzy-icon-theme"; - version = "unstable-2021-12-14"; + version = "unstable-2022-01-23"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; - rev = "5c247a4f19cf9849615631d1bf77727b945b634e"; - sha256 = "Jqn5CF80xlYJ7H4qI1VEj91vcKPPoMXP5+sPs0ksiC4="; + rev = "10b9ee80ef5c4cac1d1770d89a6d55046521ea36"; + sha256 = "1b8abhs5gzr2qy407jq818pr67vjky8zn3pa3c8n552ayybblibk"; }; # In the post patch phase we should first make sure to patch shebangs. @@ -27,6 +24,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ gtk3 + jdupes ]; dontDropIconThemeCache = true; @@ -34,10 +32,12 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out/share/icons - ./install.sh --dest $out/share/icons \ - -n ${nordzy-theme-name} \ - ${themes-arg-string} + name= ./install.sh --dest $out/share/icons \ + ${lib.optionalString (nordzy-themes != []) (lib.strings.concatMapStrings (theme: "-t ${theme} ") nordzy-themes)} + + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 87% + jdupes -L -r $out/share runHook postInstall ''; @@ -45,12 +45,10 @@ stdenvNoCC.mkDerivation { dontFixup = true; meta = with lib; { - description = "A free and open source icon theme using the Nord color palette and based on WhiteSur and Numix Icon Theme"; + description = "Icon theme using the Nord color palette, based on WhiteSur and Numix icon themes"; homepage = "https://github.com/alvatip/Nordzy-icon"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ - alexnortung - ]; + maintainers = with maintainers; [ alexnortung ]; }; } From 47c36939d57fe12c3d6a68d010fa4e2eb540dbfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jan 2022 17:26:18 +0000 Subject: [PATCH 027/111] rofi-file-browser: 1.2.0 -> 1.3.0 --- pkgs/applications/misc/rofi-file-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index 3de8a94b6264..7a86ef0f2325 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "marvinkreis"; repo = pname; rev = version; - sha256 = "1grcal8ga4gpaj3p1dvx4zmqai93jjz2izpj91lxwj0dbz1gmbdm"; + sha256 = "sha256-TNAAImQaIJRgvD8kFf2oHNj4bQiq1NhD8KkCgW5dSK8="; fetchSubmodules = true; }; From c008b3d100a75da35696c5a09afc91f65a034c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Fri, 21 Jan 2022 10:41:34 +0100 Subject: [PATCH 028/111] nixos/docs/option-declarations: Document mkEnableOption and mkPackageOption This is a squashed commit. These are the original commit messages: lib/option: Improve comment better comment Update documentation Updated nixos/doc/manual/development/options-declarations.md with info on mkEnableOption and mkPackageOption. Updated the comment on mkEnableOption in lib/options.nix remove trailing whitespace nixos/doc/option-declarations: Update IDs & formatting nixos/docs/option-declarations: Escape angle brackets Build DB from MD (Amended) Fix typo Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> (Amended) Build DB from MD (again) --- lib/options.nix | 55 +++- .../option-declarations.section.md | 74 +++++ .../option-declarations.section.xml | 309 ++++++++++++------ 3 files changed, 320 insertions(+), 118 deletions(-) diff --git a/lib/options.nix b/lib/options.nix index b3a011168c3b..794ca5e33942 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -100,23 +100,48 @@ rec { type = lib.types.bool; }; - /* Creaties an Option attribute set for an option that specifies the - package a module should use. + /* Creates an Option attribute set for an option that specifies the + package a module should use for some purpose. - The argument default is an attribute set path in pkgs. + Type: mkPackageOption :: pkgs -> string -> { default :: [string], example :: null | string | [string] } -> option + + The package is specified as a list of strings representing its attribute path in nixpkgs. + + Because of this, you need to pass nixpkgs itself as the first argument. + + The second argument is the name of the option, used in the description "The package to use.". + + You can also pass an example value, either a literal string or a package's attribute path. + + You can omit the default path if the name of the option is also attribute path in nixpkgs. + + Example: + mkPackageOption pkgs "hello" { } + => { _type = "option"; default = «derivation /nix/store/3r2vg51hlxj3cx5vscp0vkv60bqxkaq0-hello-2.10.drv»; defaultText = { ... }; description = "The hello package to use."; type = { ... }; } + + Example: + mkPackageOption pkgs "GHC" { + default = [ "ghc" ]; + example = "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])"; + } + => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } */ - mkPackageOption = pkgs: name: - { default ? [ name ], example ? null }: - let default' = if !isList default then [ default ] else default; - in mkOption { - type = lib.types.package; - description = "The ${name} package to use."; - default = attrByPath default' - (throw "${concatStringsSep "." default'} cannot be found in pkgs") pkgs; - defaultText = literalExpression ("pkgs." + concatStringsSep "." default'); - ${if example != null then "example" else null} = literalExpression - (if isList example then "pkgs." + concatStringsSep "." example else example); - }; + mkPackageOption = + # Package set (a specific version of nixpkgs) + pkgs: + # Name for the package, shown in option description + name: + { default ? [ name ], example ? null }: + let default' = if !isList default then [ default ] else default; + in mkOption { + type = lib.types.package; + description = "The ${name} package to use."; + default = attrByPath default' + (throw "${concatStringsSep "." default'} cannot be found in pkgs") pkgs; + defaultText = literalExpression ("pkgs." + concatStringsSep "." default'); + ${if example != null then "example" else null} = literalExpression + (if isList example then "pkgs." + concatStringsSep "." example else example); + }; /* This option accepts anything, but it does not produce any result. diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index be56529992ab..fff06e1ea5ba 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -57,6 +57,80 @@ The function `mkOption` accepts the following arguments. : A textual description of the option, in DocBook format, that will be included in the NixOS manual. +## Utility functions for common option patterns {#sec-option-declarations-util} + +### `mkEnableOption` {#sec-option-declarations-util-mkEnableOption} + +Creates an Option attribute set for a boolean value option i.e an +option to be toggled on or off. + +This function takes a single string argument, the name of the thing to be toggled. + +The option's description is "Whether to enable \.". + +For example: + +::: {#ex-options-declarations-util-mkEnableOption-magic .example} +```nix +lib.mkEnableOption "magic" +# is like +lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Whether to enable magic."; +} +``` + +### `mkPackageOption` {#sec-option-declarations-util-mkPackageOption} + +Usage: + +```nix +mkPackageOption pkgs "name" { default = [ "path" "in" "pkgs" ]; example = "literal example"; } +``` + +Creates an Option attribute set for an option that specifies the package a module should use for some purpose. + +**Note**: You shouldn’t necessarily make package options for all of your modules. You can always overwrite a specific package throughout nixpkgs by using [nixpkgs overlays](https://nixos.org/manual/nixpkgs/stable/#chap-overlays). + +The default package is specified as a list of strings representing its attribute path in nixpkgs. Because of this, you need to pass nixpkgs itself as the first argument. + +The second argument is the name of the option, used in the description "The \ package to use.". You can also pass an example value, either a literal string or a package's attribute path. + +You can omit the default path if the name of the option is also attribute path in nixpkgs. + +::: {#ex-options-declarations-util-mkPackageOption .title} +Examples: + +::: {#ex-options-declarations-util-mkPackageOption-hello .example} +```nix +lib.mkPackageOption pkgs "hello" { } +# is like +lib.mkOption { + type = lib.types.package; + default = pkgs.hello; + defaultText = lib.literalExpression "pkgs.hello"; + description = "The hello package to use."; +} +``` + +::: {#ex-options-declarations-util-mkPackageOption-ghc .example} +```nix +lib.mkPackageOption pkgs "GHC" { + default = [ "ghc" ]; + example = "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])"; +} +# is like +lib.mkOption { + type = lib.types.package; + default = pkgs.ghc; + defaultText = lib.literalExpression "pkgs.ghc"; + example = lib.literalExpression "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])"; + description = "The GHC package to use."; +} +``` + ## Extensible Option Types {#sec-option-declarations-eot} Extensible option types is a feature that allow to extend certain types diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index 2845e37659b1..0eeffae628e1 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -97,125 +97,228 @@ options = { -
- Extensible Option Types - - Extensible option types is a feature that allow to extend certain - types declaration through multiple module files. This feature only - work with a restricted set of types, namely - enum and submodules and any - composed forms of them. - - - Extensible option types can be used for enum - options that affects multiple modules, or as an alternative to - related enable options. - - - As an example, we will take the case of display managers. There is - a central display manager module for generic display manager - options and a module file per display manager backend (sddm, gdm - ...). - - - There are two approach to this module structure: - - - +
+ Utility functions for common option patterns +
+ <literal>mkEnableOption</literal> + + Creates an Option attribute set for a boolean value option i.e + an option to be toggled on or off. + + + This function takes a single string argument, the name of the + thing to be toggled. + + + The option’s description is Whether to enable + <name>.. + + + For example: + + + +lib.mkEnableOption "magic" +# is like +lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Whether to enable magic."; +} + +
+ <literal>mkPackageOption</literal> - Managing the display managers independently by adding an - enable option to every display manager module backend. (NixOS) + Usage: - - + +mkPackageOption pkgs "name" { default = [ "path" "in" "pkgs" ]; example = "literal example"; } + - Managing the display managers in the central module by adding - an option to select which display manager backend to use. + Creates an Option attribute set for an option that specifies + the package a module should use for some purpose. - - - - Both approaches have problems. - - - Making backends independent can quickly become hard to manage. For - display managers, there can be only one enabled at a time, but the - type system can not enforce this restriction as there is no - relation between each backend enable option. As - a result, this restriction has to be done explicitely by adding - assertions in each display manager backend module. - - - On the other hand, managing the display managers backends in the - central module will require to change the central module option - every time a new backend is added or removed. - - - By using extensible option types, it is possible to create a - placeholder option in the central module - (Example: - Extensible type placeholder in the service module), and to - extend it in each backend module - (Example: - Extending - services.xserver.displayManager.enable in the - gdm module, - Example: - Extending - services.xserver.displayManager.enable in the - sddm module). - - - As a result, displayManager.enable option - values can be added without changing the main service module file - and the type system automatically enforce that there can only be a - single display manager enabled. - - - - Example: Extensible type placeholder in - the service module - - + + Note: You shouldn’t + necessarily make package options for all of your modules. You + can always overwrite a specific package throughout nixpkgs by + using + nixpkgs + overlays. + + + The default package is specified as a list of strings + representing its attribute path in nixpkgs. Because of this, + you need to pass nixpkgs itself as the first argument. + + + The second argument is the name of the option, used in the + description The <name> package to use.. + You can also pass an example value, either a literal string or + a package’s attribute path. + + + You can omit the default path if the name of the option is + also attribute path in nixpkgs. + + + + Examples: + + + +lib.mkPackageOption pkgs "hello" { } +# is like +lib.mkOption { + type = lib.types.package; + default = pkgs.hello; + defaultText = lib.literalExpression "pkgs.hello"; + description = "The hello package to use."; +} + + + +lib.mkPackageOption pkgs "GHC" { + default = [ "ghc" ]; + example = "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])"; +} +# is like +lib.mkOption { + type = lib.types.package; + default = pkgs.ghc; + defaultText = lib.literalExpression "pkgs.ghc"; + example = lib.literalExpression "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])"; + description = "The GHC package to use."; +} + +
+ Extensible Option Types + + Extensible option types is a feature that allow to extend + certain types declaration through multiple module files. + This feature only work with a restricted set of types, + namely enum and + submodules and any composed forms of + them. + + + Extensible option types can be used for + enum options that affects multiple + modules, or as an alternative to related + enable options. + + + As an example, we will take the case of display managers. + There is a central display manager module for generic + display manager options and a module file per display + manager backend (sddm, gdm ...). + + + There are two approach to this module structure: + + + + + Managing the display managers independently by adding an + enable option to every display manager module backend. + (NixOS) + + + + + Managing the display managers in the central module by + adding an option to select which display manager backend + to use. + + + + + Both approaches have problems. + + + Making backends independent can quickly become hard to + manage. For display managers, there can be only one enabled + at a time, but the type system can not enforce this + restriction as there is no relation between each backend + enable option. As a result, this + restriction has to be done explicitely by adding assertions + in each display manager backend module. + + + On the other hand, managing the display managers backends in + the central module will require to change the central module + option every time a new backend is added or removed. + + + By using extensible option types, it is possible to create a + placeholder option in the central module + (Example: + Extensible type placeholder in the service module), + and to extend it in each backend module + (Example: + Extending + services.xserver.displayManager.enable in + the gdm module, + Example: + Extending + services.xserver.displayManager.enable in + the sddm module). + + + As a result, displayManager.enable option + values can be added without changing the main service module + file and the type system automatically enforce that there + can only be a single display manager enabled. + + + + Example: Extensible type placeholder + in the service module + + services.xserver.displayManager.enable = mkOption { description = "Display manager to use"; type = with types; nullOr (enum [ ]); }; - - - Example: Extending - services.xserver.displayManager.enable in the - gdm module - - + + + Example: Extending + services.xserver.displayManager.enable in + the gdm module + + services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "gdm" ]); }; - - - Example: Extending - services.xserver.displayManager.enable in the - sddm module - - + + + Example: Extending + services.xserver.displayManager.enable in + the sddm module + + services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); }; - - The placeholder declaration is a standard - mkOption declaration, but it is important that - extensible option declarations only use the - type argument. - - - Extensible option types work with any of the composed variants of - enum such as - with types; nullOr (enum [ "foo" "bar" ]) - or - with types; listOf (enum [ "foo" "bar" ]). - + + The placeholder declaration is a standard + mkOption declaration, but it is important + that extensible option declarations only use the + type argument. + + + Extensible option types work with any of the composed + variants of enum such as + with types; nullOr (enum [ "foo" "bar" ]) + or + with types; listOf (enum [ "foo" "bar" ]). + +
+
+
From 65705a834138253f96dbdfe120fab6fa371e2563 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 23 Jan 2022 19:10:32 +0300 Subject: [PATCH 029/111] =?UTF-8?q?gqrx:=202.15.4=20=E2=86=92=202.15.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/radio/gqrx/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 6678b933d870..f9aca3286bbf 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.15.4"; + version = "2.15.7"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-iQlrnkc1EMR8sUUAHh+7RfS/05unrcDm/kJ/Q4Vst2Q="; + sha256 = "sha256-4tXWwBkVmNZ4s3d6/n6XBdbh9Fv7821L3vkYmjgv1ds="; }; nativeBuildInputs = [ @@ -68,11 +68,6 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { "-DLINUX_AUDIO_BACKEND=${audioBackend}" ]; - postInstall = '' - install -vD $src/gqrx.desktop -t "$out/share/applications/" - install -vD $src/resources/icons/gqrx.svg -t "$out/share/pixmaps/" - ''; - meta = with lib; { description = "Software defined radio (SDR) receiver"; longDescription = '' From 4329d79dbab9f9ae6654c59ac428b8935eb7f7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 23 Jan 2022 21:08:10 +0100 Subject: [PATCH 030/111] nixos/tests: link tests to their packages --- pkgs/applications/blockchains/go-ethereum/default.nix | 4 +++- pkgs/applications/editors/emacs/generic.nix | 3 ++- pkgs/applications/editors/rstudio/default.nix | 6 +++++- .../graphics/sane/backends/brscan5/default.nix | 4 +++- pkgs/applications/networking/cluster/k3s/default.nix | 3 +++ pkgs/applications/networking/soapui/default.nix | 4 +++- pkgs/development/libraries/science/math/fenics/default.nix | 2 ++ .../tools/continuous-integration/jenkins/default.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 7 +++++-- pkgs/os-specific/linux/multipath-tools/default.nix | 4 +++- pkgs/os-specific/linux/open-iscsi/default.nix | 4 +++- pkgs/servers/dns/doh-proxy-rust/default.nix | 4 +++- pkgs/servers/gerbera/default.nix | 3 +++ pkgs/servers/isso/default.nix | 4 +++- pkgs/servers/mediatomb/default.nix | 4 +++- pkgs/servers/nosql/riak/2.2.0.nix | 4 +++- pkgs/servers/web-apps/pict-rs/default.nix | 3 +++ pkgs/tools/security/haka/default.nix | 4 +++- 18 files changed, 54 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index a934589e6872..3aa3f622024f 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, nixosTests }: let # A list of binaries to put into separate outputs @@ -50,6 +50,8 @@ in buildGoModule rec { propagatedBuildInputs = lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + passthru.tests = { inherit (nixosTests) geth; }; + meta = with lib; { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 49ecbbab4a3c..b6d556b445a0 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -10,7 +10,7 @@ , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf -, sigtool, jansson, harfbuzz, sqlite +, sigtool, jansson, harfbuzz, sqlite, nixosTests , dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null @@ -208,6 +208,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { passthru = { inherit nativeComp; pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs); + tests = { inherit (nixosTests) emacs-daemon; }; }; meta = with lib; { diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index b230218e332b..04b688622be0 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -34,6 +34,7 @@ , server ? false # build server version , sqlite , pam +, nixosTests }: let @@ -209,7 +210,10 @@ in platforms = platforms.linux; }; - passthru = { inherit server; }; + passthru = { + inherit server; + tests = { inherit (nixosTests) rstudio-server; }; + }; } // lib.optionalAttrs (!server) { qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ gnumake ]}" diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 17e9972cbe9f..9771384a5d1a 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect }: +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect, nixosTests }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ @@ -88,6 +88,8 @@ stdenv.mkDerivation rec { dontPatchELF = true; + passthru.tests = { inherit (nixosTests) brscan5; }; + meta = { description = "Brother brscan5 sane backend driver"; homepage = "https://www.brother.com"; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index f3b5e4cd70c9..34fe2bfb9d02 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -18,6 +18,7 @@ , fetchzip , fetchgit , zstd +, nixosTests }: with lib; @@ -289,5 +290,7 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; + passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; }; + meta = baseMeta; } diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 96d3de98d891..6839b6be6729 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper }: +{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "soapui"; @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { '') ]; + passthru.tests = { inherit (nixosTests) soapui; }; + meta = with lib; { description = "The Most Advanced REST & SOAP Testing Tool in the World"; homepage = "https://www.soapui.org/"; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index b65ab0bf63db..2690d544c2c8 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -26,6 +26,7 @@ , zlib , blas , lapack +, nixosTests }: let version = "2019.1.0"; @@ -260,6 +261,7 @@ let pythonPackages.pybind11 ]; doCheck = false; # Tries to orte_ess_init and call ssh to localhost + passthru.tests = { inherit (nixosTests) fenics; }; meta = { description = "Python bindings for the DOLFIN FEM compiler"; homepage = "https://fenicsproject.org/"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5823b5dac054..3a04ba2f8660 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; passthru = { - tests = { inherit (nixosTests) jenkins; }; + tests = { inherit (nixosTests) jenkins jenkins-cli; }; updateScript = writeScript "update.sh" '' #!${stdenv.shell} diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index fa5c4afdc298..aad355048a18 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,7 +1,7 @@ { stdenv, lib, pkgArches, callPackage, name, version, src, mingwGccs, monos, geckos, platforms, bison, flex, fontforge, makeWrapper, pkg-config, - autoconf, hexdump, perl, + autoconf, hexdump, perl, nixosTests, supportFlags, patches, buildScript ? null, configureFlags ? [] @@ -144,7 +144,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify" ++ lib.optional (supportFlags.mingwSupport) "format"; - passthru = { inherit pkgArches; }; + passthru = { + inherit pkgArches; + tests = { inherit (nixosTests) wine; }; + }; meta = { inherit version platforms; homepage = "https://www.winehq.org/"; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 45ffa8896ae7..184d2e1fe6eb 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod, nixosTests }: stdenv.mkDerivation rec { pname = "multipath-tools"; @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { "SYSTEMDPATH=lib" ]; + passthru.tests = { inherit (nixosTests) iscsi-multipath-root; }; + meta = with lib; { description = "Tools for the Linux multipathing driver"; homepage = "http://christophe.varoqui.free.fr/"; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 0640316b627a..a4f6565f0c70 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf +, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf, nixosTests }: stdenv.mkDerivation rec { @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login ''; + passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; }; + meta = with lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index fb87e3b19484..221ae7ce7243 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, stdenv, Security, libiconv }: +{ lib, rustPlatform, fetchCrate, stdenv, Security, libiconv, nixosTests }: rustPlatform.buildRustPackage rec { pname = "doh-proxy-rust"; @@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + passthru.tests = { inherit (nixosTests) doh-proxy-rust; }; + meta = with lib; { homepage = "https://github.com/jedisct1/doh-server"; description = "Fast, mature, secure DoH server proxy written in Rust"; diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 368f2f494151..afad6e90dc20 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, nixosTests # required , libiconv , libupnp @@ -96,6 +97,8 @@ stdenv.mkDerivation rec { zlib ] ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options)); + passthru.tests = { inherit (nixosTests) mediatomb; }; + meta = with lib; { homepage = "https://docs.gerbera.io/"; description = "UPnP Media Server for 2020"; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 6550659898e0..f02fc8df3b1b 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, lib, python3Packages, fetchFromGitHub }: +{ pkgs, nodejs, lib, python3Packages, fetchFromGitHub, nixosTests }: let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile; @@ -53,6 +53,8 @@ with python3Packages; buildPythonApplication rec { ${python.interpreter} setup.py nosetests ''; + passthru.tests = { inherit (nixosTests) isso; }; + meta = with lib; { description = "A commenting server similar to Disqus"; homepage = "https://posativ.org/isso/"; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index aa1304bf8922..3f5ac6530e16 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file -, pkg-config, autoreconfHook }: +, pkg-config, autoreconfHook, nixosTests }: stdenv.mkDerivation rec { pname = "mediatomb"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac pkg-config autoreconfHook ]; + passthru.tests = { inherit (nixosTests) mediatomb; }; + meta = with lib; { homepage = "http://mediatomb.cc"; repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb"; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index 6cbdab1b59fe..3be8d95b139c 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, which, pam }: +{ stdenv, lib, fetchurl, unzip, erlang, which, pam, nixosTests }: let solrName = "solr-4.10.4-yz-2.tgz"; @@ -90,6 +90,8 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.tests = { inherit (nixosTests) riak; }; + meta = with lib; { maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 6338b6195455..739ff2280e17 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -8,6 +8,7 @@ , imagemagick , ffmpeg , exiftool +, nixosTests }: rustPlatform.buildRustPackage rec { @@ -36,6 +37,8 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${lib.makeBinPath [ imagemagick ffmpeg exiftool ]}" ''; + passthru.tests = { inherit (nixosTests) pict-rs; }; + meta = with lib; { description = "A simple image hosting service"; homepage = "https://git.asonix.dog/asonix/pict-rs"; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 809902e88976..3ea38e060407 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }: +{ lib, stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre, nixosTests }: let version = "0.3.0"; in @@ -24,6 +24,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ swig wireshark check rsync libpcap gawk libedit pcre ]; + passthru.tests = { inherit (nixosTests) haka; }; + meta = { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; homepage = "http://www.haka-security.org/"; From 8ecd9c8936f71ca0894baea3125768cf68d256c6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Dec 2021 15:20:08 +0000 Subject: [PATCH 031/111] gvpe: 3.0 -> 3.1 --- pkgs/tools/networking/gvpe/default.nix | 13 ++++++------- .../networking/gvpe/gvpe-3.0-glibc-2.26.patch | 18 ------------------ pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 59748f6f9676..37f698386e24 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -1,25 +1,24 @@ -{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }: +{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools, pkg-config }: stdenv.mkDerivation rec { pname = "gvpe"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; - sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"; + sha256 = "sha256-8evVctclu5QOCAdxocEIZ8NQnc2DFvYRSBRQPcux6LM="; }; - patches = [ ./gvpe-3.0-glibc-2.26.patch ]; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl gmp zlib ]; configureFlags = [ "--enable-tcp" "--enable-http-proxy" "--enable-dns" - ]; + ]; - preBuild = '' + postPatch = '' sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; diff --git a/pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch b/pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch deleted file mode 100644 index 9cfb6472c4e1..000000000000 --- a/pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/lib/getopt.h b/lib/getopt.h -index 2d02142..5e7d8d4 100644 ---- a/lib/getopt.h -+++ b/lib/getopt.h -@@ -101,13 +101,6 @@ struct option - #define optional_argument 2 - - #if defined (__STDC__) && __STDC__ --#ifdef __GNU_LIBRARY__ --/* Many other libraries have conflicting prototypes for getopt, with -- differences in the consts, in stdlib.h. To avoid compilation -- errors, only prototype getopt for the GNU C library. */ --extern int getopt (int argc, char *const *argv, const char *shortopts); --#else /* not __GNU_LIBRARY__ */ --#endif /* __GNU_LIBRARY__ */ - extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); - extern int getopt_long_only (int argc, char *const *argv, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33b494c083c2..925ba05019b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6213,9 +6213,7 @@ with pkgs; gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; - gvpe = callPackage ../tools/networking/gvpe { - openssl = openssl_1_0_2; - }; + gvpe = callPackage ../tools/networking/gvpe {}; gvolicon = callPackage ../tools/audio/gvolicon {}; From ee4d2434528ce024ba917847c701f931e692b590 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 23 Jan 2022 16:56:02 -0700 Subject: [PATCH 032/111] mattermost: 6.3.0 -> 6.3.1 --- pkgs/servers/mattermost/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 2630bb4d56ad..78e2ace87544 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -10,7 +10,7 @@ , storePathAsBuildHash ? false }: let - version = "6.3.0"; + version = "6.3.1"; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -22,7 +22,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "y3VTDl01UrMpgoN06lf98C+uTu2N9u0EAWYADPpOI3w="; + sha256 = "cUeGjKutz6Yeq/cP7nYx0zPJ87GKOQWRyNSERzq/nPw="; }; ldflags = [ @@ -65,7 +65,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "PqinkPC7J6Ng1fjTrcAa6ZqiyB2JKkGRdvJ6h2wNS5w="; + sha256 = "lFwSZsAcQuuWTN+4wCe7GDLkhp1ASn5GE7/K5Vppr14="; }; installPhase = '' @@ -76,6 +76,9 @@ let mattermost/fonts \ mattermost/templates \ mattermost/config + + # For some reason a bunch of these files are +x... + find $out -type f -exec chmod -x {} \; ''; }; From ab7e6995ac9df61ceac5188a0ec499e4eb3a825b Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 24 Jan 2022 02:13:00 +0100 Subject: [PATCH 033/111] nixos/nginx: Add defaultListenAddresses option Lets you specify the default listen address if none are listed in the vhost configuration. Useful for hosts with more than one ip --- .../services/web-servers/nginx/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 41bce3669c58..a8610047f5f3 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -245,12 +245,9 @@ let defaultListen = if vhost.listen != [] then vhost.listen else - let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else ( - [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]" - ); - in - optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs) - ++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs); + let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else cfg.defaultListenAddresses; + in optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs) + ++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs); hostListen = if vhost.forceSSL @@ -432,6 +429,16 @@ in "; }; + defaultListenAddresses = mkOption { + type = types.listOf types.str; + default = [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]"; + defaultText = literalExpression ''[ "0.0.0.0" ] ++ lib.optional config.networking.enableIPv6 "[::0]"''; + example = literalExpression ''[ "10.0.0.12" "[2002:a00:1::]" ]''; + description = " + If vhosts do not specify listenAddresses, use these addresses by default. + "; + }; + package = mkOption { default = pkgs.nginxStable; defaultText = literalExpression "pkgs.nginxStable"; From 527717df6a7587c568bbfd1c734aa555f05f4b51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 01:44:08 +0000 Subject: [PATCH 034/111] clight: 4.7 -> 4.8 --- pkgs/applications/misc/clight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index b5278e7cc75c..3592de5f1c65 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.7"; + version = "4.8"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "sha256-+u50XorUyeDsn4FaKdD0wEtQHkwtiyVDY0IAi0vehEQ="; + sha256 = "sha256-nDI5Rq1iPVkj25HRpxmS9zxNDUy+9YsSwbZnEwYt86E="; }; # dbus-1.pc has datadir=/etc From 9a7bb1ef06a28d4b8ef61801413cda55e3ffde49 Mon Sep 17 00:00:00 2001 From: jmc-figueira Date: Mon, 24 Jan 2022 01:48:15 +0000 Subject: [PATCH 035/111] Fixed typo while fixing maintainer list merge conflict --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 14e540b3a85a..6adb12774f6f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5714,7 +5714,7 @@ github = "jmc-figueira"; githubId = 6634716; name = "João Figueira"; - keys = [r + keys = [ # GitHub signing key { longkeyid = "rsa4096/0xDC7AE56AE98E02D7"; From 0f8ef18fa0f55250e894a348da805fdd88b0e4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jan 2022 03:11:18 +0100 Subject: [PATCH 036/111] python39Packages.google-cloud-core: 2.2.1 -> 2.2.2 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 0351bd51e2ee..84937102ac32 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "476d1f71ab78089e0638e0aaf34bfdc99bab4fce8f4170ba6321a5243d13c5c7"; + sha256 = "sha256-fRm/iGi0ENC99aA0aKPz8tsjPA7oagI/TswreksV9zY="; }; propagatedBuildInputs = [ google-api-core ]; From 612a78acb2a9686b5eadb7d5308e7e61d9516063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jan 2022 03:28:22 +0100 Subject: [PATCH 037/111] python39Packages.googleapis-common-protos: 1.53.0 -> 1.54.0 --- .../python-modules/googleapis-common-protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 3a7c0510ad01..55380e3081a7 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.53.0"; + version = "1.54.0"; src = fetchPypi { inherit pname version; - sha256 = "a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4"; + sha256 = "sha256-pAMdbsbCsbbcPgvn4Qob1y+wsYsH75vntR8sEATOJDc="; }; propagatedBuildInputs = [ grpc protobuf ]; From 978211bedf2cd1f502cb174e1489fd3a62719039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 02:34:16 +0000 Subject: [PATCH 038/111] clj-kondo: 2021.12.19 -> 2022.01.15 --- 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 8a71939f2c11..554488ecea9f 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2021.12.19"; + version = "2022.01.15"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-CjqzsYT3Hc2Ej7ALHkuKwBPHMAQkQQilUZhuC3hcZQg="; + sha256 = "sha256-s1SdCy4GaxFL9M3Fp/WGu1C6qY2Kst5PXFShrGCizUE="; }; extraNativeImageBuildArgs = [ From 282788713f3c3d13d52290f6db18ab312fc889bd Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 23 Jan 2022 18:34:38 -0800 Subject: [PATCH 039/111] tlp: 1.4.0 -> 1.5.0 --- pkgs/tools/misc/tlp/default.nix | 9 ++++----- ...=> 0002-reintroduce-tlp-sleep-service.patch} | 17 ----------------- 2 files changed, 4 insertions(+), 22 deletions(-) rename pkgs/tools/misc/tlp/patches/{0002-tlp-sleep.service-reintroduce.patch => 0002-reintroduce-tlp-sleep-service.patch} (86%) diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 84c927260c06..151b8292a596 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -24,19 +24,19 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; + sha256 = "sha256-hHel3BVMzTYfE59kxxADnm8tqtUFntqS3RzmJSZlWjM="; }; # XXX: See patch files for relevant explanations. patches = [ ./patches/0001-makefile-correctly-sed-paths.patch - ./patches/0002-tlp-sleep.service-reintroduce.patch + ./patches/0002-reintroduce-tlp-sleep-service.patch ]; buildInputs = [ perl ]; @@ -50,12 +50,11 @@ # [1]: https://github.com/NixOS/nixpkgs/issues/65718 # [2]: https://github.com/linrunner/TLP/blob/ab788abf4936dfb44fbb408afc34af834230a64d/Makefile#L4-L46 makeFlags = [ - "DESTDIR=${placeholder "out"}" - "TLP_NO_INIT=1" "TLP_WITH_ELOGIND=0" "TLP_WITH_SYSTEMD=1" + "DESTDIR=${placeholder "out"}" "TLP_BATD=/share/tlp/bat.d" "TLP_BIN=/bin" "TLP_CONFDEF=/share/tlp/defaults.conf" diff --git a/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch similarity index 86% rename from pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch rename to pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch index 40d89e207dc4..08bbafc4b9da 100644 --- a/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch +++ b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch @@ -57,23 +57,6 @@ index ab05720..075b42f 100644 rm -f $(_ELOD)/49-tlp-sleep rm -f $(_SHCPL)/tlp-stat rm -f $(_SHCPL)/bluetooth -diff --git a/tlp-sleep b/tlp-sleep -deleted file mode 100644 -index e548d55..0000000 ---- a/tlp-sleep -+++ /dev/null -@@ -1,11 +0,0 @@ --#!/bin/sh -- --# tlp - systemd suspend/resume hook --# --# Copyright (c) 2021 Thomas Koch and others. --# This software is licensed under the GPL v2 or later. -- --case $1 in -- pre) tlp suspend ;; -- post) tlp resume ;; --esac diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 index 0000000..79c202c From a58997f52e9d2cc3d6235860cf6df949065efd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jan 2022 03:36:02 +0100 Subject: [PATCH 040/111] python39Packages.oslo-utils: 4.12.0 -> 4.12.1 --- pkgs/development/python-modules/oslo-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 301e074e67c1..35a3447243f5 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "4.12.0"; + version = "4.12.1"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "37aa1ee2c6cd8f3933912dd4323cbf7cd2d141e6dedb3debb764e491a9c9cf4d"; + sha256 = "sha256-zzEhx2/jwpY+1WOo68PJ/TvDy6XUT76K7LVAfUMMMJI="; }; postPatch = '' From 345110e2de6c0a28b719083cbdf7fe4f5d239e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jan 2022 03:41:52 +0100 Subject: [PATCH 041/111] procs: 0.11.13 -> 0.12.0 --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 7f4068afca19..25287dca9c5f 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.13"; + version = "0.12.0"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OgV4iqtGpia8l+GCySDD+aRIk1mNnJCB0OqZzITTj2I="; + sha256 = "sha256-UZTt/+K8jDFhkNIMRfyDzRqOlceAEQKWwgEf1lcZIkY="; }; - cargoSha256 = "sha256-d5GsCzigR5A1pJnvs6rjqMJqUB+H52Gaa1SzkHK5X+Y="; + cargoSha256 = "sha256-VE161UZKUiG2WW7CwjazQfR9ouOAsYCjiA5dczFQliM="; nativeBuildInputs = [ installShellFiles ]; From 4daddd2595ef89bd09da1295c4685d7de2bb4883 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 05:41:58 +0000 Subject: [PATCH 042/111] cocogitto: 4.0.1 -> 4.1.0 --- pkgs/development/tools/cocogitto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index dc5b875ac0cf..127aebccf5a5 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-uSKzHo1lEBiXsi1rOKvfD2zVlkAUVZ5k0y8iiTXYE2A="; + sha256 = "sha256-g7NBtqr7Mx7ALzij4hfoVXN3izbu4ShXYhHPYw9qnWk="; }; - cargoSha256 = "sha256-gss3+XXyM//zER3gnN9qemIWaVDfs/f4gljmukMxoq0="; + cargoSha256 = "sha256-kXspbXySY5ridLUvAjv49Rm0RGt1fNsfNw9a3vd4hyI="; # Test depend on git configuration that would likly exist in a normal user enviroment # and might be failing to create the test repository it works in. From ff3e9fbb365f57b31b605b2f84910e757fc85bb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 06:03:56 +0000 Subject: [PATCH 043/111] consul: 1.11.1 -> 1.11.2 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 58b11dfab09c..81389064d8e6 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.11.1"; + version = "1.11.2"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0x374capaz6h8mzvq2pfz4zg3gz27fjbqax65f23zqyl46haj01p"; + sha256 = "sha256-Ql8MAo4OVvOIOkFbeOLHqzloWe3I8HviUIfWrvo6INk="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "09rz2xv407ym71dap7f6bbqhdnqvylvbd9zg6f6h7qsb88nvyzsp"; + vendorSha256 = "sha256-BRLDV/9dXS82V8B0dxExiSMBq2MkIfC5//2tOrcZY7c="; doCheck = false; From a1a75336c38d643663bfc4044e658d07141c5ea3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 06:30:00 +0000 Subject: [PATCH 044/111] cpp-utilities: 5.11.3 -> 5.12.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 3f5b7b3db91d..3eae15c58d0a 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.11.3"; + version = "5.12.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a/fuzZ8crmyO87QzIKuYPk0LC3EvvHZrWO17LtWu77I="; + sha256 = "sha256-rpbD3x7zIJCDZuu4K0wDkaBKSBh36amtza/wE3rb0HM="; }; nativeBuildInputs = [ cmake ]; From e26c3587d390d45b5de22bda6025b2cd6394e237 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 08:32:08 +0100 Subject: [PATCH 045/111] python3Packages.flux-led: 0.28.8 -> 0.28.10 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 548e8534b5b2..e5c7ea3251ea 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.8"; + version = "0.28.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-/dEIrTkioqHBJouqk9pTsR0Xhkd6FoIjjOc5HwMBGrI="; + sha256 = "sha256-kH+0W+MgdA7+owqC5KsOnqCidErCaQ3mEueZdP8eAS0="; }; propagatedBuildInputs = [ From 8cc3513d49d4211664b67f657f39e95b0c070c46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 08:33:53 +0100 Subject: [PATCH 046/111] python3Packages.meshtastic: 1.2.58 -> 1.2.75 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index d50bdc4d461b..9ddabb97ec83 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.58"; + version = "1.2.75"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-USUqVzVfkp9X4zRl4D6gGDkJ/tRG3sN36MqcmJebwL4="; + sha256 = "sha256-VIeW7RloEIBU7YNG7f2e8PdFR+FauIwKLkd7v4qRCOA="; }; propagatedBuildInputs = [ From 0d8d66ca5f7bb94d4d654def9b311010ccbc127e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 08:18:40 +0000 Subject: [PATCH 047/111] dyff: 1.4.6 -> 1.4.7 --- pkgs/development/tools/dyff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 90f4881be055..3e228badbd5d 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-xODOKKMGlpMePwO3A4IVReqsR1Kx0CwBjrhsvN+uDR4="; + sha256 = "sha256-0/pn+Ld7o4gBnddA+uMzBhrFnov1XoqpRGkTT/vNH3Y="; }; - vendorSha256 = "sha256-W882fD4O4lPVH27KWmkRsS58R6qw7ENhKA2UgpNKvTw="; + vendorSha256 = "sha256-9FkRazgZlzwvimsbqWCYJLxwRRlHa0i/jPPuf+AGSOA="; subPackages = [ "cmd/dyff" From 9f786dea838b07e749f8d77257e5917f70201876 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 09:19:18 +0000 Subject: [PATCH 048/111] expenses: 0.2.2 -> 0.2.3 --- pkgs/applications/misc/expenses/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 052a7905f5b3..c123acd469eb 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "expenses"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "expenses"; rev = "v${version}"; - sha256 = "sha256-CaIbLtP7ziv9UBQE+QsNnqX65OV+6GIvkLwKm1G++iY="; + sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0="; }; - vendorSha256 = "sha256-NWTFxF4QCH1q1xx+hmVmpvDeOlqH5Ai2+0ParE5px9M="; + vendorSha256 = "sha256-Ac3f17Ws3Ne8Zo0vT+qlaMm/rhak9ua2jh5jlT6jF2Y="; - # package does not contain any tests as of v0.2.2 + # package does not contain any tests as of v0.2.3 doCheck = false; buildInputs = [ sqlite ]; From 88aa0c5bf1b80b1392b88e80a2d3aff52f15ab23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 10:20:55 +0100 Subject: [PATCH 049/111] python3Packages.identify: 2.4.4 -> 2.4.5 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 79d141c6a8bc..da18e5a9236b 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.4"; + version = "2.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G819m1mMtk5v1paMf9vdK/m/gbq08NNHM1bfW7jb+JA="; + sha256 = "sha256-VXQ9lyouwAuw2iGr1m/2KFklUFgmQOP2/gwInATKB4k="; }; checkInputs = [ From 8a389486588764a6811d56c1c45b02f76223ff54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 11:25:02 +0100 Subject: [PATCH 050/111] python3Packages.denonavr: 0.10.9 -> 0.10.10 --- pkgs/development/python-modules/denonavr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 238295ffefbf..480902cf4e76 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.9"; + version = "0.10.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "scarface-4711"; repo = pname; rev = version; - sha256 = "sha256-Y0sFRKnKZAdP95EyE3h1g92AJeT0Xkshjjwfv/vnfW8="; + sha256 = "sha256-ZL04JJZStOr6egoki85qCQrXoSTTO43RlLVbNBVz3QA="; }; propagatedBuildInputs = [ From 607b4ca82bbd76655e843231330e58bd49b65891 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 11:28:44 +0100 Subject: [PATCH 051/111] python3Packages.denonavr: enable test --- pkgs/development/python-modules/denonavr/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 480902cf4e76..9922522138b6 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -42,11 +42,6 @@ buildPythonPackage rec { pytest-timeout ]; - disabledTestPaths = [ - # https://github.com/ol-iver/denonavr/issues/228 - "tests/test_denonavr.py" - ]; - pythonImportsCheck = [ "denonavr" ]; From 00844298cb4e617359ddc981e525505b482f3b39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 10:29:43 +0000 Subject: [PATCH 052/111] fstar: 2021.12.25 -> 2022.01.15 --- pkgs/development/compilers/fstar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 43bdbda81846..25abd7949071 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2021.12.25"; + version = "2022.01.15"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "RmXKv/admC1w26z/ClNhH11J8n87WTfDr2lYOF6Fx7I="; + sha256 = "sha256-bK3McF/wTjT9q6luihPaEXjx7Lu6+ZbQ9G61Mc4KoB0="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 60dce83995a9d2110068f11e0cb0729e32d728ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jan 2022 10:28:29 +0000 Subject: [PATCH 053/111] tree-sitter: 0.20.2 -> 0.20.3 --- pkgs/development/tools/parsing/tree-sitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 29fafb6493c8..c2feb6138e73 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -29,9 +29,9 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.20.2"; - sha256 = "sha256-XCTS58q1XCl7XH6SLTZDZv22nUPBK8d4oqk063ZObkg="; - cargoSha256 = "sha256-fKS9Q3BFGzyMnbNH6ItYnPj4dybeX7ucQfzYiOxVvhA="; + version = "0.20.3"; + sha256 = "sha256-I0jHuW9bcaJrp49gHqbWQCPiTtxgMK6hFVlVj3x/zBA="; + cargoSha256 = "sha256-9qbCQYdpGxPrZMiNmG5ZrqyuYbhSeADaYOgnn+zHDog="; src = fetchFromGitHub { owner = "tree-sitter"; From 61f4f686c5f24662dae2263012c887e0658f0544 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 24 Jan 2022 12:06:08 +0100 Subject: [PATCH 054/111] tree-sitter: 0.20.3 -> 0.20.4 --- pkgs/development/tools/parsing/tree-sitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index c2feb6138e73..79dd9a6b57d4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -29,9 +29,9 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.20.3"; - sha256 = "sha256-I0jHuW9bcaJrp49gHqbWQCPiTtxgMK6hFVlVj3x/zBA="; - cargoSha256 = "sha256-9qbCQYdpGxPrZMiNmG5ZrqyuYbhSeADaYOgnn+zHDog="; + version = "0.20.4"; + sha256 = "sha256-H/7j4HnaccmaH5m/FMTbi01uA3JtKVHiJLTQ4VZ7jfo="; + cargoSha256 = "sha256-Pf/gVBQFssOomzq0IZp5H7MYwvFBRjMYfifLKCB7DCs="; src = fetchFromGitHub { owner = "tree-sitter"; From a39a11681a437b3151336ea866e1315a084c2996 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 24 Jan 2022 12:07:15 +0100 Subject: [PATCH 055/111] tree-sitter: handle errors in update script --- pkgs/development/tools/parsing/tree-sitter/update.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 118d33601c90..3bce9868912b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -398,7 +398,11 @@ let res=$(${curl}/bin/curl "''${args[@]}") if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then - echo "rate limited" >&2 # + echo "rate limited" >&2 + exit 1 + elif [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "Bad credentials" ]]; then + echo "bad credentials" >&2 + exit 1 fi printf "%s" "$res" | ${jq}/bin/jq 'map(.name)' \ From d5a2fbcf8da108a88f9c468baeb2a9a784bae87a Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 24 Jan 2022 12:09:51 +0100 Subject: [PATCH 056/111] tree-sitter: allow token-less execution --- pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 3bce9868912b..815a1dcbb064 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -366,7 +366,7 @@ let set -euo pipefail args=( '--silent' ) - if [ -n "$GITHUB_TOKEN" ]; then + if [ -n "''${GITHUB_TOKEN:-}" ]; then args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" ) fi args+=( "https://api.github.com/repos/${urlEscape orga}/${urlEscape repo}/releases/latest" ) @@ -390,7 +390,7 @@ let set -euo pipefail args=( '--silent' ) - if [ -n "$GITHUB_TOKEN" ]; then + if [ -n "''${GITHUB_TOKEN:-}" ]; then args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" ) fi args+=( 'https://api.github.com/orgs/${urlEscape orga}/repos?per_page=100' ) From a7c14c9aa9d17a6a98b9806e6102a0a806e50018 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 24 Jan 2022 12:15:56 +0100 Subject: [PATCH 057/111] tree-sitter: print `{ lib }:` in update script --- pkgs/development/tools/parsing/tree-sitter/update.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 815a1dcbb064..328c0e8bb6df 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -436,7 +436,8 @@ let mkdir -p "$outputDir" ${foreachSh allGrammars ({name, orga, repo}: ''${updateGrammar { inherit orga repo; }} > $outputDir/${name}.json'')} - ( echo "{" + ( echo "{ lib }:" + echo "{" ${foreachSh allGrammars ({name, ...}: '' # indentation hack From 15e1696532ef874befb555cde22d7a240f5669df Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 24 Jan 2022 12:18:04 +0100 Subject: [PATCH 058/111] tree-sitter: update grammars --- .../tools/parsing/tree-sitter/grammars/default.nix | 3 +-- .../parsing/tree-sitter/grammars/tree-sitter-c-sharp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-comment.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-cpp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-cuda.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-elixir.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-elm.json | 8 ++++---- .../grammars/tree-sitter-embedded-template.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-glsl.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-go.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-haskell.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-heex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-java.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-latex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-llvm.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-norg.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-org.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-perl.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-query.json | 8 ++++---- .../tools/parsing/tree-sitter/grammars/tree-sitter-r.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-regex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-rst.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-ruby.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-supercollider.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-swift.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-tlaplus.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-typescript.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-vim.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-zig.json | 8 ++++---- 30 files changed, 117 insertions(+), 118 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index e8039b1bd940..a001573b4827 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -1,5 +1,4 @@ { lib }: - { tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json; tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json; @@ -55,8 +54,8 @@ tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; - tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; tree-sitter-org = lib.importJSON ./tree-sitter-org.json; + tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index efd5be612847..487f3a27e072 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "3104df21065af0f3d51e05a96cd0e2ff16a6f982", - "date": "2021-12-09T21:13:54+00:00", - "path": "/nix/store/1xgrz7rm6mc6j2svaidj4x0zyda0ahz4-tree-sitter-c-sharp", - "sha256": "14g8x5q4xc87s2wpycws6r6ci083j7pk1jdw6sr8qp96zyzs17pp", + "rev": "352a4630c81a7a5cbd3bc67327743bd8d38f2dd2", + "date": "2022-01-03T12:31:17+00:00", + "path": "/nix/store/c7k10h98vzqag0rsywm0p71jaz57880x-tree-sitter-c-sharp", + "sha256": "198n5i9bvks0mmbqgzjgrhv6hy1afnx806jnap10241iyd817jbf", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index c25aebe78a72..56e0ad099ce3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-comment", - "rev": "5dd3c62f1bbe378b220fe16b317b85247898639e", - "date": "2021-10-01T17:13:56-05:00", - "path": "/nix/store/isrc5wlyxvcawfj35yi4nmblshy69b1j-tree-sitter-comment", - "sha256": "1wk6lxzndaikbrn72pa54y59qs0xnfaffc8mxmm6c5v5x16l8vb3", + "rev": "6975eb268f42df2afc313f96c0693e284685dba7", + "date": "2022-01-22T20:58:19-05:00", + "path": "/nix/store/nl4whdipy7a4g3ds2yv3c0qr7z4pifwn-tree-sitter-comment", + "sha256": "009krarzs9qykd8fas67gychjzcbgj8j0jm9h0963dlxs4hyay73", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 32f4a9cd64f8..47c6b811ff16 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "e8dcc9d2b404c542fd236ea5f7208f90be8a6e89", - "date": "2021-10-28T08:16:36-05:00", - "path": "/nix/store/d08ymiv4qjs9hnc8b0yw700da47879wb-tree-sitter-cpp", - "sha256": "1h0q4prr8yf714abz16i2ym41sskmilmga521sxv9d75kqhyb3wl", + "rev": "656d7ea44b2b0daece78791e30281e283f30001e", + "date": "2022-01-17T09:06:11-06:00", + "path": "/nix/store/w4qqya24zf0cd7rqw1440szrrad8nf23-tree-sitter-cpp", + "sha256": "0vfgv9rw8pw4d41p5rndy7cjw8w0k0vnn54cwpxkm3r2vblnjn58", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index 7eb34545b416..d9fb78dd2723 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "bc20ed7a36031437a69a88ef368af4b9f1ecec70", - "date": "2021-12-10T00:43:38+01:00", - "path": "/nix/store/zagrgq7zfh6n90z4qpp8cy002g588dhj-tree-sitter-cuda", - "sha256": "04gnfjq5rd1vcby8737wxhzmg4vmn2ggjz6n94bbna8b96qc1xxj", + "rev": "14cd86e18ba45e327017de5b3e0f8d8f7f8e98ec", + "date": "2022-01-24T00:39:28+01:00", + "path": "/nix/store/3lskjrhqd16ymvsbrwzcsdd80cyr7ljj-tree-sitter-cuda", + "sha256": "09qpl5mfv39788smz87zbzp04i3rdhsckjjqngvr0w24dsw30nyx", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index 3041fe7610fa..b0bad04a86fb 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "1b3ecf7765979a5602bbb8988b8fc0d9f4c887d6", - "date": "2021-12-15T23:29:48+01:00", - "path": "/nix/store/ahdmwdlw7g63wf681cvclxh92mp8waba-tree-sitter-elixir", - "sha256": "09kmi989hp2fp7w1xsambnlnp49fnnivdh45pwz9y3dab8iyngsn", + "rev": "de20391afe5cb03ef1e8a8e43167e7b58cc52869", + "date": "2022-01-10T10:35:12-06:00", + "path": "/nix/store/099pwd7iv86g1j4fplgq33a4jpwbvv60-tree-sitter-elixir", + "sha256": "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index e5ab2be11133..3618413500e1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elm-tooling/tree-sitter-elm", - "rev": "8dd06afd9ca60a420374c6b65831e58a1d1237ad", - "date": "2021-07-26T03:59:46+02:00", - "path": "/nix/store/pz5nbdx19mdq6dp238l1qc3n81l2i88f-tree-sitter-elm", - "sha256": "1mncr0nvb616zn2172pqcjd2jrqzyfad0y1pz2mwh8pqwfr0c3nf", + "rev": "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd", + "date": "2021-12-27T23:25:02+01:00", + "path": "/nix/store/l5b9nhvrnq4a105rpmfi59dpg2xqs5nr-tree-sitter-elm", + "sha256": "1ls9l81nkcyym92n6h983m3jjjxdlr27nxa21p9l6czwf34564ky", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 53cac3040afc..266de6ad18b5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "1c03594a44df1fc2020b989d503cb084abd5fd01", - "date": "2021-03-04T10:06:18-08:00", - "path": "/nix/store/09b9drfnywcy1i8wlw6slnn76ch40kqk-tree-sitter-embedded-template", - "sha256": "0c9l4i6kwb29zp05h616y3vk2hhcfc8bhdf9m436bk47pfy2zabg", + "rev": "d21df11b0ecc6fd211dbe11278e92ef67bd17e97", + "date": "2021-12-23T08:53:16-08:00", + "path": "/nix/store/zy74brmd1x2q68bpvi5v4z52bhmkcmy8-tree-sitter-embedded-template", + "sha256": "0h3nj6fz512riyx2b65pg9pjprkpkasnglwljlzi6s1in9fdig3x", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index 9a0adc92f381..0b67ae1632de 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "26ba31a3f5a85ebed5d71e49eef11a003bed782b", - "date": "2021-11-22T08:02:47+01:00", - "path": "/nix/store/khlrphky7p7qdivnn34r8hxlpzgav3xm-tree-sitter-glsl", - "sha256": "0qvn45whhd6q4wwqaihfd90197xr8lcynwjj418hxl83m9zy8xcz", + "rev": "ffb93961426926554a0ba4a389ea6e9d6fafdea9", + "date": "2022-01-24T11:15:06+01:00", + "path": "/nix/store/x508b69xq0y2ly4hspkgyq5g0v29xvjz-tree-sitter-glsl", + "sha256": "1b91wamhdzqq76l9k3vkmrdb1j98w5slzw8d4piqlgp70j396813", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 7e7ef382bae2..622f2863290c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "1203c11e422c73350e672445c5c32b8c0f79266d", - "date": "2021-12-03T14:22:11-08:00", - "path": "/nix/store/5h584m7qgvlh0s5k10503zj3idggandz-tree-sitter-go", - "sha256": "03i63mh5g21y424pf9whl42p7shqp9xlrx90xpyrd12dlc9zhh2j", + "rev": "0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75", + "date": "2022-01-06T10:54:10+01:00", + "path": "/nix/store/bw2hilbj37ys9lig2fzz58cvjy7nhn3l-tree-sitter-go", + "sha256": "0kgy4yyd0z8pydldnfwsfw2iwbhn4f43qxfhy94wvpwiwi74kfmg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 230c534ce950..31114781f58c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02", - "date": "2021-11-14T23:21:37+01:00", - "path": "/nix/store/n36iwva3hk2045wx87mahbsfrqhx6mbw-tree-sitter-haskell", - "sha256": "0clqyd1mnfz8xcpsr90nzh6j37pdgbgrr4jqf9ifn6m851k4f09g", + "rev": "d6ccd2d9c40bdec29fee0027ef04fe5ff1ae4ceb", + "date": "2022-01-07T03:13:04+01:00", + "path": "/nix/store/biyjfajma7nr175xviaw65jksqfak893-tree-sitter-haskell", + "sha256": "0zfxi3adqhy7d1w2dvnywkms8a4vfxkjswdhar7p5sxyps8a5wry", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 99eb38b7adb2..b6ff0d8a3260 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "625a721ac38d9dd23d4f2b08eceb6700a2e670d5", - "date": "2021-10-19T12:18:28-07:00", - "path": "/nix/store/pr36q25xgnpmywm53w6rg58ygs9l93wj-tree-sitter-heex", - "sha256": "1r7wrb1h2l35wp0hlswb3xpwcf55dr56r865sriq3ngv89y64yha", + "rev": "d8b5b9f016cd3c7b0ee916cf031d9a2188c0fc44", + "date": "2022-01-23T20:01:08-08:00", + "path": "/nix/store/iv3vxp8cdnfhpr75gvqvm8hmvfw8hw51-tree-sitter-heex", + "sha256": "0dx6l9k6l5ibvrdb7x13lqnpj5nmjz8f5lc8j8wh4cq2jdabfw0k", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 2d7079a97c78..6f9344437bfa 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "ed3a87f750b1d1d533f15ab93fef3e1f5a46e234", - "date": "2021-10-17T09:05:07+02:00", - "path": "/nix/store/crd0zzw31hx5jw7m95dvpssr3pi60k5l-tree-sitter-java", - "sha256": "14qwmpm7dzqwby59vy1nhyddfz2lpf69ajr65s7qaqh0jcs6rs19", + "rev": "a24ae7d16de3517bff243a87d087d0b4877a65c5", + "date": "2022-01-12T08:57:59-08:00", + "path": "/nix/store/dipis7syj55xrmc72gvx2f9q672mn6dg-tree-sitter-java", + "sha256": "0p01xkxzdjwx32hd6k4kqidlhkgj8q9b9lp4g4fra5gx9w159iqm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index c41e4237b767..bfa5df37337e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "2c0d03a36ee979bc697f6a9dd119174cf0ef15e0", - "date": "2021-07-19T17:50:34+02:00", - "path": "/nix/store/vrpfbjfps3bd9vrx8760l0vx7m7ijhja-tree-sitter-latex", - "sha256": "0dfpdv5sibvajf2grlc0mqhyggjf6ip9j01jikk58n1yc9va88ib", + "rev": "6f796b700c69a8af28132e84ed6d0c8f0c17a5e2", + "date": "2022-01-11T19:20:05+01:00", + "path": "/nix/store/48rdm71qngr9szsfhr85708srwn6b4ra-tree-sitter-latex", + "sha256": "0rbaql6jh3kwa4fap3b438l1733h2pbiazdbjzv38bbigkirad0n", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json index 6fbe13182fec..caa2f13a358c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json @@ -1,9 +1,9 @@ { "url": "https://github.com/benwilliamgraham/tree-sitter-llvm", - "rev": "d4f61bed8ecb632addcd5e088c4f4cb9c1bf1c5b", - "date": "2021-10-03T12:19:51-04:00", - "path": "/nix/store/k9vpa9lvrvf1im6wx0c0xyjf2yzgbn0x-tree-sitter-llvm", - "sha256": "0iiigra7knvwsb6v76qs7vxpkmfnggakd27gl6sz9dm6gimp1adp", + "rev": "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d", + "date": "2021-12-27T14:02:51-05:00", + "path": "/nix/store/hjg9z82l3iqyjw0s9lf1kkm31p5wlv3d-tree-sitter-llvm", + "sha256": "0ymrdcajji11852c158w67mgcsycphwj9mh777q3n4jn8pp37y8j", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 7feaee05a865..189301c7293e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "665736e400cfd52ae92ead244ca9f5d44db98151", - "date": "2021-12-14T15:04:57+01:00", - "path": "/nix/store/crbl24rj54f8c9pjq8igadz3wqcw6qrw-tree-sitter-norg", - "sha256": "0hxar07a7n3ghqagr0qjxbz4sgzcpyxwgd4dbj1vvy4xnk07i0br", + "rev": "c4be6addec0a8ada234684ced6c928189fd399af", + "date": "2022-01-22T17:12:52+01:00", + "path": "/nix/store/x73fgsrav1fg0vzydcy4ayrawn0cw7w2-tree-sitter-norg", + "sha256": "14wf53p6lkf4xknzb4bngh9fsas6hnr8iv73xnalyf8mqq1977pc", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json index 038a4f51eece..23df3b743c7e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json @@ -1,9 +1,9 @@ { "url": "https://github.com/milisims/tree-sitter-org", - "rev": "39a377f5072ee9f79884e227dc49d42c2eba67d8", - "date": "2021-11-01T23:43:23-04:00", - "path": "/nix/store/cgsn53p4gp1ahq2zl38jz51xal60dckf-tree-sitter-org", - "sha256": "0vfnph4xxvkalzk3rgvzi6ckqkjg31ddzgh4mwbk7qwsacbq9rss", + "rev": "f110024d539e676f25b72b7c80b0fd43c34264ef", + "date": "2021-11-28T23:04:31-05:00", + "path": "/nix/store/8vc7ddhd2wzrin3cj14zrw5mmi58f8sl-tree-sitter-org", + "sha256": "1gvqvdapqfac1ny1a0l590h1w617wczwv234fsnal6amfdyganxc", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index fd07357b6bb8..9585b6c60768 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "0ac2c6da562c7a2c26ed7e8691d4a590f7e8b90a", - "date": "2021-11-01T14:40:51-04:00", - "path": "/nix/store/1yzkap7jvps3xdj19pygyv1bn6c33qak-tree-sitter-perl", - "sha256": "184zaicrl9i4cywhyc2cxpghw7daz9pi0fhwkkgpv7j6kvp1ig2w", + "rev": "ab2b39439f2fc82fd5ea0b7e08509760d4cbacd5", + "date": "2022-01-23T13:55:11-05:00", + "path": "/nix/store/s55aybm3r5n7l7nx916mhjyry96xcvin-tree-sitter-perl", + "sha256": "16ap0yq9gmh0kbyka7zcpjw3dl368n23sxp3v82z4ccwzmgfmaw4", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json index 8f70551443fa..4da8b33c4852 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-query", - "rev": "9a2ccff9f672f1f3d320cf925b8e5acc89b27055", - "date": "2021-07-13T08:51:40-05:00", - "path": "/nix/store/k843gr9rlkd5jaf9arvlwcs31wsznn81-tree-sitter-query", - "sha256": "0x5ssq8pb767s1l68123jaa5p4570xmz74ii94kckd46wmqbk4v9", + "rev": "5217c6805c09f8fc00ed13d17d5fcb791437aee6", + "date": "2021-12-23T16:48:02-05:00", + "path": "/nix/store/b8n553bwlyzi05p8vn08qv6vbzg9875q-tree-sitter-query", + "sha256": "00q6cpw5rkb20cypx820glqhfs4vsgqdymj5y0sknd874lq6crfg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index dd644745aea2..dc339fe1fd65 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,9 +1,9 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "91f587e5685f46e26f9f6e55f2e06d503f8f0fc0", - "date": "2021-12-03T10:44:27-05:00", - "path": "/nix/store/z89yfih6g05fkrzz6s7snkyqp8wj8pi5-tree-sitter-r", - "sha256": "0dds34vgrvgxi1918a2w6xcw5l8n9ch3qi43vql769p8zxf8qijp", + "rev": "d9868735e401e4870a3d4422790b585fea3faec8", + "date": "2022-01-10T10:12:40-05:00", + "path": "/nix/store/b2dp06sk8s3ksm382gndshhd1mxmd6n6-tree-sitter-r", + "sha256": "1pl38gksb4cwdgrb92rbmkanxn65m99i6c8w8xldhs0q97d1v5k0", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json index b07344339855..3a2c6f258ae3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-regex", - "rev": "7b97502cfc3ffa7110f6b68bb39fb259c9a0500c", - "date": "2021-08-17T11:21:39-07:00", - "path": "/nix/store/3lpj820c141i26p20kin465xlr5jpyjs-tree-sitter-regex", - "sha256": "0n9lmwwgij00078v3fr19vfn1g3wh3agm8jqp80v1cnrcsmpn97p", + "rev": "e1cfca3c79896ff79842f057ea13e529b66af636", + "date": "2022-01-03T09:37:11-08:00", + "path": "/nix/store/24lr7jzznsd3z7cld007aww25kbwcf51-tree-sitter-regex", + "sha256": "0j6j0h8ciyhgmcq9iy3843anyfvd7s0biqzgbsqgwbgbqbg2nfwl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json index 23506e55ede9..db200508b4bc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-rst", - "rev": "a5514617ae3644effa80d4696be428e4a371c01a", - "date": "2021-11-05T20:58:51-05:00", - "path": "/nix/store/is0j0cpd3i7q7liqlcrfdflabmm9rnlg-tree-sitter-rst", - "sha256": "1bw0yry968qz4arzckxpyz5zkw6ajyirrxyf78m9lr1zmz1vnivy", + "rev": "b74770c0166f28c1a0ab293513a78712ca1c338b", + "date": "2022-01-22T20:59:44-05:00", + "path": "/nix/store/ymhzq6hwq43gf918zyxk7can4qfkz7n1-tree-sitter-rst", + "sha256": "0q50vwk72lrgnrdjjn5aj1fjksrwkd0gfmdnrjy59a6cw8m1gmf0", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index e9df62ad10fd..86320373d7ea 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "888e2e563ed3b43c417f17e57f7e29c39ce9aeea", - "date": "2021-12-03T16:33:06+01:00", - "path": "/nix/store/6g101r5pwy6iqicch9srlhwfz9xdrvzd-tree-sitter-ruby", - "sha256": "0xfcqafslxlpkw7agw4a179w3c6k6ivi3fzlf32pqfd5bjrlx9d7", + "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", + "date": "2021-03-03T16:54:30-08:00", + "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", + "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 2f6ac50b07da..1479f09e0673 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "d045b04b66d51c0ba8671e7ce1ee23a9f286b7d7", - "date": "2021-12-12T10:08:54-08:00", - "path": "/nix/store/2h6vkl05jxqgp4738a0dxccmg40yhqvj-tree-sitter-rust", - "sha256": "0ckyaw1ll3yazyg18wd40kc09h6f0zmwqmahsm07bwgfyc2nvf3h", + "rev": "eeb0702ebdac504b97196577b1dac43c80913d7b", + "date": "2022-01-10T13:05:56-08:00", + "path": "/nix/store/sh170d6b589l16rhlygz6hvn1dmfhlb1-tree-sitter-rust", + "sha256": "1npx8kc4qdjj1fszqx6ks1d0x0pklmzm3gkxracs7y28lh2whrvq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index 26f6d7bc0bc8..7dcf59de2ff0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -1,9 +1,9 @@ { "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider", - "rev": "ac83e9d5ef3a62d2160d0f1e0a64a949ecda1d8b", - "date": "2021-12-21T18:04:07+01:00", - "path": "/nix/store/zk5zwg98pljk2dwqax81pib3l68wgl8x-tree-sitter-supercollider", - "sha256": "0qpjy40wigcf6r23j2i3yqr061n6zdz60mlm9i5mkii2y65ff8cf", + "rev": "a7201b61779be59ac0fc0d118746c886dbc3edbd", + "date": "2022-01-14T01:11:12+01:00", + "path": "/nix/store/rgy05854am625shbs13gjx0yggbb6awh-tree-sitter-supercollider", + "sha256": "118mbv8d5n2lb4w5cbjy657g9z9z910gvjjj41a2rkx971vgb6w3", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json index 0c7fbb0d1add..7232c7b54aca 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-swift", - "rev": "a22fa5e19bae50098e2252ea96cba3aba43f4c58", - "date": "2019-10-24T19:04:02-06:00", - "path": "/nix/store/pk5xk8yp6vanbar75bhfrs104w0k1ph0-tree-sitter-swift", - "sha256": "14b40lmwrnyvdz2wiv684kfh4fvqfhbj1dgrx81ppmy7hsz7jcq7", + "rev": "db675450dcc1478ee128c96ecc61c13272431aab", + "date": "2022-01-13T10:47:55-08:00", + "path": "/nix/store/l3535ndrmi24v5nidxppi1rqccj4s17v-tree-sitter-swift", + "sha256": "06mq1an55p75ajwn6pvcy9vlcmzrj8qmbri3mn4bxq53icnj4fya", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index cf939daf9cc6..86e9a86bbcc0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "26bbaf5d07356cacbf21defa9316988bc732c8b3", - "date": "2021-10-12T19:50:03-04:00", - "path": "/nix/store/52rs1n8y6krfkb9z2h7jsl4s3j15dp08-tree-sitter-tlaplus", - "sha256": "1yj2hjc48sjjpysjgyji7nx2l0rpc5dnsm68i8amff5wcag5lyhw", + "rev": "ffa98bbbd80e425f07e92bf511e64c8b0dffc1c7", + "date": "2022-01-23T09:32:54-05:00", + "path": "/nix/store/rbxa4biim19pwiz6gmh0ag5cz68rws3k-tree-sitter-tlaplus", + "sha256": "0j8bwxdvdhfhvpiahbf0hr9hfkbg75p7qpxx2i1rgvidavflbpiv", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 063ecbbb57e3..fc04fd069e4f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "111b07762e86efab9a918b7c721f720c37e76b0a", - "date": "2021-11-09T11:34:06-08:00", - "path": "/nix/store/kndz7jkpl2adcaac64j7y9sb6zd7mp5h-tree-sitter-typescript", - "sha256": "1364bm3wbqqzvp03cvpx1w89bbqynb1v62i46gy7f6rhib9bf63a", + "rev": "e8e8e8dc2745840b036421b4e43286750443cb13", + "date": "2022-01-10T13:42:45-08:00", + "path": "/nix/store/zl36qsk7pd9pcawfsy368axax97d83wz-tree-sitter-typescript", + "sha256": "1z1v7fjgp418qsp0xkycfpvc8vm4a2ai5kx10xif1dvjpfgcj1qq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index 79a31402ad7f..bb57181f00f6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "1d23679256edb241ebed8da1247e340bf9e0c0ad", - "date": "2021-10-18T11:21:06+02:00", - "path": "/nix/store/5a4kihij5jcdpn73i3m7av82k4pvvzpy-tree-sitter-viml", - "sha256": "1660y9n1s76xcv0z27kzbbsr9bdv4c4xakzglzhl7z7qcylxg2rr", + "rev": "274b004d226a6686546ef83231f0f836b91700ae", + "date": "2022-01-21T14:12:20+01:00", + "path": "/nix/store/lpl3kbb5kwawr71m6qhqrwj1adkll540-tree-sitter-viml", + "sha256": "01bmn3l3fsi1r36ak72ly0v8fr62wchida965c60244bfg2s4r2c", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 98a30d08ac44..5ab34fb0e25b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "cf93353d5682c3e9d8112d448ff24d4de7b2304e", - "date": "2021-11-25T20:46:40+09:00", - "path": "/nix/store/jwrs3fdgdqymjkrni6mlz1j0f0ai6h9y-tree-sitter-zig", - "sha256": "04ja9w28zprw575s4734d02ibi498whh3z7cxm3m1fdydhjsdlrj", + "rev": "93331b8bd8b4ebee2b575490b2758f16ad4e9f30", + "date": "2022-01-10T15:22:15+09:00", + "path": "/nix/store/g54w7vid7nf9shzfipch646dk4d88ah7-tree-sitter-zig", + "sha256": "0irckd6bh3i1vr5bi2lwsbvibbpih3jv3xqdq0dbsiy447dfiv50", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 2ced62da40b41033588581dab130a61157fbe2b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 11:24:39 +0000 Subject: [PATCH 059/111] globalarrays: 5.8 -> 5.8.1 --- pkgs/development/libraries/globalarrays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index a2e983ece83d..0a8b372a52fc 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "globalarrays"; - version = "5.8"; + version = "5.8.1"; src = fetchFromGitHub { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "0bky91ncz6vy0011ps9prsnq9f4a5s5xwr23kkmi39xzg0417mnd"; + sha256 = "sha256-IyHdeIUHu/T4lb/etGGnNB2guIspual8/v9eS807Qco="; }; nativeBuildInputs = [ autoreconfHook gfortran ]; From 7c7e244719b74f6a8c1ac3cc538a6feae388ad6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 11:32:02 +0000 Subject: [PATCH 060/111] xcowsay: 1.5.1 -> 1.6 --- pkgs/games/xcowsay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/xcowsay/default.nix b/pkgs/games/xcowsay/default.nix index 89ca50b3a332..52569e044f06 100644 --- a/pkgs/games/xcowsay/default.nix +++ b/pkgs/games/xcowsay/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xcowsay"; - version = "1.5.1"; + version = "1.6"; src = fetchurl { url = "http://www.nickg.me.uk/files/xcowsay-${version}.tar.gz"; - sha256 = "sha256-wypsfAp634wbaAI+fxzmr3J5AmvQzChVi/wp/BPxiA0="; + sha256 = "sha256-RqzoZP8o0tIfS3BY8CleGNAEGhIMEHipUfpDxOD1yMU="; }; buildInputs = [ From e70ba2998d36c8817d7b06b9854d4fcaa91443f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 03:52:47 -0800 Subject: [PATCH 061/111] aws-vault: 6.3.1 -> 6.4.0 (#156374) --- pkgs/tools/admin/aws-vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index afc493c3b6a1..a6865961128a 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "6.3.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yNmjoCq9fYzt/lZQlVgxQvxKWCh5Lxd4NSX7c+gE/As="; + sha256 = "sha256-5cBQFkagDfMb8xvEQgWlVbYp++mXIHl2p5TZuiaO4Rw="; }; - vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw="; + vendorSha256 = "sha256-iRJjN+fG5tFhMvHHR3pnWW8Y9VWopuKVv/AgivJC4Eo="; nativeBuildInputs = [ installShellFiles makeWrapper ]; From e7dbfd7ece0e8f11ef0617919cc5597258eda90f Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Mon, 24 Jan 2022 12:53:05 +0100 Subject: [PATCH 062/111] terraform.withPlugins: clean and remove 0.12 support (#155477) Now that the terraform 0.12 compatibility is not needed anymore, the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations can be simplified. Instead of building a bunch of bin wrappers on instantiation, the providers are now stored in `$out/libexec/terraform-providers/////_/terraform-provider-_v` and then a simple `buildEnv` can be used to merge them. This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. --- .../from_md/release-notes/rl-2205.section.xml | 18 +++++++ .../manual/release-notes/rl-2205.section.md | 5 ++ .../cluster/terraform-providers/default.nix | 15 ++++-- .../networking/cluster/terraform/default.nix | 48 +++---------------- 4 files changed, 41 insertions(+), 45 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index f1c6644b67e1..ea2388c1bdb1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -397,6 +397,24 @@ ~/.local/share/polymc/polymc.cfg. + + + The terraform 0.12 compatibility has been removed and the + terraform.withPlugins and + terraform-providers.mkProvider + implementations simplified. Providers now need to be stored + under + $out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version> + (which mkProvider does). + + + This breaks back-compat so it’s not possible to mix-and-match + with previous versions of nixpkgs. In exchange, it now becomes + possible to use the providers from + nixpkgs-terraform-providers-bin + directly. + + pkgs.noto-fonts-cjk is now deprecated in diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 525955f8c9f4..673a82a408c1 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -124,6 +124,11 @@ In addition to numerous new and upgraded packages, this release has the followin - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. +- The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under +`$out/libexec/terraform-providers/////_/terraform-provider-_v` (which mkProvider does). + + This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. + - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` and `pkgs.noto-fonts-cjk-serif` because they each have different release schedules. To maintain compatibility with prior releases of Nixpkgs, diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 47bd402a2240..8690e65be88c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -19,7 +19,8 @@ let , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ , deleteVendor ? false , proxyVendor ? false - , provider-source-address + , # Looks like "registry.terraform.io/vancluever/acme" + provider-source-address }@attrs: buildGoModule { pname = repo; @@ -34,9 +35,15 @@ let inherit owner repo rev sha256; }; - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv $NIX_BUILD_TOP/go/bin/${repo}{,_v${version}}"; + # Move the provider to libexec + postInstall = '' + dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} + mkdir -p "$dir" + mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" + rmdir $out/bin + ''; + + # Keep the attributes around for later consumption passthru = attrs; }; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index bc179ea55eb1..a5e92bedef6a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, buildEnv , buildGoModule , fetchFromGitHub , makeWrapper @@ -62,9 +63,9 @@ let babariviere kalbasit marsam + maxeaubrey timstott zimbatm - maxeaubrey zowoq ]; }; @@ -76,39 +77,6 @@ let let actualPlugins = plugins terraform.plugins; - # Make providers available in Terraform 0.13 and 0.12 search paths. - pluginDir = lib.concatMapStrings - (pl: - let - inherit (pl) version GOOS GOARCH; - - pname = pl.pname or (throw "${pl.name} is missing a pname attribute"); - - # This is just the name, without the terraform-provider- prefix - plugin_name = lib.removePrefix "terraform-provider-" pname; - - slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}"; - - shim = writeText "shim" '' - #!${runtimeShell} - exec ${pl}/bin/${pname}_v${version} "$@" - ''; - in - '' - TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version} - mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)" - - cp ${shim} "$TF_0_13_PROVIDER_PATH" - chmod +x "$TF_0_13_PROVIDER_PATH" - - TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version} - - cp ${shim} "$TF_0_12_PROVIDER_PATH" - chmod +x "$TF_0_12_PROVIDER_PATH" - '' - ) - actualPlugins; - # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" @@ -134,18 +102,16 @@ let terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) else - lib.appendToName "with-plugins" (stdenv.mkDerivation { + lib.appendToName "with-plugins" (buildEnv { inherit (terraform) name meta; + paths = actualPlugins; nativeBuildInputs = [ makeWrapper ]; - - buildCommand = pluginDir + '' - mkdir -p $out/bin/ + postBuild = '' + mkdir -p $out/bin makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ - --set NIX_TERRAFORM_PLUGIN_DIR $out/plugins \ + --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; - - inherit passthru; }); in withPlugins (_: [ ]); From b3e385753b0ff04c1190961aff540f7f1e694d2d Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Fri, 21 Jan 2022 01:53:04 +0900 Subject: [PATCH 063/111] orchis-theme: add withWallpapers option --- pkgs/data/themes/orchis-theme/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index ef7f88e3e955..666166e0a9d2 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -6,6 +6,7 @@ , gtk-engine-murrine , sassc , tweaks ? [ ] # can be "solid" "compact" "black" "primary" +, withWallpapers ? false }: let @@ -42,6 +43,10 @@ rec { installPhase = '' runHook preInstall bash install.sh -d $out/share/themes -t all ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} + ${lib.optionalString withWallpapers '' + mkdir -p $out/share/backgrounds + cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds + ''} runHook postInstall ''; From 1abaf88baef399a3502bf10073d6f4fc2eb26359 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 12:00:43 +0000 Subject: [PATCH 064/111] goreleaser: 1.2.5 -> 1.3.1 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 14fea30a45d2..446f401dae6e 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.2.5"; + version = "1.3.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FIUp3l3CwtQeFvdXqY3HoaARBmlXqNfl7zUz3ND8ixI="; + sha256 = "sha256-QFb702/v+fSzPWJ+hIGAXqVYfLpecA4sOFM+r8QvdYE="; }; - vendorSha256 = "sha256-f7EKdffnDUzzyueMM8pHfU3XdQNcIrFf9miVsVTIdM8="; + vendorSha256 = "sha256-LZ2fVFvctLw/X2IX8p5/2D3qvoOYmGWhvef6HoeAGeE="; ldflags = [ "-s" From 786b8a718d83694c03d34979e9bf8f2bac83c770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 12:08:06 +0000 Subject: [PATCH 065/111] gosec: 2.9.5 -> 2.9.6 --- pkgs/development/tools/gosec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index baadebe53a07..a7eb80366c4c 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.9.5"; + version = "2.9.6"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YXAUDICQhZFeafP/wezd+dLpXpd7waz3wUCVCwVb12I="; + sha256 = "sha256-eDzLVoOPYm8WG07dfi6s+xtBliCwf1LXoHxQ10YWs1A="; }; - vendorSha256 = "sha256-Mob8XxTALtuG9q7gMWKvp1k2cUDKI0QHAeXfQK47NDo="; + vendorSha256 = "sha256-ELfbdrMMeK6ZG+hnibhHNB+k/Zvkepl+cbUx+E/Dvr8="; subPackages = [ "cmd/gosec" From f547487c918cccbd9b6ea1830692890cfdfa727e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 13:00:31 +0000 Subject: [PATCH 066/111] heimer: 3.1.0 -> 3.2.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 1510c992f354..74b50db5b8da 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-F0Pl6Wk+sGfOegy7iljQH63kAMYlRYv7G9nBAAtDEkg="; + sha256 = "sha256-aAFhShsC3FLGgtF/8XJbWIMBEO3/gcGeDZei69Luz+s="; }; nativeBuildInputs = [ cmake ]; From e06dfabe6ecff752b0b3f1b25129eda62c43dcee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 13:14:10 +0000 Subject: [PATCH 067/111] htpdate: 1.3.1 -> 1.3.3 --- pkgs/tools/networking/htpdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index dbf97e5ce71b..482d01342bb8 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.3"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = pname; rev = "v${version}"; - sha256 = "JPaxbu7LlGV+Bh5qxVxeNSPnMQNqLaLYWBRbpETSpQs="; + sha256 = "sha256-/xZxwEui8V5kyfGsmwRRkiyhj7lcJQaTmOjBihvdWg8="; }; makeFlags = [ From 4c8a08d231aad83ddc57a676d7e7e34a0ded4362 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 Jan 2022 14:40:02 +0100 Subject: [PATCH 068/111] tuigreet: 0.7.1 -> 0.7.2 --- pkgs/os-specific/linux/tuigreet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/os-specific/linux/tuigreet/default.nix index ede1dc38053f..581b89fb1c64 100644 --- a/pkgs/os-specific/linux/tuigreet/default.nix +++ b/pkgs/os-specific/linux/tuigreet/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tuigreet"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "apognu"; repo = pname; rev = version; - sha256 = "sha256-Ecp79q/xN6KDAD346ANzunTM3xW+z5UaRy/lblOCLaE="; + sha256 = "sha256-Mu4GGlX7ZjBaBECXRD6iJCqDMSzcj17BriJ6Nas0J70="; }; - cargoSha256 = "sha256-eam+85c2y+eNSOlfhO7oIhGqy0HPyi3FuqxHBDkZRVE="; + cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs="; meta = with lib; { description = "Graphical console greter for greetd"; From 37596fe4a9dc2832fde6e6de335c5114dda88efc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 13:42:06 +0000 Subject: [PATCH 069/111] imgproxy: 3.1.3 -> 3.2.1 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 8b1011069e92..f4ef0636b02b 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.1.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-aQ+EKUsqmsdCvEeKNNoF2Sj5+BN8yuhJAbL4BnYWINM="; + sha256 = "sha256-89LBpENzDIvlRfNeigSvzBrprw8MRsdRZMQ5qUs0wI8="; rev = "v${version}"; }; From d54a7e72a68de12e7746a9815c842c288b96990f Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 24 Jan 2022 08:58:30 -0500 Subject: [PATCH 070/111] python3Packages.pymdown-extensions: remove period from description Co-authored-by: Martin Weinelt --- pkgs/development/python-modules/pymdown-extensions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 49fa42a30e34..94a73fd82112 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions; meta = with lib; { - description = "Extensions for Python Markdown."; + description = "Extensions for Python Markdown"; homepage = "https://facelessuser.github.io/pymdown-extensions/"; license = with licenses; [ mit bsd2 ]; maintainers = with maintainers; [ cpcloud ]; From 14d6955a46a1781ff2e45a78a31e448711f6971c Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Mon, 24 Jan 2022 15:00:51 +0100 Subject: [PATCH 071/111] corsmisc: remove Upstream no longer exists --- pkgs/tools/security/corsmisc/default.nix | 25 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/tools/security/corsmisc/default.nix diff --git a/pkgs/tools/security/corsmisc/default.nix b/pkgs/tools/security/corsmisc/default.nix deleted file mode 100644 index 4c64677f3240..000000000000 --- a/pkgs/tools/security/corsmisc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "corsmisc"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "drsigned"; - repo = pname; - rev = "v${version}"; - sha256 = "18a70v093jl85vnih80i50wvac8hsg3f2gmcws9jyhj2brndq2qj"; - }; - - vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; - - meta = with lib; { - description = "Tool to discover CORS misconfigurations vulnerabilities"; - homepage = "https://github.com/drsigned/corsmisc"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a77e2d21ad2c..4e1921437bb1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -157,6 +157,7 @@ mapAliases ({ couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 + corsmisc = throw "corsmisc has been removed (upstream is gone)"; # added 2022-01-24 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # 2022-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 332d8125297b..6ccf0b37aa05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1633,8 +1633,6 @@ with pkgs; corsair = with python3Packages; toPythonApplication corsair-scan; - corsmisc = callPackage ../tools/security/corsmisc { }; - cosign = callPackage ../tools/security/cosign { inherit (darwin.apple_sdk.frameworks) PCSC; }; From 5b8b4164fe3609154423ebdd396b5e88d195e83b Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Mon, 24 Jan 2022 15:03:19 +0100 Subject: [PATCH 072/111] sigurlx: remove Upstream no longer exists --- pkgs/tools/security/sigurlx/default.nix | 25 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/tools/security/sigurlx/default.nix diff --git a/pkgs/tools/security/sigurlx/default.nix b/pkgs/tools/security/sigurlx/default.nix deleted file mode 100644 index b6908c274228..000000000000 --- a/pkgs/tools/security/sigurlx/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "sigurlx"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "drsigned"; - repo = pname; - rev = "v${version}"; - sha256 = "1q5vy05387qx7h4xcccvn2z2ks1kiff3mfbd2w3w0l0a4qgz74xs"; - }; - - vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; - - meta = with lib; { - description = "Tool to map the attack surface of web applications"; - homepage = "https://github.com/drsigned/sigurlx"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4e1921437bb1..1393fa310770 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -925,6 +925,7 @@ mapAliases ({ shared_mime_info = shared-mime-info; # added 2018-02-25 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 + sigurlx = throw "sigurlx has been removed (upstream is gone)"; # added 2022-01-24 skrooge2 = skrooge; # added 2017-02-18 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; skype = skypeforlinux; # added 2017-07-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ccf0b37aa05..3eeadb5c4a8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21846,8 +21846,6 @@ with pkgs; sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; - sigurlx = callPackage ../tools/security/sigurlx { }; - sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; From cad3bc9b8eae8230bd9edeb63f19490e7d6132e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jan 2022 16:42:24 +0000 Subject: [PATCH 073/111] signal-cli: 0.10.1 -> 0.10.2 --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 98ac99345bff..bca45576db71 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.10.1"; + version = "0.10.2"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "sha256-xj/fR/scfzOPxkWB79OhA129V7QG7QUkAbw1bNgzVas="; + sha256 = "sha256-etCO7sy48A7aL3mnXWitClNiw/E122G4eD6YfVmXEPw="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; From 5762b8c8a5bfd7fdc7a8e8eaf95d41f687882b08 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Jan 2022 15:35:04 +0100 Subject: [PATCH 074/111] irods: Don't use builtins.nixVersion The value of builtins.nixVersion should never be used except to bail out if it's too old. It causes the evaluation result to depend on the version of Nix, so e.g. the binary cache doesn't work. --- pkgs/tools/filesystems/irods/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 87bb2b9051ce..fa80e024e3db 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -17,7 +17,7 @@ "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" - "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}" + "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0" "-DCPACK_GENERATOR=TGZ" "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1" ]; From 4a46547008f47672262ced00c0862b42b2c8f81f Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 24 Jan 2022 08:54:13 -0600 Subject: [PATCH 075/111] expenses: install shell completion --- pkgs/applications/misc/expenses/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index c123acd469eb..2c31f24b6b1b 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -1,8 +1,8 @@ { lib - , buildGoModule , fetchFromGitHub , sqlite +, installShellFiles }: buildGoModule rec { @@ -21,12 +21,21 @@ buildGoModule rec { # package does not contain any tests as of v0.2.3 doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ sqlite ]; ldflags = [ "-s" "-w" "-X github.com/manojkarthick/expenses/cmd.Version=${version}" ]; + postInstall = '' + installShellCompletion --cmd expenses \ + --bash <($out/bin/expenses completion bash) \ + --zsh <($out/bin/expenses completion zsh) \ + --fish <($out/bin/expenses completion fish) + ''; + meta = with lib; { description = "An interactive command line expense logger"; license = licenses.mit; From 3fb41650985708c483cc1470a7a3122c36b71405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 24 Jan 2022 15:51:36 +0100 Subject: [PATCH 076/111] libreswan: Fix ExecStopPost paths --- pkgs/tools/networking/libreswan/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 6062b1ecfff5..4df0471bbd8d 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -14,6 +14,7 @@ , curl , nspr , bash +, runtimeShell , iproute2 , iptables , procps @@ -71,8 +72,9 @@ stdenv.mkDerivation rec { prePatch = '' # Correct iproute2 and iptables path - sed -e 's|/sbin/ip|${iproute2}/bin/ip|' \ + sed -e 's|/sbin/ip|${iproute2}/bin/ip|g' \ -e 's|/sbin/\(ip6\?tables\)|${iptables}/bin/\1|' \ + -e 's|/bin/bash|${runtimeShell}|g' \ -i initsystems/systemd/ipsec.service.in \ programs/barf/barf.in \ programs/verify/verify.in From d38cf78e0e886031bfcefda0e5ba3712fd58246e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 15:31:10 +0000 Subject: [PATCH 077/111] koreader: 2021.12.1 -> 2022.01 --- pkgs/applications/misc/koreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 74319262d5ce..38ad131bc146 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.12.1"; + version = "2022.01"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-Ia0oCSGs6UYcvZVEhNpiOh3D08FgXqjqpgsQJojd3dk="; + sha256 = "sha256-XuIYNvGhzJ649LxVPit2AOmb+YOHtZA4AhDyxjaB5OE="; }; sourceRoot = "."; From f26f2358001a8f10436ed166f4d2d07bb8698dc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 16:40:29 +0100 Subject: [PATCH 078/111] python3Packages.cyclonedx-python-lib: 1.1.1 -> 1.2.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index a0baa0e50f01..6b4097a007f3 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-gyqpd3kAW74ax3+ECVEmu4un2N0Xyl/aid4VrBihHxI="; + hash = "sha256-CrRtFo4wb/+4S0A4A68G4fxRWHi9pumXGNOsyW6t2Zc="; }; nativeBuildInputs = [ From 040139e4a8fb94326c2ad4bee6eec16137d343cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 16:40:49 +0100 Subject: [PATCH 079/111] python3Packages.cyclonedx-python-lib: 1.2.0 -> 1.3.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 6b4097a007f3..26546c3f7cb0 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-CrRtFo4wb/+4S0A4A68G4fxRWHi9pumXGNOsyW6t2Zc="; + hash = "sha256-/1kWvhTUS0JT0RwodiivJSUiWIDwQyXxdjF/KUlCNds="; }; nativeBuildInputs = [ From ed6b342fc3a76908afe4cd7cdbc0f6eaf33082da Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 24 Jan 2022 12:41:45 -0300 Subject: [PATCH 080/111] retroarchFull: use lib.meta.availableOn --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eeadb5c4a8e..2b1abfda0aec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33482,7 +33482,7 @@ with pkgs; retroarchFull = retroarch.override { cores = builtins.filter # Remove cores not supported on platform - (c: c ? libretroCore && (builtins.elem stdenv.hostPlatform.system c.meta.platforms)) + (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) (builtins.attrValues libretro); }; From f0e9f54d6e27ef1960edaf306efebd42b94087c6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 24 Jan 2022 12:45:43 -0300 Subject: [PATCH 081/111] lib/meta: fix typo in platformMatch comment --- lib/meta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meta.nix b/lib/meta.nix index bc3387646f26..5b1f7ee5ff2d 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -78,7 +78,7 @@ rec { 2. (modern) a pattern for the platform `parsed` field. - We can inject these into a patten for the whole of a structured platform, + We can inject these into a pattern for the whole of a structured platform, and then match that. */ platformMatch = platform: elem: let From b3ca14d0fd7a5627ff70acba832d894f9c096079 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 24 Jan 2022 17:09:41 +0100 Subject: [PATCH 082/111] ncspot: 0.9.3 -> 0.9.5 --- pkgs/applications/audio/ncspot/default.nix | 18 +++++++++------- .../audio/ncspot/rust_1_57_support.patch | 21 +++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/audio/ncspot/rust_1_57_support.patch diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 6ba52306e8c4..fc7ab505ac2d 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -1,22 +1,26 @@ { stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv -, withALSA ? true, alsa-lib ? null -, withPulseAudio ? false, libpulseaudio ? null -, withPortAudio ? false, portaudio ? null -, withMPRIS ? false, dbus ? null +, withALSA ? true, alsa-lib +, withPulseAudio ? false, libpulseaudio +, withPortAudio ? false, portaudio +, withMPRIS ? false, dbus }: rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-k4EGyQjjJCvUhp56OjYl63n+giI05GiIS2++I1SVhCg="; + sha256 = "sha256-HnP0dXKkMssDAhrsA99bTCVGdov9t5+1y8fJ+BWTM80="; }; - cargoSha256 = "sha256-YsjInqmkPnAwqgRBDiwcLH0DDqCF0NElrn+WO2v+ATM="; + # Upstream now only supports rust 1.58+, but this version is not yet available in nixpkgs. + # See https://github.com/hrkfdn/ncspot/issues/714 + patches = [ ./rust_1_57_support.patch ]; + + cargoSha256 = "sha256-g6UMwirsSV+/NtFIfEZrz5h/OitPQcDeSawh7wq4TLI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/ncspot/rust_1_57_support.patch b/pkgs/applications/audio/ncspot/rust_1_57_support.patch new file mode 100644 index 000000000000..ce4d473989c3 --- /dev/null +++ b/pkgs/applications/audio/ncspot/rust_1_57_support.patch @@ -0,0 +1,21 @@ +diff --git a/src/ui/listview.rs b/src/ui/listview.rs +index 17fead7..e6c72b6 100644 +--- a/src/ui/listview.rs ++++ b/src/ui/listview.rs +@@ -85,7 +85,7 @@ impl ListView { + + pub fn content_height_with_paginator(&self) -> usize { + let content_len = self.content.read().unwrap().len(); +- log::info!("content len: {content_len}"); ++ log::info!("content len: {}", content_len); + + // add 1 more row for paginator if we can paginate + if self.can_paginate() { +@@ -97,7 +97,7 @@ impl ListView { + + fn can_paginate(&self) -> bool { + let loaded = self.get_pagination().loaded_content(); +- log::info!("can paginate: {loaded}"); ++ log::info!("can paginate: {}", loaded); + self.get_pagination().max_content().unwrap_or(0) > self.get_pagination().loaded_content() + } From f243b177d5577a6d3a7be5052e938091f3bf017f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 24 Jan 2022 13:33:27 -0300 Subject: [PATCH 083/111] havoc: 0.3.1 -> 0.4.0 --- .../terminal-emulators/havoc/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix index 5df53be3b92a..e31d119d6cf9 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/applications/terminal-emulators/havoc/default.nix @@ -1,20 +1,32 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, libxkbcommon, wayland, wayland-protocols }: +{ lib +, stdenv +, fetchFromGitHub +, libxkbcommon +, pkg-config +, wayland +, wayland-protocols +}: stdenv.mkDerivation rec { - pname = "havoc"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ii8"; repo = pname; rev = version; - sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k"; + hash = "sha256-zNKDQqkDeNj5fB5EdMVfAs2H4uBgLh6Fp3uSjiJ1VhQ="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxkbcommon wayland wayland-protocols ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxkbcommon + wayland + wayland-protocols + ]; dontConfigure = true; @@ -26,8 +38,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A minimal terminal emulator for Wayland"; homepage = "https://github.com/ii8/havoc"; + description = "A minimal terminal emulator for Wayland"; license = with licenses; [ mit publicDomain ]; platforms = with platforms; unix; maintainers = with maintainers; [ AndersonTorres ]; From 60638a2dc5f7f8d2b3925af8ba5772a181094612 Mon Sep 17 00:00:00 2001 From: gruve-p Date: Mon, 24 Jan 2022 12:50:29 +0100 Subject: [PATCH 084/111] groestlcoin_hash: init at 1.0.1 --- .../groestlcoin_hash/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/groestlcoin_hash/default.nix diff --git a/pkgs/development/python-modules/groestlcoin_hash/default.nix b/pkgs/development/python-modules/groestlcoin_hash/default.nix new file mode 100644 index 000000000000..8bad39da293c --- /dev/null +++ b/pkgs/development/python-modules/groestlcoin_hash/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "groestlcoin_hash"; + version = "1.0.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Nkco8ZA0rJaT9Mx4NIcptMvzd4h0BsRn2+gomdesirg="; + }; + + pythonImportsCheck = [ + "groestlcoin_hash" + ]; + + meta = with lib; { + description = "Bindings for groestl key derivation function library used in Groestlcoin"; + homepage = "https://pypi.org/project/groestlcoin_hash/"; + maintainers = with maintainers; [ gruve-p ]; + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c9f6fc733f3..5dd95885c270 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3510,6 +3510,8 @@ in { grip = callPackage ../development/python-modules/grip { }; + groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { }; + grpc-google-iam-v1 = callPackage ../development/python-modules/grpc-google-iam-v1 { }; grpcio = callPackage ../development/python-modules/grpcio { }; From af2b1f15b4ee693cfb40234e5ec01424d40bafdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 16:51:45 +0000 Subject: [PATCH 085/111] steampipe: 0.12.0 -> 0.12.1 --- pkgs/tools/misc/steampipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index f018fdd35ee9..68e828a07b1c 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-ApY3h6CqOJMWmIindp5TqWczSU50TBiS89lYzSzj8EM="; + sha256 = "sha256-vDyox8UArgK27FkNFK3SNksvOmpaRgZ/ueZgqO7MOl0="; }; vendorSha256 = "sha256-ikmcayOy87u6XMYjxxzFv35Rlp9oTteEKFOPr/+xc2Y="; From 24822e28f8f59604fc39570696e180673db2473e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 16:53:11 +0000 Subject: [PATCH 086/111] lazygit: 0.31.4 -> 0.32.2 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 2e06ed3829a8..5eb03edd6d02 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.31.4"; + version = "0.32.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yze4UaSEbyHwHSyj0mM7uCzaDED+p4O3HVVlHJi/FKU="; + sha256 = "sha256-tawsBfHz6gq8va9YLtCwp9Ec8EWcvhdbYwdVtvvtJeY="; }; vendorSha256 = null; From 2a82cd67b5453c126db511243defbe13d18f2d9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 17:10:01 +0000 Subject: [PATCH 087/111] lego: 4.5.3 -> 4.6.0 --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index cec4f2981298..00566f174cfc 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.5.3"; + version = "4.6.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xvTV6jZmQWs6g8Oq+IrwPZVS3fzY1/adg7IWh189ftU="; + sha256 = "sha256-FisQS/qbl7f4aszc2Ft6nmuHNrDreOQdN0jrWMOvaAk="; }; - vendorSha256 = "sha256-EK2E2YWdk2X1awdUhMOJh+qr+jnnftnKuPPpiHzXZHk="; + vendorSha256 = "sha256-cLM4YGguQf7lO5PUPmd/at1Aqrp9m8zFG6GWqcduJmw="; doCheck = false; From 93a5b04b9aa673902424dbad8e635650eacfd564 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 09:26:40 -0800 Subject: [PATCH 088/111] scs: 3.0.0 -> 3.1.0 (#155857) --- pkgs/development/libraries/science/math/scs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 10ea82f93d26..a945e99ec9cb 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; rev = version; - sha256 = "sha256-Lly28KDDZ5hJyiMOhiX/3VaKs0iPcSqizOurZevhfCo="; + sha256 = "sha256-yoh25DmvY7fohAvABCiSLkvr7TskGd0ED2K3rIa/IeM="; }; # Actually link and add libgfortran to the rpath From 911ef6778ea4328ad741b6a20effbce69da9fa0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 18:08:13 +0000 Subject: [PATCH 089/111] log4j-sniffer: 1.2.0 -> 1.6.0 --- pkgs/tools/security/log4j-sniffer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix index 0a6bd4dd5abf..86b6bf00f54a 100644 --- a/pkgs/tools/security/log4j-sniffer/default.nix +++ b/pkgs/tools/security/log4j-sniffer/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "log4j-sniffer"; - version = "1.2.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "palantir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q9PwUzHmcTYKMl0dVR5owB/UXYv5ZgmvRK0S6vOBFT8="; + sha256 = "sha256-ffutvIxXhA0fCN6mSUwv6F+SO/ab6hLiaVJeatZo57w="; }; vendorSha256 = null; From 84c9735af51da3a3136efeaf179d3dbb23ac964e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 18:47:52 +0000 Subject: [PATCH 090/111] python310Packages.aenum: 3.1.6 -> 3.1.8 --- pkgs/development/python-modules/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index d80b564ea9cb..a360959a9a73 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.6"; + version = "3.1.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3ba2c25dd03fbf3992353595be18152e2fb6042f47b526ea66cd5838bb9f1fb6"; + sha256 = "8dbe15f446eb8264b788dfeca163fb0a043d408d212152397dc11377b851e4ae"; }; checkInputs = [ From 8bd7d6d6e0994aea4d2f2d42b7283db497dd5c30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 10:51:44 -0800 Subject: [PATCH 091/111] star: 2.7.9a -> 2.7.10a (#155868) --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 4328bbd975a8..3555929a33ea 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.9a"; + version = "2.7.10a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "sha256-p1yaIbSGu8K5AkqJj0BAzuoWsXr25eCNoQmLXYQeg4E="; + sha256 = "sha256-qwddCGMOKWgx76qGwRQXwvv9fCSeVsZbWHmlBwEqGKE="; }; sourceRoot = "source/source"; From 3e2706a0eb7b7c7b7c71ca8fe675a07db3ebecd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 10:51:35 +0000 Subject: [PATCH 092/111] python310Packages.bond-api: 0.1.15 -> 0.1.16 --- pkgs/development/python-modules/bond-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix index b230491de8c5..a685c01fbc0f 100644 --- a/pkgs/development/python-modules/bond-api/default.nix +++ b/pkgs/development/python-modules/bond-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bond-api"; - version = "0.1.15"; + version = "0.1.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "prystupa"; repo = "bond-api"; rev = "v${version}"; - sha256 = "sha256-Uoz5knqRAtQkD7u/4oylXC60dR2ZU3AuMJNhmvB8fP4="; + sha256 = "1nqf090b14nd7an2n776mb37yskddfnihmas2fy56pxclwvwqr9n"; }; propagatedBuildInputs = [ From b67fc5a3e5b9345d8e66701fca29e3ee0980204e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 09:10:02 +0000 Subject: [PATCH 093/111] python310Packages.total-connect-client: 2021.12 -> 2022.1 --- .../python-modules/total-connect-client/default.nix | 4 ++-- 1 file changed, 2 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 2c71d0a17828..e602041cf4ae 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2021.12"; + version = "2022.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-cgs6wIMSO8t8CPn6aR35sNcgfDaXDyFBldNEBOr850s="; + hash = "sha256-sFVjAIFhTZf1z9XUTukHvNl8/ITL6FMOnZMMDKP7X30="; }; propagatedBuildInputs = [ From 493d141d065d29afa731de27e284eb768c71b329 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 12:36:08 -0800 Subject: [PATCH 094/111] stunnel: 5.61 -> 5.62 (#155644) --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 5b73e7d3fb48..c42e78c933d9 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.61"; + version = "5.62"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-keoMpkgtj359lx7mSrT4aigX0DijcvCJPigxXvIBXXo="; + sha256 = "sha256-nPW7lJAiqmbHNsEyZVTMon0GQWBaY3AnTtxJUetb0zk="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; From 8477e53482b36a2e5f01b928863f3c1c36609916 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 22 Jan 2022 04:20:00 +0000 Subject: [PATCH 095/111] spotdl: 3.7.2 -> 3.9.2 --- pkgs/tools/audio/spotdl/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 2ecfba8772f6..c3904a711581 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.7.2"; + version = "3.9.2"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-ftSnlruSv+RtvjTpZPYg9Z2EK4th8NbDhVlG2eIc87s="; + sha256 = "sha256-Y4l86OjAEwNt2i9+OFgol3b6nhbpe27NFTKJrLKQgHg="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -22,11 +22,10 @@ python3.pkgs.buildPythonApplication rec { rapidfuzz mutagen ytmusicapi - tqdm beautifulsoup4 requests unidecode - youtube-dl + yt-dlp ]; checkInputs = with python3.pkgs; [ From 5c09fe1887a09b482aaf2b7213d8c9032b52c81a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 12:51:10 -0800 Subject: [PATCH 096/111] libsForQt5.qcoro: 0.3.0 -> 0.4.0 * libsForQt5.qcoro: 0.3.0 -> 0.4.0 (#155990) * libsForQt5.qcoro: don't build on aarch64 Co-authored-by: Renaud --- pkgs/development/libraries/qcoro/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 62608e390f8b..d5d3fd8ba1bb 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "qcoro"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "09543hpy590dndmlxmcm8c58m97blhaii4wbjr655qxdanhhxgzi"; + sha256 = "sha256-RVpyL+BklX8Wyk9Xj9UyuvNK5Vev8ZsrOSMxX1HtcHU="; }; outputs = [ "out" "dev" ]; @@ -34,5 +34,6 @@ mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ smitop ]; platforms = platforms.linux; + badPlatforms = platforms.aarch64; }; } From 3a879825374b7c696398c9fbbc29d005a713b34d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 12:52:06 -0800 Subject: [PATCH 097/111] video2midi: 0.4.0.2 -> 0.4.6.5 * video2midi: 0.4.0.2 -> 0.4.6.5 (#156000) * video2midi: use SPDX 3.0 license identifier Co-authored-by: Renaud --- pkgs/tools/audio/video2midi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index e8f5af70c87d..f8c50fda29c3 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -8,7 +8,7 @@ let }); in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.4.0.2"; + version = "0.4.6.5"; format = "other"; @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { owner = "svsdval"; repo = pname; rev = version; - sha256 = "174ijn8bc306529scd23szvgx1apanm2qmwk4lwmi64rhkm6dapx"; + sha256 = "0qzrxqhsxn0h71nfrsi9g78hx3pqm3b8sr6fjq01k4k6dd2nwfam"; }; propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; @@ -28,7 +28,7 @@ in pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Youtube synthesia video to midi conversion tool"; homepage = src.meta.homepage; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ ]; platforms = platforms.linux; }; From d0ed7ee0b040ba45609028663d6d2c686fee7820 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 2 Oct 2021 11:58:08 +0200 Subject: [PATCH 098/111] chromium: get-commit-message.py: Improve the parsing The latest announcement uses the following structure: "Google is aware the exploits for CVE-2021-37975 and CVE-2021-37976 exist in the wild." (https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop_30.html) --- .../networking/browsers/chromium/get-commit-message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index b0fbe20db8ef..85ebb8a7b935 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -39,7 +39,7 @@ for entry in feed.entries: print('chromium: TODO -> ' + version + '\n') print(url) if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) + zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) From e8b241cdbad6f7c0af4115c0d733874b02f5c54f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 24 Jan 2022 22:02:17 +0100 Subject: [PATCH 099/111] chromiumDev: Fix the configuration phase This fixes: -------------------------------------------------------------------------------- configuring ERROR at //ui/gtk/BUILD.gn:17:1: Assertion failed. assert(use_gio, "GIO is required for building with GTK") ^----- GIO is required for building with GTK See //content/shell/BUILD.gn:308:15: which caused the file to be included. deps += [ "//ui/gtk" ] ^--------- -------------------------------------------------------------------------------- But there's still another build issue(s) left: -------------------------------------------------------------------------------- [25491/48383] ACTION //components/url_formatter/spoof_checks/top_domains:generate_top_domain_list_variables_file(//build/toolchain/linux/unbundle:default)d_tmp/browser_command.mojom-webui.jsab_page_third_party.mojom-webui.js FAILED: gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc python3 ../../build/gn_run_binary.py make_top_domain_list_variables ../../components/url_formatter/spoof_checks/top_domains/domains.list top500_domains gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc make_top_domain_list_variables failed with exit code -4 ninja: build stopped: subcommand failed. -------------------------------------------------------------------------------- --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d9385ceb0427..74133a9d47e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -288,7 +288,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport; + use_gio = gnomeSupport || chromiumVersionAtLeast "99"; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; From 7916caf75964b01421fc3d40a3676908f36aa7ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 13:21:54 -0800 Subject: [PATCH 100/111] wpgtk: 6.1.3 -> 6.5.0 * wpgtk: 6.1.3 -> 6.5.0 (#155578) * wpgtk: use SPDX 3.0 license identifier Co-authored-by: Renaud --- pkgs/tools/X11/wpgtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 66464ae0b532..48b3bbffd324 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.1.3"; + version = "6.5.0"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "1jv28ygsd6ifjb096w3pm50za6wi62y45ycbizwhv7x56lr6zx1v"; + sha256 = "0gv607jrdfbmadjyy3pbrj5ksh1dmaw5hz7l8my2z7sh0ifds0n2"; }; buildInputs = [ @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf. ''; homepage = "https://github.com/deviantfero/wpgtk"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.melkor333 ]; }; From 32d086c4bb6838a7dd2a9cf2d67dd03fb7b887ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Mon, 24 Jan 2022 22:41:19 +0100 Subject: [PATCH 101/111] maintainers: format --- maintainers/maintainer-list.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 459b84817c2e..d6652aaecf18 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1918,12 +1918,10 @@ github = "cburstedde"; githubId = 109908; name = "Carsten Burstedde"; - keys = [ - { - longkeyid = "rsa2048/0x0704CD9E550A6BCD"; - fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; - } - ]; + keys = [{ + longkeyid = "rsa2048/0x0704CD9E550A6BCD"; + fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; + }]; }; cdepillabout = { email = "cdep.illabout@gmail.com"; @@ -6371,7 +6369,7 @@ keys = [{ longkeyid = "rsa4096/0x7248991EFA8EFBEE"; fingerprint = "01F5 0A29 D4AA 9117 5A11 BDB1 7248 991E FA8E FBEE"; - }]; + }]; }; kiwi = { email = "envy1988@gmail.com"; @@ -7026,7 +7024,7 @@ email = "nullarequest@vivlaid.net"; github = "Lunarequest"; githubId = 30698906; - name = "Advaith Madhukar"; #this is my legal name, I prefer Luna; please keep that in mind! + name = "Advaith Madhukar"; # this is my legal name, I prefer Luna; please keep that in mind! }; lionello = { email = "lio@lunesu.com"; @@ -11512,10 +11510,10 @@ name = "Justus K"; }; SubhrajyotiSen = { - email = "subhrajyoti12@gmail.com"; - github = "SubhrajyotiSen"; - githubId = 12984845; - name = "Subhrajyoti Sen"; + email = "subhrajyoti12@gmail.com"; + github = "SubhrajyotiSen"; + githubId = 12984845; + name = "Subhrajyoti Sen"; }; suhr = { email = "suhr@i2pmail.org"; From 61982fb66adc7902488942749479d970f04bc837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Mon, 24 Jan 2022 22:42:40 +0100 Subject: [PATCH 102/111] maintainers: update samuelgrf's email and keys --- maintainers/maintainer-list.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d6652aaecf18..9d1d35f01c4c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10622,14 +10622,20 @@ name = "Samuel Dionne-Riel"; }; samuelgrf = { - email = "git@samuelgrf.com"; + email = "s@muel.gr"; github = "samuelgrf"; githubId = 67663538; name = "Samuel Gräfenstein"; - keys = [{ - longkeyid = "rsa4096/0xEF76A063F15C63C8"; - fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8"; - }]; + keys = [ + { + longkeyid = "rsa4096/0xDE75F92E318123F0"; + fingerprint = "6F2E 2A90 423C 8111 BFF2 895E DE75 F92E 3181 23F0"; + } + { + longkeyid = "rsa4096/0xEF76A063F15C63C8"; + fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8"; + } + ]; }; samuelrivas = { email = "samuelrivas@gmail.com"; From 1c58cdbeed880e99d816c234a954d4cdfc073b6c Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 7 Nov 2021 20:49:45 +0100 Subject: [PATCH 103/111] nixos/modprobe: add boot.initrd.extraModprobeConfig option This option behaves exactly like `boot.extraModprobeConfig`, except that it also includes the generated modprobe.d file in the initrd. Many years ago, someone tried to include the normal modprobe.d/nixos.conf file generated by `boot.extraModprobeConfig` in the initrd: 0aa2c1dc46779a3df6c4e02d3fae39b0de297be8. This file contains a reference to a directory with firmware files inside. Including firmware in the initrd made it too big, so the commit was reverted again in 4a4c051a95b6b8da3a13d7955087e915e6dd4bf7. The `boot.extraModprobeConfig` option not changing the initrd caused me much confusion because I tried to set the maximum cache size for ZFS and it didn't work. Closes https://github.com/NixOS/nixpkgs/issues/25456. --- .../from_md/release-notes/rl-2205.section.xml | 8 ++++++++ .../manual/release-notes/rl-2205.section.md | 2 ++ nixos/modules/system/boot/modprobe.nix | 20 +++++++++++++++++++ nixos/modules/system/boot/stage-1.nix | 3 +++ 4 files changed, 33 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index ea2388c1bdb1..d1692c66a4ba 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -607,6 +607,14 @@ files. + + + A new option + boot.initrd.extraModprobeConfig has been + added which can be used to configure kernel modules that are + loaded in the initrd. + + fetchFromSourcehut now allows fetching diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 673a82a408c1..f2484c911e72 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -211,6 +211,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files. +- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd. + - `fetchFromSourcehut` now allows fetching repositories recursively using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index c75f32c4d99a..7426d148891f 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -34,6 +34,23 @@ with lib; type = types.lines; }; + boot.initrd.extraModprobeConfig = mkOption { + default = ""; + example = + '' + options zfs zfs_arc_max=1073741824 + ''; + description = '' + Does exactly the same thing as + , except + that the generated modprobe.conf + file is also included in the initrd. + This is useful for setting module options for kernel + modules that are loaded during early boot in the initrd. + ''; + type = types.lines; + }; + }; @@ -50,6 +67,9 @@ with lib; '')} ${config.boot.extraModprobeConfig} ''; + environment.etc."modprobe.d/nixos-initrd.conf".text = '' + ${config.boot.initrd.extraModprobeConfig} + ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; environment.systemPackages = [ pkgs.kmod ]; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 6dfe6b939abe..9c684fbada2c 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -338,6 +338,9 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } + { object = config.environment.etc."modprobe.d/nixos-initrd.conf".source; + symlink = "/etc/modprobe.d/nixos-initrd.conf"; + } { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; preferLocalBuild = true; From be8a4c32229928e486ea764a755105a9e20c154c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 24 Jan 2022 16:03:24 -0600 Subject: [PATCH 104/111] python3Packages.txtorcon: disable tests on aarch64-darwin --- pkgs/development/python-modules/txtorcon/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 42568bbca111..93c9c95a62ef 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -1,4 +1,4 @@ -{ lib, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted +{ lib, stdenv, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted , automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof , GeoIP}: @@ -22,6 +22,7 @@ buildPythonPackage rec { # as Python 3.5. disabled = pythonOlder "3.5"; + doCheck = !(stdenv.isDarwin && stdenv.isAarch64); checkPhase = '' ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES ./test ''; From 048d5eeabdce817afcda5580bc92c64a28af2278 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Mon, 24 Jan 2022 17:23:11 -0500 Subject: [PATCH 105/111] fcitx5-unikey: init at 5.0.7 (#154699) * fcitx5-unikey: init at 5.0.7 Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com> --- .../inputmethods/fcitx5/fcitx5-unikey.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix new file mode 100644 index 000000000000..05b1deeed9f0 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, fcitx5, fcitx5-qt +, ninja, gettext, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-unikey"; + version = "5.0.7"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-unikey"; + rev = version; + sha256 = "BFIqMmjIC29Z4rATZEf+qQWrULU9Wkuk6WOUXDEPO10="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + + buildInputs = [ fcitx5 fcitx5-qt ninja gettext ]; + + meta = with lib; { + description = "Unikey engine support for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-unikey"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ berberman ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3bf1f622988..b66f4e330805 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5228,6 +5228,8 @@ with pkgs; }; }; + fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; + fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; From e79bb564af849cab074452a9ed24208e0002c716 Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Mon, 24 Jan 2022 16:30:39 -0700 Subject: [PATCH 106/111] pdfstudio: merge with package pdfstudioviewer (#156274) * pdfstudio: merge with pdfstudioviewer and use FHS sandbox to fix printing Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com> --- pkgs/applications/misc/pdfstudio/common.nix | 98 +++++++++++++++ pkgs/applications/misc/pdfstudio/default.nix | 113 ++++++------------ .../misc/pdfstudioviewer/default.nix | 81 ------------- pkgs/top-level/all-packages.nix | 10 +- 4 files changed, 140 insertions(+), 162 deletions(-) create mode 100644 pkgs/applications/misc/pdfstudio/common.nix delete mode 100644 pkgs/applications/misc/pdfstudioviewer/default.nix diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix new file mode 100644 index 000000000000..7240e8a026e2 --- /dev/null +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -0,0 +1,98 @@ +{ pname +, src +, year +, version +, desktopName +, longDescription +, buildFHSUserEnv +, extraBuildInputs ? [] +, stdenv +, lib +, dpkg +, makeDesktopItem +, copyDesktopItems +, autoPatchelfHook +, sane-backends +, cups +, jdk11 +}: +let + thisPackage = stdenv.mkDerivation rec { + inherit pname src version; + strictDeps = true; + + buildInputs = [ + sane-backends #for libsane.so.1 + jdk11 + ] ++ extraBuildInputs; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "${pname}${year}"; + desktopName = desktopName; + genericName = "View and edit PDF files"; + exec = "${pname} %f"; + icon = "${pname}${year}"; + comment = "Views and edits PDF files"; + mimeType = "application/pdf"; + categories = "Office"; + type = "Application"; + terminal = false; + }) + ]; + + unpackCmd = "dpkg-deb -x $src ./${pname}-${version}"; + dontBuild = true; + + postPatch = '' + substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}" + substituteInPlace opt/${pname}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/pixmaps} + rm -rf opt/${pname}${year}/jre + cp -r opt/${pname}${year} $out/share/ + ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/ + ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname} + + runHook postInstall + ''; + }; + +in +# Package with cups in FHS sandbox, because JAVA bin expects "/usr/bin/lpr" for printing. +buildFHSUserEnv { + name = pname; + targetPkgs = pkgs: [ + cups + thisPackage + ]; + runScript = pname; + + # link desktop item and icon into FHS user environment + extraInstallCommands = '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/pixmaps" + ln -s ${thisPackage}/share/applications/*.desktop "$out/share/applications/" + ln -s ${thisPackage}/share/pixmaps/*.png "$out/share/pixmaps/" + ''; + + meta = with lib; { + homepage = "https://www.qoppa.com/${pname}/"; + description = "An easy to use, full-featured PDF editing software"; + longDescription = longDescription; + license = licenses.unfree; + platforms = platforms.linux; + mainProgram = pname; + maintainers = [ maintainers.pwoelfel ]; + }; +} diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 6b93cfb19c52..18e8136eb7b4 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -1,87 +1,42 @@ -{ stdenv -, lib +{ program ? "pdfstudioviewer" , fetchurl , libgccjit -, dpkg -, makeDesktopItem -, copyDesktopItems -, autoPatchelfHook -, sane-backends -, jdk11 +, callPackage }: -# See also package 'pdfstudioviewer' -# Differences are ${pname}, Download directory name (PDFStudio / PDFStudioViewer), -# sha256, and libgccjit (not needed for PDFStudioViewer) -let year = "2021"; -in -stdenv.mkDerivation rec { - pname = "pdfstudio"; - version = "${year}.1.2"; - strictDeps = true; - - src = fetchurl { - url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${ +{ + pdfstudio = callPackage ./common.nix rec { + pname = program; + year = "2021"; + version = "${year}.1.2"; + desktopName = "PDF Studio"; + longDescription = '' + PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer. + ''; + extraBuildInputs = [ + libgccjit #for libstdc++.so.6 and libgomp.so.1 + ]; + src = fetchurl { + url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${ builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; - sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45"; + }_linux64.deb"; + sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45"; + }; }; - buildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 - sane-backends #for libsane.so.1 - jdk11 - ]; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = "${pname}${year}"; - desktopName = "PDF Studio"; - genericName = "View and edit PDF files"; - exec = "${pname} %f"; - icon = "${pname}${year}"; - comment = "Views and edits PDF files"; - mimeType = "application/pdf"; - categories = "Office"; - type = "Application"; - terminal = false; - }) - ]; - - unpackPhase = "dpkg-deb -x $src ."; - dontBuild = true; - - postPatch = '' - substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}" - substituteInPlace opt/${pname}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}" - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share - mkdir -p $out/share/pixmaps - cp -r opt/${pname}${year} $out/share/ - rm -rf $out/share/${pname}${year}/jre - ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/ - ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname} - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.qoppa.com/pdfstudio/"; - description = "An easy to use, full-featured PDF editing software"; - license = licenses.unfree; - platforms = platforms.linux; - mainProgram = pname; - maintainers = [ maintainers.pwoelfel ]; + pdfstudioviewer = callPackage ./common.nix rec { + pname = program; + year = "2021"; + version = "${year}.1.2"; + desktopName = "PDF Studio Viewer"; + longDescription = '' + PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. + ''; + src = fetchurl { + url = "https://download.qoppa.com/${pname}/v${year}/PDFStudioViewer_v${ + builtins.replaceStrings [ "." ] [ "_" ] version + }_linux64.deb"; + sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6"; + }; }; -} +}.${program} diff --git a/pkgs/applications/misc/pdfstudioviewer/default.nix b/pkgs/applications/misc/pdfstudioviewer/default.nix deleted file mode 100644 index 9dc01108e657..000000000000 --- a/pkgs/applications/misc/pdfstudioviewer/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv -, lib -, fetchurl -, dpkg -, makeDesktopItem -, copyDesktopItems -, autoPatchelfHook -, sane-backends -, jdk11 -}: - -let year = "2021"; -in stdenv.mkDerivation rec { - pname = "pdfstudioviewer"; - version = "${year}.1.2"; - autoPatchelfIgnoreMissingDeps = false; - strictDeps = true; - - src = fetchurl { - url = "https://download.qoppa.com/${pname}/v${year}/PDFStudioViewer_v${ - builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; - sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6"; - }; - - buildInputs = [ - sane-backends - jdk11 - ]; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = "${pname}${year}"; - desktopName = "PDF Studio"; - genericName = "View and edit PDF files"; - exec = "${pname} %f"; - icon = "${pname}${year}"; - comment = "Views and edits PDF files"; - mimeType = "application/pdf"; - categories = "Office"; - type = "Application"; - terminal = false; - }) - ]; - - unpackPhase = "dpkg-deb -x $src ."; - dontBuild = true; - - postPatch = '' - substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}" - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share - mkdir -p $out/share/pixmaps - cp -r opt/${pname}${year} $out/share/ - rm -rf $out/share/${pname}${year}/jre - ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/ - ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname} - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.qoppa.com/pdfstudio/"; - description = "An easy to use, full-featured PDF editing software"; - license = licenses.unfree; - platforms = platforms.linux; - mainProgram = pname; - maintainers = [ maintainers.pwoelfel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b66f4e330805..6be40a111396 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24263,9 +24263,15 @@ with pkgs; foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { }; - pdfstudio = callPackage ../applications/misc/pdfstudio { }; + pdfstudio = import ../applications/misc/pdfstudio { + program = "pdfstudio"; + inherit callPackage fetchurl libgccjit; + }; - pdfstudioviewer = callPackage ../applications/misc/pdfstudioviewer { }; + pdfstudioviewer = import ../applications/misc/pdfstudio { + program = "pdfstudioviewer"; + inherit callPackage fetchurl libgccjit; + }; aeolus = callPackage ../applications/audio/aeolus { }; From 7976f70bae1f688a2d1a9e1863710c63bbc16b5f Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sat, 22 Jan 2022 12:53:14 +1000 Subject: [PATCH 107/111] ffmpeg_5: init at 5.0 --- ...missing-samples-dependency-to-fate-s.patch | 27 +++++++++++++++++++ pkgs/development/libraries/ffmpeg/5.nix | 14 ++++++++++ pkgs/development/libraries/ffmpeg/generic.nix | 4 ++- pkgs/top-level/all-packages.nix | 3 +++ 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch create mode 100644 pkgs/development/libraries/ffmpeg/5.nix diff --git a/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch b/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch new file mode 100644 index 000000000000..ac016069357d --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch @@ -0,0 +1,27 @@ +From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Sun, 16 Jan 2022 00:32:52 -0300 +Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest + +Signed-off-by: James Almer +(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345) +--- + tests/fate/ffmpeg.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak +index 0b00bb5b23..b80467d02e 100644 +--- a/tests/fate/ffmpeg.mak ++++ b/tests/fate/ffmpeg.mak +@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \ + -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \ + -f ac3 -flags +bitexact -c ac3_fixed + +-FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ ++FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ + SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \ + ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \ + AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \ +-- +2.33.1 + diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix new file mode 100644 index 000000000000..7b79ddff77eb --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -0,0 +1,14 @@ +{ callPackage +# Darwin frameworks +, Cocoa, CoreMedia, VideoToolbox +, ... +}@args: + +callPackage ./generic.nix (rec { + version = "5.0"; + branch = version; + sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0"; + darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; + + patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ]; +} // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 876910da6d25..8f74fbd5a3d5 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -54,6 +54,8 @@ let ifMinVer = minVer: flag: if reqMin minVer then flag else null; + ifVerOlder = maxVer: flag: if (lib.versionOlder branch maxVer) then flag else null; + # Version specific fix verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix; @@ -121,7 +123,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" "--enable-avdevice") "--enable-avfilter" (ifMinVer "0.6" "--enable-avformat") - (ifMinVer "1.0" "--enable-avresample") + (ifMinVer "1.0" (ifVerOlder "5.0" "--enable-avresample")) (ifMinVer "1.1" "--enable-avutil") "--enable-postproc" (ifMinVer "0.9" "--enable-swresample") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6be40a111396..80b4a6cfef08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16391,6 +16391,9 @@ with pkgs; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; }; + ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; + }; # Aliases ffmpeg_3 = ffmpeg_3_4; From abe84c21a9a45845f68eb02dcc5937ca34224dec Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Wed, 19 Jan 2022 11:05:12 -0700 Subject: [PATCH 108/111] neovim: add ldflag for treesitter plugins requiring libstdc++ --- pkgs/applications/editors/neovim/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 412a6f724956..7cec1025611f 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -113,6 +113,9 @@ in substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; + # For treesitter plugins, libstdc++.so.6 will be needed + NIX_LDFLAGS = [ "-lstdc++"]; + # export PATH=$PWD/build/bin:${PATH} shellHook='' export VIMRUNTIME=$PWD/runtime From 555014c67d27040c792be370734801e558b43022 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Mon, 15 Nov 2021 04:34:05 +0900 Subject: [PATCH 109/111] online-judge-tools: init at 11.5.1 --- .../online-judge-api-client/default.nix | 60 +++++++++++++++++++ .../online-judge-api-client/fix-paths.patch | 39 ++++++++++++ .../online-judge-tools/default.nix | 31 ++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 4 ++ 5 files changed, 136 insertions(+) create mode 100644 pkgs/development/python-modules/online-judge-api-client/default.nix create mode 100644 pkgs/development/python-modules/online-judge-api-client/fix-paths.patch create mode 100644 pkgs/development/python-modules/online-judge-tools/default.nix diff --git a/pkgs/development/python-modules/online-judge-api-client/default.nix b/pkgs/development/python-modules/online-judge-api-client/default.nix new file mode 100644 index 000000000000..81ca9bfaf42c --- /dev/null +++ b/pkgs/development/python-modules/online-judge-api-client/default.nix @@ -0,0 +1,60 @@ +{ lib +, appdirs +, beautifulsoup4 +, buildPythonPackage +, colorlog +, fetchFromGitHub +, git +, jsonschema +, lxml +, markdown +, python +, requests +, substituteAll +, toml +}: + +let + # NOTE This is needed to download & run another Python program internally in + # order to generate test cases for library-checker problems. + pythonEnv = python.withPackages (ps: with ps; [ colorlog jinja2 markdown toml ]); +in buildPythonPackage rec { + pname = "online-judge-api-client"; + version = "10.10.0"; + + src = fetchFromGitHub { + owner = "online-judge-tools"; + repo = "api-client"; + rev = "v${version}"; + sha256 = "0lmryqi0bv82v9k9kf1rzzq9zr83smpmy8ivzw4fk31hvpczp4fn"; + }; + + patches = [ ./fix-paths.patch ]; + postPatch = '' + substituteInPlace onlinejudge/service/library_checker.py \ + --subst-var-by git ${git} \ + --subst-var-by pythonInterpreter ${pythonEnv.interpreter} + ''; + + propagatedBuildInputs = [ + appdirs + beautifulsoup4 + colorlog + jsonschema + lxml + requests + toml + ]; + + # Requires internet access + doCheck = false; + + pythonImportsCheck = [ "onlinejudge" "onlinejudge_api" ]; + + meta = with lib; { + description = "API client to develop tools for competitive programming"; + homepage = "https://github.com/online-judge-tools/api-client"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/development/python-modules/online-judge-api-client/fix-paths.patch b/pkgs/development/python-modules/online-judge-api-client/fix-paths.patch new file mode 100644 index 000000000000..5ec1f9b95c2e --- /dev/null +++ b/pkgs/development/python-modules/online-judge-api-client/fix-paths.patch @@ -0,0 +1,39 @@ +diff --git a/onlinejudge/service/library_checker.py b/onlinejudge/service/library_checker.py +index b63c7b7..e062490 100644 +--- a/onlinejudge/service/library_checker.py ++++ b/onlinejudge/service/library_checker.py +@@ -51,7 +51,7 @@ class LibraryCheckerService(onlinejudge.type.Service): + return + + try: +- subprocess.check_call(['git', '--version'], stdout=sys.stderr, stderr=sys.stderr) ++ subprocess.check_call(['@git@/bin/git', '--version'], stdout=sys.stderr, stderr=sys.stderr) + except FileNotFoundError: + logger.error('git command not found') + raise +@@ -60,12 +60,12 @@ class LibraryCheckerService(onlinejudge.type.Service): + if not path.exists(): + # init the problem repository + url = 'https://github.com/yosupo06/library-checker-problems' +- logger.info('$ git clone %s %s', url, path) +- subprocess.check_call(['git', 'clone', url, str(path)], stdout=sys.stderr, stderr=sys.stderr) ++ logger.info('$ @git@/bin/git clone %s %s', url, path) ++ subprocess.check_call(['@git@/bin/git', 'clone', url, str(path)], stdout=sys.stderr, stderr=sys.stderr) + else: + # sync the problem repository +- logger.info('$ git -C %s pull', str(path)) +- subprocess.check_call(['git', '-C', str(path), 'pull'], stdout=sys.stderr, stderr=sys.stderr) ++ logger.info('$ @git@/bin/git -C %s pull', str(path)) ++ subprocess.check_call(['@git@/bin/git', '-C', str(path), 'pull'], stdout=sys.stderr, stderr=sys.stderr) + + cls.is_repository_updated = True + +@@ -100,7 +100,7 @@ class LibraryCheckerProblem(onlinejudge.type.Problem): + logger.warning("generate.py may not work on Windows") + + problem_spec = str(self._get_problem_directory_path() / 'info.toml') +- command = [sys.executable, str(path / 'generate.py'), problem_spec] ++ command = ['@pythonInterpreter@', str(path / 'generate.py'), problem_spec] + if compile_checker: + command.append('--compile-checker') + logger.info('$ %s', ' '.join(command)) diff --git a/pkgs/development/python-modules/online-judge-tools/default.nix b/pkgs/development/python-modules/online-judge-tools/default.nix new file mode 100644 index 000000000000..34e1882d60e9 --- /dev/null +++ b/pkgs/development/python-modules/online-judge-tools/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, colorama +, fetchFromGitHub +, online-judge-api-client +, requests +}: + +buildPythonPackage rec { + pname = "online-judge-tools"; + version = "11.5.1"; + + src = fetchFromGitHub { + owner = "online-judge-tools"; + repo = "oj"; + rev = "v${version}"; + sha256 = "0zkzmmjgjb6lyrzq1ip54cpnp7al9a7mcyjyi5vx58bvnx3q0c6m"; + }; + + propagatedBuildInputs = [ colorama online-judge-api-client requests ]; + + # Requires internet access + doCheck = false; + + meta = with lib; { + description = "Tools for various online judges. Download sample cases, generate additional test cases, test your code, and submit it."; + homepage = "https://github.com/online-judge-tools/oj"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b4a6cfef08..909bd4d04e66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,6 +3510,8 @@ with pkgs; oneshot = callPackage ../tools/networking/oneshot { }; + online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; + xkbd = callPackage ../applications/misc/xkbd { }; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0bd233984da..ee34016a6f8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5572,6 +5572,10 @@ in { onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + online-judge-api-client = callPackage ../development/python-modules/online-judge-api-client { }; + + online-judge-tools = callPackage ../development/python-modules/online-judge-tools { }; + onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { }; From 637a001f69db31ec4ae0a0beaa9e092a6dc09e1f Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Tue, 25 Jan 2022 07:39:50 +0800 Subject: [PATCH 110/111] dcap: Init at 2.47.12 (#156282) --- pkgs/tools/networking/dcap/default.nix | 44 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/networking/dcap/default.nix diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/tools/networking/dcap/default.nix new file mode 100644 index 000000000000..bad1b9ee1c5a --- /dev/null +++ b/pkgs/tools/networking/dcap/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoconf +, automake +, libtool +, zlib +, cunit +}: +stdenv.mkDerivation rec { + pname = "dcap"; + version = "2.47.12"; + + src = fetchFromGitHub { + owner = "dCache"; + repo = "dcap"; + rev = version; + sha256 = "sha256-pNLEN1YLQGMJNuv8n6bec3qONbwNOYbYDDvkwuP5AR4="; + }; + + nativeBuildInputs = [ autoconf automake libtool ]; + buildInputs = [ zlib ]; + + preConfigure = '' + patchShebangs bootstrap.sh + ./bootstrap.sh + ''; + + doCheck = true; + + checkInputs = [ cunit ]; + + outputs = [ "bin" "dev" "out" "man" "doc" ]; + + meta = with lib; { + description = "dCache access protocol client library"; + homepage = "https://github.com/dCache/dcap"; + changelog = "https://github.com/dCache/dcap/blob/master/ChangeLog"; + license = licenses.lgpl2Only; + platforms = platforms.all; + mainProgram = "dccp"; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 909bd4d04e66..7ac4c0c528c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1663,6 +1663,8 @@ with pkgs; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; + dcap = callPackage ../tools/networking/dcap { }; + deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { From ecbad79bfbf28be30a233db270bb6102c86f53e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 15:48:09 -0800 Subject: [PATCH 111/111] lombok: 1.18.20 -> 1.18.22 (#152792) --- pkgs/development/libraries/java/lombok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index af75be537579..4eee98157d50 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.20"; + version = "1.18.22"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-zpR75sL751n7vo7ztCtoJfgUyYyIU/EBPy2WMM7fdLA="; + sha256 = "sha256-7O8VgUEdeoLMBCgWZ+4LrF18ClqudM/DhDA5bJHDGDE="; }; nativeBuildInputs = [ makeWrapper ];