Merge staging-next into staging
This commit is contained in:
@@ -22477,6 +22477,12 @@
|
||||
github = "sdaqo";
|
||||
githubId = 63876564;
|
||||
};
|
||||
sdedovic = {
|
||||
name = "Stevan Dedovic";
|
||||
email = "stevan@dedovic.com";
|
||||
github = "sdedovic";
|
||||
githubId = 599915;
|
||||
};
|
||||
sdht0 = {
|
||||
email = "nixpkgs@sdht.in";
|
||||
github = "sdht0";
|
||||
|
||||
@@ -373,6 +373,20 @@ in
|
||||
description = "Path to a file containing the metrics authentication token.";
|
||||
};
|
||||
|
||||
minioAccessKeyId = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "/var/lib/secrets/gitea/minio_access_key_id";
|
||||
description = "Path to a file containing the Minio access key id.";
|
||||
};
|
||||
|
||||
minioSecretAccessKey = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "/var/lib/secrets/gitea/minio_secret_access_key";
|
||||
description = "Path to a file containing the Minio secret access key.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
default = { };
|
||||
description = ''
|
||||
@@ -655,6 +669,15 @@ in
|
||||
};
|
||||
|
||||
packages.CHUNKED_UPLOAD_PATH = "${cfg.stateDir}/tmp/package-upload";
|
||||
|
||||
storage = mkMerge [
|
||||
(mkIf (cfg.minioAccessKeyId != null) {
|
||||
MINIO_ACCESS_KEY_ID = "#minioaccesskeyid#";
|
||||
})
|
||||
(mkIf (cfg.minioSecretAccessKey != null) {
|
||||
MINIO_SECRET_ACCESS_KEY = "#miniosecretaccesskey#";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
|
||||
@@ -797,6 +820,13 @@ in
|
||||
${replaceSecretBin} '#metricstoken#' '${cfg.metricsTokenFile}' '${runConfig}'
|
||||
''}
|
||||
|
||||
${lib.optionalString (cfg.minioAccessKeyId != null) ''
|
||||
${replaceSecretBin} '#minioaccesskeyid#' '${cfg.minioAccessKeyId}' '${runConfig}'
|
||||
''}
|
||||
${lib.optionalString (cfg.minioSecretAccessKey != null) ''
|
||||
${replaceSecretBin} '#miniosecretaccesskey#' '${cfg.minioSecretAccessKey}' '${runConfig}'
|
||||
''}
|
||||
|
||||
${lib.optionalString (cfg.captcha.secretFile != null) ''
|
||||
${replaceSecretBin} '#captchasecret#' '${cfg.captcha.secretFile}' '${runConfig}'
|
||||
''}
|
||||
|
||||
@@ -53,12 +53,15 @@ let
|
||||
${optionalString (
|
||||
cfg.down != "" || cfg.updateResolvConf
|
||||
) "down ${pkgs.writeShellScript "openvpn-${name}-down" downScript}"}
|
||||
${optionalString (cfg.authUserPass != null)
|
||||
"auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" ''
|
||||
${cfg.authUserPass.username}
|
||||
${cfg.authUserPass.password}
|
||||
''}"
|
||||
}
|
||||
${optionalString (cfg.authUserPass != null) (
|
||||
if isAttrs cfg.authUserPass then
|
||||
"auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" ''
|
||||
${cfg.authUserPass.username}
|
||||
${cfg.authUserPass.password}
|
||||
''}"
|
||||
else
|
||||
"auth-user-pass ${cfg.authUserPass}"
|
||||
)}
|
||||
'';
|
||||
|
||||
in
|
||||
@@ -202,23 +205,28 @@ in
|
||||
This option can be used to store the username / password credentials
|
||||
with the "auth-user-pass" authentication method.
|
||||
|
||||
WARNING: Using this option will put the credentials WORLD-READABLE in the Nix store!
|
||||
You can either provide an attribute set of `username` and `password`,
|
||||
or the path to a file containing the credentials on two lines.
|
||||
|
||||
WARNING: If you use an attribute set, this option will put the credentials WORLD-READABLE into the Nix store!
|
||||
'';
|
||||
type = types.nullOr (
|
||||
types.submodule {
|
||||
types.oneOf [
|
||||
types.singleLineStr
|
||||
(types.submodule {
|
||||
options = {
|
||||
username = mkOption {
|
||||
description = "The username to store inside the credentials file.";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
options = {
|
||||
username = mkOption {
|
||||
description = "The username to store inside the credentials file.";
|
||||
type = types.str;
|
||||
password = mkOption {
|
||||
description = "The password to store inside the credentials file.";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
|
||||
password = mkOption {
|
||||
description = "The password to store inside the credentials file.";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
}
|
||||
})
|
||||
]
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
@@ -252,6 +252,8 @@ in
|
||||
|
||||
environment.etc."/pdns-recursor/recursor.yml".source = configFile;
|
||||
|
||||
networking.resolvconf.useLocalResolver = lib.mkDefault true;
|
||||
|
||||
services.pdns-recursor.yaml-settings = {
|
||||
incoming = mkDefaultAttrs {
|
||||
listen = cfg.dns.address;
|
||||
|
||||
@@ -130,17 +130,25 @@ in
|
||||
|
||||
services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];
|
||||
|
||||
environment.extraInit = ''
|
||||
${concatMapStrings (p: ''
|
||||
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
||||
environment.extraInit =
|
||||
''
|
||||
${concatMapStrings (p: ''
|
||||
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
||||
fi
|
||||
if [ -d "${p}/lib/girepository-1.0" ]; then
|
||||
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
|
||||
fi
|
||||
'') cfg.sessionPath}
|
||||
''
|
||||
+ lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
|
||||
# Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still
|
||||
# applies to sessions not managed by systemd.
|
||||
if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then
|
||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
|
||||
fi
|
||||
if [ -d "${p}/lib/girepository-1.0" ]; then
|
||||
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
|
||||
fi
|
||||
'') cfg.sessionPath}
|
||||
'';
|
||||
'';
|
||||
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
|
||||
@@ -87,18 +87,26 @@ in
|
||||
};
|
||||
|
||||
# Have to take care of GDM + Cinnamon on Wayland users
|
||||
environment.extraInit = ''
|
||||
${concatMapStrings (p: ''
|
||||
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
||||
fi
|
||||
environment.extraInit =
|
||||
''
|
||||
${concatMapStrings (p: ''
|
||||
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
||||
fi
|
||||
|
||||
if [ -d "${p}/lib/girepository-1.0" ]; then
|
||||
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
|
||||
if [ -d "${p}/lib/girepository-1.0" ]; then
|
||||
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
|
||||
fi
|
||||
'') cfg.sessionPath}
|
||||
''
|
||||
+ lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
|
||||
# Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still
|
||||
# applies to sessions not managed by systemd.
|
||||
if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then
|
||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
|
||||
fi
|
||||
'') cfg.sessionPath}
|
||||
'';
|
||||
'';
|
||||
|
||||
# Default services
|
||||
services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
|
||||
|
||||
@@ -59,6 +59,14 @@ in
|
||||
pkgs.mate.mate-session-manager
|
||||
];
|
||||
|
||||
environment.extraInit = lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
|
||||
# Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still
|
||||
# applies to sessions not managed by systemd.
|
||||
if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then
|
||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
|
||||
fi
|
||||
'';
|
||||
|
||||
# Debugging
|
||||
environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||
|
||||
|
||||
@@ -68,6 +68,8 @@
|
||||
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"
|
||||
machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
|
||||
machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")
|
||||
# From the nixos/budgie module
|
||||
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
|
||||
|
||||
with subtest("Open run dialog"):
|
||||
machine.send_key("alt-f2")
|
||||
|
||||
@@ -58,6 +58,13 @@
|
||||
with subtest("Check if sessionPath option actually works"):
|
||||
machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")
|
||||
|
||||
with subtest("Check if various environment variables are set"):
|
||||
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"
|
||||
machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
|
||||
machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
|
||||
# From the nixos/cinnamon module
|
||||
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
|
||||
|
||||
with subtest("Open Cinnamon Settings"):
|
||||
machine.succeed("${su "cinnamon-settings themes >&2 &"}")
|
||||
machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")
|
||||
|
||||
@@ -69,6 +69,13 @@
|
||||
with subtest("Check if sessionPath option actually works"):
|
||||
machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")
|
||||
|
||||
with subtest("Check if various environment variables are set"):
|
||||
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"
|
||||
machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'x11'")
|
||||
machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
|
||||
# From the nixos/cinnamon module
|
||||
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
|
||||
|
||||
with subtest("Open Cinnamon Settings"):
|
||||
machine.succeed("${su "cinnamon-settings themes >&2 &"}")
|
||||
machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")
|
||||
|
||||
@@ -52,6 +52,8 @@
|
||||
machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
|
||||
machine.succeed(f"{cmd} | grep 'XDG_SESSION_DESKTOP' | grep 'MATE'")
|
||||
machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
|
||||
# From the nixos/mate module
|
||||
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
|
||||
|
||||
with subtest("Check if Wayfire config is properly configured"):
|
||||
for i in ["button_style = mate", "firedecor", "mate-wayland-components.sh"]:
|
||||
|
||||
@@ -58,6 +58,8 @@
|
||||
machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf marco)/environ | grep 'XDG_CURRENT_DESKTOP' | grep 'MATE'")
|
||||
# From mate-panel-with-applets packaging
|
||||
machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
|
||||
# From the nixos/mate module
|
||||
machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
|
||||
|
||||
with subtest("Check if applets are built with in-process support"):
|
||||
# This is needed for Wayland support
|
||||
|
||||
@@ -78,6 +78,8 @@
|
||||
machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")
|
||||
# Hopefully from login shell.
|
||||
machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
|
||||
# Hopefully from gcr-ssh-agent.
|
||||
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
|
||||
|
||||
with subtest("Wait for elementary videos autostart"):
|
||||
machine.wait_until_succeeds("pgrep -f io.elementary.videos")
|
||||
|
||||
@@ -73,6 +73,8 @@
|
||||
machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")
|
||||
# Hopefully from login shell.
|
||||
machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
|
||||
# Hopefully from gcr-ssh-agent.
|
||||
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
|
||||
|
||||
with subtest("Open elementary videos"):
|
||||
machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.videos >&2 &'")
|
||||
|
||||
+1
-1
@@ -97,7 +97,7 @@ Now that this is out of the way. To add a package to Nixpkgs:
|
||||
|
||||
- GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp`](development/libraries/gmp). Also done by the generic builder, but has a dependency on `m4`.
|
||||
|
||||
- Pan, a GTK-based newsreader: [`pkgs/by-name/pa/pan/package.nix`](./by-name/pa/pan/package.nix). Has an optional dependency on `gtkspell`, which is only built if `spellCheck` is `true`.
|
||||
- Pan, a GTK-based newsreader: [`pkgs/by-name/pa/pan/package.nix`](./by-name/pa/pan/package.nix). Has an optional dependency on `gspell`, which is only built if `spellCheck` is `true`.
|
||||
|
||||
- Apache HTTPD: [`pkgs/servers/http/apache-httpd/2.4.nix`](servers/http/apache-httpd/2.4.nix). A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery.
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.43";
|
||||
version = "13.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-IP5l8YUsCNm9rixgpQqbyyhfcBNQgrZha1MNjetug2c=";
|
||||
hash = "sha256-eFANrUMESQVsZwTfz20VW2Qf7hiSgtkeKszCiJ8i/jk=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -142,7 +142,6 @@ stdenv.mkDerivation {
|
||||
updateScript = import ./update.nix {
|
||||
inherit
|
||||
pname
|
||||
lib
|
||||
writeScript
|
||||
xidel
|
||||
coreutils
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
pname,
|
||||
channel,
|
||||
lib,
|
||||
writeScript,
|
||||
xidel,
|
||||
coreutils,
|
||||
@@ -16,10 +14,6 @@
|
||||
versionSuffix ? "",
|
||||
}:
|
||||
|
||||
let
|
||||
isBeta = channel != "release";
|
||||
|
||||
in
|
||||
writeScript "update-${pname}" ''
|
||||
#!${runtimeShell}
|
||||
PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
|
||||
@@ -49,9 +43,7 @@ writeScript "update-${pname}" ''
|
||||
grep "^[0-9]" | \
|
||||
sort --version-sort | \
|
||||
grep -v "funnelcake" | \
|
||||
grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${
|
||||
lib.optionalString (!isBeta) "grep -v \"b\" |"
|
||||
} \
|
||||
grep -e "\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | grep -v "b" | \
|
||||
tail -1`
|
||||
|
||||
curl --silent -o $HOME/shasums "$url$version/SHA256SUMS"
|
||||
@@ -94,7 +86,7 @@ writeScript "update-${pname}" ''
|
||||
}
|
||||
EOF
|
||||
|
||||
mv $tmpfile ${channel}${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix
|
||||
mv $tmpfile release${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix
|
||||
|
||||
popd
|
||||
''
|
||||
|
||||
@@ -104,7 +104,6 @@ stdenv.mkDerivation {
|
||||
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
|
||||
inherit
|
||||
pname
|
||||
lib
|
||||
writeScript
|
||||
xidel
|
||||
coreutils
|
||||
@@ -116,7 +115,6 @@ stdenv.mkDerivation {
|
||||
versionSuffix
|
||||
;
|
||||
baseName = "thunderbird";
|
||||
channel = "release";
|
||||
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
|
||||
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
|
||||
};
|
||||
|
||||
@@ -34,13 +34,13 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bitwarden-desktop";
|
||||
version = "2025.5.0";
|
||||
version = "2025.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
|
||||
hash = "sha256-1gxd73E7Y7e1A6yU+J3XYQ4QzXZTxuKd+AE+t8HD478=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit";
|
||||
version = "338";
|
||||
version = "340";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZNvMLzkDh1SuyHuChWM0YykSYu152JHvjrKVm+u0Upw=";
|
||||
hash = "sha256-I/T1bovkf2H/GJqocRxsiRxqRw9HMdscKpWQ+M6IdrU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,20 +6,20 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "departure-mono";
|
||||
version = "1.422";
|
||||
version = "1.500";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/rektdeckard/departure-mono/releases/download/v${finalAttrs.version}/DepartureMono-${finalAttrs.version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-9CcXd7PLxkzQt0oT/asZO9mowtXtjPBfuKphfGgM/y8=";
|
||||
hash = "sha256-XYL76L266MKqClxfbPn/C6+x/vcs7AD56DtiDmQam2A=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -m 444 *.otf -t $out/share/fonts/otf
|
||||
install -D -m 444 *.woff -t $out/share/fonts/woff
|
||||
install -D -m 444 *.woff2 -t $out/share/fonts/woff2
|
||||
install -D -m 444 DepartureMono-1.500/*.otf -t $out/share/fonts/otf
|
||||
install -D -m 444 DepartureMono-1.500/*.woff -t $out/share/fonts/woff
|
||||
install -D -m 444 DepartureMono-1.500/*.woff2 -t $out/share/fonts/woff2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -66,7 +66,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
phpPackage = php84;
|
||||
tests = nixosTests.firefly-iii-data-importer;
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"v(\\d+\\.\\d+\\.\\d+)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -55,7 +55,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
phpPackage = php84;
|
||||
tests = nixosTests.firefly-iii;
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"v(\\d+\\.\\d+\\.\\d+)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
flutter327,
|
||||
flutter329,
|
||||
gst_all_1,
|
||||
libunwind,
|
||||
makeWrapper,
|
||||
@@ -18,15 +18,15 @@
|
||||
fletTarget ? "linux",
|
||||
}:
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
flutter329.buildFlutterApplication rec {
|
||||
pname = "flet-client-flutter";
|
||||
version = "0.27.6";
|
||||
version = "0.28.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flet-dev";
|
||||
repo = "flet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZtIAfLdj9209ZzgmNzTHMyzCTohxYK0Va4M8NYyie64=";
|
||||
hash = "sha256-fD42AcfU3a/7sNvLE81pd1jdwUn5dEro3uKzaRBCWIU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/client";
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "async",
|
||||
"sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
|
||||
"sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.11.0"
|
||||
"version": "2.12.0"
|
||||
},
|
||||
"audioplayers": {
|
||||
"dependency": "transitive",
|
||||
@@ -104,21 +104,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "boolean_selector",
|
||||
"sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
|
||||
"sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"characters": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "characters",
|
||||
"sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
|
||||
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.0"
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"checked_yaml": {
|
||||
"dependency": "transitive",
|
||||
@@ -144,21 +144,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "clock",
|
||||
"sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
|
||||
"sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.1"
|
||||
"version": "1.1.2"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "collection",
|
||||
"sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
|
||||
"sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.19.0"
|
||||
"version": "1.19.1"
|
||||
},
|
||||
"cross_file": {
|
||||
"dependency": "transitive",
|
||||
@@ -264,41 +264,41 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "fake_async",
|
||||
"sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
|
||||
"sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.1"
|
||||
"version": "1.3.2"
|
||||
},
|
||||
"ffi": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "ffi",
|
||||
"sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
|
||||
"sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
"version": "2.1.3"
|
||||
},
|
||||
"file": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "file",
|
||||
"sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
|
||||
"sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.0"
|
||||
"version": "7.0.1"
|
||||
},
|
||||
"file_picker": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "file_picker",
|
||||
"sha256": "aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877",
|
||||
"sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.1.3"
|
||||
"version": "8.3.7"
|
||||
},
|
||||
"fixnum": {
|
||||
"dependency": "transitive",
|
||||
@@ -327,7 +327,7 @@
|
||||
"relative": true
|
||||
},
|
||||
"source": "path",
|
||||
"version": "0.27.5"
|
||||
"version": "0.27.6"
|
||||
},
|
||||
"flet_ads": {
|
||||
"dependency": "direct main",
|
||||
@@ -542,11 +542,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_plugin_android_lifecycle",
|
||||
"sha256": "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de",
|
||||
"sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.21"
|
||||
"version": "2.0.24"
|
||||
},
|
||||
"flutter_redux": {
|
||||
"dependency": "transitive",
|
||||
@@ -756,21 +756,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker",
|
||||
"sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
|
||||
"sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.7"
|
||||
"version": "10.0.8"
|
||||
},
|
||||
"leak_tracker_flutter_testing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker_flutter_testing",
|
||||
"sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
|
||||
"sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.8"
|
||||
"version": "3.0.9"
|
||||
},
|
||||
"leak_tracker_testing": {
|
||||
"dependency": "transitive",
|
||||
@@ -846,11 +846,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "matcher",
|
||||
"sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
|
||||
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.16+1"
|
||||
"version": "0.12.17"
|
||||
},
|
||||
"material_color_utilities": {
|
||||
"dependency": "transitive",
|
||||
@@ -956,11 +956,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
|
||||
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.15.0"
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"mgrs_dart": {
|
||||
"dependency": "transitive",
|
||||
@@ -996,11 +996,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path",
|
||||
"sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
|
||||
"sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.9.0"
|
||||
"version": "1.9.1"
|
||||
},
|
||||
"path_parsing": {
|
||||
"dependency": "transitive",
|
||||
@@ -1146,11 +1146,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "platform",
|
||||
"sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
|
||||
"sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.5"
|
||||
"version": "3.1.6"
|
||||
},
|
||||
"plugin_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1176,11 +1176,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "process",
|
||||
"sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
|
||||
"sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.2"
|
||||
"version": "5.0.3"
|
||||
},
|
||||
"proj4dart": {
|
||||
"dependency": "transitive",
|
||||
@@ -1512,11 +1512,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_span",
|
||||
"sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
|
||||
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.10.0"
|
||||
"version": "1.10.1"
|
||||
},
|
||||
"sprintf": {
|
||||
"dependency": "transitive",
|
||||
@@ -1532,31 +1532,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "stack_trace",
|
||||
"sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
|
||||
"sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.12.0"
|
||||
"version": "1.12.1"
|
||||
},
|
||||
"stream_channel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "stream_channel",
|
||||
"sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
|
||||
"sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
"version": "2.1.4"
|
||||
},
|
||||
"string_scanner": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "string_scanner",
|
||||
"sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
|
||||
"sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.0"
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"sync_http": {
|
||||
"dependency": "transitive",
|
||||
@@ -1582,21 +1582,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "term_glyph",
|
||||
"sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
|
||||
"sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
|
||||
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.3"
|
||||
"version": "0.7.4"
|
||||
},
|
||||
"torch_light": {
|
||||
"dependency": "transitive",
|
||||
@@ -1792,11 +1792,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
|
||||
"sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "14.3.0"
|
||||
"version": "14.3.1"
|
||||
},
|
||||
"volume_controller": {
|
||||
"dependency": "transitive",
|
||||
@@ -1832,11 +1832,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "web",
|
||||
"sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062",
|
||||
"sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
"version": "1.1.0"
|
||||
},
|
||||
"web_socket_channel": {
|
||||
"dependency": "transitive",
|
||||
@@ -1912,11 +1912,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32",
|
||||
"sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9",
|
||||
"sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.5.3"
|
||||
"version": "5.10.1"
|
||||
},
|
||||
"win32_registry": {
|
||||
"dependency": "transitive",
|
||||
@@ -1990,7 +1990,7 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.5.0 <4.0.0",
|
||||
"dart": ">=3.7.0-0 <4.0.0",
|
||||
"flutter": ">=3.24.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goctl";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeromicro";
|
||||
repo = "go-zero";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-v5WzqMotF9C7i9hTYSjaPmTwveBVDVn+SKQXYuS4Rdc=";
|
||||
hash = "sha256-N0U/8YbqhyD5kb14lq8JKWwfYHUZ57Z/KZyIf6kKl0U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tOIlfYiAI9m7oTZyPDCzTXg9XTwBb6EOVLzDfZnzL4E=";
|
||||
vendorHash = "sha256-D56zTwn4y03eaP2yP8Q2F6ixGMaQJwKEqonHNJGp2Ec=";
|
||||
|
||||
modRoot = "tools/goctl";
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -6,22 +6,22 @@
|
||||
go,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotools";
|
||||
version = "0.30.0";
|
||||
version = "0.34.0";
|
||||
|
||||
# using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse
|
||||
# using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is too basic to browse
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yUkdZSe/GV0w1qK8aQjcFE4tNKYC8f4JeFgPiv8GlQc=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-C+P2JoD4NzSAkAQuA20bVrfLZrMHXekvXn8KPOM5Nj4=";
|
||||
};
|
||||
|
||||
allowGoReference = true;
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-+jhCNi7bGkRdI1Ywfe3q4i+zcm3UJ0kbQalsDD3WkS4=";
|
||||
vendorHash = "sha256-UZNYHx5y+kRp3AJq6s4Wy+k789GDG7FBTSzCTorVjgg=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -29,6 +29,8 @@ buildGoModule rec {
|
||||
# The gopls folder contains a Go submodule which causes a build failure
|
||||
# and lives in its own package named gopls.
|
||||
rm -r gopls
|
||||
# cmd/auth folder is similar and is scheduled to be removed https://github.com/golang/go/issues/70872
|
||||
rm -r cmd/auth
|
||||
'';
|
||||
|
||||
# Set GOTOOLDIR for derivations adding this to buildInputs
|
||||
@@ -43,16 +45,16 @@ buildGoModule rec {
|
||||
--suffix PATH : ${lib.makeBinPath [ go ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Additional tools for Go development";
|
||||
longDescription = ''
|
||||
This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash.
|
||||
'';
|
||||
homepage = "https://go.googlesource.com/tools";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
SuperSandro2000
|
||||
techknowlogick
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gum";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "gum";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-77102I7pOGfpPBSGelsA/9GJYos05akF0kdmr522RC0=";
|
||||
hash = "sha256-3tn126Ars64ZhOY68aCrE7j14YDVGmllbHvYMHAgLR0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wrl4Zo5NSaTTMrc95Fs9cevG7ITJtHuV3pGkFd8jpxU=";
|
||||
vendorHash = "sha256-SsnULG12NjyetLhL7vYjjpDI8vqqdeSyoZj0U3KP/nI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lavalink";
|
||||
version = "4.0.8";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lavalink-devs/Lavalink/releases/download/${finalAttrs.version}/Lavalink.jar";
|
||||
hash = "sha256-G4a9ltPq/L0vcazTQjStTlOOtwrBi37bYUNQHy5CV9Y=";
|
||||
hash = "sha256-ZR/5YDgbziAqOR8fex3aMzybPmLy/KOGtNM12Zj/ttg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libusbmuxd";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libimobiledevice";
|
||||
repo = "libusbmuxd";
|
||||
rev = version;
|
||||
hash = "sha256-coQqNGPsqrOYbBjO0eQZQNK8ZTB+ZzfMWvQ6Z1by9PY=";
|
||||
hash = "sha256-o1EFY/cv+pQrGexvPOwMs5mz9KRcffnloXCQXMzbmDY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,33 +4,37 @@
|
||||
fetchFromGitHub,
|
||||
openssl,
|
||||
pkg-config,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "live-server";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lomirus";
|
||||
repo = "live-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8NM3XJ7RC7cUNKN1DPW2huvkx7tfA8zDrETkwDMbaT8=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0IP7F8+Vdl/h4+zcghRqowvzz6zjQYDTjMSZPuGOOj4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-tUKhVDv+ZDGRpJC/sSYcQxYhGsAyOsflc+GeUyBaeEk=";
|
||||
cargoHash = "sha256-MMeeUoj3vYd1lv15N3+qjHbn991IVMhIUCMd0isCNhk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Local network server with live reload feature for static pages";
|
||||
downloadPage = "https://github.com/lomirus/live-server/releases";
|
||||
homepage = "https://github.com/lomirus/live-server";
|
||||
license = licenses.mit;
|
||||
changelog = "https://github.com/lomirus/live-server/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "live-server";
|
||||
maintainers = [ maintainers.philiptaron ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ lib.maintainers.philiptaron ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
beamPackages.mixRelease rec {
|
||||
pname = "livebook";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
|
||||
inherit elixir;
|
||||
|
||||
@@ -23,7 +23,7 @@ beamPackages.mixRelease rec {
|
||||
owner = "livebook-dev";
|
||||
repo = "livebook";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vZFmd9Y5KEnQqzvCmGKGUbY+yR7IEc+0n0sycPDMxa8=";
|
||||
hash = "sha256-x4h5vT2p1SL/8p04DRpKbIbwL7XzctH27f4ZAwj0QOg=";
|
||||
};
|
||||
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "21.09";
|
||||
version = "25.05.0";
|
||||
pname = "mma";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
|
||||
sha256 = "sha256-5YzdaZ499AGiKAPUsgBCj3AQ9s0WlfgAbHhOQSOLLO8=";
|
||||
sha256 = "sha256-J72uTwAlWa/dRPf7/lO1epbmjTQar+3/U//+IJ9u4PM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -117,17 +117,17 @@ in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+8UHE9M2JWUARuuIRdKwNkn1hoxtuitVH7do5V5uEg0=";
|
||||
hash = "sha256-6ha8aGRljb/uN+CtPpZDpcAVmpZccCq/1TSCQ5FVL8E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA=";
|
||||
vendorHash = "sha256-svJt7Cuy+auVd8II3+JaAefiZcG88QyDgjWPnpoxfts=";
|
||||
|
||||
env =
|
||||
lib.optionalAttrs enableRocm {
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.1.47";
|
||||
version = "1.1.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
tag = "release-${version}";
|
||||
hash = "sha256-7VW99dtE7gz0Y9pKyAdyeKHL6zgk5KvA8jPfgG1O5sc=";
|
||||
hash = "sha256-fQmS8oJZ7Oy/miKCtOQGSvZFDIEMFOcUyz2D6P8hNZY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 pngpaste $out/bin
|
||||
install -Dm555 pngpaste $out/bin/pngpaste
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "reth";
|
||||
version = "1.4.3";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradigmxyz";
|
||||
repo = "reth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pl0eQU7BjkSg8ECxeB13oNMO9CNIwLyOOHiWWC4CWhY=";
|
||||
hash = "sha256-slVf2yVukW3fkDlpaz+rdPKf6QdsFa9HwySZkItHvoQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-85mtKJWhDguOeNJhsqJyb99xVVF1H7D/2lWRmXF3LSg=";
|
||||
cargoHash = "sha256-vNe8eACwwlPspUQgI65T9O2SaQYl7FihDZRpljkA/4U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rose-pine-kvantum";
|
||||
version = "0-unstable-2025-03-26";
|
||||
version = "0-unstable-2025-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rose-pine";
|
||||
repo = "kvantum";
|
||||
rev = "5a51f5892ba752088dee062a6188b9f0bb59324b";
|
||||
hash = "sha256-lUO3Bg9+KbPkllKu2sv9ueV1dcZu4qRn32N/+4+2B4A=";
|
||||
rev = "48edf9e2d772b166ed50af3e182a19196e5d3fe6";
|
||||
hash = "sha256-0xSMYYPsW7Rw5O8FL0iAt63Hya8GkI2VuOZf64PewyQ=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/rose-pine/kvantum";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ amadaluzia ];
|
||||
license = lib.licenses.unfree; # rose-pine/kvantum#1
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
flutter329,
|
||||
flutter332,
|
||||
fetchFromGitHub,
|
||||
gst_all_1,
|
||||
libunwind,
|
||||
@@ -15,21 +15,23 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
flutter329.buildFlutterApplication rec {
|
||||
flutter332.buildFlutterApplication rec {
|
||||
pname = "saber";
|
||||
version = "0.25.6";
|
||||
version = "0.25.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saber-notes";
|
||||
repo = "saber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OknqEbWAYLlxSTDWcggM6GP2V8cdKIAksbm7TmKzjKY=";
|
||||
hash = "sha256-l1TPk6JiT/o0Pl67Vqv4NE2n/FrZKy/SqwhW58A3c6w=";
|
||||
};
|
||||
|
||||
gitHashes = {
|
||||
receive_sharing_intent = "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=";
|
||||
json2yaml = "sha256-Vb0Bt11OHGX5+lDf8KqYZEGoXleGi5iHXVS2k7CEmDw=";
|
||||
workmanager = "sha256-fpB8CwNIn+HCQujyIXciq7Y9yd78Ie0IjkSewv3u5iw=";
|
||||
flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=";
|
||||
irondash_engine_context = "sha256-/ohreOZDsVqfPoJ6wK7ylTQAgWw23v0b31bDQw5L2Hw=";
|
||||
super_native_extensions = "sha256-0WZ5+imtLJE8GhbAgLyCC502vvlDl5QG3xtG2nCAnQI=";
|
||||
yaru = "sha256-j0aPyHx79kzT/eLf0Y3cq4qQkQ4c76GdpjLaVNp8MuI=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -84,11 +84,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "async",
|
||||
"sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
|
||||
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.12.0"
|
||||
"version": "2.13.0"
|
||||
},
|
||||
"audioplayers": {
|
||||
"dependency": "direct main",
|
||||
@@ -214,11 +214,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "built_value",
|
||||
"sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
|
||||
"sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.9.5"
|
||||
"version": "8.10.1"
|
||||
},
|
||||
"chalkdart": {
|
||||
"dependency": "transitive",
|
||||
@@ -374,11 +374,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "decimal",
|
||||
"sha256": "4140a688f9e443e2f4de3a1162387bf25e1ac6d51e24c9da263f245210f41440",
|
||||
"sha256": "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.2"
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"defer_pointer": {
|
||||
"dependency": "direct main",
|
||||
@@ -474,11 +474,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "fake_async",
|
||||
"sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
|
||||
"sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.2"
|
||||
"version": "1.3.3"
|
||||
},
|
||||
"fast_image_resizer": {
|
||||
"dependency": "direct main",
|
||||
@@ -514,11 +514,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "file_picker",
|
||||
"sha256": "a222f231db4f822fc49e3b753674bda630e981873c84bf8604bceeb77fce0b24",
|
||||
"sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.1.7"
|
||||
"version": "10.2.0"
|
||||
},
|
||||
"file_selector_linux": {
|
||||
"dependency": "transitive",
|
||||
@@ -656,11 +656,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "flutter_lints",
|
||||
"sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
|
||||
"sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.0"
|
||||
"version": "6.0.0"
|
||||
},
|
||||
"flutter_localizations": {
|
||||
"dependency": "direct main",
|
||||
@@ -682,11 +682,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_quill",
|
||||
"sha256": "de019f6160023d36ad3e89343da6d740ab66ae7839875c89871fbeabcb9e8f9b",
|
||||
"sha256": "7e60963632bbc8615627f0bae8e178515f69ecb378ad49fa68c43c2aabf33e21",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "11.4.0"
|
||||
"version": "11.4.1"
|
||||
},
|
||||
"flutter_quill_delta_from_html": {
|
||||
"dependency": "transitive",
|
||||
@@ -719,13 +719,14 @@
|
||||
"version": "0.1.0"
|
||||
},
|
||||
"flutter_secure_storage_linux": {
|
||||
"dependency": "transitive",
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"name": "flutter_secure_storage_linux",
|
||||
"sha256": "9b4b73127e857cd3117d43a70fa3dddadb6e0b253be62e6a6ab85caa0742182c",
|
||||
"url": "https://pub.dev"
|
||||
"path": "flutter_secure_storage_linux",
|
||||
"ref": "patch-2",
|
||||
"resolved-ref": "f076cbb65b075afd6e3b648122987a67306dc298",
|
||||
"url": "https://github.com/m-berto/flutter_secure_storage.git"
|
||||
},
|
||||
"source": "hosted",
|
||||
"source": "git",
|
||||
"version": "2.0.1"
|
||||
},
|
||||
"flutter_secure_storage_platform_interface": {
|
||||
@@ -850,31 +851,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "go_router",
|
||||
"sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a",
|
||||
"sha256": "b453934c36e289cef06525734d1e676c1f91da9e22e2017d9dcab6ce0f999175",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "15.1.2"
|
||||
"version": "15.1.3"
|
||||
},
|
||||
"golden_screenshot": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "golden_screenshot",
|
||||
"sha256": "0ecff8fde3eaea98d2f19449fb2becf67583cb0e98326b1a6ad47226137099a1",
|
||||
"sha256": "8178266a5827eb74caf7547a19d42051e7493a4bbcc206917f62f4830729b6c3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"golden_toolkit": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "golden_toolkit",
|
||||
"sha256": "8f74adab33154fe7b731395782797021f97d2edc52f7bfb85ff4f1b5c4a215f0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.15.0"
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"gsettings": {
|
||||
"dependency": "transitive",
|
||||
@@ -956,21 +947,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "intl",
|
||||
"sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
|
||||
"sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.19.0"
|
||||
"version": "0.20.2"
|
||||
},
|
||||
"irondash_engine_context": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "irondash_engine_context",
|
||||
"sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10",
|
||||
"sha256": "2bb0bc13dfda9f5aaef8dde06ecc5feb1379f5bb387d59716d799554f3f305d7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.4"
|
||||
"version": "0.5.5"
|
||||
},
|
||||
"irondash_message_channel": {
|
||||
"dependency": "transitive",
|
||||
@@ -992,17 +983,6 @@
|
||||
"source": "hosted",
|
||||
"version": "0.7.2"
|
||||
},
|
||||
"json2yaml": {
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "fix-string-ends-with-colon",
|
||||
"resolved-ref": "618fc6b7c57acd17cfa98ef7895a771938374456",
|
||||
"url": "https://github.com/adil192/json2yaml"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "3.0.1"
|
||||
},
|
||||
"json_annotation": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1027,11 +1007,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker",
|
||||
"sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
|
||||
"sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.8"
|
||||
"version": "10.0.9"
|
||||
},
|
||||
"leak_tracker_flutter_testing": {
|
||||
"dependency": "transitive",
|
||||
@@ -1057,11 +1037,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "lints",
|
||||
"sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
|
||||
"sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.1.1"
|
||||
"version": "6.0.0"
|
||||
},
|
||||
"list_utilities": {
|
||||
"dependency": "transitive",
|
||||
@@ -1117,11 +1097,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "material_symbols_icons",
|
||||
"sha256": "d45b6c36c3effa8cb51b1afb8698107d5ff1f88fa4631428f34a8a01abc295d7",
|
||||
"sha256": "7c50901b39d1ad645ee25d920aed008061e1fd541a897b4ebf2c01d966dbf16b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2815.0"
|
||||
"version": "4.2815.1"
|
||||
},
|
||||
"matrix4_transform": {
|
||||
"dependency": "transitive",
|
||||
@@ -1416,11 +1396,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "pdfrx",
|
||||
"sha256": "1bde1885de38ac8ad9f8d5e4be37a57f36f23467a9bb5a586607d5e4aa153ab8",
|
||||
"sha256": "4640c561aa31598c9c8ff9042675f7c1ecb2ca2b1190dff6e2ecaa677d1bc416",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.28"
|
||||
"version": "1.1.35"
|
||||
},
|
||||
"perfect_freehand": {
|
||||
"dependency": "direct main",
|
||||
@@ -1923,11 +1903,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "slang",
|
||||
"sha256": "13132690084bef34fb74dbc698a1e5496f97afbcd3eb58e20c09393e77ac46e6",
|
||||
"sha256": "6668a08355b370d5cb5446fc869c4492ed23c6433934fe88228876460fedac22",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.7.1"
|
||||
"version": "4.7.2"
|
||||
},
|
||||
"slang_flutter": {
|
||||
"dependency": "direct main",
|
||||
@@ -1993,21 +1973,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "super_clipboard",
|
||||
"sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40",
|
||||
"sha256": "e73f3bb7e66cc9260efa1dc507f979138e7e106c3521e2dda2d0311f6d728a16",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.0-dev.6"
|
||||
"version": "0.9.1"
|
||||
},
|
||||
"super_native_extensions": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "super_native_extensions",
|
||||
"sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86",
|
||||
"sha256": "b9611dcb68f1047d6f3ef11af25e4e68a21b1a705bbcc3eb8cb4e9f5c3148569",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.0-dev.6"
|
||||
"version": "0.9.1"
|
||||
},
|
||||
"sync_http": {
|
||||
"dependency": "transitive",
|
||||
@@ -2183,11 +2163,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics",
|
||||
"sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
|
||||
"sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.18"
|
||||
"version": "1.1.19"
|
||||
},
|
||||
"vector_graphics_codec": {
|
||||
"dependency": "transitive",
|
||||
@@ -2203,11 +2183,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics_compiler",
|
||||
"sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
|
||||
"sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.16"
|
||||
"version": "1.1.17"
|
||||
},
|
||||
"vector_math": {
|
||||
"dependency": "direct main",
|
||||
@@ -2233,21 +2213,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
|
||||
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "14.3.1"
|
||||
"version": "15.0.0"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "watcher",
|
||||
"sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
|
||||
"sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.1"
|
||||
"version": "1.1.2"
|
||||
},
|
||||
"web": {
|
||||
"dependency": "transitive",
|
||||
@@ -2263,21 +2243,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "webdriver",
|
||||
"sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
|
||||
"sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.4"
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"win32": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32",
|
||||
"sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
|
||||
"sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.13.0"
|
||||
"version": "5.14.0"
|
||||
},
|
||||
"win32_registry": {
|
||||
"dependency": "transitive",
|
||||
@@ -2313,22 +2293,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "worker_manager",
|
||||
"sha256": "eb8ad7013f823539e259f2452b40f8bf77c0aacc7a73f66195f1ad3166eafcf8",
|
||||
"sha256": "af3db5e6c6c8a74ab8f72e25e9d305f8ff60984ca55551397e3c8828ebf30509",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.2.4"
|
||||
"version": "7.2.6"
|
||||
},
|
||||
"workmanager": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "workmanager",
|
||||
"ref": "main",
|
||||
"resolved-ref": "4ce065135dc1b91fee918f81596b42a56850391d",
|
||||
"url": "https://github.com/fluttercommunity/flutter_workmanager"
|
||||
"name": "workmanager",
|
||||
"sha256": "f3c3ce6d79cce53eee4a29dd2e8328c25db5ba5d9062fcc5e8f3c71e0af9b7e4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "0.5.2"
|
||||
"source": "hosted",
|
||||
"version": "0.6.0"
|
||||
},
|
||||
"xdg_directories": {
|
||||
"dependency": "transitive",
|
||||
@@ -2374,11 +2353,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "yaru",
|
||||
"sha256": "f149399d81ecd3d20bfcc79afd5ddd9bcd7e4c901d5e602a8577fe59c71c8617",
|
||||
"sha256": "d9149e87ddcbabd6214fe629bfd0b6a94b9d81ca55a5618949ffc47a3d8a7b69",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.0"
|
||||
"version": "8.0.0"
|
||||
},
|
||||
"yaru_window": {
|
||||
"dependency": "transitive",
|
||||
@@ -2432,7 +2411,7 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.7.0 <4.0.0",
|
||||
"flutter": ">=3.29.0"
|
||||
"dart": ">=3.8.0 <4.0.0",
|
||||
"flutter": ">=3.32.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
flutter329,
|
||||
flutter332,
|
||||
fetchFromGitHub,
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
@@ -12,15 +12,15 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
flutter329.buildFlutterApplication {
|
||||
flutter332.buildFlutterApplication rec {
|
||||
pname = "server-box";
|
||||
version = "1.0.1130-unstable-2025-04-25";
|
||||
version = "1.0.1189";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lollipopkit";
|
||||
repo = "flutter_server_box";
|
||||
rev = "8f09085cf30f9b48209c7c3c1e9dceac5aa5eeeb";
|
||||
hash = "sha256-D2FzL34FV+7FnxyEVi/Rm2qO3c9eQmCjlH/4pMWlU5s=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gz+4uJe0JHi8oYNz/oLylkYUmHQA8wnxp/4TadYNMfo=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
@@ -28,12 +28,12 @@ flutter329.buildFlutterApplication {
|
||||
gitHashes = {
|
||||
circle_chart = "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=";
|
||||
computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=";
|
||||
dartssh2 = "sha256-bS916CwUuOKhRyymtmvMxt7vGXmlyiLep4AZsxRJ6iU=";
|
||||
fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=";
|
||||
fl_lib = "sha256-+eHUpn89BI7k/MbCp09gUWGMlqLBrxOy9PgL9uXnkDI=";
|
||||
dartssh2 = "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=";
|
||||
fl_build = "sha256-hCojuXFuN33/prCyuPcMoehWiGfaR2yOJA2V6dOuz4E=";
|
||||
fl_lib = "sha256-cauq5kbcCE52Jp3K/xBdHEmdfuF8aQsujNTjbE93Pww=";
|
||||
plain_notification_token = "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=";
|
||||
watch_connectivity = "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=";
|
||||
xterm = "sha256-LTCMaGVqehL+wFSzWd63KeTBjjU4xCyuhfD9QmQaP0Q=";
|
||||
xterm = "sha256-yMETVh1qEdQAIYaQWbL5958N5dGpczJ/Y8Zvl1WjRnw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -12,18 +12,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.18.3";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ByKj9rnRGS3B+BEqeo7QJvjSxVXytOXydmZMx7lK8Xc=";
|
||||
hash = "sha256-xoGOiaUIjlR2l+l+oM1s3J7YBW9af2dfd+hXwq8zZU8=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorHash = "sha256-L+oww1HlPWgAYK16OG5bWiDb/OW7uarY8LZyw9b85ac=";
|
||||
vendorHash = "sha256-VjxgBXPrgwm8L3VIy7eLG2pVP+iYnpn1oR+ARRh3EAQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tauno-monitor";
|
||||
version = "0.1.27";
|
||||
version = "0.1.28";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taunoe";
|
||||
repo = "tauno-monitor";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QxapBgKKXuZxMIvZ8Z91cYhjE2/qxe9fC/eEaPpJWFg=";
|
||||
hash = "sha256-DxWB69bkDAe35ci/e18Dji0EpZvbz7Y5y+32ZchV/m8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "2.0.14";
|
||||
version = "2.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-B7u5xJHss09QOP1AHoHZWIiHyd2RBcF/XU3BB9N2C60=";
|
||||
hash = "sha256-+0sVumtXEJQEP3vFQ7QU4zA4PuqCRDH5+fetD8PqtBg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-JJUkZlol09Hehxc26DMdEzdxy8Nxa16G8YdTZkHhi78=";
|
||||
npmDepsHash = "sha256-I9h/5sIOXJWm/+YJbXQ5QUfoMnTNiOz27LSEiVS4FXA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pnpm_9,
|
||||
nodejs_22,
|
||||
versionCheckHook,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tsx";
|
||||
version = "4.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "privatenumber";
|
||||
repo = "tsx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wdv2oqJNc6U0Fyv4jT+0LUcYaDfodHk1vQZGMdyFF/E=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-57KDZ9cHb7uqnypC0auIltmYMmIhs4PWyf0HTRWEFiU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs_22
|
||||
pnpm_9.configHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nodejs_22
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
runHook prePatch
|
||||
|
||||
# by default pnpm builds the docs workspace and this was just
|
||||
# the easiest way I found to stop that, as pnpmWorkspaces and
|
||||
# other flags did not work
|
||||
rm pnpm-workspace.yaml
|
||||
|
||||
# because tsx uses semantic-release, the package.json has a placeholder
|
||||
# version number. this patches it to match the version of the nix package,
|
||||
# which in turn is the release version in github.
|
||||
substituteInPlace package.json --replace-fail "0.0.0-semantic-release" "${version}"
|
||||
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
npm run build
|
||||
|
||||
# remove devDependencies that are only required to build
|
||||
# and package the typescript code
|
||||
pnpm prune --prod
|
||||
|
||||
# Clean up broken symlinks left behind by `pnpm prune`
|
||||
# https://github.com/pnpm/pnpm/issues/3645
|
||||
find node_modules -xtype l -delete
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,lib/tsx}
|
||||
cp -r {dist,node_modules} $out/lib/tsx
|
||||
chmod +x $out/lib/tsx/dist/cli.mjs
|
||||
ln -s $out/lib/tsx/dist/cli.mjs $out/bin/tsx
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# 8 / 85 tests are failing, I do not know why, while regular usage shows no issues.
|
||||
doCheck = false;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
description = "TypeScript Execute (tsx): The easiest way to run TypeScript in Node.js";
|
||||
homepage = "https://tsx.is";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.sdedovic ];
|
||||
mainProgram = "tsx";
|
||||
};
|
||||
}
|
||||
@@ -156,11 +156,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wavebox";
|
||||
version = "10.136.15-2";
|
||||
version = "10.137.9-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-VY8SIFg4aN5dH3CXB6r/mv1lh2KWNSPDHZkNFXptQJo=";
|
||||
hash = "sha256-knJKdBegAeC2xQWnkdvx2Xyyfr3Q9uHaXlD62PnMngs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -39,7 +39,7 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-Ma2WWknZ0rF9NZNqOaPyQ2eil34HWmgSIHMnfaSaFjs=";
|
||||
x86_64-linux = "sha256-BQNynZwQevXl+PlAi+OhaIUIf9TaNW5JowD3mLGgJxE=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "16.4.1";
|
||||
version = "16.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
+22
-2
@@ -17,12 +17,26 @@ let
|
||||
pname = "super_native_extensions-rs";
|
||||
inherit version src;
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
if [ -d $src/super_native_extensions ]; then
|
||||
cp -r $src/super_native_extensions ${src.name}
|
||||
else
|
||||
cp -r $src ${src.name}
|
||||
fi
|
||||
chmod -R u+w -- "$sourceRoot"
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
sourceRoot = "${src.name}/rust";
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash =
|
||||
rec {
|
||||
_0_9_1 = _0_9_0-dev_6;
|
||||
_0_9_0-dev_6 = "sha256-1yJIbBxScmkCwy/e+/z2cYA8qQBfT0yoIBmOSPVd4h4=";
|
||||
_0_9_0-dev_5 = _0_8_22;
|
||||
_0_9_0-dev_3 = _0_8_22;
|
||||
@@ -69,8 +83,14 @@ stdenv.mkDerivation {
|
||||
runHook preInstall
|
||||
|
||||
cp -r "$src" "$out"
|
||||
chmod +rwx $out/cargokit/cmake/cargokit.cmake
|
||||
cp ${fakeCargokitCmake} $out/cargokit/cmake/cargokit.cmake
|
||||
if [ -d $out/super_native_extensions ]; then
|
||||
pushd $out/super_native_extensions
|
||||
else
|
||||
pushd $out
|
||||
fi
|
||||
chmod +rwx cargokit/cmake/cargokit.cmake
|
||||
cp ${fakeCargokitCmake} cargokit/cmake/cargokit.cmake
|
||||
popd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (
|
||||
{
|
||||
version = "28.3";
|
||||
hash = "sha256-+bb5RxITzxuX50ItmpQhWEG1kMfvlizWTMJJzwlhhYM=";
|
||||
}
|
||||
// args
|
||||
)
|
||||
@@ -57,44 +57,46 @@ deployAndroidPackage {
|
||||
libxshmfence
|
||||
])
|
||||
++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
|
||||
patchInstructions = lib.optionalString (os == "linux") ''
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib64
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
|
||||
# autoPatchelf is not detecting libuuid :(
|
||||
addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib
|
||||
patchInstructions =
|
||||
(lib.optionalString (os == "linux") ''
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib64
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
|
||||
# autoPatchelf is not detecting libuuid :(
|
||||
addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib
|
||||
|
||||
# This library is linked against a version of libtiff that nixpkgs doesn't have
|
||||
for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do
|
||||
patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
|
||||
done
|
||||
# This library is linked against a version of libtiff that nixpkgs doesn't have
|
||||
for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do
|
||||
patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
|
||||
done
|
||||
|
||||
for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do
|
||||
patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true
|
||||
done
|
||||
for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do
|
||||
patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true
|
||||
done
|
||||
|
||||
autoPatchelf $out
|
||||
autoPatchelf $out
|
||||
|
||||
# Wrap emulator so that it can load required libraries at runtime
|
||||
wrapProgram $out/libexec/android-sdk/emulator/emulator \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
pkgs.dbus
|
||||
pkgs.systemd
|
||||
]
|
||||
} \
|
||||
--set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
|
||||
--set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
|
||||
# Wrap emulator so that it can load required libraries at runtime
|
||||
wrapProgram $out/libexec/android-sdk/emulator/emulator \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
pkgs.dbus
|
||||
pkgs.systemd
|
||||
]
|
||||
} \
|
||||
--set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
|
||||
--set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
|
||||
'')
|
||||
+ ''
|
||||
mkdir -p $out/bin
|
||||
cd $out/bin
|
||||
find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do
|
||||
ln -s $i
|
||||
done
|
||||
|
||||
mkdir -p $out/bin
|
||||
cd $out/bin
|
||||
find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do
|
||||
ln -s $i
|
||||
done
|
||||
|
||||
cd $out/libexec/android-sdk
|
||||
${postInstall}
|
||||
'';
|
||||
cd $out/libexec/android-sdk
|
||||
${postInstall}
|
||||
'';
|
||||
dontMoveLib64 = true;
|
||||
|
||||
inherit meta;
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "prelude";
|
||||
version = "0.5";
|
||||
|
||||
minimalOCamlVersion = "4.13";
|
||||
|
||||
# upstream git repo is misconfigured and cannot be cloned
|
||||
src = fetchzip {
|
||||
url = "https://git.zapashcanon.fr/zapashcanon/prelude/archive/${version}.tar.gz";
|
||||
hash = "sha256-lti+q1U/eEasAXo0O5YEu4iw7947V9bdvSHA0IEMS8M=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Library to enforce good stdlib practices";
|
||||
homepage = "https://ocaml.org/p/prelude/";
|
||||
downloadPage = "https://git.zapashcanon.fr/zapashcanon/prelude";
|
||||
changelog = "https://git.zapashcanon.fr/zapashcanon/prelude/src/tag/${version}/CHANGES.md";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ lib.maintainers.ethancedwards8 ];
|
||||
};
|
||||
}
|
||||
@@ -27,6 +27,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-B+JcLTy/9b5UAif/N3GcyJ8hXfqqpesDinWwG7+7JyI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools<79.0.0" setuptools
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
aiohttp,
|
||||
@@ -9,28 +8,22 @@
|
||||
yarl,
|
||||
aresponses,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "here-routing";
|
||||
version = "1.0.1";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
version = "1.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eifinger";
|
||||
repo = "here_routing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sdNs5QNYvL1Cpbk9Yi+7PSiDZ6LEgAXQ19IYSAY78p0=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-56Sx8pbfsuCj7mqG15HK3QoGGiQDFFrbkOdNedV+HY4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
@@ -42,13 +35,14 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "here_routing" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/eifinger/here_routing/releases/tag/v${version}";
|
||||
changelog = "https://github.com/eifinger/here_routing/releases/tag/${src.tag}";
|
||||
description = "Asynchronous Python client for the HERE Routing V8 API";
|
||||
homepage = "https://github.com/eifinger/here_routing";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -58,6 +58,11 @@ buildPythonPackage rec {
|
||||
--replace-fail \
|
||||
"dldir = [" \
|
||||
"dldir = [ '${addDriverRunpath.driverLink}/lib', "
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail 'max_numpy_run_version = "2.3"' 'max_numpy_run_version = "2.4"'
|
||||
substituteInPlace numba/__init__.py \
|
||||
--replace-fail "numpy_version > (2, 2)" "numpy_version > (2, 3)"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numexpr";
|
||||
version = "2.10.2";
|
||||
version = "2.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sK/2tI68mdL1Tye19zpYy5L95lCu/xs5fHHIeItP/xo=";
|
||||
hash = "sha256-dbLAGk7aLnw1e8Z6P1w912UGwVtf1NxChF7y4YIYG60=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "test2ref";
|
||||
version = "0.8.2";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nbiotcloud";
|
||||
repo = "test2ref";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Rgm7qZc1pFY/9gwzHjnI305Ch9enXzzWRsPZ7CQjzpQ=";
|
||||
hash = "sha256-m95undMr1W2GRcSELv7s9kpuXyu+HnGo+huc0Uh9rQI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Testing Against Learned Reference Data";
|
||||
homepage = "https://github.com/nbiotcloud/test2ref";
|
||||
changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/v${version}";
|
||||
changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
protobuf,
|
||||
libffi,
|
||||
callPackage,
|
||||
librusty_v8 ? callPackage ./librusty_v8.nix { },
|
||||
nix-update-script,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "vl-convert-python";
|
||||
version = "1.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vega";
|
||||
repo = "vl-convert";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dmfY05i5nCiM2felvBcSuVyY8G70HhpJP3KrRGQ7wq8=";
|
||||
};
|
||||
|
||||
patches = [ ./libffi-sys-system-feature.patch ];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-t952WH6zq7POVvdX3fI7kXXfPiaAXjfsvoqI/aq5Fn0=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "vl-convert-python";
|
||||
|
||||
env.RUSTY_V8_ARCHIVE = librusty_v8;
|
||||
|
||||
build-system = [
|
||||
rustPlatform.maturinBuildHook
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ protobuf ];
|
||||
|
||||
buildInputs = [ libffi ];
|
||||
|
||||
pythonImportsCheck = [ "vl_convert" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"vl-convert-python@(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Utilities for converting Vega-Lite specs from the command line and Python";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://github.com/vega/vl-convert";
|
||||
changelog = "https://github.com/vega/vl-convert/releases/tag/v${version}";
|
||||
maintainers = with lib.maintainers; [ antonmosich ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
diff --git a/vl-convert-python/Cargo.toml b/vl-convert-python/Cargo.toml
|
||||
index 3d24fa4..25020db 100644
|
||||
--- a/vl-convert-python/Cargo.toml
|
||||
+++ b/vl-convert-python/Cargo.toml
|
||||
@@ -22,3 +22,5 @@ lazy_static = { workspace = true }
|
||||
futures = { workspace = true }
|
||||
pythonize = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
+
|
||||
+libffi = { version = "3.2.0", features = ["system"] }
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
let
|
||||
fetch_librusty_v8 =
|
||||
args:
|
||||
fetchurl {
|
||||
name = "librusty_v8-${args.version}";
|
||||
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
|
||||
sha256 = args.shas.${stdenv.hostPlatform.system};
|
||||
meta = {
|
||||
inherit (args) version;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.105.1";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-f7aDA74Jn2h4rp9sACGHX4DBbN6yevgWCEKdfI1fJDU=";
|
||||
aarch64-linux = "sha256-vuEP7in+A/PrBXSunRq1SC77dOuMiScsKcA712AuNuk=";
|
||||
x86_64-darwin = "sha256-sNe2VCwZvy64jdbPwx7pZ91fFRv1xosOcGiAtSPbt8A=";
|
||||
aarch64-darwin = "sha256-GmwTJADMxArwOvRN/w5KVmWGc1+WfraBc/wWe7dxHMg=";
|
||||
};
|
||||
}
|
||||
@@ -46,6 +46,8 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "django-tasks" ];
|
||||
|
||||
dependencies = [
|
||||
anyascii
|
||||
beautifulsoup4
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "corefreq";
|
||||
version = "2.0.5";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyring";
|
||||
repo = "CoreFreq";
|
||||
rev = version;
|
||||
hash = "sha256-9RANWw0zdsNFHdHPc0AjPQTZSlaejChsrZmxNXeBzK0=";
|
||||
hash = "sha256-k9tw32yG8WGGCY0/5WWvRTBzz+jka7PZ9WU05rwnunI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "beets-audible";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Neurrone";
|
||||
repo = "beets-audible";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Sds16h+W9t7N755ADPXXDi+SxwouBMxP9ApUqaXedqY=";
|
||||
hash = "sha256-6rf8U63SW+gwfT7ZdN/ymYKHRs0HSMDTP2ZBfULLsJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
description = "Completion input method for faster typing";
|
||||
mainProgram = "emoji-picker";
|
||||
maintainers = with maintainers; [ ncfavier ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
isIbusEngine = true;
|
||||
};
|
||||
|
||||
@@ -1618,6 +1618,7 @@ mapAliases {
|
||||
prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10
|
||||
prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30
|
||||
protobuf_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
|
||||
protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14
|
||||
protobuf3_24 = protobuf_24;
|
||||
protobuf3_23 = protobuf_23;
|
||||
protobuf3_21 = protobuf_21;
|
||||
|
||||
@@ -9321,7 +9321,6 @@ with pkgs;
|
||||
protobuf_31 = callPackage ../development/libraries/protobuf/31.nix { };
|
||||
protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { };
|
||||
protobuf_29 = callPackage ../development/libraries/protobuf/29.nix { };
|
||||
protobuf_28 = callPackage ../development/libraries/protobuf/28.nix { };
|
||||
protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { };
|
||||
protobuf_26 = callPackage ../development/libraries/protobuf/26.nix { };
|
||||
protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { };
|
||||
@@ -9333,7 +9332,6 @@ with pkgs;
|
||||
protobuf_31
|
||||
protobuf_30
|
||||
protobuf_29
|
||||
protobuf_28
|
||||
protobuf_27
|
||||
protobuf_26
|
||||
protobuf_25
|
||||
|
||||
@@ -1768,6 +1768,8 @@ let
|
||||
|
||||
pratter = callPackage ../development/ocaml-modules/pratter { };
|
||||
|
||||
prelude = callPackage ../development/ocaml-modules/prelude { };
|
||||
|
||||
prettym = callPackage ../development/ocaml-modules/prettym { };
|
||||
|
||||
printbox = callPackage ../development/ocaml-modules/printbox { };
|
||||
|
||||
@@ -19006,6 +19006,10 @@ self: super: with self; {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
vl-convert-python = callPackage ../development/python-modules/vl-convert-python {
|
||||
inherit (pkgs) protobuf;
|
||||
};
|
||||
|
||||
vllm = callPackage ../development/python-modules/vllm { };
|
||||
|
||||
vmprof = callPackage ../development/python-modules/vmprof { };
|
||||
|
||||
Reference in New Issue
Block a user