From 95a5f1411645416240a59b75a04ee70997fc6bcc Mon Sep 17 00:00:00 2001 From: MinerSebas Date: Wed, 29 Nov 2023 15:33:09 +0100 Subject: [PATCH 01/15] nixos/plasma5: Dont add samba a second time to `environment.systemPackages` If `services.samba.enable` is true, the the samba Module already adds the samba Package. If a User sets a differnet Package in `services.samba.package` then `environment.systemPackages` will contain two different samba Packages. ``` system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/testparm' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/testparm' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/testparm' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/testparm' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/nmbd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/nmbd' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/nmbd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/nmbd' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbcontrol' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbcontrol' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbcontrol' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbcontrol' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/gentest' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/gentest' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/gentest' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/gentest' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbpasswd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbpasswd' system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbd' ... ``` (The original samba will still stay in the closure as `kdenetwork-filesharing` depends on it.) --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index a177299bb32b..3a77c0f46a73 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -295,7 +295,7 @@ in ++ lib.optional config.powerManagement.enable powerdevil ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt - ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] + ++ lib.optional config.services.samba.enable kdenetwork-filesharing ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet ++ lib.optional config.services.flatpak.enable flatpak-kcm; From 8b217a82a25d34c4306271bc0cf301caeae32ba7 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 9 Dec 2023 13:53:31 +0300 Subject: [PATCH 02/15] vcmi: 1.3.2 -> 1.4.0 --- pkgs/games/vcmi/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index ad5aa48c7c5d..2dd27400961d 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -27,14 +27,13 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; - fetchSubmodules = true; - hash = "sha256-dwTQRpu+IrKhuiiw/uYBt8i/BYlQ5XCy/jUhDAo6aa4="; + hash = "sha256-MhY3tpKlrIgq6QXZwAkMnObYYpUxsPcysTR5CZH1rhE="; }; nativeBuildInputs = [ @@ -63,10 +62,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_LUA:BOOL=ON" - "-DENABLE_ERM:BOOL=OFF" + "-DENABLE_ERM:BOOL=ON" "-DENABLE_GITVERSION:BOOL=OFF" "-DENABLE_PCH:BOOL=OFF" - "-DENABLE_TEST:BOOL=OFF" + "-DENABLE_TEST:BOOL=OFF" # Tests require HOMM3 data files. "-DFORCE_BUNDLED_MINIZIP:BOOL=OFF" "-DFORCE_BUNDLED_FL:BOOL=OFF" "-DCMAKE_INSTALL_RPATH:STRING=$out/lib/vcmi" @@ -80,12 +79,10 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ innoextract ffmpeg unshield ]}" ''; - doCheck = true; - passthru.tests.version = testers.testVersion { package = vcmi; command = '' - XDG_DATA_HOME=$PWD XDG_CACHE_HOME=$PWD XDG_CONFIG_HOME=$PWD \ + XDG_DATA_HOME="$TMPDIR" XDG_CACHE_HOME="$TMPDIR" XDG_CONFIG_HOME="$TMPDIR" \ vcmiclient --version ''; }; @@ -93,8 +90,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source engine for Heroes of Might and Magic III"; homepage = "https://vcmi.eu"; - changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog"; - license = with licenses; [ gpl2Only cc-by-sa-40 ]; + changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md"; + license = with licenses; [ gpl2Plus cc-by-sa-40 ]; maintainers = with maintainers; [ azahi ]; platforms = platforms.linux; mainProgram = "vcmilauncher"; From 9df0b1e53af4766d6bf06aa0dc65865624f12c8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 09:11:30 +0000 Subject: [PATCH 03/15] git-lfs: 3.4.0 -> 3.4.1 --- pkgs/applications/version-management/git-lfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 54ce30907323..6988e590cf72 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - hash = "sha256-lZx+sJQttclZPET0jkv3dmpQysCpsYani+La7yfSUlI="; + hash = "sha256-XqxkNCC2yzUTVOi/1iDsnxtLkw4jfQuBh9UsjtZ1zVc="; }; vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg="; From 0e3c75f206eecb63d52b2adaa09174d32b32d5cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 04:45:46 +0000 Subject: [PATCH 04/15] clj-kondo: 2023.10.20 -> 2023.12.15 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index a60de4d83ea8..a0c784d58258 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -3,12 +3,12 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.10.20"; + version = "2023.12.15"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-f9u/pk3CEEmiLgnS2biaUHpsMHjVEwZL2jyB/1PiZUY="; + sha256 = "sha256-YVFG7eY0wOB41kKJWydXfil8uyDSHRxPVry9L3u2P4k="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; From 5eb4128d60a43b12f4daeabb645666b48fdab817 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 16 Dec 2023 10:04:09 +0300 Subject: [PATCH 05/15] buildFHSEnv: propagate host /etc if nested This fixes use cases like launching Lutris/Heroic from Steam. --- pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index b6b5f13bba97..7d0138a4d85a 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -149,6 +149,13 @@ let done fi + # propagate /etc from the actual host if nested + if [[ -e /.host-etc ]]; then + ro_mounts+=(--ro-bind /.host-etc /.host-etc) + else + ro_mounts+=(--ro-bind /etc /.host-etc) + fi + for i in ${lib.escapeShellArgs etcBindEntries}; do if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then continue @@ -193,7 +200,6 @@ let ${lib.optionalString unshareCgroup "--unshare-cgroup"} ${lib.optionalString dieWithParent "--die-with-parent"} --ro-bind /nix /nix - --ro-bind /etc /.host-etc ${lib.optionalString privateTmp "--tmpfs /tmp"} # Our glibc will look for the cache in its own path in `/nix/store`. # As such, we need a cache to exist there, because pressure-vessel From 6f2ef6811e2d703dcb1b485e421d35ccbd3554fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Dec 2023 01:42:12 +0100 Subject: [PATCH 06/15] platformio: 6.1.6 -> 6.1.11 https://github.com/platformio/platformio-core/releases/tag/v6.1.7 https://github.com/platformio/platformio-core/releases/tag/v6.1.8 https://github.com/platformio/platformio-core/releases/tag/v6.1.9 https://github.com/platformio/platformio-core/releases/tag/v6.1.10 https://github.com/platformio/platformio-core/releases/tag/v6.1.11 Fixes support for ESP-IDF among other plugins, by replacing the path to the python interpreter with one that has all dependencies wrapped. Closes: #227230 Co-Authored-By: Joerie de Gram --- pkgs/development/embedded/platformio/core.nix | 53 ++++++++++++------- ...fix-searchpath.patch => interpreter.patch} | 13 ++++- .../platformio/missing-udev-rules-nixos.patch | 8 +-- .../use-local-spdx-license-list.patch | 18 +++---- 4 files changed, 56 insertions(+), 36 deletions(-) rename pkgs/development/embedded/platformio/{fix-searchpath.patch => interpreter.patch} (59%) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index e02e76e3ccce..82ccfa41c2f0 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -1,42 +1,53 @@ -{ stdenv, lib, python3 +{ lib +, python3Packages , fetchFromGitHub -, fetchPypi +, fetchpatch , git , spdx-license-list-data +, substituteAll }: -with python3.pkgs; buildPythonApplication rec { - pname = "platformio"; - version = "6.1.6"; +with python3Packages; buildPythonApplication rec { + pname = "platformio"; + version = "6.1.11"; + pyproject = true; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "sha256-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms="; + hash = "sha256-NR4UyAt8q5sUGtz1Sy6E8Of7y9WrH9xpcAWzLBeDQmo="; }; outputs = [ "out" "udev" ]; patches = [ - ./fix-searchpath.patch - ./use-local-spdx-license-list.patch + (substituteAll { + src = ./interpreter.patch; + interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter; + }) + (substituteAll { + src = ./use-local-spdx-license-list.patch; + spdx_license_list_data = spdx-license-list-data.json; + }) ./missing-udev-rules-nixos.patch + (fetchpatch { + # restore PYTHONPATH when calling scons + # https://github.com/platformio/platformio-core/commit/097de2be98af533578671baa903a3ae825d90b94 + url = "https://github.com/platformio/platformio-core/commit/097de2be98af533578671baa903a3ae825d90b94.patch"; + hash = "sha256-yq+/QHCkhAkFND11MbKFiiWT3oF1cHhgWj5JkYjwuY0="; + revert = true; + }) ]; - postPatch = '' - substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ - --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; - substituteInPlace setup.py \ - --replace 'aiofiles==%s" % ("0.8.0" if PY36 else "22.1.*")' 'aiofiles"' \ - --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.23.*")' 'starlette"' \ - --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.20.*")' 'uvicorn"' \ - --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ - --replace 'wsproto==%s" % ("1.0.0" if PY36 else "1.2.*")' 'wsproto"' - ''; + pythonRelaxDeps = true; propagatedBuildInputs = [ aiofiles @@ -52,12 +63,14 @@ with python3.pkgs; buildPythonApplication rec { pyserial requests semantic-version + setuptools spdx-license-list-data.json starlette tabulate uvicorn wsproto zeroconf + ]; preCheck = '' @@ -163,11 +176,13 @@ with python3.pkgs; buildPythonApplication rec { ]); passthru = { - python = python3; + python = python3Packages.python; }; meta = with lib; { + changelog = "https://github.com/platformio/platformio-core/releases/tag/v${version}"; description = "An open source ecosystem for IoT development"; + downloadPage = "https://github.com/platformio/platformio-core"; homepage = "https://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; diff --git a/pkgs/development/embedded/platformio/fix-searchpath.patch b/pkgs/development/embedded/platformio/interpreter.patch similarity index 59% rename from pkgs/development/embedded/platformio/fix-searchpath.patch rename to pkgs/development/embedded/platformio/interpreter.patch index fe7f9f127a7a..f7e212d57111 100644 --- a/pkgs/development/embedded/platformio/fix-searchpath.patch +++ b/pkgs/development/embedded/platformio/interpreter.patch @@ -1,9 +1,18 @@ diff --git a/platformio/proc.py b/platformio/proc.py -index 80e50201..15cee5a5 100644 +index 707245a1..cae17a29 100644 --- a/platformio/proc.py +++ b/platformio/proc.py +@@ -165,7 +165,7 @@ def is_container(): + + + def get_pythonexe_path(): +- return os.environ.get("PYTHONEXEPATH", os.path.normpath(sys.executable)) ++ return "@interpreter@" + + + def copy_pythonpath_to_osenv(): @@ -181,7 +181,7 @@ def copy_pythonpath_to_osenv(): - conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio"))) + ) if all(conditions): _PYTHONPATH.append(p) - os.environ["PYTHONPATH"] = os.pathsep.join(_PYTHONPATH) diff --git a/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch b/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch index 4be06ceac8b1..878470920577 100644 --- a/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch +++ b/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch @@ -1,10 +1,12 @@ diff --git a/platformio/exception.py b/platformio/exception.py -index ef1d3bab..445174fc 100644 +index 80ffb496..ea064f97 100644 --- a/platformio/exception.py +++ b/platformio/exception.py -@@ -57,6 +57,7 @@ class MissedUdevRules(InvalidUdevRules): +@@ -49,6 +49,7 @@ class MissedUdevRules(InvalidUdevRules): MESSAGE = ( "Warning! Please install `99-platformio-udev.rules`. \nMore details: " "https://docs.platformio.org/en/latest/core/installation/udev-rules.html" -+ "On NixOS add the platformio-core.udev package to services.udev.packages" ++ "On NixOS set `services.udev.packages = with pkgs; [ platformio-core.udev ];`." ) + + diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index 6db8585a55f3..ba9b55b788a1 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -1,23 +1,17 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index 1e5f935a..26d1ac6a 100644 +index 95e08108..6c2cfaed 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -276,9 +276,12 @@ class ManifestSchema(BaseSchema): +@@ -276,9 +276,6 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.19" +- version = "3.21" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" -- "v%s/json/licenses.json" % version +- f"v{version}/json/licenses.json" - ) - return json.loads(fetch_remote_content(spdx_data_url)) -+ # version = "3.19" -+ # spdx_data_url = ( -+ # "https://raw.githubusercontent.com/spdx/license-list-data/" -+ # "v%s/json/licenses.json" % version -+ # ) -+ # return json.loads(fetch_remote_content(spdx_data_url)) -+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f: -+ spdx = json.load(f) ++ with open("@spdx_license_list_data@/json/licenses.json") as fd: ++ spdx = json.load(fd) + return spdx From 6000c3c94cc92c1570f52fe61406a295fc11ef39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Dec 2023 03:00:35 +0100 Subject: [PATCH 07/15] esphome: use pep517 build, upgrade esptool to 4.x --- pkgs/tools/misc/esphome/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 2b683e73ed0f..6e8c3a91e278 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -3,7 +3,7 @@ , python3Packages , fetchFromGitHub , platformio -, esptool_3 +, esptool , git }: @@ -17,7 +17,7 @@ in python.pkgs.buildPythonApplication rec { pname = "esphome"; version = "2023.11.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = pname; @@ -26,6 +26,10 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-9LqZlhCt+7p6tnSHFhbnUzkEOJQDsg/Pd/hgd/Il0ZQ="; }; + nativeBuildInputs = with python.pkgs; [ + setuptools + ]; + postPatch = '' # remove all version pinning (E.g tornado==5.1.1 -> tornado) sed -i -e "s/==[0-9.]*//" requirements.txt @@ -70,7 +74,7 @@ python.pkgs.buildPythonApplication rec { # platformio is used in esphomeyaml/platformio_api.py # esptool is used in esphomeyaml/__main__.py # git is used in esphomeyaml/writer.py - "--prefix PATH : ${lib.makeBinPath [ platformio esptool_3 git ]}" + "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" "--set ESPHOME_USE_SUBPROCESS ''" ]; From dbb72b239e7615ef205567cd8ec92837ebbf9693 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Dec 2023 03:01:15 +0100 Subject: [PATCH 08/15] esptool_3: drop This was a version that was kept around for esphome, which has since moved on. --- pkgs/tools/misc/esptool/3.nix | 73 --------------------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 75 deletions(-) delete mode 100644 pkgs/tools/misc/esptool/3.nix diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/tools/misc/esptool/3.nix deleted file mode 100644 index a0b13ece1646..000000000000 --- a/pkgs/tools/misc/esptool/3.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, python3 }: - -python3.pkgs.buildPythonApplication rec { - pname = "esptool"; - version = "3.3.2"; - - src = fetchFromGitHub { - owner = "espressif"; - repo = "esptool"; - rev = "v${version}"; - hash = "sha256-hpPL9KNPA+S57SJoKnQewBCOybDbKep0t5RKw9a9GjM="; - }; - - patches = [ - # https://github.com/espressif/esptool/pull/802 - (fetchpatch { - name = "bitstring-4-compatibility.patch"; - url = "https://github.com/espressif/esptool/commit/16fa58415be2a7ff059ece40d4545288565d0a23.patch"; - hash = "sha256-FYa9EvyET4P8VkdyMzJBkdxVYm0tFt2GPnfsjzBnevE="; - excludes = [ "setup.py" ]; - }) - ]; - - postPatch = '' - substituteInPlace test/test_imagegen.py \ - --replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY" - ''; - - propagatedBuildInputs = with python3.pkgs; [ - bitstring - cryptography - ecdsa - pyserial - reedsolo - ]; - - # wrapPythonPrograms will overwrite esptool.py with a bash script, - # but espefuse.py tries to import it. Since we don't add any binary paths, - # use patchPythonScript directly. - dontWrapPythonPrograms = true; - postFixup = '' - buildPythonPath "$out $pythonPath" - for f in $out/bin/*.py; do - echo "Patching $f" - patchPythonScript "$f" - done - ''; - - nativeCheckInputs = with python3.pkgs; [ - pyelftools - ]; - - # tests mentioned in `.github/workflows/test_esptool.yml` - checkPhase = '' - runHook preCheck - - export ESPTOOL_PY=$out/bin/esptool.py - ${python3.interpreter} test/test_imagegen.py - ${python3.interpreter} test/test_espsecure.py - ${python3.interpreter} test/test_merge_bin.py - ${python3.interpreter} test/test_modules.py - - runHook postCheck - ''; - - meta = with lib; { - description = "ESP8266 and ESP32 serial bootloader utility"; - homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ hexa ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3519439bcdc3..4a53cacef4ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5305,8 +5305,6 @@ with pkgs; esptool = callPackage ../tools/misc/esptool { }; - esptool_3 = callPackage ../tools/misc/esptool/3.nix { }; - esptool-ck = callPackage ../tools/misc/esptool-ck { }; ephemeralpg = callPackage ../development/tools/database/ephemeralpg { }; From 3dda6d5ed56af34534dd4cdcdd85627df25aec55 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 15 Dec 2023 12:02:23 +0100 Subject: [PATCH 09/15] signal-desktop: 6.40.0 -> 6.42.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.41.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.42.0 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index bfae729772f4..58b119605d58 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix {} rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.40.0"; + version = "6.42.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; + hash = "sha256-uGsVv/J8eMjPOdUs+8GcYopy9D2g3SUhS09banrA6hY="; } From 5a5221b8cf00ba324e28e0e5b631fd3a546e3f35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 08:03:53 +0000 Subject: [PATCH 10/15] ldapnomnom: 1.1.0 -> 1.2.0 --- pkgs/tools/security/ldapnomnom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ldapnomnom/default.nix b/pkgs/tools/security/ldapnomnom/default.nix index 65e874d06691..484c06c68a43 100644 --- a/pkgs/tools/security/ldapnomnom/default.nix +++ b/pkgs/tools/security/ldapnomnom/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ldapnomnom"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lkarlslund"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o29vcPKRX8TWRCpa20DVsh/4K7d3IbaLS3B+jJGBEmo="; + hash = "sha256-3s2mLNqnJ+wZ17gy8Yr2Ze0S62A1bmE91E2ciLNO14E="; }; vendorHash = "sha256-3ucnLD+qhBSWY2wLtBcsOcuEf1woqHP17qQg7LlERA8="; From 944cd0b02acc79dc0c14252e116c637024d20525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Dec 2023 09:33:37 +0100 Subject: [PATCH 11/15] knot-dns: fixup build on darwin Let's simply do this until upstream has a long-term solution. --- pkgs/servers/dns/knot-dns/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 26c578cd73c3..41da27f2baa1 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -46,7 +46,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - CFLAGS = [ "-O2" "-DNDEBUG" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ] + # https://gitlab.nic.cz/knot/knot-dns/-/issues/909 + ++ lib.optional stdenv.isDarwin "-D__APPLE_USE_RFC_3542"; doCheck = true; checkFlags = [ "V=1" ]; # verbose output in case some test fails From 7381932087cb7e5f86aedcf23141a30176d451ae Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Wed, 8 Nov 2023 15:33:16 +1300 Subject: [PATCH 12/15] dependabot-cli: init at 1.39.0 Co-authored-by: Martin Weinelt --- pkgs/by-name/de/dependabot-cli/package.nix | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/de/dependabot-cli/package.nix diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix new file mode 100644 index 000000000000..6997cc16caf0 --- /dev/null +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -0,0 +1,62 @@ +{ buildGoModule +, dependabot-cli +, fetchFromGitHub +, fetchpatch +, installShellFiles +, lib +, testers +}: +let + pname = "dependabot-cli"; + version = "1.39.0"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "dependabot"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-QuhgFWF97B72KTX/QKSXNl/4RDAKUMDga7vLYiZw4SM="; + }; + + vendorHash = "sha256-mNpNp/zeQGgcljj2VhGl4IN1HG1R8CJSTWKzrgC0z44="; + + ldflags = [ + "-s" + "-w" + "-X github.com/dependabot/cli/cmd/dependabot/internal/cmd.version=v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd dependabot \ + --bash <($out/bin/dependabot completion bash) \ + --fish <($out/bin/dependabot completion fish) \ + --zsh <($out/bin/dependabot completion zsh) + ''; + + checkFlags = [ + "-skip=TestIntegration|TestNewProxy_customCert|TestRun" + ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/dependabot --help + ''; + + passthru.tests.version = testers.testVersion { + package = dependabot-cli; + command = "dependabot --version"; + version = "v${version}"; + }; + + meta = with lib; { + changelog = "https://github.com/dependabot/cli/releases/tag/v${version}"; + description = "A tool for testing and debugging Dependabot update jobs"; + homepage = "https://github.com/dependabot/cli"; + license = licenses.mit; + maintainers = with maintainers; [ l0b0 ]; + }; +} From 031eba6ab43d17f108960c2795f02bd8853c98d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:02:32 +0100 Subject: [PATCH 13/15] ldapnomnom: add ldflags --- pkgs/tools/security/ldapnomnom/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ldapnomnom/default.nix b/pkgs/tools/security/ldapnomnom/default.nix index 484c06c68a43..59daa142856b 100644 --- a/pkgs/tools/security/ldapnomnom/default.nix +++ b/pkgs/tools/security/ldapnomnom/default.nix @@ -9,13 +9,18 @@ buildGoModule rec { src = fetchFromGitHub { owner = "lkarlslund"; - repo = pname; + repo = "ldapnomnom"; rev = "refs/tags/v${version}"; hash = "sha256-3s2mLNqnJ+wZ17gy8Yr2Ze0S62A1bmE91E2ciLNO14E="; }; vendorHash = "sha256-3ucnLD+qhBSWY2wLtBcsOcuEf1woqHP17qQg7LlERA8="; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { description = "Tool to anonymously bruteforce usernames from Domain controllers"; homepage = "https://github.com/lkarlslund/ldapnomnom"; From 0ab8db371a350fc3b23c3aa1b6ec2262875e1213 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:45:05 +0100 Subject: [PATCH 14/15] exploitdb: 2023-12-15 -> 2023-12-16 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-12-15...2023-12-16 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e441a25520a8..45466726d98e 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-12-15"; + version = "2023-12-16"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ArPcg66mWu4i/H8KWKkGG/tW0wxwWMyIr4VuQiqpyKo="; + hash = "sha256-GIoOX3/TpUiXDyG2ZY6KO4twPYNXA8HaHOo1dJA4dc4="; }; nativeBuildInputs = [ From 44f2f5ce5aaf6ae3ae0c82ffec74e2d235c68535 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 Dec 2023 01:45:45 -0800 Subject: [PATCH 15/15] klipper: unstable-2023-11-16 -> unstable-2023-12-13 (#274602) --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 13fa39fe828c..4726c63e1448 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-11-16"; + version = "unstable-2023-12-13"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "187cc2f1b89e3870d694f8db6a64b116992106b7"; - sha256 = "sha256-CmnWgX8MvQs/5jQuAR8+1bKM4VsFXF2pV/jme75WJLY="; + rev = "f0753bd3381a86826082d5bf7a349c1f0b9f7e48"; + sha256 = "sha256-4xaee/7tXmR4/249lxHocana0KoesdH22/7HXWq1xwk="; }; sourceRoot = "${src.name}/klippy";