diff --git a/doc/hooks/xfce4-dev-tools.section.md b/doc/hooks/xfce4-dev-tools.section.md index 6c0d54a0b005..a18295f4db67 100644 --- a/doc/hooks/xfce4-dev-tools.section.md +++ b/doc/hooks/xfce4-dev-tools.section.md @@ -1,4 +1,4 @@ -# `xfce.xfce4-dev-tools` {#xfce4-dev-tools} +# `xfce4-dev-tools` {#xfce4-dev-tools} This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1adc9a129e3c..d3ca955a9840 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13326,6 +13326,12 @@ githubId = 20658981; name = "Jarosław Wygoda"; }; + jzbor = { + email = "jzbor@posteo.net"; + github = "jzbor"; + githubId = 48366877; + name = "Julian"; + }; jzellner = { email = "jeffz@eml.cc"; github = "sofuture"; diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix index 1788b220439c..cc9b6ddf7ac7 100644 --- a/nixos/modules/programs/xfconf.nix +++ b/nixos/modules/programs/xfconf.nix @@ -22,11 +22,11 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.xfce.xfconf + pkgs.xfconf ]; services.dbus.packages = [ - pkgs.xfce.xfconf + pkgs.xfconf ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 74c481dd5b8c..c40721d7a013 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -129,9 +129,9 @@ in # Needed by Xfce's xinitrc script xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - xfce.exo - xfce.garcon - xfce.libxfce4ui + xfce4-exo + garcon + libxfce4ui xfce.mousepad xfce.parole @@ -160,7 +160,7 @@ in xfce.xfwm4-themes ] ++ lib.optionals (!cfg.noDesktop) [ - xfce.xfce4-panel + xfce4-panel xfce.xfdesktop ] ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver diff --git a/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch b/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch new file mode 100644 index 000000000000..616b501d2ff8 --- /dev/null +++ b/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch @@ -0,0 +1,22 @@ +diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go +index 000c058df0..246c427cba 100644 +--- a/cli-plugins/manager/manager_unix.go ++++ b/cli-plugins/manager/manager_unix.go +@@ -2,7 +2,13 @@ + + package manager + +-var defaultSystemPluginDirs = []string{ +- "/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins", +- "/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins", ++import ( ++ "os" ++ "path/filepath" ++) ++ ++var defaultSystemPluginDirs []string ++ ++func init() { ++ defaultSystemPluginDirs = filepath.SplitList(os.Getenv("DOCKER_CLI_PLUGIN_DIRS")) + } + \ No newline at end of file diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 571b3116d8c0..91dda130ccce 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -277,7 +277,12 @@ let }; patches = [ - ./cli-system-plugin-dir-from-env.patch + ( + if lib.versionOlder version "26.0.0" then + ./cli-system-plugin-dir-from-env-25.patch + else + ./cli-system-plugin-dir-from-env.patch + ) ]; vendorHash = null; diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix index 2af3ec060406..0e9af39956b0 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = true; passthru = { - tests.version = testers.testVersion { package = finalAttrs.package; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { extraArgs = [ "--version-regex" diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix index 6e3e1d9aac98..80266a47b580 100644 --- a/pkgs/by-name/ba/bark-server/package.nix +++ b/pkgs/by-name/ba/bark-server/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "bark-server"; - version = "2.2.8"; + version = "2.3.2"; src = fetchFromGitHub { owner = "Finb"; repo = "bark-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-O4Bo3OuC8uwgFpwAY/zwSUQW6EY7h90Dn3tUjZA3j4E="; + hash = "sha256-MXvmS61r/DZ1KL4xh2kv+NpnPhSpRefJn7LuWLoLD0w="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-/h3L4Ow2aBPkbH1hPXCEb9DKrzVEcaLh2+O9iZXkXN8="; + vendorHash = "sha256-7C+xYleje6/WcRl/GylE+xvS7QFvJXaCLkCeRW8wwIY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ba/basex/package.nix b/pkgs/by-name/ba/basex/package.nix index 5f4610931ffc..06925099c5bd 100644 --- a/pkgs/by-name/ba/basex/package.nix +++ b/pkgs/by-name/ba/basex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "12.0"; + version = "12.1"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${ builtins.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-/9TeaAp2jckG77F8+J3aSpkoXWyTFXvXxnxXgpn58Zc="; + hash = "sha256-vxndej8+WhnC1G493MWdxXV4MUBXYTSPC8sccyd07ao="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index ac014cfcd01a..29e729bfa3d3 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -41,7 +41,7 @@ upower, vala, validatePkgConfig, - xfce, + libxfce4windowing, wrapGAppsHook3, zenity, }: @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { sassc udev upower - xfce.libxfce4windowing + libxfce4windowing ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index 7315b6065be6..630103b5a5dc 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -8,7 +8,7 @@ ninja, nix-update-script, python3Packages, - xfce, + libxfce4windowing, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib gtk3 - xfce.libxfce4windowing + libxfce4windowing ]; pythonPath = with python3Packages; [ diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix index bcdb14ea1a96..d166dc2297d0 100644 --- a/pkgs/by-name/ca/caffeine-ng/package.nix +++ b/pkgs/by-name/ca/caffeine-ng/package.nix @@ -13,7 +13,7 @@ xset, xautolock, xscreensaver, - xfce, + xfconf, wrapGAppsHook3, }: @@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { procps xautolock xscreensaver - xfce.xfconf + xfconf xset ] } diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 238f6cbc4283..f6ad82ec27b8 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.7.4"; + version = "1.7.6"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-qoPDQks1OkiWrl6f0zG+BQf7r/DzbyoadlRIsqMuzbo="; + hash = "sha256-RxvdGeIHXdrAg0RAYrzvR5D1Siin9me7BmQNddO3iCs="; }; postPatch = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-86+bVj77Uo2IaDcKM3igd2rrNEQxpUYfwKDOwLnqceg="; + hash = "sha256-3j49i1HlqpYaOQeagB8D/RgcwVMa66fEp7c5GCP45nI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix index e13ad6262ad4..697f30bdcedb 100644 --- a/pkgs/by-name/di/direwolf-unstable/package.nix +++ b/pkgs/by-name/di/direwolf-unstable/package.nix @@ -12,13 +12,13 @@ inherit hamlibSupport gpsdSupport extraScripts; }).overrideAttrs (oldAttrs: { - version = "1.8.1-unstable-2025-11-30"; + version = "1.8.1-unstable-2025-12-19"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "c8319fcc7b7d8311ed7b42537ec82650ec48275b"; - hash = "sha256-yl6aogu9BsHEiUUdd+k031QoWQxTxGa/+qcNTF92J1s="; + rev = "1924999dbd24ce155aff69fec76cee35ad478bdd"; + hash = "sha256-Q9mYeDQHaMNez1oQHaQTfjU/AxAKhpB98UcmaNujMjA="; }; # drop upstreamed cmake-4 patch diff --git a/pkgs/by-name/ec/ec2-instance-selector/package.nix b/pkgs/by-name/ec/ec2-instance-selector/package.nix index 626d370f14e1..58f72da2ba03 100644 --- a/pkgs/by-name/ec/ec2-instance-selector/package.nix +++ b/pkgs/by-name/ec/ec2-instance-selector/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "ec2-instance-selector"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-instance-selector"; tag = "v${finalAttrs.version}"; - hash = "sha256-8tSZkh2ngOgfwup2nCiNXHFX2GhIVVW9PtLuGNP5yoo="; + hash = "sha256-lsd0ahIpN8l3qpXofA7Rjlg0f0J+GJtFiPAvo/wy6Mw="; }; vendorHash = "sha256-qrxYLnj8DEGNtIq6sC7xvNBLgguG/lj9YLqgLFumQtE="; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 7a8691096274..65d2639b5dae 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -34,7 +34,7 @@ versionCheckHook, vulkan-loader, wayland, - xfce, + xfconf, xorg, yyjson, zlib, @@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals xfceSupport [ # Needed for XFWM theme and XFCE Terminal font. - xfce.xfconf + xfconf ] ++ lib.optionals zfsSupport [ # Needed for zpool module diff --git a/pkgs/by-name/fr/frugal/package.nix b/pkgs/by-name/fr/frugal/package.nix deleted file mode 100644 index 82e0a8140756..000000000000 --- a/pkgs/by-name/fr/frugal/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "frugal"; - version = "3.17.13"; - - src = fetchFromGitHub { - owner = "Workiva"; - repo = "frugal"; - rev = "v${version}"; - sha256 = "sha256-giPlv3pf0hz2zlQ/9o12SGfwFLCtpN96tfQwP9AaPNo="; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-DCSS2kH2yco8cfbQBw3IZHcEE4BP5ir7ikxsIsFDqg0="; - - meta = { - description = "Thrift improved"; - mainProgram = "frugal"; - homepage = "https://github.com/Workiva/frugal"; - license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ diogox ]; - }; -} diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/by-name/ga/garcon/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/garcon/default.nix rename to pkgs/by-name/ga/garcon/package.nix diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index 958ef3e745c9..910f4e10025b 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation rec { pname = "gnome-pomodoro"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "gnome-pomodoro"; repo = "gnome-pomodoro"; rev = version; - hash = "sha256-cVuBJ1Rwh/mjlFKKRJkKmdtDHdWNc6uiEE3ywCesirU="; + hash = "sha256-1G0Sv6uR4rE+/TZqEM57mCdBaXoJNpC0cznY4pnPEa4="; }; patches = [ diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix index db4643e17746..ce599c2efc51 100644 --- a/pkgs/by-name/jg/jgmenu/package.nix +++ b/pkgs/by-name/jg/jgmenu/package.nix @@ -6,12 +6,13 @@ python3Packages, pango, librsvg, + libxfce4util, libxml2, menu-cache, xorg, makeWrapper, enableXfcePanelApplet ? false, - xfce, + xfce4-panel, gtk3, gitUpdater, }: @@ -44,8 +45,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableXfcePanelApplet [ gtk3 - xfce.libxfce4util - xfce.xfce4-panel + libxfce4util + xfce4-panel ]; configureFlags = [ diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 393572b2a281..f0a0bd37b91c 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -39,13 +39,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.103"; + version = "1.104"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-lvrsgycFLqIGypB7lZvi9bDBtiKNAte4tLnEnRiPnZU="; + hash = "sha256-dhOdmyy+mhV2O/eWw3pNZefqRuhtakdD7iAG/RWOCEg="; }; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/by-name/li/libxfce4ui/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/libxfce4ui/default.nix rename to pkgs/by-name/li/libxfce4ui/package.nix diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/by-name/li/libxfce4util/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/libxfce4util/default.nix rename to pkgs/by-name/li/libxfce4util/package.nix diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/by-name/li/libxfce4windowing/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/libxfce4windowing/default.nix rename to pkgs/by-name/li/libxfce4windowing/package.nix diff --git a/pkgs/by-name/li/lightdm-gtk-greeter/package.nix b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix index b6b62599d139..1279d447353a 100644 --- a/pkgs/by-name/li/lightdm-gtk-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix @@ -9,7 +9,7 @@ linkFarm, wrapGAppsHook3, gtk3, - xfce, + xfce4-dev-tools, at-spi2-core, librsvg, hicolor-icon-theme, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config intltool - xfce.xfce4-dev-tools + xfce4-dev-tools wrapGAppsHook3 ]; diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index 4579b29f9d9b..7185edc7935e 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "LycheeSlicer"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-0QP+DOIfvzFd+NmrchXyNVJwGjTxtk8T1lkBqK1RGR0="; + hash = "sha256-coPzvcF+kQVkETiKc3AY9tuPvh4vm45LSXi5UCbL9GI="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/ni/nix-sweep/package.nix b/pkgs/by-name/ni/nix-sweep/package.nix new file mode 100644 index 000000000000..6c89fc29408a --- /dev/null +++ b/pkgs/by-name/ni/nix-sweep/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + installShellFiles, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "nix-sweep"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "jzbor"; + repo = "nix-sweep"; + tag = "v${finalAttrs.version}"; + hash = "sha256-C83AtqexEzx+8cNZXZyYUtg4gAUyam00IM0eXO8xOgA="; + }; + + cargoHash = "sha256-etqSdtoiSPMQLuMgBK/nnJM8dDTdmRk+MT++zu/9IjM="; + + nativeBuildInputs = [ + installShellFiles + ]; + + outputs = [ + "out" + "man" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mkdir ./manpages + $out/bin/nix-sweep man ./manpages + installManPage ./manpages/* + mkdir ./completions + $out/bin/nix-sweep completions ./completions + installShellCompletion completions/nix-sweep.{bash,fish,zsh} + ''; + + meta = { + description = "Utility to clean up old Nix profile generations and left-over garbage collection roots"; + homepage = "https://github.com/jzbor/nix-sweep"; + changelog = "https://github.com/jzbor/nix-sweep/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "nix-sweep"; + maintainers = with lib.maintainers; [ + jzbor + ]; + }; +}) diff --git a/pkgs/by-name/pa/pangolin-cli/package.nix b/pkgs/by-name/pa/pangolin-cli/package.nix new file mode 100644 index 000000000000..a9783b4107d1 --- /dev/null +++ b/pkgs/by-name/pa/pangolin-cli/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "pangolin-cli"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "fosrl"; + repo = "cli"; + tag = finalAttrs.version; + hash = "sha256-NR8GaOtFjOk6LLTdtDw6Nu691B76bPwllA2EOPSaM94="; + }; + + patches = [ ./use-tagged-newt-and-olm.patch ]; + + vendorHash = "sha256-7LPnmbrIgWV5p4KCHfVVljRvadtZfg2FwLWIE/m3pi4="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/cli $out/bin/pangolin + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd pangolin \ + --bash <($out/bin/pangolin completion bash) \ + --fish <($out/bin/pangolin completion fish) \ + --zsh <($out/bin/pangolin completion zsh) + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Pangolin CLI tool and VPN client"; + homepage = "https://github.com/fosrl/cli"; + changelog = "https://github.com/fosrl/cli/releases/tag/${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + water-sucks + ]; + mainProgram = "pangolin"; + }; +}) diff --git a/pkgs/by-name/pa/pangolin-cli/use-tagged-newt-and-olm.patch b/pkgs/by-name/pa/pangolin-cli/use-tagged-newt-and-olm.patch new file mode 100644 index 000000000000..14bba945ded8 --- /dev/null +++ b/pkgs/by-name/pa/pangolin-cli/use-tagged-newt-and-olm.patch @@ -0,0 +1,70 @@ +commit f251229d0eed13b7863bac74c1a88dd45d94d3c5 +Author: Varun Narravula +Date: Tue Dec 23 15:00:11 2025 -0800 + + chore(deps): pin olm and newt to upstream tags + +diff --git a/go.mod b/go.mod +index 4635ea0..5d58e09 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,11 +7,10 @@ require ( + github.com/charmbracelet/bubbletea v1.3.6 + github.com/charmbracelet/huh v0.8.0 + github.com/charmbracelet/lipgloss v1.1.0 +- github.com/fosrl/newt v0.0.0 +- github.com/fosrl/olm v0.0.0 ++ github.com/fosrl/newt v1.8.0 ++ github.com/fosrl/olm v1.3.0 + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c + github.com/spf13/cobra v1.10.1 +- github.com/spf13/pflag v1.0.10 + github.com/spf13/viper v1.21.0 + ) + +@@ -51,6 +50,7 @@ require ( + github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect + github.com/spf13/afero v1.15.0 // indirect + github.com/spf13/cast v1.10.0 // indirect ++ github.com/spf13/pflag v1.0.10 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/vishvananda/netlink v1.3.1 // indirect + github.com/vishvananda/netns v0.0.5 // indirect +@@ -74,6 +74,8 @@ require ( + software.sslmate.com/src/go-pkcs12 v0.6.0 // indirect + ) + +-replace github.com/fosrl/olm v0.0.0 => ../olm +- +-replace github.com/fosrl/newt v0.0.0 => ../newt ++// If changes to Olm or Newt are required, use these ++// replace directives during development. ++// ++// replace github.com/fosrl/olm => ../olm ++// replace github.com/fosrl/newt => ../newt +diff --git a/go.sum b/go.sum +index b4118da..de27625 100644 +--- a/go.sum ++++ b/go.sum +@@ -50,6 +50,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp + github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= + github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4= + github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= ++github.com/fosrl/newt v1.8.0 h1:wIRCO2shhCpkFzsbNbb4g2LC7mPzIpp2ialNveBMJy4= ++github.com/fosrl/newt v1.8.0/go.mod h1:pol958CEs0nQmo/35Ltv0CGksheIKCS2hoNvdTVLEcI= ++github.com/fosrl/olm v1.3.0 h1:eYNFqcvTn5u8aujy4lIUDta8W3j09p91WkMcDWCp/VA= ++github.com/fosrl/olm v1.3.0/go.mod h1:FZ0L5GufoIOyZ00/49g8LKtkknodJkhM+icW5gOFdiw= + github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= + github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= + github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +@@ -60,8 +64,8 @@ github.com/godbus/dbus/v5 v5.2.0 h1:3WexO+U+yg9T70v9FdHr9kCxYlazaAXUhx2VMkbfax8= + github.com/godbus/dbus/v5 v5.2.0/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c= + github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= + github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= ++github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= ++github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= + github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= + github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= + github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix index eeeb9f4b0704..056693f89115 100644 --- a/pkgs/by-name/pr/pragha/package.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -34,7 +34,8 @@ withGudev ? false, # experimental libmtp, withMtp ? false, # experimental - xfce, + libxfce4ui, + xfce4-dev-tools, withXfce4ui ? false, totem-pl-parser, withTotemPlParser ? false, @@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ intltool pkg-config - xfce.xfce4-dev-tools + xfce4-dev-tools desktop-file-utils installShellFiles libsForQt5.wrapQtAppsHook @@ -96,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withGlyr glyr ++ lib.optional withLibsoup libsoup_2_4 ++ lib.optional withMtp libmtp - ++ lib.optional withXfce4ui xfce.libxfce4ui + ++ lib.optional withXfce4ui libxfce4ui ++ lib.optional withTotemPlParser totem-pl-parser # ++ lib.optional withGrilo grilo # ++ lib.optional withRygel rygel diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix index 454c94976905..e523a7f68a4b 100644 --- a/pkgs/by-name/qu/quark-goldleaf/package.nix +++ b/pkgs/by-name/qu/quark-goldleaf/package.nix @@ -3,7 +3,6 @@ jdk, maven, fetchFromGitHub, - fetchpatch, makeDesktopItem, copyDesktopItems, imagemagick, @@ -17,13 +16,13 @@ let in maven.buildMavenPackage rec { pname = "quark-goldleaf"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "XorTroll"; repo = "Goldleaf"; - rev = version; - hash = "sha256-gagIQGOiygJ0Onm0SrkbFWaovqWX2WJNx7LpSRheCLM="; + tag = version; + hash = "sha256-ldGNtNmn7ln53JvxRkP1AMPslKH0JtSPhBkyqytSx20="; }; sourceRoot = "${src.name}/Quark"; @@ -31,12 +30,6 @@ maven.buildMavenPackage rec { patches = [ ./fix-maven-plugin-versions.patch ./remove-pom-jfx.patch - (fetchpatch { - name = "fix-config-path.patch"; - url = "https://github.com/XorTroll/Goldleaf/commit/714ecc2755df9c1252615ad02cafff9c0311a739.patch"; - hash = "sha256-4j+6uLIOdltZ4XIb3OtOzZg9ReH9660gZMMNQpHnn4o="; - relative = "Quark"; - }) ]; mvnJdk = jdk'; @@ -115,7 +108,7 @@ maven.buildMavenPackage rec { or by adding the package manually to udev packages: - `services.udev.packages = [ pkgs.quark-goldleaf ]; + `services.udev.packages = [ pkgs.quark-goldleaf ];` ''; license = lib.licenses.gpl3Only; mainProgram = "quark-goldleaf"; diff --git a/pkgs/by-name/sn/snitch/package.nix b/pkgs/by-name/sn/snitch/package.nix index c8d44fbe9044..37495236aa28 100644 --- a/pkgs/by-name/sn/snitch/package.nix +++ b/pkgs/by-name/sn/snitch/package.nix @@ -3,22 +3,30 @@ stdenv, buildGoModule, fetchFromGitHub, - apple-sdk_15, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "snitch"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "karol-broda"; repo = "snitch"; rev = "v${finalAttrs.version}"; - hash = "sha256-/0MYXKBat+OumuXnS8XSiMslNHUopVDFO4RdYGECfI8="; + hash = "sha256-krZf6bx1CZGgwg7cu2f2dzPYFEU4rM/nZjGtkXgGQkM="; }; vendorHash = "sha256-fX3wOqeOgjH7AuWGxPQxJ+wbhp240CW8tiF4rVUUDzk="; + postPatch = '' + substituteInPlace cmd/version.go \ + --replace-fail \ + 'Version = "dev"' \ + 'Version = "${finalAttrs.version}"' + ''; + # these below settings (env, buildInputs, ldflags) copied from # https://github.com/karol-broda/snitch/blob/master/flake.nix @@ -27,17 +35,23 @@ buildGoModule (finalAttrs: { CGO_ENABLED = if stdenv.hostPlatform.isDarwin then 1 else 0; }; - # darwin: use macOS 15 SDK for SecTrustCopyCertificateChain (Go 1.25 crypto/x509) - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; - ldflags = [ "-s" - "-w" "-X snitch/cmd.Version=${finalAttrs.version}" "-X snitch/cmd.Commit=v${finalAttrs.version}" "-X snitch/cmd.Date=1970-01-01" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "friendlier ss / netstat for humans"; homepage = "https://github.com/karol-broda/snitch"; diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index 5da3e8aa9f4c..bc787fd3cd2e 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -5,7 +5,7 @@ }: let pname = "winbox"; - version = "4.0beta42"; + version = "4.0beta44"; metaCommon = { description = "Graphical configuration utility for RouterOS-based devices"; @@ -23,13 +23,13 @@ let x86_64-zip = callPackage ./build-from-zip.nix { inherit pname version metaCommon; - hash = "sha256-c+aewjTl+W/ahTdp9CIYT+MD4Nf+L58QONFCRifaOHI="; + hash = "sha256-LPq7KPOj59NUhoQCxpAVW8qbjXJGxRw8fRJT7/qDtZM="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-3/sdKhMw2vx3IQE5IucllXzJyBs1snxXjAXNqumPQk0="; + hash = "sha256-96lb8a70dmqieKn5Nr61sZg/aVDLz0sY64sfN83rU+0="; }; in (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: { diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/by-name/xf/xfce4-dev-tools/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix rename to pkgs/by-name/xf/xfce4-dev-tools/package.nix diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/by-name/xf/xfce4-dev-tools/setup-hook.sh similarity index 100% rename from pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh rename to pkgs/by-name/xf/xfce4-dev-tools/setup-hook.sh diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/by-name/xf/xfce4-exo/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/exo/default.nix rename to pkgs/by-name/xf/xfce4-exo/package.nix diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/by-name/xf/xfce4-panel/package.nix similarity index 98% rename from pkgs/desktops/xfce/core/xfce4-panel/default.nix rename to pkgs/by-name/xf/xfce4-panel/package.nix index fe8cfc0a1b33..1b9a92bd8fc0 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/by-name/xf/xfce4-panel/package.nix @@ -8,7 +8,7 @@ xfce4-dev-tools, wrapGAppsHook3, cairo, - exo, + xfce4-exo, garcon, gtk-layer-shell, gtk3, @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - exo + xfce4-exo garcon gtk-layer-shell libdbusmenu-gtk3 diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/by-name/xf/xfconf/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/xfconf/default.nix rename to pkgs/by-name/xf/xfconf/package.nix diff --git a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch b/pkgs/by-name/xm/xmonad_log_applet/fix-paths.patch similarity index 100% rename from pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch rename to pkgs/by-name/xm/xmonad_log_applet/fix-paths.patch diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/by-name/xm/xmonad_log_applet/package.nix similarity index 100% rename from pkgs/applications/window-managers/xmonad/log-applet/default.nix rename to pkgs/by-name/xm/xmonad_log_applet/package.nix diff --git a/pkgs/by-name/zo/zoho-mail-desktop/package.nix b/pkgs/by-name/zo/zoho-mail-desktop/package.nix index caac02759af7..a891a7f31e1d 100644 --- a/pkgs/by-name/zo/zoho-mail-desktop/package.nix +++ b/pkgs/by-name/zo/zoho-mail-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "zoho-mail-desktop"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { url = "https://downloads.zohocdn.com/zmail-desktop/linux/zoho-mail-desktop-lite-x64-v${version}.AppImage"; - hash = "sha256-hoWOujwfm5/DS/0Kh69gqIKmc1dnVSOYJP/zypvcy8I="; + hash = "sha256-uGz2sksBMbw/17ia/RU/9kJhf4EMeSFrMX27D9XplrI="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 029b5c62cfe7..d0a8256cdca2 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.9.0"; + version = "11.9.1"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-rUrpmjmcVfWY4Z6d7MvLKTxaog3NH5ieEbxVvma2ALI="; + hash = "sha256-skDNRBOffNKa6ZXSIfP8Oip1/dp35a2rtm44D5Q8HS0="; }; - npmDepsHash = "sha256-Q7FjXLMl14caowfofShhm5It7cCMxI255ahXebsG8u0="; + npmDepsHash = "sha256-oTJKh+mpwB9m8KXF0CJcPkfdcNTQOEozUEH+/zGs+ZI="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index cd14d171eb7b..408eafaa96e1 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -31,14 +31,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atril"; version = "1.28.2"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "atril"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-NnWD3Gcxn8ZZKdHzg6iclLiSwj3sBvF+BwpNtcU+dSY="; }; @@ -96,4 +96,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index ea974ff28437..e6e999fad8ff 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -10,18 +10,18 @@ gtk3, python3, dropbox, - mateUpdateScript, + gitUpdater, }: let dropboxd = "${dropbox}/bin/dropbox"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caja-dropbox"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-dropbox-${finalAttrs.version}.tar.xz"; sha256 = "t0w4qZQlS9PPfLxxK8LsdRagypQqpleFJs29aqYgGWM="; }; @@ -57,7 +57,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/caja-dropbox"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Dropbox extension for Caja file manager"; @@ -69,4 +73,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 6b7e6c7a072c..1f1b13e5f8d8 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -12,15 +12,15 @@ imagemagick, mate-desktop, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caja-extensions"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-extensions-${finalAttrs.version}.tar.xz"; sha256 = "0phsXgdAg1/icc+9WCPu6vAyka8XYyA/RwCruBCeMXU="; }; @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/caja-extensions"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Set of extensions for Caja file manager"; @@ -62,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index a1f096a6bfd1..463677b7a9ed 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -15,10 +15,10 @@ hicolor-icon-theme, wayland, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caja"; version = "1.28.0"; outputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-${finalAttrs.version}.tar.xz"; sha256 = "HjAUzhRVgX7C73TQnv37aDXYo3LtmhbvtZGe97ghlXo="; }; @@ -62,7 +62,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/caja"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "File manager for the MATE desktop"; @@ -74,4 +78,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index bf650d4ff2d7..ecb5a343fcd9 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -12,18 +12,18 @@ json-glib, mate-desktop, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, # can be defaulted to true once switch to meson withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, file, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "engrampa"; version = "1.28.2"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/engrampa-${finalAttrs.version}.tar.xz"; hash = "sha256-Hpl3wjdFv4hDo38xUXHZr5eBSglxrqw9d08BdlCsCe8="; }; @@ -55,7 +55,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/engrampa"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Archive Manager for MATE"; @@ -69,4 +73,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 195212917381..46b8fc44a01b 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -18,15 +18,15 @@ mate-desktop, hicolor-icon-theme, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eom"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/eom-${finalAttrs.version}.tar.xz"; sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw="; }; @@ -61,7 +61,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/eom"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Image viewing and cataloging program for the MATE desktop"; @@ -71,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index f8e62d9dc006..7af06f9df0f4 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -12,14 +12,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmatekbd"; version = "1.28.0"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "libmatekbd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6s8JiuXbBWOHxbNSuO8rglzOCRKlQ9fx/GsYYc08GmI="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 129459d8e68d..b0484fb9ed54 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -12,15 +12,15 @@ pulseaudioSupport ? config.pulseaudio or true, libpulseaudio, ossSupport ? false, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmatemixer"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/libmatemixer-${finalAttrs.version}.tar.xz"; sha256 = "XXO5Ijl/YGiOPJUw61MrzkbDDiYtsbU1L6MsQNhwoMc="; }; @@ -44,7 +44,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/libmatemixer"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Mixer library for MATE"; @@ -53,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 6e19e5ba8792..44fa0e462b08 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -14,16 +14,16 @@ libsoup_3, tzdata, mate-common, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmateweather"; version = "1.28.1"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "libmateweather"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-W0p4+OMr2sgkQP10DGjZLf2VTSGa2A+5ey+nYBr+HJQ="; }; @@ -66,7 +66,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/libmateweather"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Library to access weather information from online services for MATE"; @@ -75,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index ae92127de50c..fdfe06118510 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -18,15 +18,15 @@ mate-desktop, mate-settings-daemon, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marco"; version = "1.28.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/marco-${finalAttrs.version}.tar.xz"; sha256 = "JJbl5A7pgM1oSUk6w+D4/Q3si4HGdNqNm6GaV38KwuE="; }; @@ -61,7 +61,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/marco"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "MATE default window manager"; @@ -70,4 +74,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index b078e5e315a3..e612960e63ed 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -22,10 +22,10 @@ wirelesstools, hicolor-icon-theme, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-applets"; version = "1.28.1"; outputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-applets-${finalAttrs.version}.tar.xz"; sha256 = "pZZxQVJ9xbFy0yKmADwjruwlMWD2ULs2QwoG3a76fi4="; }; @@ -72,7 +72,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-applets"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Applets for use with the MATE panel"; @@ -85,4 +89,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 45525c5dab02..60490d8063a8 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -5,15 +5,15 @@ meson, ninja, gettext, - mateUpdateScript, + gitUpdater, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "mate-backgrounds"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-backgrounds-${finalAttrs.version}.tar.xz"; sha256 = "UNGv0CSGvQesIqWmtu+jAxFI8NSKguSI2QmtVwA6aUM="; }; @@ -23,7 +23,11 @@ stdenvNoCC.mkDerivation rec { ninja ]; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-backgrounds"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Background images and data for MATE"; @@ -35,4 +39,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index c238bd2f4bdc..3488fd4ba96f 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -10,15 +10,15 @@ libxml2, mpfr, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-calc"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-calc-${finalAttrs.version}.tar.xz"; sha256 = "gEsSXR4oZLHnSvgW2psquLGUcrmvl0Q37nNVraXmKPU="; }; @@ -41,7 +41,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-calc"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Calculator for the MATE desktop"; @@ -50,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index c9c4af42cf18..9d0a13a84cc9 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -2,21 +2,25 @@ lib, stdenvNoCC, fetchurl, - mateUpdateScript, + gitUpdater, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "mate-common"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-common-${finalAttrs.version}.tar.xz"; sha256 = "QrfCzuJo9x1+HBrU9pvNoOzWVXipZyIYfGt2N40mugo="; }; enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-common"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Common files for development of MATE packages"; @@ -25,4 +29,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 294733a1e701..63374a83fe80 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -33,17 +33,17 @@ hicolor-icon-theme, wrapGAppsHook3, yelp-tools, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-control-center"; version = "1.28.1"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "mate-control-center"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rsEu3Ig6GxqPOvAFOXhkEoXM+etyjWpQWHGOsA+myJs="; }; @@ -100,7 +100,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-control-center"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Utilities to configure the MATE desktop"; @@ -109,4 +113,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index e982d0b4a62b..085ed1d72db0 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -9,10 +9,10 @@ gtk3, dconf, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-desktop"; version = "1.28.2"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-desktop-${finalAttrs.version}.tar.xz"; sha256 = "MrtLeSAUs5HB4biunBioK01EdlCYS0y6fSjpVWSWSqI="; }; @@ -45,7 +45,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-desktop"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Library with common API for various MATE modules"; @@ -54,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 157ed1ce2bff..8e87c6fc1c88 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -9,12 +9,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-icon-theme-faenza"; version = "1.20.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-icon-theme-faenza-${finalAttrs.version}.tar.xz"; sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = gitUpdater { + url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza"; rev-prefix = "v"; - url = "https://github.com/mate-desktop-legacy-archive/${pname}"; }; meta = { @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index c65437a95479..b5ff3c9cadff 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -8,15 +8,15 @@ librsvg, gtk3, hicolor-icon-theme, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-icon-theme"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-icon-theme-${finalAttrs.version}.tar.xz"; sha256 = "lNYHkGDKXfdFQpId5O6ji30C0HVhyRk1bZXeh2+abTo="; }; @@ -44,7 +44,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-icon-theme"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Icon themes from MATE"; @@ -53,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index a8c162662c1d..e3137e73cac6 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -9,15 +9,15 @@ mate-panel, hicolor-icon-theme, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-indicator-applet"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-indicator-applet-${finalAttrs.version}.tar.xz"; sha256 = "zrPXA5cKPlWNfNffCxwhceOvdSolSVrO0uIiwemtSc0="; }; @@ -44,7 +44,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-indicator-applet"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { homepage = "https://github.com/mate-desktop/mate-indicator-applet"; @@ -67,4 +71,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 543dd244d294..b3c785487a11 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -14,10 +14,10 @@ mate-panel, wayland, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-media"; version = "1.28.1"; outputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-media-${finalAttrs.version}.tar.xz"; sha256 = "vNwQLiL2P1XmMWbVxwjpHBE1cOajCodDRaiGCeg6mRI="; }; @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-media"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Media tools for MATE"; @@ -62,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ chpatrick ]; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 4ae59c13f4d0..2faa0b376541 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -10,17 +10,17 @@ gobject-introspection, mate-common, python3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-menus"; version = "1.28.1"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "mate-menus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GAc9DPsXdswmyNKlbY6cyHBWO2OSKCBygtzttNHN/p4="; }; nativeBuildInputs = [ @@ -44,7 +44,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-menus"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { broken = stdenv.hostPlatform.isDarwin; @@ -57,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 7a3ae7a232f5..61e8b2a2b9a5 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -10,10 +10,10 @@ libXtst, mate, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-netbook"; version = "1.26.0"; outputs = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-netbook-${finalAttrs.version}.tar.xz"; sha256 = "12gdy69nfysl8vmd8lv8b0lknkaagplrrz88nh6n0rmjkxnipgz3"; }; @@ -42,7 +42,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-netbook"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "MATE utilities for netbooks"; @@ -62,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 90a7da31b9dc..e2fa4aef56d0 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -17,10 +17,10 @@ mate-desktop, mate-panel, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-notification-daemon"; version = "1.28.5"; outputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mate-desktop"; repo = "mate-notification-daemon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6N6lD63JL9xAtALn9URjYiCEhMZBC9TfIsrdalyY3YY="; }; @@ -61,7 +61,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-notification-daemon"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Notification daemon for MATE Desktop"; @@ -74,4 +78,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 4ecf4510330b..b7254ad1181b 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -29,7 +29,7 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-panel"; version = "1.28.7"; outputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mate-desktop"; repo = "mate-panel"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-8GS6JY5kS2YKscItAo8dzudgkZeG51JsSBUj0EfLiZQ="; }; @@ -114,4 +114,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 0f31fb9495f7..49b7269fae3e 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -8,15 +8,15 @@ gobject-introspection, libayatana-appindicator, polkit, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-polkit"; version = "1.28.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-polkit-${finalAttrs.version}.tar.xz"; sha256 = "NQod0KjtaiycGDz/KiHzlCmelo/MauLoyTxWXa5gSug="; }; @@ -34,7 +34,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-polkit"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Integrates polkit authentication for MATE desktop"; @@ -43,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 4144c176e148..9f67b36f661b 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -18,10 +18,10 @@ libtool, polkit, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-power-manager"; version = "1.28.1"; outputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-power-manager-${finalAttrs.version}.tar.xz"; sha256 = "jr3LdLYH6Ggza6moFGze+Pl7zlNcKwyzv2UMWPce7iE="; }; @@ -60,7 +60,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-power-manager"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "MATE Power Manager"; @@ -73,4 +77,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ chpatrick ]; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index ba9d92d9f4ae..450bdef5132c 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -15,15 +15,15 @@ pam, systemd, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-screensaver"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-screensaver-${finalAttrs.version}.tar.xz"; sha256 = "ag8kqPhKL5XhARSrU+Y/1KymiKVf3FA+1lDgpBDj6nA="; }; @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-screensaver"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Screen saver and locker for the MATE desktop"; @@ -64,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index e78e3accbad0..536b3c3251fa 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -14,15 +14,15 @@ lm_sensors, mate-panel, hicolor-icon-theme, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-sensors-applet"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-sensors-applet-${finalAttrs.version}.tar.xz"; sha256 = "1GU2ZoKvj+uGGCg8l4notw22/RfKj6lQrG9xAQIxWoE="; }; @@ -56,7 +56,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-sensors-applet"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; @@ -65,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 841f87bf2e9c..cba2e8c7d722 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -18,15 +18,15 @@ mate-screensaver, wrapGAppsHook3, fetchpatch, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-session-manager"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-session-manager-${finalAttrs.version}.tar.xz"; sha256 = "0yzkWVuh2mUpB3cgPyvIK9lzshSjoECAoe9caJkKLXs="; }; @@ -69,7 +69,11 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "mate" ]; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-session-manager"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "MATE Desktop session manager"; @@ -81,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index f236d536ee81..d7083fc8ab21 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -18,11 +18,11 @@ pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-settings-daemon"; version = "1.28.0"; outputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-settings-daemon-${finalAttrs.version}.tar.xz"; sha256 = "TtfNraqkyZ7//AKCuEEXA7t24HLEHEtXmJ+MW0BhGjo="; }; @@ -64,7 +64,11 @@ stdenv.mkDerivation rec { doInstallCheck = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-settings-daemon"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "MATE settings daemon"; @@ -78,4 +82,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 87b12ebab56b..bc8715962c5e 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -13,15 +13,15 @@ systemd, wrapGAppsHook3, mate-desktop, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-system-monitor"; version = "1.28.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-system-monitor-${finalAttrs.version}.tar.xz"; sha256 = "QtZj1rkPtTYevBP2VHmD1vHirHXcKuTxysbqYymWWiU="; }; @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-system-monitor"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "System monitor for the MATE desktop"; @@ -62,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 6fbd2d2b50e0..050cefb0b611 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -11,16 +11,16 @@ vte, pcre2, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-terminal"; version = "1.28.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-terminal-${finalAttrs.version}.tar.xz"; sha256 = "8TXrGp4q4ieY7LLcGRT9tM/XdOa7ZcAVK+N8xslGnpI="; }; @@ -43,7 +43,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-terminal"; + odd-unstable = true; + rev-prefix = "v"; + }; passthru.tests.test = nixosTests.terminal-emulators.mate-terminal; @@ -54,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index dc97762db452..f5b5faa2010a 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -11,15 +11,15 @@ gtk-engine-murrine, gdk-pixbuf, librsvg, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-themes"; version = "3.22.26"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor finalAttrs.version}/mate-themes-${finalAttrs.version}.tar.xz"; sha256 = "Ik6J02TrO3Pxz3VtBUlKmEIak8v1Q0miyF/GB+t1Xtc="; }; @@ -49,7 +49,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-themes"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Set of themes from MATE"; @@ -62,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 669f10705e66..35d3b97283d0 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -6,15 +6,15 @@ itstool, libxml2, yelp, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-user-guide"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-user-guide-${finalAttrs.version}.tar.xz"; sha256 = "U+8IFPUGVEYU7WGre+UiHMjTqfFPfvlpjJD+fkYBS54="; }; @@ -35,7 +35,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-user-guide"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "MATE User Guide"; @@ -47,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 91bddbab2868..3df42a10b273 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -15,18 +15,18 @@ hicolor-icon-theme, mate, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: let inherit (apacheHttpdPackages) apacheHttpd mod_dnssd; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-user-share"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-user-share-${finalAttrs.version}.tar.xz"; sha256 = "iYVgmZkXllE0jkl+8I81C4YIG5expKcwQHfurlc5rjg="; }; @@ -65,7 +65,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-user-share"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "User level public file sharing for the MATE desktop"; @@ -75,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 6d9b724539f6..1dd76a649967 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -18,10 +18,10 @@ hicolor-icon-theme, wayland, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mate-utils"; version = "1.28.0"; outputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-utils-${finalAttrs.version}.tar.xz"; sha256 = "WESdeg0dkA/wO3jKn36Ywh6X9H/Ca+5/8cYYNPIviNM="; }; @@ -69,7 +69,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mate-utils"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Utilities for the MATE desktop"; @@ -81,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mate-wayland-session/default.nix b/pkgs/desktops/mate/mate-wayland-session/default.nix index 89ad31c18d2e..d9f9ca89ef30 100644 --- a/pkgs/desktops/mate/mate-wayland-session/default.nix +++ b/pkgs/desktops/mate/mate-wayland-session/default.nix @@ -12,14 +12,14 @@ gitUpdater, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "mate-wayland-session"; version = "1.28.4"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "mate-wayland-session"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jcYkiJOo1k0bMP/LkBW+QIrSyoj6qi8zZMTxqmuNQd0="; }; @@ -53,4 +53,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index ef4c646935fe..a27b94d8e4af 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -9,7 +9,7 @@ glib, wrapGAppsHook3, gobject-introspection, - mateUpdateScript, + gitUpdater, }: python3.pkgs.buildPythonApplication rec { @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/mozo-${version}.tar.xz"; sha256 = "/piYT/1qqMNtBZS879ugPeObQtQeAHJRaAOE8870SSQ="; }; @@ -43,7 +43,11 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/mozo"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "MATE Desktop menu editor"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 4b937a001e17..336a284d1072 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -15,15 +15,15 @@ libpeas, mate-desktop, wrapGAppsHook3, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pluma"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/pluma-${finalAttrs.version}.tar.xz"; sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ="; }; @@ -66,7 +66,11 @@ stdenv.mkDerivation rec { patchPythonScript $out/lib/pluma/plugins/snippets/Snippet.py ''; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/pluma"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Powerful text editor for the MATE desktop"; @@ -80,4 +84,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index a732baa0dca8..b06000ba2e13 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -7,15 +7,15 @@ caja, gtk3, python3Packages, - mateUpdateScript, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "python-caja"; version = "1.28.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/python-caja-${finalAttrs.version}.tar.xz"; sha256 = "sFbCOdvf4z7QzIQx+zUAqTj3h7Weh19f+TV4umb2gNY="; }; @@ -36,7 +36,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname; }; + passthru.updateScript = gitUpdater { + url = "https://git.mate-desktop.org/python-caja"; + odd-unstable = true; + rev-prefix = "v"; + }; meta = { description = "Python binding for Caja components"; @@ -45,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; -} +}) diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 4c27e4d0056c..a31ad58933bd 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -8,7 +8,7 @@ pkg-config, wrapGAppsHook3, cairo, - exo, + xfce4-exo, gtk3, libexif, libxfce4ui, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - exo + xfce4-exo glib gtk3 libexif diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index a3b816c1a65d..75e0fb873755 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -9,7 +9,7 @@ ninja, pkg-config, wrapGAppsHook3, - exo, + xfce4-exo, gst_all_1, gtk3, libburn, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo glib gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 9d1264a8ed1e..d539966335bd 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -9,7 +9,7 @@ pkg-config, wayland-scanner, wrapGAppsHook3, - exo, + xfce4-exo, gtk3, gtk-layer-shell, libX11, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 gtk-layer-shell libX11 diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index 777f845b3de1..995d77c07bd7 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -6,7 +6,7 @@ pkg-config, xfce4-dev-tools, wrapGAppsHook3, - exo, + xfce4-exo, gtk3, libgudev, libxfce4ui, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 libgudev libxfce4ui diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index acb8c43afd8a..f52ce309c469 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -4,7 +4,7 @@ fetchFromGitLab, docbook_xsl, gettext, - exo, + xfce4-exo, gdk-pixbuf, gtk3, libexif, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gdk-pixbuf gtk3 libX11 @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( # https://github.com/NixOS/nixpkgs/issues/329688 - --prefix PATH : ${lib.makeBinPath [ exo ]} + --prefix PATH : ${lib.makeBinPath [ xfce4-exo ]} ) ''; diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 9df164019861..05dbbb9848b3 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -7,7 +7,7 @@ xfce4-dev-tools, wrapGAppsHook3, polkit, - exo, + xfce4-exo, libxfce4util, libxfce4ui, libxfce4windowing, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 gtk-layer-shell glib diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 2fc5f5dddd95..dbc5078e6499 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -7,7 +7,7 @@ xfce4-dev-tools, wayland-scanner, wrapGAppsHook3, - exo, + xfce4-exo, garcon, gtk3, gtk-layer-shell, @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo garcon glib gtk3 diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index 5e669868a5a8..9c8e0e2793d1 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -6,7 +6,7 @@ pkg-config, xfce4-dev-tools, wrapGAppsHook3, - exo, + xfce4-exo, gtk3, libxfce4ui, libxfce4util, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 libxfce4ui libxfce4util diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 18df33389d05..a232610d7bcb 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -17,16 +17,6 @@ makeScopeWithSplicing' { { #### CORE - exo = callPackage ./core/exo { }; - - garcon = callPackage ./core/garcon { }; - - libxfce4ui = callPackage ./core/libxfce4ui { }; - - libxfce4util = callPackage ./core/libxfce4util { }; - - libxfce4windowing = callPackage ./core/libxfce4windowing { }; - thunar-unwrapped = callPackage ./core/thunar { }; thunar = callPackage ./core/thunar/wrapper.nix { }; @@ -43,24 +33,18 @@ makeScopeWithSplicing' { tumbler = callPackage ./core/tumbler { }; - xfce4-panel = callPackage ./core/xfce4-panel { }; - xfce4-session = callPackage ./core/xfce4-session { }; xfce4-settings = callPackage ./core/xfce4-settings { }; xfce4-power-manager = callPackage ./core/xfce4-power-manager { }; - xfconf = callPackage ./core/xfconf { }; - xfdesktop = callPackage ./core/xfdesktop { }; xfwm4 = callPackage ./core/xfwm4 { }; xfce4-appfinder = callPackage ./core/xfce4-appfinder { }; - xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { }; - #### APPLICATIONS catfish = callPackage ./applications/catfish { }; @@ -160,9 +144,6 @@ makeScopeWithSplicing' { } // lib.optionalAttrs config.allowAliases { #### ALIASES - - automakeAddFlags = throw "xfce.automakeAddFlags has been removed: this setup-hook is no longer used in Nixpkgs"; # added 2024-03-24 - genericUpdater = throw "xfce.genericUpdater has been removed: use pkgs.genericUpdater directly"; # added 2025-12-22 mkXfceDerivation = lib.warnOnInstantiate '' @@ -172,19 +153,21 @@ makeScopeWithSplicing' { to your configureFlags. '' (callPackage ./mkXfceDerivation.nix { }); # added 2025-12-22 - xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04 - - thunar-bare = self.thunar-unwrapped; # added 2019-11-04 - xfce4-datetime-plugin = throw '' xfce4-datetime-plugin has been removed: this plugin has been merged into the xfce4-panel's built-in clock plugin and thus no longer maintained upstream, see https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/563. ''; # Added 2025-05-20 - - xfce4-embed-plugin = throw "xfce4-embed-plugin has been removed, as it was broken"; # Added 2024-07-15 - - xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 - xfce4-namebar-plugin = throw "xfce.xfce4-namebar-plugin has been removed: abandoned by upstream and does not build"; # added 2024-05-08 } ); } +// lib.optionalAttrs config.allowAliases { + # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope. + exo = lib.warnOnInstantiate "‘xfce.exo’ was moved to top-level. Please use ‘pkgs.xfce4-exo’ directly" pkgs.xfce4-exo; # Added on 2025-12-23 + garcon = lib.warnOnInstantiate "‘xfce.garcon’ was moved to top-level. Please use ‘pkgs.garcon’ directly" pkgs.garcon; # Added on 2025-12-23 + libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23 + libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23 + libxfce4windowing = lib.warnOnInstantiate "‘xfce.libxfce4windowing’ was moved to top-level. Please use ‘pkgs.libxfce4windowing’ directly" pkgs.libxfce4windowing; # Added on 2025-12-23 + xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23 + xfce4-panel = lib.warnOnInstantiate "‘xfce.xfce4-panel’ was moved to top-level. Please use ‘pkgs.xfce4-panel’ directly" pkgs.xfce4-panel; # Added on 2025-12-23 + xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23 +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 3df3819740f2..cdf9fad0adc6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -10,7 +10,8 @@ pkg-config, python3Packages, wrapGAppsHook3, - xfce, + xfce4-panel, + xfconf, }: stdenv.mkDerivation rec { @@ -40,8 +41,8 @@ stdenv.mkDerivation rec { buildInputs = [ keybinder3 python3Packages.python - xfce.xfce4-panel - xfce.xfconf + xfce4-panel + xfconf ] ++ pythonPath; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index aba48cca097a..9d7419d6df74 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -9,7 +9,7 @@ xfce4-panel, libxfce4ui, libxfce4util, - exo, + xfce4-exo, glib, gtk3, gnutls, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { libxfce4ui libxfce4util xfce4-panel - exo + xfce4-exo glib gtk3 gnutls diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 46aa33786756..36bcd05f03f3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitLab, - exo, + xfce4-exo, gtk3, libcanberra, libpulseaudio, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo glib gtk3 keybinder3 diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ca30bb25da43..9652f3e5d14b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -8,7 +8,7 @@ pkg-config, wrapGAppsHook3, accountsservice, - exo, + xfce4-exo, garcon, glib, gtk-layer-shell, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice - exo + xfce4-exo garcon glib gtk-layer-shell diff --git a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix index 086c259c6d85..e7ecbbd05a72 100644 --- a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix @@ -8,7 +8,7 @@ pkg-config, wrapGAppsHook3, thunar, - exo, + xfce4-exo, libxfce4ui, libxfce4util, gtk3, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ thunar - exo + xfce4-exo libxfce4ui libxfce4util gtk3 diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix index 5f38ee28fe51..ed89dd30d7a3 100644 --- a/pkgs/development/compilers/idris2/pack.nix +++ b/pkgs/development/compilers/idris2/pack.nix @@ -5,6 +5,7 @@ clang, chez, gmp, + gnumake, zsh, makeBinaryWrapper, stdenv, @@ -189,6 +190,7 @@ let gmp clang chez + gnumake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; @@ -200,6 +202,7 @@ let [ clang chez + gnumake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ] ) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 5875f4a29b9b..05ee0ca89e60 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -18,40 +18,19 @@ python-multipart, trustme, uvicorn, + websockets, writableTmpDirAsHomeHook, }: -let - # This is only used for testing and requires 12.0 specifically - # due to incompatible API changes in later versions. - websockets = buildPythonPackage rec { - pname = "websockets"; - version = "12.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "aaugustin"; - repo = "websockets"; - tag = version; - hash = "sha256-sOL3VI9Ib/PncZs5KN4dAIHOrBc7LfXqT15LO4M6qKg="; - }; - - build-system = [ setuptools ]; - - doCheck = false; - - pythonImportsCheck = [ "websockets" ]; - }; -in buildPythonPackage rec { pname = "curl-cffi"; - version = "0.14.0b2"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "lexiforest"; repo = "curl_cffi"; tag = "v${version}"; - hash = "sha256-JXfqZTf26kl2P0OMAw/aTdjQaGtdyTpNnhRPlwMiZNw="; + hash = "sha256-5Q9oHAOjefihxj6xU1UGVTl6Ib31XqhrxLtOgI5VABs="; }; patches = [ ./use-system-libs.patch ]; @@ -114,6 +93,8 @@ buildPythonPackage rec { # FIXME ImpersonateError: Impersonating chrome136 is not supported "test_impersonate_without_version" "test_with_impersonate" + # Impersonating chrome142 is not supported + "test_cli" # InvalidURL: Invalid URL component 'path' "test_update_params" # tests access network diff --git a/pkgs/development/python-modules/django-axes/default.nix b/pkgs/development/python-modules/django-axes/default.nix index 9fe5294ae069..05e498df22e6 100644 --- a/pkgs/development/python-modules/django-axes/default.nix +++ b/pkgs/development/python-modules/django-axes/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-axes"; - version = "8.0.0"; + version = "8.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-axes"; tag = version; - hash = "sha256-RV2/s372+yjSqYAqikH0VOJKt7fRAej32sgdOoKR/Do="; + hash = "sha256-yiXj0Wmn9AVKDilmGVTIE+MICmKeO76j2P6jtlt5CFY="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 0fba91572fc5..389b89855ce3 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -22,13 +22,13 @@ let nixComponents = nixVersions.nixComponents_2_30; common = rec { - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; tag = version; - hash = "sha256-VPUX/68ysFUr1S8JW9I1rU5UcRoyZiCjL+9u2owrs6w="; + hash = "sha256-7B6jRkgqX5UCFXd0Bz7JFNG9ce3xeRNwXZyPR4nm4h0="; }; nativeBuildInputs = [ @@ -73,6 +73,7 @@ in ]; buildInputs = [ + nixComponents.nix-expr gtest boost nlohmann_json diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 37df62a88ea7..7297049cda27 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -624,6 +624,7 @@ mapAliases { freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23 freerdp3 = throw "'freerdp3' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27 freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27 + frugal = throw "'frugal' was removed because upstream has been pulled"; # Added 2025-12-20 fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # Added 2025-07-05 futuresql = throw "'futuresql' has been renamed to/replaced by 'libsForQt5.futuresql'"; # Converted to throw 2025-10-27 fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9481ebb87b5a..fb6250777a91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12455,10 +12455,6 @@ with pkgs; inherit (haskellPackages) ghcWithPackages; }; - xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { - inherit (xfce) libxfce4util xfce4-panel; - }; - xmonad_log_applet_mate = xmonad_log_applet.override { desktopSupport = "mate"; };