From 70d943295c92e98af02a809053d295a69a72719f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 15 Jan 2024 00:14:29 -0500 Subject: [PATCH 01/23] rubyPackages.msgpack: drop nonexistent dependency on msgpack --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 97715659be0d..232efeb42571 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl -, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem +, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem , cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk @@ -562,10 +562,6 @@ in ''; }; - msgpack = attrs: { - buildInputs = [ msgpack ]; - }; - mysql = attrs: { buildInputs = [ libmysqlclient zlib openssl ]; }; From ac922d9f9ab6c7bbc92f8fc6d1f733e5dd5bd7a3 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 4 Feb 2024 10:49:39 -0600 Subject: [PATCH 02/23] yabai: 6.0.7 -> 6.0.9 --- pkgs/os-specific/darwin/yabai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 54d307290925..09393e9523e6 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "6.0.7"; + version = "6.0.9"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-hZMBXSCiTlx/37jt2yLquCQ8AZ2LS3heIFPKolLub1c="; + hash = "sha256-v7V52R+ODJIYKWPs1NW2jNBK96wNz+XyabNMyEg/L+o="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-vWL2KA+Rhj78I2J1kGItJK+OdvhVo1ts0NoOHIK65Hg="; + hash = "sha256-fI5Y6LAO1jieg4x9loIV6jdD+qZ9B07S545oBmRADkA="; }; nativeBuildInputs = [ From 23b89f915bd63ca9b469f280185daefaa9c3f7c7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 6 Feb 2024 18:35:39 -0600 Subject: [PATCH 03/23] sketchybar: 2.20.0 -> 2.20.1 --- pkgs/os-specific/darwin/sketchybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 1d10749bf95a..4ac6ef9c13c9 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.20.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-Nyje2F2OXtojbAGNgGPGdX8SEH75SWWpBKLFULb96n4="; + hash = "sha256-dyo4J3Qszq7SSXdAXmgm7xFhWE5Eqtr7yZpNGmtuphY="; }; buildInputs = [ From 82216f3d1be9e64c25515af69b9d6661aa447a05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Feb 2024 05:28:08 +0000 Subject: [PATCH 04/23] python312Packages.apycula: 0.10.0 -> 0.11.1 --- pkgs/development/python-modules/apycula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index afa3cf9230d5..43289ba0751d 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.10.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-nSj+c6IX57kwcDz/h2Sg4U8JlxZ5fq8k7hDL1zCE08g="; + hash = "sha256-yuDyW1JXavI6U3B3hx3kdHBuVCQd2rJJqgZ0z15ahaw="; }; nativeBuildInputs = [ From c3c693491ca0572da6b1a80e8ac164e4d74eff4d Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 29 Jan 2024 15:01:16 +0100 Subject: [PATCH 05/23] winePackages.{unstable,staging}: 9.0 -> 9.1 --- pkgs/applications/emulators/wine/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 8bae07a87e07..0b2d41bd2d28 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.0"; - url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz"; - hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4="; + version = "9.1"; + url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; + hash = "sha256-AbO5G2/DXKvpOyjxkKI3upXIrHDENtkZWG3qo9olj/8="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-lE/95OZigifreaRRCPkvA+Z0FqsBmm018jD6leSysXU="; + hash = "sha256-Auf3aXPYxluAC2WZvieTcN0xjWp4GzEZqywadWNYPWM="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 65b289f68a2a677e9d675b849a10c19f3b188252 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 10 Feb 2024 15:59:32 -0600 Subject: [PATCH 06/23] yosys: 0.37 -> 0.38 Also fix test issues on macOS. --- pkgs/development/compilers/yosys/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 850e02dc6e67..ee8fe6cee576 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.37"; + version = "0.38"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-JRztXMZMBFhdZMeVHkRxFulRrFzyuNaLzcRlmgAz6Gc="; + hash = "sha256-mzMBhnIEgToez6mGFOvO7zBA+rNivZ9OnLQsjBBDamA="; }; enableParallelBuilding = true; @@ -107,7 +107,11 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace ./Makefile \ - --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' + --replace-fail 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' + + # https://github.com/YosysHQ/yosys/pull/4199 + substituteInPlace ./tests/various/clk2fflogic_effects.sh \ + --replace-fail 'tail +3' 'tail -n +3' chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in @@ -135,6 +139,13 @@ in stdenv.mkDerivation (finalAttrs: { echo "BOOST_PYTHON_LIB := -lboost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" >> Makefile.conf ''; + preCheck = '' + # autotest.sh automatically compiles a utility during startup if it's out of date. + # having N check jobs race to do that creates spurious codesigning failures on macOS. + # run it once without asking it to do anything so that compilation is done before the jobs start. + tests/tools/autotest.sh + ''; + checkTarget = "test"; doCheck = true; nativeCheckInputs = [ verilog ]; From adb9bde1cc0f40e5ae1f8c5020e88ba8e30b0ef7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 10 Feb 2024 17:45:34 -0600 Subject: [PATCH 07/23] yabai: 6.0.9 -> 6.0.10 --- pkgs/os-specific/darwin/yabai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 09393e9523e6..4ccf2e875ef1 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "6.0.9"; + version = "6.0.10"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-v7V52R+ODJIYKWPs1NW2jNBK96wNz+XyabNMyEg/L+o="; + hash = "sha256-HabZzcX/r6eXm8SWcBA2QUJAIUzMqhvRUxCk8CclPfw="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-fI5Y6LAO1jieg4x9loIV6jdD+qZ9B07S545oBmRADkA="; + hash = "sha256-KQLL3iX0Tqap2WooaDXF3i9v6w3Bew9No1iccFArzzs="; }; nativeBuildInputs = [ From e6841b0d0e02d302611c66da421a1e85bc014e03 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Feb 2024 04:20:00 +0000 Subject: [PATCH 08/23] flexget: 3.11.8 -> 3.11.17 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.11.8...v3.11.17 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.17 --- .../networking/flexget/default.nix | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 1518ca4403d9..c2f13faa10c4 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -4,27 +4,9 @@ , fetchFromGitHub }: -let - python = python3.override { - # FlexGet doesn't support transmission-rpc>=5 yet - # https://github.com/NixOS/nixpkgs/issues/258504 - # https://github.com/Flexget/Flexget/issues/3847 - packageOverrides = self: super: { - transmission-rpc = super.transmission-rpc.overridePythonAttrs (old: rec { - version = "4.3.1"; - src = fetchPypi { - pname = "transmission_rpc"; - inherit version; - hash = "sha256-Kh2eARIfM6MuXu7RjPPVhvPZ+bs0AXkA4qUCbfu5hHU="; - }; - doCheck = false; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.8"; + version = "3.11.17"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -32,7 +14,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-kJLcOk1ci4agSoBO7L1JacVq5G2jTjOj1mh7J8S2D+Y="; + hash = "sha256-C6BVSrF6xM3tnNnGS39T57N9jB5LnOq4W1hcF99CgPk="; }; postPatch = '' @@ -40,12 +22,12 @@ python.pkgs.buildPythonApplication rec { sed 's/[~<>=][^;]*//' -i requirements.txt ''; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ setuptools wheel ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt apscheduler beautifulsoup4 From 05e8c3e2d9904e0b4eb7a166f1f4136ccdf96d6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Feb 2024 09:48:04 +0000 Subject: [PATCH 09/23] ironbar: 0.14.0 -> 0.14.1 --- pkgs/by-name/ir/ironbar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index bcd28e4ee581..1576f06528c6 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "ironbar"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "ironbar"; rev = "v${version}"; - hash = "sha256-NRQAR412m14SHozYjJmlnb/TJyCroiWdqY0NLvCOQSE="; + hash = "sha256-y4w4i/IVe1+wjB2tsCPQH6c7XTl93u45Q0pXFi3TY1E="; }; - cargoHash = "sha256-EzLcmOppzUtTg1dOdZcx2rweiELPXv2Mt/we7hMr4m4="; + cargoHash = "sha256-h5yNJM+NvX/Hi86iSegHWevPcPZeDmJ4y/qNr3G20Qg="; buildInputs = [ gtk3 From f24b1330485e12e90e4ba8db5799d327a22c942e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Feb 2024 10:04:21 +0000 Subject: [PATCH 10/23] ory: 0.3.2 -> 0.3.4 --- pkgs/by-name/or/ory/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/ory/package.nix b/pkgs/by-name/or/ory/package.nix index b5ba89d2dd14..d4fb9aa9e7d8 100644 --- a/pkgs/by-name/or/ory/package.nix +++ b/pkgs/by-name/or/ory/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ory"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "ory"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-o5ii8+tQzVcoIgTHQ9nnGJf2VKhWhL+osbAKPB7esDA="; + hash = "sha256-q7+Fpttgx62GbKxCCiEDlX//e/pNO24e7KhhBeGRDH0="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ buildGoModule rec { "sqlite" ]; - vendorHash = "sha256-iUPZbeCZ08iDf8+u2CoVH1yN2JyBqQjeS3dAKUMyX9Y="; + vendorHash = "sha256-B0y1JVjJmC5eitn7yIcDpl+9+xaBDJBMdvm+7N/ZxTk="; postInstall = '' mv $out/bin/cli $out/bin/ory From b18a422f41aab3daf8ff3966d43316cd28b7e64b Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 11 Feb 2024 13:41:42 +0100 Subject: [PATCH 11/23] sysdig: 0.34.1 -> 0.35.1 --- pkgs/os-specific/linux/sysdig/default.nix | 41 +++++++---------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 33354b1df8b7..be924a5e8637 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -4,11 +4,11 @@ }: let - # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.13.1"; - libsHash = "sha256-UNoXIkFr64Nr0XVAtV4+BMNpCk4w8Dn4waZek/ok4Uk="; + # Compare with https://github.com/draios/sysdig/blob/0.35.1/cmake/modules/falcosecurity-libs.cmake + libsRev = "0.14.2"; + libsHash = "sha256-sWrniRB/vQd1BZnsiz+wLHugrF3LhuAr9e9gDMavLoo="; - # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 + # Compare with https://github.com/falcosecurity/libs/blob/0.14.2/cmake/modules/valijson.cmake valijson = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; @@ -23,35 +23,23 @@ let hash = "sha256-qQhvLzpCYMAafBNRWlY5yklHrILM8BYD+xxF0l17+do="; }; - # https://github.com/draios/sysdig/blob/0.31.5/cmake/modules/driver.cmake + # https://github.com/draios/sysdig/blob/0.35.1/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "6.0.1+driver"; - hash = "sha256-e9TJl/IahrUc4Yq2/KssTz3IBjOZwXeLt1jOkZ94EiE="; - }; - - # can be dropped in next release - uthashDevendorPatch = fetchpatch { - url = "https://github.com/falcosecurity/libs/commit/0d58f798ab72e21a16ee6965c775cba2932e5100.patch"; - hash = "sha256-5Y79M9u5rXZiKllJcXzDDw/3JKt0k/CgvWx+MZepkpw="; - }; - - # https://github.com/falcosecurity/libs/blob/master/cmake/modules/b64.cmake - base64 = fetchurl { - url = "https://raw.githubusercontent.com/istio/proxy/1.18.2/extensions/common/wasm/base64.h"; - hash = "sha256-WvHRHp5caMBDvH+2pMrU4ZptX6WvPcPaeVGtVBBCw64="; + rev = "7.0.0+driver"; + hash = "sha256-kXqvfM7HbGh2wEGaO4KBkFDW+m5gpOShJZKJLu9McKk="; }; in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - hash = "sha256-G1yr1wHiaGvLMtBZgh4eoiRNJiH0cghHqWFOjKYXXsw="; + hash = "sha256-nSCkKwhdEduepyvcyWEKMQtQ6TfhF3GnTSreRVoarsw="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -84,15 +72,13 @@ stdenv.mkDerivation rec { hash = libsHash; }} libs chmod -R +w libs - pushd libs - patch -p1 < ${uthashDevendorPatch} - popd + + substituteInPlace libs/userspace/libscap/libscap.pc.in libs/userspace/libsinsp/libsinsp.pc.in \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@" cp -r ${driver} driver-src chmod -R +w driver-src - pushd driver-src - patch -p1 < ${uthashDevendorPatch} - popd cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver" @@ -124,7 +110,6 @@ stdenv.mkDerivation rec { exit 1 fi cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization") - install -D ${base64} build/b64/base64.h '' + lib.optionalString (kernel != null) '' export INSTALL_MOD_PATH="$out" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" From 6f37738cf7ea61aa044b7ed98a6fc184067425b8 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 11 Feb 2024 13:51:22 +0100 Subject: [PATCH 12/23] sysdig: remove unneeded tinydir (https://github.com/draios/sysdig/commit/838ffdeb05e9c747c25de7880f735b03e740741e) --- pkgs/os-specific/linux/sysdig/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index be924a5e8637..0dbfbd29b6c3 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -16,13 +16,6 @@ let hash = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; }; - tinydir = fetchFromGitHub { - owner = "cxong"; - repo = "tinydir"; - rev = "1.2.5"; - hash = "sha256-qQhvLzpCYMAafBNRWlY5yklHrILM8BYD+xxF0l17+do="; - }; - # https://github.com/draios/sysdig/blob/0.35.1/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; @@ -94,7 +87,6 @@ stdenv.mkDerivation rec { "-DUSE_BUNDLED_JSONCPP=OFF" "-DCREATE_TEST_TARGETS=OFF" "-DVALIJSON_INCLUDE=${valijson}/include" - "-DTINYDIR_INCLUDE=${tinydir}" "-DUTHASH_INCLUDE=${uthash}/include" ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; From 62c998c0bb92b8068b876bf60e0af349a9448b68 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sun, 11 Feb 2024 14:39:22 +0100 Subject: [PATCH 13/23] winePackages.{unstable,staging}: 9.1 -> 9.2 --- pkgs/applications/emulators/wine/sources.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 0b2d41bd2d28..a0195eadd090 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.1"; + version = "9.2"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-AbO5G2/DXKvpOyjxkKI3upXIrHDENtkZWG3qo9olj/8="; + hash = "sha256-goHFoILMR6w8LJHOqt5fFzllU7Oa3LMudBJThltlgWI="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "8.1.0"; + version = "9.0.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA="; + hash = "sha256-efbEMQBnVWbBEvQZm56nuUTTOBZLNL2R+hGwsKQU4cQ="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -114,11 +114,12 @@ in rec { ''; }; - staging = fetchFromGitHub rec { - # https://github.com/wine-staging/wine-staging/releases + staging = fetchFromGitLab rec { + # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-Auf3aXPYxluAC2WZvieTcN0xjWp4GzEZqywadWNYPWM="; - owner = "wine-staging"; + hash = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco="; + domain = "gitlab.winehq.org"; + owner = "wine"; repo = "wine-staging"; rev = "v${version}"; From 2e2211a386070c0b5b3cbb94fb7da83637cd12dd Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 5 Feb 2024 23:12:00 +0100 Subject: [PATCH 14/23] wine: don't default mingwSupport to true outside stable release This way, minimal Wine will build without it --- pkgs/applications/emulators/wine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index ec05cef74414..7e3514fa720a 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -35,7 +35,7 @@ vulkanSupport ? false, sdlSupport ? false, usbSupport ? false, - mingwSupport ? wineRelease != "stable", + mingwSupport ? false, waylandSupport ? stdenv.isLinux, x11Support ? stdenv.isLinux, embedInstallers ? false, # The Mono and Gecko MSI installers From b2182b9130c18c8d8527b86e2e8a2cb749c115fa Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 5 Feb 2024 23:21:29 +0100 Subject: [PATCH 15/23] wine: cleanup Wayland Makes base.nix less Wayland-centric. This means: - Don't specify support in the meta.description (since even regular Wine supports it, it's specified everywhere) - `x11Support` and `waylandSupport` are now set in `wine-packages.nix`, like every other flag (they are also now disabled on minimal) - Disable Darwin in supported platforms if an incompatible supportFlag is true (not just `waylandSupport`) - Add wineRelease name for every release other than "stable" or "unstable", instead of just "wayland" - This also fixes an inconsistency on wine-staging, where "-staging" was written after the version --- pkgs/applications/emulators/wine/base.nix | 8 +++++--- pkgs/applications/emulators/wine/default.nix | 4 ++-- pkgs/applications/emulators/wine/staging.nix | 4 +--- pkgs/top-level/wine-packages.nix | 6 ++++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 08bf9a630682..fc6d08556091 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -23,6 +23,8 @@ let mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs; }; } ./setup-hook-darwin.sh; + darwinUnsupportedFlags = [ "alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport" "udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport" ]; + darwinUnsupported = builtins.any (name: builtins.getAttr name supportFlags) darwinUnsupportedFlags; in stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; @@ -47,7 +49,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { }) // rec { inherit version src; - pname = prevName + lib.optionalString (wineRelease == "wayland") "-wayland"; + pname = prevName + lib.optionalString (wineRelease != "stable" && wineRelease != "unstable") "-${wineRelease}"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; @@ -209,8 +211,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { binaryNativeCode # mono, gecko ]; broken = stdenv.isDarwin && !supportFlags.mingwSupport; - 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; + description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; + platforms = if darwinUnsupported then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ]; inherit mainProgram; }; diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 7e3514fa720a..69706dcfd720 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -36,8 +36,8 @@ sdlSupport ? false, usbSupport ? false, mingwSupport ? false, - waylandSupport ? stdenv.isLinux, - x11Support ? stdenv.isLinux, + waylandSupport ? false, + x11Support ? false, embedInstallers ? false, # The Mono and Gecko MSI installers moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily }: diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index 9e9a03ebfc59..0a99e6d42a87 100644 --- a/pkgs/applications/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix @@ -7,12 +7,10 @@ let patch = (callPackage ./sources.nix {}).staging; (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; -(lib.overrideDerivation wineUnstable (self: { +(lib.overrideDerivation (wineUnstable.override { wineRelease = "staging"; }) (self: { buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs; - name = "${self.name}-staging"; - prePatch = self.prePatch or "" + '' patchShebangs tools cp -r ${patch}/patches ${patch}/staging . diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 7cf5533da7f2..18596f21014e 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -25,6 +25,8 @@ rec { sdlSupport = true; mingwSupport = true; usbSupport = true; + waylandSupport = stdenv.isLinux; + x11Support = stdenv.isLinux; }; full = base.override { @@ -50,6 +52,6 @@ rec { staging = base.override { wineRelease = "staging"; }; stagingFull = full.override { wineRelease = "staging"; }; - wayland = base.override { wineRelease = "wayland"; }; - waylandFull = full.override { wineRelease = "wayland"; }; + wayland = base.override { wineRelease = "wayland"; waylandSupport = true; }; + waylandFull = full.override { wineRelease = "wayland"; waylandSupport = true; }; } From 997500c6885ca83923cce49c91f7675515c3827b Mon Sep 17 00:00:00 2001 From: 9R Date: Sun, 11 Feb 2024 09:25:25 +0100 Subject: [PATCH 16/23] maintainers: add _9R --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e339ec41025..4be53f36b802 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -241,6 +241,12 @@ fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691"; }]; }; + _9R = { + email = "nix@9-r.net"; + github = "9R"; + githubId = 381298; + name = "9R"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; From 99a12fdbb07c8d7711253bed31a97c329a229ebe Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 11 Feb 2024 11:12:16 -0600 Subject: [PATCH 17/23] yabai: 6.0.10 -> 6.0.11 --- pkgs/os-specific/darwin/yabai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 4ccf2e875ef1..549acdce24f0 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "6.0.10"; + version = "6.0.11"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-HabZzcX/r6eXm8SWcBA2QUJAIUzMqhvRUxCk8CclPfw="; + hash = "sha256-CfyuWvxkeZQVuwMbX90CZF0RiY6q+o0WtfE3H9Z8q1o="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-KQLL3iX0Tqap2WooaDXF3i9v6w3Bew9No1iccFArzzs="; + hash = "sha256-HaflgZJ7QqooaSUNW+Uu0LD9+AVu4hHyJtILUrOC9+I="; }; nativeBuildInputs = [ From 57da038a87c2c42d57003fc2451cdaffbe36b9f2 Mon Sep 17 00:00:00 2001 From: 9R Date: Sun, 11 Feb 2024 09:26:47 +0100 Subject: [PATCH 18/23] sispmctl: init at 4.11 --- pkgs/by-name/si/sispmctl/package.nix | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/si/sispmctl/package.nix diff --git a/pkgs/by-name/si/sispmctl/package.nix b/pkgs/by-name/si/sispmctl/package.nix new file mode 100644 index 000000000000..d431e1a29ffe --- /dev/null +++ b/pkgs/by-name/si/sispmctl/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, libusb-compat-0_1 +}: + +stdenv.mkDerivation rec { + pname = "sispmctl"; + version = "4.11"; + + src = fetchurl { + url = "mirror://sourceforge/sispmctl/sispmctl-${version}.tar.gz"; + hash = "sha256-dLlKNxAEaxUHDHMR8MrLgVVMhrQidxnMJzPLlscFJXg="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libusb-compat-0_1 + ]; + + meta = with lib; { + homepage = "https://sispmctl.sourceforge.net/"; + description = "USB controlled powerstrips management software"; + license = licenses.gpl2Plus; + mainProgram = "sispmctl"; + maintainers = [ maintainers._9R ]; + platforms = platforms.unix; + }; +} From 84f5833a9d9b5c693e449aa5a63be0d40b7886ef Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 11 Feb 2024 21:21:12 +0100 Subject: [PATCH 19/23] presenterm: 0.6.0 -> 0.6.1 Diff: https://github.com/mfontanini/presenterm/compare/refs/tags/v0.6.0...v0.6.1 Changelog: https://github.com/mfontanini/presenterm/releases/tag/v0.6.1 --- pkgs/by-name/pr/presenterm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 0697624f88d2..8745736119ba 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -9,20 +9,20 @@ rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; rev = "refs/tags/v${version}"; - hash = "sha256-du/fL+6GYFm20jDdPwA/ImFI4HvhNTH2kVgToM0FETY="; + hash = "sha256-+XESFDseRScWYOry58JLknGv+xhewTKx38lrzQu2mQ4="; }; buildInputs = [ libsixel ]; - cargoHash = "sha256-zX6/1IRZVNjXtaJbQ/eUnGUOFvPTuKBHtVLpkfPr7XA="; + cargoHash = "sha256-xZLGm+tGAmmo/OzDMrgQK0uH7GMG6fTkpPsXwLe94VM="; # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib From d439d93c01e51131b862b9641dcdb21c203d4630 Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Thu, 25 Jan 2024 15:08:33 +0000 Subject: [PATCH 20/23] arc_unpacker: apply AUR patch that fixes build on GCC 13 `arc_unpacker` fails to build with GCC 13 because GCC stopped transitively including `cstdint` in a lot of scenarios. While the project is inactive (the repository has been archived on GitHub), the Arch Linux user repository already contains a patch that fixes this issue. Since ofborg indicated unit test failures on darwin-aarch64, this change also marks the package as broken for such machines. Note that these test failures are very unlikely to be caused by the patch applied here, as it only adds a single `#include ` statement in a single file and that specific include has been pulled in with older versions of GCC, anyway. Co-authored-by: midchildan Co-authored-by: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> --- pkgs/tools/archivers/arc_unpacker/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index f293ae49626f..61bf3fa91e74 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation { url = "https://aur.archlinux.org/cgit/aur.git/plain/failing_tests.patch?h=arc_unpacker-git&id=bda1ad9f69e6802e703b2e6913d71a36d76cfef9"; hash = "sha256-bClACsf/+SktyLAPtt7EcSqprkw8JVIi1ZLpcJcv9IE="; }) + (fetchpatch { + name = "include_cstdint.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/include_cstdint.patch?h=arc_unpacker-git&id=8c5c5121b23813c7650db19cb617b409d8fdcc9f"; + hash = "sha256-3BQ1v7s9enUK/js7Jqrqo2RdSRvGVd7hMcY4iL51SiE="; + }) ]; postPatch = '' @@ -86,5 +91,8 @@ stdenv.mkDerivation { maintainers = with maintainers; [ midchildan ]; platforms = platforms.all; mainProgram = "arc_unpacker"; + + # unit test failures + broken = stdenv.isDarwin && stdenv.isAarch64; }; } From 2004c7b5c464b9b1518e2e87b185c83838ab4c56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Feb 2024 22:22:34 +0000 Subject: [PATCH 21/23] symfony-cli: 5.8.6 -> 5.8.8 --- pkgs/development/tools/symfony-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 453b96242638..e316ae832231 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.8.6"; + version = "5.8.8"; vendorHash = "sha256-ACK0JCaS1MOCgUi2DMEjIcKf/nMCcrdDyIdioBZv7qw="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-lZ4jPmqPGyWp8xS156XXl6s4ZfNbU4M5xJy25nRL1Bs="; + hash = "sha256-GdmFRGyp4s5G5RTEFKjcrY/OpaEVCgRhNVJbY1F8vk0="; }; ldflags = [ From c4558a9c7942bf664b5cc5174084bff14b36263a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sun, 11 Feb 2024 20:19:17 -0300 Subject: [PATCH 22/23] budgie.budgie-backgrounds: 2.0 -> 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/budgie-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index 989908916689..fc51474af340 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "budgie-backgrounds"; - version = "2.0"; + version = "3.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-backgrounds"; rev = "v${version}"; - hash = "sha256-L6y9YVS0NFsycS90AmUJJd9HFMJ/Ge99pI426tC05jA="; + hash = "sha256-2E6+WDLIAwqiiPMJw+tLDCT3CnpboH4X0cB87zw/hBQ="; }; nativeBuildInputs = [ From d73507aae635df37e68208ad508bcfc0b0bdd800 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Feb 2024 03:54:39 +0000 Subject: [PATCH 23/23] python312Packages.pytest-describe: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/pytest-describe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index a7c389202ee9..c1118327734c 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -11,7 +11,7 @@ let pname = "pytest-describe"; - version = "2.1.0"; + version = "2.2.0"; in buildPythonPackage { inherit pname version; @@ -19,7 +19,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-BjDJWsSUKrjc2OdmI2+GQ2tJhIltsMBZ/CNP72b+lzI="; + hash = "sha256-ObsF65DySX2co0Lvmgt/pbraflhQWuwz9m1mHWMZVbc="; }; buildInputs = [