Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-07-03 00:37:07 +00:00
committed by GitHub
142 changed files with 979 additions and 618 deletions
+11
View File
@@ -14472,6 +14472,11 @@
githubId = 464625;
name = "Enric Morales";
};
kikos0 = {
github = "KiKoS0";
githubId = 22998716;
name = "Riadh Daghmoura";
};
kilianar = {
email = "mail@kilianar.de";
github = "kilianar";
@@ -28858,6 +28863,12 @@
github = "TyberiusPrime";
githubId = 1257580;
};
tyceherrman = {
email = "Tyce.Herrman@pm.me";
github = "TyceHerrman";
githubId = 22066434;
name = "Tyce Herrman";
};
tye-exe = {
name = "Tye";
email = "nixpkgs-fr@tye-home.xyz";
+5 -2
View File
@@ -240,12 +240,15 @@ in
after = [ "network.target" ];
path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks));
serviceConfig = {
ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon";
ExecStart = "${autosuspend}/bin/autosuspend --logging ${autosuspend}/etc/autosuspend-logging.conf daemon --config ${autosuspend-conf}";
};
};
};
meta = {
maintainers = with maintainers; [ xlambein ];
maintainers = with maintainers; [
xlambein
adamcstephens
];
};
}
+1
View File
@@ -977,6 +977,7 @@ in
lomiri-system-settings = runTest ./lomiri-system-settings.nix;
lorri = handleTest ./lorri/default.nix { };
luks = runTest ./luks.nix;
luks-suspend = runTest ./luks-suspend.nix;
lvm2 = import ./lvm2 { inherit pkgs runTest; };
lxc = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./lxc;
lxd-image-server = runTest ./lxd-image-server.nix;
+146
View File
@@ -0,0 +1,146 @@
# Tests that `cryptsetup luksSuspend` successfully wipes the volume key from memory.
{ pkgs, lib, ... }:
let
# Fixed 64-byte volume key.
# Chosen by fair dice roll. Guaranteed to be random. :-)
# (tr -dc '0-9A-Za-z' </dev/urandom | head -c 64)
volumeKey = "Okqf1piY8oebIL11l3x5lkqzyqLuY8X0aROgI6wMuUV99PoeqHbgsptcACs0ojaL";
luksUUID = "55555555-5555-5555-5555-555555555555";
# 1 GiB of RAM for the VM. Less than the 4 GiB PCI hole, so that a
# single `pmemsave 0 <MEM_BYTES>` captures all of guest RAM.
memorySizeMiB = 1024;
# A LUKS2 container with the known master key above.
luksImage =
pkgs.runCommand "luks-suspend-test-disk.img" { nativeBuildInputs = [ pkgs.cryptsetup ]; }
''
truncate -s 64M $out
echo -n abc | cryptsetup luksFormat \
--batch-mode \
--uuid ${luksUUID} \
--pbkdf pbkdf2 --pbkdf-force-iterations 1000 \
--volume-key-file <(echo -n "${volumeKey}") \
$out
'';
commonMachine =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.cryptsetup ];
virtualisation.memorySize = memorySizeMiB;
virtualisation.qemu.drives = [
{
name = "luks";
file = "${luksImage}";
driveExtraOpts = {
format = "raw";
readonly = "on";
};
}
];
};
in
{
name = "luks-suspend";
meta.maintainers = with lib.maintainers; [ iblech ];
nodes = {
# Variant 1: LUKS volume opened after boot via the cryptsetup CLI.
cli = commonMachine;
# Variant 2: LUKS volume opened during boot by systemd-cryptsetup,
# driven by the native NixOS LUKS module.
native =
{ pkgs, lib, ... }:
{
imports = [ commonMachine ];
boot.initrd.systemd.enable = true;
# The test framework's qemu-vm module force-clears
# boot.initrd.luks.devices via mkVMOverride (priority 10) when
# virtualisation.useDefaultFilesystems is on (the default).
# Our setting should have priority.
boot.initrd.luks.devices = lib.mkOverride 5 {
foo = {
device = "/dev/disk/by-uuid/${luksUUID}";
keyFile = "/etc/luks-foo.key";
};
};
# Will produce (harmless) warnings about a world-readable keyFile.
boot.initrd.systemd.contents."/etc/luks-foo.key".source = pkgs.writeText "luks-foo-key" "abc";
};
};
testScript = ''
import mmap
MEM_BYTES = ${toString memorySizeMiB} * 1024 * 1024
VOLUME_KEY = b"${volumeKey}"
LUKS_DEV = "/dev/disk/by-uuid/${luksUUID}"
def count_occurrences(dump_path, needle):
count = 0
with open(dump_path, "rb") as f:
with mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ) as m:
i = m.find(needle)
while i != -1:
count += 1
i = m.find(needle, i + 1)
return count
def dump_and_count(machine, label):
path = machine.state_dir / f"ram-{machine.name}-{label}.raw"
reply = machine.send_monitor_command(f'pmemsave 0 {MEM_BYTES} "{path}"')
if not path.exists():
raise Exception(f"pmemsave wrote no dump; monitor replied: {reply!r}")
full = count_occurrences(path, VOLUME_KEY)
first = count_occurrences(path, VOLUME_KEY[:32])
second = count_occurrences(path, VOLUME_KEY[32:])
path.unlink()
print(
f"[{machine.name}/{label}] volume-key copies in RAM: "
f"full={full} first-half={first} second-half={second}"
)
return full, first, second
def check_suspend_wipes_key(machine):
# Precondition: `machine` reached multi-user.target with the LUKS
# volume open as /dev/mapper/foo.
machine.succeed("test -b /dev/mapper/foo")
# Give kernel-keyring garbage collection time to run.
machine.sleep(10)
before_full, before_first, before_second = dump_and_count(machine, "before-suspend")
assert (before_full, before_first, before_second) == (0, 1, 1), (
f"[{machine.name}] expected exactly one copy of the two parts of the volume key each "
f"while the volume is open, found {before_full} / {before_first} / {before_second}"
)
# Suspend the volume -- this must wipe the key from kernel memory.
machine.succeed("cryptsetup luksSuspend foo")
after_full, after_first, after_second = dump_and_count(machine, "after-suspend")
assert (after_full, after_first, after_second) == (0, 0, 0), (
f"[{machine.name}] volume key material still present in RAM after luksSuspend "
f"(full={after_full} first-half={after_first} second-half={after_second}) "
f"-- key-wipe bug is present"
)
# Variant 1
cli.start()
cli.wait_for_unit("multi-user.target")
cli.wait_for_file(LUKS_DEV)
cli.succeed(f"echo -n abc | cryptsetup luksOpen {LUKS_DEV} foo")
check_suspend_wipes_key(cli)
# Variant 2
native.start()
native.wait_for_unit("multi-user.target")
check_suspend_wipes_key(native)
'';
}
@@ -6737,14 +6737,13 @@ final: prev: {
gitportal-nvim = buildVimPlugin {
pname = "gitportal.nvim";
version = "0-unstable-2025-12-21";
src = fetchFromGitHub {
owner = "trevorhauter";
repo = "gitportal.nvim";
rev = "0c3e1c1d518c9e42e61e8df35ea0c0582a278a65";
hash = "sha256-ag7t+G5TKRajLNc4ZrNuMufJSxqJQXPpWINZSFwEmx4=";
version = "0-unstable-2026-06-26";
src = fetchgit {
url = "https://codeberg.org/trevorhauter/gitportal.nvim";
rev = "ee5446aa17738a419e855e2e4c01cb65e378e4cb";
hash = "sha256-nt+4FjY+9IEBbUMNk0FpTwNfFu0/3k7DKeops+cGlxk=";
};
meta.homepage = "https://github.com/trevorhauter/gitportal.nvim/";
meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim";
meta.license = getLicenseFromSpdxId "MIT";
meta.hydraPlatforms = [ ];
};
@@ -479,7 +479,7 @@ https://github.com/vim-scripts/gitignore.vim/,,
https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,,
https://github.com/LionyxML/gitlineage.nvim/,,
https://github.com/ruifm/gitlinker.nvim/,,
https://github.com/trevorhauter/gitportal.nvim/,,
https://codeberg.org/trevorhauter/gitportal.nvim/,,
https://github.com/gregsexton/gitv/,,
https://github.com/DNLHC/glance.nvim/,,
https://github.com/ellisonleao/glow.nvim/,,
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Millet";
publisher = "azdavis";
version = "0.15.1";
hash = "sha256-5V5GG7M52ohpS9Zg2TTamEjbWyXH9kllZyy7Oezy4Iw=";
version = "0.15.2";
hash = "sha256-mtI4IW+xBIuo11ctTIv5/6LOXVStD3YqSYkIQYJWqmo=";
};
nativeBuildInputs = [
jq
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "biome";
publisher = "biomejs";
version = "2026.3.311859";
hash = "sha256-HH+KJYY4J6nuHwQ/+DhEFsJ7P5S97UsNuoc+y7GnE00=";
version = "2026.6.181955";
hash = "sha256-6FRrVKDY+E9wuqgeNKArgGn4PDp5ViJsdCPjjwBGbGI=";
};
postInstall = ''
@@ -1950,8 +1950,8 @@ let
mktplcRef = {
publisher = "github";
name = "codespaces";
version = "1.18.13";
hash = "sha256-tvs35GA3bZ4jExiAe0NeHx/vQV/+2zio2Q0813/MAMU=";
version = "1.18.14";
hash = "sha256-i/J5inu6iJ3CPgoBf+pMFuM33Ex/0KqhfzfRl/BIe7Y=";
};
meta = {
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2026-06-23";
version = "0-unstable-2026-06-26";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "59ab660649d933f40cf281656ba949eb4c835d73";
hash = "sha256-Hwav4vHppInUUbiSch3J84P7HIYkQ+DM431fFdq1qEg=";
rev = "7ec978e8521f75427ad38eb8f8f4f3cabaa891d0";
hash = "sha256-3ChQnJP6xI/Wd3BOlkauTYCNQz1MjSHk0lDmjX+Iugg=";
fetchSubmodules = true;
};
@@ -14,16 +14,16 @@ builtins.mapAttrs
}:
buildGoModule rec {
inherit pname;
version = "3.31.5";
version = "3.31.6";
src = fetchFromGitHub {
owner = "projectcalico";
repo = "calico";
rev = "v${version}";
hash = "sha256-HdTnERSuqJ2ORijvI8AbzLGTwXaRl349p9onKgH4HE8=";
hash = "sha256-lME1x04iFaNg+dilS66dGuFmw3IEJQmyPcnDvGTzk/8=";
};
vendorHash = "sha256-LwOEshx4VU+a0oBlq/881RC/ViQVDnZZlZs/U3BMJ7M=";
vendorHash = "sha256-8CvnDaoEkb/yMMgGBG03RFrdHdc5Anbv9t1TnOYHA9A=";
inherit doCheck subPackages;
@@ -580,13 +580,13 @@
"vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU="
},
"hashicorp_google": {
"hash": "sha256-/O0K2qf1kk8kfRl/FQ3eNAs96Z7Te4yg6boVHdYtLJo=",
"hash": "sha256-TQFMOZZbMabLfTDPON1OMd+DgyssfprzqMbc9/u7cbQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
"rev": "v7.37.0",
"rev": "v7.39.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ub+Dvddw5jcSy2hR72OSsy4EgHphhCW1kekPyrQGc9E="
"vendorHash": "sha256-ayt8FR4684ZV5kd6exMw0AEgkMJLW5huvTYZqcr3q/s="
},
"hashicorp_google-beta": {
"hash": "sha256-LbNsD7R+TP9trNaMZq+OTyGlQPR6EZoSdUx3uo+3xUo=",
@@ -2,8 +2,8 @@
lib,
stdenv,
fetchFromGitHub,
autoconf-archive,
autoreconfHook,
meson,
ninja,
cmocka,
curl,
expat,
@@ -12,7 +12,6 @@
glibcLocales,
libstrophe,
libmicrohttpd,
libotr,
libuuid,
ncurses,
openssl,
@@ -35,41 +34,39 @@
python3,
traySupport ? true,
gtk3,
otrSupport ? true,
libotr,
avatarScalingSupport ? true,
spellcheckSupport ? true,
enchant,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "profanity";
version = "0.17.0";
version = "0.18.2";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = finalAttrs.version;
hash = "sha256-fZFLEkbwiYeAtnqDOImV8aXbYGMqO9TEcXPFMuchJaE=";
hash = "sha256-rPiYzG5KvJyKt7b99AImmO6wTYxZPFcf/6Xhz8SrgIo=";
};
patches = [
./patches/packages-osx.patch
];
enableParallelBuilding = true;
nativeBuildInputs = [
autoconf-archive
autoreconfHook
glibcLocales
meson
pkg-config
ninja
];
buildInputs = [
cmocka
curl
expat
expect
glib
libstrophe
libmicrohttpd
libotr
libuuid
ncurses
openssl
@@ -91,22 +88,38 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals pgpSupport [ gpgme ]
++ lib.optionals pythonPluginSupport [ python3 ]
++ lib.optionals traySupport [ gtk3 ];
++ lib.optionals traySupport [ gtk3 ]
++ lib.optionals otrSupport [ libotr ]
++ lib.optionals spellcheckSupport [ enchant ]
++ lib.optionals avatarScalingSupport [ gdk-pixbuf ];
# Enable feature flags, so that build fail if libs are missing
configureFlags = [
"--enable-c-plugins"
"--enable-otr"
]
++ lib.optionals notifySupport [ "--enable-notifications" ]
++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ]
++ lib.optionals pgpSupport [ "--enable-pgp" ]
++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ]
++ lib.optionals omemoSupport [ "--enable-omemo" ];
# see also: https://profanity-im.github.io/guide/latest/build.html#expl
mesonFlags = [
(lib.mesonBool "tests" finalAttrs.doCheck)
(lib.mesonEnable "notifications" notifySupport)
(lib.mesonEnable "python-plugins" pythonPluginSupport)
(lib.mesonEnable "c-plugins" true)
(lib.mesonEnable "otr" otrSupport)
(lib.mesonEnable "pgp" pgpSupport)
(lib.mesonEnable "omemo" omemoSupport)
(lib.mesonEnable "omemo-qrcode" omemoSupport)
(lib.mesonEnable "icons-and-clipboard" traySupport)
(lib.mesonEnable "gdk-pixbuf" avatarScalingSupport)
(lib.mesonEnable "xscreensaver" autoAwaySupport)
(lib.mesonEnable "spellcheck" spellcheckSupport)
];
# this build directory is hard coded by the tests:
# https://github.com/profanity-im/profanity/blob/c9033aae568d1a8f5435c566f31aa165718c7726/tests/functionaltests/proftest.c#L275
mesonBuildDir = "build_run";
doCheck = true;
nativeCheckInputs = [
cmocka
env.LC_ALL = "en_US.utf8";
# when stabber is found, functional tests are enabled which take a very long time
# stabber
];
meta = {
homepage = "https://profanity-im.github.io";
@@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 5c00aca..eb78060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,6 @@ PLATFORM="unknown"
AS_CASE([$host_os],
[freebsd*], [PLATFORM="freebsd"],
[openbsd*], [PLATFORM="openbsd"],
- [darwin*], [PLATFORM="osx"],
[cygwin], [PLATFORM="cygwin"],
[PLATFORM="nix"])
@@ -68,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
dontStrip = debug;
separateDebugInfo = !debug;
dontWrapQtApps = true;
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "acme.sh";
version = "3.1.2";
version = "3.1.3";
src = fetchFromGitHub {
owner = "acmesh-official";
repo = "acme.sh";
tag = finalAttrs.version;
hash = "sha256-eTNligdr4LV+yer+D2GJ1tdv2APP3I4Revjw1q8WrH0=";
hash = "sha256-oWVTk4fKbplMY4NJWf9eTokiHSxPMZ8lgSoG4aF8DVk=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -25,11 +25,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "amarok";
version = "3.3.1";
version = "3.3.3";
src = fetchurl {
url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz";
hash = "sha256-OW8uqToH25XI+762gNeAai5ZVKUgxSwFZIXBHeYznAE=";
hash = "sha256-aOnoPX2MDL3UcJWOdogV9XPWHzzjK+e8G4f7VtYiQ24=";
};
outputs = [
@@ -11,16 +11,17 @@
buildGoModule (finalAttrs: {
pname = "amazon-cloudwatch-agent";
version = "1.300069.0";
version = "1.300070.0";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-cloudwatch-agent";
tag = "v${finalAttrs.version}";
hash = "sha256-A9UASdKERo/vg3K8EDu//r6SqQjskhmVKeBlbqqpdDM=";
hash = "sha256-w0/y4qW109MjgO1/HWcBfPQ3zhIQb8lzZLCnoDMM99c=";
};
vendorHash = "sha256-Qlwy0wz79TgYlBcsdHLzZA3OWbSIg6reK6KGSKsMlzI=";
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-ilpoDtOLVh4i/pGv8a90meCqw4DU3CeuAqDZyA/bgXE=";
# See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
subPackages = [
+1
View File
@@ -63,6 +63,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
];
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "1.9.1";
src = fetchFromGitHub {
owner = "endevco";
owner = "jdx";
repo = "aube";
tag = "v${finalAttrs.version}";
hash = "sha256-uwOEou6DH+bePNupYKmTc82xQV9T08bDmSPG9RU9yBk=";
@@ -40,8 +40,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Fast Node.js package manager";
homepage = "https://github.com/endevco/aube";
changelog = "https://github.com/endevco/aube/blob/v${finalAttrs.version}/CHANGELOG.md";
homepage = "https://github.com/jdx/aube";
changelog = "https://github.com/jdx/aube/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ chillcicada ];
mainProgram = "aube";
+3 -2
View File
@@ -11,7 +11,7 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "autosuspend";
version = "10.1.0";
version = "11.3.0";
pyproject = true;
outputs = [
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
owner = "languitar";
repo = "autosuspend";
tag = "v${finalAttrs.version}";
hash = "sha256-4mByuJ75hd5TEoKxVglAHlYXZSlbAldMwnIianSw8O4=";
hash = "sha256-KG1Cv3Fmdf3VDdZR+k0SeA97g6R+oI6+NgtaWHWPVUQ=";
};
postPatch = ''
@@ -100,6 +100,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
maintainers = with lib.maintainers; [
bzizou
anthonyroussel
adamcstephens
];
mainProgram = "autosuspend";
platforms = lib.platforms.linux;
+14 -3
View File
@@ -16,6 +16,7 @@
gnugrep,
man,
asciidoctor,
bashNonInteractive,
}:
let
@@ -47,15 +48,25 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-/33Lx62S/9RcqrfJumE6/o3KnAObBa3DcmuGkcOXIQE=";
};
__structuredAttrs = true;
strictDeps = true;
enableParallelBuilding = true;
outputs = [
"out"
"man"
"doc"
];
nativeBuildInputs = [
makeWrapper
gettext
asciidoctor
man
];
buildInputs = [
python'
man
asciidoctor
bashNonInteractive
];
installFlags = [ "DEST=$(out)" ];
@@ -83,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "'fusermount'" "'${lib.getExe' fuse3 "fusermount3"}'"
substituteInPlace "bitlicense.py" \
--replace-fail "/usr/share/doc" "$out/share/doc" \
--replace-fail "/usr/share/doc" "$doc/share/doc" \
'';
dontAddPrefix = true;
+11 -1
View File
@@ -49,7 +49,6 @@ stdenv.mkDerivation {
version
src
installFlags
meta
dontAddPrefix
;
@@ -105,4 +104,15 @@ stdenv.mkDerivation {
wrapProgram "$out/bin/backintime-qt_polkit" \
--prefix PATH : "${lib.getBin polkit}/bin:$PATH"
'';
meta = {
inherit (backintime-common.meta)
homepage
description
license
maintainers
platforms
longDescription
;
};
}
+2 -2
View File
@@ -13,7 +13,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bdep";
version = "0.17.0";
version = "0.18.0";
outputs = [
"out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bdep-${finalAttrs.version}.tar.gz";
hash = "sha256-+2Hl5kanxWJmOpfePAvvSBSmG3kZLQv/kYIkT4J+kaQ=";
hash = "sha256-7pfGiIelaHQydpZqd6KiF7gwCqC9oJspig87BrKz6QU=";
};
strictDeps = true;
+2 -2
View File
@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bpkg";
version = "0.17.0";
version = "0.18.0";
outputs = [
"out"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${finalAttrs.version}.tar.gz";
hash = "sha256-Yw6wvTqO+VfCo91B2BUT0A8OIN0MVhGK1USYM7hgGMs=";
hash = "sha256-EcDxvQ3P182gkZWkE3qI586vIlJXlDrYC2DoU0Out18=";
};
strictDeps = true;
@@ -1,8 +1,6 @@
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index f848003c..0f14f9a5 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -966,6 +966,17 @@ namespace build2
@@ -1806,6 +1806,17 @@ namespace build2
void
msvc_extract_library_search_dirs (const strings&, dir_paths&); // msvc.cxx
@@ -20,11 +18,8 @@ index f848003c..0f14f9a5 100644
dir_paths common::
extract_library_search_dirs (const scope& bs) const
{
@@ -987,8 +998,19 @@ namespace build2
msvc_extract_library_search_dirs (v, r);
else
@@ -1829,6 +1840,16 @@ namespace build2
gcc_extract_library_search_dirs (v, r);
+
};
+ // NIX_LDFLAGS are implicitly used when linking,
+4 -10
View File
@@ -8,20 +8,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "build2-bootstrap";
version = "0.17.0";
version = "0.18.1";
src = fetchurl {
url = "https://download.build2.org/${finalAttrs.version}/build2-toolchain-${finalAttrs.version}.tar.xz";
hash = "sha256-NyKonqht90JTnQ+Ru0Qp/Ua79mhVOjUHgKY0EbZIv10=";
hash = "sha256-pfPqudRSK8InBImVk91scBM0mhuMNyeMiyMhBz4l/xY=";
};
patches = [
# Pick up sysdirs from NIX_LDFLAGS
./nix-ldflags-sysdirs.patch
# Fix build on newer clang/libcpp
(fetchpatch {
name = "new-libcpp-fix.patch";
url = "https://github.com/build2/build2/commit/7cf9cece1d88cd1be283ab309f9a851bd02b43d0.patch";
hash = "sha256-PTo1C6Aa1L9fvjiJ08KtGgVqHMw2ZlW5LSKoripL22g=";
})
];
sourceRoot = "build2-toolchain-${finalAttrs.version}/build2";
@@ -43,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
checkPhase = ''
runHook preCheck
build2/b-boot --version
b/b-boot --version
runHook postCheck
'';
installPhase = ''
runHook preInstall
install -D build2/b-boot $out/bin/b
install -D b/b-boot $out/bin/b
runHook postInstall
'';
+2 -2
View File
@@ -16,7 +16,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "build2";
version = "0.17.0";
version = "0.18.1";
outputs = [
"out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/build2-${finalAttrs.version}.tar.gz";
hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA=";
hash = "sha256-BLMBd/1kofVuB2MalPyuj4lXNMi3p5uuzVIJUzQv3A0=";
};
patches = [
@@ -1,14 +1,14 @@
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -86,8 +86,11 @@ build2_config_lines = [strings]
host_config_lines = [strings]
@@ -109,8 +109,11 @@ host_config_no_warnings_lines = [strings]
build2_config_no_warnings_lines = [strings]
for l: $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
+ [null], return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
for l: $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^( *(#|(config\.(build2\.|test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
+ [null], return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
[null])
{
build2_config_lines += $l
if ($defined(config.build2.host_c) && $regex.match($l, ' *config\.c[ =].*'))
+3 -3
View File
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub {
owner = "tracel-ai";
repo = "burn-central-cli";
repo = "tracel-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-1QXlN1cq5MKZAPgGx5mnf8Jy7o4CnKJDKi0sSith6n0=";
};
@@ -45,8 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
with Burn Central, the centralized platform for experiment tracking,
model sharing, and deployment for Burn users.
'';
homepage = "https://github.com/tracel-ai/burn-central-cli";
changelog = "https://github.com/tracel-ai/burn-central-cli/releases/tag/v${finalAttrs.version}";
homepage = "https://github.com/tracel-ai/tracel-cli";
changelog = "https://github.com/tracel-ai/tracel-cli/releases/tag/v${finalAttrs.version}";
license = with lib.licenses; [
mit
asl20
+3 -3
View File
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "20.0.6";
src = fetchFromGitHub {
owner = "ryoppippi";
owner = "ccusage";
repo = "ccusage";
tag = "v${finalAttrs.version}";
hash = "sha256-uf/FlPprxx4jh74YwjmYMtoIHpTkKrWTLetbNoYiFv4=";
@@ -98,8 +98,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Analyze coding agent CLI token usage and costs from local data";
homepage = "https://github.com/ryoppippi/ccusage";
changelog = "https://github.com/ryoppippi/ccusage/releases/tag/v${finalAttrs.version}";
homepage = "https://github.com/ccusage/ccusage";
changelog = "https://github.com/ccusage/ccusage/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ thrix ];
mainProgram = "ccusage";
+2
View File
@@ -23,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [
"--bin"
"cedar"
"--bin"
"cedar-language-server"
];
cargoTestFlags = finalAttrs.cargoBuildFlags;
+4 -4
View File
@@ -9,7 +9,7 @@ let
version = "0.25.2";
src = fetchFromGitHub {
owner = "google";
owner = "cel-expr";
repo = "cel-spec";
tag = "v${finalAttrs.version}";
hash = "sha256-aNyBGUlpTqILCiQHo7BxaZShI6q9xgtRegywd+jQSlo=";
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
version = "0.28.1";
src = fetchFromGitHub {
owner = "google";
owner = "cel-expr";
repo = "cel-go";
tag = "v${finalAttrs.version}";
hash = "sha256-fiFkoYVKdSdYkSMQxmC1SvEEGsalBasCl9tzsGSYwmw=";
@@ -68,9 +68,9 @@ buildGoModule (finalAttrs: {
};
meta = {
changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.tag}";
changelog = "https://github.com/cel-expr/cel-go/releases/tag/${finalAttrs.src.tag}";
description = "Fast, portable, non-Turing complete expression evaluation with gradual typing";
homepage = "https://github.com/google/cel-go";
homepage = "https://github.com/cel-expr/cel-go";
license = lib.licenses.asl20;
mainProgram = "cel-go";
maintainers = with lib.maintainers; [ hythera ];
+3 -3
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.6.2.2";
src = fetchFromGitHub {
owner = "zmartzone";
owner = "OpenIDC";
repo = "cjose";
rev = "v${finalAttrs.version}";
sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk=";
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
homepage = "https://github.com/zmartzone/cjose";
changelog = "https://github.com/zmartzone/cjose/blob/${finalAttrs.version}/CHANGELOG.md";
homepage = "https://github.com/OpenIDC/cjose";
changelog = "https://github.com/OpenIDC/cjose/blob/${finalAttrs.version}/CHANGELOG.md";
description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ midchildan ];
+2 -2
View File
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
version = "1.0.0";
src = fetchFromGitHub {
owner = "vmware";
owner = "vmware-archive";
repo = "clarity-city";
rev = "v${finalAttrs.version}";
hash = "sha256-1POSdd2ICnyNNmGadIujezNK8qvARD0kkLR4yWjs5kA=";
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = {
description = "Open source sans-serif typeface";
homepage = "https://github.com/vmware/clarity-city";
homepage = "https://github.com/vmware-archive/clarity-city";
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ sagikazarmark ];
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.3.8";
src = fetchFromGitHub {
owner = "UnknownShadow200";
owner = "ClassiCube";
repo = "ClassiCube";
tag = finalAttrs.version;
hash = "sha256-AF4cr3ZXCixwiihS+2ayrzVH5eYShkjlfF0myb2PbHM=";
+2 -2
View File
@@ -9,7 +9,7 @@ buildGoModule {
version = "2022-04-16";
src = fetchFromGitHub {
owner = "TorchedSammy";
owner = "sammy-ette";
repo = "clematis";
rev = "cbe74da084b9d3f6893f53721c27cd0f3a45fe93";
sha256 = "sha256-TjoXHbY0vUQ2rhwdCJ/s/taRd9/MG0P9HaEw2BOIy/s=";
@@ -19,7 +19,7 @@ buildGoModule {
meta = {
description = "Discord rich presence for MPRIS music players";
homepage = "https://github.com/TorchedSammy/Clematis";
homepage = "https://github.com/sammy-ette/clematis";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ misterio77 ];
+2 -2
View File
@@ -10,7 +10,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
repo = "mql";
tag = "v${version}";
hash = "sha256-CTg2jfpCLTYuRx5R+9Si0Ig1NT1ZGXMFbcPPa8CbMKY=";
};
@@ -32,7 +32,7 @@ buildGoModule rec {
accounts, Kubernetes, containers, services, VMs, APIs, and more.
'';
homepage = "https://mondoo.com/cnquery";
changelog = "https://github.com/mondoohq/cnquery/releases/tag/v${version}";
changelog = "https://github.com/mondoohq/mql/releases/tag/v${version}";
license = lib.licenses.bsl11;
maintainers = with lib.maintainers; [ mariuskimmina ];
};
+1 -1
View File
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "7.0.0";
src = fetchFromGitHub {
owner = "oknozor";
owner = "cocogitto";
repo = "cocogitto";
tag = finalAttrs.version;
hash = "sha256-Z+SXB6bDxyR+Bt3Pz6uF9+sZLjbiFNYeECVFZbx40h8=";
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "coin";
version = "4.0.8";
version = "4.0.10";
src = fetchFromGitHub {
owner = "coin3d";
repo = "coin";
rev = "v${finalAttrs.version}";
hash = "sha256-2rKTDyDdmY7ItxUCHHfs3OyTlOQHdHaWITLxdGhrQ/I=";
hash = "sha256-Zymizcj+HeNgvvuuIoIHf03I0suOyWGOBIqvnjx5qyw=";
};
nativeBuildInputs = [ cmake ];
+1 -1
View File
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
version = "1.6.10";
src = fetchFromGitHub {
owner = "miguelmota";
owner = "cointop-sh";
repo = "cointop";
rev = "v${finalAttrs.version}";
sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0=";
+2 -2
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.1.0";
src = fetchFromGitHub {
owner = "Thomas-de-Bock";
owner = "Thomas-995";
repo = "construct";
rev = finalAttrs.version;
hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew=";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Abstraction over x86 NASM Assembly";
longDescription = "Construct adds features such as while loops, if statements, scoped macros and function-call syntax to NASM Assembly.";
homepage = "https://github.com/Thomas-de-Bock/construct";
homepage = "https://github.com/Thomas-995/construct";
maintainers = with lib.maintainers; [ rucadi ];
platforms = lib.platforms.all;
license = lib.licenses.mit;
+4 -4
View File
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
version = "0.11.3";
src = fetchFromGitHub {
owner = "grafana";
owner = "grafana-cold-storage";
repo = "cortex-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-+GWUC+lnCn5Nw2WytSvW/UsIMmMelCCsnKdBCHuue24=";
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
env.CGO_ENABLED = 0;
ldflags = [
"-X github.com/grafana/cortex-tools/pkg/version.Version=${finalAttrs.src.tag}"
"-X github.com/grafana-cold-storage/cortex-tools/pkg/version.Version=${finalAttrs.src.tag}"
"-s"
"-w"
];
@@ -60,7 +60,7 @@ buildGoModule (finalAttrs: {
versionCheckProgramArg = "version";
meta = {
changelog = "https://github.com/grafana/cortex-tools/releases/tag/${finalAttrs.src.tag}";
changelog = "https://github.com/grafana-cold-storage/cortex-tools/releases/tag/${finalAttrs.src.tag}";
description = "Tools used for interacting with Cortex, a Prometheus-compatible server";
longDescription = ''
Tools used for interacting with Cortex, a horizontally scalable, highly available, multi-tenant, long term Prometheus server:
@@ -70,7 +70,7 @@ buildGoModule (finalAttrs: {
- logtool: Tool which parses Cortex query-frontend logs and formats them for easy analysis.
- e2ealerting: Tool that helps measure how long an alert takes from scrape of sample to Alertmanager notification delivery.
'';
homepage = "https://github.com/grafana/cortex-tools";
homepage = "https://github.com/grafana-cold-storage/cortex-tools";
license = lib.licenses.asl20;
platforms = lib.platforms.linux ++ lib.platforms.windows ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ videl ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applibrary";
repo = "cosmic-app-library";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-TZncRQer4lXunUwdQ2xDP3DmF5B7UmfhSQvEwVodc98=";
};
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
};
meta = {
homepage = "https://github.com/pop-os/cosmic-applibrary";
homepage = "https://github.com/pop-os/cosmic-app-library";
description = "Application Template for the COSMIC Desktop Environment";
license = lib.licenses.gpl3Only;
teams = [ lib.teams.cosmic ];
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "courier-unicode";
version = "2.5.0";
version = "2.6.0";
src = fetchurl {
url = "mirror://sourceforge/courier/courier-unicode/${finalAttrs.version}/courier-unicode-${finalAttrs.version}.tar.bz2";
hash = "sha256-Xsp6U2UWEg745d5gFOaQcRvGs/saG9V9LxkDxU3ts+A=";
hash = "sha256-Cu0jScW2LeDTPM+MI1J6rkHa+VoDyAVMiN5Prvjaigg=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -10,7 +10,7 @@ buildGoModule (finalAttrs: {
src = fetchFromGitHub {
owner = "Cyphrme";
repo = "Coze_cli";
repo = "CozeCLI";
rev = "v${finalAttrs.version}";
hash = "sha256-/Cznx5Q0a9vVrC4oAoBmAkejT1505AQzzCW/wi3itv4=";
};
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "CLI client for Coze, a cryptographic JSON messaging specification";
mainProgram = "coze";
homepage = "https://github.com/Cyphrme/coze_cli";
homepage = "https://github.com/Cyphrme/CozeCLI";
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ qbit ];
};
+1 -1
View File
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
pyproject = true;
src = fetchFromGitHub {
owner = "lpechacek";
owner = "SUSE";
repo = "cpuset";
rev = "v${finalAttrs.version}";
hash = "sha256-fW0SXNI10pb6FTn/2TOqxP9qlys0KL/H9m//NjslUaY=";
+2 -2
View File
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
version = "2.9.54";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
owner = "cloudfoundry";
repo = "credhub-cli";
rev = finalAttrs.version;
sha256 = "sha256-qp7Oj207uu2P/Jt9O5tZM0ra9fMx+DfuHPaKr5z+ef0=";
@@ -40,7 +40,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Provides a command line interface to interact with CredHub servers";
homepage = "https://github.com/cloudfoundry-incubator/credhub-cli";
homepage = "https://github.com/cloudfoundry/credhub-cli";
maintainers = with lib.maintainers; [ ris ];
license = lib.licenses.asl20;
};
+2 -2
View File
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
pyproject = true;
src = fetchFromGitHub {
owner = "Nefcore";
owner = "Raghavd3v";
repo = "CRLFsuite";
tag = "v${finalAttrs.version}";
sha256 = "sha256-mK20PbVGhTEjhY5L6coCzSMIrG/PHHmNq30ZoJEs6uI=";
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
meta = {
description = "CRLF injection (HTTP Response Splitting) scanner";
mainProgram = "crlfsuite";
homepage = "https://github.com/Nefcore/CRLFsuite";
homepage = "https://github.com/Raghavd3v/CRLFsuite";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
fab
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.3";
src = fetchFromGitHub {
owner = "Acolarh";
owner = "nielssp";
repo = "ctodo";
rev = "v${finalAttrs.version}";
sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna";
+2 -2
View File
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
version = "0.1.11";
src = fetchFromGitHub {
owner = "grafana";
owner = "grafana-cold-storage";
repo = "cuetsy";
rev = "v${finalAttrs.version}";
hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0=";
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Experimental CUE->TypeScript exporter";
homepage = "https://github.com/grafana/cuetsy";
homepage = "https://github.com/grafana-cold-storage/cuetsy";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bryanhonof ];
mainProgram = "cuetsy";
+1 -1
View File
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
pyproject = true;
src = fetchFromGitHub {
owner = "audiusGmbH";
owner = "audius";
repo = "cups-printers";
tag = finalAttrs.version;
hash = "sha256-Fne7V9dEZwdV6OsQPg2gzrz/wloAOOuwlx3CqXOyWBc=";
+8 -4
View File
@@ -13,16 +13,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cwm";
version = "7.4";
version = "7.9";
src = fetchFromGitHub {
owner = "leahneukirchen";
repo = "cwm";
rev = "v${finalAttrs.version}";
hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA=";
tag = "v${finalAttrs.version}";
hash = "sha256-YC+x4YSPAgZ47PFMbzICv9ixfDxA1PG3ncLiMahSoUc=";
};
strictDeps = true;
__structuredAttrs = true;
nativeBuildInputs = [
pkg-config
@@ -40,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Lightweight and efficient window manager for X11";
homepage = "https://github.com/leahneukirchen/cwm";
maintainers = with lib.maintainers; [ _0x4A6F ];
maintainers = with lib.maintainers; [
_0x4A6F
iamanaws
];
license = lib.licenses.isc;
platforms = lib.platforms.linux;
mainProgram = "cwm";
+2 -2
View File
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
version = "0.6.0";
src = fetchFromGitHub {
owner = "rancher";
owner = "rancher-archives";
repo = "dapper";
rev = "v${finalAttrs.version}";
sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM=";
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Docker build wrapper";
mainProgram = "dapper";
homepage = "https://github.com/rancher/dapper";
homepage = "https://github.com/rancher-archives/dapper";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ kuznero ];
+3 -3
View File
@@ -10,8 +10,8 @@ buildGoModule (finalAttrs: {
version = "2.6.0";
src = fetchFromGitHub {
owner = "ddosify";
repo = "ddosify";
owner = "getanteon";
repo = "anteon";
tag = "selfhosted-${finalAttrs.version}";
hash = "sha256-EPbpBCSaUVVhxGlj7gRqwHLuj5p6563iiARqkEjA6Rk=";
};
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
description = "High-performance load testing tool, written in Golang";
mainProgram = "ddosify";
homepage = "https://ddosify.com/";
changelog = "https://github.com/ddosify/ddosify/releases/tag/selfhosted-${finalAttrs.version}";
changelog = "https://github.com/getanteon/anteon/releases/tag/selfhosted-${finalAttrs.version}";
license = lib.licenses.agpl3Plus;
maintainers = [ ];
};
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.7.2";
src = fetchFromGitHub {
owner = "lukas2511";
owner = "dehydrated-io";
repo = "dehydrated";
rev = "v${finalAttrs.version}";
sha256 = "sha256-xDDYqP6oxJt0NPgHtHV1xQKUxVc8JQxWekXwxezggtE=";
+3 -1
View File
@@ -44,7 +44,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
postInstall = ''
installShellCompletion --cmd delta \
etc/completion/completion.{bash,fish,zsh}
--bash <($out/bin/delta --generate-completion bash) \
--fish <($out/bin/delta --generate-completion zsh) \
--zsh <($out/bin/delta --generate-completion fish)
'';
# test_env_parsing_with_pager_set_to_bat sets environment variables,
+2 -2
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.9.13";
src = fetchFromGitHub {
owner = "TASVideos";
owner = "TASEmulators";
repo = "desmume";
rev = "release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
homepage = "https://www.github.com/TASVideos/desmume/";
homepage = "https://www.github.com/TASEmulators/desmume/";
description = "Open-source Nintendo DS emulator";
longDescription = ''
DeSmuME is a freeware emulator for the NDS roms & Nintendo DS Lite games
+1 -1
View File
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "3.0.0";
src = fetchFromGitHub {
owner = "digitalbitbox";
owner = "BitBoxSwiss";
repo = "dbb-app";
tag = "v${finalAttrs.version}";
hash = "sha256-ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
+2 -2
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "3.4.0";
src = fetchFromGitHub {
owner = "discordapp";
owner = "discord";
repo = "discord-rpc";
rev = "v${finalAttrs.version}";
sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a";
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Official library to interface with the Discord client";
homepage = "https://github.com/discordapp/discord-rpc";
homepage = "https://github.com/discord/discord-rpc";
license = lib.licenses.mit;
maintainers = [ ];
platforms = lib.platforms.all;
+2 -2
View File
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
version = "2.0.1";
src = fetchFromGitHub {
owner = "ChaoticWeg";
owner = "fieu";
repo = "discord.sh";
rev = "v${version}";
sha256 = "sha256-z57uMbH6PI68aTMAjA8UIPEefV8sQRR4cS0eK6Ypxuk=";
@@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec {
meta = {
description = "Write-only command-line Discord webhook integration written in 100% Bash script";
mainProgram = "discord.sh";
homepage = "https://github.com/ChaoticWeg/discord.sh";
homepage = "https://github.com/fieu/discord.sh";
license = lib.licenses.gpl3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ matthewcroughan ];
+2 -2
View File
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "disktui";
version = "1.3.0";
src = fetchFromGitHub {
owner = "Maciejonos";
owner = "mkbula";
repo = "disktui";
tag = "v${finalAttrs.version}";
hash = "sha256-C0skZF7fP7Qx5o+q9bUitgnBB9tBh1J4JdGyn8oQ/Rc=";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "TUI for disk management on Linux";
homepage = "https://github.com/Maciejonos/disktui";
homepage = "https://github.com/mkbula/disktui";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Inarizxc ];
platforms = lib.platforms.linux;
+2 -2
View File
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
pyproject = true;
src = fetchFromGitHub {
owner = "Riverside-Healthcare";
owner = "djlint";
repo = "djlint";
tag = "v${finalAttrs.version}";
hash = "sha256-1DXBDVe8Ae8joJOYwwlBZB8MVubDPVhh+TiJBpL2u2M=";
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
meta = {
description = "HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang";
mainProgram = "djlint";
homepage = "https://github.com/Riverside-Healthcare/djlint";
homepage = "https://github.com/djlint/djLint";
license = lib.licenses.gpl3Only;
changelog = "https://github.com/djlint/djLint/blob/v${finalAttrs.version}/CHANGELOG.md";
maintainers = with lib.maintainers; [ traxys ];
+1 -1
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "3.1.1";
src = fetchFromGitHub {
owner = "darbyjohnston";
owner = "grizzlypeak3d";
repo = "djv";
tag = finalAttrs.version;
hash = "sha256-/SakJ23mi/dz8eUt2UtcgfLtFZiCHy1ME+jWdNS8+Fw=";
+2 -2
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.1";
src = fetchFromGitHub {
owner = "sergev";
owner = "OpenRTX";
repo = "dmrconfig";
rev = finalAttrs.version;
sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
longDescription = ''
DMRconfig is a utility for programming digital radios via USB programming cable.
'';
homepage = "https://github.com/sergev/dmrconfig";
homepage = "https://github.com/OpenRTX/dmrconfig";
license = lib.licenses.asl20;
maintainers = [ ];
platforms = lib.platforms.linux;
+2 -2
View File
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub {
owner = "Dj-Codeman";
repo = "doge";
repo = "dog_community";
rev = "v${finalAttrs.version}";
hash = "sha256-SeC/GZ1AeEqRzxWc4oJ6JOvXfn3/LRcQz9uWXXqdTqU=";
};
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Reviving a command-line DNS client";
homepage = "https://github.com/Dj-Codeman/doge";
homepage = "https://github.com/Dj-Codeman/dog_community";
license = lib.licenses.eupl12;
mainProgram = "doge";
maintainers = with lib.maintainers; [ aktaboot ];
+2 -2
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
version = "unstable-2018-01-04";
src = fetchFromGitHub {
owner = "wormt";
owner = "positively-charged";
repo = "bcc";
rev = "d58b44d9f18b28fd732c27113e5607a454506d19";
sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq";
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
meta = {
description = "Compiler for Doom/Hexen scripts (ACS, BCS)";
mainProgram = "bcc";
homepage = "https://github.com/wormt/bcc";
homepage = "https://github.com/positively-charged/bcc";
license = lib.licenses.mit;
};
}
+6 -17
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchurl,
rustPlatform,
cmake,
ninja,
@@ -25,22 +24,14 @@
pipewire,
apple-sdk_15,
darwin,
shelter,
nix-update-script,
}:
let
webkitgtk_4_1' = webkitgtk_4_1.override {
enableExperimental = true;
};
shelter = fetchurl {
url = "https://raw.githubusercontent.com/uwu/shelter-builds/7a1beaff4bb4ec5e8590d069549686fda4200e82/shelter.js";
hash = "sha256-LeZTxrGRQb0rl3BMP34UFHIEFnil4k3Fet3MTujvVB8=";
meta = {
homepage = "https://github.com/uwu/shelter";
sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; # actually, minified JS
license = lib.licenses.cc0;
};
};
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dorion";
@@ -124,7 +115,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
' src-tauri/tauri.conf.json
# link shelter injection
ln -s "${shelter}" src-tauri/injection/shelter.js
ln -s ${shelter}/shelter.js src-tauri/injection/shelter.js
# link html/frontend data
ln -s "$(pwd)/src" src-tauri/html
@@ -192,6 +183,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
TAURI_RESOURCE_DIR = "${placeholder "out"}/lib";
};
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://spikehd.github.io/projects/dorion/";
description = "Tiny alternative Discord client";
@@ -201,10 +194,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
changelog = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
downloadPage = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
license = [
lib.licenses.gpl3Only
shelter.meta.license
];
license = lib.licenses.gpl3Only;
mainProgram = "Dorion";
maintainers = with lib.maintainers; [
nyabinary
@@ -214,7 +204,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
platforms = lib.platforms.unix;
sourceProvenance = [
lib.sourceTypes.binaryBytecode # actually, minified JS
lib.sourceTypes.fromSource
];
};
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "dracut-ng";
repo = "dracut-ng";
repo = "dracut";
tag = finalAttrs.version;
hash = "sha256-2jdS7/LGuLSBBXv1R/o8yjgwdXl2l2wNbZWxq01wSb0";
};
+3 -3
View File
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
version = "2.1.5";
src = fetchFromGitHub {
owner = "aramg";
repo = "droidcam";
owner = "dev47apps";
repo = "droidcam-linux-client";
rev = "v${finalAttrs.version}";
sha256 = "sha256-22lRmtXumjR/83Fg1edBisM1GjNZvNUvPs1Yg7Na1xw=";
};
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Linux client for DroidCam app";
homepage = "https://github.com/aramg/droidcam";
homepage = "https://github.com/dev47apps/droidcam-linux-client";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.suhr ];
platforms = lib.platforms.linux;
+2 -2
View File
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
src = fetchFromGitHub {
owner = "harness";
repo = "drone";
repo = "harness";
tag = "v${finalAttrs.version}";
hash = "sha256-jKM+jET6dsMe5+QRDKIHA40OOHb/nZmli3owaDB7IvU=";
};
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Continuous Integration platform built on container technology";
mainProgram = "drone-server";
homepage = "https://github.com/harness/drone";
homepage = "https://github.com/harness/harness";
maintainers = with lib.maintainers; [
vdemeester
techknowlogick
+8 -7
View File
@@ -1,7 +1,7 @@
{
stdenv,
lib,
fetchFromGitHub,
fetchFromForgejo,
cargo,
desktop-file-utils,
gnome-desktop,
@@ -22,18 +22,19 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "e-imzo-manager";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "xinux-org";
src = fetchFromForgejo {
domain = "git.oss.uzinfocom.uz";
owner = "xinux";
repo = "e-imzo-manager";
tag = finalAttrs.version;
hash = "sha256-LX13zdwjlV99NziEP7PoJH8yxPV1gVQQH/L0VkuRLD4=";
hash = "sha256-QXAfrNPaq76HALhUlMdSygbfA5wJI4rGHDpnwPI/74w";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-qnwAJ0gRzIxEkkDeNqiYMB+Dvth4MugUIe9sv7c46/E=";
hash = "sha256-9yyTtMf1oCJWfFxWsaYWGT2/iTqU+3Ls0LIdHrNGZJI=";
};
strictDeps = true;
@@ -72,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/xinux-org/e-imzo-manager";
homepage = "https://git.oss.uzinfocom.uz/xinux/e-imzo-manager";
mainProgram = "E-IMZO-Manager";
description = "GTK application for managing E-IMZO keys";
license = with lib.licenses; [ agpl3Plus ];
+4 -1
View File
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
__structuredAttrs = true;
strictDeps = true;
meta = {
description = "Converter from ASCII to PostScript, HTML, or RTF";
@@ -58,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://www.gnu.org/software/enscript/";
maintainers = [ ];
maintainers = with lib.maintainers; [ aiyion ];
platforms = lib.platforms.all;
mainProgram = "enscript";
};
+2 -2
View File
@@ -15,14 +15,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fastdds";
version = "3.6.1";
version = "3.6.2";
src = fetchFromGitHub {
owner = "eProsima";
repo = "Fast-DDS";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-C9MKfQJ+8XsiSIYaB43j6xmoIyRH7h7sgEyzj1gml/8=";
hash = "sha256-17AxZwYPBhl+AyehWvNYP/if124GcmNfWJOD/yB+tgk=";
};
nativeBuildInputs = [
+10 -1
View File
@@ -6,6 +6,7 @@
doxygen,
eigen,
fetchFromGitHub,
fetchpatch,
fmt,
gts,
hdf5,
@@ -99,7 +100,15 @@ freecad-utils.makeCustomizable (
]
++ pythonDeps;
patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ];
patches = [
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
(fetchpatch {
# https://github.com/FreeCAD/FreeCAD/pull/30899
# fix COIN3D_MICRO_VERSION regex for coin 4.0.10
url = "https://github.com/FreeCAD/FreeCAD/commit/e3e56059865849c6b1c85161f69183ad872414e3.patch";
hash = "sha256-qe0wn7DwvQT/pmrSCa44+orMetztpw8DZ+NhDJEYAMw=";
})
];
postPatch = ''
substituteInPlace src/Mod/Fem/femmesh/gmshtools.py \
+2 -2
View File
@@ -9,13 +9,13 @@
}:
let
version = "4.0.5";
version = "4.1.1";
src = fetchFromGitHub {
owner = "leoafarias";
repo = "fvm";
tag = version;
hash = "sha256-NLFEGUo4Zy/OYOlbPKirN+JhbGfvzX2Eg0qB10SiGxs=";
hash = "sha256-5XQK90aJ32A74FWV9ukwg0lRmRUU62ENy2SEjwsu+Os=";
};
in
buildDartApplication {
+7
View File
@@ -4,6 +4,7 @@
fetchFromGitHub,
nix-update-script,
gitMinimal,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -27,6 +28,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
gitMinimal
];
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
];
meta = {
description = "Fast terminal workspace for staying on top of GitHub";
homepage = "https://catcoding.me/ghr/";
+3 -3
View File
@@ -12,19 +12,19 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gpauth";
version = "2.5.4";
version = "2.6.4";
src = fetchFromGitHub {
owner = "yuezk";
repo = "GlobalProtect-openconnect";
tag = "v${finalAttrs.version}";
hash = "sha256-RDfxhf0t70Ex6MfgHAX2AaWcPAwTCvjm1bQkek+92zc=";
hash = "sha256-cFzQhogahw4/LXI6B9K2xxkMitbHfZg/3/00UORiGEE=";
fetchSubmodules = true;
};
buildAndTestSubdir = "apps/gpauth";
cargoHash = "sha256-SY0PS5GxvVO1jaCNyLa3/l/v8/JT2R+4lM3W9kA7fVM=";
cargoHash = "sha256-9O9DHkn2ZG3SOnqjd5xYTNTTJ3w6yj0bs9Nl7m+rg64=";
nativeBuildInputs = [
perl
+3
View File
@@ -43,6 +43,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
"lib"
];
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
passthru.updateScript = nix-update-script { };
meta = {
+3
View File
@@ -59,6 +59,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
doCheck = true;
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
passthru = {
updateScript = nix-update-script { };
};
+3
View File
@@ -45,6 +45,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
wayland-protocols
];
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
passthru = {
updateScript = nix-update-script { };
};
@@ -51,6 +51,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
qtWrapperArgs+=(--prefix PATH : "${makeBinPath [ pciutils ]}")
'';
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
meta = {
description = "Hyprland QT/qml utility apps";
homepage = "https://github.com/hyprwm/hyprland-qtutils";
+1
View File
@@ -185,6 +185,7 @@ customStdenv.mkDerivation (finalAttrs: {
cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
dontStrip = debug;
separateDebugInfo = !debug;
strictDeps = true;
cmakeFlags = mapAttrsToList cmakeBool {
+3
View File
@@ -34,6 +34,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
doCheck = true;
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
meta = {
homepage = "https://github.com/hyprwm/hyprlang";
description = "Official implementation library for the hypr config language";
+3
View File
@@ -72,6 +72,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
ln -s $out/share/hypr/hyprlock.conf $out/etc/xdg/hypr/hyprlock.conf
'';
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
passthru.updateScript = nix-update-script { };
meta = {
+3
View File
@@ -88,6 +88,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
meta = {
inherit (finalAttrs.src.meta) homepage;
description = "Blazing fast wayland wallpaper utility";
+4 -1
View File
@@ -29,7 +29,10 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
hash = "sha256-ABumeksE8Bvtdb6g4vJ2jA9BLlYHnXU86VAuKJhBPoY=";
};
cmakeBuildType = if debug then "Debug" else "Release";
cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
dontStrip = debug;
separateDebugInfo = !debug;
nativeBuildInputs = [
cmake
+3
View File
@@ -46,6 +46,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
passthru = {
updateScript = nix-update-script { };
};
+1
View File
@@ -34,6 +34,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
];
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
passthru.updateScript = nix-update-script { };
+3
View File
@@ -31,6 +31,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
pugixml
];
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
meta = {
inherit (finalAttrs.src.meta) homepage;
description = "A fast and consistent wire protocol for IPC ";
+15 -5
View File
@@ -14,7 +14,7 @@
python3Packages.buildPythonApplication rec {
# i3pystatus moved to rolling release:
# https://github.com/enkore/i3pystatus/issues/584
version = "3.35-unstable-2025-06-24";
version = "3.35-unstable-2026-04-21";
pname = "i3pystatus";
pyproject = true;
build-system = [ python3Packages.setuptools ];
@@ -22,8 +22,8 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "enkore";
repo = "i3pystatus";
rev = "e8e03934d95658c85fa9f594987dac0481ca26c9";
hash = "sha256-uAt6jxNAUR9txyPtHS4BRtu8Z5QaP6uqFg0sROf356c=";
rev = "045d5f09220ccec1146a220619ff80b1077206a4";
hash = "sha256-K6sCII8qw0JLcMw5QVCY0RCu0O55MlEKFQXDY96V3NM=";
};
patches = [
@@ -44,12 +44,20 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = [
python3Packages.pytestCheckHook
python3Packages.mock
writableTmpDirAsHomeHook
];
checkInputs = [ python3Packages.requests ];
# Upstream tests construct ElementCall via __new__ without Module.__init__, so
# output/_output is never set (AttributeError on .output after run()).
disabledTests = [
"test_active_output"
"test_empty_output"
"test_error_output"
"test_format_includes_room_alias"
];
propagatedBuildInputs =
dependencies =
with python3Packages;
[
keyring
@@ -58,6 +66,8 @@ python3Packages.buildPythonApplication rec {
psutil
basiciw
pygobject3
requests
dbus-python
]
++ extraLibs;
+106
View File
@@ -0,0 +1,106 @@
{
lib,
buildGoModule,
fetchFromGitHub,
fetchPnpmDeps,
pnpm_10,
pnpmConfigHook,
nodejs,
stdenv,
testers,
}:
let
version = "1.34.0";
websiteRev = "159c0ac611e85ec85ffe0a8c8bf2c4a0330bdb38";
src = fetchFromGitHub {
owner = "inngest";
repo = "inngest";
tag = "v${version}";
hash = "sha256-DMJEhgKj2glNtJmsLc3oyDZr5H/COFLrcogcgaYiLjU=";
};
website = fetchFromGitHub {
owner = "inngest";
repo = "website";
rev = websiteRev;
hash = "sha256-EkTIv8jgcqzurz2M7PC6Kfh6x2Zxu7UmIhpTjlj8o88=";
};
ui = stdenv.mkDerivation (finalAttrs: {
inherit version src;
pname = "inngest-ui";
nativeBuildInputs = [
nodejs
pnpm_10
pnpmConfigHook
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
sourceRoot = "${finalAttrs.src.name}/ui";
fetcherVersion = 4;
hash = "sha256-bt/7cpN9EXf2CZFRAaybr7pgJyInV0fdUy7Rv/UcT/I=";
};
pnpmRoot = "ui";
buildPhase = ''
runHook preBuild
pnpm --filter dev-server-ui build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/dist
cp -r ui/apps/dev-server-ui/dist/. $out/dist/
runHook postInstall
'';
});
in
buildGoModule (finalAttrs: {
inherit version src;
pname = "inngest";
__structuredAttrs = true;
vendorHash = null;
preBuild = ''
cp -r ${ui}/dist/. ./pkg/devserver/static/
cp -r ${website}/. ./internal/embeddocs/website/
'';
postInstall = ''
mv $out/bin/cmd $out/bin/inngest
'';
ldflags = [
"-s"
"-w"
"-X github.com/inngest/inngest/pkg/inngest/version.Version=${version}"
];
env.CGO_ENABLED = 0;
subPackages = [ "cmd" ];
passthru = {
inherit ui website websiteRev;
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
updateScript = ./update.sh;
};
meta = {
description = "CLI and dev server for Inngest durable workflows";
homepage = "https://github.com/inngest/inngest";
changelog = "https://github.com/inngest/inngest/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.sspl;
sourceProvenance = with lib.sourceTypes; [ fromSource ];
maintainers = with lib.maintainers; [ kikos0 ];
mainProgram = "inngest";
platforms = lib.lists.remove "x86_64-darwin" lib.platforms.all;
};
})
+46
View File
@@ -0,0 +1,46 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p gh jq
# shellcheck shell=bash
set -euo pipefail
nixpkgs="$(pwd)"
cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
nix_attr() { nix eval --json --impure --expr "(import $nixpkgs {}).$1" | jq -r; }
update_hash() {
old_hash="$(nix_attr "$1.outputHash")"
new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs {}).$1; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true
sed -i "s|${old_hash}|${new_hash}|g" package.nix
echo "$1: $old_hash -> $new_hash"
}
latest=$(gh api repos/inngest/inngest/releases/latest --jq '.tag_name' | tr -d 'v')
current=$(nix_attr inngest.version)
if [[ "$current" == "$latest" ]]; then
echo "inngest is already up to date: $current"
exit 0
fi
echo "Updating inngest $current -> $latest"
sed -i "s|version = \"${current}\"|version = \"${latest}\"|" package.nix
update_hash inngest.src
old_lock=$(gh api "repos/inngest/inngest/contents/ui/pnpm-lock.yaml?ref=v${current}" --jq '.sha')
new_lock=$(gh api "repos/inngest/inngest/contents/ui/pnpm-lock.yaml?ref=v${latest}" --jq '.sha')
if [[ "$old_lock" != "$new_lock" ]]; then
update_hash inngest.ui.pnpmDeps
else
echo "pnpm lockfile unchanged, skipping"
fi
new_rev=$(gh api "repos/inngest/inngest/contents/internal/embeddocs/website?ref=v${latest}" --jq '.sha')
old_rev=$(nix_attr inngest.websiteRev)
if [[ "$old_rev" != "$new_rev" ]]; then
sed -i "s|${old_rev}|${new_rev}|" package.nix
update_hash inngest.website
else
echo "website unchanged, skipping"
fi
+2 -2
View File
@@ -5,14 +5,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "26.03";
version = "26.06";
pname = "intel-cmt-cat";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-cmt-cat";
rev = "v${finalAttrs.version}";
sha256 = "sha256-uGSWpP5CWyUpdLX5F/Lpiqbcdb0Zldeh5XSjptUqLqY=";
sha256 = "sha256-4rpmbQzxLD7FrtIzE+iE4G0sU7Dvz4rWs4MSlJqZcok=";
};
enableParallelBuilding = true;
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jujutsu";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "jj-vcs";
repo = "jj";
tag = "v${finalAttrs.version}";
hash = "sha256-wAefhpNP4ErCTTjZADpvTDk2of/XKP/MoXl6fpG7/fA=";
hash = "sha256-XgBq2ZN34iWlwKVgW7Syr46KUdt7pJuSDd/J6QWJwwQ=";
};
cargoHash = "sha256-b7/5vkO6GNX8qzJr4NcxtLZVLDc6NOMrOU4dE6LOFoE=";
cargoHash = "sha256-bEvpTd+FAHrD+CZN7+AuCuThyJ5LtufQR7OrGpjrWK0=";
nativeBuildInputs = [
installShellFiles
+2 -2
View File
@@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libbpkg";
version = "0.17.0";
version = "0.18.0";
outputs = [
"out"
"dev"
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${finalAttrs.version}.tar.gz";
hash = "sha256-4P4+uJGWB3iblYPuErJNr8c7/pS2UhN6LXr7MY2rWDY=";
hash = "sha256-ROaIgIql1oXOqiwz8giTcz0landh6rITyzX3WxR16L4=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -12,7 +12,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libbutl";
version = "0.17.0";
version = "0.18.1";
outputs = [
"out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${finalAttrs.version}.tar.gz";
hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs=";
hash = "sha256-tQl7FRJh/CJ7A5MIlxlVv5aduPy/C0shcn9l+IB1oZU=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,7 +10,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libodb-sqlite";
version = "2.5.0-b.27";
version = "2.5.0";
outputs = [
"out"
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${finalAttrs.version}.tar.gz";
hash = "sha256-jpxtY/VMkh88IzqGYgedu5TZGVIbPpy/FZNvUaOMf+w=";
url = "https://pkg.cppget.org/1/stable/odb/libodb-sqlite-${finalAttrs.version}.tar.gz";
hash = "sha256-soq3OpAlVLum65um9MkJnR4Vgm3nofpPumRRpBCFb70=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libodb";
version = "2.5.0-b.27";
version = "2.5.0";
outputs = [
"out"
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-${finalAttrs.version}.tar.gz";
hash = "sha256-04Et/wHYsWvJPLlcL0J2iOPV2SBFC6J32EleGw38K2Q=";
url = "https://pkg.cppget.org/1/stable/odb/libodb-${finalAttrs.version}.tar.gz";
hash = "sha256-cAA4pzxsvq0BESmxUDC3zdP3NRC2h/LEUEgI30IwRBs=";
};
nativeBuildInputs = [ build2 ];
+3 -3
View File
@@ -18,18 +18,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lux-cli";
version = "0.33.3";
version = "0.35.0";
src = fetchFromGitHub {
owner = "lumen-oss";
repo = "lux";
tag = "v${finalAttrs.version}";
hash = "sha256-N6BnLRI4I9PvpjSmtadtCdn5BLQIc4lsZXs9w3UQxu0=";
hash = "sha256-CHLtA9K7w10G1OM3PaXDRiYCB94OpE27lLbHD45IWRQ=";
};
buildAndTestSubdir = "lux-cli";
cargoHash = "sha256-m9vl624Vkpu0bJUtHEaEKYwdQAVJJ088X7l69C6kcP0=";
cargoHash = "sha256-FzprOAtLv3zak7qnmpB/r6MGVtU5x5hyjpUFVUQccvA=";
nativeInstallCheckInputs = [
versionCheckHook

Some files were not shown because too many files have changed in this diff Show More