Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -27876,6 +27876,11 @@
|
||||
github = "wamserma";
|
||||
githubId = 60148;
|
||||
};
|
||||
wariuccio = {
|
||||
name = "Wariuccio";
|
||||
github = "wariuccio";
|
||||
githubId = 191101255;
|
||||
};
|
||||
water-sucks = {
|
||||
email = "varun@snare.dev";
|
||||
name = "Varun Narravula";
|
||||
|
||||
@@ -251,6 +251,15 @@ with lib.maintainers;
|
||||
shortName = "Cyberus Technology employees";
|
||||
};
|
||||
|
||||
danklinux = {
|
||||
members = [
|
||||
luckshiba
|
||||
marcusramberg
|
||||
];
|
||||
scope = "Maintain DankMaterialShell and related packages and modules from Dank Linux.";
|
||||
shortName = "Dank Linux";
|
||||
};
|
||||
|
||||
darwin = {
|
||||
github = "darwin-core";
|
||||
enableFeatureFreezePing = true;
|
||||
|
||||
@@ -20,6 +20,12 @@
|
||||
|
||||
- [LibreChat](https://www.librechat.ai/), open-source self-hostable ChatGPT clone with Agents and RAG APIs. Available as [services.librechat](#opt-services.librechat.enable).
|
||||
|
||||
- [DankMaterialShell](https://danklinux.com), a complete desktop shell for Wayland compositors built with Quickshell. Available as [programs.dms-shell](#opt-programs.dms-shell.enable).
|
||||
|
||||
- [dms-greeter](https://danklinux.com), a modern display manager greeter for DankMaterialShell that works with greetd and supports multiple Wayland compositors. Available as [services.displayManager.dms-greeter](#opt-services.displayManager.dms-greeter.enable).
|
||||
|
||||
- [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable).
|
||||
|
||||
- [udp-over-tcp](https://github.com/mullvad/udp-over-tcp), a tunnel for proxying UDP traffic over a TCP stream. Available as `services.udp-over-tcp`.
|
||||
|
||||
- [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable).
|
||||
|
||||
@@ -790,9 +790,6 @@ class Machine:
|
||||
def stop_job(self, jobname: str, user: str | None = None) -> tuple[int, str]:
|
||||
return self.systemctl(f"stop {jobname}", user)
|
||||
|
||||
def wait_for_job(self, jobname: str) -> None:
|
||||
self.wait_for_unit(jobname)
|
||||
|
||||
def connect(self) -> None:
|
||||
def shell_ready(timeout_secs: int) -> bool:
|
||||
"""We sent some data from the backdoor service running on the guest
|
||||
|
||||
@@ -49,5 +49,5 @@ in
|
||||
systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ luckshiba ];
|
||||
meta.maintainers = lib.teams.danklinux.maintainers;
|
||||
}
|
||||
|
||||
@@ -14,10 +14,20 @@ let
|
||||
types
|
||||
optional
|
||||
optionals
|
||||
mapAttrs
|
||||
mapAttrs'
|
||||
filterAttrs
|
||||
;
|
||||
|
||||
cfg = config.programs.dms-shell;
|
||||
|
||||
path = [
|
||||
"programs"
|
||||
"dms-shell"
|
||||
];
|
||||
|
||||
builtInRemovedMsg = "This is now built-in in DMS and doesn't need additional dependencies.";
|
||||
|
||||
optionalPackages =
|
||||
optionals cfg.enableSystemMonitoring [ pkgs.dgop ]
|
||||
++ optionals cfg.enableClipboard [
|
||||
@@ -28,20 +38,33 @@ let
|
||||
pkgs.glib
|
||||
pkgs.networkmanager
|
||||
]
|
||||
++ optional cfg.enableBrightnessControl pkgs.brightnessctl
|
||||
++ optional cfg.enableColorPicker pkgs.hyprpicker
|
||||
++ optional cfg.enableDynamicTheming pkgs.matugen
|
||||
++ optional cfg.enableAudioWavelength pkgs.cava
|
||||
++ optional cfg.enableCalendarEvents pkgs.khal
|
||||
++ optional cfg.enableSystemSound pkgs.kdePackages.qtmultimedia;
|
||||
++ optional cfg.enableCalendarEvents pkgs.khal;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule (path ++ [ "enableBrightnessControl" ]) builtInRemovedMsg)
|
||||
(lib.mkRemovedOptionModule (path ++ [ "enableColorPicker" ]) builtInRemovedMsg)
|
||||
(lib.mkRemovedOptionModule (
|
||||
path ++ [ "enableSystemSound" ]
|
||||
) "qtmultimedia is now included on dms-shell package.")
|
||||
];
|
||||
|
||||
options.programs.dms-shell = {
|
||||
enable = mkEnableOption "DankMaterialShell, a complete desktop shell for Wayland compositors";
|
||||
|
||||
package = mkPackageOption pkgs "dms-shell" { };
|
||||
|
||||
systemd = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable DankMaterialShell systemd startup service.
|
||||
'';
|
||||
};
|
||||
|
||||
target = mkOption {
|
||||
type = types.str;
|
||||
default = "graphical-session.target";
|
||||
@@ -98,28 +121,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
enableBrightnessControl = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install dependencies required for brightness and backlight control.
|
||||
This enables screen brightness adjustment widgets.
|
||||
|
||||
Requires: brightnessctl
|
||||
'';
|
||||
};
|
||||
|
||||
enableColorPicker = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install dependencies required for color picking functionality.
|
||||
This enables on-screen color picker tools.
|
||||
|
||||
Requires: hyprpicker
|
||||
'';
|
||||
};
|
||||
|
||||
enableDynamicTheming = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@@ -153,50 +154,79 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
enableSystemSound = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install dependencies required for system sound support.
|
||||
This enables audio playback for system notifications and events.
|
||||
|
||||
Requires: qtmultimedia
|
||||
'';
|
||||
};
|
||||
|
||||
quickshell = {
|
||||
package = mkPackageOption pkgs "quickshell" { };
|
||||
};
|
||||
|
||||
plugins = mkOption {
|
||||
type = types.attrsOf (
|
||||
types.submodule {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable this plugin";
|
||||
};
|
||||
src = mkOption {
|
||||
type = types.either types.package types.path;
|
||||
description = "Source of the plugin package or path";
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
default = { };
|
||||
description = "DMS Plugins to install and enable";
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
DockerManager = {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "LuckShiba";
|
||||
repo = "DmsDockerManager";
|
||||
rev = "v1.2.0";
|
||||
sha256 = "sha256-VoJCaygWnKpv0s0pqTOmzZnPM922qPDMHk4EPcgVnaU=";
|
||||
};
|
||||
};
|
||||
AnotherPlugin = {
|
||||
enable = true;
|
||||
src = pkgs.another-plugin;
|
||||
};
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.etc."xdg/quickshell/dms".source = "${cfg.package}/share/quickshell/dms";
|
||||
systemd.packages = lib.mkIf cfg.systemd.enable [ cfg.package ];
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.user.services.dms = {
|
||||
systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
|
||||
wantedBy = [ cfg.systemd.target ];
|
||||
restartTriggers = optional cfg.systemd.restartIfChanged "${cfg.package}/share/quickshell/dms";
|
||||
restartIfChanged = cfg.systemd.restartIfChanged;
|
||||
path = lib.mkForce [ ];
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
cfg.package
|
||||
cfg.quickshell.package
|
||||
pkgs.ddcutil
|
||||
pkgs.libsForQt5.qt5ct
|
||||
pkgs.kdePackages.qt6ct
|
||||
]
|
||||
++ optionalPackages;
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
fira-code
|
||||
inter
|
||||
material-symbols
|
||||
];
|
||||
environment.etc =
|
||||
mapAttrs'
|
||||
(name: value: {
|
||||
name = "xdg/quickshell/dms-plugins/${name}";
|
||||
inherit value;
|
||||
})
|
||||
(
|
||||
mapAttrs (name: plugin: {
|
||||
source = plugin.src;
|
||||
}) (filterAttrs (n: v: v.enable) cfg.plugins)
|
||||
);
|
||||
|
||||
services.power-profiles-daemon.enable = lib.mkDefault true;
|
||||
services.accounts-daemon.enable = lib.mkDefault true;
|
||||
hardware.i2c.enable = lib.mkDefault true;
|
||||
hardware.graphics.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ luckshiba ];
|
||||
meta.maintainers = lib.teams.danklinux.maintainers;
|
||||
}
|
||||
|
||||
@@ -13,16 +13,19 @@ let
|
||||
mkIf
|
||||
mkDefault
|
||||
mkPackageOption
|
||||
mkRemovedOptionModule
|
||||
literalExpression
|
||||
getExe
|
||||
makeBinPath
|
||||
optionalString
|
||||
concatMapStringsSep
|
||||
escapeShellArgs
|
||||
;
|
||||
|
||||
cfg = config.services.displayManager.dms-greeter;
|
||||
cfgAutoLogin = config.services.displayManager.autoLogin;
|
||||
|
||||
cacheDir = "/var/lib/dms-greeter";
|
||||
|
||||
greeterScript = pkgs.writeShellScriptBin "dms-greeter-start" ''
|
||||
export PATH=$PATH:${
|
||||
makeBinPath [
|
||||
@@ -30,18 +33,28 @@ let
|
||||
config.programs.${cfg.compositor.name}.package
|
||||
]
|
||||
}
|
||||
exec ${cfg.package}/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \
|
||||
--command ${cfg.compositor.name} \
|
||||
-p ${cfg.package}/share/quickshell/dms \
|
||||
--cache-dir /var/lib/dms-greeter \
|
||||
${
|
||||
optionalString (
|
||||
cfg.compositor.customConfig != ""
|
||||
) "-C ${pkgs.writeText "dms-greeter-compositor-config" cfg.compositor.customConfig}"
|
||||
} \
|
||||
${optionalString cfg.logs.save ">> ${cfg.logs.path} 2>&1"}
|
||||
${
|
||||
escapeShellArgs (
|
||||
[
|
||||
"sh"
|
||||
"${cfg.package}/share/quickshell/dms/Modules/Greetd/assets/dms-greeter"
|
||||
"--cache-dir"
|
||||
cacheDir
|
||||
"--command"
|
||||
cfg.compositor.name
|
||||
"-p"
|
||||
"${cfg.package}/share/quickshell/dms"
|
||||
]
|
||||
++ lib.optionals (cfg.compositor.customConfig != "") [
|
||||
"-C"
|
||||
"${pkgs.writeText "dmsgreeter-compositor-config" cfg.compositor.customConfig}"
|
||||
]
|
||||
)
|
||||
} ${optionalString cfg.logs.save "> ${cfg.logs.path} 2>&1"}
|
||||
'';
|
||||
|
||||
jq = getExe pkgs.jq;
|
||||
|
||||
configFilesFromHome =
|
||||
if cfg.configHome != null then
|
||||
[
|
||||
@@ -180,7 +193,7 @@ in
|
||||
];
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
enable = mkDefault true;
|
||||
settings = {
|
||||
default_session = {
|
||||
user = "dms-greeter";
|
||||
@@ -200,7 +213,7 @@ in
|
||||
material-symbols
|
||||
];
|
||||
|
||||
systemd.tmpfiles.settings."10-dms-greeter"."/var/lib/dms-greeter".d = {
|
||||
systemd.tmpfiles.settings."10-dms-greeter".${cacheDir}.d = {
|
||||
user = "dms-greeter";
|
||||
group = "dms-greeter";
|
||||
mode = "0750";
|
||||
@@ -211,40 +224,64 @@ in
|
||||
allConfigFiles = cfg.configFiles ++ configFilesFromHome;
|
||||
in
|
||||
''
|
||||
set -euo pipefail
|
||||
|
||||
cd /var/lib/dms-greeter || exit 1
|
||||
|
||||
${concatMapStringsSep "\n" (f: ''
|
||||
if [[ -f "${f}" ]]; then
|
||||
cp "${f}" . || true
|
||||
fi
|
||||
'') allConfigFiles}
|
||||
|
||||
# Handle session.json wallpaper path
|
||||
if [[ -f session.json ]]; then
|
||||
if wallpaper=$(${getExe pkgs.jq} -r '.wallpaperPath' session.json 2>/dev/null); then
|
||||
if [[ -f "$wallpaper" ]]; then
|
||||
cp "$wallpaper" wallpaper.jpg || true
|
||||
mv session.json session.orig.json
|
||||
${getExe pkgs.jq} '.wallpaperPath = "/var/lib/dms-greeter/wallpaper.jpg"' \
|
||||
session.orig.json > session.json || true
|
||||
cd ${cacheDir}
|
||||
${lib.concatStringsSep "\n" (
|
||||
lib.map (f: ''
|
||||
if [ -f "${f}" ]; then
|
||||
cp "${f}" .
|
||||
fi
|
||||
fi
|
||||
'') allConfigFiles
|
||||
)}
|
||||
|
||||
if [ -f session.json ]; then
|
||||
copy_wallpaper() {
|
||||
local path=$(${jq} -r ".$1 // empty" session.json)
|
||||
if [ -f "$path" ]; then
|
||||
cp "$path" "$2"
|
||||
${jq} ".$1 = \"${cacheDir}/$2\"" session.json > session.tmp
|
||||
mv session.tmp session.json
|
||||
fi
|
||||
}
|
||||
|
||||
copy_monitor_wallpapers() {
|
||||
${jq} -r ".$1 // {} | to_entries[] | .key + \":\" + .value" session.json 2>/dev/null | while IFS=: read monitor path; do
|
||||
local dest="$2-$(echo "$monitor" | tr -c '[:alnum:]' '-')"
|
||||
if [ -f "$path" ]; then
|
||||
cp "$path" "$dest"
|
||||
${jq} --arg m "$monitor" --arg p "${cacheDir}/$dest" ".$1[\$m] = \$p" session.json > session.tmp
|
||||
mv session.tmp session.json
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
copy_wallpaper "wallpaperPath" "wallpaper"
|
||||
copy_wallpaper "wallpaperPathLight" "wallpaper-light"
|
||||
copy_wallpaper "wallpaperPathDark" "wallpaper-dark"
|
||||
copy_monitor_wallpapers "monitorWallpapers" "wallpaper-monitor"
|
||||
copy_monitor_wallpapers "monitorWallpapersLight" "wallpaper-monitor-light"
|
||||
copy_monitor_wallpapers "monitorWallpapersDark" "wallpaper-monitor-dark"
|
||||
fi
|
||||
|
||||
# Rename colors file if it exists
|
||||
[[ -f dms-colors.json ]] && mv dms-colors.json colors.json || true
|
||||
if [ -f settings.json ]; then
|
||||
if cp "$(${jq} -r '.customThemeFile' settings.json)" custom-theme.json; then
|
||||
mv settings.json settings.orig.json
|
||||
${jq} '.customThemeFile = "${cacheDir}/custom-theme.json"' settings.orig.json > settings.json
|
||||
fi
|
||||
fi
|
||||
|
||||
# Fix ownership of all files
|
||||
chown -R "dms-greeter:dms-greeter" . || true
|
||||
mv dms-colors.json colors.json || :
|
||||
chown dms-greeter:dms-greeter * || :
|
||||
'';
|
||||
|
||||
services.displayManager.dms-greeter.configFiles = lib.mkIf (
|
||||
cfg.configHome != null
|
||||
) configFilesFromHome;
|
||||
|
||||
users.groups.dms-greeter = { };
|
||||
users.users.dms-greeter = {
|
||||
description = "DankMaterialShell greeter user";
|
||||
isSystemUser = true;
|
||||
home = "/var/lib/dms-greeter";
|
||||
home = cacheDir;
|
||||
homeMode = "0750";
|
||||
createHome = true;
|
||||
group = "dms-greeter";
|
||||
@@ -257,5 +294,5 @@ in
|
||||
services.libinput.enable = mkDefault true;
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ luckshiba ];
|
||||
meta.maintainers = lib.teams.danklinux.maintainers;
|
||||
}
|
||||
|
||||
@@ -295,20 +295,6 @@ in
|
||||
|
||||
enableLmtp = mkEnableOption "starting the LMTP listener (when Dovecot is enabled)";
|
||||
|
||||
hasNewUnitName = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
readOnly = true;
|
||||
internal = true;
|
||||
description = ''
|
||||
Inspectable option to confirm that the dovecot module uses the new
|
||||
`dovecot.service` name, instead of `dovecot2.service`.
|
||||
|
||||
This is a helper added for the nixos-mailserver project and can be
|
||||
removed after branching off nixos-25.11.
|
||||
'';
|
||||
};
|
||||
|
||||
protocols = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
@@ -705,7 +691,6 @@ in
|
||||
environment.etc."dovecot/dovecot.conf".source = cfg.configFile;
|
||||
|
||||
systemd.services.dovecot = {
|
||||
aliases = [ "dovecot2.service" ];
|
||||
description = "Dovecot IMAP/POP3 server";
|
||||
documentation = [
|
||||
"man:dovecot(1)"
|
||||
|
||||
@@ -22,7 +22,7 @@ let
|
||||
if config.services.postgresql.enable then
|
||||
config.services.postgresql.package
|
||||
else
|
||||
pkgs.postgresql_14;
|
||||
pkgs.postgresql_16;
|
||||
|
||||
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
|
||||
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
|
||||
|
||||
@@ -185,7 +185,7 @@ let
|
||||
type = types.nullOr nonEmptyStr;
|
||||
description = ''
|
||||
Label of the device. This simply sets {option}`device` to
|
||||
`/dev/disk/by-id/''${label}`. Note that devices will not
|
||||
`/dev/disk/by-label/''${label}`. Note that devices will not
|
||||
have a label unless they contain a filesystem which
|
||||
supports labels, such as ext4 or fat32.
|
||||
'';
|
||||
|
||||
@@ -52,7 +52,7 @@ let
|
||||
|
||||
with subtest("Do a backup and wait for it to start"):
|
||||
machine.start_job("automysqlbackup.service")
|
||||
machine.wait_for_job("automysqlbackup.service")
|
||||
machine.wait_for_unit("automysqlbackup.service")
|
||||
|
||||
with subtest("wait for backup file and check that data appears in backup"):
|
||||
machine.wait_for_file("/var/backup/mysql/daily/testdb")
|
||||
|
||||
@@ -6036,6 +6036,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gruvbox-alabaster-nvim = buildVimPlugin {
|
||||
pname = "gruvbox-alabaster.nvim";
|
||||
version = "2025-12-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xoconoch";
|
||||
repo = "gruvbox-alabaster.nvim";
|
||||
rev = "246822279aa2c23b9374c5aee8ee71dbc06d26e6";
|
||||
sha256 = "0l5r429al3m6l65lvq6mlvbgpga8081swpigixhbm5sw728npfhz";
|
||||
};
|
||||
meta.homepage = "https://github.com/Xoconoch/gruvbox-alabaster.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gruvbox-baby = buildVimPlugin {
|
||||
pname = "gruvbox-baby";
|
||||
version = "2024-01-25";
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
vimUtils,
|
||||
}:
|
||||
let
|
||||
version = "d88922e-unstable-2025-12-07";
|
||||
version = "e3f788f-unstable-2025-12-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtrKovalenko";
|
||||
repo = "fff.nvim";
|
||||
rev = "d88922e6c74b357cfd029128ce5ecd813b6eb747";
|
||||
hash = "sha256-XdDSyRHAZxRjziFwnEjjIrKSf8S+CHZw74P/O9O7C88=";
|
||||
rev = "e3f788f87b014f61e39cd916edc766d10e563d73";
|
||||
hash = "sha256-NSTo5zs9DvGDVUp6PJNHCQsSNPgdkJCTYvlA/IP12h4=";
|
||||
};
|
||||
fff-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "fff-nvim-lib";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-+se3u1ib3Ghy1tHIPpCY8sPgaQRaYCYGdJ8up+bubpM=";
|
||||
cargoHash = "sha256-kNTJC+0KBQKt0nMY2HAUWnr55x8nTd5oRGeDuam8X30=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -462,6 +462,7 @@ https://github.com/liuchengxu/graphviz.vim/,,
|
||||
https://github.com/cbochs/grapple.nvim/,HEAD,
|
||||
https://github.com/blazkowolf/gruber-darker.nvim/,,
|
||||
https://github.com/morhetz/gruvbox/,,
|
||||
https://github.com/Xoconoch/gruvbox-alabaster.nvim/,HEAD,
|
||||
https://github.com/luisiacc/gruvbox-baby/,HEAD,
|
||||
https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
|
||||
https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
|
||||
|
||||
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
name = "harper";
|
||||
publisher = "elijah-potter";
|
||||
version = harper.version;
|
||||
hash = "sha256-ifOUhBsEtBNGB4m+y6p82ZNk2CAeyTzmgz76GRh+f90=";
|
||||
hash = "sha256-84yN7qiGaNp9XtLYOOOw1vWkiH9wAH1Tp9rE/8Vpk7A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
|
||||
meta = {
|
||||
description = "Debugging with LLDB in Visual Studio Code";
|
||||
downloadPage = "hhttps://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.lldb-dap";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.lldb-dap";
|
||||
homepage = "https://github.com/llvm/llvm-project";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.m0nsterrr ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
mkLibretroCore rec {
|
||||
core = "fbalpha2012";
|
||||
version = "0-unstable-2024-10-21";
|
||||
version = "0-unstable-2025-12-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbalpha2012";
|
||||
rev = "77167cea72e808384c136c8c163a6b4975ce7a84";
|
||||
hash = "sha256-giEV09dT/e82bmDlRkxpkW04JcsEZc/enIPecqYtg3c=";
|
||||
rev = "c547d8cf3f7748f4094cee658a5d31ec1b79ece4";
|
||||
hash = "sha256-owy8IuJ/dAEbUH7hGCR3oLiI4tYuwsNfRYRl6LmyYfc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/svn-current/trunk";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "flycast";
|
||||
version = "0-unstable-2025-11-22";
|
||||
version = "0-unstable-2025-12-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "1666eb0875613ee16b04e08be8ed89c27dbd5c25";
|
||||
hash = "sha256-uQvr4C8iO+3FXh6ki+Rgv7Y/+p1WHwXuqy9Xyq4gSeo=";
|
||||
rev = "37a9077304908196193b20d5f314dd86fe0578e1";
|
||||
hash = "sha256-zYQHP9DohTurAY4j1Vj73YvSHZHXFSsEa30UETORAyA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2025-11-03";
|
||||
version = "0-unstable-2025-12-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "77c62d3a942e219bc9d072b4800fa0881208ce2a";
|
||||
hash = "sha256-ROrANubftSJwGl9THdAIRhSFOy1uHZ6v2kAmYWLDhN0=";
|
||||
rev = "6400e0f0d8a1e2345def663bc646e8adc0e42e76";
|
||||
hash = "sha256-2hmeEuO+Z0FDyDYiA59ntXl24B5OcLWuvxbiLLfiWE8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -174,7 +174,6 @@ rec {
|
||||
};
|
||||
|
||||
meta = redshift.meta // {
|
||||
name = "${pname}-${version}";
|
||||
longDescription = "Gammastep" + lib.removePrefix "Redshift" redshift.meta.longDescription;
|
||||
homepage = "https://gitlab.com/chinstrap/gammastep";
|
||||
mainProgram = "gammastep";
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
microsoft-gsl,
|
||||
nlohmann_json,
|
||||
xar,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -57,6 +57,7 @@ let
|
||||
python3
|
||||
qt5.wrapQtAppsHook
|
||||
qt5.qttools
|
||||
makeBinaryWrapper
|
||||
]
|
||||
++ (overrides.nativeBuildInputs or [ ]);
|
||||
|
||||
@@ -107,9 +108,6 @@ let
|
||||
platforms = lib.platforms.darwin;
|
||||
nativeBuildInputs = [
|
||||
qt5.qttools
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -173,11 +171,11 @@ let
|
||||
mv $out/Mumble.app $out/Applications/Mumble.app
|
||||
|
||||
# ensure that the app can be started from the shell
|
||||
makeWrapper $out/Applications/Mumble.app/Contents/MacOS/mumble $out/bin/mumble
|
||||
makeBinaryWrapper $out/Applications/Mumble.app/Contents/MacOS/mumble $out/bin/mumble
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
wrapProgram $out/bin/mumble \
|
||||
wrapProgramBinary $out/bin/mumble \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath (
|
||||
lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire
|
||||
|
||||
@@ -1,88 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
SDL2,
|
||||
cmake,
|
||||
libGL,
|
||||
libX11,
|
||||
libXrandr,
|
||||
libvdpau,
|
||||
mpv,
|
||||
ninja,
|
||||
pkg-config,
|
||||
python3,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtwayland,
|
||||
qtdeclarative,
|
||||
qtwebchannel,
|
||||
qtwebengine,
|
||||
qtx11extras,
|
||||
jellyfin-web,
|
||||
withDbus ? stdenv.hostPlatform.isLinux,
|
||||
mpvqt,
|
||||
libcec,
|
||||
SDL2,
|
||||
libXrandr,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.12.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IXinyenadnW+a+anQ9e61h+N8vG2r77JPboHm5dN4Iw=";
|
||||
hash = "sha256-tdjmOeuC3LFEIDSH8X9LG/myvE1FoxwR1zpDQRyaTkQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix the location of the jellyfin-web path
|
||||
./fix-web-path.patch
|
||||
# disable update notifications since the end user can't simply download the release artifacts to update
|
||||
./disable-update-notifications.patch
|
||||
|
||||
# cmake 4 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jellyfin/jellyfin-media-player/commit/6c5c603a1db489872832ed560581d98fdee89d6f.patch";
|
||||
hash = "sha256-Blq7y7kOygbZ6uKxPJl9aDXJWqhE0jnM5GNEAwyQEA0=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
libGL
|
||||
libX11
|
||||
libXrandr
|
||||
libvdpau
|
||||
mpv
|
||||
qtbase
|
||||
qtwebchannel
|
||||
qtwebengine
|
||||
qtx11extras
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
qtwayland
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtwebchannel
|
||||
qtwebengine
|
||||
|
||||
mpvqt
|
||||
|
||||
# input sources
|
||||
libcec
|
||||
SDL2
|
||||
|
||||
# frame rate switching
|
||||
libXrandr
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DQTROOT=${qtbase}"
|
||||
"-GNinja"
|
||||
]
|
||||
++ lib.optionals (!withDbus) [
|
||||
"-DLINUX_X11POWER=ON"
|
||||
"-DCHECK_FOR_UPDATES=OFF"
|
||||
"-DUSE_STATIC_MPVQT=OFF"
|
||||
# workaround for Qt cmake weirdness
|
||||
"-DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# link the jellyfin-web files to be copied by cmake (see fix-web-path.patch)
|
||||
ln -s ${jellyfin-web}/share/jellyfin-web .
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/bin $out/Applications
|
||||
mv "$out/Jellyfin Media Player.app" $out/Applications
|
||||
@@ -91,7 +62,7 @@ mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/jellyfin/jellyfin-media-player";
|
||||
description = "Jellyfin Desktop Client based on Plex Media Player";
|
||||
description = "Jellyfin Desktop Client";
|
||||
license = with lib.licenses; [
|
||||
gpl2Only
|
||||
mit
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/resources/settings/settings_description.json b/resources/settings/settings_description.json
|
||||
index 3329d0d..ccd5718 100644
|
||||
--- a/resources/settings/settings_description.json
|
||||
+++ b/resources/settings/settings_description.json
|
||||
@@ -127,7 +127,7 @@
|
||||
"value": "checkForUpdates",
|
||||
"display_name": "Check For Updates",
|
||||
"help": "Allows user to disable update check plugin script.",
|
||||
- "default": true
|
||||
+ "default": false
|
||||
},
|
||||
{
|
||||
"value": "enableInputRepeat",
|
||||
@@ -1,38 +0,0 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 9df49da..be1c479 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -106,7 +106,8 @@ endif()
|
||||
set(RESOURCE_ROOT .)
|
||||
if(APPLE)
|
||||
set(RESOURCE_ROOT Resources)
|
||||
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
|
||||
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
|
||||
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
|
||||
endif()
|
||||
|
||||
if(NOT APPLE)
|
||||
@@ -119,6 +120,7 @@ if(NOT APPLE)
|
||||
install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
|
||||
endif()
|
||||
endforeach()
|
||||
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
|
||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
|
||||
endif()
|
||||
|
||||
diff --git a/src/settings/SettingsComponent.cpp b/src/settings/SettingsComponent.cpp
|
||||
index c398523..7023948 100644
|
||||
--- a/src/settings/SettingsComponent.cpp
|
||||
+++ b/src/settings/SettingsComponent.cpp
|
||||
@@ -748,7 +748,7 @@ QString SettingsComponent::getWebClientUrl(bool desktop)
|
||||
|
||||
if (url == "bundled")
|
||||
{
|
||||
- auto path = Paths::webExtensionPath() + "find-webclient.html";
|
||||
+ auto path = Paths::webClientPath("desktop");
|
||||
|
||||
url = "file:///" + path;
|
||||
}
|
||||
--
|
||||
2.36.0
|
||||
|
||||
@@ -82,13 +82,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ansel";
|
||||
version = "0-unstable-2025-12-01";
|
||||
version = "0-unstable-2025-12-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aurelienpierreeng";
|
||||
repo = "ansel";
|
||||
rev = "845679e472b40f092d574d1bcb71e9e95d3366da";
|
||||
hash = "sha256-6aB6sBDh/0XGLK3M206oxCTBPqy+AbDJL4DrvNbSFU4=";
|
||||
rev = "06961da4b03abff051c4abff32eeb6356894809e";
|
||||
hash = "sha256-UJC1TBGga52/d1uRkZzCJtNcivql7zjGEUP7mav56wk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "asleap";
|
||||
version = "0-unstable-2020-11-28";
|
||||
version = "0-unstable-2021-06-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joswr1ght";
|
||||
owner = "zackw";
|
||||
repo = "asleap";
|
||||
rev = "254acabba34cb44608c9d2dcf7a147553d3d5ba3";
|
||||
hash = "sha256-MQjPup3EX7DCXY/zyroTj/+U2GIq12+VQQJD0gru7C8=";
|
||||
rev = "eb3bd42098cba42b65f499c9d8c73d890861b94f";
|
||||
hash = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -34,7 +34,9 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch=zack/no-external-crypto" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/zackw/asleap";
|
||||
|
||||
@@ -23,24 +23,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.24.1";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bpftrace";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Wt1MXKOg48477HMszq1GAjs+ZELbfAfp+P2AYa+dg+Q=";
|
||||
hash = "sha256-LkiHwmKU+TOtn6mDvlqIKvSOQaU320aVQOkcElzB7gM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "attach_tracepoint_with_enums.patch";
|
||||
url = "https://github.com/bpftrace/bpftrace/pull/4714.patch";
|
||||
includes = [ "src/ast/passes/clang_parser.cpp" ];
|
||||
hash = "sha256-xk+/eBNJJJSUqNTs0HFr0BAaqRB5B7CNWRSmnoBMTs0=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = with llvmPackages; [
|
||||
llvm
|
||||
libclang
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
let
|
||||
pname = "cables";
|
||||
version = "0.8.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
|
||||
@@ -18,7 +17,7 @@ let
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
postExtract = ''
|
||||
substituteInPlace $out/${pname}-${version}.desktop --replace 'Exec=AppRun' 'Exec=cables'
|
||||
substituteInPlace $out/cables-${version}.desktop --replace 'Exec=AppRun' 'Exec=cables'
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -27,8 +26,8 @@ appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${name}.desktop $out/share/applications/cables.desktop
|
||||
install -m 444 -D ${appimageContents}/${name}.png $out/share/icons/hicolor/512x512/apps/cables.png
|
||||
install -m 444 -D ${appimageContents}/cables-${version}.desktop $out/share/applications/cables.desktop
|
||||
install -m 444 -D ${appimageContents}/cables-${version}.png $out/share/icons/hicolor/512x512/apps/cables.png
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
let
|
||||
pname = "capacities";
|
||||
version = "1.52.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20250519011655/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/capacities-${version}.AppImage";
|
||||
|
||||
@@ -12,15 +12,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "clutter-gtk";
|
||||
version = "1.8.4";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "clutter-gtk";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
url = "mirror://gnome/sources/clutter-gtk/${lib.versions.majorMinor version}/clutter-gtk-${version}.tar.xz";
|
||||
sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
|
||||
};
|
||||
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "clutter";
|
||||
version = "1.26.4";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
stdenv.mkDerivation {
|
||||
pname = "clutter";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
url = "mirror://gnome/sources/clutter/${lib.versions.majorMinor version}/clutter-${version}.tar.xz";
|
||||
sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b";
|
||||
};
|
||||
|
||||
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
packageName = "clutter";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -66,13 +66,15 @@ stdenv.mkDerivation {
|
||||
pname = "corefonts";
|
||||
version = "1";
|
||||
|
||||
exes = map (
|
||||
{ name, hash }:
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/corefonts/the%20fonts/final/${name}32.exe";
|
||||
inherit hash;
|
||||
}
|
||||
) fonts;
|
||||
env.exes = toString (
|
||||
map (
|
||||
{ name, hash }:
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/corefonts/the%20fonts/final/${name}32.exe";
|
||||
inherit hash;
|
||||
}
|
||||
) fonts
|
||||
);
|
||||
|
||||
nativeBuildInputs = [ cabextract ];
|
||||
|
||||
@@ -137,6 +139,8 @@ stdenv.mkDerivation {
|
||||
done
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://corefonts.sourceforge.net/";
|
||||
description = "Microsoft's TrueType core fonts for the Web";
|
||||
|
||||
@@ -45,7 +45,7 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/AvengeMedia/dgop";
|
||||
changelog = "https://github.com/AvengeMedia/dgop/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ luckshiba ];
|
||||
teams = [ lib.teams.danklinux ];
|
||||
mainProgram = "dgop";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -7,68 +7,96 @@
|
||||
procps,
|
||||
nix-update-script,
|
||||
bashNonInteractive,
|
||||
fprintd,
|
||||
kdePackages,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dms-shell";
|
||||
version = "0.6.2";
|
||||
buildGoModule (
|
||||
finalAttrs:
|
||||
let
|
||||
qmlPkgs = with kdePackages; [
|
||||
kirigami.unwrapped
|
||||
sonnet
|
||||
qtmultimedia
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "DankMaterialShell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dLbiTWsKoF0if/Wqet/+L90ILdAaBqp+REGOou8uH3k=";
|
||||
};
|
||||
qmlImportPath = lib.concatStringsSep ":" (map (o: "${o}/${qt6.qtbase.qtQmlPrefix}") qmlPkgs);
|
||||
qtPluginPath = lib.concatStringsSep ":" (map (o: "${o}/${qt6.qtbase.qtPluginPrefix}") qmlPkgs);
|
||||
in
|
||||
{
|
||||
pname = "dms-shell";
|
||||
version = "1.0.2";
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/core";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "DankMaterialShell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rWjWYu5rs3ZOJ4YJpvIscBZSYu74thJHc0VYyYKJTUc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nc4CvEPfJ6l16/zmhnXr1jqpi6BeSXd3g/51djbEfpQ=";
|
||||
sourceRoot = "${finalAttrs.src.name}/core";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
];
|
||||
vendorHash = "sha256-2PCqiW4frxME8IlmwWH5ktznhd/G1bah5Ae4dp0HPTQ=";
|
||||
|
||||
subPackages = [ "cmd/dms" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
subPackages = [ "cmd/dms" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/quickshell
|
||||
cp -r ${finalAttrs.src}/quickshell $out/share/quickshell/dms
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
wrapProgram $out/bin/dms --add-flags "-c $out/share/quickshell/dms"
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/quickshell/dms
|
||||
cp -r ${finalAttrs.src}/quickshell/. $out/share/quickshell/dms/
|
||||
|
||||
install -Dm644 ${finalAttrs.src}/quickshell/assets/systemd/dms.service \
|
||||
$out/lib/systemd/user/dms.service
|
||||
substituteInPlace $out/lib/systemd/user/dms.service \
|
||||
--replace-fail /usr/bin/dms $out/bin/dms \
|
||||
--replace-fail /usr/bin/pkill ${procps}/bin/pkill
|
||||
install -D ${finalAttrs.src}/assets/dms-open.desktop \
|
||||
$out/share/applications/dms-open.desktop
|
||||
install -D ${finalAttrs.src}/core/assets/danklogo.svg \
|
||||
$out/share/hicolor/scalable/apps/danklogo.svg
|
||||
|
||||
substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \
|
||||
--replace-fail /bin/bash ${bashNonInteractive}/bin/bash
|
||||
wrapProgram $out/bin/dms \
|
||||
--add-flags "-c $out/share/quickshell/dms" \
|
||||
--prefix "NIXPKGS_QT6_QML_IMPORT_PATH" ":" "${qmlImportPath}" \
|
||||
--prefix "QT_PLUGIN_PATH" ":" "${qtPluginPath}"
|
||||
|
||||
installShellCompletion --cmd dms \
|
||||
--bash <($out/bin/dms completion bash) \
|
||||
--fish <($out/bin/dms completion fish) \
|
||||
--zsh <($out/bin/dms completion zsh)
|
||||
'';
|
||||
install -Dm644 ${finalAttrs.src}/assets/systemd/dms.service \
|
||||
$out/lib/systemd/user/dms.service
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
substituteInPlace $out/lib/systemd/user/dms.service \
|
||||
--replace-fail /usr/bin/dms $out/bin/dms \
|
||||
--replace-fail /usr/bin/pkill ${procps}/bin/pkill
|
||||
|
||||
meta = {
|
||||
description = "Desktop shell for wayland compositors built with Quickshell & GO";
|
||||
homepage = "https://danklinux.com";
|
||||
changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ luckshiba ];
|
||||
mainProgram = "dms";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \
|
||||
--replace-fail /bin/bash ${bashNonInteractive}/bin/bash
|
||||
|
||||
substituteInPlace $out/share/quickshell/dms/assets/pam/fprint \
|
||||
--replace-fail pam_fprintd.so ${fprintd}/lib/security/pam_fprintd.so
|
||||
|
||||
installShellCompletion --cmd dms \
|
||||
--bash <($out/bin/dms completion bash) \
|
||||
--fish <($out/bin/dms completion fish) \
|
||||
--zsh <($out/bin/dms completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "DankMaterialShell - Desktop shell for wayland compositors built with Quickshell & GO";
|
||||
homepage = "https://danklinux.com";
|
||||
changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.danklinux ];
|
||||
mainProgram = "dms";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@@ -47,7 +47,7 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/AvengeMedia/danksearch";
|
||||
changelog = "https://github.com/AvengeMedia/danksearch/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ luckshiba ];
|
||||
teams = [ lib.teams.danklinux ];
|
||||
mainProgram = "dsearch";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -14,8 +14,7 @@
|
||||
ladspaH,
|
||||
libbs2b,
|
||||
libebur128,
|
||||
libportal-qt6,
|
||||
libsamplerate,
|
||||
libmysofa,
|
||||
libsigcxx30,
|
||||
libsndfile,
|
||||
lilv,
|
||||
@@ -43,11 +42,9 @@ let
|
||||
inherit (qt6)
|
||||
qtbase
|
||||
qtgraphs
|
||||
qtwebengine
|
||||
wrapQtAppsHook
|
||||
;
|
||||
inherit (kdePackages)
|
||||
appstream-qt
|
||||
breeze
|
||||
breeze-icons
|
||||
extra-cmake-modules
|
||||
@@ -62,13 +59,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easyeffects";
|
||||
version = "8.0.6";
|
||||
version = "8.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5UPwCdpFU1SiD9nlQd99lAK7QdC9jcizj5X3BhBYJ4U=";
|
||||
hash = "sha256-Pw9rMYHrRBSttdtElWDH1YOF0tNWgb2zBzJBI9jJe4Q=";
|
||||
};
|
||||
|
||||
patches = [ ./qmlmodule-fix.patch ];
|
||||
@@ -86,7 +83,6 @@ stdenv.mkDerivation rec {
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
appstream-qt
|
||||
breeze
|
||||
breeze-icons
|
||||
deepfilternet
|
||||
@@ -103,8 +99,7 @@ stdenv.mkDerivation rec {
|
||||
qqc2-desktop-style
|
||||
libbs2b
|
||||
libebur128
|
||||
libportal-qt6
|
||||
libsamplerate
|
||||
libmysofa
|
||||
libsigcxx30
|
||||
libsndfile
|
||||
lilv
|
||||
@@ -113,7 +108,6 @@ stdenv.mkDerivation rec {
|
||||
pipewire
|
||||
qtbase
|
||||
qtgraphs
|
||||
qtwebengine
|
||||
rnnoise
|
||||
rubberband
|
||||
soundtouch
|
||||
@@ -154,7 +148,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Audio effects for PipeWire applications";
|
||||
homepage = "https://github.com/wwmm/easyeffects";
|
||||
changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/src/contents/docs/community/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
getchoo
|
||||
|
||||
@@ -9,7 +9,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
version = "5.0";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${version}.zip";
|
||||
sha256 = "sha256-3+w9n6GJQg9+HfHYukC7tlm4GVs8vEOO23hrLw6qjTY=";
|
||||
};
|
||||
|
||||
@@ -4,12 +4,11 @@
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "eduli";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip";
|
||||
hash = "sha256-bDQtLugYPWwJJNusBLEJrgIVufocRK4NIR0CCGaTkyw=";
|
||||
};
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -26,6 +27,15 @@ buildGoModule rec {
|
||||
"-w"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion \
|
||||
--bash ./completions/fabric.bash \
|
||||
--zsh ./completions/_fabric \
|
||||
--fish ./completions/fabric.fish
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,10 +5,9 @@
|
||||
fira-sans,
|
||||
}:
|
||||
|
||||
symlinkJoin rec {
|
||||
symlinkJoin {
|
||||
pname = "fira";
|
||||
inherit (fira-sans) version;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
paths = [
|
||||
fira-mono
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flirt";
|
||||
version = "0.4";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~hadronized";
|
||||
repo = "flirt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wH6WLLUqUj5YrrudNbGkzZ4i15xRPDBE3UKwyhkQSxg=";
|
||||
hash = "sha256-L7BiNA/cG7e1GX9sOxwwLS5+2/Tpb1PeA/2rPz8ALf8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-m1aLJFa6C5X9HwNweezoUcFnpG09AuYf9ooet8GUGFE=";
|
||||
cargoHash = "sha256-roPPL9zR8JBr3Ya2IhkvIOfnKxuRSXdxxaJ80ZUK87M=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
+13
-2
@@ -31,8 +31,6 @@
|
||||
libiconvReal,
|
||||
svnSupport ? false,
|
||||
subversionClient,
|
||||
perlLibs,
|
||||
smtpPerlLibs,
|
||||
perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform,
|
||||
nlsSupport ? true,
|
||||
osxkeychainSupport ? stdenv.hostPlatform.isDarwin,
|
||||
@@ -70,6 +68,19 @@ let
|
||||
FCGIProcManager
|
||||
HTMLTagCloud
|
||||
];
|
||||
perlLibs = with perlPackages; [
|
||||
LWP
|
||||
URI
|
||||
TermReadKey
|
||||
];
|
||||
smtpPerlLibs = with perlPackages; [
|
||||
libnet
|
||||
NetSMTPSSL
|
||||
IOSocketSSL
|
||||
NetSSLeay
|
||||
AuthenSASL
|
||||
DigestHMAC
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -2,6 +2,7 @@
|
||||
buildGoModule,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
@@ -21,6 +22,7 @@ buildGoModule (finalAttrs: {
|
||||
vendorHash = "sha256-FJjC2WU1DTP8Frk2cj9Adduxv49d9uyt4G8BotzWsYU=";
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) ejabberd prosody; };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "harper";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Automattic";
|
||||
repo = "harper";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Lh612FwMvr3Dn8LxixF+igrLyGYiIFOSRzCpASB8zZ8=";
|
||||
hash = "sha256-EyS07pkPvXaC5PVHt7T/w3et3Zfbqw4nPQNdif/8I4Y=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "harper-ls";
|
||||
|
||||
cargoHash = "sha256-lNFxnp1s7WMwgauPGexWc6swVSz8GpAOYJnUszXM3G0=";
|
||||
cargoHash = "sha256-vNUsos2kI7jitS+1373npE/wS1VkcrFq3h4LvsnXne0=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hol/hol/${longVersion}/${holsubdir}.tar.gz";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "iwe";
|
||||
version = "0.0.56";
|
||||
version = "0.0.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwe-org";
|
||||
repo = "iwe";
|
||||
tag = "iwe-v${finalAttrs.version}";
|
||||
hash = "sha256-nEn2iR2/ROboalMAXJV4y8qZiN36QkaWin+sMLZSKMQ=";
|
||||
hash = "sha256-BtNeTMDttAbozFHIe/hlOkEfIFPUFSDvWsJWY9+hKfk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fi16wLc/ZQV2bJHiIo7HVP+IS8zuoJeQQ7kV0cJ9GZ8=";
|
||||
cargoHash = "sha256-TvWoleEhjsV73Qfi/yTeje1CawhdETB/dFPlah6aDwY=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package=iwe"
|
||||
|
||||
@@ -18,8 +18,8 @@ let
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}-deps";
|
||||
inherit src;
|
||||
pname = "deps-${pname}";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jdk
|
||||
|
||||
@@ -9,15 +9,22 @@
|
||||
gnugrep,
|
||||
gnused,
|
||||
openjdk17,
|
||||
freetype,
|
||||
fontconfig,
|
||||
libXi,
|
||||
libX11,
|
||||
libXext,
|
||||
libXtst,
|
||||
libXrender,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "marvin";
|
||||
version = "25.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${version}.deb";
|
||||
name = "marvin-${finalAttrs.version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${finalAttrs.version}/marvin_linux_${finalAttrs.version}.deb";
|
||||
hash = "sha256-OiTHMGKAuHadoKQMTTPRcYl/zKL+bc0ts/UNsJlHn0Q=";
|
||||
};
|
||||
|
||||
@@ -26,6 +33,16 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
fontconfig
|
||||
libXi
|
||||
libX11
|
||||
libXext
|
||||
libXtst
|
||||
libXrender
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x $src opt
|
||||
'';
|
||||
@@ -34,6 +51,7 @@ stdenv.mkDerivation rec {
|
||||
wrapBin() {
|
||||
makeWrapper $1 $out/bin/$(basename $1) \
|
||||
--set INSTALL4J_JAVA_HOME "${openjdk17}" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
@@ -72,4 +90,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,23 +4,22 @@
|
||||
fetchurl,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.1";
|
||||
|
||||
let
|
||||
pname = "meslo-lg";
|
||||
version = "1.2.1";
|
||||
|
||||
meslo-lg = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/andreberg/Meslo-Font/09a431d546d211130352c28eb0466e5d7d5aeaf0/dist/v${version}/Meslo%20LG%20v${version}.zip";
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h";
|
||||
};
|
||||
|
||||
meslo-lg-dz = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/andreberg/Meslo-Font/09a431d546d211130352c28eb0466e5d7d5aeaf0/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip";
|
||||
name = "${pname}-${version}-dz";
|
||||
sha256 = "0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
|
||||
@@ -162,11 +162,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "143.0.3650.66";
|
||||
version = "143.0.3650.80";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-Oak7r7ykODJsqzdb+cEmzkUrcezTUe+Xl9oo1lUrq6w=";
|
||||
hash = "sha256-Uoh3cx2Cw7Af4fNiK3sP3vpppjP0vHuMFYK8ngfQjwA=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -45,8 +45,12 @@ let
|
||||
'';
|
||||
|
||||
core = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
inherit src patches;
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
postPatch = commonPostPatch + ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.02)" "cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "morewaita-icon-theme";
|
||||
version = "48.4";
|
||||
version = "49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "somepaulo";
|
||||
repo = "MoreWaita";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c3wpxaANZL9SwYwUEHkW0bbv4VsdseuwORsC49kUSjg=";
|
||||
hash = "sha256-DxZ7XnIIF3EKGMPXahD+aHp6lCLRmrnywn7+qWCVflo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
version = "20060208";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version;
|
||||
url = "http://www.etallen.com/msr/${pname}-${version}.src.tar.gz";
|
||||
hash = "sha256-e01qYWbOALkXp5NpexuVodMxA3EBySejJ6ZBpZjyT+E=";
|
||||
};
|
||||
|
||||
@@ -69,7 +69,6 @@ symlinkJoin rec {
|
||||
pname = "nailgun";
|
||||
inherit client server version;
|
||||
|
||||
name = "${pname}-${version}";
|
||||
paths = [
|
||||
client
|
||||
server
|
||||
|
||||
@@ -16,14 +16,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "netbox";
|
||||
version = "4.4.6";
|
||||
version = "4.4.8";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = "netbox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i/S9/WR+GKo7wb9t23nYYERf9F6DPsSOTef3tvfFENk=";
|
||||
hash = "sha256-C7tzY6gp/jfoCf6uPGfAvO8+xHkGe7T0o0Dod+D6YRU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
libpcap,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -16,6 +17,8 @@ buildGoModule rec {
|
||||
};
|
||||
vendorHash = "sha256-8KxY3KYcaaZZjk+IIKdu8tzGhgGUlJ5nyMMSKhe41kg=";
|
||||
|
||||
buildInputs = [ libpcap ];
|
||||
|
||||
doCheck = false; # Tests require a network connection.
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "niff";
|
||||
version = "0.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
pname = "niff";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FRidh";
|
||||
|
||||
@@ -25,14 +25,14 @@ in
|
||||
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "oci-cli";
|
||||
version = "3.71.0";
|
||||
version = "3.71.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle";
|
||||
repo = "oci-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Yooaq7Jr8uu0yDGoVYhxJittJmMqhUDFSczWbFIyrN0=";
|
||||
hash = "sha256-vV67ZCvRlykrBJLa77GJ/tjq4YlWmA8Rq4DBlpLZZEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opencloud-desktop";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencloud-eu";
|
||||
repo = "desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ILOapZfySDJWZJDVFwNs46SEw/yPpe/+2dctyRl8iJ8=";
|
||||
hash = "sha256-b6KaWrthL2z/Ep+O7wFIXxjd+H8+sBqZz8nmoQijTQU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -21,11 +21,10 @@ let
|
||||
pulseaudio
|
||||
];
|
||||
pname = "pulseaudio-ctl";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "1.70";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graysky2";
|
||||
|
||||
@@ -9,12 +9,18 @@
|
||||
jre,
|
||||
fetchzip,
|
||||
buildNpmPackage,
|
||||
_experimental-update-script-combinators,
|
||||
nix-update-script,
|
||||
writeShellScript,
|
||||
gnugrep,
|
||||
nix-update,
|
||||
common-updater-scripts,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.25.1";
|
||||
apalacheVersion = "0.47.2";
|
||||
evaluatorVersion = "0.2.0";
|
||||
version = "0.29.1";
|
||||
apalacheVersion = "0.51.1";
|
||||
evaluatorVersion = "0.3.0";
|
||||
|
||||
metaCommon = {
|
||||
description = "Formal specification language with TLA+ semantics";
|
||||
@@ -28,7 +34,7 @@ let
|
||||
owner = "informalsystems";
|
||||
repo = "quint";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CYQesIoDlIGCKXIJ/hpZqOZBVd19Or5VEKVERchJz68=";
|
||||
hash = "sha256-lnvtyL4GKOyKdBDC5vevx5LgaiB7xTkfuN1rRTxKyv4=";
|
||||
};
|
||||
|
||||
# Build the Quint CLI from source
|
||||
@@ -40,7 +46,7 @@ let
|
||||
|
||||
sourceRoot = "${src.name}/quint";
|
||||
|
||||
npmDepsHash = "sha256-FYNSr5B0/oJ4PbU/HUVqSdPG8kFvq4vRFnYwwdMf+jQ=";
|
||||
npmDepsHash = "sha256-CBwovC7PTdjJHwL9lKRlJbl8rNjd9J3hVBFJz24+cbw=";
|
||||
|
||||
npmBuildScript = "compile";
|
||||
|
||||
@@ -82,7 +88,7 @@ let
|
||||
# Download Apalache. It runs on the JVM, so no need to build it from source.
|
||||
apalacheDist = fetchzip {
|
||||
url = "https://github.com/apalache-mc/apalache/releases/download/v${apalacheVersion}/apalache.tgz";
|
||||
hash = "sha256-P0QOxB14OSlphqBALR1YL9WJ0XYaUYE/R52yZytVzds=";
|
||||
hash = "sha256-xYQQH9XxPwf3+YmjiRs7XlW49LdHrEnMeuvd16Ir0B4=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -113,6 +119,30 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit
|
||||
quint-cli
|
||||
quint-evaluator
|
||||
apalacheDist
|
||||
apalacheVersion
|
||||
;
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"quint-cli"
|
||||
];
|
||||
})
|
||||
(writeShellScript "update" ''
|
||||
src=$(nix build --print-out-paths --no-link .#quint.src)
|
||||
QUINT_EVALUATOR_VERSION=$(${lib.getExe gnugrep} -m1 "const QUINT_EVALUATOR_VERSION" $src/quint/src/quintRustWrapper.ts | sed -E "s/.*= 'v?([^']+)'.*/\1/")
|
||||
${lib.getExe nix-update} quint.quint-evaluator --version $QUINT_EVALUATOR_VERSION
|
||||
DEFAULT_APALACHE_VERSION_TAG=$(${lib.getExe gnugrep} "DEFAULT_APALACHE_VERSION_TAG" $src/quint/src/apalache.ts | sed -E "s/.*= '([^']+)'.*/\1/")
|
||||
${lib.getExe' common-updater-scripts "update-source-version"} quint $DEFAULT_APALACHE_VERSION_TAG --version-key=apalacheVersion --source-key=apalacheDist --ignore-same-version --ignore-same-hash
|
||||
'')
|
||||
];
|
||||
};
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "quint";
|
||||
};
|
||||
|
||||
@@ -4,7 +4,7 @@ let
|
||||
version = "4.1";
|
||||
in
|
||||
fetchurl {
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version;
|
||||
url = "http://www.quivira-font.com/files/Quivira.otf";
|
||||
|
||||
# Download the source file to a temporary directory so that $out can be a
|
||||
|
||||
@@ -46,7 +46,8 @@ rustPlatform.buildRustPackage rec {
|
||||
sourceRoot = "${src.name}/ratman/dashboard";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${pname}-${version}-npm-deps";
|
||||
pname = "npm-deps-${pname}";
|
||||
inherit version;
|
||||
src = "${src}/ratman/dashboard";
|
||||
hash = "sha256-47L4V/Vf8DK3q63MYw3x22+rzIN3UPD0N/REmXh5h3w=";
|
||||
};
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rattler-build";
|
||||
version = "0.53.0";
|
||||
version = "0.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prefix-dev";
|
||||
repo = "rattler-build";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QxFAHfaAM0lkfunY3Qte86S0sn26mZ59ix7y9QsKQp4=";
|
||||
hash = "sha256-knbku4ckTe/iQUzixpZoraY6+tttpSlCmb6VLtVy+Bc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JKaprdd6P7Bm9MLMZuDr5HTbuvwpPJOJ/4EGLvjn9iE=";
|
||||
cargoHash = "sha256-6qCh+7aiVBOps6WEQ33395dzEx3mnwI7/qNQXvs+E+I=";
|
||||
|
||||
doCheck = false; # test requires network access
|
||||
|
||||
|
||||
@@ -4,24 +4,32 @@
|
||||
buildGoModule,
|
||||
asciidoctor,
|
||||
ruby,
|
||||
which,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "reposurgeon";
|
||||
version = "4.26";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-${version}.tar.xz";
|
||||
sha256 = "sha256-FuL5pvIM468hEm6rUBKGW6+WlYv4DPHNnpwpRGzMwlY=";
|
||||
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-XEPpZyBlTfLGtFQSCHND8OrIPB6ml8HDdg0DSvnmWh8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QpgRCnsOOZujE405dCe+PYg/zNkqnrfZFfbBFo7adjY=";
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "./repocutter -q docgen >cuttercommands.inc" 'echo "/* skipped */" >cuttercommands.inc' \
|
||||
--replace-fail "./repotool docgen >toolcommands.inc" 'echo "/* skipped */" >toolcommands.inc'
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-4bNhAWkO84imCaBzjBxNCOzG2A/z4lhqvu51wF2GVUo=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
ruby
|
||||
which
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
@@ -40,4 +48,4 @@ buildGoModule rec {
|
||||
maintainers = with lib.maintainers; [ dfoxfranke ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.10.1",
|
||||
"version": "1.11.0",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "1013az3v223l1g4yqic2mx6g8f6vamqig0y10nkkxkqd8gjr57gb"
|
||||
"sha256": "1xj5mb853qqsrrvqb3xpnh7x9yakf9vrb0xfszi5jw819ayidf4f"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "127azaiddpnb7vjgrkqc8w9a6ngplaxxb5q4l9z6pfg9j3amz615"
|
||||
"sha256": "1lrwhbk0drzaq11q6jg4aszypfdsqqnwvsk50cz213jqvnzdazhc"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "0lfp42442ji7b5blr1mxf0p1xqricq08z8d64vnzrg13bzi3g865"
|
||||
"sha256": "0hd2qhhk4ifciijdp3fsn1v9zqsmhh70mqa6b7km97lq4g1dx77r"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "0pnq95ymawcncyw0zasb3309k4rwrncmf2sqcgq3jkzi2sppmkym"
|
||||
"sha256": "1jvd5fl85lhl57wj684g1p2rhwql83lfcjpwyflzgg370v052z3r"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (
|
||||
{
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sql-formatter";
|
||||
version = "15.6.10";
|
||||
version = "15.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sql-formatter-org";
|
||||
repo = "sql-formatter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3C1NdPUuBfrDN6HRSyfu76IEV2pFIirK94kwoEhr1ZU=";
|
||||
hash = "sha256-wJfuewg3GFspcJDhR/qoymnksPvW3ZxFFOuGT/P/GDE=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
|
||||
@@ -46,10 +46,9 @@ let
|
||||
fi
|
||||
'';
|
||||
in
|
||||
symlinkJoin rec {
|
||||
symlinkJoin {
|
||||
pname = replaceStrings [ "-unwrapped" ] [ "" ] sway.pname;
|
||||
inherit (sway) version;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
paths = (optional withBaseWrapper baseWrapper) ++ [ sway ];
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
version = "4.1.17";
|
||||
version = "4.1.18";
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
|
||||
|
||||
@@ -22,10 +22,10 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-darwin = "sha256-hSti2Rpt+laWloa8ikuuDkci3o9am0KxArtYm37OjP4=";
|
||||
aarch64-linux = "sha256-JkaJmEMRzCyhBKnWpNA5tCZ67PRUPcnqC7wJTusMzI0=";
|
||||
x86_64-darwin = "sha256-YzfIcYUyHAeSRN+9nCRQKjAGQBvRU50ZzcnfjekQGEM=";
|
||||
x86_64-linux = "sha256-zBFdm2xO3k5CO/6mo8/D8D5sFwK32RA2m5VA4rTPOGA=";
|
||||
aarch64-darwin = "sha256-fydxHc6sGlgLatWN2sRuWSAshabBby8I9v3N7iYQCOE=";
|
||||
aarch64-linux = "sha256-encC22yTcYqbZlXUVTBO3aGGAPWk8ZUkI0LtO1tw6+g=";
|
||||
x86_64-darwin = "sha256-Hop3/XlqOkqj2HJ4h96SbvnThHeroRP9fDLA0xoyo6s=";
|
||||
x86_64-linux = "sha256-c3vs+NStERXqmN9p+pQCbUAsqP65EwagNbWwBBZ9qN0=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
|
||||
@@ -10,7 +10,7 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.hyperrealm.com/${pname}/${pname}-${version}.tar.gz";
|
||||
|
||||
@@ -27,7 +27,6 @@ let
|
||||
ruby = ruby_3_4;
|
||||
|
||||
deps = bundlerEnv rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "vagrant";
|
||||
inherit version;
|
||||
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "wike";
|
||||
version = "3.1.3";
|
||||
version = "3.2.0";
|
||||
pyproject = false; # built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugolabe";
|
||||
repo = "Wike";
|
||||
tag = version;
|
||||
hash = "sha256-+N9yhzIErFc0z/2JqEtit02GZKqo11viGCLoyQxtxBU=";
|
||||
hash = "sha256-4J23dUK844ZYQp9LAvaQgN2cnGaPt7eWGOFSAe7WRH8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -58,8 +58,9 @@ python3Packages.buildPythonApplication rec {
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
|
||||
patchShebangs --update $out/share/wike/wike-sp
|
||||
'';
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/wike" "$out $pythonPath"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -68,7 +69,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
meta = {
|
||||
description = "Wikipedia Reader for the GNOME Desktop";
|
||||
homepage = "https://github.com/hugolabe/Wike";
|
||||
homepage = "https://hugolabe.github.io/Wike";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ samalws ];
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "yq-go";
|
||||
version = "4.49.2";
|
||||
version = "4.50.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r+9TjdVRcHx5Ijea/4ITCqyJIngEcfzrCBP3Xlgd1xE=";
|
||||
hash = "sha256-0KVO643y3ZnXpq/0Cv3LOAf1oOOMfVEnqOs4gPG2lso=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fcjHqWLDvXyALkh3TR8lOnv7McXUVtcb1VpVbMuUMtk=";
|
||||
vendorHash = "sha256-U6T8gcHIb/Kr2xh2eB+aj0bdoqHUO887SYWqT9nrXBQ=";
|
||||
|
||||
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
installShellFiles
|
||||
|
||||
@@ -106,7 +106,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.216.0";
|
||||
version = "0.216.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sy178C5Z8F4qZzdVAnf6XI+S52Zl/8Z6dI4Qqk2d3dI=";
|
||||
hash = "sha256-7rLrPXnPvKTE4w9FYs4RHSs3wBbmwbaWtTdvC2iC6yY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-0aKEbdV41ZNbMLx30DotmYDBuuxOgFOET79jjNhhd4Y=";
|
||||
cargoHash = "sha256-cnjLwoes71/M0vMB01dLBB7pujlVHT82hfQxwr/Z4XQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zlcompressor";
|
||||
version = "0.2.1";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZL-Audio";
|
||||
repo = "ZLCompressor";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-0Z29+jLtAtThFaVVqvuqUJkj1VRI69WOvIbEfE45db4=";
|
||||
hash = "sha256-G7tgRenRB6aYpi+BSiQzwSsekvCw4JPUuy1iXVj7HN0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zlsplitter";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZL-Audio";
|
||||
repo = "ZLSplitter";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-8a/t1yJG5CUr4udnKIy80exQejDy0HzOi7uMjelPldg=";
|
||||
hash = "sha256-6ICXL1jX6MMYf5VasTW9osJ2BNb6jqWfeAtmmEp6L/4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gnome-shell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-icon-hider";
|
||||
version = "23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikalnytskyi";
|
||||
repo = "gnome-shell-extension-icon-hider";
|
||||
rev = "v${version}";
|
||||
sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "icon-hider@kalnitsky.org";
|
||||
extensionPortalSlug = "icon-hider";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/gnome-shell/extensions
|
||||
cp -r "icon-hider@kalnitsky.org" $out/share/gnome-shell/extensions
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Icon Hider is a GNOME Shell extension for managing status area items";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
platforms = gnome-shell.meta.platforms;
|
||||
homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider";
|
||||
broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
|
||||
};
|
||||
}
|
||||
@@ -88,6 +88,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail 'Icon=@SETTINGS_SHARE_DIR@/system-settings.svg' 'Icon=lomiri-system-settings' \
|
||||
--replace-fail 'X-Lomiri-Splash-Image=@SETTINGS_SHARE_DIR@/system-settings-app-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-system-settings.svg' \
|
||||
--replace-fail 'X-Screenshot=@SETTINGS_SHARE_DIR@/screenshot.png' 'X-Screenshot=lomiri-app-launch/screenshot/lomiri-system-settings.png'
|
||||
|
||||
# https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/525
|
||||
substituteInPlace \
|
||||
plugins/notifications/click_applications_model.h \
|
||||
plugins/notifications/general_notification_settings.h \
|
||||
--replace-fail '<QGSettings/QGSettings>' '<QGSettings>'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -42,6 +42,7 @@ let
|
||||
deviceinfo = callPackage ./development/deviceinfo { };
|
||||
geonames = callPackage ./development/geonames { };
|
||||
gmenuharness = callPackage ./development/gmenuharness { };
|
||||
gsettings-qt = callPackage ./development/gsettings-qt { };
|
||||
libusermetrics = callPackage ./development/libusermetrics { };
|
||||
lomiri-api = callPackage ./development/lomiri-api { };
|
||||
lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
testers,
|
||||
cmake,
|
||||
cmake-extras,
|
||||
glib,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gsettings-qt";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/gsettings-qt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-NUrJ3xQnef7TwPa7AIZaiI7TAkMe+nhuEQ/qC1H1Ves=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qtdeclarative
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmake-extras
|
||||
glib
|
||||
];
|
||||
|
||||
# Library
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch =
|
||||
# Upstream renamed WERROR option to ENABLE_WERROR, but forgot this line
|
||||
''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'if (WERROR)' 'if (ENABLE_WERROR)'
|
||||
''
|
||||
# The usual pkg-config fix
|
||||
+ ''
|
||||
substituteInPlace src/gsettings-qt.pc.in \
|
||||
--replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \
|
||||
--replace-fail "\''${prefix}/@QT_INCLUDE_DIR@/QGSettings" '@QT_FULL_INCLUDE_DIR@/QGSettings'
|
||||
''
|
||||
# Adjust to where we keep QML modules
|
||||
+ ''
|
||||
substituteInPlace GSettings/CMakeLists.txt \
|
||||
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}'
|
||||
'';
|
||||
|
||||
preBuild =
|
||||
# For qmlplugindump
|
||||
''
|
||||
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
|
||||
(lib.cmakeBool "ENABLE_WERROR" true)
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
postInstall =
|
||||
# *Something* is going wrong when the module path doesn't include the version
|
||||
# https://gitlab.com/ubports/development/core/gsettings-qt/-/merge_requests/7#note_2952471601
|
||||
''
|
||||
mv -v $out/${qtbase.qtQmlPrefix}/GSettings $out/${qtbase.qtQmlPrefix}/GSettings.1.0
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Library to access GSettings from Qt";
|
||||
homepage = "https://gitlab.com/ubports/core/gsettings-qt";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
teams = [ lib.teams.lomiri ];
|
||||
platforms = lib.platforms.linux;
|
||||
pkgConfigModules = [
|
||||
"gsettings-qt"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -49,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
substituteInPlace doc/CMakeLists.txt \
|
||||
--replace-fail "\''${CMAKE_INSTALL_FULL_DATAROOTDIR}/doc/libusermetrics-doc" "\''${CMAKE_INSTALL_DOCDIR}"
|
||||
|
||||
# https://gitlab.com/ubports/development/core/libusermetrics/-/merge_requests/22
|
||||
substituteInPlace src/libusermetricsoutput/GSettingsColorThemeProvider.h \
|
||||
--replace-fail '<QGSettings/QGSettings>' '<QGSettings>'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -59,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Don't override default theme search path (which honours XDG_DATA_DIRS) with a FHS assumption
|
||||
substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \
|
||||
--replace-fail 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' ""
|
||||
|
||||
# https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/54
|
||||
substituteInPlace src/com/lomiri/content/service/registry.h \
|
||||
--replace-fail '<QGSettings/QGSettings>' '<QGSettings>'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -28,7 +28,6 @@ in
|
||||
jdk.overrideAttrs (
|
||||
finalAttrs: oldAttrs: {
|
||||
inherit pname version src;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
|
||||
jdk
|
||||
|
||||
@@ -16,17 +16,8 @@
|
||||
|
||||
let
|
||||
stdenv = llvmPackages.stdenv;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mozart2";
|
||||
version = "2.0.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mozart/mozart2/releases/download/v${version}/${name}-Source.zip";
|
||||
sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
|
||||
};
|
||||
|
||||
# This is a workaround to avoid using sbt.
|
||||
# I guess it is acceptable to fetch the bootstrapping compiler in binary form.
|
||||
@@ -34,6 +25,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
|
||||
sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mozart/mozart2/releases/download/v${version}/${pname}-${version}-Source.zip";
|
||||
sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patch-limits.diff
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
wrapQtAppsHook,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsettings-qt";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
group = "ubports";
|
||||
owner = "core";
|
||||
repo = "gsettings-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "14l8xphw4jd9ckqba13cyxq0i362x8lfsd0zlfawwi2z1q1vqm92";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
gobject-introspection
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
qtdeclarative
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
# force ordered build of subdirs
|
||||
sed -i -e "\$aCONFIG += ordered" gsettings-qt.pro
|
||||
|
||||
# It seems that there is a bug in qtdeclarative: qmlplugindump fails
|
||||
# because it can not find or load the Qt platform plugin "minimal".
|
||||
# A workaround is to set QT_PLUGIN_PATH and QML2_IMPORT_PATH explicitly.
|
||||
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
export QML2_IMPORT_PATH=${qtdeclarative.bin}/${qtbase.qtQmlPrefix}
|
||||
|
||||
substituteInPlace GSettings/gsettings-qt.pro \
|
||||
--replace '$$[QT_INSTALL_QML]' "$out/$qtQmlPrefix" \
|
||||
--replace '$$[QT_INSTALL_BINS]/qmlplugindump' "qmlplugindump"
|
||||
|
||||
substituteInPlace src/gsettings-qt.pro \
|
||||
--replace '$$[QT_INSTALL_LIBS]' "$out/lib" \
|
||||
--replace '$$[QT_INSTALL_HEADERS]' "$out/include"
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# do not install tests
|
||||
for f in tests/Makefile{,.cpptest}; do
|
||||
substituteInPlace $f \
|
||||
--replace "install: install_target" "install: "
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Library to access GSettings from Qt";
|
||||
homepage = "https://gitlab.com/ubports/core/gsettings-qt";
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
@@ -39,12 +39,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coiled";
|
||||
version = "1.129.3";
|
||||
version = "1.129.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-r1Y6SfU2sfEISYWh7raAXGyT/hcHoGAs0oF92uVkT54=";
|
||||
hash = "sha256-OGgMfbERVC3PJXLwqVQlNpXZpAAMv6Y87S0kpv6NxLA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -22,8 +22,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-kp5bCmHYMS/e8eM6HrRw0JlVaxwPscFGDLQ0PX4ZIC4=";
|
||||
};
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
|
||||
geopandas,
|
||||
pooch,
|
||||
@@ -13,20 +12,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geodatasets";
|
||||
version = "2024.8.0";
|
||||
version = "2025.12.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geopandas";
|
||||
repo = "geodatasets";
|
||||
tag = version;
|
||||
hash = "sha256-GJ7RyFlohlRz0RbQ80EewZUmIX9CJkSfUMY/uMNTtEM=";
|
||||
hash = "sha256-F5cGmcUKbIy35Lx50WFV7hVDmWwWCk66EScx8YW2OTE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ pooch ];
|
||||
dependencies = [ pooch ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
geopandas
|
||||
|
||||
@@ -147,8 +147,8 @@ buildPythonPackage rec {
|
||||
# Forge look and feel of multi-output derivation as best as we can.
|
||||
#
|
||||
# Using 'outputs = [ "doc" ];' breaks a lot of assumptions.
|
||||
name = "${pname}-${version}-doc";
|
||||
inherit src pname version;
|
||||
pname = "${pname}-doc";
|
||||
inherit src version;
|
||||
|
||||
postInstallSphinx = ''
|
||||
mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version
|
||||
|
||||
@@ -58,8 +58,8 @@ buildPythonPackage rec {
|
||||
# Forge look and feel of multi-output derivation as best as we can.
|
||||
#
|
||||
# Using 'outputs = [ "doc" ];' breaks a lot of assumptions.
|
||||
name = "${pname}-${version}-doc";
|
||||
inherit src pname version;
|
||||
pname = "${pname}-doc";
|
||||
inherit src version;
|
||||
|
||||
patches = [
|
||||
# Fix import of "sphinxcontrib-log-cabinet"
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
requests,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "miniflux";
|
||||
version = "1.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniflux";
|
||||
repo = "python-client";
|
||||
tag = version;
|
||||
hash = "sha256-SCam8WiQH0cOUcqMMvhNDaNPGs7hi1RP4x4eoa5WIa4=";
|
||||
};
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ requests ];
|
||||
|
||||
pythonImportsCheck = [ "miniflux" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Miniflux Python API Client";
|
||||
homepage = "https://github.com/miniflux/python-client";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ wariuccio ];
|
||||
};
|
||||
}
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nvidia-ml-py";
|
||||
version = "13.580.82";
|
||||
version = "13.590.44";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "nvidia_ml_py";
|
||||
inherit version;
|
||||
hash = "sha256-DAKIBdxToOKmmF6oAYiBl3Zawu+PHJ4pp78NNhal78c=";
|
||||
hash = "sha256-s1jHYUsP3upLlfBG8ckBI7/iXRSKuTuxwAJIuDRwM3M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ripser";
|
||||
version = "0.6.13";
|
||||
version = "0.6.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-tda";
|
||||
repo = "ripser.py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-m6EJrz0RBuKlzDX41Gm/W2k71YQK9CgfZN4o84cQYCs=";
|
||||
hash = "sha256-p47vhrG8+B226/no4PD7+XFNccbNJvi45Luwu287ygI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user