Merge master into staging-next
This commit is contained in:
@@ -33,6 +33,9 @@ let
|
||||
allowVariants = !attrNamesOnly;
|
||||
checkMeta = true;
|
||||
|
||||
# Silence the `x86_64-darwin` deprecation warning.
|
||||
allowDeprecatedx86_64Darwin = true;
|
||||
|
||||
handleEvalIssue =
|
||||
reason: errormsg:
|
||||
let
|
||||
|
||||
@@ -774,6 +774,18 @@
|
||||
githubId = 59283660;
|
||||
name = "Antoine Fontaine";
|
||||
};
|
||||
afontaine = {
|
||||
name = "Andrewfontaine";
|
||||
github = "afontaine";
|
||||
githubId = 3373136;
|
||||
email = "andrew@afontaine.ca";
|
||||
matrix = "@andrew:afontaine.dev";
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "A8F3 62E2 D806 6895 581A C014 DD4B E519 1E21 53E0";
|
||||
}
|
||||
];
|
||||
};
|
||||
aforemny = {
|
||||
email = "aforemny@posteo.de";
|
||||
github = "aforemny";
|
||||
@@ -15143,6 +15155,11 @@
|
||||
githubId = 101508537;
|
||||
name = "Yuchen He";
|
||||
};
|
||||
lilahummel = {
|
||||
github = "LilaHummel";
|
||||
githubId = 263230236;
|
||||
name = "Lila Hummel";
|
||||
};
|
||||
lilioid = {
|
||||
name = "Lilly";
|
||||
email = "li@lly.sh";
|
||||
@@ -17387,6 +17404,12 @@
|
||||
githubId = 43088426;
|
||||
name = "Mihnea Stoian";
|
||||
};
|
||||
mikaeladev = {
|
||||
email = "mikaeladev@icloud.com";
|
||||
github = "mikaeladev";
|
||||
githubId = 100416544;
|
||||
name = "mikaeladev";
|
||||
};
|
||||
mikaelfangel = {
|
||||
email = "nixpkgs.bottle597@passfwd.com";
|
||||
github = "MikaelFangel";
|
||||
|
||||
@@ -276,11 +276,11 @@ in
|
||||
services.udev.extraRules = lib.mkIf cfg.applyUdevRules (udevRules cfg.tssUser cfg.tssGroup);
|
||||
|
||||
# Create the tss user and group only if the default value is used
|
||||
users.users.${cfg.tssUser} = lib.mkIf (cfg.tssUser == "tss") {
|
||||
users.users.tss = lib.mkIf (cfg.tssUser == "tss" || cfg.tssGroup == "tss") {
|
||||
isSystemUser = true;
|
||||
group = "tss";
|
||||
};
|
||||
users.groups.${cfg.tssGroup} = lib.mkIf (cfg.tssGroup == "tss") { };
|
||||
users.groups.tss = lib.mkIf (cfg.tssUser == "tss" || cfg.tssGroup == "tss") { };
|
||||
|
||||
environment.variables = lib.mkIf cfg.tctiEnvironment.enable (
|
||||
lib.attrsets.genAttrs
|
||||
|
||||
@@ -1638,7 +1638,7 @@ in
|
||||
tomcat = runTest ./tomcat.nix;
|
||||
tor = runTest ./tor.nix;
|
||||
tpm-ek = handleTest ./tpm-ek { };
|
||||
tpm2 = runTest ./tpm2.nix;
|
||||
tpm2 = import ./tpm2 { inherit runTest; };
|
||||
traccar = runTest ./traccar.nix;
|
||||
# tracee requires bpf
|
||||
tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };
|
||||
|
||||
@@ -16,9 +16,14 @@ in
|
||||
scripts = [ pkgs.mpvScripts.simple-mpv-webui ];
|
||||
})
|
||||
];
|
||||
|
||||
environment.etc."mpv/mpv.conf".text = ''
|
||||
[nixos-test-profile]
|
||||
'';
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.succeed("mpv --profile=help | grep -F nixos-test-profile")
|
||||
machine.execute("set -m; mpv --script-opts=webui-port=${port} --idle=yes >&2 &")
|
||||
machine.wait_for_open_port(${port})
|
||||
assert "<title>simple-mpv-webui" in machine.succeed("curl -s localhost:${port}")
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{ runTest }:
|
||||
{
|
||||
abrmd = runTest ./tpm2-abrmd.nix;
|
||||
tpmrm = runTest ./tpm2-tpmrm.nix;
|
||||
}
|
||||
@@ -39,6 +39,10 @@
|
||||
machine.start()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("/dev/tpmrm0 has correct ownership"):
|
||||
machine.succeed('[ `stat -c "%U" /dev/tpmrm0` = "tss" ]')
|
||||
machine.succeed('[ `stat -c "%G" /dev/tpmrm0` = "tss" ]')
|
||||
|
||||
with subtest("tabrmd service started properly"):
|
||||
machine.succeed('[ `systemctl show tpm2-abrmd.service --property=Result` = "Result=success" ]')
|
||||
machine.succeed('[ `journalctl -b -u tpm2-abrmd.service | grep -c "Starting"` = "1" ]')
|
||||
@@ -0,0 +1,72 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
name = "tpm2-tpmrm";
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
virtualisation = {
|
||||
mountHostNixStore = true;
|
||||
useEFIBoot = true;
|
||||
tpm.enable = true;
|
||||
};
|
||||
|
||||
users.users = {
|
||||
tss-user = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "tss" ];
|
||||
};
|
||||
};
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
security.tpm2 = {
|
||||
enable = true;
|
||||
pkcs11.enable = true;
|
||||
tctiEnvironment.enable = true;
|
||||
fapi.ekCertLess = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.tpm2-tools
|
||||
pkgs.openssl
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("/dev/tpmrm0 has correct ownership"):
|
||||
machine.succeed('[ `stat -c "%U" /dev/tpmrm0` = "root" ]')
|
||||
machine.succeed('[ `stat -c "%G" /dev/tpmrm0` = "tss" ]')
|
||||
|
||||
with subtest("tpm2 cli works"):
|
||||
machine.succeed('tpm2 createprimary --hierarchy=o --key-algorithm=aes256 --attributes="fixedtpm|fixedparent|sensitivedataorigin|userwithauth|restricted|decrypt" --key-context=owner_root_key.ctx')
|
||||
machine.succeed('tpm2 create --parent-context=owner_root_key.ctx --key-algorithm=ecc256:ecdsa-sha256:null --attributes="fixedtpm|fixedparent|sensitivedataorigin|userwithauth|restricted|sign" --key-context=ecc_sign_key.ctx --creation-ticket=ecc_sign_key-creation_ticket.bin -f pem --output=ecc_sign_key_public.pem')
|
||||
machine.succeed('echo "A very important message." > message.txt')
|
||||
machine.succeed('tpm2 sign --key-context=ecc_sign_key.ctx --hash-algorithm=sha256 -f plain --signature message_signature.bin message.txt')
|
||||
machine.succeed('openssl dgst -verify ecc_sign_key_public.pem -signature message_signature.bin message.txt')
|
||||
machine.succeed('echo "evil addition!" >> message.txt')
|
||||
machine.fail('openssl dgst -verify ecc_sign_key_public.pem -signature message_signature.bin message.txt')
|
||||
|
||||
def format_command(command, user):
|
||||
return f"runuser -u {user} -- bash -c '{command}'"
|
||||
def succeedu(command,user):
|
||||
return machine.succeed(format_command(command,user))
|
||||
def failu(command,user):
|
||||
return machine.fail(format_command(command,user))
|
||||
|
||||
with subtest("tss2 cli works"):
|
||||
machine.succeed('tss2 provision')
|
||||
succeedu('tss2 createkey --path=HS/SRK/sign --type=sign --authValue=""',"tss-user")
|
||||
succeedu('tss2 gettpmblobs --path=HS/SRK/sign --tpm2bPublic=$HOME/sign_key_public.bin',"tss-user")
|
||||
succeedu('tpm2 print -t TPM2B_PUBLIC -f pem $HOME/sign_key_public.bin > $HOME/sign_key_public.pem',"tss-user")
|
||||
succeedu('echo "A very important message." > $HOME/message.txt',"tss-user")
|
||||
succeedu('tpm2 hash --hash-algorithm=sha256 --output=$HOME/message_hash.bin $HOME/message.txt',"tss-user")
|
||||
succeedu('tss2 sign --keyPath=HS/SRK/sign --digest=$HOME/message_hash.bin --signature=$HOME/message_signature.bin',"tss-user")
|
||||
succeedu('openssl dgst -verify $HOME/sign_key_public.pem -signature $HOME/message_signature.bin $HOME/message.txt',"tss-user")
|
||||
succeedu('echo "evil addition!" >> $HOME/message.txt',"tss-user")
|
||||
failu('openssl dgst -verify $HOME/sign_key_public.pem -signature $HOME/message_signature.bin $HOME/message.txt',"tss-user")
|
||||
'';
|
||||
}
|
||||
+20
-10
@@ -30,6 +30,7 @@ let
|
||||
libraries = [ pkgs.python3Packages.selenium ];
|
||||
flakeIgnore = [ "E501" ];
|
||||
}
|
||||
# python
|
||||
''
|
||||
|
||||
from selenium.webdriver.common.by import By
|
||||
@@ -80,6 +81,13 @@ let
|
||||
|
||||
wait.until_not(EC.title_contains("Set a strong password"))
|
||||
|
||||
wait.until_not(EC.title_contains("Join organization"))
|
||||
|
||||
# NOTE: When testing this locally, the extensions must not be installed, otherwise this screen does not appear
|
||||
click_when_unobstructed((By.XPATH, "//button[contains(., 'Add it later')]"))
|
||||
|
||||
click_when_unobstructed((By.XPATH, "//a[contains(., 'Skip to web app')]"))
|
||||
|
||||
click_when_unobstructed((By.XPATH, "//button[contains(., 'New item')]"))
|
||||
|
||||
driver.find_element(By.XPATH, '//input[@formcontrolname="name"]').send_keys(
|
||||
@@ -205,7 +213,7 @@ let
|
||||
testScript
|
||||
else
|
||||
''
|
||||
import json
|
||||
# import json
|
||||
|
||||
start_all()
|
||||
server.wait_for_unit("vaultwarden.service")
|
||||
@@ -222,18 +230,20 @@ let
|
||||
with subtest("use the web interface to sign up, log in, and save a password"):
|
||||
server.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner")
|
||||
|
||||
with subtest("log in with the cli"):
|
||||
key = client.succeed(
|
||||
"bw --nointeraction --raw login ${userEmail} ${userPassword}"
|
||||
).strip()
|
||||
# Upstreams sees offline usage as a new feature...
|
||||
# https://github.com/bitwarden/clients/issues/18110
|
||||
# with subtest("log in with the cli"):
|
||||
# key = client.succeed(
|
||||
# "bw --nointeraction --raw login ${userEmail} ${userPassword}"
|
||||
# ).strip()
|
||||
|
||||
with subtest("sync with the cli"):
|
||||
client.succeed(f"bw --nointeraction --raw --session {key} sync -f")
|
||||
# with subtest("sync with the cli"):
|
||||
# client.succeed(f"bw --nointeraction --raw --session {key} sync -f")
|
||||
|
||||
with subtest("get the password with the cli"):
|
||||
output = json.loads(client.succeed(f"bw --nointeraction --raw --session {key} list items"))
|
||||
# with subtest("get the password with the cli"):
|
||||
# output = json.loads(client.succeed(f"bw --nointeraction --raw --session {key} list items"))
|
||||
|
||||
assert output[0]['login']['password'] == "${storedPassword}"
|
||||
# assert output[0]['login']['password'] == "${storedPassword}"
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "freeintv";
|
||||
version = "0-unstable-2025-12-26";
|
||||
version = "0-unstable-2026-02-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "freeintv";
|
||||
rev = "df5a5312985b66b1ec71b496868641e40b7ad1c9";
|
||||
hash = "sha256-xpcDAvxHvnuiQiWBYSwPKGE+Zg1lcs/6L4hMhpb1G1g=";
|
||||
rev = "0e0e58503386304c5e7ac860c135583bc52e2e49";
|
||||
hash = "sha256-uRkLF3LSiAMV/k8R8PuE0QZUnc1YEYe0rmccQz6H43A=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -571,11 +571,11 @@
|
||||
"vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
|
||||
},
|
||||
"hashicorp_google": {
|
||||
"hash": "sha256-SeShEZVFMn/f/ATUY08Jl1wwXBJFmyTpRh7U46ftM60=",
|
||||
"hash": "sha256-HXHeCA3h5h9pyC9WZ+3EnySWmIsxGMskHbW+SjvZel4=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v7.19.0",
|
||||
"rev": "v7.20.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-lhTdDrTwTbRuWngQ+NGuh+x5Z5HZfVTtNi+mZqIENbg="
|
||||
},
|
||||
@@ -806,13 +806,13 @@
|
||||
"vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk="
|
||||
},
|
||||
"keycloak_keycloak": {
|
||||
"hash": "sha256-u9gIh3iM9mpBJbO0Vgyt8YZNsRHvewJTY6vNm+KVxwY=",
|
||||
"hash": "sha256-55/a3lJCJEOIDsnFckx5BsUClphPZ9BSBvWxQBq1D9Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
|
||||
"owner": "keycloak",
|
||||
"repo": "terraform-provider-keycloak",
|
||||
"rev": "v5.6.0",
|
||||
"rev": "v5.7.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-va9B1CPLLT0NH4VP+1Fjr8O/I2K8xVO9aVjM3fZ9jVE="
|
||||
"vendorHash": "sha256-JgQqOm+cAMLACp/rVz3ek1C4uuTAs8vqDcwRkpFssYc="
|
||||
},
|
||||
"kislerdm_neon": {
|
||||
"hash": "sha256-1o5EnAI9X8Q+dXxh1/jZwimy1MmPDF3X2aRc+HO7HpQ=",
|
||||
|
||||
@@ -12,6 +12,7 @@ cargoNextestHook() {
|
||||
local flagsArray=(
|
||||
"--target" "@rustcTargetSpec@"
|
||||
"--offline"
|
||||
"--show-progress=none"
|
||||
)
|
||||
|
||||
if [[ -z ${dontUseCargoParallelTests-} ]]; then
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
let
|
||||
nodejs = nodejs_22;
|
||||
yarn-berry = yarn-berry_4.override { inherit nodejs; };
|
||||
version = "26.2.0";
|
||||
version = "26.2.1";
|
||||
src = fetchFromGitHub {
|
||||
name = "actualbudget-actual-source";
|
||||
owner = "actualbudget";
|
||||
repo = "actual";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fnfDPN/9TfV1v/myNvCQ70Q0T2oW9XIyomsMdQKyoJo=";
|
||||
hash = "sha256-8cRt1WKa4Yp6rE2Jzko0rKJoCp7+KSzVdtKcv/aKK8o=";
|
||||
};
|
||||
translations = fetchFromGitHub {
|
||||
name = "actualbudget-translations-source";
|
||||
@@ -27,8 +27,8 @@ let
|
||||
repo = "translations";
|
||||
# Note to updaters: this repo is not tagged, so just update this to the Git
|
||||
# tip at the time the update is performed.
|
||||
rev = "a7a0edce994520f3d473c92902992b4eccb81204";
|
||||
hash = "sha256-Kha3kPt9rKaw2i/S0nOOVba9QwWtb9SJV/1qs6YJHRE=";
|
||||
rev = "3917dc0ea36608c3a1857518f0205d8ab4011d69";
|
||||
hash = "sha256-g4GI+zIKZ63lL+NC+EMEk01GVlbUDVGey0UgqO6Fk+8=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alpine";
|
||||
version = "2.26";
|
||||
version = "2.29.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.or.cz/alpine.git";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cJyUBatQBjD6RG+jesJ0JRhWghPRBACc/HQl+2aCTd0=";
|
||||
hash = "sha256-uAPQlF2IQPSZ0QoK9bwh6RBGsb1X0ktP1eVhs3RO44I=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amneziawg-tools";
|
||||
version = "1.0.20250903";
|
||||
version = "1.0.20260223";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amnezia-vpn";
|
||||
repo = "amneziawg-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-a5o49hx0HwB0PwlY1orp3ZI5zb5mpzHoRIhv9OdGSbU=";
|
||||
hash = "sha256-pHmuxlrbTqjwRrB7BShdC4ENw3iVQRRLH+Z2w8x+KeE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
@@ -29,9 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"lib"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
audit
|
||||
gperf
|
||||
libcap
|
||||
];
|
||||
|
||||
@@ -41,8 +40,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
python3
|
||||
getent
|
||||
gperf
|
||||
];
|
||||
|
||||
mesonFlags = lib.optionals (!stdenv.hostPlatform.isLinux) [
|
||||
"-Daudit=disabled"
|
||||
"-Dlibcap=disabled"
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.useLLVM {
|
||||
NIX_LDFLAGS = "--undefined-version";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
pushd src/basic
|
||||
patchShebangs \
|
||||
@@ -56,6 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "basuctl";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
accountsservice,
|
||||
alsa-lib,
|
||||
budgie-desktop-services,
|
||||
@@ -69,6 +70,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
patches = [
|
||||
./plugins.patch
|
||||
|
||||
# Don't use scaling factors
|
||||
# https://github.com/BuddiesOfBudgie/budgie-desktop/pull/864
|
||||
(fetchpatch {
|
||||
url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/03d18336c3d50d14e3e81ef03ef8ebd548d8e00c.patch";
|
||||
hash = "sha256-pO1t3nnyYX2XDqH6wr+00MHsM0fAT0MOSuk+lN+2CNY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-session";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = "budgie-session";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KBNX1jbQ2yv+5rymoB9/w5V3bRZhBdZIJoysp9cNgn4=";
|
||||
hash = "sha256-MqFZ/0Xe2EXVzbhviNSO3gbZK8R+wLGQOoVkJDA6/Eg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -20,17 +20,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applets";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applets";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-ZL7Rt0UeWiMaALCIy/eDY5ROTm83xqRymiCupyvx9yI=";
|
||||
hash = "sha256-ONDfvyIy7sqgMpf2IrVUjLPkXUEOiN3OGK57P/4KVZQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-n83JK/pOEMLTBlh0bbFqyW10usEthrSiXoozqmkUa58=";
|
||||
cargoHash = "sha256-FWpfgqPqjbzzv6yaBKx9eq+PHCCQ/TErx+TGWqmXqXA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applibrary";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applibrary";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-nxTsshFF7xRbd06q7YiMjXYmt94CRm8nSofcyrzulSQ=";
|
||||
hash = "sha256-OxHfrtUrcVC5rdh3W56zNhNRNzYrX+VRJIiW19lAJPM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-apLIpb1VUuQRgOJ2mQioPyucbETzyh5wOeatMCLGrc4=";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-bg";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-lD5lTYXBy+keee+VArtNHgCS9n737YKaW8Kg3tu+8o0=";
|
||||
hash = "sha256-/6VYiZ02y/UAA3fZ+CHb18BZAWBnm/3HAf7IdEhaeD0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -20,17 +20,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-comp";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-comp";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-TQBHXXF8hZrdgqQLtQQHsallAfxAUGxGa3becbddPqc=";
|
||||
hash = "sha256-AxMhcWBYN6q6IDKXXBWFi+WvSnSgF/lg5Ch9Obs+7uc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-58qUzJDzwwMB5hmOl9XHmbTRZE/ep5fWKPj5u2onvRM=";
|
||||
cargoHash = "sha256-hcQ6u4Aj5Av9T9uX0oDSbJG82g6E8IXcJc4Z2CfoRtg=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-edit";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-edit";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-MaWRzTLJlc7883BVKCegyAT3GXf3OqgZhFWteVI+P6o=";
|
||||
hash = "sha256-yaDFlnORaPwh/2Zb3Nh1Hr/jA1Z/kQT6Y1zic0eVvwA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EdKx+ynQBthJp4f3COmYRYp9pTq7/TkxuheyxcDuwV0=";
|
||||
cargoHash = "sha256-1Q+jdr7uSQTp+3z2fgQIyH33v/Ld9MPER3/WRJ34Mdg=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-files";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-files";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-oSCGJAjfCSM9hSr/bsEzFY+E/JjFVrvPAlKlU/Zw57g=";
|
||||
hash = "sha256-kTPPYfga0to19ZC66bGj/ROsMceG8LuELl1OkwKSirU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+Z7ICOBnxhS+I9gAZTnpq6guLzlqXlMAk9+awCIzNCk=";
|
||||
cargoHash = "sha256-tkH9BIeTukdVJhN9yUgFdUUhyfqnx3tTqwu+LAAULog=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-mtq8xz70zAXrKW/18nUOvO3UjxC6qoYznhWyUWJ5NBc=";
|
||||
hash = "sha256-U0JrxvMWzISSA0tP8moasN7iN7TfZreEwbvWZGHRn8E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sNJTXBInr/h8w5dhOOP9ceBYWBcJW3qGjDuaG6UTV90=";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-icons";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-icons";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-lbj64wH180UGO3jYW9HhuHIwy/tU2Ka86wXz+Wjde8g=";
|
||||
hash = "sha256-dLiBao8jvtxxSlENceVkPJNChwEK1Wtf3k5hY97WZoI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ just ];
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-idle";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-idle";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-mQnWGYHlY1zKGynCwJSxjMSeHd0iBFYWsY3b1wZEGTs=";
|
||||
hash = "sha256-0tcrOfVT5b57ev3b5F2U78F2QPGFwp94bqFVNyKH0Yk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw=";
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-initial-setup";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-initial-setup";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-6pa4ZSH1NzVqq65d5MQucCLNr4c4PURNE0mLvrfWlug=";
|
||||
hash = "sha256-+yl3MIBNO3G0O4o4Iu1vMkcLW4UMj8mPv9IWCCcqG6s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Kj+eaTMHMQQHN0X3prIuZm1wvfnaV7BUlUKem6JLtc8=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-launcher";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-launcher";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-j65JSGBeRiDvZQgrPuaBBsQGfoowjkZLfW7lfdxXIh0=";
|
||||
hash = "sha256-zrU5wn/DaIJiIri5u40t4etqkyn8ZO9ITTyJQGyqziw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o2CyAjUp0E4m5G4SG8vm4RhQzvFsmbgfJDQRRxoyGEg=";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-notifications";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-notifications";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-We2N6lyN75loTOSP2GRv/6S73QgLa7B/bjLftoZIviA=";
|
||||
hash = "sha256-uBnKwl1yZh/QPV6pastve2UBLwG/VjYVQmGJ3kZt8c8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns=";
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osd";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osd";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-i0fGEwLBpbqmz808Z6uqQlykSsi6hAFUsShMBXtRpl8=";
|
||||
hash = "sha256-HhE8/N+tD12MLWQwqsoQSQFtFMj2LZkUTPkOijmEBaM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-panel";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-panel";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-1Xwe1uONJbl4wq6QBbTI1suLiSlTzU4e/5WBccvghHE=";
|
||||
hash = "sha256-ZNbX9Xs84TQmoke+xEolpkGqgJkC/lIuMKWRJjgZ+nE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZkjXZrcA4qKHSjEOxj7+j10PxJw/du8B2Mee2fxPJxs=";
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-player";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-player";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-zBSSJHn+onMj5HIEgGXKmsFAvKVewCk1BqkfeBE0KC0=";
|
||||
hash = "sha256-ddwYgyyAaQr+0ULdCm7ZDLBfmXi014OR/G2KauYsI10=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KjGP1iEAuAEb4Ab343aPx22u3h8tFCG7yW6Op6DwTik=";
|
||||
cargoHash = "sha256-8w66CbGoonmJ3cb5G4G7pPjjk1OVbdZFp9smuKchvRY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-randr";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-7jkHaCE1IUE3GuRUeDMvbxomBp3gTzauK1EP1MAbqf0=";
|
||||
hash = "sha256-Jimw6YCRouG9FDlLBp15OOCRlywBIaP/K/bXLR7trQM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QWSPj7bxxWh5/KeNEtUsfDKg+JMONLjomrMcn57j6fw=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-screenshot";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-screenshot";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-IyjrXj9UElfWKU7t9JpJi4WvOpgteg/Y3tvj3ZukQYI=";
|
||||
hash = "sha256-w80z/mKr+kYLeg5MMR0GfS/XkX5EU+unvmlRCUZvp6A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-session";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-session";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-LZN+7hN3rBpVk7UWvG9D4gH2UOrfwMmSisdIsOT4vmA=";
|
||||
hash = "sha256-dMx7ZSl+ZDZGwAbo3tWwSH8Tg00ZVTJsXNZrBHY4Xj4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4=";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings-daemon";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings-daemon";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-4YozCuj6lF9GmsV9eRD4HEb3G8tYKjQc3+ghYHxKrhE=";
|
||||
hash = "sha256-nivViFs0swS5MUH+hfpBl5sFGBZ6XPo3E0PGONVmzxo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -27,17 +27,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-255HkAWq9q7Fxx/YCTYqcsRE7g6Hnuqc6rJWBW+7MYA=";
|
||||
hash = "sha256-IkWH8V5M8k3BB8UpnNMxM5z5uzKRatu/tbACywiqezg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T9fbhrYrQrc7TjyumhfT5vyElRKnDzxVBsJtcGA3f7I=";
|
||||
cargoHash = "sha256-1T/Wd59AD8HVeTCeKb8BIdzw3n+nK5otevFmwn3YJRs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-store";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-0QcgFEyMlAK5QxZK9CmXBSJoFymmw4yru3VdK9TcXws=";
|
||||
hash = "sha256-nFquLO/qMANbQRbOfjegZeMb2vCSKUK5/Y/U4ghuW64=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0cn7/Mow9uAOAQZEUh7CZXNk9r4tvOeqjyCyJGtE2m4=";
|
||||
cargoHash = "sha256-rrIIQ5bx4HMrxoUDH63qFJN7J+eyohSSewFZB5xMNjs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-term";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-bfl8mi32EWdRJfnSkv672rQvHpYyArrDzCOsNShdqXU=";
|
||||
hash = "sha256-Woko89mT0jBx1YhzO4yXyMfxAMDxPiMn1m51Cm1e7hQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uKPRRfjhx1Yc+6hFTjac3333Do92+GFY36DEhw9F91U=";
|
||||
cargoHash = "sha256-KXhjNBpTOk96+86PbDjeKtQ/VynRVV4a9SYbYGz4A6c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
forceFetchGit = true;
|
||||
fetchLFS = true;
|
||||
hash = "sha256-XtNmV6fxKFlirXQvxxgAYSQveQs8RCTfcFd8SVdEXtE=";
|
||||
hash = "sha256-m2cYppfitpBDKK8CC9i/lUrC9rfSYTuqUSZSyIKKGyg=";
|
||||
};
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
@@ -14,17 +14,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-MWQhDFCn10ONm3SuT+vcXkliCvm3xPJHHYVytufCq2g=";
|
||||
hash = "sha256-HrW02lM1uSiI2UBC46Jjgv7r3urVcgS3Mrvfoig/EjI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZVl09YgeH+V4X3H88rdeiBgua1IpVcfKe0y8A78wzl4=";
|
||||
cargoHash = "sha256-r5Do3eRBcwjA4IysyKgkHLz8Wo1WwdEl596ZENiQbEM=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "docfd";
|
||||
version = "12.3.0";
|
||||
version = "12.3.1";
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
@@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec {
|
||||
owner = "darrenldl";
|
||||
repo = "docfd";
|
||||
rev = version;
|
||||
hash = "sha256-PEeZcSlXkWLo0hZHOsmuvcQoxeAXxqNfTR9sUJQG40g=";
|
||||
hash = "sha256-PiA3nN/NTz+4yLYgr2uN7SGcGJhO2VZ3QHF3jlDeUbc=";
|
||||
};
|
||||
|
||||
# Compatibility with nottui ≥ 0.4
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "drogon";
|
||||
version = "1.9.11";
|
||||
version = "1.9.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drogonframework";
|
||||
repo = "drogon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eFOYmqfyb/yp83HRa0hWSMuROozR/nfnEp7k5yx8hj0=";
|
||||
hash = "sha256-Rx6PpouEXW1J44oK+wCnnGQa0i+H5KSboLLATLMCBBg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "EGLStream-based Wayland external platform";
|
||||
homepage = "https://github.com/NVIDIA/egl-wayland/";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
maintainers = with lib.maintainers; [ hedning ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "EGL External Platform interface";
|
||||
homepage = "https://github.com/NVIDIA/eglexternalplatform";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
maintainers = with lib.maintainers; [ hedning ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "en-croissant";
|
||||
version = "0.13.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franciscoBSalgueiro";
|
||||
repo = "en-croissant";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+s774MtqbfOhL2qco+i9uBMQPn30EGvOYtqw1nZ9KkY=";
|
||||
hash = "sha256-S1ObsGpLxNzr0+bFEuPAe3PCHQc1k0QavgKD6YDffIc=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-/gue4iQG8xySxsH3l5ri+GjmNr/9sow20CLVxxQo7Gs=";
|
||||
hash = "sha256-hkI1TQeOHKQdsnq1pYIeeU+GYFMIxbyNoZY5Wuxj4UU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
cargoHash = "sha256-4gtGHexyR6TkI8tmtLMT2xUAn9+Bd9l3hRq43aL94yI=";
|
||||
cargoHash = "sha256-trQzf5x/sIxkEYQOQKAq1y2GrT3VoQ/ZWCFncb2dNvs=";
|
||||
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2026.2.0";
|
||||
version = "2026.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-VcfQsDx3u7GTndF5GE0XCplPXVo9ClLJwqWLJFKzWEk=";
|
||||
hash = "sha256-7gCUSR2jLhCre84JggSPvNHIRzAA6ZSVGTe1pQ+D8ok=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firefly-iii";
|
||||
version = "6.4.14";
|
||||
version = "6.4.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "firefly-iii";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hXqLy0i1q2RRx0yg67zOPZPxEQ2c+VsFp90LFIXOE2w=";
|
||||
hash = "sha256-i20D0/z6GA7pZYrWvRJ8tUlptNI5Cl/e9UY0hKg9SP8=";
|
||||
};
|
||||
|
||||
buildInputs = [ php84 ];
|
||||
@@ -36,13 +36,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname src version;
|
||||
composerStrictValidation = true;
|
||||
strictDeps = true;
|
||||
vendorHash = "sha256-fLL0FAhd8r2igiZZ+wb1gse+vembHS6rzUnKe9LXXmI=";
|
||||
vendorHash = "sha256-m+esW/yQs/GSwnw2iqVfSMXCf6/5M4634GUbt4Nnvbg=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
hash = "sha256-kmYxC5+Vi/wCP/mT4n7JtxbzW4nVHOsA4xFpNMn0Li8=";
|
||||
hash = "sha256-pu8dxL0NRB1cyqlQEf2zT2wdVp2fbe+Vp85qMs7f6s0=";
|
||||
};
|
||||
|
||||
preInstall = ''
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "framework-tool-tui";
|
||||
version = "0.7.6";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grouzen";
|
||||
repo = "framework-tool-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-reIsJK2bGuMf83SmjCVu9PdUrd4zilCxpvbZllnU6vo=";
|
||||
hash = "sha256-XzOwShPMTyQjuoJ6fGW39kOF0Cnf3n8IEOQql0cEBvc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-E2lVpu+sI/Bf1YwqCbwg3pr15kfo4DUddwI+5/Dwh40=";
|
||||
cargoHash = "sha256-geLxSMtSucJ5SO5u9yvbV6lT+O2a/JVbq3HxTZGYhQE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-qukv1lD17FW0IOjOcJeh8kt4O9cwK/wzNEH0+vdr6NA=";
|
||||
hash = "sha256-3C++qdbngBdIVyyFV7VaOzH+rQBDEYp9wDcBVBjsrSc=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-hElD8VUC17Q/1sMy+ASidhoY9svGNncDf7IUfKkFfZU=";
|
||||
hash = "sha256-9apZXwVF8MV0ZK7/FsoQf+30lTg4P42aTtqedBCnSls=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.6.257";
|
||||
version = "5.6.258";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "github-mcp-server";
|
||||
version = "0.30.3";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "github-mcp-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RqTwii79h7Kk1bpJT1uGG2ODZE5DtROZZyMDKvH3jmo=";
|
||||
hash = "sha256-7vcDkN0q/bNr2dHQgM4YzmQjDjMyLLtkbdBjhmUM1/4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rv7mZQ2/j4R9s3p+Psq5E2I99zFtnieGc3eaMT3ykqQ=";
|
||||
vendorHash = "sha256-zxisK5o2zqeAkQEPKd1w8rFXoJsDB4VNEdD27uos250=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gitlab-duo";
|
||||
version = "8.57.1";
|
||||
version = "8.67.0";
|
||||
|
||||
# DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version
|
||||
nodejs = nodejs_22;
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "editor-extensions";
|
||||
repo = "gitlab-lsp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IofCSh9ja3C8WEiksp0pFJ6LZOu86o4VHnwiIUHHgLI=";
|
||||
hash = "sha256-GnL3720MwiWtC7lHA4CrfiZUTeOV+ytWFii16OKGbAM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -32,14 +32,11 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
# PATCH: Only build for the current platform, not all targets
|
||||
postPatch = ''
|
||||
substituteInPlace packages/cli/scripts/compile_executables.sh \
|
||||
--replace-fail \
|
||||
'SUPPORTED_TARGETS="bun-linux-x64 bun-linux-arm64 bun-windows-x64 bun-darwin-arm64 bun-darwin-x64"' \
|
||||
"SUPPORTED_TARGETS=bun-$TARGET"
|
||||
sed -i 's/SUPPORTED_TARGETS=".\+"/SUPPORTED_TARGETS="bun-$TARGET"/' packages/cli/scripts/compile_executables.sh
|
||||
'';
|
||||
|
||||
npmFlags = [ "--install-links" ];
|
||||
npmDepsHash = "sha256-dj4TrKMdXgUZr7/0NLT7h8jT3VjobB9KFO8tl/+47rk=";
|
||||
npmDepsHash = "sha256-9b73NGu3GO5Sgus7BZ7WvOaXBvQ3UrW9BUTk6NwH+uY=";
|
||||
npmBuildScript = "build:binary";
|
||||
npmWorkspace = "@gitlab/duo-cli";
|
||||
nativeBuildInputs = [
|
||||
@@ -79,6 +76,6 @@ buildNpmPackage (finalAttrs: {
|
||||
homepage = "https://about.gitlab.com/gitlab-duo/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "duo";
|
||||
maintainers = with lib.maintainers; [ yajo ];
|
||||
maintainers = with lib.maintainers; [ afontaine ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -38,7 +38,7 @@ commander_version=$(jaq -r '.packages["packages/cli"].devDependencies.commander'
|
||||
commander_version="${commander_version/^}"
|
||||
# Sync locked version and remove URL and hash, so they are fixed later
|
||||
jaq -i --arg ver "$commander_version" \
|
||||
'.packages["packages/cli/node_modules/commander"].version = $ver | del(.packages["packages/cli/node_modules/commander"].integrity, .packages["packages/cli/node_modules/commander"].resolved)' \
|
||||
'.packages["node_modules/commander"].version = $ver | del(.packages["node_modules/commander"].integrity, .packages["node_modules/commander"].resolved)' \
|
||||
./package-lock.json
|
||||
|
||||
npm install --package-lock-only --ignore-scripts
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
slurp,
|
||||
wl-clipboard,
|
||||
unixtools,
|
||||
glib,
|
||||
bash,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -56,6 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
slurp
|
||||
wl-clipboard
|
||||
unixtools.getopt
|
||||
glib
|
||||
]
|
||||
}"
|
||||
'';
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
sassc,
|
||||
trackerSupport ? stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform),
|
||||
tinysparql,
|
||||
x11Support ? stdenv.hostPlatform.isLinux,
|
||||
waylandSupport ? stdenv.hostPlatform.isLinux,
|
||||
x11Support ? stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD,
|
||||
waylandSupport ? stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD,
|
||||
libGL,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
nlohmann_json,
|
||||
doctest,
|
||||
callPackage,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -19,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-P4XKz2FcMfP0HRMoEC2+RKE/ljZSpusUTDmF9Ao5txo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/pantor/inja/pull/317
|
||||
(fetchpatch {
|
||||
name = "cmake-install-pc.patch";
|
||||
url = "https://github.com/pantor/inja/commit/ebb7aeb3ae49ccb49a642aaecb0d41483078b8bd.patch";
|
||||
hash = "sha256-Cz0EbYwGwFcfhKd8lJzXDy2DpMAcHkz7EC/vVFV60c0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
propagatedBuildInputs = [ nlohmann_json ];
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jotta-cli";
|
||||
version = "0.17.148769";
|
||||
version = "0.17.158308";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://repo.jotta.us/archives/linux/amd64/jotta-cli-${version}_linux_amd64.tar.gz";
|
||||
hash = "sha256-uI5yYpyLa7gGg9eL1nG5MMwHZ2j2yH5/8n5sB/WgoQI=";
|
||||
hash = "sha256-KSm4SGK/NeBwixEzcu8mh1Ssr2tx1vBHT5QtvtwfMBE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
Generated
+23
-23
@@ -167,16 +167,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/collections",
|
||||
"version": "v12.51.0",
|
||||
"version": "v12.52.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/collections.git",
|
||||
"reference": "1fd7db2203ce5a935fffd2ad40955248fb9f581c"
|
||||
"reference": "f35c084f0d9bc57895515cb4d0665797c66285fd"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/1fd7db2203ce5a935fffd2ad40955248fb9f581c",
|
||||
"reference": "1fd7db2203ce5a935fffd2ad40955248fb9f581c",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/f35c084f0d9bc57895515cb4d0665797c66285fd",
|
||||
"reference": "f35c084f0d9bc57895515cb4d0665797c66285fd",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -223,11 +223,11 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2026-02-09T13:43:38+00:00"
|
||||
"time": "2026-02-16T14:10:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/conditionable",
|
||||
"version": "v12.51.0",
|
||||
"version": "v12.52.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/conditionable.git",
|
||||
@@ -273,16 +273,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/contracts",
|
||||
"version": "v12.51.0",
|
||||
"version": "v12.52.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/contracts.git",
|
||||
"reference": "3d4eeab332c04a9eaea90968c19a66f78745e47a"
|
||||
"reference": "620d82bad07f55fcb7f5125f44c9d9b93335fb8c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/contracts/zipball/3d4eeab332c04a9eaea90968c19a66f78745e47a",
|
||||
"reference": "3d4eeab332c04a9eaea90968c19a66f78745e47a",
|
||||
"url": "https://api.github.com/repos/illuminate/contracts/zipball/620d82bad07f55fcb7f5125f44c9d9b93335fb8c",
|
||||
"reference": "620d82bad07f55fcb7f5125f44c9d9b93335fb8c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -317,20 +317,20 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2026-01-28T15:26:27+00:00"
|
||||
"time": "2026-02-10T18:16:44+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/filesystem",
|
||||
"version": "v12.51.0",
|
||||
"version": "v12.52.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/filesystem.git",
|
||||
"reference": "62c225e046a4c469779c0855dce7abd8c0b1fa1e"
|
||||
"reference": "c4c3f8612f218afcf09f3c7f5c7dc9e282626800"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/62c225e046a4c469779c0855dce7abd8c0b1fa1e",
|
||||
"reference": "62c225e046a4c469779c0855dce7abd8c0b1fa1e",
|
||||
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/c4c3f8612f218afcf09f3c7f5c7dc9e282626800",
|
||||
"reference": "c4c3f8612f218afcf09f3c7f5c7dc9e282626800",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -384,11 +384,11 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2026-02-09T20:42:48+00:00"
|
||||
"time": "2026-02-13T20:26:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/macroable",
|
||||
"version": "v12.51.0",
|
||||
"version": "v12.52.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/macroable.git",
|
||||
@@ -434,7 +434,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/reflection",
|
||||
"version": "v12.51.0",
|
||||
"version": "v12.52.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/reflection.git",
|
||||
@@ -485,16 +485,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/support",
|
||||
"version": "v12.51.0",
|
||||
"version": "v12.52.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/support.git",
|
||||
"reference": "fcc84cf4fba138f1835d6a5978ac4434f11a55aa"
|
||||
"reference": "6e9de455bcb232372db11531b72a01d4eca83ef2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/fcc84cf4fba138f1835d6a5978ac4434f11a55aa",
|
||||
"reference": "fcc84cf4fba138f1835d6a5978ac4434f11a55aa",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/6e9de455bcb232372db11531b72a01d4eca83ef2",
|
||||
"reference": "6e9de455bcb232372db11531b72a01d4eca83ef2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -561,7 +561,7 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2026-02-10T16:02:09+00:00"
|
||||
"time": "2026-02-14T23:03:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/prompts",
|
||||
|
||||
@@ -7,19 +7,19 @@
|
||||
}:
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "laravel";
|
||||
version = "5.24.5";
|
||||
version = "5.24.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laravel";
|
||||
repo = "installer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wFyXg92bW7hZBKubj4Gf6nXnFpEpD3aUXv7mF7XbYQw=";
|
||||
hash = "sha256-zXgLIp2tTPwGvZTT0rJqbbsO0Od/8sf6NQIgx/xhfJE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
composerLock = ./composer.lock;
|
||||
vendorHash = "sha256-hEr7VX4ZwuS7HUSNOvWCy+FOufTE1fMpJih37ZReoro=";
|
||||
vendorHash = "sha256-pegatl+tktcTSFV5GuxiyXvmZGVC+57DzWAIsOoZJWE=";
|
||||
|
||||
# Adding npm (nodejs) and php composer to path
|
||||
postInstall = ''
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "legcord";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Legcord";
|
||||
repo = "Legcord";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-196AE244jEZNfhkC+vouNq9M7DOd3kk/1JLW1XRLOHA=";
|
||||
hash = "sha256-i4Pw1jvkRYCQg1+9eZVi30Qblpttz9V+k//zehBZGDM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-ksClxW8dIV72Hky5RFJ6cpPAteL29Cx8Me0aG5V/Y4k=";
|
||||
hash = "sha256-9sdN5tbCCe/euTo8zRkU0C3yQ8sAufPyN8a4GeJW/Us=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcomps";
|
||||
version = "0.1.23";
|
||||
version = "0.1.24";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "rpm-software-management";
|
||||
repo = "libcomps";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-6nX6Oa2ACVALOtXDxjowIGKaziZkGZbtkgZzDfuP4PE=";
|
||||
hash = "sha256-O60+k3ZnSfP+wFI55s/WfgrPbvu52uXZh88Ebg3Nf+c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
## lock-obj-pub.x86_64-unknown-freebsd15.0.h
|
||||
## File created by gen-posix-lock-obj - DO NOT EDIT
|
||||
## To be included by mkheader into gpg-error.h
|
||||
|
||||
typedef struct
|
||||
{
|
||||
long _vers;
|
||||
union {
|
||||
volatile char _priv[8];
|
||||
long _x_align;
|
||||
long *_xp_align;
|
||||
} u;
|
||||
} gpgrt_lock_t;
|
||||
|
||||
#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0}}}
|
||||
##
|
||||
## Local Variables:
|
||||
## mode: c
|
||||
## buffer-read-only: t
|
||||
## End:
|
||||
##
|
||||
@@ -34,6 +34,11 @@ stdenv.mkDerivation (
|
||||
|
||||
postPatch = ''
|
||||
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
|
||||
''
|
||||
# libgpg-error insists on having these generated files. They should be fairly ABI stable,
|
||||
# so add one for FreeBSD.
|
||||
+ lib.optionalString (stdenv.hostPlatform.system == "x86_64-freebsd") ''
|
||||
cp ${./lock-obj-pub.x86_64-unknown-freebsd.h} src/syscfg/lock-obj-pub.freebsd.h
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "strictflexarrays3" ];
|
||||
|
||||
@@ -23,8 +23,9 @@
|
||||
gnome,
|
||||
vala,
|
||||
shared-mime-info,
|
||||
# Requires building a cdylib.
|
||||
withPixbufLoader ? !stdenv.hostPlatform.isStatic,
|
||||
# Requires building a cdylib and running a target binary
|
||||
withPixbufLoader ?
|
||||
!stdenv.hostPlatform.isStatic && stdenv.hostPlatform.emulatorAvailable buildPackages,
|
||||
withIntrospection ?
|
||||
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
|
||||
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "llmfit";
|
||||
version = "0.2.1";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexsJones";
|
||||
repo = "llmfit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-XmbxJlchBhXrAK8Yjn1dTBxrg+90B9/0HXgEhmZz6+4=";
|
||||
sha256 = "sha256-m3JV7lF/YuxtPMsUvGNQd4VjLw4KFuBM5jQYjnC+2Hs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VTFZ592eZZToj5MeC2mdpugMazWmqyO5VrKLJbweI/E=";
|
||||
cargoHash = "sha256-Ue09DBvcqyvQDQ23yAUa6Fo56AWn5pxAl2XYiVLrUYI=";
|
||||
|
||||
meta = {
|
||||
description = "Find what runs on your hardware";
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.21";
|
||||
version = "2.1.23";
|
||||
pname = "lunatask";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
|
||||
hash = "sha256-q+GnztAetorwEywBYmjEjFl4PLqTj+v0igQB3toFRTg=";
|
||||
hash = "sha256-IvQNc52xd13zCyMnAXRvG/g2xAGYGqC2dk4EHu8w0Gg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-nixos";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utensils";
|
||||
repo = "mcp-nixos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZScQ79z7SwjpI5ZnrwXhRNqOnYQTI9MayvPjv00hiyY=";
|
||||
hash = "sha256-/3/MUCjUu4iQOEmgda61ztO2d6e/HPpjsF9Z7hTWYMc=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.hatchling ];
|
||||
@@ -29,6 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
anthropic
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
python-dotenv
|
||||
];
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mini-calc";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vanilla-extracts";
|
||||
repo = "calc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-eyWRDuECMV/jfxq+Ki2uouiYqp4PmQJa+D3QORewj+Y=";
|
||||
hash = "sha256-NR5SJpJW7L6VGu6tCyzt0hhQ5Wnvx3TKlq3MAK4EcLM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7hBtu6mJ+wQF4apU0SAuVKFE7LdajjZdMyk3Ov6xxlQ=";
|
||||
cargoHash = "sha256-LejKPnp4GvGykMTFZM9WVQIa0EMueeit5XfSuE1uiPQ=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postFixup = ''
|
||||
|
||||
@@ -138,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "default_library" "shared")
|
||||
(lib.mesonOption "sysconfdir" "/etc")
|
||||
(lib.mesonBool "libmpv" true)
|
||||
(lib.mesonEnable "manpage-build" true)
|
||||
(lib.mesonEnable "cdda" cddaSupport)
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildLua rec {
|
||||
pname = "mpvacious";
|
||||
version = "0.42";
|
||||
version = "26.1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ajatt-Tools";
|
||||
repo = "mpvacious";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-26GbP969b6aT6UyYDYyC01QjAnIY4wUHqGUaXBaHQZo=";
|
||||
sha256 = "sha256-I0h9tf1pwCkWPn/6t2mxhe4MPx6GsPR+F5F29NAgdXI=";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.6";
|
||||
version = "15.0.7";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-7FqNvt6Uyl00sxiScDA4EhBT2a8BYStIxfzCOanWx7M=";
|
||||
hash = "sha256-Uj2H6ONVpn3EtzMNl8xqOAf6UeO6FGAKtyH9DKh976U=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "music-discord-rpc";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patryk-ku";
|
||||
repo = "music-discord-rpc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sc7K9xD+l48w5xXLWjSsw1eq+x0xP8QHMioPaulPP2E=";
|
||||
hash = "sha256-HZh7rwZR/9dccNyQV2BEyQF2vtoH+L/lW4L4hu9RJTI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nHG6W6WbMNVmsnG1f5o0obp5SEUI4UIyyJDvgS6sUzA=";
|
||||
cargoHash = "sha256-vCqjeY07R/AuNruBYS3sc7n9kN/Y4IwvvpSooWTu7Oc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "naja";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "najaeda";
|
||||
repo = "naja";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q0k8uk2QGEkwBr2PXOvJadNbx0vCpS56BgMQPlAVW/E=";
|
||||
hash = "sha256-QKKV1+xhodA66404ez7w+V0gYatsCoAYq3IuvB3QPnA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nb";
|
||||
version = "7.24.1";
|
||||
version = "7.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xwmx";
|
||||
repo = "nb";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NTBRuxy66mytpJ/UNeS1N2jIMu4IrZmGNp/jPwa2qZI=";
|
||||
hash = "sha256-+QRKv+zKOz8qDD1Ecpavl0ybf4nIcy0flNLHhyR+fxA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netbird-dashboard";
|
||||
version = "2.31.0";
|
||||
version = "2.32.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "dashboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vpxMPoF0xn5UzY1Yo5Y2NAfmwC21Z6Ogv+C30JKyj0E=";
|
||||
hash = "sha256-DNIibCGeC4dzJ8xKQPLkWJZ2YfW2igLse+321SrSmhE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-IyNVeoEusQlxOYzYe9xIwtHepDRyjUfKHGNNR8LoOSA=";
|
||||
npmDepsHash = "sha256-shN+XdS5Z2MxEFy453YqqovDUXbde3L9Y7+cPZW53/Y=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nvibrant";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tremeschin";
|
||||
repo = "nvibrant";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RZIi1V3hcwZdaI84Nd0YSQOjDng9/ZDg7aqfTL7GJIU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configure NVIDIA's Digital Vibrance on Wayland";
|
||||
homepage = "https://github.com/Tremeschin/nvibrant";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.mikaeladev ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "nvibrant";
|
||||
};
|
||||
})
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4w+CkYhFS/P9ZeHiR2daK+DujqCKzF/aUAZbMcHqvyk=";
|
||||
hash = "sha256-pVFsyNg9ccSFAdHb/fjeVoMBh1nKcjwcFfVBBqFalIo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3QNiw3q0dhgWeGFBq4a5GCE3bIIa4YiJRKMU+Hakvx0=";
|
||||
vendorHash = "sha256-lfabvwO+p54SREvpCZdw5z/QMLDZqaf1UZTXWGm6sdg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "2.1.39";
|
||||
version = "2.1.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-aOAD4ZDjsm47tn44qgHnQEx9D04qAI5ErRG/oP/h1Nk=";
|
||||
hash = "sha256-AlM5lJPHlO0BAkav1PluP/bIkZBzaWTsm4HA72y59iI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "playball";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paaatrick";
|
||||
repo = "playball";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xgAhzNWCLNmbrwaYAGmXMercoRgXWPjjV5dcnXunmeA=";
|
||||
hash = "sha256-Kg1ooxtXwP2q9qa7uuzUtl2R8/jqG9wryaKWYnWXIjw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-s0JKBJnVYkeXOE62F6BZRKwd0Hg3IOuMai6rmKUi6TI=";
|
||||
npmDepsHash = "sha256-waaC5AcsEWMOLyXSmMbRuRS5Ozq5ERrmONQZhP05Kes=";
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
|
||||
@@ -35,13 +35,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plugdata";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plugdata-team";
|
||||
repo = "plugdata";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3ldLM6M54usqjsM9veEctXVa/G14shOdp7Yi9tQi70Y=";
|
||||
hash = "sha256-GjaJCg9FhsvUWHFfEk1a/Ef5gMglWKqEWaCLqazooto=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -45,13 +45,13 @@ let
|
||||
};
|
||||
|
||||
pname = "pretix";
|
||||
version = "2026.1.1";
|
||||
version = "2026.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iH8S7+2SMw4LJjHjJvHAQgNSWU/zuk0nOUY/YI96T3E=";
|
||||
hash = "sha256-S8HcCtTBTU9oU7X+XD6avSZVtlRkXeF7pIqnggqJRPs=";
|
||||
};
|
||||
|
||||
npmDeps = buildNpmPackage {
|
||||
@@ -59,7 +59,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
||||
npmDepsHash = "sha256-GaUPVSHRZg5Aihk4WAjmF8M6zIL99DU9Z3F3dym78bs=";
|
||||
npmDepsHash = "sha256-n4Gd4DKdP4b6LT34uy9aJDWcTz9okk4imq6vtw1cC+k=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-mollie";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-mollie";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SpSXHPPxwI36iz5b8naD60vTomc52U84LjeeV8OnJXo=";
|
||||
hash = "sha256-Q9cofG4etT8Lb/RZbOVkSYlN1ONS3vPGkE53ph92cLg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qmapshack";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Maproom";
|
||||
repo = "qmapshack";
|
||||
tag = "V_${finalAttrs.version}";
|
||||
hash = "sha256-OazG5BkgofNXWKoTpKEoyZ+Ew1u2w2i1Y/ovTYNrl+w=";
|
||||
hash = "sha256-NqyouJGagVvyJGGetF8csA1byATaigBtGJIt5U3in+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "qovery-cli";
|
||||
version = "1.57.2";
|
||||
version = "1.57.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6a4vkzY2IuiPzYisqgH/H9nxwCLRIOhD6F0Ht5qeN+k=";
|
||||
hash = "sha256-RjSpojVDmUIBYTKPiiFzbkUeena45nFNi/GhD14FbYY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fea6M+zq9/pBFWY/X18fDjga1StgOHCbk0AVGNiO8HE=";
|
||||
vendorHash = "sha256-i0QWcRF8PKDQmZMzI0mHWY6pDbnjAOoXKxg9onavTjw=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "qui";
|
||||
version = "1.13.1";
|
||||
version = "1.14.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "qui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zpOz5X3Okig5PNdzwa1nS6HaldSXEFIQ/Aj0dQczabs=";
|
||||
hash = "sha256-DfIqjYcRdE0ZlhB+wvgyYvwxInqH40VIQ9s/efGepdI=";
|
||||
};
|
||||
|
||||
qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
|
||||
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-3TAB5StrKBmgit02J7GiMfk6EDl8oiLvcOAnCJ9ian4=";
|
||||
hash = "sha256-HzbwKFZaXQEjE7ELiqjHqLbkfM9YkyWqPNwXGUqW550=";
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
});
|
||||
|
||||
vendorHash = "sha256-F4P+hpbAFWCrk+lSleOQFTsR3kfZoWkMbybeKPzMv20=";
|
||||
vendorHash = "sha256-PeGWnnIxcxXzZdOaRUzUD7pG3CJTDDgjvXXJeSo9+hc=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${finalAttrs.qui-web}/* web/dist
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "redlist";
|
||||
version = "0-unstable-2026-01-30";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Laharah";
|
||||
repo = "redlist";
|
||||
rev = "3d465a12d79331eefde52351b441d8e0875f93e3";
|
||||
hash = "sha256-eROvTs4WCVeXE2+4FICC9Rl5bjIkf0E5sYvqCaskXEw=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
aiohttp
|
||||
beets
|
||||
humanize
|
||||
confuse
|
||||
pynentry
|
||||
deluge-client
|
||||
cryptography
|
||||
]
|
||||
++ aiohttp.optional-dependencies.speedups;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Convert Spotify playlists to local m3u's and fill the gaps";
|
||||
mainProgram = "redlist";
|
||||
homepage = "https://github.com/Laharah/redlist";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ lilahummel ];
|
||||
};
|
||||
})
|
||||
@@ -18,16 +18,16 @@ in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "regclient";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
tag = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regclient";
|
||||
repo = "regclient";
|
||||
rev = tag;
|
||||
sha256 = "sha256-7HfcwDb4BgpOxkjOau/QVs9x/U6Da5eh5rHB6W1NhwE=";
|
||||
sha256 = "sha256-q3dsIQgUyLQXiiBgz//ttT1leGaUROd1GFxXIbbvV2U=";
|
||||
};
|
||||
vendorHash = "sha256-cNbHgb/yHF/ubhnWkyEQOjOz5qmircJJR8jDYj+d8bM=";
|
||||
vendorHash = "sha256-J0kY5tltiicZPdQeq9uHAwqKR7SpFzwgLSryXtxL+9U=";
|
||||
|
||||
outputs = [ "out" ] ++ bins;
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rumdl";
|
||||
version = "0.1.22";
|
||||
version = "0.1.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rvben";
|
||||
repo = "rumdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pOSsd/U/KdvhK/NTprFRzv0jROEeAjbboXr5ik1KFJA=";
|
||||
hash = "sha256-+GWsVsDhHTWYP3JkNkEfYp9qU53TCKAjkvsZXpGeB8k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-t/71aCc1lXIdYjP0g0nvjkMfHtoygAlpBEqfebLes7c=";
|
||||
cargoHash = "sha256-8XsHhXutb+W39OxVgKtFaE+34YTsj+DXNElnFS3DqAU=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin=rumdl"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rustical";
|
||||
version = "0.12.8";
|
||||
version = "0.12.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lennart-k";
|
||||
repo = "rustical";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JYWm4/Fkya5NcBlf+lxpNTea2S64v2Dl/RNwipdpm64=";
|
||||
hash = "sha256-1dGpYvsdrSngeZkSjtm0dgZBcZonlToDWvkb8rpmoMQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-553DKENM8RvofiYL/W31dg+JtlNvKjnbj+qZbKM4S5k=";
|
||||
cargoHash = "sha256-3V6enIbZAErSk4+nZN3x03I+TyOisS3adBbnjbBXBFc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
jq,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
xcodebuild,
|
||||
replaceVars,
|
||||
noto-fonts-color-emoji,
|
||||
nixosTests,
|
||||
@@ -105,9 +106,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmConfigHook
|
||||
pnpm
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
python3
|
||||
jq
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcodebuild
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
copyDesktopItems
|
||||
];
|
||||
buildInputs = (lib.optional (!withAppleEmojis) noto-fonts-color-emoji-png);
|
||||
|
||||
@@ -134,6 +140,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# https://github.com/signalapp/Signal-Desktop/issues/7667
|
||||
substituteInPlace ts/util/version.std.ts \
|
||||
--replace-fail 'isAdhoc(version)' 'true'
|
||||
|
||||
# Nix builds do not need upstream release hooks (notarization and
|
||||
# language-pack postprocessing), and they expect a different macOS
|
||||
# app layout than nixpkgs' Electron provides.
|
||||
substituteInPlace package.json \
|
||||
--replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.js",' "" \
|
||||
--replace-fail '"afterSign": "ts/scripts/after-sign.node.js",' "" \
|
||||
--replace-fail '"afterPack": "ts/scripts/after-pack.node.js",' "" \
|
||||
--replace-fail '"sign": "./ts/scripts/sign-macos.node.js",' "" \
|
||||
--replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.js",' ""
|
||||
'';
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -156,6 +172,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1771441806;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Disable code signing during local macOS builds.
|
||||
CSC_IDENTITY_AUTO_DISCOVERY = "false";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@@ -200,6 +220,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
rm -r node_modules/@signalapp/sqlcipher
|
||||
cp -r ${signal-sqlcipher} node_modules/@signalapp/sqlcipher
|
||||
|
||||
# fs-xattr is required at runtime by preload.wrapper.js,
|
||||
# but with npmRebuild disabled its native binding is missing.
|
||||
# Build it explicitly against Electron headers ahead of packaging.
|
||||
export npm_config_nodedir=${electron.headers}
|
||||
pushd node_modules/fs-xattr
|
||||
pnpm exec node-gyp rebuild
|
||||
popd
|
||||
test -f node_modules/fs-xattr/build/Release/xattr.node
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
@@ -212,18 +241,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpm run generate
|
||||
pnpm exec electron-builder \
|
||||
--linux "dir:${stdenv.hostPlatform.node.arch}" \
|
||||
${
|
||||
if stdenv.hostPlatform.isDarwin then "--mac" else "--linux"
|
||||
} "dir:${stdenv.hostPlatform.node.arch}" \
|
||||
--config.extraMetadata.environment=$SIGNAL_ENV \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
-c.electronVersion=${electron.version} \
|
||||
-c.npmRebuild=false \
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
cp -r dist/mac*/Signal.app $out/Applications
|
||||
makeWrapper "$out/Applications/Signal.app/Contents/MacOS/Signal" "$out/bin/signal-desktop" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
mkdir -p $out/share
|
||||
cp -r dist/*-unpacked/resources $out/share/signal-desktop
|
||||
|
||||
for icon in build/icons/png/*
|
||||
@@ -236,7 +276,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -293,6 +334,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optional withAppleEmojis unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
eclairevoyant
|
||||
iamanaws
|
||||
marcin-serwin
|
||||
teutat3s
|
||||
];
|
||||
@@ -300,6 +342,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
cargo,
|
||||
dump_syms,
|
||||
python3,
|
||||
xcodebuild,
|
||||
cctools,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "node-sqlcipher";
|
||||
@@ -45,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cargo
|
||||
dump_syms
|
||||
python3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcodebuild
|
||||
cctools.libtool
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
@@ -75,6 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# deps/sqlcipher
|
||||
bsd3
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildPackages,
|
||||
ninja,
|
||||
gn,
|
||||
symlinkJoin,
|
||||
python3,
|
||||
pkg-config,
|
||||
glib,
|
||||
@@ -12,9 +13,20 @@
|
||||
writeShellScriptBin,
|
||||
gclient2nix,
|
||||
rustc,
|
||||
apple-sdk,
|
||||
xcodebuild,
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
llvmCcAndBintools = symlinkJoin {
|
||||
name = "signal-webrtc-llvm-cc-and-bintools";
|
||||
paths = [
|
||||
llvmPackages.llvm
|
||||
llvmPackages.stdenv.cc
|
||||
];
|
||||
};
|
||||
|
||||
chromiumRosettaStone = {
|
||||
cpu =
|
||||
platform:
|
||||
@@ -39,6 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gclientDeps = gclient2nix.importGclientDeps ./webrtc-sources.json;
|
||||
sourceRoot = "src";
|
||||
|
||||
# Chromium's Darwin toolchain defines _LIBCPP_HARDENING_MODE itself; keep
|
||||
# cc-wrapper from injecting a conflicting default.
|
||||
hardeningDisable = lib.optionals stdenv.isDarwin [
|
||||
"libcxxhardeningfast"
|
||||
"libcxxhardeningextensive"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gn
|
||||
ninja
|
||||
@@ -49,21 +68,44 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rustc
|
||||
pkg-config
|
||||
gclient2nix.gclientUnpackHook
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
apple-sdk
|
||||
xcodebuild
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
alsa-lib
|
||||
pulseaudio
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
llvmPackages.compiler-rt
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build/toolchain/linux/BUILD.gn \
|
||||
--replace-fail 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
|
||||
patchShebangs build/mac/should_use_hermetic_xcode.py
|
||||
|
||||
substituteInPlace modules/audio_device/linux/pulseaudiosymboltable_linux.cc \
|
||||
--replace-fail "libpulse.so.0" "${pulseaudio}/lib/libpulse.so.0"
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
# Fix Darwin Python script shebangs for sandbox builds
|
||||
patchShebangs build/mac/should_use_hermetic_xcode.py build/toolchain/apple/linker_driver.py
|
||||
|
||||
substituteInPlace build/config/clang/BUILD.gn \
|
||||
--replace-fail '_clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"' \
|
||||
'_clang_lib_dir = "${llvmPackages.compiler-rt}/lib"'
|
||||
|
||||
# Keep target triple aligned with nix cc-wrapper expectations to avoid
|
||||
# arm64-apple-macos vs arm64-apple-darwin warning spam.
|
||||
substituteInPlace build/config/mac/BUILD.gn \
|
||||
--replace-fail "apple-macos" "apple-darwin"
|
||||
''
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace modules/audio_device/linux/alsasymboltable_linux.cc \
|
||||
--replace-fail "libasound.so.2" "${alsa-lib}/lib/libasound.so.2"
|
||||
'';
|
||||
@@ -73,46 +115,59 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
echo "generate_location_tags = true" >> build/config/gclient_args.gni
|
||||
'';
|
||||
|
||||
gnFlags = [
|
||||
# webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags
|
||||
# are copied from pkgs/applications/networking/browsers/chromium/common.nix.
|
||||
''target_os="linux"''
|
||||
''target_cpu="${chromiumRosettaStone.cpu stdenv.hostPlatform}"''
|
||||
''pkg_config="${stdenv.cc.targetPrefix}pkg-config"''
|
||||
"use_sysroot=false"
|
||||
"is_clang=false"
|
||||
"treat_warnings_as_errors=false"
|
||||
"use_llvm_libatomic=false"
|
||||
"use_custom_libcxx=false"
|
||||
gnFlags =
|
||||
lib.optionals stdenv.isLinux [
|
||||
# webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags
|
||||
# are copied from pkgs/applications/networking/browsers/chromium/common.nix.
|
||||
''target_os="linux"''
|
||||
''pkg_config="${stdenv.cc.targetPrefix}pkg-config"''
|
||||
"use_sysroot=false"
|
||||
"is_clang=false"
|
||||
|
||||
# https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop
|
||||
"rtc_build_examples=false"
|
||||
"rtc_build_tools=false"
|
||||
"rtc_use_x11=false"
|
||||
"rtc_enable_sctp=false"
|
||||
"rtc_libvpx_build_vp9=true"
|
||||
"rtc_disable_metrics=true"
|
||||
"rtc_disable_trace_events=true"
|
||||
"is_debug=false"
|
||||
"symbol_level=1"
|
||||
"rtc_include_tests=false"
|
||||
"rtc_enable_protobuf=false"
|
||||
|
||||
''rust_sysroot_absolute="${buildPackages.rustc}"''
|
||||
|
||||
# Build using the system toolchain (for Linux distributions):
|
||||
#
|
||||
# What you would expect to be called "target_toolchain" is
|
||||
# actually called either "default_toolchain" or "custom_toolchain",
|
||||
# depending on which part of the codebase you are in; see:
|
||||
# https://chromium.googlesource.com/chromium/src/build/+/3c4595444cc6d514600414e468db432e0f05b40f/config/BUILDCONFIG.gn#17
|
||||
''custom_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||
''host_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||
]
|
||||
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
''host_toolchain="//build/toolchain/linux/unbundle:host"''
|
||||
''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"''
|
||||
];
|
||||
# Build using the system toolchain (for Linux distributions):
|
||||
#
|
||||
# What you would expect to be called "target_toolchain" is
|
||||
# actually called either "default_toolchain" or "custom_toolchain",
|
||||
# depending on which part of the codebase you are in; see:
|
||||
# https://chromium.googlesource.com/chromium/src/build/+/3c4595444cc6d514600414e468db432e0f05b40f/config/BUILDCONFIG.gn#17
|
||||
''custom_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||
''host_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
''target_os="mac"''
|
||||
''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"''
|
||||
"use_sysroot=true"
|
||||
"is_clang=true"
|
||||
"use_lld=false"
|
||||
"clang_use_chrome_plugins=false"
|
||||
"clang_use_raw_ptr_plugin=false"
|
||||
"use_clang_modules=false"
|
||||
''clang_base_path="${llvmCcAndBintools}"''
|
||||
''custom_toolchain="//build/toolchain/mac:clang_${chromiumRosettaStone.cpu stdenv.hostPlatform}"''
|
||||
]
|
||||
++ [
|
||||
''target_cpu="${chromiumRosettaStone.cpu stdenv.hostPlatform}"''
|
||||
# https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop
|
||||
"rtc_build_examples=false"
|
||||
"rtc_build_tools=false"
|
||||
"rtc_use_x11=false"
|
||||
"rtc_enable_sctp=false"
|
||||
"rtc_libvpx_build_vp9=true"
|
||||
"rtc_disable_metrics=true"
|
||||
"rtc_disable_trace_events=true"
|
||||
"is_debug=false"
|
||||
"symbol_level=1"
|
||||
"rtc_include_tests=false"
|
||||
"rtc_enable_protobuf=false"
|
||||
"treat_warnings_as_errors=false"
|
||||
"use_llvm_libatomic=false"
|
||||
"use_custom_libcxx=false"
|
||||
''rust_sysroot_absolute="${buildPackages.rustc}"''
|
||||
]
|
||||
++ lib.optionals (stdenv.isLinux && stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
''host_toolchain="//build/toolchain/linux/unbundle:host"''
|
||||
''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"''
|
||||
];
|
||||
ninjaFlags = [ "webrtc" ];
|
||||
|
||||
installPhase = ''
|
||||
@@ -128,6 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/SignalApp/webrtc";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "slipshow";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "panglesd";
|
||||
repo = "slipshow";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-13LoIvmSYGycuJpAqylyVmVnyttuyaQF1Dk/3BgikkE=";
|
||||
hash = "sha256-6i7zbfk0uBgwoXlg5fLvC+onZMYKBJwUd74FUakt3jc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "slskd";
|
||||
version = "0.24.3";
|
||||
version = "0.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slskd";
|
||||
repo = "slskd";
|
||||
tag = version;
|
||||
hash = "sha256-471Rhpkl89l6T1ScXltCYwRckS0iOAWmDYuj7NH0TAQ=";
|
||||
hash = "sha256-TMi4RG5hdd2zR2d5O6zwxifd3zcEqSiqsuz16yyrH38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,7 +40,7 @@ buildDotnetModule rec {
|
||||
name = "${pname}-${version}-npm-deps";
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/${npmRoot}";
|
||||
hash = "sha256-cNYnYp+QrbwvpYs/qKKivDlMpdQP6EbDUBS32S3TrO4=";
|
||||
hash = "sha256-w2+O8Kx1nYyLbhnFovfHZSBVCPY0eDvdUoLO9cYnVY0=";
|
||||
};
|
||||
|
||||
projectFile = "slskd.sln";
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "slurm";
|
||||
version = "25.11.2.1";
|
||||
version = "25-11-3-1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
|
||||
hash = "sha256-ukQlxKD+XhvL/sh15g3Tk5drsgXkK3hV+PFa1d2y9mk=";
|
||||
hash = "sha256-wG94g5fb39A/JqJgdKn8EuXTg1xtGNQw9vJn4jAF3z0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "snowemu";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twvd";
|
||||
repo = "snow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oBMzkN4cHk0KywIiKLcjE58T/9lOIM6fRbCZOR6zON8=";
|
||||
hash = "sha256-/arxD1bShXqsC2If2v7ARBsjdlnhlg0wK6MLX0q4xiI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoHash = "sha256-cuxbjyjdQNkluRfPQtro9OPr4V/trT1VqgbHjfZUScQ=";
|
||||
cargoHash = "sha256-7cyhpiT6RL+5x+xslQzhA5W71rcZ9TJPmfUHKl7TC/M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
postInstall = ''
|
||||
mv $out/bin/snow_frontend_egui $out/bin/snowemu
|
||||
|
||||
install -Dm644 docs/images/snow_icon.png $out/share/icons/hicolor/apps/snowemu.png
|
||||
install -Dm644 assets/snow_icon.png $out/share/icons/hicolor/1024x1024/apps/snowemu.png
|
||||
|
||||
wrapProgram $out/bin/snowemu \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user