From 24a71f566b13a1f47b419ed72bf6c9c51d8ceb17 Mon Sep 17 00:00:00 2001 From: Shiryel Date: Wed, 28 Dec 2022 18:37:48 -0300 Subject: [PATCH 01/17] godot_4: 4.0-beta3 -> 4.0-beta10 --- pkgs/development/tools/godot/4/default.nix | 48 +++++++++++++-------- pkgs/development/tools/godot/4/xfixes.patch | 12 +++--- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 13ccfcc80964..22b14dd283b3 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -9,11 +9,11 @@ , libX11 , libXcursor , libXinerama -, libXi -, libXrandr , libXext +, libXrandr +, libXrender +, libXi , libXfixes -, libGLU , freetype , alsa-lib , libpulseaudio @@ -21,6 +21,9 @@ , speechd , fontconfig , udev +, withPlatform ? "linuxbsd" +, withTarget ? "editor" +, withPrecision ? "single" , withPulseaudio ? false , withDbus ? true , withSpeechd ? false @@ -29,9 +32,16 @@ , withTouch ? true }: +assert lib.asserts.assertOneOf "withPrecision" withPrecision [ "single" "double" ]; + let - # Options from godot/platform/linuxbsd/detect.py options = { + # Options from 'godot/SConstruct' + platform = withPlatform; + target = withTarget; + precision = withPrecision; # Floating-point precision level + + # Options from 'godot/platform/linuxbsd/detect.py' pulseaudio = withPulseaudio; dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support @@ -42,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta3"; + version = "4.0-beta10"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "01ae26d31befb6679ecd92cd3c73aa5a76162e95"; - sha256 = "sha256-Q+zMviGevezjcQKJPOm7zAu4liJ5z8Rl73TYmjRR3MY="; + rev = "d0398f62f08ce0cfba80990b21c6af4181f93fe9"; + sha256 = "sha256-h4DpK7YC7/qMc6GAD2nvNVmrlGjKT5d7OK+1NcuZCMg="; }; nativeBuildInputs = [ @@ -59,27 +69,26 @@ stdenv.mkDerivation rec { buildInputs = [ scons - libGLU + ] + ++ runtimeDependencies; + + runtimeDependencies = [ libX11 libXcursor libXinerama - libXi - libXrandr libXext + libXrandr + libXrender + libXi libXfixes - ] - ++ runtimeDependencies - # Necessary to make godot see fontconfig.lib and dbus.lib - ++ lib.optional withFontconfig fontconfig - ++ lib.optional withDbus dbus; - - runtimeDependencies = [ - vulkan-loader alsa-lib + vulkan-loader ] ++ lib.optional withPulseaudio libpulseaudio + ++ lib.optional withDbus dbus ++ lib.optional withDbus dbus.lib ++ lib.optional withSpeechd speechd + ++ lib.optional withFontconfig fontconfig ++ lib.optional withFontconfig fontconfig.lib ++ lib.optional withUdev udev; @@ -91,7 +100,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - sconsFlags = [ "platform=linuxbsd target=editor production=true" ]; + # Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py' + sconsFlags = [ "production=true" ]; preConfigure = '' sconsFlags+=" ${ lib.concatStringsSep " " diff --git a/pkgs/development/tools/godot/4/xfixes.patch b/pkgs/development/tools/godot/4/xfixes.patch index b3d0b7aa3cc5..df5c914d7fd6 100644 --- a/pkgs/development/tools/godot/4/xfixes.patch +++ b/pkgs/development/tools/godot/4/xfixes.patch @@ -1,12 +1,12 @@ diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py -index ac69f3806b..14acbf5c58 100644 +index 844b15e9fb..0c8bee1757 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py -@@ -191,6 +191,7 @@ def configure(env: "Environment"): - env.ParseConfig("pkg-config xrandr --cflags --libs") - env.ParseConfig("pkg-config xrender --cflags --libs") - env.ParseConfig("pkg-config xi --cflags --libs") -+ env.ParseConfig("pkg-config xfixes --cflags --libs") +@@ -192,6 +192,7 @@ def configure(env: "Environment"): + env.ParseConfig("pkg-config xrandr --cflags") + env.ParseConfig("pkg-config xrender --cflags") + env.ParseConfig("pkg-config xi --cflags") ++ env.ParseConfig("pkg-config xfixes --cflags") if env["touch"]: env.Append(CPPDEFINES=["TOUCH_ENABLED"]) From c6245bdfde58169a8908016ac8a402e446511cd4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 3 Jan 2023 16:12:35 -0500 Subject: [PATCH 02/17] cargo-modules: 0.7.1 -> 0.7.2 Diff: https://github.com/regexident/cargo-modules/compare/0.7.1...0.7.2 Changelog: https://github.com/regexident/cargo-modules/blob/0.7.2/CHANGELOG.md --- .../tools/rust/cargo-modules/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 69f0c4b814da..54290e2491f4 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -1,17 +1,26 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-vMmbed2UOe/N8V7LbvYm7BbOOHD69qaizkYf66VCZMs="; + sha256 = "sha256-QRBhlSHqOTJCdzZhqpcfLeCDuCfJsjyxa2+6yzzN52g="; }; - cargoSha256 = "sha256-xo3EUDWoE1OFTaA9y3ymGA/l2fwNqnPBLpNc8xyjasY="; + cargoSha256 = "sha256-+asFAkUOHP9u/nOoHsr81KeqQkLqaRXhJH32oTG5vYo="; + + cargoPatches = [ + # https://github.com/regexident/cargo-modules/pull/161; + (fetchpatch { + name = "update-outdated-lock-file.patsh"; + url = "https://github.com/regexident/cargo-modules/commit/ea9029b79acdadddbaf4067076690153c38cd09c.patch"; + sha256 = "sha256-DOLvo/PP+4/6i1IYbl9oGC6BAnXNI88hK5he9549EJk="; + }) + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 80aca3bd36e55fba8704047a4ab34eb5ae69a042 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Jan 2023 13:09:55 +0000 Subject: [PATCH 03/17] =?UTF-8?q?gnome.gnome-bluetooth:=2042.4=20=E2=86=92?= =?UTF-8?q?=2042.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/42.4...42.5 --- pkgs/desktops/gnome/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 9596f6d84cd5..6eddefc7c452 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.4"; + version = "42.5"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HW/PHNtsyZI6szSiwLw3osG7qdGN4VPUhO7cBPPAvNw="; + sha256 = "pPXxrC27e3uS99bStCwDD2Ku2bVCa53BFpRgQfPLqPc="; }; nativeBuildInputs = [ From 3fe1b3d31c575e7cd1c350989a274617331e248a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Jan 2023 13:49:49 +0000 Subject: [PATCH 04/17] =?UTF-8?q?gnome.gnome-control-center:=2043.1=20?= =?UTF-8?q?=E2=86=92=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/43.1...43.2 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 0d3b3bc5c6dd..c018b4ea4a34 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6YvGt4Sv0E8pfbXo5sWZEOLNCQMycQd08m3I3omvT8c="; + sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM="; }; patches = [ From 1cb769e12c7c52cb5cc7da0462519a612152a2f8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Jan 2023 14:06:03 +0000 Subject: [PATCH 05/17] =?UTF-8?q?gnome.aisleriot:=203.22.26=20=E2=86=92=20?= =?UTF-8?q?3.22.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/aisleriot/-/compare/3.22.26...3.22.27 --- pkgs/desktops/gnome/games/aisleriot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 5983b89f37f4..77ca7ca8586b 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.26"; + version = "3.22.27"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "aisleriot"; rev = version; - sha256 = "sha256-enUDJ6KM3QDsPb3ckKOxpRzMe4I0bj4TQR94oZWJJJY="; + sha256 = "sha256-XvYQ1JWMBWVZF5u3VL1zPADgMDMN/1FNuwZ4vaOeo7Y="; }; nativeBuildInputs = [ From 4d5d4a7df3470ab4993407aa90ebc69b3674a667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Jan 2023 19:26:38 +0100 Subject: [PATCH 06/17] release.nix: don't block on aarch64-darwin bootstrap tools They haven't worked for several months, so let's not start blocking now: https://hydra.nixos.org/job/nixpkgs/nixpkgs-unstable-aarch64-darwin/stdenvBootstrapTools.aarch64-darwin.dist --- pkgs/top-level/release.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 61116328b29f..374a308ac141 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -130,7 +130,8 @@ let jobs.tests.patch-shebangs.x86_64-linux */ ] - ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools + # FIXME: reintroduce aarch64-darwin after this builds again + ++ lib.collect lib.isDerivation (removeAttrs jobs.stdenvBootstrapTools [ "aarch64-darwin" ]) ++ lib.optionals supportDarwin.x86_64 [ jobs.stdenv.x86_64-darwin jobs.cargo.x86_64-darwin From ac33331957681b70d5206809d378f7144320655a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 5 Jan 2023 21:47:28 +0000 Subject: [PATCH 07/17] keybinder: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/keybinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index ee1b4fb8ce8a..ce38c51a7788 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -6,13 +6,13 @@ let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { pname = "keybinder"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "engla"; repo = "keybinder"; rev = "v${version}"; - sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk="; + sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU="; }; nativeBuildInputs = [ pkg-config autoconf automake ]; From 4d0d25a37e056e8d349d8d0ab4a3434faf6a9bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 5 Jan 2023 18:50:03 -0300 Subject: [PATCH 08/17] linuxKernel.kernels.linux_lqx: 6.1.2-lqx1 -> 6.1.3-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index c061b5433792..a9308ab2eefe 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.2"; #lqx + version = "6.1.3"; #lqx suffix = "lqx1"; #lqx - sha256 = "03kwp1c3amk87sjdji9643gr396hca8crqf2z614wkd84vdwary0"; #lqx + sha256 = "0vp6skhw4wsxk2nl3m8y975a9bx78h5wl574wsfgnc5nvzmh250l"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 5da27ada70594617d401e36f72cb236b6f7650eb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 5 Jan 2023 21:46:04 +0000 Subject: [PATCH 09/17] keybinder: disable python bindings --- pkgs/development/libraries/keybinder/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index ce38c51a7788..e4318ebe6193 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome -, gtk-doc, gtk2, python2Packages, lua, gobject-introspection +, gtk-doc, gtk2, lua, gobject-introspection }: -let - inherit (python2Packages) python pygtk; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "keybinder"; version = "0.3.1"; @@ -16,13 +14,16 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ libtool gnome.gnome-common gtk-doc gtk2 - python pygtk lua gobject-introspection + lua gobject-introspection ]; + configureFlags = [ "--disable-python" ]; + preConfigure = '' - ./autogen.sh --prefix="$out" + ./autogen.sh --prefix="$out" $configureFlags ''; meta = with lib; { @@ -36,8 +37,6 @@ in stdenv.mkDerivation rec { * A C library, ``libkeybinder`` * Gobject-Introspection (gir) generated bindings * Lua bindings, ``lua-keybinder`` - * Python bindings, ``python-keybinder`` - * An ``examples`` directory with programs in C, Lua, Python and Vala. ''; homepage = "https://github.com/engla/keybinder/"; license = licenses.gpl2Plus; From 9c21b5bcd8f15f2083c62f849ba81016e83abe11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 5 Jan 2023 19:31:51 -0300 Subject: [PATCH 10/17] linuxKernel.kernels.linux_zen: 6.1.2-zen1 -> 6.1.3-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index a9308ab2eefe..4c72a78133a7 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.2"; #zen + version = "6.1.3"; #zen suffix = "zen1"; #zen - sha256 = "0wys16f4z221r3g3fc8cb5i0hcymjsk780jk657ihx5xm3anv3kf"; #zen + sha256 = "JOOw24CroRTOaWqdGaiZBDMk0ITmIsZKXZV3KeoqGMw="; #zen isLqx = false; }; # ./update-zen.py lqx From 78162240513bcfbb4b201058b5914b44888abbb2 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 6 Jan 2023 04:51:56 +0100 Subject: [PATCH 11/17] powertop: add anthonyroussel to maintainers --- pkgs/os-specific/linux/powertop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 2b498d9ddc91..0c46a0d6a6db 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Analyze power consumption on Intel-based laptops"; homepage = "https://01.org/powertop"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz anthonyroussel ]; platforms = platforms.linux; }; } From 700dda2156660c0c8c9f45498534aeeb33e6ee58 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 6 Jan 2023 04:51:44 +0100 Subject: [PATCH 12/17] powertop: 2.14 -> 2.15 --- pkgs/os-specific/linux/powertop/default.nix | 33 ++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 0c46a0d6a6db..f353067094b0 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,42 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils -, pkg-config, zlib, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils +, pkg-config, zlib, autoreconfHook, autoconf-archive, nix-update-script, testers, powertop }: stdenv.mkDerivation rec { pname = "powertop"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "fenrus75"; repo = pname; rev = "v${version}"; - sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f"; + hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M="; }; - patches = [ - # Pull upstream patch for ncurses-6.3 compatibility - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/fenrus75/powertop/commit/9ef1559a1582f23d599c149601c3a8e06809296c.patch"; - sha256 = "0qx69f3bwhxgsga9nas8lgrclf1rxvr7fq7fd2n8dv3x4lsb46j1"; - }) - ]; - outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - NIX_LDFLAGS = [ "-lpthread" ]; - postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool" ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = powertop; + command = "powertop --version"; + inherit version; + }; + }; + meta = with lib; { + inherit (src.meta) homepage; + changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}"; description = "Analyze power consumption on Intel-based laptops"; - homepage = "https://01.org/powertop"; license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz anthonyroussel ]; platforms = platforms.linux; From 1b28b9c555bbddbc6b9594cff67f3d8a7524ef06 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 6 Jan 2023 04:52:49 +0100 Subject: [PATCH 13/17] powertop: format with nixpkgs-fmt --- pkgs/os-specific/linux/powertop/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index f353067094b0..02c2851177a7 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils -, pkg-config, zlib, autoreconfHook, autoconf-archive, nix-update-script, testers, powertop }: +{ lib +, stdenv +, fetchFromGitHub +, gettext +, libnl +, ncurses +, pciutils +, pkg-config +, zlib +, autoreconfHook +, autoconf-archive +, nix-update-script +, testers +, powertop +}: stdenv.mkDerivation rec { pname = "powertop"; From 0d394e08c826d7c7238c49d4a4d70462626d78b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 30 Dec 2022 10:36:37 +0100 Subject: [PATCH 14/17] =?UTF-8?q?ocamlPackages.containers:=203.9=20?= =?UTF-8?q?=E2=86=92=203.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 4b4cb19686bd..4cd6413293e5 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,14 +5,14 @@ }: buildDunePackage rec { - version = "3.9"; + version = "3.10"; pname = "containers"; src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "sha256-uQyKBSXgf3kGx5HvS2VQrrkh0WqNZfxr5j8tTRjeTX4="; + hash = "sha256-eWmju4CD30+wX3sKI8rOUEbqbQygdOtc0U4sb9vYuNA="; }; buildInputs = [ dune-configurator ]; From 4c9c1b6c84b1c623cb912b00d44eec9e3c63a352 Mon Sep 17 00:00:00 2001 From: Dolphin von Chips Date: Sat, 31 Dec 2022 15:36:56 +0500 Subject: [PATCH 15/17] ocamlPackages.ppxlib: use release tarballs instead of git repositories This allows to fetch ppxlib's version using findlib. One example of package which depends on this is metapp (https://github.com/thierry-martinez/metapp), which fetches ppxlib's version at build time and fails to build if it's not found. --- .../ocaml-modules/ppxlib/default.nix | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 92090c244142..bc683033eaca 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , version ? if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" @@ -10,45 +10,49 @@ let param = { "0.8.1" = { - sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE="; max_version = "4.10"; useDune2 = false; useOMP2 = false; }; "0.13.0" = { - sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl"; + sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk="; + max_version = "4.11"; useDune2 = false; useOMP2 = false; }; "0.15.0" = { - sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn"; + sha256 = "sha256-C2MNf410qJmlXMJxiLXOA+c1qT8H6gwt5WUy2P2TszA="; min_version = "4.07"; max_version = "4.12"; useOMP2 = false; }; "0.18.0" = { - sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm"; + sha256 = "sha256-nUg8NkZ64GHHDfcWbtFGXq3MNEKu+nYPtcVDm/gEfcM="; min_version = "4.07"; max_version = "4.12"; }; "0.22.0" = { - sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q"; + sha256 = "sha256-PuuR4DlmZiKEoyIuYS3uf0+it2N8U9lXLSp0E0u5bXo="; min_version = "4.07"; + max_version = "4.13"; }; "0.22.2" = { - sha256 = "0fysjqcpv281n52wl3h0dy2lzf9d61wdzk90ldv3p63a4i3mr1j2"; + sha256 = "sha256-0Oih69xiILFXTXqSbwCEYMURjM73m/mgzgJC80z/Ilo="; min_version = "4.07"; + max_version = "4.14"; }; "0.23.0" = { - sha256 = "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1"; + sha256 = "sha256-G1g2wYa51aFqz0falPOWj08ItRm3cpzYao/TmXH+EuU="; min_version = "4.07"; + max_version = "4.14"; }; "0.24.0" = { - sha256 = "sha256-wuG7cUZiVP2PdM+nZloip7lGGiWn6Wpkh2YoF/Fuc9o="; + sha256 = "sha256-d2YCfC7ND1s7Rg6SEqcHCcZ0QngRPrkfMXxWxB56kMg="; min_version = "4.07"; }; "0.28.0" = { - sha256 = "sha256-i/U++sosKQUjyxu9GscPb1Gfv2a3Hbmj+UgIZlewnCo="; + sha256 = "sha256-2Hrl+aCBIGMIypZICbUKZq646D0lSAHouWdUSLYM83c="; min_version = "4.07"; }; }."${version}"; in @@ -62,12 +66,10 @@ buildDunePackage rec { pname = "ppxlib"; inherit version; - useDune2 = param.useDune2 or true; + duneVersion = if param.useDune2 or true then "2" else "1"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = pname; - rev = version; + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz"; inherit (param) sha256; }; @@ -85,6 +87,6 @@ buildDunePackage rec { description = "Comprehensive ppx tool set"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-ppx/ppxlib"; }; } From 5d67071b1a5b39e718ba41537573b8857a899cbc Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 6 Jan 2023 04:49:59 -0500 Subject: [PATCH 16/17] scaleway-cli: 2.7.0 -> 2.8.0 (#209071) --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 6169f22eb12b..e4cbcf3c3616 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-DWr5I6xMESRWhQCgDY/xJsSw0XhlNSJiVsHNvL+xmH4="; + sha256 = "sha256-2PDENdQmkcGU+nRjfr9QW5H3vzNPq1YStN4yew0+Ixw="; }; - vendorSha256 = "sha256-1Ke01pc+RyqxCuD1SGypTSKCFnnHazz6IaybL0TylhA="; + vendorSha256 = "sha256-EzZ18jXettkGbGgMIthqnyfwJ44hEh2SCdV6XpFv3GQ="; ldflags = [ "-w" From 3f4bbaee841660825d0258d3b56147865bdb5fc9 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Fri, 6 Jan 2023 11:11:30 +0100 Subject: [PATCH 17/17] nginxModules.geoip2: 3.3 -> 3.4 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 7c3e6255c403..971e04dcd365 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -204,8 +204,8 @@ let self = { name = "geoip2"; owner = "leev"; repo = "ngx_http_geoip2_module"; - rev = "3.3"; - sha256 = "EEn/qxPsBFgVBqOgPYTrRhaLPwSBlSPWYYSr3SL8wZA="; + rev = "3.4"; + sha256 = "CAs1JZsHY7RymSBYbumC2BENsXtZP3p4ljH5QKwz5yg="; }; inputs = [ libmaxminddb ];