lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
4904bab0 bf4c42e0

+483 -95
+37 -3
nixos/modules/services/x11/desktop-managers/budgie.nix
··· 12 12 inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages; 13 13 inherit nixos-background-dark nixos-background-light; 14 14 }; 15 + 16 + nixos-background-info = pkgs.writeTextFile { 17 + name = "nixos-background-info"; 18 + text = '' 19 + <?xml version="1.0"?> 20 + <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd"> 21 + <wallpapers> 22 + <wallpaper deleted="false"> 23 + <name>Nineish</name> 24 + <filename>${nixos-background-light.gnomeFilePath}</filename> 25 + <options>zoom</options> 26 + <shade_type>solid</shade_type> 27 + <pcolor>#d1dcf8</pcolor> 28 + <scolor>#e3ebfe</scolor> 29 + </wallpaper> 30 + <wallpaper deleted="false"> 31 + <name>Nineish Dark Gray</name> 32 + <filename>${nixos-background-dark.gnomeFilePath}</filename> 33 + <options>zoom</options> 34 + <shade_type>solid</shade_type> 35 + <pcolor>#151515</pcolor> 36 + <scolor>#262626</scolor> 37 + </wallpaper> 38 + </wallpapers> 39 + ''; 40 + destination = "/share/gnome-background-properties/nixos.xml"; 41 + }; 15 42 in { 16 43 options = { 17 44 services.xserver.desktopManager.budgie = { 18 - enable = mkEnableOption (mdDoc "Budgie desktop"); 45 + enable = mkEnableOption (mdDoc "the Budgie desktop"); 19 46 20 47 sessionPath = mkOption { 21 48 description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart."; ··· 35 62 type = with types; listOf path; 36 63 default = []; 37 64 }; 65 + 66 + extraPlugins = mkOption { 67 + description = mdDoc "Extra plugins for the Budgie desktop"; 68 + type = with types; listOf package; 69 + default = []; 70 + }; 38 71 }; 39 72 40 73 environment.budgie.excludePackages = mkOption { ··· 76 109 # Budgie Desktop. 77 110 budgie.budgie-backgrounds 78 111 budgie.budgie-control-center 79 - budgie.budgie-desktop 112 + (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) 80 113 budgie.budgie-desktop-view 81 114 budgie.budgie-screensaver 82 115 83 116 # Required by the Budgie Desktop session. 84 - (gnome.gnome-session.override {gnomeShellSupport = false;}) 117 + (gnome.gnome-session.override { gnomeShellSupport = false; }) 85 118 86 119 # Required by Budgie Menu. 87 120 gnome-menus ··· 106 139 # Desktop themes. 107 140 qogir-theme 108 141 qogir-icon-theme 142 + nixos-background-info 109 143 110 144 # Default settings. 111 145 nixos-gsettings-overrides
+6 -1
nixos/tests/budgie.nix
··· 20 20 }; 21 21 }; 22 22 23 - services.xserver.desktopManager.budgie.enable = true; 23 + services.xserver.desktopManager.budgie = { 24 + enable = true; 25 + extraPlugins = [ 26 + pkgs.budgie.budgie-analogue-clock-applet 27 + ]; 28 + }; 24 29 }; 25 30 26 31 testScript = { nodes, ... }:
+2 -2
pkgs/applications/audio/tidal-hifi/default.nix
··· 37 37 38 38 stdenv.mkDerivation rec { 39 39 pname = "tidal-hifi"; 40 - version = "4.4.0"; 40 + version = "5.0.0"; 41 41 42 42 src = fetchurl { 43 43 url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; 44 - sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8="; 44 + sha256 = "sha256-6NyHDH16bLs+bgSbjZYm2LEzp1WkJ1nO3sdkO78/VqE="; 45 45 }; 46 46 47 47 nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
+56
pkgs/applications/misc/flowtime/default.nix
··· 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , vala 5 + , meson 6 + , ninja 7 + , wrapGAppsHook4 8 + , libadwaita 9 + , libxml2 10 + , libgee 11 + , gst_all_1 12 + , gobject-introspection 13 + , desktop-file-utils 14 + , glib 15 + , pkg-config 16 + }: 17 + 18 + stdenv.mkDerivation rec { 19 + pname = "flowtime"; 20 + version = "3.0"; 21 + 22 + src = fetchFromGitHub { 23 + owner = "Diego-Ivan"; 24 + repo = "Flowtime"; 25 + rev = "v${version}"; 26 + hash = "sha256-op643yU7KdkTO9hT0iYTIqBP4oPe0MT1R5I3FAtN0/I="; 27 + }; 28 + 29 + nativeBuildInputs = [ 30 + desktop-file-utils 31 + glib 32 + gobject-introspection 33 + meson 34 + ninja 35 + pkg-config 36 + vala 37 + wrapGAppsHook4 38 + ]; 39 + 40 + buildInputs = [ 41 + libadwaita 42 + libxml2 43 + libgee 44 + ] ++ (with gst_all_1; [ 45 + gstreamer 46 + gst-plugins-base 47 + gst-plugins-bad 48 + ]); 49 + 50 + meta = with lib; { 51 + description = "Get what motivates you done, without losing concentration"; 52 + homepage = "https://github.com/Diego-Ivan/Flowtime"; 53 + license = licenses.gpl3Plus; 54 + maintainers = with maintainers; [ foo-dogsquared ]; 55 + }; 56 + }
+2 -2
pkgs/applications/misc/logseq/default.nix
··· 10 10 11 11 stdenv.mkDerivation rec { 12 12 pname = "logseq"; 13 - version = "0.9.3"; 13 + version = "0.9.4"; 14 14 15 15 src = fetchurl { 16 16 url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; 17 - hash = "sha256-hwBTS6hjD66SPOPctcS2esybnVrgw77fFpt8phGt334="; 17 + hash = "sha256-K04iIa/WnRtcHwRUHJbKqXO9c4l5xwHPvnwN5WX/Row="; 18 18 name = "${pname}-${version}.AppImage"; 19 19 }; 20 20
+2 -2
pkgs/applications/misc/minder/default.nix
··· 25 25 26 26 stdenv.mkDerivation rec { 27 27 pname = "minder"; 28 - version = "1.14.0"; 28 + version = "1.15.0"; 29 29 30 30 src = fetchFromGitHub { 31 31 owner = "phase1geo"; 32 32 repo = pname; 33 33 rev = version; 34 - sha256 = "sha256-0x+MMVa9/jOVp9n9JFM1MGndh9H9MzmmHepcez4aT+Q="; 34 + sha256 = "sha256-5k6a7/49iqtPt7il1/LlCHlQsilXRcGAJSAkJ3BBowU="; 35 35 }; 36 36 37 37 nativeBuildInputs = [
+2 -2
pkgs/applications/misc/xmrig/proxy.nix
··· 13 13 in 14 14 stdenv.mkDerivation rec { 15 15 pname = "xmrig-proxy"; 16 - version = "6.19.0"; 16 + version = "6.19.2"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "xmrig"; 20 20 repo = "xmrig-proxy"; 21 21 rev = "v${version}"; 22 - hash = "sha256-0vmRwe7PQVifm6HxgpPno9mIFcBZFtxqNdDK4V637ds="; 22 + hash = "sha256-3nEfg2hmOMjevo5VhjelIeV2xRwkIOVhLNxBmPzdWog="; 23 23 }; 24 24 25 25 postPatch = ''
+13 -13
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 146 146 "vendorHash": null 147 147 }, 148 148 "baiducloud": { 149 - "hash": "sha256-J17jzgCTCG87Cieci/TrMpEUxA4Ynfm1+Cr4fRjDtNY=", 149 + "hash": "sha256-cEi/B5vZWQDdne4SlTwoObt+eUsmTdyG8bH6YHPo4IA=", 150 150 "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", 151 151 "owner": "baidubce", 152 152 "repo": "terraform-provider-baiducloud", 153 - "rev": "v1.19.6", 153 + "rev": "v1.19.7", 154 154 "spdx": "MPL-2.0", 155 155 "vendorHash": null 156 156 }, ··· 466 466 "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" 467 467 }, 468 468 "grafana": { 469 - "hash": "sha256-cCluXspcWsRzuo+mP6Hk0VXtrP7zA5TGV1LCf3xuvhw=", 469 + "hash": "sha256-vfH+KIOv/DXv4fUzUATgoL6s69NqGVP8Dn7aoEPfe8g=", 470 470 "homepage": "https://registry.terraform.io/providers/grafana/grafana", 471 471 "owner": "grafana", 472 472 "repo": "terraform-provider-grafana", 473 - "rev": "v1.37.2", 473 + "rev": "v1.38.0", 474 474 "spdx": "MPL-2.0", 475 - "vendorHash": "sha256-Mv3BKYS1j5AAHbXVCP5C3OQpEmOBea2ru3ONbJ0pYyc=" 475 + "vendorHash": "sha256-MlqnDcig8/uiF8pNuEkTveN7kgsGEs4XOe5z4/a+Fm0=" 476 476 }, 477 477 "gridscale": { 478 478 "hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=", ··· 530 530 "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" 531 531 }, 532 532 "http": { 533 - "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=", 533 + "hash": "sha256-PNgiyawIMSkuZmC0jXiuqHp3qKNfJ0NgMijEQzTg+ow=", 534 534 "homepage": "https://registry.terraform.io/providers/hashicorp/http", 535 535 "owner": "hashicorp", 536 536 "repo": "terraform-provider-http", 537 - "rev": "v3.2.1", 537 + "rev": "v3.3.0", 538 538 "spdx": "MPL-2.0", 539 - "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" 539 + "vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg=" 540 540 }, 541 541 "huaweicloud": { 542 542 "hash": "sha256-VK/b74pGB8vjaWmUi8Zz4K5utIUYlfeYk18YZF8J1jI=", ··· 665 665 "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" 666 666 }, 667 667 "linode": { 668 - "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=", 668 + "hash": "sha256-Z8mllx/TO0EUQNSOGcUhMRAsV7jiUhybzYDPg2ZtUec=", 669 669 "homepage": "https://registry.terraform.io/providers/linode/linode", 670 670 "owner": "linode", 671 671 "repo": "terraform-provider-linode", 672 - "rev": "v1.30.0", 672 + "rev": "v2.0.0", 673 673 "spdx": "MPL-2.0", 674 - "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM=" 674 + "vendorHash": "sha256-Xbnf8ejyojd3JD7h580hlM0PC4nD+sjpodV9hr0/F+c=" 675 675 }, 676 676 "linuxbox": { 677 677 "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", ··· 1026 1026 "vendorHash": null 1027 1027 }, 1028 1028 "snowflake": { 1029 - "hash": "sha256-/9TTK33XwMW8izM35y9sOZOKFc6/HC2/CCnX3JMzY3I=", 1029 + "hash": "sha256-ScGBo04qWjSuYXKHynn/rpd+2iKf+K+musYt/eWJfok=", 1030 1030 "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", 1031 1031 "owner": "Snowflake-Labs", 1032 1032 "repo": "terraform-provider-snowflake", 1033 - "rev": "v0.62.0", 1033 + "rev": "v0.63.0", 1034 1034 "spdx": "MIT", 1035 1035 "vendorHash": "sha256-3Ry+XQxF39lXr3Ev+KOx0GatVbD0Sjs9Jai1VPjEDBE=" 1036 1036 },
+3 -3
pkgs/applications/networking/rymdport/default.nix
··· 11 11 12 12 buildGoModule rec { 13 13 pname = "rymdport"; 14 - version = "3.3.2"; 14 + version = "3.3.4"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "Jacalz"; 18 18 repo = "rymdport"; 19 19 rev = "v${version}"; 20 - hash = "sha256-UATtfJPpB0twIh6vsgfMSbu9S0F36l+PQgpWYDBmy4M="; 20 + hash = "sha256-qCMQEor+R+feXbndG7RZ9HBa/n6Lu0vkQ+tvF/R+148="; 21 21 }; 22 22 23 - vendorHash = "sha256-XJracr2oblyVid6QKri0EUr5LrEgA3w27PPqbqWcNh8="; 23 + vendorHash = "sha256-7PSWMf4z/NjAyWUXpWoNHdngMN9anOvPu+F+o8O27zs="; 24 24 25 25 nativeBuildInputs = [ 26 26 pkg-config
+14 -12
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
··· 13 13 , libXrandr 14 14 , pkg-config 15 15 , zlib 16 + , Accelerate 16 17 , AGL 17 18 , Cocoa 18 19 , Foundation ··· 43 44 buildInputs = lib.optionals stdenv.isLinux [ 44 45 alsa-lib 45 46 ] ++ (if stdenv.isDarwin then [ 46 - AGL 47 - Cocoa 48 - Foundation 49 - zlib 50 - ] else [ 51 - libX11 52 - libXcursor 53 - libXext 54 - libXft 55 - libXinerama 56 - libXrandr 57 - ]); 47 + Accelerate 48 + AGL 49 + Cocoa 50 + Foundation 51 + zlib 52 + ] else [ 53 + libX11 54 + libXcursor 55 + libXext 56 + libXft 57 + libXinerama 58 + libXrandr 59 + ]); 58 60 59 61 doCheck = false; 60 62
+44
pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , meson 5 + , ninja 6 + , pkg-config 7 + , vala 8 + , budgie-desktop 9 + , gtk3 10 + , libpeas 11 + }: 12 + 13 + stdenv.mkDerivation rec { 14 + pname = "budgie-analogue-clock-applet"; 15 + version = "2.0"; 16 + 17 + src = fetchFromGitHub { 18 + owner = "samlane-ma"; 19 + repo = "analogue-clock-applet"; 20 + rev = "v${version}"; 21 + hash = "sha256-yId5bbdmELinBmZ5eISa5hQSYkeZCkix2FJ287GdcCs="; 22 + }; 23 + 24 + nativeBuildInputs = [ 25 + meson 26 + ninja 27 + pkg-config 28 + vala 29 + ]; 30 + 31 + buildInputs = [ 32 + budgie-desktop 33 + gtk3 34 + libpeas 35 + ]; 36 + 37 + meta = with lib; { 38 + description = "Analogue Clock Applet for the Budgie desktop"; 39 + homepage = "https://github.com/samlane-ma/analogue-clock-applet"; 40 + license = licenses.gpl3Plus; 41 + maintainers = [ maintainers.federicoschonborn ]; 42 + platforms = platforms.linux; 43 + }; 44 + }
+4
pkgs/desktops/budgie/budgie-desktop/default.nix
··· 46 46 sha256 = "sha256-ww65J9plixbxFza6xCfaz1WYtT9giKkLVH1XYxH41+0="; 47 47 }; 48 48 49 + patches = [ 50 + ./plugins.patch 51 + ]; 52 + 49 53 nativeBuildInputs = [ 50 54 docbook-xsl-nons 51 55 gtk-doc
+66
pkgs/desktops/budgie/budgie-desktop/plugins.patch
··· 1 + diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala 2 + index d3cdb65c..9d569bd1 100644 3 + --- a/src/panel/plugin_manager.vala 4 + +++ b/src/panel/plugin_manager.vala 5 + @@ -40,10 +40,26 @@ namespace Budgie { 6 + } 7 + 8 + /* System path */ 9 + - var dir = Environment.get_user_data_dir(); 10 + - engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY); 11 + + var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR"); 12 + + if (libdir != null) { 13 + + debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir); 14 + + } else { 15 + + debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY); 16 + + libdir = Budgie.MODULE_DIRECTORY; 17 + + } 18 + + 19 + + var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR"); 20 + + if (datadir != null) { 21 + + debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir); 22 + + } else { 23 + + debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY); 24 + + datadir = Budgie.MODULE_DATA_DIRECTORY; 25 + + } 26 + + 27 + + engine.add_search_path(libdir, datadir); 28 + 29 + /* User path */ 30 + + var dir = Environment.get_user_data_dir(); 31 + var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins"); 32 + var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data"); 33 + engine.add_search_path(user_mod, hdata); 34 + diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala 35 + index b0814693..d671109a 100644 36 + --- a/src/raven/plugin_manager.vala 37 + +++ b/src/raven/plugin_manager.vala 38 + @@ -51,10 +51,26 @@ namespace Budgie { 39 + } 40 + 41 + /* System path */ 42 + - var dir = Environment.get_user_data_dir(); 43 + - engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR); 44 + + var libdir = Environment.get_variable("RAVEN_PLUGIN_LIBDIR"); 45 + + if (libdir != null) { 46 + + debug("RAVEN_PLUGIN_LIBDIR is set to %s", libdir); 47 + + } else { 48 + + debug("RAVEN_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_LIBDIR); 49 + + libdir = Budgie.RAVEN_PLUGIN_LIBDIR; 50 + + } 51 + + 52 + + var datadir = Environment.get_variable("RAVEN_PLUGIN_DATADIR"); 53 + + if (datadir != null) { 54 + + debug("RAVEN_PLUGIN_DATADIR is set to %s", datadir); 55 + + } else { 56 + + debug("RAVEN_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_DATADIR); 57 + + datadir = Budgie.RAVEN_PLUGIN_DATADIR; 58 + + } 59 + + 60 + + engine.add_search_path(libdir, datadir); 61 + 62 + /* User path */ 63 + + var dir = Environment.get_user_data_dir(); 64 + var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins"); 65 + var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-data"); 66 + engine.add_search_path(user_mod, hdata);
+53
pkgs/desktops/budgie/budgie-desktop/wrapper.nix
··· 1 + { lib 2 + , stdenv 3 + , glib 4 + , xorg 5 + , wrapGAppsHook 6 + , budgie-desktop 7 + , plugins ? [] 8 + }: 9 + 10 + stdenv.mkDerivation { 11 + pname = "${budgie-desktop.pname}-with-plugins"; 12 + inherit (budgie-desktop) version; 13 + 14 + src = null; 15 + 16 + paths = [ 17 + budgie-desktop 18 + ] ++ plugins; 19 + 20 + passAsFile = [ "paths" ]; 21 + 22 + nativeBuildInputs = [ 23 + glib 24 + wrapGAppsHook 25 + ]; 26 + 27 + buildInputs = lib.forEach plugins (plugin: plugin.buildInputs) ++ plugins; 28 + 29 + dontUnpack = true; 30 + dontConfigure = true; 31 + dontBuild = true; 32 + 33 + preferLocalBuild = true; 34 + allowSubstitutes = false; 35 + 36 + installPhase = '' 37 + mkdir -p $out 38 + for i in $(cat $pathsPath); do 39 + ${xorg.lndir}/bin/lndir -silent $i $out 40 + done 41 + ''; 42 + 43 + preFixup = '' 44 + gappsWrapperArgs+=( 45 + --set BUDGIE_PLUGIN_LIBDIR "$out/lib/budgie-desktop/plugins" 46 + --set BUDGIE_PLUGIN_DATADIR "$out/share/budgie-desktop/plugins" 47 + --set RAVEN_PLUGIN_LIBDIR "$out/lib/budgie-desktop/raven-plugins" 48 + --set RAVEN_PLUGIN_DATADIR "$out/share/budgie-desktop/raven-plugins" 49 + ) 50 + ''; 51 + 52 + inherit (budgie-desktop) meta; 53 + }
+4 -5
pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
··· 31 31 font-name="Noto Sans 10" 32 32 document-font-name="Noto Sans 10" 33 33 monospace-font-name="Hack 10" 34 - enable-hot-corners=true 35 34 36 35 [org.gnome.desktop.wm.preferences:Budgie] 37 36 titlebar-font="Noto Sans Bold 10" 38 37 39 - [org.gnome.mutter:Budgie] 40 - workspaces-only-on-primary=true 38 + [com.solus-project.budgie-menu:Budgie] 39 + use-default-menu-icon=true 41 40 42 41 [com.solus-project.budgie-panel:Budgie] 43 42 dark-theme=false 44 43 builtin-theme=false 45 44 46 45 [com.solus-project.icon-tasklist:Budgie] 47 - pinned-launchers=["nemo.desktop", "vlc.desktop", "mate-terminal.desktop"] 46 + pinned-launchers=["nemo.desktop", "firefox.desktop", "vlc.desktop"] 48 47 49 48 [org.buddiesofbudgie.budgie-desktop-view:Budgie] 50 49 show=true 51 - click-policy="double" 50 + show-active-mounts=true 52 51 terminal="${mate.mate-terminal}/bin/mate-terminal" 53 52 54 53 ${extraGSettingsOverrides}
+2
pkgs/desktops/budgie/default.nix
··· 1 1 { lib, pkgs }: 2 2 3 3 lib.makeScope pkgs.newScope (self: with self; { 4 + budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; 4 5 budgie-backgrounds = callPackage ./budgie-backgrounds { }; 5 6 budgie-control-center = callPackage ./budgie-control-center { }; 6 7 budgie-desktop = callPackage ./budgie-desktop { }; 7 8 budgie-desktop-view = callPackage ./budgie-desktop-view { }; 9 + budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { }; 8 10 budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; 9 11 budgie-screensaver = callPackage ./budgie-screensaver { }; 10 12 })
+2 -11
pkgs/desktops/gnome/core/nautilus/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 - , fetchpatch2 5 4 , meson 6 5 , ninja 7 6 , pkg-config ··· 39 38 40 39 stdenv.mkDerivation rec { 41 40 pname = "nautilus"; 42 - version = "44.0"; 41 + version = "44.1"; 43 42 44 43 outputs = [ "out" "dev" "devdoc" ]; 45 44 46 45 src = fetchurl { 47 46 url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; 48 - sha256 = "V7meu44rnBUS04HlMJYYjAh7M0ENbFLYeie9YO52rH8="; 47 + sha256 = "NggCpZXj7brZYsjOo1O2K6qL5AdRO1FiyJyTPKU4eqk="; 49 48 }; 50 49 51 50 patches = [ ··· 56 55 (substituteAll { 57 56 src = ./fix-paths.patch; 58 57 inherit tracker; 59 - }) 60 - 61 - # Fix crash during search after "copy"/"cut" action selection 62 - # Can be removed in 44.1 63 - # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1155 64 - (fetchpatch2 { 65 - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/f0f6c372802aabe7ba098d3af1f81cbc03eba27b.patch"; 66 - sha256 = "mlrLvNgDQvi4maa81ozu6DsDBVx9NrsgYzWN+oSboVQ="; 67 58 }) 68 59 ]; 69 60
+2 -2
pkgs/development/libraries/pcl/default.nix
··· 6 6 , qhull 7 7 , flann 8 8 , boost 9 - , vtk_8 9 + , vtk 10 10 , eigen 11 11 , pkg-config 12 12 , qtbase ··· 55 55 libpng 56 56 libtiff 57 57 qhull 58 - vtk_8 58 + vtk 59 59 ]; 60 60 61 61 cmakeFlags = lib.optionals stdenv.isDarwin [
+2 -2
pkgs/development/python-modules/pontos/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "pontos"; 20 - version = "23.4.3"; 20 + version = "23.4.6"; 21 21 format = "pyproject"; 22 22 23 23 disabled = pythonOlder "3.9"; ··· 26 26 owner = "greenbone"; 27 27 repo = pname; 28 28 rev = "refs/tags/v${version}"; 29 - hash = "sha256-dfalOFksqrOOhoQz2VCeEFS10Sqr7qmjgH7Rgb2YCeY="; 29 + hash = "sha256-b96tfdr/Ya8qK3e+/sXWjlsi8gExX5f/5WgQxWuQfq8="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+3 -2
pkgs/development/python-modules/python-gvm/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "python-gvm"; 15 - version = "23.4.0"; 15 + version = "23.4.1"; 16 16 format = "pyproject"; 17 17 18 18 disabled = pythonOlder "3.7"; ··· 21 21 owner = "greenbone"; 22 22 repo = pname; 23 23 rev = "refs/tags/v${version}"; 24 - hash = "sha256-qpPoE5QSm6JwBG3842gjxGeSd87yY2/T/HFi4k8U/qY="; 24 + hash = "sha256-RuyOhFerWSJ/JEQTruv1gh/ieO2X99E33VW28assflY="; 25 25 }; 26 26 27 27 nativeBuildInputs = [ ··· 52 52 meta = with lib; { 53 53 description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; 54 54 homepage = "https://github.com/greenbone/python-gvm"; 55 + changelog = "https://github.com/greenbone/python-gvm/releases/tag/v${version}"; 55 56 license = with licenses; [ gpl3Plus ]; 56 57 maintainers = with maintainers; [ fab ]; 57 58 };
+64
pkgs/development/python-modules/torchio/default.nix
··· 1 + { stdenv 2 + , lib 3 + , buildPythonPackage 4 + , fetchFromGitHub 5 + , pytestCheckHook 6 + , pythonOlder 7 + , deprecated 8 + , humanize 9 + , matplotlib 10 + , nibabel 11 + , numpy 12 + , parameterized 13 + , scipy 14 + , simpleitk 15 + , torch 16 + , tqdm 17 + , typer 18 + }: 19 + 20 + buildPythonPackage rec { 21 + pname = "torchio"; 22 + version = "0.18.90"; 23 + format = "pyproject"; 24 + disabled = pythonOlder "3.7"; 25 + 26 + src = fetchFromGitHub { 27 + owner = "fepegar"; 28 + repo = pname; 29 + rev = "refs/tags/v${version}"; 30 + hash = "sha256-h8cvNhOkjMMbQ6Nry8FKtwnK+yhRYRGjXi/xp0i5yyY="; 31 + }; 32 + 33 + propagatedBuildInputs = [ 34 + deprecated 35 + humanize 36 + nibabel 37 + numpy 38 + scipy 39 + simpleitk 40 + torch 41 + tqdm 42 + typer 43 + ] ++ typer.passthru.optional-dependencies.all; 44 + 45 + nativeCheckInputs = [ pytestCheckHook matplotlib parameterized ]; 46 + disabledTests = [ 47 + # tries to download models: 48 + "test_load_all" 49 + ] ++ lib.optionals stdenv.isAarch64 [ 50 + # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly 51 + "test_queue_multiprocessing" 52 + ]; 53 + pythonImportsCheck = [ 54 + "torchio" 55 + "torchio.data" 56 + ]; 57 + 58 + meta = with lib; { 59 + description = "Medical imaging toolkit for deep learning"; 60 + homepage = "http://www.torchio.org/"; 61 + license = licenses.asl20; 62 + maintainers = [ maintainers.bcdarwin ]; 63 + }; 64 + }
+2 -2
pkgs/development/tools/azcopy/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "azure-storage-azcopy"; 5 - version = "10.18.0"; 5 + version = "10.18.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Azure"; 9 9 repo = "azure-storage-azcopy"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-fdJah0Y+VkZYI416vA8Pdr+oWnG17IhBwvMDm0vqiS0="; 11 + sha256 = "sha256-Yy6A2lNxF3aHD6Jw/dnLt1MFiFQ9+U+cB4wVK/dWbmE="; 12 12 }; 13 13 14 14 subPackages = [ "." ];
+2 -2
pkgs/development/tools/misc/phpunit/default.nix
··· 2 2 3 3 let 4 4 pname = "phpunit"; 5 - version = "10.1.0"; 5 + version = "10.1.2"; 6 6 in 7 7 stdenv.mkDerivation { 8 8 inherit pname version; 9 9 10 10 src = fetchurl { 11 11 url = "https://phar.phpunit.de/phpunit-${version}.phar"; 12 - hash = "sha256-1zYGgYV4BHxjBE3QcV6XP73u2JIaUzCKS70eDB7e9DQ="; 12 + hash = "sha256-X6upMANmKU2H8Qs0pOd/uRL2GdH/JPyOAQ/P8Z5yNl8="; 13 13 }; 14 14 15 15 dontUnpack = true;
+3 -3
pkgs/development/tools/rust/cargo-llvm-lines/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-llvm-lines"; 5 - version = "0.4.26"; 5 + version = "0.4.27"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "dtolnay"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-TFwuUtRJ1R0dxgCN7ExTpYMHM6IalMxnvTNUGiqEM8s="; 11 + sha256 = "sha256-nojFHP3JhhJSzYeRGZKpUpNcVdMg21L+t6vTxIalsJs="; 12 12 }; 13 13 14 - cargoSha256 = "sha256-vfuEJC/A06d5t0uCShBljTvTxX78h/r4Us5fSPvosqE="; 14 + cargoSha256 = "sha256-ZVi3j5FbcYYQJ5QOW1tiotiqwOjF9uv1VLHrZL0LBxc="; 15 15 16 16 meta = with lib; { 17 17 description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
+3 -3
pkgs/development/tools/rust/cargo-lock/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-lock"; 5 - version = "8.0.3"; 5 + version = "9.0.0"; 6 6 7 7 src = fetchCrate { 8 8 inherit pname version; 9 - sha256 = "sha256-Xh39gaiTC3g1FHVWqUr8PR/MzeoRaGlCmGZZZnHB4Kc="; 9 + hash = "sha256-SMxM66qo3Xmst+SVXu4LYZ0Zzn15wqVVNqqHzAkip/s="; 10 10 }; 11 11 12 - cargoSha256 = "sha256-gf9KDzGKjZt4p5ldZShH4lOwrieJeI2WJQ8hU4hhGJE="; 12 + cargoHash = "sha256-wUp4zBY64MvD4anGlVsJrI3pyfwVSQGnn6YuweTeYNk="; 13 13 14 14 buildFeatures = [ "cli" ]; 15 15
+3 -3
pkgs/development/tools/rust/cargo-make/default.nix
··· 13 13 14 14 rustPlatform.buildRustPackage rec { 15 15 pname = "cargo-make"; 16 - version = "0.36.6"; 16 + version = "0.36.7"; 17 17 18 18 src = fetchCrate { 19 19 inherit pname version; 20 - sha256 = "sha256-ln6zySZ2fMzRPGdVikPYgtT89/J3Fw56fdrEkkOU/j8="; 20 + sha256 = "sha256-OE24RKbSWylX2dXkjBMZ8Va9ONVeMKG/BVdlZD6O+Yc="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ pkg-config ]; ··· 25 25 buildInputs = [ openssl ] 26 26 ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; 27 27 28 - cargoHash = "sha256-ntnd5vWiMxP5p/IBSWotLqNR8UseJHdSPiaxUHWpOlo="; 28 + cargoHash = "sha256-AAZYY9CbLbbvWWMhkHOc8OhzmwSFXSL9jSga3qMbkDU="; 29 29 30 30 # Some tests fail because they need network access. 31 31 # However, Travis ensures a proper build.
+3 -3
pkgs/development/tools/worker-build/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "worker-build"; 5 - version = "0.0.15"; 5 + version = "0.0.16"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "cloudflare"; 9 9 repo = "workers-rs"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-EJU6WgoGnhquHSJ1hLVK8eild7jcegeC+VxOeoD9+20="; 11 + sha256 = "sha256-8+ifSCfHYrS5iAa4fsujmofzicbwk/00VRNZvIkIc+E="; 12 12 }; 13 13 14 - cargoHash = "sha256-6QzZtaqnhZ1V5UU9pppLK+LKn9EdvMJ8YOyxFYt7oos="; 14 + cargoHash = "sha256-fj/l53AdgJXYz+IA45yfNYgSw7DKbBrGVyFCfbqxxq0="; 15 15 16 16 buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 17 17
+2 -2
pkgs/servers/jackett/default.nix
··· 9 9 10 10 buildDotnetModule rec { 11 11 pname = "jackett"; 12 - version = "0.20.3920"; 12 + version = "0.20.3990"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = pname; 16 16 repo = pname; 17 17 rev = "v${version}"; 18 - hash = "sha512-SSWohyMYnaGpOa5IipUalZPsOTHV00XSY5g70LiaW/8CPCKHjM+IydVm2S2pH7x+fmnqA4P4GvfCT1O67NsrIg=="; 18 + hash = "sha512-eewv7QkGUE66PNJh31WjxeAN+x/M9vr2qfFaF6T+W7esMv2EoHZb9FcRwzZ8GmpT/bd9LFNNahSJ3jIHdKg8KA=="; 19 19 }; 20 20 21 21 projectFile = "src/Jackett.Server/Jackett.Server.csproj";
+3 -3
pkgs/servers/rmfakecloud/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "rmfakecloud"; 5 - version = "0.0.12"; 5 + version = "0.0.13.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "ddvk"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-xBKo+qwwgGMOb+B1aI0pwH8u8c1GNZSXfhVd4SNewdg="; 11 + sha256 = "sha256-7lVNbqQv6MNIhHMFbH8VFVIjKiuTCbeVkAKeGprzrkw="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A="; 14 + vendorSha256 = "sha256-Pz/TtGjwGHaDSueBEHMtHjyAxYO5V+8jzXCowHcUW/4="; 15 15 16 16 ui = callPackage ./webui.nix { inherit version src; }; 17 17
+1 -1
pkgs/servers/rmfakecloud/webui.nix
··· 7 7 8 8 yarnOfflineCache = fetchYarnDeps { 9 9 yarnLock = "${src}/ui/yarn.lock"; 10 - sha256 = "sha256-lKA3W7gXT2Dnux+sIXCluG5HxkGQgHPnCjgV/a4pjY0="; 10 + sha256 = "sha256-37P+acjaeG7TCyLoIHIHsB+DCUOsQOJ1H9T5SgajtLc="; 11 11 }; 12 12 13 13 nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ];
+3 -3
pkgs/shells/nushell/default.nix
··· 24 24 25 25 rustPlatform.buildRustPackage ( 26 26 let 27 - version = "0.78.0"; 27 + version = "0.79.0"; 28 28 pname = "nushell"; 29 29 in { 30 30 inherit version pname; ··· 33 33 owner = pname; 34 34 repo = pname; 35 35 rev = version; 36 - hash = "sha256-fxx34xTFan5DcKo/sxFq6JxObGFTs4myNM0WmL5hnl8="; 36 + hash = "sha256-vnOTSXTgFxNTI4msgMQ/5E27VUKPj6nBIqPWLUeXAr4="; 37 37 }; 38 38 39 - cargoHash = "sha256-VqM6SAzYqwSSo3csjNCvcrZGwemtVHEGvh8gufouMeQ="; 39 + cargoHash = "sha256-FqhN1t3n6j5czZ40JUFtsz4ZxTl7vpMTBhrR66M1DNw="; 40 40 41 41 nativeBuildInputs = [ pkg-config ] 42 42 ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
+2 -2
pkgs/shells/zsh/zsh-nix-shell/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "zsh-nix-shell"; 8 - version = "0.5.0"; 8 + version = "0.6.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "chisui"; 12 12 repo = "zsh-nix-shell"; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-IT3wpfw8zhiNQsrw59lbSWYh0NQ1CUdUtFzRzHlURH0="; 14 + sha256 = "sha256-B0mdmIqefbm5H8wSG1h41c/J4shA186OyqvivmSK42Q="; 15 15 }; 16 16 17 17 strictDeps = true;
+5 -1
pkgs/tools/graphics/vulkan-cts/default.nix
··· 18 18 , vulkan-loader 19 19 , wayland 20 20 , wayland-protocols 21 + , wayland-scanner 21 22 , zlib 22 23 }: 23 24 let ··· 126 127 ninja 127 128 pkg-config 128 129 python3 130 + wayland-scanner 129 131 ]; 130 132 131 - # Fix cts cmake not coping with absolute install dirs 132 133 cmakeFlags = [ 134 + # Fix cts cmake not coping with absolute install dirs 133 135 "-DCMAKE_INSTALL_BINDIR=bin" 134 136 "-DCMAKE_INSTALL_LIBDIR=lib" 135 137 "-DCMAKE_INSTALL_INCLUDEDIR=include" 138 + 139 + "-DWAYLAND_SCANNER=wayland-scanner" 136 140 ]; 137 141 138 142 postInstall = ''
+3 -3
pkgs/tools/misc/infracost/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "infracost"; 5 - version = "0.10.19"; 5 + version = "0.10.20"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "infracost"; 9 9 rev = "v${version}"; 10 10 repo = "infracost"; 11 - sha256 = "sha256-1f1AP/yitmSTeZCopGGxA8f3hIEP6cvQcm8Ie24WJ1w="; 11 + sha256 = "sha256-KHXboxaLHA5CErBLPpX5WudwBCBw6dCW2ZXi1WlTs84="; 12 12 }; 13 - vendorHash = "sha256-hbWhWs4b547oBTSM9SbVbJ5YifJdMwOwtp/3df2MHGg="; 13 + vendorHash = "sha256-6GGSFnCbg7HZZQvBVBbwKwy+ng/NNX5oOquuBFXpN/s="; 14 14 15 15 ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; 16 16
+57
pkgs/tools/misc/license-cli/default.nix
··· 1 + { stdenv 2 + , lib 3 + , fetchFromSourcehut 4 + , rustPlatform 5 + , installShellFiles 6 + , scdoc 7 + , makeWrapper 8 + 9 + # Script dependencies. 10 + , fzf 11 + , wl-clipboard 12 + , xclip 13 + }: 14 + 15 + rustPlatform.buildRustPackage rec { 16 + pname = "license-cli"; 17 + version = "3.0.0"; 18 + 19 + src = fetchFromSourcehut { 20 + owner = "~zethra"; 21 + repo = "license"; 22 + rev = version; 23 + hash = "sha256-M5ypymJ99T4Vc7XSmqNb69yBLgSYu9I+6FEQvtFGUf0="; 24 + }; 25 + 26 + cargoHash = "sha256-me4xPP6fO1D+vvR9XZg2EHieY7OU2HHQ4P0nkk/IKpE="; 27 + 28 + nativeBuildInputs = [ installShellFiles makeWrapper ]; 29 + 30 + preInstall = '' 31 + ${scdoc}/bin/scdoc < doc/license.scd > license.1 32 + ''; 33 + 34 + postInstall = '' 35 + installShellCompletion completions/license.{bash,fish} 36 + installShellCompletion --zsh completions/_license 37 + installManPage ./license.1 38 + 39 + install -Dm0755 ./scripts/set-license -t $out/bin 40 + wrapProgram $out/bin/set-license \ 41 + --prefix PATH : "$out/bin" \ 42 + --prefix PATH : ${lib.makeBinPath [ fzf ]} 43 + 44 + install -Dm0755 ./scripts/copy-header -t $out/bin 45 + wrapProgram $out/bin/copy-header \ 46 + --prefix PATH : "$out/bin" \ 47 + --prefix PATH : ${lib.makeBinPath [ wl-clipboard xclip ]} 48 + ''; 49 + 50 + meta = with lib; { 51 + homepage = "https://git.sr.ht/~zethra/license"; 52 + description = "Command-line tool to easily add license to your project"; 53 + license = licenses.mpl20; 54 + mainProgram = "license"; 55 + maintainers = with maintainers; [ foo-dogsquared ]; 56 + }; 57 + }
+5 -1
pkgs/top-level/all-packages.nix
··· 1576 1576 1577 1577 kubevirt = callPackage ../tools/virtualization/kubevirt { }; 1578 1578 1579 + license-cli = callPackage ../tools/misc/license-cli { }; 1580 + 1579 1581 license-generator = callPackage ../tools/misc/license-generator { }; 1580 1582 1581 1583 linux-router = callPackage ../tools/networking/linux-router { }; ··· 11479 11481 rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; 11480 11482 11481 11483 rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { 11482 - pcl = pcl.override { vtk_8 = vtk_8_withQt5; }; 11484 + pcl = pcl.override { vtk = vtk_8_withQt5; }; 11483 11485 }; 11484 11486 11485 11487 rtaudio = callPackage ../development/libraries/audio/rtaudio { ··· 29919 29921 exercism = callPackage ../applications/misc/exercism { }; 29920 29922 29921 29923 expenses = callPackage ../applications/misc/expenses { }; 29924 + 29925 + flowtime = callPackage ../applications/misc/flowtime { }; 29922 29926 29923 29927 fnott = callPackage ../applications/misc/fnott { }; 29924 29928
+2
pkgs/top-level/python-packages.nix
··· 11949 11949 11950 11950 torchmetrics = callPackage ../development/python-modules/torchmetrics { }; 11951 11951 11952 + torchio = callPackage ../development/python-modules/torchio { }; 11953 + 11952 11954 torchinfo = callPackage ../development/python-modules/torchinfo { }; 11953 11955 11954 11956 torchlibrosa = callPackage ../development/python-modules/torchlibrosa { };
+1 -1
pkgs/top-level/qt5-packages.nix
··· 131 131 packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; 132 132 133 133 libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { 134 - inherit (pkgs.darwin.apple_sdk.frameworks) AGL Cocoa Foundation; 134 + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; 135 135 }; 136 136 137 137 libqglviewer = callPackage ../development/libraries/libqglviewer {