From 2b191a3bd4f96d2aec1f901d585c83b1c378a632 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Tue, 6 Dec 2022 20:12:39 +0100 Subject: [PATCH 01/24] quodlibet: Add WMA support The issue already popped up with rhythmbox and this is the application of the solution from https://github.com/NixOS/nixpkgs/pull/130118/files Related to NixOS/nixpkgs#204695 --- pkgs/applications/audio/quodlibet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index aacc584c5b84..b57f4a4986ce 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gstreamer ] ++ lib.optionals (withGstPlugins) [ + gst-libav gst-plugins-bad gst-plugins-good gst-plugins-ugly From e00c04989763ef0c9649509b5c5d4c62d67d0f1a Mon Sep 17 00:00:00 2001 From: Dacio Romero Date: Sat, 17 Dec 2022 13:10:47 -0800 Subject: [PATCH 02/24] nvidia-vaapi-driver: unstable-2022-12-01 -> 0.0.8 --- pkgs/development/libraries/nvidia-vaapi-driver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index eb7e1e9acc9b..ca09af9ef233 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "unstable-2022-12-01"; + version = "0.0.8"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; - rev = "6e8b0d067c52c3a7e0c3de745337e6e733c59207"; - sha256 = "sha256-HL/sjNPsLhzl8NZ/9l8in27vUrMkyUIcNr/+HhiaTT0="; + rev = "v${version}"; + sha256 = "sha256-RMFkClaWoFNeSglV5otS/rzI6JNQMiAHDzH3DoEHA5I="; }; nativeBuildInputs = [ From 60f6a46bbd29b6a9f7e7a0ae8b42ddc1b02f2b40 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 31 Dec 2022 09:35:16 +0800 Subject: [PATCH 03/24] qt6.qtbase: remove valgrind from propagatedBuildInputs reduces the build-time closure and the runtime closure of packages accidentally referencing qtbase.dev by nearly 600M --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 5bbed5cb51e5..dc40394a4715 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -31,7 +31,6 @@ , libsepol , vulkan-headers , vulkan-loader -, valgrind , libthai , libdrm , libdatrie @@ -140,7 +139,6 @@ stdenv.mkDerivation rec { libthai libdrm libdatrie - valgrind udev # Text rendering fontconfig From 753da128bd2ce4a5e8108fb0617e31a87e458fac Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 31 Dec 2022 08:51:56 +0800 Subject: [PATCH 04/24] qt6.qtvirtualkeyboard: add dev output --- pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix index bb868dc61829..9c53f11e1a3c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix +++ b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix @@ -11,5 +11,4 @@ qtModule { qtInputs = [ qtbase qtdeclarative qtsvg ]; propagatedBuildInputs = [ hunspell ]; nativeBuildInputs = [ pkg-config ]; - outputs = [ "out" ]; } From 650f51f373f2fea2ace997ad29390d679abbbc2e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 31 Dec 2022 09:29:49 +0800 Subject: [PATCH 05/24] qt6Packages.quazip: add dev output --- pkgs/development/libraries/quazip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 610f408e4419..31bcdc374d7a 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + outputs = [ "out" "dev" ]; + meta = with lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; From bffa10ffa3db5aaaa9f505de2c34879faaed06cd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 31 Dec 2022 10:17:58 +0800 Subject: [PATCH 06/24] openboard: fix build --- pkgs/applications/graphics/openboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index b0d59d4a7f55..3178c50c933d 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -23,7 +23,7 @@ let install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openboard"; version = "unstable-2022-11-28"; @@ -36,9 +36,9 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip5' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ --replace '-lquazip5' '-lquazip1-qt5' \ - --replace '/usr/include/poppler' '${poppler.dev}/include/poppler' + --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; From 443560c8312c5dd8a9f97f61998a5072b5383be3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 31 Dec 2022 10:20:48 +0800 Subject: [PATCH 07/24] fritzing: fix build --- pkgs/applications/science/electronics/fritzing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index ca2b2e5175b0..22b65f2da313 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -a ${parts}/* parts/ ''; - NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; + NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; qmakeFlags = [ "phoenix.pro" From 01c8e3d8bbada41a0caeb7b48292aad1fa3d7838 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 31 Dec 2022 18:30:28 +0800 Subject: [PATCH 08/24] Revert "qt6.qtdeclarative: reduce closure size by removing reference to qtbase.dev" This reverts commit cec6862940c2deb71b599536dc31c5d10a43b5d6. --- pkgs/development/libraries/qt-6/modules/qtdeclarative.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 76231f866efe..fcb699298fe9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -36,8 +36,4 @@ qtModule { "bin/qmlscene" "bin/qmltestrunner" ]; - - NIX_CFLAGS_COMPILE = [ - "-fmacro-prefix-map=${qtbase.dev}=qtbase.dev" - ]; } From 496a2f43b4455959a7a7aece0bece913003c5bf5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 31 Dec 2022 18:29:44 +0800 Subject: [PATCH 09/24] qt6.qtbase: patch QTEST_ASSERT and other macros to remove reference to qtbase.dev via __FILE__ macro This is safe because they are only used for printing debug messages, alternatives are setting -fmacro-prefix-map=${qtbase.dev}=qtbase.dev in NIX_CFLAGS_COMPILE or injecting #line directives in all header files, but they would interfere with other usages of __FILE__ macro that might depend on the the path to actually point to a file. --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index dc40394a4715..a9c8ddc83a86 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -271,6 +271,9 @@ stdenv.mkDerivation rec { -e "/^bindir=/ c bindir=$dev/bin" patchShebangs $out $dev + + # QTEST_ASSERT and other macros keeps runtime reference to qtbase.dev + substituteInPlace "$dev/include/QtTest/qtestassert.h" --replace "__FILE__" "__BASE_FILE__" ''; dontStrip = debugSymbols; From 04b55451e8373190114df534087749ac0b61376b Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sun, 1 Jan 2023 16:16:31 +0000 Subject: [PATCH 10/24] runescape-launcher: Switch to openssl_1_1 The Runescape launcher requires 1.1.x versions of openssl libs (specifically libssl.so.1.1 and libcrypto.so.1.1). The default openssl package being v3.x.y was too new and caused the build to fail. --- pkgs/games/runescape-launcher/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 75ed66c01e00..9fd89c062e46 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildFHSUserEnv, dpkg, glibc, gcc-unwrapped, autoPatchelfHook, fetchurl, wrapGAppsHook , gnome2, xorg -, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl +, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl_1_1 , libpulseaudio , SDL2, xorg_sys_opengl, libGL }: @@ -34,7 +34,7 @@ let cairo gtk2-x11 zlib - openssl + openssl_1_1 ]; runtimeDependencies = [ @@ -42,7 +42,7 @@ let libGL SDL2 xorg_sys_opengl - openssl + openssl_1_1 zlib ]; @@ -96,7 +96,7 @@ in targetPkgs = pkgs: [ runescape dpkg glibc gcc-unwrapped - libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl + libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl_1_1 libpulseaudio xorg.libX11 SDL2 xorg_sys_opengl libGL From f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 10 Nov 2022 08:10:20 -0500 Subject: [PATCH 11/24] pkgsStatic.protobufc: fix build Upstream effectively puts "-lprotobuf -lprotoc" as linking flags, while in fact "protoc.a" depends on "protobuf.a", so flags should be in reverse order. It is simpler to append one more "-lprotobuf" than to make patch to fix order. That means that linker will scan "protobuf.a" twice, but price is neglectable. --- pkgs/development/libraries/protobufc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix index f7cf765e150d..dc3b2c92f191 100644 --- a/pkgs/development/libraries/protobufc/default.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , protobuf @@ -19,6 +20,14 @@ stdenv.mkDerivation rec { hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM="; }; + patches = [ + # https://github.com/protobuf-c/protobuf-c/pull/534 + (fetchpatch { + url = "https://github.com/protobuf-c/protobuf-c/commit/a6c9ea5207aeac61c57b446ddf5a6b68308881d8.patch"; + hash = "sha256-wTb8+YbvrCrOVpgthI5SJdG/CpQcOzCX4Bv47FPY804="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; From 7952d7bc14c97c4b8e1c81e837e38853249947c0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:42:27 +0100 Subject: [PATCH 12/24] mariadb_104: 10.4.26 -> 10.4.27 https://mariadb.com/kb/en/mariadb-10-4-27-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 19a81db9a364..41ab8343230f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -238,8 +238,8 @@ in self: { mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 - version = "10.4.26"; - hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8="; + version = "10.4.27"; + hash = "sha256-SKHyIMoYuwxGN513/pjrdQvMcFLnPxDjJ26ipcUbirI="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From b217e7dfcb3e6d5747eedf4d40060a0f26e3bd61 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:43:20 +0100 Subject: [PATCH 13/24] mariadb_105: 10.5.17 -> 10.5.18 https://mariadb.com/kb/en/mariadb-10-5-18-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 41ab8343230f..7d617825777b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -245,8 +245,8 @@ in }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.17"; - hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E="; + version = "10.5.18"; + hash = "sha256-NZOw3MDy6A6YF3AZ9dz6XMjBQXLOFhpvpQ+AhPLO90k="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 4a6b0747ed79496fff7e6c764e32b98355bbdd41 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:44:32 +0100 Subject: [PATCH 14/24] mariadb_106: 10.6.10 -> 10.6.11 https://mariadb.com/kb/en/mariadb-10-6-11-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7d617825777b..d5471c38a4ef 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -252,8 +252,8 @@ in }; mariadb_106 = self.callPackage generic { # Supported until 2026-07 - version = "10.6.10"; - hash = "sha256-atn6hvDIXI7q+tJkNUnV/13ShyAClk51R1LekYY6o7c="; + version = "10.6.11"; + hash = "sha256-V4S6TF2Hk7rbpYNIV2gk2YSewVLpy+5HoXZRYdhAyUo="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 91b70ce7aaa6ca6d400dfb88ae2377d4dffbe35b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:45:52 +0100 Subject: [PATCH 15/24] mariadb_108: 10.8.5 -> 10.8.6 https://mariadb.com/kb/en/mariadb-10-8-6-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d5471c38a4ef..18567986df74 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -259,8 +259,8 @@ in }; mariadb_108 = self.callPackage generic { # Supported until 2023-05 - version = "10.8.5"; - hash = "sha256-z37TjDYTTNgYP93WTLPlD1ROgmS6dCAlXbEpcJfgjos="; + version = "10.8.6"; + hash = "sha256-qal8eZtpnhDJOWW71wQ0U/eiDhQL0inSCaoWFvKfv20="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 0525d149504201b9d05e121847eb7883ce98a66a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:47:20 +0100 Subject: [PATCH 16/24] mariadb_109: 10.9.3 -> 10.9.4 https://mariadb.com/kb/en/mariadb-10-9-4-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 18567986df74..829f33955e77 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -266,8 +266,8 @@ in }; mariadb_109 = self.callPackage generic { # Supported until 2023-08 - version = "10.9.3"; - hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4="; + version = "10.9.4"; + hash = "sha256-Hf8IoPN+pc+PAMvRLUDoB1n659cxhMz1a1tRrP3PwFQ="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From d0e4c10df522e82ade423ea3a2d15a3d39030e61 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 10 Jan 2023 15:07:51 +0100 Subject: [PATCH 17/24] mariadb: fix darwin build --- pkgs/servers/sql/mariadb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 829f33955e77..9eacea78a37e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -96,6 +96,9 @@ let # to pass in java explicitly. "-DCONNECT_WITH_JDBC=OFF" "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [ + # workaround for https://jira.mariadb.org/browse/MDEV-29925 + "-Dhave_C__Wl___as_needed=" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # revisit this if nixpkgs supports any architecture whose stack grows upwards "-DSTACK_DIRECTION=-1" From 5a8bcb2a73ea8179bd650f85e4071da9c6cd9733 Mon Sep 17 00:00:00 2001 From: Mislav Zanic Date: Tue, 10 Jan 2023 17:31:54 +0100 Subject: [PATCH 18/24] maintainers: add mislavzanic --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 169663a2f573..7b942694b512 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9394,6 +9394,12 @@ githubId = 1776903; name = "Andrew Abbott"; }; + mislavzanic = { + email = "mislavzanic3@gmail.com"; + github = "mislavzanic"; + githubId = 48838244; + name = "Mislav Zanic"; + }; misterio77 = { email = "eu@misterio.me"; github = "Misterio77"; From 654b3afaf85dc5d3523df61a16190cbf403e80e2 Mon Sep 17 00:00:00 2001 From: Mislav Zanic Date: Tue, 10 Jan 2023 17:32:57 +0100 Subject: [PATCH 19/24] terraspace: init at 2.2.3 --- .../networking/cluster/terraspace/Gemfile | 2 + .../cluster/terraspace/Gemfile.lock | 129 +++++ .../networking/cluster/terraspace/default.nix | 32 ++ .../networking/cluster/terraspace/gemset.nix | 464 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 629 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraspace/Gemfile create mode 100644 pkgs/applications/networking/cluster/terraspace/Gemfile.lock create mode 100644 pkgs/applications/networking/cluster/terraspace/default.nix create mode 100644 pkgs/applications/networking/cluster/terraspace/gemset.nix diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/applications/networking/cluster/terraspace/Gemfile new file mode 100644 index 000000000000..0bf6893eeec1 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem "terraspace", '~> 2.2.3' diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock new file mode 100644 index 000000000000..1c7b39767c6e --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock @@ -0,0 +1,129 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.0.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + aws-eventstream (1.2.0) + aws-partitions (1.689.0) + aws-sdk-core (3.168.4) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.61.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.117.2) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + cli-format (0.2.2) + activesupport + text-table + zeitwerk + concurrent-ruby (1.1.10) + deep_merge (1.2.2) + diff-lcs (1.5.0) + dotenv (2.8.1) + dsl_evaluator (0.3.1) + activesupport + memoist + rainbow + zeitwerk + eventmachine (1.2.7) + eventmachine-tail (0.6.5) + eventmachine + graph (2.11.0) + hcl_parser (0.2.2) + rhcl + i18n (1.12.0) + concurrent-ruby (~> 1.0) + jmespath (1.6.2) + memoist (0.16.2) + minitest (5.17.0) + mini_portile2 (2.8.0) + nokogiri (1.13.9) + racc (~> 1.4) + mini_portile2 (~> 2.8.0) + racc (1.6.2) + rainbow (3.1.1) + render_me_pretty (0.8.4) + activesupport + rainbow + tilt + rexml (3.2.5) + rhcl (0.1.0) + deep_merge + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rspec-terraspace (0.3.2) + activesupport + memoist + rainbow + rspec + zeitwerk + rubyzip (2.3.2) + terraspace (2.2.3) + activesupport + bundler + cli-format + deep_merge + dotenv + dsl_evaluator + eventmachine-tail + graph + hcl_parser + memoist + rainbow + render_me_pretty + rexml + rspec-terraspace (>= 0.3.1) + terraspace-bundler (>= 0.5.0) + thor + tty-tree + zeitwerk + zip_folder + terraspace-bundler (0.5.0) + activesupport + aws-sdk-s3 + dsl_evaluator + memoist + nokogiri + rainbow + rubyzip + thor + zeitwerk + text-table (1.2.4) + thor (1.2.1) + tilt (2.0.11) + tty-tree (0.4.0) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) + zeitwerk (2.6.6) + zip_folder (0.1.0) + rubyzip + +PLATFORMS + x86_64-linux + +DEPENDENCIES + terraspace (~> 2.2.3) + +BUNDLED WITH + 2.3.25 diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/applications/networking/cluster/terraspace/default.nix new file mode 100644 index 000000000000..af7c1025356a --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }: +let + rubyEnv = bundlerEnv { + inherit ruby; + name = "terraspace"; + gemdir = ./.; + }; +in stdenv.mkDerivation { + pname = "terraspace"; + version = (import ./gemset.nix).terraspace.version; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${rubyEnv}/bin/terraspace $out/bin/terraspace + wrapProgram $out/bin/terraspace \ + --prefix PATH : ${lib.makeBinPath [ rubyEnv.ruby ]} + ''; + + passthru.updateScript = bundlerUpdateScript "terraspace"; + + meta = with lib; { + description = "Terraform framework that provides an organized structure, and keeps your code DRY"; + homepage = "https://github.com/boltops-tools/terraspace"; + license = licenses.asl20; + platforms = ruby.meta.platforms; + maintainers = with maintainers; [ mislavzanic ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/applications/networking/cluster/terraspace/gemset.nix new file mode 100644 index 000000000000..cc5e64e944cf --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/gemset.nix @@ -0,0 +1,464 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; + type = "gem"; + }; + version = "7.0.4"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06878pd1kxbj54dh6jp11a1460dkyxvk4mzwp480gcdqy5jaqwhw"; + type = "gem"; + }; + version = "1.689.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; + type = "gem"; + }; + version = "3.168.4"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; + type = "gem"; + }; + version = "1.61.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; + type = "gem"; + }; + version = "1.117.2"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + type = "gem"; + }; + version = "1.5.2"; + }; + cli-format = { + dependencies = ["activesupport" "text-table" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf"; + type = "gem"; + }; + version = "0.2.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + type = "gem"; + }; + version = "1.1.10"; + }; + deep_merge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3"; + type = "gem"; + }; + version = "1.2.2"; + }; + diff-lcs = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; + type = "gem"; + }; + version = "2.8.1"; + }; + dsl_evaluator = { + dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51"; + type = "gem"; + }; + version = "0.3.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + eventmachine-tail = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x5ly7mnfr6gibjyxz6lrxb4jbf05p0r8257qcgkf8rkwg9ynw0c"; + type = "gem"; + }; + version = "0.6.5"; + }; + graph = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9"; + type = "gem"; + }; + version = "2.11.0"; + }; + hcl_parser = { + dependencies = ["rhcl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09d55i9y187xkw0fi0b5aq8wyzvq8w73ryi939dvzdzgss25m7jj"; + type = "gem"; + }; + version = "0.2.2"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + type = "gem"; + }; + version = "1.12.0"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; + memoist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; + type = "gem"; + }; + version = "0.16.2"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + type = "gem"; + }; + version = "5.17.0"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + type = "gem"; + }; + version = "1.13.9"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + type = "gem"; + }; + version = "1.6.2"; + }; + rainbow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + render_me_pretty = { + dependencies = ["activesupport" "rainbow" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cd64d59jx6jjzhi5xngfa031sfpgs7zyq8bhc9y4smlz121l1ij"; + type = "gem"; + }; + version = "0.8.4"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rhcl = { + dependencies = ["deep_merge"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c7xp9y9438mnqrfrvjp1fwy2lk0b1ixz45qi2g2kbl91ilhn834"; + type = "gem"; + }; + version = "0.1.0"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k64i7ax6sqvh702s0xrll2g8isxx1x4zam95ck7122flsyh7van"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-support = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-terraspace = { + dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16bi6x6aynnkp7yh341fmvpiasm1vg43mxf61ji57akdhx4mam5q"; + type = "gem"; + }; + version = "0.3.2"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + terraspace = { + dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m38gj4bpcafrbrfdck2pswknm2p6mqfq8mp6k3pkjkmk9p3w9a9"; + type = "gem"; + }; + version = "2.2.3"; + }; + terraspace-bundler = { + dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kn6is7zqlw8l4njj4pjwbdi95w651nz3qvqgc3vw07rchs08nnx"; + type = "gem"; + }; + version = "0.5.0"; + }; + text-table = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06yhlnb49fn0fhkmi6lrziyv2hd42gcm2zi3sggm2qab48qxn94j"; + type = "gem"; + }; + version = "1.2.4"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + type = "gem"; + }; + version = "2.0.11"; + }; + tty-tree = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w3nh9yppb7zaswa7d9hnhf6k64z5d3jd8xvpyg2mjfrzcw9rbgs"; + type = "gem"; + }; + version = "0.4.0"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + type = "gem"; + }; + version = "2.0.5"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + type = "gem"; + }; + version = "2.6.6"; + }; + zip_folder = { + dependencies = ["rubyzip"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1884a1ixy7bzm9yp8cjikhdfcn8205p4fsjq894ilby8i1whl58k"; + type = "gem"; + }; + version = "0.1.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ffde8e34ba6..e11a96505881 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37689,6 +37689,8 @@ with pkgs; terranix = callPackage ../applications/networking/cluster/terranix {}; + terraspace = callPackage ../applications/networking/cluster/terraspace {}; + tfswitch = callPackage ../applications/networking/cluster/tfswitch {}; tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; From 9ff579f6ea97aceea2e70874e0f115bb3f9c41d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 19:43:13 +0000 Subject: [PATCH 20/24] gobgp: 3.9.0 -> 3.10.0 --- pkgs/tools/networking/gobgp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 0cb2fcf3b9b7..9e27cf7039f4 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-W03RUxuDo5+YiHAf7yIfzYl0zXi7fwQf1DBqcgLejJs="; + sha256 = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM="; }; - vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; + vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; postConfigure = '' export CGO_ENABLED=0 From d20cccd120df98c03cc7fe4e7ed31974c8dade76 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 11 Jan 2023 10:59:00 -0500 Subject: [PATCH 21/24] cargo-hack: 0.5.25 -> 0.5.26 Changelog: https://github.com/taiki-e/cargo-hack/blob/v0.5.26/CHANGELOG.md --- pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 85015e713d52..a63af2476557 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.25"; + version = "0.5.26"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1X2/C9JNTuRWY9nke3c7S1x5HuomDs0Em+v0P1HU4aQ="; + sha256 = "sha256-ZVR3bycEWpOV4T/85OsERNjKooz2rwBF5kMSEfHnmEI="; }; - cargoSha256 = "sha256-Ylo0HeIlXEJg6g93u4QMGTbzBtU2EpHW5BWIBDCX+EU="; + cargoSha256 = "sha256-4TChr6dKxUerpuaX63WShrWyXTLH4m85P6E30a5rmH8="; # some necessary files are absent in the crate version doCheck = false; From 79a26e0c7020aad5e81f7e6b7d2ffe372e7d746f Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Thu, 12 Jan 2023 16:16:57 +0100 Subject: [PATCH 22/24] ungoogled-chromium: 108.0.5359.125 -> 109.0.5414.87 --- .../browsers/chromium/upstream-info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d64eea22c831..f54fcb589104 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "108.0.5359.125", - "sha256": "0n8aigw7qv6dzd8898xz435kj79z73v916amfaxyz69g57pnpqhn", + "version": "109.0.5414.87", + "sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8", "sha256bin64": null, "deps": { "gn": { - "version": "2022-10-05", + "version": "2022-11-10", "url": "https://gn.googlesource.com/gn", - "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", - "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" }, "ungoogled-patches": { - "rev": "108.0.5359.125-1", - "sha256": "1dacvzi6j4xyjjnrsb79mhhj7jc992z1di9acl4appfydlqadgv3" + "rev": "109.0.5414.87-1", + "sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j" } } } From 94911f820e96c5bd634e03d74f04c0eafeb0a60c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 21:50:26 +0000 Subject: [PATCH 23/24] automatic-timezoned: 1.0.53 -> 1.0.55 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 3a985bee371d..cea88a31f600 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.53"; + version = "1.0.55"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HxlaJwrek01yM8CDeaZ24lKBsA3VuanTcMNxnf4MwZc="; + sha256 = "sha256-80GP7w3YF7RNMTlSI5SCQfugjkNBweX5BcYk4ODimBQ="; }; - cargoSha256 = "sha256-jz58E7t8UfYezVozc95ncK96Sv3zHv4jSzgNQjsGc+k="; + cargoHash = "sha256-WtqK8T/3Mo/y3cPn8d6kDzC59qE70JUHFdHk7mFpP1k="; meta = with lib; { description = "Automatically update system timezone based on location"; From 0eece73358dee8031e07be7ee17b42e84e9715f1 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Fri, 30 Dec 2022 22:56:50 +0000 Subject: [PATCH 24/24] grig: init at 0.9.0 --- pkgs/applications/radio/grig/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/radio/grig/default.nix diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/applications/radio/grig/default.nix new file mode 100644 index 000000000000..33ae8b8ff88b --- /dev/null +++ b/pkgs/applications/radio/grig/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, wrapGAppsHook +, gtk2 +, hamlib_4 }: + +stdenv.mkDerivation rec { + pname = "grig"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "fillods"; + repo = "grig"; + rev = "GRIG-${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ hamlib_4 gtk2 ]; + + meta = with lib; { + description = "A simple Ham Radio control (CAT) program based on Hamlib"; + longDescription = '' + Grig is a graphical user interface for the Ham Radio Control Libraries. + It is intended to be simple and generic, presenting the user with the + same interface regardless of which radio they use. + ''; + homepage = "https://groundstation.sourceforge.net/grig/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6387dbc3390e..40a029ab16e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7734,6 +7734,8 @@ with pkgs; gridtracker = callPackage ../applications/radio/gridtracker { }; + grig = callPackage ../applications/radio/grig { }; + grin = callPackage ../tools/text/grin { }; gyb = callPackage ../tools/backup/gyb { };