diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 6e6d5ef3face..19ad077dd919 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -12,10 +12,37 @@ let inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages; inherit nixos-background-dark nixos-background-light; }; + + nixos-background-info = pkgs.writeTextFile { + name = "nixos-background-info"; + text = '' + + + + + Nineish + ${nixos-background-light.gnomeFilePath} + zoom + solid + #d1dcf8 + #e3ebfe + + + Nineish Dark Gray + ${nixos-background-dark.gnomeFilePath} + zoom + solid + #151515 + #262626 + + + ''; + destination = "/share/gnome-background-properties/nixos.xml"; + }; in { options = { services.xserver.desktopManager.budgie = { - enable = mkEnableOption (mdDoc "Budgie desktop"); + enable = mkEnableOption (mdDoc "the Budgie desktop"); sessionPath = mkOption { description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart."; @@ -35,6 +62,12 @@ in { type = with types; listOf path; default = []; }; + + extraPlugins = mkOption { + description = mdDoc "Extra plugins for the Budgie desktop"; + type = with types; listOf package; + default = []; + }; }; environment.budgie.excludePackages = mkOption { @@ -76,12 +109,12 @@ in { # Budgie Desktop. budgie.budgie-backgrounds budgie.budgie-control-center - budgie.budgie-desktop + (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie.budgie-desktop-view budgie.budgie-screensaver # Required by the Budgie Desktop session. - (gnome.gnome-session.override {gnomeShellSupport = false;}) + (gnome.gnome-session.override { gnomeShellSupport = false; }) # Required by Budgie Menu. gnome-menus @@ -106,6 +139,7 @@ in { # Desktop themes. qogir-theme qogir-icon-theme + nixos-background-info # Default settings. nixos-gsettings-overrides diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index b9eba74b450b..a2599572b3bf 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -20,7 +20,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; }; - services.xserver.desktopManager.budgie.enable = true; + services.xserver.desktopManager.budgie = { + enable = true; + extraPlugins = [ + pkgs.budgie.budgie-analogue-clock-applet + ]; + }; }; testScript = { nodes, ... }: diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 93b8d3203534..cecfbaca8120 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.4.0"; + version = "5.0.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8="; + sha256 = "sha256-6NyHDH16bLs+bgSbjZYm2LEzp1WkJ1nO3sdkO78/VqE="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/pkgs/applications/misc/flowtime/default.nix b/pkgs/applications/misc/flowtime/default.nix new file mode 100644 index 000000000000..e08e12032700 --- /dev/null +++ b/pkgs/applications/misc/flowtime/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, vala +, meson +, ninja +, wrapGAppsHook4 +, libadwaita +, libxml2 +, libgee +, gst_all_1 +, gobject-introspection +, desktop-file-utils +, glib +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "flowtime"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "Diego-Ivan"; + repo = "Flowtime"; + rev = "v${version}"; + hash = "sha256-op643yU7KdkTO9hT0iYTIqBP4oPe0MT1R5I3FAtN0/I="; + }; + + nativeBuildInputs = [ + desktop-file-utils + glib + gobject-introspection + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libxml2 + libgee + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + ]); + + meta = with lib; { + description = "Get what motivates you done, without losing concentration"; + homepage = "https://github.com/Diego-Ivan/Flowtime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index eb2233c16310..fbcf4c97b479 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-hwBTS6hjD66SPOPctcS2esybnVrgw77fFpt8phGt334="; + hash = "sha256-K04iIa/WnRtcHwRUHJbKqXO9c4l5xwHPvnwN5WX/Row="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 3cf85f94dbbc..0a65ecb64b2d 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "sha256-0x+MMVa9/jOVp9n9JFM1MGndh9H9MzmmHepcez4aT+Q="; + sha256 = "sha256-5k6a7/49iqtPt7il1/LlCHlQsilXRcGAJSAkJ3BBowU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 461af3ca669e..0be5dd4cae2e 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.19.0"; + version = "6.19.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - hash = "sha256-0vmRwe7PQVifm6HxgpPno9mIFcBZFtxqNdDK4V637ds="; + hash = "sha256-3nEfg2hmOMjevo5VhjelIeV2xRwkIOVhLNxBmPzdWog="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d0d25383099f..d59f46fcce8c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -146,11 +146,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-J17jzgCTCG87Cieci/TrMpEUxA4Ynfm1+Cr4fRjDtNY=", + "hash": "sha256-cEi/B5vZWQDdne4SlTwoObt+eUsmTdyG8bH6YHPo4IA=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.6", + "rev": "v1.19.7", "spdx": "MPL-2.0", "vendorHash": null }, @@ -466,13 +466,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-cCluXspcWsRzuo+mP6Hk0VXtrP7zA5TGV1LCf3xuvhw=", + "hash": "sha256-vfH+KIOv/DXv4fUzUATgoL6s69NqGVP8Dn7aoEPfe8g=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.37.2", + "rev": "v1.38.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Mv3BKYS1j5AAHbXVCP5C3OQpEmOBea2ru3ONbJ0pYyc=" + "vendorHash": "sha256-MlqnDcig8/uiF8pNuEkTveN7kgsGEs4XOe5z4/a+Fm0=" }, "gridscale": { "hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=", @@ -530,13 +530,13 @@ "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { - "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=", + "hash": "sha256-PNgiyawIMSkuZmC0jXiuqHp3qKNfJ0NgMijEQzTg+ow=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.2.1", + "rev": "v3.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" + "vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg=" }, "huaweicloud": { "hash": "sha256-VK/b74pGB8vjaWmUi8Zz4K5utIUYlfeYk18YZF8J1jI=", @@ -665,13 +665,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=", + "hash": "sha256-Z8mllx/TO0EUQNSOGcUhMRAsV7jiUhybzYDPg2ZtUec=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v1.30.0", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM=" + "vendorHash": "sha256-Xbnf8ejyojd3JD7h580hlM0PC4nD+sjpodV9hr0/F+c=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -1026,11 +1026,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-/9TTK33XwMW8izM35y9sOZOKFc6/HC2/CCnX3JMzY3I=", + "hash": "sha256-ScGBo04qWjSuYXKHynn/rpd+2iKf+K+musYt/eWJfok=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.62.0", + "rev": "v0.63.0", "spdx": "MIT", "vendorHash": "sha256-3Ry+XQxF39lXr3Ev+KOx0GatVbD0Sjs9Jai1VPjEDBE=" }, diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 0203128e6bad..0e84601e7306 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.3.2"; + version = "3.3.4"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-UATtfJPpB0twIh6vsgfMSbu9S0F36l+PQgpWYDBmy4M="; + hash = "sha256-qCMQEor+R+feXbndG7RZ9HBa/n6Lu0vkQ+tvF/R+148="; }; - vendorHash = "sha256-XJracr2oblyVid6QKri0EUr5LrEgA3w27PPqbqWcNh8="; + vendorHash = "sha256-7PSWMf4z/NjAyWUXpWoNHdngMN9anOvPu+F+o8O27zs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 0c028a4a046f..1400be78b9f5 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -13,6 +13,7 @@ , libXrandr , pkg-config , zlib +, Accelerate , AGL , Cocoa , Foundation @@ -43,18 +44,19 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ] ++ (if stdenv.isDarwin then [ - AGL - Cocoa - Foundation - zlib - ] else [ - libX11 - libXcursor - libXext - libXft - libXinerama - libXrandr - ]); + Accelerate + AGL + Cocoa + Foundation + zlib + ] else [ + libX11 + libXcursor + libXext + libXft + libXinerama + libXrandr + ]); doCheck = false; diff --git a/pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix new file mode 100644 index 000000000000..798992886b9b --- /dev/null +++ b/pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, budgie-desktop +, gtk3 +, libpeas +}: + +stdenv.mkDerivation rec { + pname = "budgie-analogue-clock-applet"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "samlane-ma"; + repo = "analogue-clock-applet"; + rev = "v${version}"; + hash = "sha256-yId5bbdmELinBmZ5eISa5hQSYkeZCkix2FJ287GdcCs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + budgie-desktop + gtk3 + libpeas + ]; + + meta = with lib; { + description = "Analogue Clock Applet for the Budgie desktop"; + homepage = "https://github.com/samlane-ma/analogue-clock-applet"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.federicoschonborn ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 252f4cbd38d4..6c593206ac51 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ww65J9plixbxFza6xCfaz1WYtT9giKkLVH1XYxH41+0="; }; + patches = [ + ./plugins.patch + ]; + nativeBuildInputs = [ docbook-xsl-nons gtk-doc diff --git a/pkgs/desktops/budgie/budgie-desktop/plugins.patch b/pkgs/desktops/budgie/budgie-desktop/plugins.patch new file mode 100644 index 000000000000..af03fb635140 --- /dev/null +++ b/pkgs/desktops/budgie/budgie-desktop/plugins.patch @@ -0,0 +1,66 @@ +diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala +index d3cdb65c..9d569bd1 100644 +--- a/src/panel/plugin_manager.vala ++++ b/src/panel/plugin_manager.vala +@@ -40,10 +40,26 @@ namespace Budgie { + } + + /* System path */ +- var dir = Environment.get_user_data_dir(); +- engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY); ++ var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR"); ++ if (libdir != null) { ++ debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir); ++ } else { ++ debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY); ++ libdir = Budgie.MODULE_DIRECTORY; ++ } ++ ++ var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR"); ++ if (datadir != null) { ++ debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir); ++ } else { ++ debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY); ++ datadir = Budgie.MODULE_DATA_DIRECTORY; ++ } ++ ++ engine.add_search_path(libdir, datadir); + + /* User path */ ++ var dir = Environment.get_user_data_dir(); + var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins"); + var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data"); + engine.add_search_path(user_mod, hdata); +diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala +index b0814693..d671109a 100644 +--- a/src/raven/plugin_manager.vala ++++ b/src/raven/plugin_manager.vala +@@ -51,10 +51,26 @@ namespace Budgie { + } + + /* System path */ +- var dir = Environment.get_user_data_dir(); +- engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR); ++ var libdir = Environment.get_variable("RAVEN_PLUGIN_LIBDIR"); ++ if (libdir != null) { ++ debug("RAVEN_PLUGIN_LIBDIR is set to %s", libdir); ++ } else { ++ debug("RAVEN_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_LIBDIR); ++ libdir = Budgie.RAVEN_PLUGIN_LIBDIR; ++ } ++ ++ var datadir = Environment.get_variable("RAVEN_PLUGIN_DATADIR"); ++ if (datadir != null) { ++ debug("RAVEN_PLUGIN_DATADIR is set to %s", datadir); ++ } else { ++ debug("RAVEN_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_DATADIR); ++ datadir = Budgie.RAVEN_PLUGIN_DATADIR; ++ } ++ ++ engine.add_search_path(libdir, datadir); + + /* User path */ ++ var dir = Environment.get_user_data_dir(); + var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins"); + var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-data"); + engine.add_search_path(user_mod, hdata); diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix new file mode 100644 index 000000000000..88c8d132bf12 --- /dev/null +++ b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, glib +, xorg +, wrapGAppsHook +, budgie-desktop +, plugins ? [] +}: + +stdenv.mkDerivation { + pname = "${budgie-desktop.pname}-with-plugins"; + inherit (budgie-desktop) version; + + src = null; + + paths = [ + budgie-desktop + ] ++ plugins; + + passAsFile = [ "paths" ]; + + nativeBuildInputs = [ + glib + wrapGAppsHook + ]; + + buildInputs = lib.forEach plugins (plugin: plugin.buildInputs) ++ plugins; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + preferLocalBuild = true; + allowSubstitutes = false; + + installPhase = '' + mkdir -p $out + for i in $(cat $pathsPath); do + ${xorg.lndir}/bin/lndir -silent $i $out + done + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set BUDGIE_PLUGIN_LIBDIR "$out/lib/budgie-desktop/plugins" + --set BUDGIE_PLUGIN_DATADIR "$out/share/budgie-desktop/plugins" + --set RAVEN_PLUGIN_LIBDIR "$out/lib/budgie-desktop/raven-plugins" + --set RAVEN_PLUGIN_DATADIR "$out/share/budgie-desktop/raven-plugins" + ) + ''; + + inherit (budgie-desktop) meta; +} diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix index c9e2632b62f9..6516498dea89 100644 --- a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix +++ b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix @@ -31,24 +31,23 @@ let font-name="Noto Sans 10" document-font-name="Noto Sans 10" monospace-font-name="Hack 10" - enable-hot-corners=true [org.gnome.desktop.wm.preferences:Budgie] titlebar-font="Noto Sans Bold 10" - [org.gnome.mutter:Budgie] - workspaces-only-on-primary=true + [com.solus-project.budgie-menu:Budgie] + use-default-menu-icon=true [com.solus-project.budgie-panel:Budgie] dark-theme=false builtin-theme=false [com.solus-project.icon-tasklist:Budgie] - pinned-launchers=["nemo.desktop", "vlc.desktop", "mate-terminal.desktop"] + pinned-launchers=["nemo.desktop", "firefox.desktop", "vlc.desktop"] [org.buddiesofbudgie.budgie-desktop-view:Budgie] show=true - click-policy="double" + show-active-mounts=true terminal="${mate.mate-terminal}/bin/mate-terminal" ${extraGSettingsOverrides} diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 24a461a16703..8c49ac5b0234 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -1,10 +1,12 @@ { lib, pkgs }: lib.makeScope pkgs.newScope (self: with self; { + budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; budgie-backgrounds = callPackage ./budgie-backgrounds { }; budgie-control-center = callPackage ./budgie-control-center { }; budgie-desktop = callPackage ./budgie-desktop { }; budgie-desktop-view = callPackage ./budgie-desktop-view { }; + budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { }; budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; budgie-screensaver = callPackage ./budgie-screensaver { }; }) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index b0832180b38d..efcbffd92700 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , meson , ninja , pkg-config @@ -39,13 +38,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "44.0"; + version = "44.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "V7meu44rnBUS04HlMJYYjAh7M0ENbFLYeie9YO52rH8="; + sha256 = "NggCpZXj7brZYsjOo1O2K6qL5AdRO1FiyJyTPKU4eqk="; }; patches = [ @@ -57,14 +56,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tracker; }) - - # Fix crash during search after "copy"/"cut" action selection - # Can be removed in 44.1 - # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1155 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/f0f6c372802aabe7ba098d3af1f81cbc03eba27b.patch"; - sha256 = "mlrLvNgDQvi4maa81ozu6DsDBVx9NrsgYzWN+oSboVQ="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index fbc84ce8351d..635422fd9b99 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -6,7 +6,7 @@ , qhull , flann , boost -, vtk_8 +, vtk , eigen , pkg-config , qtbase @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libpng libtiff qhull - vtk_8 + vtk ]; cmakeFlags = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index bab8fc8e1914..50ebbd4fc8be 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.4.3"; + version = "23.4.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dfalOFksqrOOhoQz2VCeEFS10Sqr7qmjgH7Rgb2YCeY="; + hash = "sha256-b96tfdr/Ya8qK3e+/sXWjlsi8gExX5f/5WgQxWuQfq8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index d6e95d433662..3ea1d0d89a8c 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.4.0"; + version = "23.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qpPoE5QSm6JwBG3842gjxGeSd87yY2/T/HFi4k8U/qY="; + hash = "sha256-RuyOhFerWSJ/JEQTruv1gh/ieO2X99E33VW28assflY="; }; nativeBuildInputs = [ @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; homepage = "https://github.com/greenbone/python-gvm"; + changelog = "https://github.com/greenbone/python-gvm/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix new file mode 100644 index 000000000000..58ab010eb969 --- /dev/null +++ b/pkgs/development/python-modules/torchio/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, deprecated +, humanize +, matplotlib +, nibabel +, numpy +, parameterized +, scipy +, simpleitk +, torch +, tqdm +, typer +}: + +buildPythonPackage rec { + pname = "torchio"; + version = "0.18.90"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fepegar"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-h8cvNhOkjMMbQ6Nry8FKtwnK+yhRYRGjXi/xp0i5yyY="; + }; + + propagatedBuildInputs = [ + deprecated + humanize + nibabel + numpy + scipy + simpleitk + torch + tqdm + typer + ] ++ typer.passthru.optional-dependencies.all; + + nativeCheckInputs = [ pytestCheckHook matplotlib parameterized ]; + disabledTests = [ + # tries to download models: + "test_load_all" + ] ++ lib.optionals stdenv.isAarch64 [ + # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly + "test_queue_multiprocessing" + ]; + pythonImportsCheck = [ + "torchio" + "torchio.data" + ]; + + meta = with lib; { + description = "Medical imaging toolkit for deep learning"; + homepage = "http://www.torchio.org/"; + license = licenses.asl20; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 4b2091f28820..de861b4f6a92 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.18.0"; + version = "10.18.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-fdJah0Y+VkZYI416vA8Pdr+oWnG17IhBwvMDm0vqiS0="; + sha256 = "sha256-Yy6A2lNxF3aHD6Jw/dnLt1MFiFQ9+U+cB4wVK/dWbmE="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix index 8a75ecafe954..9e97617b76f3 100644 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -2,14 +2,14 @@ let pname = "phpunit"; - version = "10.1.0"; + version = "10.1.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://phar.phpunit.de/phpunit-${version}.phar"; - hash = "sha256-1zYGgYV4BHxjBE3QcV6XP73u2JIaUzCKS70eDB7e9DQ="; + hash = "sha256-X6upMANmKU2H8Qs0pOd/uRL2GdH/JPyOAQ/P8Z5yNl8="; }; dontUnpack = true; diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 26f5c5d0f344..3c11972d83e4 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.26"; + version = "0.4.27"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-TFwuUtRJ1R0dxgCN7ExTpYMHM6IalMxnvTNUGiqEM8s="; + sha256 = "sha256-nojFHP3JhhJSzYeRGZKpUpNcVdMg21L+t6vTxIalsJs="; }; - cargoSha256 = "sha256-vfuEJC/A06d5t0uCShBljTvTxX78h/r4Us5fSPvosqE="; + cargoSha256 = "sha256-ZVi3j5FbcYYQJ5QOW1tiotiqwOjF9uv1VLHrZL0LBxc="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/development/tools/rust/cargo-lock/default.nix index b5347f46379f..01769487e536 100644 --- a/pkgs/development/tools/rust/cargo-lock/default.nix +++ b/pkgs/development/tools/rust/cargo-lock/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lock"; - version = "8.0.3"; + version = "9.0.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Xh39gaiTC3g1FHVWqUr8PR/MzeoRaGlCmGZZZnHB4Kc="; + hash = "sha256-SMxM66qo3Xmst+SVXu4LYZ0Zzn15wqVVNqqHzAkip/s="; }; - cargoSha256 = "sha256-gf9KDzGKjZt4p5ldZShH4lOwrieJeI2WJQ8hU4hhGJE="; + cargoHash = "sha256-wUp4zBY64MvD4anGlVsJrI3pyfwVSQGnn6YuweTeYNk="; buildFeatures = [ "cli" ]; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 686ed5119191..a4d6bad29549 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.6"; + version = "0.36.7"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ln6zySZ2fMzRPGdVikPYgtT89/J3Fw56fdrEkkOU/j8="; + sha256 = "sha256-OE24RKbSWylX2dXkjBMZ8Va9ONVeMKG/BVdlZD6O+Yc="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-ntnd5vWiMxP5p/IBSWotLqNR8UseJHdSPiaxUHWpOlo="; + cargoHash = "sha256-AAZYY9CbLbbvWWMhkHOc8OhzmwSFXSL9jSga3qMbkDU="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix index 1ef82f80fdff..356f03531945 100644 --- a/pkgs/development/tools/worker-build/default.nix +++ b/pkgs/development/tools/worker-build/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-EJU6WgoGnhquHSJ1hLVK8eild7jcegeC+VxOeoD9+20="; + sha256 = "sha256-8+ifSCfHYrS5iAa4fsujmofzicbwk/00VRNZvIkIc+E="; }; - cargoHash = "sha256-6QzZtaqnhZ1V5UU9pppLK+LKn9EdvMJ8YOyxFYt7oos="; + cargoHash = "sha256-fj/l53AdgJXYz+IA45yfNYgSw7DKbBrGVyFCfbqxxq0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index a49ffacc5093..c7cf3bb3336a 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3920"; + version = "0.20.3990"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-SSWohyMYnaGpOa5IipUalZPsOTHV00XSY5g70LiaW/8CPCKHjM+IydVm2S2pH7x+fmnqA4P4GvfCT1O67NsrIg=="; + hash = "sha512-eewv7QkGUE66PNJh31WjxeAN+x/M9vr2qfFaF6T+W7esMv2EoHZb9FcRwzZ8GmpT/bd9LFNNahSJ3jIHdKg8KA=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix index a01712d3867b..d444eb3ddf8c 100644 --- a/pkgs/servers/rmfakecloud/default.nix +++ b/pkgs/servers/rmfakecloud/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.12"; + version = "0.0.13.2"; src = fetchFromGitHub { owner = "ddvk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xBKo+qwwgGMOb+B1aI0pwH8u8c1GNZSXfhVd4SNewdg="; + sha256 = "sha256-7lVNbqQv6MNIhHMFbH8VFVIjKiuTCbeVkAKeGprzrkw="; }; - vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A="; + vendorSha256 = "sha256-Pz/TtGjwGHaDSueBEHMtHjyAxYO5V+8jzXCowHcUW/4="; ui = callPackage ./webui.nix { inherit version src; }; diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix index 8b636baec115..f870dc013b5a 100644 --- a/pkgs/servers/rmfakecloud/webui.nix +++ b/pkgs/servers/rmfakecloud/webui.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - sha256 = "sha256-lKA3W7gXT2Dnux+sIXCluG5HxkGQgHPnCjgV/a4pjY0="; + sha256 = "sha256-37P+acjaeG7TCyLoIHIHsB+DCUOsQOJ1H9T5SgajtLc="; }; nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ]; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index c2196952e8b7..4865757f13f8 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage ( let - version = "0.78.0"; + version = "0.79.0"; pname = "nushell"; in { inherit version pname; @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage ( owner = pname; repo = pname; rev = version; - hash = "sha256-fxx34xTFan5DcKo/sxFq6JxObGFTs4myNM0WmL5hnl8="; + hash = "sha256-vnOTSXTgFxNTI4msgMQ/5E27VUKPj6nBIqPWLUeXAr4="; }; - cargoHash = "sha256-VqM6SAzYqwSSo3csjNCvcrZGwemtVHEGvh8gufouMeQ="; + cargoHash = "sha256-FqhN1t3n6j5czZ40JUFtsz4ZxTl7vpMTBhrR66M1DNw="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index 88b6b98117e9..211c18edf7b3 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zsh-nix-shell"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; rev = "v${version}"; - sha256 = "sha256-IT3wpfw8zhiNQsrw59lbSWYh0NQ1CUdUtFzRzHlURH0="; + sha256 = "sha256-B0mdmIqefbm5H8wSG1h41c/J4shA186OyqvivmSK42Q="; }; strictDeps = true; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index a38a58d57339..83bd5e948e31 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.19"; + version = "0.10.20"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-1f1AP/yitmSTeZCopGGxA8f3hIEP6cvQcm8Ie24WJ1w="; + sha256 = "sha256-KHXboxaLHA5CErBLPpX5WudwBCBw6dCW2ZXi1WlTs84="; }; - vendorHash = "sha256-hbWhWs4b547oBTSM9SbVbJ5YifJdMwOwtp/3df2MHGg="; + vendorHash = "sha256-6GGSFnCbg7HZZQvBVBbwKwy+ng/NNX5oOquuBFXpN/s="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/license-cli/default.nix b/pkgs/tools/misc/license-cli/default.nix new file mode 100644 index 000000000000..586ef7508f4d --- /dev/null +++ b/pkgs/tools/misc/license-cli/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromSourcehut +, rustPlatform +, installShellFiles +, scdoc +, makeWrapper + +# Script dependencies. +, fzf +, wl-clipboard +, xclip +}: + +rustPlatform.buildRustPackage rec { + pname = "license-cli"; + version = "3.0.0"; + + src = fetchFromSourcehut { + owner = "~zethra"; + repo = "license"; + rev = version; + hash = "sha256-M5ypymJ99T4Vc7XSmqNb69yBLgSYu9I+6FEQvtFGUf0="; + }; + + cargoHash = "sha256-me4xPP6fO1D+vvR9XZg2EHieY7OU2HHQ4P0nkk/IKpE="; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + preInstall = '' + ${scdoc}/bin/scdoc < doc/license.scd > license.1 + ''; + + postInstall = '' + installShellCompletion completions/license.{bash,fish} + installShellCompletion --zsh completions/_license + installManPage ./license.1 + + install -Dm0755 ./scripts/set-license -t $out/bin + wrapProgram $out/bin/set-license \ + --prefix PATH : "$out/bin" \ + --prefix PATH : ${lib.makeBinPath [ fzf ]} + + install -Dm0755 ./scripts/copy-header -t $out/bin + wrapProgram $out/bin/copy-header \ + --prefix PATH : "$out/bin" \ + --prefix PATH : ${lib.makeBinPath [ wl-clipboard xclip ]} + ''; + + meta = with lib; { + homepage = "https://git.sr.ht/~zethra/license"; + description = "Command-line tool to easily add license to your project"; + license = licenses.mpl20; + mainProgram = "license"; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c583cce2085e..c513a9af14ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1576,6 +1576,8 @@ with pkgs; kubevirt = callPackage ../tools/virtualization/kubevirt { }; + license-cli = callPackage ../tools/misc/license-cli { }; + license-generator = callPackage ../tools/misc/license-generator { }; linux-router = callPackage ../tools/networking/linux-router { }; @@ -11479,7 +11481,7 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { - pcl = pcl.override { vtk_8 = vtk_8_withQt5; }; + pcl = pcl.override { vtk = vtk_8_withQt5; }; }; rtaudio = callPackage ../development/libraries/audio/rtaudio { @@ -29918,6 +29920,8 @@ with pkgs; expenses = callPackage ../applications/misc/expenses { }; + flowtime = callPackage ../applications/misc/flowtime { }; + fnott = callPackage ../applications/misc/fnott { }; furnace = callPackage ../applications/audio/furnace { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55473652e361..c88c5606fd87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11947,6 +11947,8 @@ self: super: with self; { torchmetrics = callPackage ../development/python-modules/torchmetrics { }; + torchio = callPackage ../development/python-modules/torchio { }; + torchinfo = callPackage ../development/python-modules/torchinfo { }; torchlibrosa = callPackage ../development/python-modules/torchlibrosa { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 567795e68f70..ce2d13ed52e9 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -131,7 +131,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { - inherit (pkgs.darwin.apple_sdk.frameworks) AGL Cocoa Foundation; + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; }; libqglviewer = callPackage ../development/libraries/libqglviewer {