diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 98d3555ccbc5..8810b5f8c8b0 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -80,7 +80,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [ + environment.systemPackages = utils.removePackagesByName (with pkgs; [ glib # for gsettings gtk3.out # gtk-update-icon-cache @@ -88,7 +88,7 @@ in adwaita-icon-theme hicolor-icon-theme tango-icon-theme - xfce4-icon-theme + xfce.xfce4-icon-theme desktop-file-utils shared-mime-info # for update-mime-database @@ -99,37 +99,37 @@ in # Needed by Xfce's xinitrc script xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - exo - garcon - libxfce4ui + xfce.exo + xfce.garcon + xfce.libxfce4ui - mousepad - parole - ristretto - xfce4-appfinder - xfce4-notifyd - xfce4-screenshooter - xfce4-session - xfce4-settings - xfce4-taskmanager - xfce4-terminal + xfce.mousepad + xfce.parole + xfce.ristretto + xfce.xfce4-appfinder + xfce.xfce4-notifyd + xfce.xfce4-screenshooter + xfce.xfce4-session + xfce.xfce4-settings + xfce.xfce4-taskmanager + xfce.xfce4-terminal ] # TODO: NetworkManager doesn't belong here ++ optional config.networking.networkmanager.enable networkmanagerapplet - ++ optional config.powerManagement.enable xfce4-power-manager + ++ optional config.powerManagement.enable xfce.xfce4-power-manager ++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ pavucontrol # volume up/down keys support: # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse # but can only be used with xfce4-panel, so for no-desktop usage we still include # xfce4-volumed-pulse - (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin) + (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin) ] ++ optionals cfg.enableXfwm [ - xfwm4 - xfwm4-themes + xfce.xfwm4 + xfce.xfwm4-themes ] ++ optionals (!cfg.noDesktop) [ - xfce4-panel - xfdesktop - ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages; + xfce.xfce4-panel + xfce.xfdesktop + ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2; programs.xfconf.enable = true; diff --git a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch b/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch deleted file mode 100644 index b044fb47c2e1..000000000000 --- a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Geoffrey McRae -Date: Wed, 13 Mar 2024 11:17:25 +1100 -Subject: [PATCH] [client] cmake: move X11 config directives to - `displayservers` - ---- - client/CMakeLists.txt | 7 ------- - client/displayservers/CMakeLists.txt | 7 +++++++ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git client/CMakeLists.txt client/CMakeLists.txt -index 3755adcf..eeeb3eb0 100644 ---- client/CMakeLists.txt -+++ client/CMakeLists.txt -@@ -42,19 +42,12 @@ add_feature_info(ENABLE_ASAN ENABLE_ASAN "AddressSanitizer support.") - option(ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF) - add_feature_info(ENABLE_UBSAN ENABLE_UBSAN "UndefinedBehaviorSanitizer support.") - --option(ENABLE_X11 "Build with X11 support" ON) --add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.") -- - option(ENABLE_PIPEWIRE "Build with PipeWire audio output support" ON) - add_feature_info(ENABLE_PIPEWIRE ENABLE_PIPEWIRE "PipeWire audio support.") - - option(ENABLE_PULSEAUDIO "Build with PulseAudio audio output support" ON) - add_feature_info(ENABLE_PULSEAUDIO ENABLE_PULSEAUDIO "PulseAudio audio support.") - --if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND) -- message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on") --endif() -- - add_compile_options( - "-Wall" - "-Wextra" -diff --git client/displayservers/CMakeLists.txt client/displayservers/CMakeLists.txt -index 5b5f827a..e7c4b25a 100644 ---- client/displayservers/CMakeLists.txt -+++ client/displayservers/CMakeLists.txt -@@ -18,9 +18,16 @@ function(add_displayserver name) - add_subdirectory(${name}) - endfunction() - -+option(ENABLE_X11 "Build with X11 support" ON) -+add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.") -+ - option(ENABLE_WAYLAND "Build with Wayland support" ON) - add_feature_info(ENABLE_WAYLAND ENABLE_WAYLAND "Wayland support.") - -+if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND) -+ message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on") -+endif() -+ - # Add/remove displayservers here! - if (ENABLE_WAYLAND) - add_displayserver(Wayland) --- -2.43.1 diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 6adb2ebcc163..8e0f81680b63 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchFromGitHub , makeDesktopItem , pkg-config @@ -62,7 +63,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland. - ./0001-client-cmake-move-X11-config-directives-to-displayse.patch + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch"; + hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU="; + stripLen = 1; + }) ]; nativeBuildInputs = [ cmake pkg-config wayland-scanner ]; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 99faeb7eb01a..5be1172352b5 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -126,12 +126,13 @@ let indentLines = str: concatLines (map (s: " " + s) (filter (s: s != "") (splitString "\n" str))); bwrapCmd = { initArgs ? "" }: '' - ${extraPreBwrapCmds} ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"}) ro_mounts=() symlinks=() etc_ignored=() + ${extraPreBwrapCmds} + # loop through all entries of root in the fhs environment, except its /etc. for i in ${fhsenv}/*; do path="/''${i##*/}" diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index ec1c9db783fb..2956a9ed021e 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.61.0-53949"; + version = "1.61.2-54148"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-FuRWi4+vPt31bd3muMDEn3Fu20h9oWEd1XuPJU7W1OU="; + hash = "sha256-y5oQFPdk6Y7AjzeTrA2U8MhGkPi6RJUcGqsvpjJ++UE="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/by-name/bu/bundletool/package.nix similarity index 66% rename from pkgs/development/tools/bundletool/default.nix rename to pkgs/by-name/bu/bundletool/package.nix index 0a7629958227..da40101e5523 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/by-name/bu/bundletool/package.nix @@ -1,11 +1,17 @@ -{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }: +{ + lib, + stdenvNoCC, + fetchurl, + makeBinaryWrapper, + jre_headless, +}: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "bundletool"; version = "1.17.1"; src = fetchurl { - url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; + url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar"; sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI="; }; @@ -19,14 +25,14 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Command-line tool to manipulate Android App Bundles"; mainProgram = "bundletool"; homepage = "https://developer.android.com/studio/command-line/bundletool"; - changelog = "https://github.com/google/bundletool/releases/tag/${version}"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = [ ]; + changelog = "https://github.com/google/bundletool/releases/tag/${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + maintainers = with lib.maintainers; [ momeemt ]; platforms = jre_headless.meta.platforms; - license = licenses.asl20; + license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 2867124b5814..3f3e5a40ea46 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { zlib ]; - passthru.updateScript = gitUpdater { tagPrefix = "v"; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 32c8c0c77519..0970b4f0f011 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.31.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-YY8PWBEd8MV/k0wvXqyFTuNi3mvUnFNm2GrmrFF7TKQ="; + hash = "sha256-TxZdHR6SNHrIAdrrg3X9TnWCR8bjos93d7k7eaKpvQ8="; }; - vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY="; + vendorHash = "sha256-GiA/fmLT9x3gGF066bHTBWDd1yhygeG9snwCpwhOlMM="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix index e4f51c53c818..ae59c1c10ac9 100644 --- a/pkgs/by-name/on/onedrive/package.nix +++ b/pkgs/by-name/on/onedrive/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "onedrive"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "abraunegg"; repo = "onedrive"; rev = "v${finalAttrs.version}"; - hash = "sha256-up7o1myrQutDOEX98rkMlxJZs+Wzaf9HkOYNsX/JC4s="; + hash = "sha256-neJi5lIx45GsuwZPzzwwEm1bfrL2DFSysVkxa4fCBww"; }; outputs = [ diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 83bf017a6654..12942225207d 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -33,10 +33,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16959-60b5adab6"; - rpcs3Version = "0.0.33-16959-60b5adab6"; - rpcs3Revision = "60b5adab636f0cef6987165b38b42cbd7b2a9768"; - rpcs3Hash = "sha256-0/cNiPUnjuik6YyiNeZ5ZAZBExex5WVW56PCzm80Xx8="; + rpcs3GitVersion = "16999-938306a7b"; + rpcs3Version = "0.0.33-16999-938306a7b"; + rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f"; + rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 53acbd8ea9f4..b2739defd11b 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gitUpdater { tagPrefix = "v"; }; + updateScript = gitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) rtorrent; }; diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 4599629cbeda..7404dd906335 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-AsKbmJBWIv/NjWzGdjTpbCs+esSkIli08qbEApppvOU="; + hash = "sha256-+3tWqNdDZagJa9cLSz1OBaPtCr2F1joYyzB//BPqV34="; }; - cargoHash = "sha256-+/7asqF4eXtl+/AhgSf+M3KIVqFf44EHb0FJTT4lo4c="; + cargoHash = "sha256-3TrnSU7qXC8INlEZMbYTNwZsqiKMZ6j7tdGmz3DFl1g="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 8d7a4afb69de..7e3794083f34 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -19,27 +19,25 @@ , libgudev , libraw , sqlite -, python3 , libwebp , wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-EULNLtoZ8M68cp1DT11G6O2TONH/0DXWNX0k4AUqa/w="; + sha256 = "sha256-+aqBeGRisngbH/EALROTr0IZvyrWIlQvFFEgJNfv95Y="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -66,11 +64,6 @@ stdenv.mkDerivation rec { gstreamer ]); - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix deleted file mode 100644 index 92dffbc2682f..000000000000 --- a/pkgs/development/libraries/rustls-ffi/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, - apacheHttpd, -}: - -rustPlatform.buildRustPackage rec { - pname = "rustls-ffi"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "rustls"; - repo = pname; - rev = "v${version}"; - hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc="; - }; - - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - cargoLock.lockFile = ./Cargo.lock; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - installPhase = '' - runHook preInstall - - make install DESTDIR=${placeholder "out"} - - runHook postInstall - ''; - - passthru.tests = { - apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; - # Currently broken notably because of https://github.com/curl/curl/issues/13248 - # curl = curl.override { opensslSupport = false; rustlsSupport = true; }; - }; - - meta = with lib; { - description = "C-to-rustls bindings"; - homepage = "https://github.com/rustls/rustls-ffi/"; - license = with lib.licenses; [ - mit - asl20 - isc - ]; - maintainers = [ maintainers.lesuisse ]; - }; -} diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index b7bddc916ab8..c2e9a8b653d0 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-r8awjj4yo8BXQ0vZiJW+ky1sTvC04FzcViJY725/P6k="; + hash = "sha256-cyqhNpV3gowSDmZhdI3NbbJ1VOwnrJTXZYR/rYNnFVE="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index 3224fc137db1..a527351262be 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, looking-glass-client }: +{ lib, stdenv, fetchpatch, kernel, looking-glass-client }: stdenv.mkDerivation { pname = "kvmfr"; @@ -9,6 +9,23 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; + patches = [ + # fix build for linux-6_10 + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/7305ce36af211220419eeab302ff28793d515df2.patch"; + hash = "sha256-97nZsIH+jKCvSIPf1XPf3i8Wbr24almFZzMOhjhLOYk="; + stripLen = 1; + }) + + # securtiy patch for potential buffer overflow + # https://github.com/gnif/LookingGlass/issues/1133 + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/3ea37b86e38a87ee35eefb5d8fcc38b8dc8e2903.patch"; + hash = "sha256-Kk1gN1uB86ZJA374zmzM9dwwfMZExJcix3hee7ifpp0="; + stripLen = 1; + }) + ]; + makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix index f298e7f4f75e..42c8acf5618e 100644 --- a/pkgs/tools/networking/octodns/default.nix +++ b/pkgs/tools/networking/octodns/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, pytestCheckHook -, dnspython -, fqdn -, idna -, natsort -, python-dateutil -, pyyaml -, python -, runCommand +{ + lib, + buildPythonPackage, + dnspython, + fetchFromGitHub, + fqdn, + idna, + natsort, + pytestCheckHook, + python-dateutil, + python3, + pythonOlder, + pyyaml, + runCommand, + setuptools, }: buildPythonPackage rec { pname = "octodns"; - version = "1.4.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,15 +25,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "octodns"; repo = "octodns"; - rev = "v${version}"; - hash = "sha256-l4JGodbUmFxHFeEaxgClEozHcbyYP0F2yj5gDqV88IA="; + rev = "refs/tags/v${version}"; + hash = "sha256-5EKa5G1rX/BRMMpGd861qTaACa2tBgNrKX52uJPV+N8="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dnspython fqdn idna @@ -47,18 +48,21 @@ buildPythonPackage rec { pythonImportsCheck = [ "octodns" ]; - passthru.withProviders = ps: let - pyEnv = python.withPackages ps; - in runCommand "octodns-with-providers" { } '' - mkdir -p $out/bin - ln -st $out/bin ${pyEnv}/bin/octodns-* - ''; + passthru.withProviders = + ps: + let + pyEnv = python3.withPackages ps; + in + runCommand "octodns-with-providers" { } '' + mkdir -p $out/bin + ln -st $out/bin ${pyEnv}/bin/octodns-* + ''; meta = with lib; { description = "Tools for managing DNS across multiple providers"; homepage = "https://github.com/octodns/octodns"; changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.anthonyroussel ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix index d1c39b628da1..8278e6ea8537 100644 --- a/pkgs/tools/networking/octodns/providers/powerdns/default.nix +++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "octodns-powerdns"; - version = "0.0.5"; + version = "0.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,15 +19,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "octodns"; repo = "octodns-powerdns"; - rev = "v${version}"; - hash = "sha256-jt0+JnpCgvsoqMcC9mANX7uq2WPTiI2JQjwQi7LGWj0="; + rev = "refs/tags/v${version}"; + hash = "sha256-wa/SHyTfj+iHnTq8t+3yzyGn+YULOdI88Aii16qPwPM="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ octodns requests ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f6c4b8b03b6..c0e1f87f6bd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4196,8 +4196,6 @@ with pkgs; buildtorrent = callPackage ../tools/misc/buildtorrent { }; - bundletool = callPackage ../development/tools/bundletool { }; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { };