From f2dc18834be35908a3cbc8af5c2e97e1d2d53c99 Mon Sep 17 00:00:00 2001 From: Riccardo Sirchia Date: Sun, 10 Dec 2023 23:59:13 +0100 Subject: podman: 4.7.2 -> 4.8.1 https://github.com/containers/podman/releases/tag/v4.8.1 https://github.com/containers/podman/releases/tag/v4.8.0 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- .../virtualization/podman/rm-podman-mac-helper-msg.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8841abcd3671..b714db0bd62a 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -62,13 +62,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.7.2"; + version = "4.8.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-o5FTCuFUbTlENqvh+u6fPEfD816tKWPxHu2yhBi/Mf0="; + hash = "sha256-EDIgipbv8Z7nVV6VQ5IAmvHvvpLyGEDHMDnwhMUm/BQ="; }; patches = [ diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 5663f5e8a018..179ce41f02b2 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,5 +1,5 @@ diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go -index 649748947..a981d93bf 100644 +index 4e43dd54c..a981d93bf 100644 --- a/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go @@ -127,14 +127,6 @@ address can't be used by podman. ` @@ -7,10 +7,10 @@ index 649748947..a981d93bf 100644 if len(helper) < 1 { fmt.Print(fmtString) - } else { -- fmtString += `If you would like to install it run the\nfollowing commands: +- fmtString += `If you would like to install it, run the following commands: - - sudo %s install -- podman machine stop%[1]s; podman machine start%[1]s +- podman machine stop%[2]s; podman machine start%[2]s - - ` - fmt.Printf(fmtString, helper, suffix) -- cgit 1.4.1 From 3145307809f845b3d1c940afc14b45cb61587818 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 20:58:16 +0000 Subject: filebot: 5.1.1 -> 5.1.2 --- pkgs/applications/video/filebot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index e38b4dde3d29..fd779bf0bf81 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "filebot"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-BCsZBRtT2Ka7WZw7WFnagwoJwIO1L3qpFk/6nlGdpmQ="; + hash = "sha256-+5I0t67asbCwaMCuqI/ixRHNAdcLTziuYOfepVThoPk="; }; unpackPhase = "tar xvf $src"; -- cgit 1.4.1 From 000a43d5fcd2f6ba752eceb077afb10cb4b08e8e Mon Sep 17 00:00:00 2001 From: arthsmn Date: Tue, 12 Dec 2023 13:18:38 -0300 Subject: mpvScripts.buildLua: remove unused inherits --- pkgs/applications/video/mpv/scripts/buildLua.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index 4c1e1957c097..21fbde93d7ca 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -2,7 +2,6 @@ , stdenvNoCC }: let - inherit (lib) hasPrefix hasSuffix removeSuffix; escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'"); fileName = pathStr: lib.last (lib.splitString "/" pathStr); scriptsDir = "$out/share/mpv/scripts"; -- cgit 1.4.1 From 5496f871e063a30420ff0e67cd913b930aeabed4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 06:55:10 +0000 Subject: noson: 5.6.0 -> 5.6.3 --- pkgs/applications/audio/noson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index fb37c93e10fe..b8d29af7abdf 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.0"; + version = "5.6.3"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-ZOAnH7pdhlTbqHOM0kiCWcHYJvnskigWdz3N9WjtM0M="; + hash = "sha256-Yv5p9yAEhJHm9ZDZlR76z10oGBNpdifR7ITXcAHIb54="; }; nativeBuildInputs = [ -- cgit 1.4.1 From a70060d2e48c2583c3bbd7792f0e98ebca0186b2 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sat, 16 Dec 2023 15:32:02 +0100 Subject: tribler: move license elsewhere to avoid conflict This leads to conflicts when using nix profile otherwise --- pkgs/applications/networking/p2p/tribler/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index b4fba4b9197e..fc8377a4d113 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications $out/share/icons cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm + mkdir -p $out/share/copyright/tribler + mv $out/LICENSE $out/share/copyright/tribler ''; shellHook = '' -- cgit 1.4.1 From a96dfb45810f41a6e0f6db5a6bae8039a5927093 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 17 Dec 2023 18:52:53 +1000 Subject: terraform: 1.6.5 -> 1.6.6 (#274877) Diff: https://github.com/hashicorp/terraform/compare/v1.6.5...v1.6.6 Changelog: https://github.com/hashicorp/terraform/blob/v1.6.6/CHANGELOG.md --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 9937359dd497..df62730e0bb9 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.6.5"; - hash = "sha256-TJKs7pWoLFIeov/ERgPqZxPtbjSAHrHI2wrSEXUAS1A="; - vendorHash = "sha256-QHfCGlgOv4v3MzUs4JxIHytcyymUYmnk4Z0smgak1Mg="; + version = "1.6.6"; + hash = "sha256-fYFmHypzSbSgut9Wij6Sz8xR97DVOwPLQap6pan7IRA="; + vendorHash = "sha256-fQsxTX1v8HsMDIkofeCVfNitJAaTWHwppC7DniXlvT4="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; -- cgit 1.4.1 From 2d9c3878c95878fbc1775cf70b69c391fe81ba21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 09:06:21 +0000 Subject: clightning: 23.11 -> 23.11.1 --- pkgs/applications/blockchains/clightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index d4fa4c68fe26..efedeb55cb1a 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "23.11"; + version = "23.11.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256:1q1plg9qhwlrcvljnrv8yd1gaz9a98pxgql7bqxjq37vk3lfggw6"; + sha256 = "sha256-PH5vNaQWUP9liKOiNXJnYPWn6LPBw6+XfT4KvcXb4Kk="; }; # when building on darwin we need dawin.cctools to provide the correct libtool -- cgit 1.4.1 From 83267ae441a5698afa0622d9e04cf45cf3582bb6 Mon Sep 17 00:00:00 2001 From: Quantenzitrone Date: Tue, 12 Dec 2023 15:51:57 +0100 Subject: sway*: move to pkgs/by-name --- pkgs/applications/misc/sway-contrib/default.nix | 107 +++++++++++++++++++++ .../window-managers/sway/assign-cgroups.nix | 43 --------- pkgs/applications/window-managers/sway/bg.nix | 40 -------- pkgs/applications/window-managers/sway/contrib.nix | 107 --------------------- pkgs/applications/window-managers/sway/default.nix | 101 ------------------- .../window-managers/sway/fix-paths.patch | 11 --- pkgs/applications/window-managers/sway/fx.nix | 43 --------- pkgs/applications/window-managers/sway/idle.nix | 42 -------- .../sway/load-configuration-from-etc.patch | 48 --------- .../window-managers/sway/lock-effects.nix | 53 ---------- .../window-managers/sway/lock-fancy.nix | 67 ------------- pkgs/applications/window-managers/sway/lock.nix | 39 -------- pkgs/applications/window-managers/sway/osd.nix | 71 -------------- .../sway/sway-config-nixos-paths.patch | 21 ---- .../sway/sway-config-no-nix-store-references.patch | 21 ---- .../applications/window-managers/sway/swaycons.nix | 26 ----- .../sway/swayest-workstyle/default.nix | 29 ------ .../sway/swayosd_systemd_paths.patch | 24 ----- pkgs/applications/window-managers/sway/wrapper.nix | 63 ------------ .../sway/ws-update-Cargo-lock.patch | 13 --- pkgs/applications/window-managers/sway/ws.nix | 29 ------ pkgs/applications/window-managers/sway/wsr.nix | 33 ------- pkgs/by-name/sw/sway-assign-cgroups/package.nix | 43 +++++++++ pkgs/by-name/sw/sway-unwrapped/fix-paths.patch | 11 +++ .../load-configuration-from-etc.patch | 48 +++++++++ pkgs/by-name/sw/sway-unwrapped/package.nix | 104 ++++++++++++++++++++ .../sway-unwrapped/sway-config-nixos-paths.patch | 21 ++++ .../sway-config-no-nix-store-references.patch | 21 ++++ pkgs/by-name/sw/sway/package.nix | 63 ++++++++++++ pkgs/by-name/sw/swaybg/package.nix | 40 ++++++++ pkgs/by-name/sw/swaycons/package.nix | 26 +++++ pkgs/by-name/sw/swayest-workstyle/package.nix | 29 ++++++ pkgs/by-name/sw/swayfx/package.nix | 43 +++++++++ pkgs/by-name/sw/swayidle/package.nix | 42 ++++++++ pkgs/by-name/sw/swaylock-effects/package.nix | 53 ++++++++++ pkgs/by-name/sw/swaylock-fancy/package.nix | 67 +++++++++++++ pkgs/by-name/sw/swaylock/package.nix | 39 ++++++++ pkgs/by-name/sw/swayosd/package.nix | 71 ++++++++++++++ .../by-name/sw/swayosd/swayosd_systemd_paths.patch | 24 +++++ pkgs/by-name/sw/swayws/package.nix | 29 ++++++ pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch | 13 +++ pkgs/by-name/sw/swaywsr/package.nix | 33 +++++++ pkgs/top-level/all-packages.nix | 23 +---- 43 files changed, 928 insertions(+), 946 deletions(-) create mode 100644 pkgs/applications/misc/sway-contrib/default.nix delete mode 100644 pkgs/applications/window-managers/sway/assign-cgroups.nix delete mode 100644 pkgs/applications/window-managers/sway/bg.nix delete mode 100644 pkgs/applications/window-managers/sway/contrib.nix delete mode 100644 pkgs/applications/window-managers/sway/default.nix delete mode 100644 pkgs/applications/window-managers/sway/fix-paths.patch delete mode 100644 pkgs/applications/window-managers/sway/fx.nix delete mode 100644 pkgs/applications/window-managers/sway/idle.nix delete mode 100644 pkgs/applications/window-managers/sway/load-configuration-from-etc.patch delete mode 100644 pkgs/applications/window-managers/sway/lock-effects.nix delete mode 100644 pkgs/applications/window-managers/sway/lock-fancy.nix delete mode 100644 pkgs/applications/window-managers/sway/lock.nix delete mode 100644 pkgs/applications/window-managers/sway/osd.nix delete mode 100644 pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch delete mode 100644 pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch delete mode 100644 pkgs/applications/window-managers/sway/swaycons.nix delete mode 100644 pkgs/applications/window-managers/sway/swayest-workstyle/default.nix delete mode 100644 pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch delete mode 100644 pkgs/applications/window-managers/sway/wrapper.nix delete mode 100644 pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch delete mode 100644 pkgs/applications/window-managers/sway/ws.nix delete mode 100644 pkgs/applications/window-managers/sway/wsr.nix create mode 100644 pkgs/by-name/sw/sway-assign-cgroups/package.nix create mode 100644 pkgs/by-name/sw/sway-unwrapped/fix-paths.patch create mode 100644 pkgs/by-name/sw/sway-unwrapped/load-configuration-from-etc.patch create mode 100644 pkgs/by-name/sw/sway-unwrapped/package.nix create mode 100644 pkgs/by-name/sw/sway-unwrapped/sway-config-nixos-paths.patch create mode 100644 pkgs/by-name/sw/sway-unwrapped/sway-config-no-nix-store-references.patch create mode 100644 pkgs/by-name/sw/sway/package.nix create mode 100644 pkgs/by-name/sw/swaybg/package.nix create mode 100644 pkgs/by-name/sw/swaycons/package.nix create mode 100644 pkgs/by-name/sw/swayest-workstyle/package.nix create mode 100644 pkgs/by-name/sw/swayfx/package.nix create mode 100644 pkgs/by-name/sw/swayidle/package.nix create mode 100644 pkgs/by-name/sw/swaylock-effects/package.nix create mode 100644 pkgs/by-name/sw/swaylock-fancy/package.nix create mode 100644 pkgs/by-name/sw/swaylock/package.nix create mode 100644 pkgs/by-name/sw/swayosd/package.nix create mode 100644 pkgs/by-name/sw/swayosd/swayosd_systemd_paths.patch create mode 100644 pkgs/by-name/sw/swayws/package.nix create mode 100644 pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch create mode 100644 pkgs/by-name/sw/swaywsr/package.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/sway-contrib/default.nix b/pkgs/applications/misc/sway-contrib/default.nix new file mode 100644 index 000000000000..df5ad07b1c5a --- /dev/null +++ b/pkgs/applications/misc/sway-contrib/default.nix @@ -0,0 +1,107 @@ +{ lib, stdenv +, fetchFromGitHub +, coreutils +, makeWrapper +, sway-unwrapped +, installShellFiles +, wl-clipboard +, libnotify +, slurp +, grim +, jq +, bash + +, python3Packages +}: + +let + version = "unstable-2023-06-30"; + src = fetchFromGitHub { + owner = "OctopusET"; + repo = "sway-contrib"; + rev = "7e138bfc112872b79ac9fd766bc57c0f125b96d4"; + hash = "sha256-u4sw1NeAhl4FJCG2YOeY45SHoN7tw6cSJwEL5iqr0uQ="; + }; + + meta = with lib; { + homepage = "https://github.com/OctopusET/sway-contrib"; + license = licenses.mit; + platforms = platforms.all; + }; +in +{ + +grimshot = stdenv.mkDerivation rec { + inherit version src; + + pname = "grimshot"; + + dontBuild = true; + dontConfigure = true; + + outputs = [ "out" "man" ]; + + strictDeps = true; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + buildInputs = [ bash ]; + installPhase = '' + installManPage grimshot.1 + + install -Dm 0755 grimshot $out/bin/grimshot + wrapProgram $out/bin/grimshot --set PATH \ + "${lib.makeBinPath [ + sway-unwrapped + wl-clipboard + coreutils + libnotify + slurp + grim + jq + ] }" + ''; + + doInstallCheck = true; + + installCheckPhase = '' + # check always returns 0 + if [[ $($out/bin/grimshot check | grep "NOT FOUND") ]]; then false + else + echo "grimshot check passed" + fi + ''; + + meta = with lib; { + description = "A helper for screenshots within sway"; + maintainers = with maintainers; [ evils ]; + mainProgram = "grimshot"; + }; +}; + + +inactive-windows-transparency = python3Packages.buildPythonApplication rec { + inherit version src; + + # long name is long + lname = "inactive-windows-transparency"; + pname = "sway-${lname}"; + + format = "other"; + dontBuild = true; + dontConfigure = true; + + propagatedBuildInputs = [ python3Packages.i3ipc ]; + + installPhase = '' + install -Dm 0755 $src/${lname}.py $out/bin/${lname}.py + ''; + + meta = with lib; { + description = "It makes inactive sway windows transparent"; + mainProgram = "${lname}.py"; + maintainers = with maintainers; [ + evils # packaged this as a side-effect of grimshot but doesn't use it + ]; + }; +}; + +} diff --git a/pkgs/applications/window-managers/sway/assign-cgroups.nix b/pkgs/applications/window-managers/sway/assign-cgroups.nix deleted file mode 100644 index c6029de3ee80..000000000000 --- a/pkgs/applications/window-managers/sway/assign-cgroups.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, fetchFromGitHub -, python3Packages -}: - -python3Packages.buildPythonApplication rec { - pname = "assign-cgroups"; - version = "0.4.0"; - src = fetchFromGitHub { - owner = "alebastr"; - repo = "sway-systemd"; - rev = "v${version}"; - sha256 = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; - }; - format = "other"; - - propagatedBuildInputs = with python3Packages; [ dbus-next i3ipc psutil tenacity xlib ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp src/assign-cgroups.py $out/bin/ - runHook postInstall - ''; - - meta = with lib; { - description = "Place GUI applications into systemd scopes for systemd-oomd compatibility."; - longDescription = '' - Automatically assign a dedicated systemd scope to the GUI applications - launched in the same cgroup as the compositor. This could be helpful for - implementing cgroup-based resource management and would be necessary when - `systemd-oomd` is in use. - - Limitations: The script is using i3ipc window:new event to detect application - launches and would fail to detect background apps or special surfaces. - Therefore it's recommended to supplement the script with use of systemd user - services for such background apps. - ''; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ nickhu ]; - }; -} diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix deleted file mode 100644 index aa5d12cdfc4f..000000000000 --- a/pkgs/applications/window-managers/sway/bg.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc -, wayland, wayland-protocols, cairo, gdk-pixbuf -, wayland-scanner -}: - -stdenv.mkDerivation rec { - pname = "swaybg"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "swaybg"; - rev = "v${version}"; - hash = "sha256-Qk5iGALlSVSzgBJzYzyLdLHhj/Zq1R4nFseACBmIBuA="; - }; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; - - mesonFlags = [ - "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" - ]; - - meta = with lib; { - description = "Wallpaper tool for Wayland compositors"; - inherit (src.meta) homepage; - longDescription = '' - A wallpaper utility for Wayland compositors, that is compatible with any - Wayland compositor which implements the following Wayland protocols: - wlr-layer-shell, xdg-output, and xdg-shell. - ''; - license = licenses.mit; - mainProgram = "swaybg"; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix deleted file mode 100644 index df5ad07b1c5a..000000000000 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, coreutils -, makeWrapper -, sway-unwrapped -, installShellFiles -, wl-clipboard -, libnotify -, slurp -, grim -, jq -, bash - -, python3Packages -}: - -let - version = "unstable-2023-06-30"; - src = fetchFromGitHub { - owner = "OctopusET"; - repo = "sway-contrib"; - rev = "7e138bfc112872b79ac9fd766bc57c0f125b96d4"; - hash = "sha256-u4sw1NeAhl4FJCG2YOeY45SHoN7tw6cSJwEL5iqr0uQ="; - }; - - meta = with lib; { - homepage = "https://github.com/OctopusET/sway-contrib"; - license = licenses.mit; - platforms = platforms.all; - }; -in -{ - -grimshot = stdenv.mkDerivation rec { - inherit version src; - - pname = "grimshot"; - - dontBuild = true; - dontConfigure = true; - - outputs = [ "out" "man" ]; - - strictDeps = true; - nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = [ bash ]; - installPhase = '' - installManPage grimshot.1 - - install -Dm 0755 grimshot $out/bin/grimshot - wrapProgram $out/bin/grimshot --set PATH \ - "${lib.makeBinPath [ - sway-unwrapped - wl-clipboard - coreutils - libnotify - slurp - grim - jq - ] }" - ''; - - doInstallCheck = true; - - installCheckPhase = '' - # check always returns 0 - if [[ $($out/bin/grimshot check | grep "NOT FOUND") ]]; then false - else - echo "grimshot check passed" - fi - ''; - - meta = with lib; { - description = "A helper for screenshots within sway"; - maintainers = with maintainers; [ evils ]; - mainProgram = "grimshot"; - }; -}; - - -inactive-windows-transparency = python3Packages.buildPythonApplication rec { - inherit version src; - - # long name is long - lname = "inactive-windows-transparency"; - pname = "sway-${lname}"; - - format = "other"; - dontBuild = true; - dontConfigure = true; - - propagatedBuildInputs = [ python3Packages.i3ipc ]; - - installPhase = '' - install -Dm 0755 $src/${lname}.py $out/bin/${lname}.py - ''; - - meta = with lib; { - description = "It makes inactive sway windows transparent"; - mainProgram = "${lname}.py"; - maintainers = with maintainers; [ - evils # packaged this as a side-effect of grimshot but doesn't use it - ]; - }; -}; - -} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix deleted file mode 100644 index 38fa09e86f70..000000000000 --- a/pkgs/applications/window-managers/sway/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg -, meson, ninja, pkg-config, wayland-scanner, scdoc -, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev -, pango, cairo, libinput, gdk-pixbuf, librsvg -, wlroots, wayland-protocols, libdrm -, nixosTests -# Used by the NixOS module: -, isNixOS ? false -, enableXWayland ? true, xorg -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, trayEnabled ? systemdSupport -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sway-unwrapped"; - version = "1.8.1"; - - inherit enableXWayland isNixOS systemdSupport trayEnabled; - src = fetchFromGitHub { - owner = "swaywm"; - repo = "sway"; - rev = finalAttrs.version; - hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; - }; - - patches = [ - ./load-configuration-from-etc.patch - - (substituteAll { - src = ./fix-paths.patch; - inherit swaybg; - }) - - (fetchpatch { - name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"; - url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff"; - hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0="; - }) - ] ++ lib.optionals (!finalAttrs.isNixOS) [ - # References to /nix/store/... will get GC'ed which causes problems when - # copying the default configuration: - ./sway-config-no-nix-store-references.patch - ] ++ lib.optionals finalAttrs.isNixOS [ - # Use /run/current-system/sw/share and /etc instead of /nix/store - # references: - ./sway-config-nixos-paths.patch - ]; - - strictDeps = true; - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson ninja pkg-config wayland-scanner scdoc - ]; - - buildInputs = [ - libGL wayland libxkbcommon pcre2 json_c libevdev - pango cairo libinput gdk-pixbuf librsvg - wayland-protocols libdrm - (wlroots.override { inherit (finalAttrs) enableXWayland; }) - ] ++ lib.optionals finalAttrs.enableXWayland [ - xorg.xcbutilwm - ]; - - mesonFlags = let - # The "sd-bus-provider" meson option does not include a "none" option, - # but it is silently ignored iff "-Dtray=disabled". We use "basu" - # (which is not in nixpkgs) instead of "none" to alert us if this - # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 - # assert trayEnabled -> systemdSupport && dbusSupport; - - sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; - in - [ "-Dsd-bus-provider=${sd-bus-provider}" ] - ++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" - ++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled" - ; - - passthru.tests.basic = nixosTests.sway; - - meta = with lib; { - description = "An i3-compatible tiling Wayland compositor"; - longDescription = '' - Sway is a tiling Wayland compositor and a drop-in replacement for the i3 - window manager for X11. It works with your existing i3 configuration and - supports most of i3's features, plus a few extras. - Sway allows you to arrange your application windows logically, rather - than spatially. Windows are arranged into a grid by default which - maximizes the efficiency of your screen and can be quickly manipulated - using only the keyboard. - ''; - homepage = "https://swaywm.org"; - changelog = "https://github.com/swaywm/sway/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - mainProgram = "sway"; - }; -}) diff --git a/pkgs/applications/window-managers/sway/fix-paths.patch b/pkgs/applications/window-managers/sway/fix-paths.patch deleted file mode 100644 index c52f65b146b7..000000000000 --- a/pkgs/applications/window-managers/sway/fix-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sway/config.c -+++ b/sway/config.c -@@ -276,7 +276,7 @@ - - if (!(config->active_bar_modifiers = create_list())) goto cleanup; - -- if (!(config->swaybg_command = strdup("swaybg"))) goto cleanup; -+ if (!(config->swaybg_command = strdup("@swaybg@/bin/swaybg"))) goto cleanup; - - if (!(config->config_chain = create_list())) goto cleanup; - config->current_config_path = NULL; diff --git a/pkgs/applications/window-managers/sway/fx.nix b/pkgs/applications/window-managers/sway/fx.nix deleted file mode 100644 index d8ca9cfb7f48..000000000000 --- a/pkgs/applications/window-managers/sway/fx.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ fetchFromGitHub, lib, sway-unwrapped }: - -sway-unwrapped.overrideAttrs (oldAttrs: rec { - pname = "swayfx"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "WillPower3309"; - repo = "swayfx"; - rev = version; - sha256 = "sha256-Gwewb0yDVhEBrefSSGDf1hLtpWcntzifPCPJQhqLqI0="; - }; - - # This patch was backported into SwayFX - # remove when next release is rebased on Sway 1.9 - patches = - let - removePatches = [ - "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch" - ]; - in - builtins.filter - (patch: !builtins.elem (patch.name or null) removePatches) - (oldAttrs.patches or [ ]); - - - meta = with lib; { - description = "Sway, but with eye candy!"; - homepage = "https://github.com/WillPower3309/swayfx"; - license = licenses.mit; - maintainers = with maintainers; [ eclairevoyant ricarch97 ]; - platforms = platforms.linux; - mainProgram = "sway"; - - longDescription = '' - Fork of Sway, an incredible and one of the most well established Wayland - compositors, and a drop-in replacement for the i3 window manager for X11. - SwayFX adds extra options and effects to the original Sway, such as rounded corners, - shadows and inactive window dimming to bring back some of the Picom X11 - compositor functionality, which was commonly used with the i3 window manager. - ''; - }; -}) diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix deleted file mode 100644 index 0ee08dc7ca1d..000000000000 --- a/pkgs/applications/window-managers/sway/idle.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, runtimeShell -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -}: - -stdenv.mkDerivation rec { - pname = "swayidle"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "swayidle"; - rev = version; - hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg="; - }; - - strictDeps = true; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols ] - ++ lib.optionals systemdSupport [ systemd ]; - - mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; - - postPatch = '' - substituteInPlace main.c \ - --replace '"sh"' '"${runtimeShell}"' - ''; - - meta = with lib; { - description = "Idle management daemon for Wayland"; - inherit (src.meta) homepage; - longDescription = '' - Sway's idle management daemon. It is compatible with any Wayland - compositor which implements the KDE idle protocol. - ''; - license = licenses.mit; - mainProgram = "swayidle"; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch b/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch deleted file mode 100644 index 46a170abc04a..000000000000 --- a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 92283df3acbffa5c1bb21f23cdd686113d905114 Mon Sep 17 00:00:00 2001 -From: Patrick Hilhorst -Date: Wed, 31 Mar 2021 21:14:13 +0200 -Subject: [PATCH] Load configs from /etc but fallback to /nix/store - -This change will load all configuration files from /etc, to make it easy -to override them, but fallback to /nix/store/.../etc/sway/config to make -Sway work out-of-the-box with the default configuration on non NixOS -systems. - -Original patch by Michael Weiss, updated for Sway 1.6 by Patrick Hilhorst - -Co-authored-by: Michael Weiss ---- - meson.build | 3 ++- - sway/config.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index b7a29660..8ae8ceb3 100644 ---- a/meson.build -+++ b/meson.build -@@ -164,7 +164,8 @@ if scdoc.found() - endforeach - endif - --add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') -+add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') -+add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') - - version = '"@0@"'.format(meson.project_version()) - git = find_program('git', native: true, required: false) -diff --git a/sway/config.c b/sway/config.c -index 76b9ec08..fb5b51aa 100644 ---- a/sway/config.c -+++ b/sway/config.c -@@ -374,7 +374,8 @@ static char *get_config_path(void) { - { .prefix = home, .config_folder = ".i3"}, - { .prefix = config_home, .config_folder = "i3"}, - { .prefix = SYSCONFDIR, .config_folder = "sway"}, -- { .prefix = SYSCONFDIR, .config_folder = "i3"} -+ { .prefix = SYSCONFDIR, .config_folder = "i3"}, -+ { .prefix = NIX_SYSCONFDIR, .config_folder = "sway"}, - }; - - size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]); --- -2.30.1 diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix deleted file mode 100644 index c5dbf3766f06..000000000000 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, scdoc -, wayland -, wayland-protocols -, wayland-scanner -, libxkbcommon -, cairo -, gdk-pixbuf -, pam -}: - -stdenv.mkDerivation rec { - pname = "swaylock-effects"; - version = "1.7.0.0"; - - src = fetchFromGitHub { - owner = "jirutka"; - repo = "swaylock-effects"; - rev = "v${version}"; - sha256 = "sha256-cuFM+cbUmGfI1EZu7zOsQUj4rA4Uc4nUXcvIfttf9zE="; - }; - - postPatch = '' - sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build - ''; - - strictDeps = true; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner]; - buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; - - mesonFlags = [ - "-Dpam=enabled" - "-Dgdk-pixbuf=enabled" - "-Dman-pages=enabled" - ]; - - meta = with lib; { - description = "Screen locker for Wayland"; - longDescription = '' - Swaylock, with fancy effects - ''; - mainProgram = "swaylock"; - inherit (src.meta) homepage; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ gnxlxnxx ]; - }; -} diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix deleted file mode 100644 index 83d56def4dcc..000000000000 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, coreutils -, grim -, gawk -, jq -, swaylock -, imagemagick -, getopt -, fontconfig -, wmctrl -, makeWrapper -, bash -}: - -let - depsPath = lib.makeBinPath [ - coreutils - grim - gawk - jq - swaylock - imagemagick - getopt - fontconfig - wmctrl - ]; - mainProgram = "swaylock-fancy"; -in - -stdenv.mkDerivation { - pname = "swaylock-fancy"; - version = "unstable-2023-11-21"; - - src = fetchFromGitHub { - owner = "Big-B"; - repo = "swaylock-fancy"; - rev = "ff37ae3c6d0f100f81ff64fdb9d422c37de2f4f6"; - hash = "sha256-oS4YCbZOIrMP4QSM5eHWzTn18k3w2OnJ2k+64x/DnuM="; - }; - - postPatch = '' - substituteInPlace ${mainProgram} \ - --replace "/usr/share" "$out/share" - ''; - - strictDeps = true; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ bash ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - postInstall = '' - wrapProgram $out/bin/${mainProgram} \ - --prefix PATH : "${depsPath}" - ''; - - meta = with lib; { - description = "This is an swaylock bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; - homepage = "https://github.com/Big-B/swaylock-fancy"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ frogamic ]; - inherit mainProgram; - }; -} diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix deleted file mode 100644 index 0b438df13d28..000000000000 --- a/pkgs/applications/window-managers/sway/lock.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam -}: - -stdenv.mkDerivation rec { - pname = "swaylock"; - version = "1.7.2"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "swaylock"; - rev = "v${version}"; - hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; - }; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; - - mesonFlags = [ - "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" - ]; - - meta = with lib; { - description = "Screen locker for Wayland"; - longDescription = '' - swaylock is a screen locking utility for Wayland compositors. - Important note: If you don't use the Sway module (programs.sway.enable) - you need to set "security.pam.services.swaylock = {};" manually. - ''; - inherit (src.meta) homepage; - mainProgram = "swaylock"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/applications/window-managers/sway/osd.nix b/pkgs/applications/window-managers/sway/osd.nix deleted file mode 100644 index b2a7b17b4315..000000000000 --- a/pkgs/applications/window-managers/sway/osd.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook -, cargo -, coreutils -, gtk-layer-shell -, libevdev -, libinput -, libpulseaudio -, meson -, ninja -, rustc -, stdenv -, udev -}: - -stdenv.mkDerivation rec { - pname = "swayosd"; - version = "unstable-2023-07-18"; - - src = fetchFromGitHub { - owner = "ErikReider"; - repo = "SwayOSD"; - rev = "b14c83889c7860c174276d05dec6554169a681d9"; - hash = "sha256-MJuTwEI599Y7q+0u0DMxRYaXsZfpksc2csgnK9Ghp/E="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-pExpzQwuHREhgkj+eZ8drBVsh/B3WiQBBh906O6ymFw="; - }; - - nativeBuildInputs = [ - wrapGAppsHook - pkg-config - meson - rustc - cargo - ninja - rustPlatform.cargoSetupHook - ]; - - buildInputs = [ - gtk-layer-shell - libevdev - libinput - libpulseaudio - udev - ]; - - patches = [ - ./swayosd_systemd_paths.patch - ]; - - postPatch = '' - substituteInPlace data/udev/99-swayosd.rules \ - --replace /bin/chgrp ${coreutils}/bin/chgrp \ - --replace /bin/chmod ${coreutils}/bin/chmod - ''; - - meta = with lib; { - description = "A GTK based on screen display for keyboard shortcuts"; - homepage = "https://github.com/ErikReider/SwayOSD"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch b/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch deleted file mode 100644 index bbb0f722b8bc..000000000000 --- a/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/config.in b/config.in -index 08703bef..f3872730 100644 ---- a/config.in -+++ b/config.in -@@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec -- - - ### Output configuration - # --# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) --output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill -+# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/) -+output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill - # - # Example configuration: - # -@@ -214,4 +214,4 @@ bar { - } - } - --include @sysconfdir@/sway/config.d/* -+include /etc/sway/config.d/* diff --git a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch deleted file mode 100644 index 009c12959430..000000000000 --- a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/config.in b/config.in ---- a/config.in -+++ b/config.in -@@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec - - ### Output configuration - # --# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) --output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill -+# Default wallpaper -+#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill - # - # Example configuration: - # -@@ -213,5 +213,3 @@ bar { - inactive_workspace #32323200 #32323200 #5c5c5c - } - } -- --include @sysconfdir@/sway/config.d/* - diff --git a/pkgs/applications/window-managers/sway/swaycons.nix b/pkgs/applications/window-managers/sway/swaycons.nix deleted file mode 100644 index c990a2bb5186..000000000000 --- a/pkgs/applications/window-managers/sway/swaycons.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "swaycons"; - version = "unstable-2023-01-05"; - - src = fetchFromGitHub { - owner = "ActuallyAllie"; - repo = "swaycons"; - rev = "e863599fb56177fc9747d60db661be2d7c2d290b"; - hash = "sha256-zkCpZ3TehFKNePtSyFaEk+MA4mi1+la9yFjRPFy+eq8="; - }; - - cargoSha256 = "sha256-GcoRx52dwL/ehJ1Xg6xQHVzPIKXWqBrG7IjzxRjfgqA="; - - meta = with lib; { - description = "Window Icons in Sway with Nerd Fonts!"; - homepage = "https://github.com/ActuallyAllie/swaycons"; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ aacebedo ]; - }; -} diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix deleted file mode 100644 index 2867db53f371..000000000000 --- a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "swayest-workstyle"; - version = "1.3.5"; - - src = fetchFromGitHub { - owner = "Lyr-7D1h"; - repo = "swayest_workstyle"; - rev = version; - sha256 = "sha256-Dk6rAiz7PXUfyy9fWMtSVRjaWWl66n38gTNyWKqeqkU="; - }; - - cargoHash = "sha256-sLQPq3tyWq1TxxeFyg05qBt+KGI/vO0jLU7wJLiqcYA="; - - doCheck = false; # No tests - - meta = with lib; { - description = "Map sway workspace names to icons defined depending on the windows inside of the workspace"; - homepage = "https://github.com/Lyr-7D1h/swayest_workstyle"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ miangraham ]; - mainProgram = "sworkstyle"; - }; -} diff --git a/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch b/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch deleted file mode 100644 index 189c761e9d36..000000000000 --- a/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/data/meson.build b/data/meson.build -index fc687a5..68decdf 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,5 +1,6 @@ - datadir = get_option('datadir') - sysconfdir = get_option('sysconfdir') -+libdir = get_option('libdir') - - # LICENSE - install_data( -@@ -41,11 +42,7 @@ configure_file( - - # Systemd service unit - systemd = dependency('systemd', required: false) --if systemd.found() -- systemd_service_install_dir = systemd.get_variable(pkgconfig :'systemdsystemunitdir') --else -- systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') --endif -+systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') - - configure_file( - configuration: conf_data, diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix deleted file mode 100644 index 7510e1e9582b..000000000000 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, sway-unwrapped -, makeWrapper, symlinkJoin, writeShellScriptBin -, withBaseWrapper ? true, extraSessionCommands ? "", dbus -, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 -, extraOptions ? [] # E.g.: [ "--verbose" ] -# Used by the NixOS module: -, isNixOS ? false - -, enableXWayland ? true -, dbusSupport ? true -}: - -assert extraSessionCommands != "" -> withBaseWrapper; - -with lib; - -let - sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); - baseWrapper = writeShellScriptBin sway.meta.mainProgram '' - set -o errexit - if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then - export XDG_CURRENT_DESKTOP=${sway.meta.mainProgram} - ${extraSessionCommands} - export _SWAY_WRAPPER_ALREADY_EXECUTED=1 - fi - if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then - export DBUS_SESSION_BUS_ADDRESS - exec ${lib.getExe sway} "$@" - else - exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@" - fi - ''; -in symlinkJoin { - name = "${sway.meta.mainProgram}-${sway.version}"; - - paths = (optional withBaseWrapper baseWrapper) - ++ [ sway ]; - - strictDeps = false; - nativeBuildInputs = [ makeWrapper ] - ++ (optional withGtkWrapper wrapGAppsHook); - - buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ]; - - # We want to run wrapProgram manually - dontWrapGApps = true; - - postBuild = '' - ${optionalString withGtkWrapper "gappsWrapperArgsHook"} - - wrapProgram $out/bin/${sway.meta.mainProgram} \ - ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ - ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} - ''; - - passthru = { - inherit (sway.passthru) tests; - providedSessions = [ sway.meta.mainProgram ]; - }; - - inherit (sway) meta; -} diff --git a/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch b/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch deleted file mode 100644 index e1d7614e8bfa..000000000000 --- a/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index f01f824..e00d079 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -328,7 +328,7 @@ dependencies = [ - - [[package]] - name = "swayws" --version = "1.1.1" -+version = "1.2.0" - dependencies = [ - "clap", - "env_logger", diff --git a/pkgs/applications/window-managers/sway/ws.nix b/pkgs/applications/window-managers/sway/ws.nix deleted file mode 100644 index 999581153ac9..000000000000 --- a/pkgs/applications/window-managers/sway/ws.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchFromGitLab, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "swayws"; - version = "1.2.0"; - - src = fetchFromGitLab { - owner = "w0lff"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; - }; - - cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo="; - # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1 - cargoPatches = [ - ./ws-update-Cargo-lock.patch - ]; - - # swayws does not have any tests - doCheck = false; - - meta = with lib; { - description = "A sway workspace tool which allows easy moving of workspaces to and from outputs"; - homepage = "https://gitlab.com/w0lff/swayws"; - license = licenses.mit; - maintainers = [ maintainers.atila ]; - }; -} diff --git a/pkgs/applications/window-managers/sway/wsr.nix b/pkgs/applications/window-managers/sway/wsr.nix deleted file mode 100644 index 23a82bd2df08..000000000000 --- a/pkgs/applications/window-managers/sway/wsr.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, libxcb, python3 }: - -rustPlatform.buildRustPackage rec { - pname = "swaywsr"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "pedroscaff"; - repo = pname; - rev = "0276b43824af5c40085248c1275feaa372c412a5"; - sha256 = "sha256-KCMsn9uevmmjHkP4zwfaWSUI10JgT3M91iqmXI9Cv2Y="; - }; - - cargoSha256 = "sha256-j/9p28ezy8m5NXReOmG1oryWd+GcY/fNW6i7OrEvjSc="; - - nativeBuildInputs = [ python3 ]; - buildInputs = [ libxcb ]; - - # has not tests - doCheck = false; - - meta = with lib; { - description = "Automatically change sway workspace names based on their contents"; - longDescription = '' - Automatically sets the workspace names to match the windows on the workspace. - The chosen name for a workspace is a composite of the app_id or WM_CLASS X11 - window property for each window in a workspace. - ''; - homepage = "https://github.com/pedroscaff/swaywsr"; - license = licenses.mit; - maintainers = [ maintainers.sebbadk ]; - }; -} diff --git a/pkgs/by-name/sw/sway-assign-cgroups/package.nix b/pkgs/by-name/sw/sway-assign-cgroups/package.nix new file mode 100644 index 000000000000..c420a32cf37b --- /dev/null +++ b/pkgs/by-name/sw/sway-assign-cgroups/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "sway-assign-cgroups"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "alebastr"; + repo = "sway-systemd"; + rev = "v${version}"; + sha256 = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; + }; + format = "other"; + + propagatedBuildInputs = with python3Packages; [ dbus-next i3ipc psutil tenacity xlib ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp src/assign-cgroups.py $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + description = "Place GUI applications into systemd scopes for systemd-oomd compatibility."; + longDescription = '' + Automatically assign a dedicated systemd scope to the GUI applications + launched in the same cgroup as the compositor. This could be helpful for + implementing cgroup-based resource management and would be necessary when + `systemd-oomd` is in use. + + Limitations: The script is using i3ipc window:new event to detect application + launches and would fail to detect background apps or special surfaces. + Therefore it's recommended to supplement the script with use of systemd user + services for such background apps. + ''; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/pkgs/by-name/sw/sway-unwrapped/fix-paths.patch b/pkgs/by-name/sw/sway-unwrapped/fix-paths.patch new file mode 100644 index 000000000000..c52f65b146b7 --- /dev/null +++ b/pkgs/by-name/sw/sway-unwrapped/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/sway/config.c ++++ b/sway/config.c +@@ -276,7 +276,7 @@ + + if (!(config->active_bar_modifiers = create_list())) goto cleanup; + +- if (!(config->swaybg_command = strdup("swaybg"))) goto cleanup; ++ if (!(config->swaybg_command = strdup("@swaybg@/bin/swaybg"))) goto cleanup; + + if (!(config->config_chain = create_list())) goto cleanup; + config->current_config_path = NULL; diff --git a/pkgs/by-name/sw/sway-unwrapped/load-configuration-from-etc.patch b/pkgs/by-name/sw/sway-unwrapped/load-configuration-from-etc.patch new file mode 100644 index 000000000000..46a170abc04a --- /dev/null +++ b/pkgs/by-name/sw/sway-unwrapped/load-configuration-from-etc.patch @@ -0,0 +1,48 @@ +From 92283df3acbffa5c1bb21f23cdd686113d905114 Mon Sep 17 00:00:00 2001 +From: Patrick Hilhorst +Date: Wed, 31 Mar 2021 21:14:13 +0200 +Subject: [PATCH] Load configs from /etc but fallback to /nix/store + +This change will load all configuration files from /etc, to make it easy +to override them, but fallback to /nix/store/.../etc/sway/config to make +Sway work out-of-the-box with the default configuration on non NixOS +systems. + +Original patch by Michael Weiss, updated for Sway 1.6 by Patrick Hilhorst + +Co-authored-by: Michael Weiss +--- + meson.build | 3 ++- + sway/config.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index b7a29660..8ae8ceb3 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,8 @@ if scdoc.found() + endforeach + endif + +-add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') ++add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') ++add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') + + version = '"@0@"'.format(meson.project_version()) + git = find_program('git', native: true, required: false) +diff --git a/sway/config.c b/sway/config.c +index 76b9ec08..fb5b51aa 100644 +--- a/sway/config.c ++++ b/sway/config.c +@@ -374,7 +374,8 @@ static char *get_config_path(void) { + { .prefix = home, .config_folder = ".i3"}, + { .prefix = config_home, .config_folder = "i3"}, + { .prefix = SYSCONFDIR, .config_folder = "sway"}, +- { .prefix = SYSCONFDIR, .config_folder = "i3"} ++ { .prefix = SYSCONFDIR, .config_folder = "i3"}, ++ { .prefix = NIX_SYSCONFDIR, .config_folder = "sway"}, + }; + + size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]); +-- +2.30.1 diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix new file mode 100644 index 000000000000..452925beeabb --- /dev/null +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -0,0 +1,104 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg +, meson, ninja, pkg-config, wayland-scanner, scdoc +, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev +, pango, cairo, libinput, gdk-pixbuf, librsvg +, wlroots_0_16, wayland-protocols, libdrm +, nixosTests +# Used by the NixOS module: +, isNixOS ? false +, enableXWayland ? true, xorg +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, trayEnabled ? systemdSupport +}: + +let + wlroots = wlroots_0_16; +in +stdenv.mkDerivation (finalAttrs: { + pname = "sway-unwrapped"; + version = "1.8.1"; + + inherit enableXWayland isNixOS systemdSupport trayEnabled; + src = fetchFromGitHub { + owner = "swaywm"; + repo = "sway"; + rev = finalAttrs.version; + hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; + }; + + patches = [ + ./load-configuration-from-etc.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit swaybg; + }) + + (fetchpatch { + name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"; + url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff"; + hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0="; + }) + ] ++ lib.optionals (!finalAttrs.isNixOS) [ + # References to /nix/store/... will get GC'ed which causes problems when + # copying the default configuration: + ./sway-config-no-nix-store-references.patch + ] ++ lib.optionals finalAttrs.isNixOS [ + # Use /run/current-system/sw/share and /etc instead of /nix/store + # references: + ./sway-config-nixos-paths.patch + ]; + + strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson ninja pkg-config wayland-scanner scdoc + ]; + + buildInputs = [ + libGL wayland libxkbcommon pcre2 json_c libevdev + pango cairo libinput gdk-pixbuf librsvg + wayland-protocols libdrm + (wlroots.override { inherit (finalAttrs) enableXWayland; }) + ] ++ lib.optionals finalAttrs.enableXWayland [ + xorg.xcbutilwm + ]; + + mesonFlags = let + # The "sd-bus-provider" meson option does not include a "none" option, + # but it is silently ignored iff "-Dtray=disabled". We use "basu" + # (which is not in nixpkgs) instead of "none" to alert us if this + # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 + # assert trayEnabled -> systemdSupport && dbusSupport; + + sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; + in + [ "-Dsd-bus-provider=${sd-bus-provider}" ] + ++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" + ++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled" + ; + + passthru.tests.basic = nixosTests.sway; + + meta = with lib; { + description = "An i3-compatible tiling Wayland compositor"; + longDescription = '' + Sway is a tiling Wayland compositor and a drop-in replacement for the i3 + window manager for X11. It works with your existing i3 configuration and + supports most of i3's features, plus a few extras. + Sway allows you to arrange your application windows logically, rather + than spatially. Windows are arranged into a grid by default which + maximizes the efficiency of your screen and can be quickly manipulated + using only the keyboard. + ''; + homepage = "https://swaywm.org"; + changelog = "https://github.com/swaywm/sway/releases/tag/${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos synthetica ]; + mainProgram = "sway"; + }; +}) diff --git a/pkgs/by-name/sw/sway-unwrapped/sway-config-nixos-paths.patch b/pkgs/by-name/sw/sway-unwrapped/sway-config-nixos-paths.patch new file mode 100644 index 000000000000..bbb0f722b8bc --- /dev/null +++ b/pkgs/by-name/sw/sway-unwrapped/sway-config-nixos-paths.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +index 08703bef..f3872730 100644 +--- a/config.in ++++ b/config.in +@@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec -- + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/) ++output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -214,4 +214,4 @@ bar { + } + } + +-include @sysconfdir@/sway/config.d/* ++include /etc/sway/config.d/* diff --git a/pkgs/by-name/sw/sway-unwrapped/sway-config-no-nix-store-references.patch b/pkgs/by-name/sw/sway-unwrapped/sway-config-no-nix-store-references.patch new file mode 100644 index 000000000000..009c12959430 --- /dev/null +++ b/pkgs/by-name/sw/sway-unwrapped/sway-config-no-nix-store-references.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +--- a/config.in ++++ b/config.in +@@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper ++#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -213,5 +213,3 @@ bar { + inactive_workspace #32323200 #32323200 #5c5c5c + } + } +- +-include @sysconfdir@/sway/config.d/* + diff --git a/pkgs/by-name/sw/sway/package.nix b/pkgs/by-name/sw/sway/package.nix new file mode 100644 index 000000000000..7510e1e9582b --- /dev/null +++ b/pkgs/by-name/sw/sway/package.nix @@ -0,0 +1,63 @@ +{ lib +, sway-unwrapped +, makeWrapper, symlinkJoin, writeShellScriptBin +, withBaseWrapper ? true, extraSessionCommands ? "", dbus +, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 +, extraOptions ? [] # E.g.: [ "--verbose" ] +# Used by the NixOS module: +, isNixOS ? false + +, enableXWayland ? true +, dbusSupport ? true +}: + +assert extraSessionCommands != "" -> withBaseWrapper; + +with lib; + +let + sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); + baseWrapper = writeShellScriptBin sway.meta.mainProgram '' + set -o errexit + if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then + export XDG_CURRENT_DESKTOP=${sway.meta.mainProgram} + ${extraSessionCommands} + export _SWAY_WRAPPER_ALREADY_EXECUTED=1 + fi + if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then + export DBUS_SESSION_BUS_ADDRESS + exec ${lib.getExe sway} "$@" + else + exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@" + fi + ''; +in symlinkJoin { + name = "${sway.meta.mainProgram}-${sway.version}"; + + paths = (optional withBaseWrapper baseWrapper) + ++ [ sway ]; + + strictDeps = false; + nativeBuildInputs = [ makeWrapper ] + ++ (optional withGtkWrapper wrapGAppsHook); + + buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ]; + + # We want to run wrapProgram manually + dontWrapGApps = true; + + postBuild = '' + ${optionalString withGtkWrapper "gappsWrapperArgsHook"} + + wrapProgram $out/bin/${sway.meta.mainProgram} \ + ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ + ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} + ''; + + passthru = { + inherit (sway.passthru) tests; + providedSessions = [ sway.meta.mainProgram ]; + }; + + inherit (sway) meta; +} diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix new file mode 100644 index 000000000000..aa5d12cdfc4f --- /dev/null +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config, scdoc +, wayland, wayland-protocols, cairo, gdk-pixbuf +, wayland-scanner +}: + +stdenv.mkDerivation rec { + pname = "swaybg"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "swaybg"; + rev = "v${version}"; + hash = "sha256-Qk5iGALlSVSzgBJzYzyLdLHhj/Zq1R4nFseACBmIBuA="; + }; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; + buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; + + mesonFlags = [ + "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + ]; + + meta = with lib; { + description = "Wallpaper tool for Wayland compositors"; + inherit (src.meta) homepage; + longDescription = '' + A wallpaper utility for Wayland compositors, that is compatible with any + Wayland compositor which implements the following Wayland protocols: + wlr-layer-shell, xdg-output, and xdg-shell. + ''; + license = licenses.mit; + mainProgram = "swaybg"; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/sw/swaycons/package.nix b/pkgs/by-name/sw/swaycons/package.nix new file mode 100644 index 000000000000..c990a2bb5186 --- /dev/null +++ b/pkgs/by-name/sw/swaycons/package.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "swaycons"; + version = "unstable-2023-01-05"; + + src = fetchFromGitHub { + owner = "ActuallyAllie"; + repo = "swaycons"; + rev = "e863599fb56177fc9747d60db661be2d7c2d290b"; + hash = "sha256-zkCpZ3TehFKNePtSyFaEk+MA4mi1+la9yFjRPFy+eq8="; + }; + + cargoSha256 = "sha256-GcoRx52dwL/ehJ1Xg6xQHVzPIKXWqBrG7IjzxRjfgqA="; + + meta = with lib; { + description = "Window Icons in Sway with Nerd Fonts!"; + homepage = "https://github.com/ActuallyAllie/swaycons"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aacebedo ]; + }; +} diff --git a/pkgs/by-name/sw/swayest-workstyle/package.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix new file mode 100644 index 000000000000..2867db53f371 --- /dev/null +++ b/pkgs/by-name/sw/swayest-workstyle/package.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "swayest-workstyle"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "Lyr-7D1h"; + repo = "swayest_workstyle"; + rev = version; + sha256 = "sha256-Dk6rAiz7PXUfyy9fWMtSVRjaWWl66n38gTNyWKqeqkU="; + }; + + cargoHash = "sha256-sLQPq3tyWq1TxxeFyg05qBt+KGI/vO0jLU7wJLiqcYA="; + + doCheck = false; # No tests + + meta = with lib; { + description = "Map sway workspace names to icons defined depending on the windows inside of the workspace"; + homepage = "https://github.com/Lyr-7D1h/swayest_workstyle"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ miangraham ]; + mainProgram = "sworkstyle"; + }; +} diff --git a/pkgs/by-name/sw/swayfx/package.nix b/pkgs/by-name/sw/swayfx/package.nix new file mode 100644 index 000000000000..d8ca9cfb7f48 --- /dev/null +++ b/pkgs/by-name/sw/swayfx/package.nix @@ -0,0 +1,43 @@ +{ fetchFromGitHub, lib, sway-unwrapped }: + +sway-unwrapped.overrideAttrs (oldAttrs: rec { + pname = "swayfx"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "WillPower3309"; + repo = "swayfx"; + rev = version; + sha256 = "sha256-Gwewb0yDVhEBrefSSGDf1hLtpWcntzifPCPJQhqLqI0="; + }; + + # This patch was backported into SwayFX + # remove when next release is rebased on Sway 1.9 + patches = + let + removePatches = [ + "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch" + ]; + in + builtins.filter + (patch: !builtins.elem (patch.name or null) removePatches) + (oldAttrs.patches or [ ]); + + + meta = with lib; { + description = "Sway, but with eye candy!"; + homepage = "https://github.com/WillPower3309/swayfx"; + license = licenses.mit; + maintainers = with maintainers; [ eclairevoyant ricarch97 ]; + platforms = platforms.linux; + mainProgram = "sway"; + + longDescription = '' + Fork of Sway, an incredible and one of the most well established Wayland + compositors, and a drop-in replacement for the i3 window manager for X11. + SwayFX adds extra options and effects to the original Sway, such as rounded corners, + shadows and inactive window dimming to bring back some of the Picom X11 + compositor functionality, which was commonly used with the i3 window manager. + ''; + }; +}) diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix new file mode 100644 index 000000000000..0ee08dc7ca1d --- /dev/null +++ b/pkgs/by-name/sw/swayidle/package.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config, scdoc, wayland-scanner +, wayland, wayland-protocols, runtimeShell +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +}: + +stdenv.mkDerivation rec { + pname = "swayidle"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "swayidle"; + rev = version; + hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg="; + }; + + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; + buildInputs = [ wayland wayland-protocols ] + ++ lib.optionals systemdSupport [ systemd ]; + + mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; + + postPatch = '' + substituteInPlace main.c \ + --replace '"sh"' '"${runtimeShell}"' + ''; + + meta = with lib; { + description = "Idle management daemon for Wayland"; + inherit (src.meta) homepage; + longDescription = '' + Sway's idle management daemon. It is compatible with any Wayland + compositor which implements the KDE idle protocol. + ''; + license = licenses.mit; + mainProgram = "swayidle"; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/sw/swaylock-effects/package.nix b/pkgs/by-name/sw/swaylock-effects/package.nix new file mode 100644 index 000000000000..c5dbf3766f06 --- /dev/null +++ b/pkgs/by-name/sw/swaylock-effects/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland +, wayland-protocols +, wayland-scanner +, libxkbcommon +, cairo +, gdk-pixbuf +, pam +}: + +stdenv.mkDerivation rec { + pname = "swaylock-effects"; + version = "1.7.0.0"; + + src = fetchFromGitHub { + owner = "jirutka"; + repo = "swaylock-effects"; + rev = "v${version}"; + sha256 = "sha256-cuFM+cbUmGfI1EZu7zOsQUj4rA4Uc4nUXcvIfttf9zE="; + }; + + postPatch = '' + sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build + ''; + + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner]; + buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; + + mesonFlags = [ + "-Dpam=enabled" + "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" + ]; + + meta = with lib; { + description = "Screen locker for Wayland"; + longDescription = '' + Swaylock, with fancy effects + ''; + mainProgram = "swaylock"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ gnxlxnxx ]; + }; +} diff --git a/pkgs/by-name/sw/swaylock-fancy/package.nix b/pkgs/by-name/sw/swaylock-fancy/package.nix new file mode 100644 index 000000000000..83d56def4dcc --- /dev/null +++ b/pkgs/by-name/sw/swaylock-fancy/package.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, grim +, gawk +, jq +, swaylock +, imagemagick +, getopt +, fontconfig +, wmctrl +, makeWrapper +, bash +}: + +let + depsPath = lib.makeBinPath [ + coreutils + grim + gawk + jq + swaylock + imagemagick + getopt + fontconfig + wmctrl + ]; + mainProgram = "swaylock-fancy"; +in + +stdenv.mkDerivation { + pname = "swaylock-fancy"; + version = "unstable-2023-11-21"; + + src = fetchFromGitHub { + owner = "Big-B"; + repo = "swaylock-fancy"; + rev = "ff37ae3c6d0f100f81ff64fdb9d422c37de2f4f6"; + hash = "sha256-oS4YCbZOIrMP4QSM5eHWzTn18k3w2OnJ2k+64x/DnuM="; + }; + + postPatch = '' + substituteInPlace ${mainProgram} \ + --replace "/usr/share" "$out/share" + ''; + + strictDeps = true; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postInstall = '' + wrapProgram $out/bin/${mainProgram} \ + --prefix PATH : "${depsPath}" + ''; + + meta = with lib; { + description = "This is an swaylock bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; + homepage = "https://github.com/Big-B/swaylock-fancy"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ frogamic ]; + inherit mainProgram; + }; +} diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix new file mode 100644 index 000000000000..0b438df13d28 --- /dev/null +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkg-config, scdoc, wayland-scanner +, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam +}: + +stdenv.mkDerivation rec { + pname = "swaylock"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "swaylock"; + rev = "v${version}"; + hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; + }; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; + buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; + + mesonFlags = [ + "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + ]; + + meta = with lib; { + description = "Screen locker for Wayland"; + longDescription = '' + swaylock is a screen locking utility for Wayland compositors. + Important note: If you don't use the Sway module (programs.sway.enable) + you need to set "security.pam.services.swaylock = {};" manually. + ''; + inherit (src.meta) homepage; + mainProgram = "swaylock"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix new file mode 100644 index 000000000000..b2a7b17b4315 --- /dev/null +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -0,0 +1,71 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, cargo +, coreutils +, gtk-layer-shell +, libevdev +, libinput +, libpulseaudio +, meson +, ninja +, rustc +, stdenv +, udev +}: + +stdenv.mkDerivation rec { + pname = "swayosd"; + version = "unstable-2023-07-18"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwayOSD"; + rev = "b14c83889c7860c174276d05dec6554169a681d9"; + hash = "sha256-MJuTwEI599Y7q+0u0DMxRYaXsZfpksc2csgnK9Ghp/E="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-pExpzQwuHREhgkj+eZ8drBVsh/B3WiQBBh906O6ymFw="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + pkg-config + meson + rustc + cargo + ninja + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + gtk-layer-shell + libevdev + libinput + libpulseaudio + udev + ]; + + patches = [ + ./swayosd_systemd_paths.patch + ]; + + postPatch = '' + substituteInPlace data/udev/99-swayosd.rules \ + --replace /bin/chgrp ${coreutils}/bin/chgrp \ + --replace /bin/chmod ${coreutils}/bin/chmod + ''; + + meta = with lib; { + description = "A GTK based on screen display for keyboard shortcuts"; + homepage = "https://github.com/ErikReider/SwayOSD"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/sw/swayosd/swayosd_systemd_paths.patch b/pkgs/by-name/sw/swayosd/swayosd_systemd_paths.patch new file mode 100644 index 000000000000..189c761e9d36 --- /dev/null +++ b/pkgs/by-name/sw/swayosd/swayosd_systemd_paths.patch @@ -0,0 +1,24 @@ +diff --git a/data/meson.build b/data/meson.build +index fc687a5..68decdf 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,6 @@ + datadir = get_option('datadir') + sysconfdir = get_option('sysconfdir') ++libdir = get_option('libdir') + + # LICENSE + install_data( +@@ -41,11 +42,7 @@ configure_file( + + # Systemd service unit + systemd = dependency('systemd', required: false) +-if systemd.found() +- systemd_service_install_dir = systemd.get_variable(pkgconfig :'systemdsystemunitdir') +-else +- systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') +-endif ++systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') + + configure_file( + configuration: conf_data, diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix new file mode 100644 index 000000000000..999581153ac9 --- /dev/null +++ b/pkgs/by-name/sw/swayws/package.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayws"; + version = "1.2.0"; + + src = fetchFromGitLab { + owner = "w0lff"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; + }; + + cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo="; + # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1 + cargoPatches = [ + ./ws-update-Cargo-lock.patch + ]; + + # swayws does not have any tests + doCheck = false; + + meta = with lib; { + description = "A sway workspace tool which allows easy moving of workspaces to and from outputs"; + homepage = "https://gitlab.com/w0lff/swayws"; + license = licenses.mit; + maintainers = [ maintainers.atila ]; + }; +} diff --git a/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch b/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch new file mode 100644 index 000000000000..e1d7614e8bfa --- /dev/null +++ b/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index f01f824..e00d079 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -328,7 +328,7 @@ dependencies = [ + + [[package]] + name = "swayws" +-version = "1.1.1" ++version = "1.2.0" + dependencies = [ + "clap", + "env_logger", diff --git a/pkgs/by-name/sw/swaywsr/package.nix b/pkgs/by-name/sw/swaywsr/package.nix new file mode 100644 index 000000000000..23a82bd2df08 --- /dev/null +++ b/pkgs/by-name/sw/swaywsr/package.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, rustPlatform, libxcb, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "swaywsr"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "pedroscaff"; + repo = pname; + rev = "0276b43824af5c40085248c1275feaa372c412a5"; + sha256 = "sha256-KCMsn9uevmmjHkP4zwfaWSUI10JgT3M91iqmXI9Cv2Y="; + }; + + cargoSha256 = "sha256-j/9p28ezy8m5NXReOmG1oryWd+GcY/fNW6i7OrEvjSc="; + + nativeBuildInputs = [ python3 ]; + buildInputs = [ libxcb ]; + + # has not tests + doCheck = false; + + meta = with lib; { + description = "Automatically change sway workspace names based on their contents"; + longDescription = '' + Automatically sets the workspace names to match the windows on the workspace. + The chosen name for a workspace is a composite of the app_id or WM_CLASS X11 + window property for each window in a workspace. + ''; + homepage = "https://github.com/pedroscaff/swaywsr"; + license = licenses.mit; + maintainers = [ maintainers.sebbadk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75e7407c904e..e4736778d84b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32650,33 +32650,12 @@ with pkgs; wlroots_0_16 wlroots; - sway-unwrapped = callPackage ../applications/window-managers/sway { - wlroots = wlroots_0_16; - }; - sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; - swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; - swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; - swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; - swayosd = callPackage ../applications/window-managers/sway/osd.nix { }; - swayws = callPackage ../applications/window-managers/sway/ws.nix { }; - swaywsr = callPackage ../applications/window-managers/sway/wsr.nix { }; - sway-assign-cgroups = callPackage ../applications/window-managers/sway/assign-cgroups.nix { }; - sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { }); - - swaycons = callPackage ../applications/window-managers/sway/swaycons.nix { }; - - swayfx = callPackage ../applications/window-managers/sway/fx.nix { }; - - swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; - - swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; swaynag-battery = callPackage ../applications/misc/swaynag-battery { }; - swayest-workstyle = callPackage ../applications/window-managers/sway/swayest-workstyle { }; - tiramisu = callPackage ../applications/misc/tiramisu { }; rlaunch = callPackage ../applications/misc/rlaunch { }; -- cgit 1.4.1 From 33ac45a1e480db0092f8bf45fd09f6e25f649512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 09:33:47 +0000 Subject: ncspot: 0.13.4 -> 1.0.0 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index f98f45a1b5cb..553e50f16654 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.13.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg="; + hash = "sha256-NHrpJC6cF/YAcyqZ4bRQdSdjDNhkEV7U2P/S4LSADao="; }; - cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw="; + cargoHash = "sha256-HT084XewXwZByL5KZhyymqU7sy99SAjYIWysm3qGvWU="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; -- cgit 1.4.1 From e85489ea5351d25e4d8d1c7121a235ad8889655b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 09:56:33 +0000 Subject: okteta: 0.26.13 -> 0.26.14 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 72ff8ae5d605..3b20e5c815d5 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.13"; + version = "0.26.14"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0wlpv0rk4ys4rbcpf8lqpkm0yr5dxkaz60qk2lvm27w1s489ir8l"; + sha256 = "sha256-2bvspG3lecKlcN/+YPRmFKQCu/jhckafeSo272iE+9k="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; -- cgit 1.4.1 From d2458900870aae0f7df6cace865ba9ca4fb9aad2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 17 Dec 2023 05:20:40 -0500 Subject: root: 6.28.10 -> 6.30.02 (#274348) --- pkgs/applications/science/misc/root/default.nix | 18 +++++++++++++----- pkgs/applications/science/misc/root/sw_vers.patch | 13 ++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9fe06f6d7969..ee3610c5f6f6 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.28.10"; + version = "6.30.02"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-adb962B+ayC9AsdX+mIXAkwLYTLB6bHf9Nhdmiu35R4="; + hash = "sha256-eWWkVtGtHuDV/kdpv1qP7Cka9oTtk9sPMICpw2JDUYM="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -110,6 +110,13 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch + + # Fix for builtin_llvm=OFF + # https://github.com/root-project/root/pull/14238 + (fetchpatch { + url = "https://github.com/root-project/root/commit/1477d3adebf27a19f3a8b85f21c27a0a5649c7ff.diff"; + hash = "sha256-g+FqXBTWXA7t7F/rMarnmOK2014oCNnNJbHhjH+Tvjw="; + }) ]; preConfigure = '' @@ -121,7 +128,7 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' - substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \ + substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace 'add_clang_symlink(''${link} clang)' "" # Don't require textutil on macOS @@ -136,8 +143,8 @@ stdenv.mkDerivation rec { substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" '' + lib.optionalString stdenv.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks - substituteInPlace core/CMakeLists.txt \ - --replace "-F/System/Library/PrivateFrameworks" "" + substituteInPlace core/macosx/CMakeLists.txt \ + --replace "-F/System/Library/PrivateFrameworks " "" '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -184,6 +191,7 @@ stdenv.mkDerivation rec { "-Dsqlite=OFF" "-Dssl=ON" "-Dtmva=ON" + "-Dtmva-pymva=OFF" "-Dvdt=OFF" "-Dwebgui=ON" "-Dxml=ON" diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 836bbb5b17a4..54ad1091392e 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -1,8 +1,8 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake -@@ -28,17 +28,10 @@ if(CMAKE_VERSION VERSION_LESS 3.14.4) - endif() +@@ -8,17 +8,10 @@ + set(ROOT_PLATFORM macosx) if (CMAKE_SYSTEM_NAME MATCHES Darwin) - EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" @@ -19,7 +19,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #TODO: check haveconfig and rpath -> set rpath true #TODO: check Thread, define link command #TODO: more stuff check configure script -@@ -57,22 +50,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -37,22 +30,7 @@ SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") @@ -42,7 +42,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake if (CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common") -@@ -130,7 +108,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -96,7 +74,6 @@ endif() #---Set Linker flags---------------------------------------------------------------------- @@ -53,7 +53,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in +++ b/config/root-config.in -@@ -312,12 +312,6 @@ macosxicc) +@@ -307,12 +307,6 @@ ;; macosx64|macosxarm64) # MacOS X with gcc (GNU cc v4.x) in 64 bit mode @@ -66,7 +66,7 @@ diff a/config/root-config.in b/config/root-config.in auxcflags="${cxxversionflag} -m64" auxldflags="-m64" auxlibs="-lm -ldl" -@@ -378,18 +372,11 @@ freebsd* | openbsd* | linux*) +@@ -387,17 +381,11 @@ done ;; macosx*) @@ -74,7 +74,6 @@ diff a/config/root-config.in b/config/root-config.in auxcflags="-pthread $auxcflags" auxlibs="-lpthread $auxlibs" - else -- auxcflags="-D_REENTRANT $auxcflags" - auxlibs="-lpthread $auxlibs" - fi for f in $features ; do -- cgit 1.4.1 From a4f5ccfba449c39fbc8fd0f83cf0120fc897c96c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 10:24:05 +0000 Subject: op-geth: 1.101304.0 -> 1.101304.2 --- pkgs/applications/blockchains/optimism/geth.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index a028c8e85844..66a446d526ad 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "op-geth"; - version = "1.101304.0"; + version = "1.101304.2"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "op-geth"; rev = "v${version}"; - hash = "sha256-MpLkAAYQmceabVChixF1yqvGSoRm+A9p9mOeKHhqxQE="; + hash = "sha256-cGCgcwP/9xSpVo2UJAArptF5KEflo7SSdfg5WYUMuxY="; fetchSubmodules = true; }; @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/utils" ]; - vendorHash = "sha256-JIuS2qWFf9g5MIJP6jVTSAkPG15XCDeMHcoYeJQz7Og="; + vendorHash = "sha256-F0OANE4S7WJDYKpJ6mCnR38CPyOov0Hxc0gK1MGHcIg="; # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = -- cgit 1.4.1