Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -11,6 +11,9 @@
|
||||
|
||||
- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.
|
||||
|
||||
- `kanata` now requires `karabiner-dk` version 6.0+ or later.
|
||||
The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package.
|
||||
|
||||
- All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years.
|
||||
|
||||
- `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3.
|
||||
|
||||
+18
-177
@@ -3131,12 +3131,6 @@
|
||||
github = "beeb";
|
||||
githubId = 703631;
|
||||
};
|
||||
beezow = {
|
||||
name = "beezow";
|
||||
email = "zbeezow@gmail.com";
|
||||
github = "beezow";
|
||||
githubId = 42082156;
|
||||
};
|
||||
bellackn = {
|
||||
name = "Nico Bellack";
|
||||
email = "blcknc@pm.me";
|
||||
@@ -4109,6 +4103,12 @@
|
||||
{ fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; }
|
||||
];
|
||||
};
|
||||
cablehead = {
|
||||
email = "andy@thecablelounge.com";
|
||||
github = "cablehead";
|
||||
githubId = 1394;
|
||||
name = "Andy Gayton";
|
||||
};
|
||||
CactiChameleon9 = {
|
||||
email = "h19xjkkp@duck.com";
|
||||
github = "CactiChameleon9";
|
||||
@@ -4360,12 +4360,6 @@
|
||||
githubId = 37775;
|
||||
name = "Kirill A. Korinsky";
|
||||
};
|
||||
catern = {
|
||||
email = "sbaugh@catern.com";
|
||||
github = "catern";
|
||||
githubId = 5394722;
|
||||
name = "Spencer Baugh";
|
||||
};
|
||||
cathalmullan = {
|
||||
email = "contact@cathal.dev";
|
||||
github = "CathalMullan";
|
||||
@@ -4409,6 +4403,12 @@
|
||||
githubId = 3471749;
|
||||
name = "Claudio Bley";
|
||||
};
|
||||
cboecking = {
|
||||
email = "chuck@chuboe.com";
|
||||
github = "cboecking";
|
||||
githubId = 16024854;
|
||||
name = "Chuck Boecking";
|
||||
};
|
||||
cbrewster = {
|
||||
email = "cbrewster@hey.com";
|
||||
github = "cbrewster";
|
||||
@@ -4467,12 +4467,6 @@
|
||||
githubId = 543423;
|
||||
name = "Alex Wied";
|
||||
};
|
||||
cfhammill = {
|
||||
email = "cfhammill@gmail.com";
|
||||
github = "cfhammill";
|
||||
githubId = 7467038;
|
||||
name = "Chris Hammill";
|
||||
};
|
||||
cfouche = {
|
||||
email = "chaddai.fouche@gmail.com";
|
||||
github = "Chaddai";
|
||||
@@ -6547,12 +6541,6 @@
|
||||
githubId = 41772157;
|
||||
name = "Dict Xiong";
|
||||
};
|
||||
diegolelis = {
|
||||
email = "diego.o.lelis@gmail.com";
|
||||
github = "DiegoLelis";
|
||||
githubId = 8404455;
|
||||
name = "Diego Lelis";
|
||||
};
|
||||
diegs = {
|
||||
email = "dpontor@gmail.com";
|
||||
github = "diegs";
|
||||
@@ -6713,12 +6701,6 @@
|
||||
githubId = 28980797;
|
||||
name = "David Leslie";
|
||||
};
|
||||
dlip = {
|
||||
email = "dane@lipscombe.com.au";
|
||||
github = "dlip";
|
||||
githubId = 283316;
|
||||
name = "Dane Lipscombe";
|
||||
};
|
||||
dlugoschvincent = {
|
||||
email = "dlugoschvincent@gmail.com";
|
||||
github = "dlugoschvincent";
|
||||
@@ -6843,12 +6825,6 @@
|
||||
githubId = 53937537;
|
||||
keys = [ { fingerprint = "BBC4 C071 516B A147 8D07 F9DC D2FD E6EC 2E8C 2BF4"; } ];
|
||||
};
|
||||
doriath = {
|
||||
email = "tomasz.zurkowski@gmail.com";
|
||||
github = "doriath";
|
||||
githubId = 150959;
|
||||
name = "Tomasz Zurkowski";
|
||||
};
|
||||
doronbehar = {
|
||||
email = "me@doronbehar.com";
|
||||
github = "doronbehar";
|
||||
@@ -7411,13 +7387,6 @@
|
||||
github = "edlimerkaj";
|
||||
githubId = 71988351;
|
||||
};
|
||||
edmundmiller = {
|
||||
name = "Edmund Miller";
|
||||
email = "git@edmundmiller.dev";
|
||||
matrix = "@emiller:beeper.com";
|
||||
github = "edmundmiller";
|
||||
githubId = 20095261;
|
||||
};
|
||||
edrex = {
|
||||
email = "ericdrex@gmail.com";
|
||||
github = "edrex";
|
||||
@@ -8335,12 +8304,6 @@
|
||||
githubId = 88741530;
|
||||
name = "Fabian Rigoll";
|
||||
};
|
||||
fadenb = {
|
||||
email = "tristan.helmich+nixos@gmail.com";
|
||||
github = "fadenb";
|
||||
githubId = 878822;
|
||||
name = "Tristan Helmich";
|
||||
};
|
||||
famfo = {
|
||||
name = "famfo";
|
||||
email = "famfo+nixpkgs@famfo.xyz";
|
||||
@@ -8536,12 +8499,6 @@
|
||||
githubId = 5198058;
|
||||
name = "Udo Sauer";
|
||||
};
|
||||
ferrine = {
|
||||
email = "justferres@yandex.ru";
|
||||
github = "ferrine";
|
||||
githubId = 11705326;
|
||||
name = "Max Kochurov";
|
||||
};
|
||||
fettgoenner = {
|
||||
email = "paulmatti@protonmail.com";
|
||||
github = "fettgoenner";
|
||||
@@ -9344,12 +9301,6 @@
|
||||
githubId = 34658064;
|
||||
name = "Grace Dinh";
|
||||
};
|
||||
geluk = {
|
||||
email = "johan+nix@geluk.io";
|
||||
github = "geluk";
|
||||
githubId = 1516985;
|
||||
name = "Johan Geluk";
|
||||
};
|
||||
genericnerdyusername = {
|
||||
name = "GenericNerdyUsername";
|
||||
email = "genericnerdyusername@proton.me";
|
||||
@@ -14122,12 +14073,6 @@
|
||||
name = "Kristoffer Longva Eriksen";
|
||||
matrix = "@krisleri:pvv.ntnu.no";
|
||||
};
|
||||
kroell = {
|
||||
email = "nixosmainter@makroell.de";
|
||||
github = "rokk4";
|
||||
githubId = 17659803;
|
||||
name = "Matthias Axel Kröll";
|
||||
};
|
||||
krostar = {
|
||||
email = "alexis.destrez@pm.me";
|
||||
github = "krostar";
|
||||
@@ -14158,12 +14103,6 @@
|
||||
github = "krzaczek";
|
||||
githubId = 5773701;
|
||||
};
|
||||
KSJ2000 = {
|
||||
email = "katsho123@outlook.com";
|
||||
name = "KSJ2000";
|
||||
github = "KSJ2000";
|
||||
githubId = 184105270;
|
||||
};
|
||||
ktechmidas = {
|
||||
email = "daniel@ktechmidas.net";
|
||||
github = "ktechmidas";
|
||||
@@ -16155,12 +16094,6 @@
|
||||
githubId = 3674056;
|
||||
name = "Asad Saeeduddin";
|
||||
};
|
||||
masipcat = {
|
||||
email = "jordi@masip.cat";
|
||||
github = "masipcat";
|
||||
githubId = 775189;
|
||||
name = "Jordi Masip";
|
||||
};
|
||||
MaskedBelgian = {
|
||||
email = "michael.colicchia@imio.be";
|
||||
github = "MaskedBelgian";
|
||||
@@ -16219,12 +16152,6 @@
|
||||
}
|
||||
];
|
||||
};
|
||||
math-42 = {
|
||||
email = "matheus.4200@gmail.com";
|
||||
github = "Math-42";
|
||||
githubId = 43853194;
|
||||
name = "Matheus Vieira";
|
||||
};
|
||||
mathiassven = {
|
||||
email = "github@mathiassven.com";
|
||||
github = "MathiasSven";
|
||||
@@ -17501,6 +17428,12 @@
|
||||
githubId = 14153763;
|
||||
name = "modderme123";
|
||||
};
|
||||
mofrim = {
|
||||
email = "mofrim@posteo.de";
|
||||
github = "mofrim";
|
||||
githubId = 46672819;
|
||||
name = "mofrim";
|
||||
};
|
||||
mog = {
|
||||
email = "mog-lists@rldn.net";
|
||||
github = "mogorman";
|
||||
@@ -17628,12 +17561,6 @@
|
||||
matrix = "@motiejus:jakstys.lt";
|
||||
name = "Motiejus Jakštys";
|
||||
};
|
||||
mounium = {
|
||||
email = "muoniurn@gmail.com";
|
||||
github = "Mounium";
|
||||
githubId = 20026143;
|
||||
name = "Katona László";
|
||||
};
|
||||
mpcsh = {
|
||||
email = "m@mpc.sh";
|
||||
github = "mpcsh";
|
||||
@@ -18531,12 +18458,6 @@
|
||||
github = "ngerstle";
|
||||
githubId = 1023752;
|
||||
};
|
||||
ngiger = {
|
||||
email = "niklaus.giger@member.fsf.org";
|
||||
github = "ngiger";
|
||||
githubId = 265800;
|
||||
name = "Niklaus Giger";
|
||||
};
|
||||
nh2 = {
|
||||
email = "mail@nh2.me";
|
||||
matrix = "@nh2:matrix.org";
|
||||
@@ -19344,12 +19265,6 @@
|
||||
githubId = 123140;
|
||||
name = "Oliver Breitwieser";
|
||||
};
|
||||
obsidian-systems-maintenance = {
|
||||
name = "Obsidian Systems Maintenance";
|
||||
email = "maintainer@obsidian.systems";
|
||||
github = "obsidian-systems-maintenance";
|
||||
githubId = 80847921;
|
||||
};
|
||||
obsoleszenz = {
|
||||
name = "obsoleszenz";
|
||||
email = "obsoleszenz@riseup.net";
|
||||
@@ -20210,12 +20125,6 @@
|
||||
githubId = 1368952;
|
||||
name = "Pedro Lara Campos";
|
||||
};
|
||||
peefy = {
|
||||
email = "xpf6677@gmail.com";
|
||||
github = "Peefy";
|
||||
githubId = 22744597;
|
||||
name = "Peefy";
|
||||
};
|
||||
peelz = {
|
||||
email = "peelz.dev+nixpkgs@gmail.com";
|
||||
github = "notpeelz";
|
||||
@@ -20282,12 +20191,6 @@
|
||||
githubId = 722550;
|
||||
name = "Peter Hoeg";
|
||||
};
|
||||
peterromfeldhk = {
|
||||
email = "peter.romfeld.hk@gmail.com";
|
||||
github = "peterromfeldhk";
|
||||
githubId = 5515707;
|
||||
name = "Peter Romfeld";
|
||||
};
|
||||
petersjt014 = {
|
||||
email = "petersjt014@gmail.com";
|
||||
github = "petersjt014";
|
||||
@@ -23363,12 +23266,6 @@
|
||||
githubId = 15986681;
|
||||
name = "Simon Bruder";
|
||||
};
|
||||
scalavision = {
|
||||
email = "scalavision@gmail.com";
|
||||
github = "scalavision";
|
||||
githubId = 3958212;
|
||||
name = "Tom Sorlie";
|
||||
};
|
||||
scd31 = {
|
||||
name = "scd31";
|
||||
github = "scd31";
|
||||
@@ -24411,11 +24308,6 @@
|
||||
githubId = 116099351;
|
||||
name = "Skylar";
|
||||
};
|
||||
slam-bert = {
|
||||
github = "slam-bert";
|
||||
githubId = 106779009;
|
||||
name = "Slambert";
|
||||
};
|
||||
slashformotion = {
|
||||
github = "slashformotion";
|
||||
githubId = 45801817;
|
||||
@@ -24742,13 +24634,6 @@
|
||||
githubId = 950799;
|
||||
name = "Tomasz Czyż";
|
||||
};
|
||||
spitulax = {
|
||||
name = "Bintang Adiputra Pratama";
|
||||
email = "bintangadiputrapratama@gmail.com";
|
||||
github = "spitulax";
|
||||
githubId = 96517350;
|
||||
keys = [ { fingerprint = "652F FAAD 5CB8 AF1D 3F96 9521 929E D6C4 0414 D3F5"; } ];
|
||||
};
|
||||
spk = {
|
||||
email = "laurent@spkdev.net";
|
||||
github = "spk";
|
||||
@@ -24962,14 +24847,6 @@
|
||||
githubId = 55607356;
|
||||
name = "Stephan Heßelmann";
|
||||
};
|
||||
steinybot = {
|
||||
name = "Jason Pickens";
|
||||
email = "jasonpickensnz@gmail.com";
|
||||
matrix = "@steinybot:matrix.org";
|
||||
github = "steinybot";
|
||||
githubId = 4659562;
|
||||
keys = [ { fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; } ];
|
||||
};
|
||||
stelcodes = {
|
||||
email = "stel@stel.codes";
|
||||
github = "stelcodes";
|
||||
@@ -26685,12 +26562,6 @@
|
||||
githubId = 6740669;
|
||||
name = "Tom Smeets";
|
||||
};
|
||||
tonyshkurenko = {
|
||||
email = "support@twingate.com";
|
||||
github = "antonshkurenko";
|
||||
githubId = 8597964;
|
||||
name = "Anton Shkurenko";
|
||||
};
|
||||
toonn = {
|
||||
email = "nixpkgs@toonn.io";
|
||||
matrix = "@toonn:matrix.org";
|
||||
@@ -27211,13 +27082,6 @@
|
||||
name = "Kevin Brubeck Unhammer";
|
||||
keys = [ { fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; } ];
|
||||
};
|
||||
uniquepointer = {
|
||||
email = "uniquepointer@mailbox.org";
|
||||
matrix = "@uniquepointer:matrix.org";
|
||||
github = "uniquepointer";
|
||||
githubId = 71751817;
|
||||
name = "uniquepointer";
|
||||
};
|
||||
unode = {
|
||||
email = "alves.rjc@gmail.com";
|
||||
matrix = "@renato_alves:matrix.org";
|
||||
@@ -27550,12 +27414,6 @@
|
||||
github = "victormeriqui";
|
||||
githubId = 1396008;
|
||||
};
|
||||
vidbina = {
|
||||
email = "vid@bina.me";
|
||||
github = "vidbina";
|
||||
githubId = 335406;
|
||||
name = "David Asabina";
|
||||
};
|
||||
videl = {
|
||||
email = "thibaut.smith@mailbox.org";
|
||||
github = "videl";
|
||||
@@ -28911,11 +28769,6 @@
|
||||
{ fingerprint = "D2A8 A906 ACA7 B6D6 575E 9A2F 3A49 5054 6EA6 9E5C"; }
|
||||
];
|
||||
};
|
||||
yomaq = {
|
||||
name = "yomaq";
|
||||
github = "yomaq";
|
||||
githubId = 112864332;
|
||||
};
|
||||
yorickvp = {
|
||||
email = "yorickvanpelt@gmail.com";
|
||||
matrix = "@yorickvp:matrix.org";
|
||||
@@ -29207,12 +29060,6 @@
|
||||
github = "zazedd";
|
||||
githubId = 93401987;
|
||||
};
|
||||
zbioe = {
|
||||
name = "Iury Fukuda";
|
||||
email = "zbioe@protonmail.com";
|
||||
github = "zbioe";
|
||||
githubId = 7332055;
|
||||
};
|
||||
zebradil = {
|
||||
email = "german.lashevich+nixpkgs@gmail.com";
|
||||
github = "zebradil";
|
||||
@@ -29406,12 +29253,6 @@
|
||||
githubId = 6067895;
|
||||
name = "Al Zohali";
|
||||
};
|
||||
zokrezyl = {
|
||||
email = "zokrezyl@gmail.com";
|
||||
github = "zokrezyl";
|
||||
githubId = 51886259;
|
||||
name = "Zokre Zyl";
|
||||
};
|
||||
zookatron = {
|
||||
email = "tim@zookatron.com";
|
||||
github = "zookatron";
|
||||
|
||||
@@ -640,7 +640,6 @@ with lib.maintainers;
|
||||
matrix = {
|
||||
members = [
|
||||
ma27
|
||||
fadenb
|
||||
mguentner
|
||||
dandellion
|
||||
nickcao
|
||||
|
||||
@@ -36,6 +36,5 @@ in
|
||||
|
||||
meta = {
|
||||
doc = ./default.md;
|
||||
maintainers = with lib.maintainers; [ vidbina ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -52,6 +52,11 @@ in
|
||||
User = "slimserver";
|
||||
# Issue 40589: Disable broken image/video support (audio still works!)
|
||||
ExecStart = "${lib.getExe cfg.package} --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo";
|
||||
# Allow only IPv4 since slimserver breaks with IPv6
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -29,9 +29,7 @@ in
|
||||
capabilities = "cap_dac_override+p";
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = lib.getExe (
|
||||
pkgs.espanso-wayland.override { securityWrapperPath = config.security.wrapperDir; }
|
||||
);
|
||||
source = lib.getExe (cfg.package.override { securityWrapperPath = config.security.wrapperDir; });
|
||||
};
|
||||
systemd.user.services.espanso = {
|
||||
description = "Espanso daemon";
|
||||
|
||||
@@ -22,7 +22,6 @@ in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
jbedo
|
||||
cfhammill
|
||||
];
|
||||
|
||||
options.services.rstudio-server = {
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
name = "rstudio-server-test";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [
|
||||
jbedo
|
||||
cfhammill
|
||||
];
|
||||
|
||||
nodes.machine =
|
||||
|
||||
@@ -150,7 +150,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [
|
||||
atinba
|
||||
ilian
|
||||
uniquepointer
|
||||
viraptor
|
||||
];
|
||||
};
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
"meta": {
|
||||
"isOpenSource": true,
|
||||
"description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains",
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ],
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ],
|
||||
"longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.",
|
||||
"homepage": "https://www.jetbrains.com/idea/"
|
||||
}
|
||||
@@ -85,7 +85,7 @@
|
||||
"meta": {
|
||||
"isOpenSource": false,
|
||||
"description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains",
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ],
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ],
|
||||
"longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.",
|
||||
"homepage": "https://www.jetbrains.com/idea/"
|
||||
}
|
||||
|
||||
@@ -46,7 +46,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
description = "Official VSCode plugin for ReScript";
|
||||
homepage = "https://github.com/rescript-lang/rescript-vscode";
|
||||
maintainers = [
|
||||
lib.maintainers.dlip
|
||||
lib.maintainers.jayesh-bhoot
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
-1
@@ -35,7 +35,6 @@ ocamlPackages.buildDunePackage rec {
|
||||
homepage = "https://github.com/rescript-lang/rescript-vscode";
|
||||
changelog = "https://github.com/rescript-lang/rescript-vscode/releases/tag/${version}";
|
||||
maintainers = with lib.maintainers; [
|
||||
dlip
|
||||
jayesh-bhoot
|
||||
RossSmyth
|
||||
];
|
||||
|
||||
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/your-editor/yed/blob/${version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [ mit ];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ uniquepointer ];
|
||||
mainProgram = "yed";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -81,14 +81,14 @@ let
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.40.12";
|
||||
version = "3.40.13";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-QsAiE3HC71lGsdUKW9QZ5gCLCRsOCCM2IR3MKJlJ0vk=";
|
||||
hash = "sha256-2VPgD7ycj26cTpl16BSEukNEuUXtP25HwG2fRWBXNrU=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -150,9 +150,6 @@ mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://digitalbitbox.com/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
vidbina
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -62,7 +62,6 @@ let
|
||||
maintainers = with maintainers; [
|
||||
offline
|
||||
zimbatm
|
||||
diegolelis
|
||||
yurrriq
|
||||
];
|
||||
};
|
||||
|
||||
@@ -71,6 +71,5 @@ buildGoModule rec {
|
||||
homepage = "https://kuma.io/";
|
||||
changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ zbioe ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1003,13 +1003,13 @@
|
||||
"vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
|
||||
},
|
||||
"okta_okta": {
|
||||
"hash": "sha256-CZSh4NEFC3cT9/WoOrIFHx3RAt3q70Fmd0/bEU1aJTU=",
|
||||
"hash": "sha256-vrH7PS6ZHFYMnzq6ApFMV31guaIxj6G7/YhB+EdoS6k=",
|
||||
"homepage": "https://registry.terraform.io/providers/okta/okta",
|
||||
"owner": "okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v6.5.0",
|
||||
"rev": "v6.5.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-YFxDfmWjB8QWBqX0KHlsr6DyzAEhkSFm/VaEmH1+VYg="
|
||||
"vendorHash": "sha256-ZrjjQCpFE4f8oBd+YGClaG68W/Tx1fnRikHmHLtOg+k="
|
||||
},
|
||||
"oktadeveloper_oktaasa": {
|
||||
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"linux-canary": {
|
||||
"hash": "sha256-302oXjbkWNHaYQBUY1ZaY9f+7a5hJlesyLUMhZZCU/4=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.814/discord-canary-0.0.814.tar.gz",
|
||||
"version": "0.0.814"
|
||||
"hash": "sha256-hhrjKkXnhHm8gntPMGjst1eLu8xqube73lnbW5TEINY=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.819/discord-canary-0.0.819.tar.gz",
|
||||
"version": "0.0.819"
|
||||
},
|
||||
"linux-development": {
|
||||
"hash": "sha256-oG50YrXQUCnbn+rO0EeRjixeqvXYBdnyqdomdPfxfos=",
|
||||
"url": "https://development.dl2.discordapp.net/apps/linux/0.0.92/discord-development-0.0.92.tar.gz",
|
||||
"version": "0.0.92"
|
||||
"hash": "sha256-1zlRLOxWUA7QNAMi2SRWCdnx1dbmkwWQSCl7Pyexoac=",
|
||||
"url": "https://development.dl2.discordapp.net/apps/linux/0.0.93/discord-development-0.0.93.tar.gz",
|
||||
"version": "0.0.93"
|
||||
},
|
||||
"linux-ptb": {
|
||||
"hash": "sha256-uz3QNIDzmB/4aLNRNgB1wzpNJlc8ous8aUvcqGaHE7c=",
|
||||
@@ -15,14 +15,14 @@
|
||||
"version": "0.0.168"
|
||||
},
|
||||
"linux-stable": {
|
||||
"hash": "sha256-PFJQV0+bYe5UhH17/pHaUEEO5xFJL/KfaGkHziNhCVk=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.116/discord-0.0.116.tar.gz",
|
||||
"version": "0.0.116"
|
||||
"hash": "sha256-PN1E8GjVopEPGW9ISb0y1Lo7nnj30CXylW0nTR1Pc6U=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.117/discord-0.0.117.tar.gz",
|
||||
"version": "0.0.117"
|
||||
},
|
||||
"osx-canary": {
|
||||
"hash": "sha256-r4MwAQps86XBKlMy9nFx0MD0Sjo9zmuB4aX4iaEWTfA=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.919/DiscordCanary.dmg",
|
||||
"version": "0.0.919"
|
||||
"hash": "sha256-bBimaZYUjkd7MwiqJiNjgQpiBOEUAVhTFOoQ/cnR+K0=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.923/DiscordCanary.dmg",
|
||||
"version": "0.0.923"
|
||||
},
|
||||
"osx-development": {
|
||||
"hash": "sha256-x4i/bbaR4XjzyZGkVerUl8oxxhm01A+2tpN+UEtKwwc=",
|
||||
@@ -35,8 +35,8 @@
|
||||
"version": "0.0.200"
|
||||
},
|
||||
"osx-stable": {
|
||||
"hash": "sha256-G0jSuUgX05fqk4dmiJTqpbsIh7lnTRxcron989/diw0=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.368/Discord.dmg",
|
||||
"version": "0.0.368"
|
||||
"hash": "sha256-k4S9UyO2GLmT/nnR1BUcUVjhFvxjGeQv2tbuZzEh8Ro=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.369/Discord.dmg",
|
||||
"version": "0.0.369"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,9 +36,6 @@ let
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [
|
||||
vidbina
|
||||
];
|
||||
}
|
||||
// (attrs.meta or { });
|
||||
|
||||
|
||||
@@ -162,7 +162,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${finalAttrs.version}/debian/changelog";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
masipcat
|
||||
zhaofengli
|
||||
armelclo
|
||||
];
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
pkg-config,
|
||||
pnpm,
|
||||
|
||||
alsa-lib,
|
||||
glib-networking,
|
||||
libappindicator-gtk3,
|
||||
openssl,
|
||||
@@ -18,27 +19,28 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "atuin-desktop";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jBCf6Wq7xTgI2VjhQ+RZ3uN7LVh+ZlQ3TDJ0epsGj0M=";
|
||||
hash = "sha256-XuPbfD6yEt82kHOIiKyxXyKcOkXEF/AsuE7Cde6QNNA=";
|
||||
};
|
||||
|
||||
cargoRoot = "./.";
|
||||
cargoHash = "sha256-329uNcc8LSNreD8CgPCpEhGCR2PebpmFoaRwZn+oscE=";
|
||||
cargoHash = "sha256-nmxF7IKmdLr2l6y///7pqcEBe7ijTYWSmB3cy6tTf9E=";
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-2i1mL4HwwiXrmM1qaWvHhm27U2/oElbOpnXh09ziamo=";
|
||||
hash = "sha256-Tdcdghhc4cH+cYIeUy3inChgPfb1i9E7F1mpxxWoW4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
pnpm.configHook
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
nodejs
|
||||
pkg-config
|
||||
@@ -46,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
glib-networking
|
||||
libappindicator-gtk3
|
||||
openssl
|
||||
|
||||
@@ -21,16 +21,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "23.2.0";
|
||||
version = "23.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T4eOiFpU17vAwAM02gwJq93ZtJQUC7bv0CCFpj4NKEA=";
|
||||
hash = "sha256-HAcsFGLUUaeNxEBAFgYjDipu8QTsd+8yptC6kAX0C4g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-kRkc3o8xmROlH17GI3yoGvMwEweHrLeGpvW3rH0wOSU=";
|
||||
npmDepsHash = "sha256-dT5WrrzrO5tcP4/NFe5WTG7boYTOlFRNut52X2AWaao=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -81,7 +81,6 @@ appimageTools.wrapAppImage {
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
jshcmpbll
|
||||
edmundmiller
|
||||
zh4ngx
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "binaryninja-free";
|
||||
version = "5.1.8104";
|
||||
version = "5.2.8614";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Vector35/binaryninja-api/releases/download/stable/${finalAttrs.version}/binaryninja_free_linux.zip";
|
||||
hash = "sha256-s7lRvQhegW/bgZc6XnAowTl1ZZPIN0/BJe+u3p9qHsE=";
|
||||
hash = "sha256-Z7hI0WTOseEgM/opZLxSGCnHYXiliEWksA1FpICLRPQ=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
@@ -67,12 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xcbutilwm
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
# Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108
|
||||
mkdir -p "$out/lib"
|
||||
ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/lib/libxml2.so.2"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "biome";
|
||||
version = "2.3.6";
|
||||
version = "2.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "@biomejs/biome@${finalAttrs.version}";
|
||||
hash = "sha256-wi0dkD9AlMYyGS/y96FMCOJKjRuo0b4pHpva+R1W3Yg=";
|
||||
hash = "sha256-pNWwFrI0EWY8HB8aCZdZ/Y+LJl3MS4vl0HhpYFEGUbY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GCwJdO43Q5cRw3w1omuIpSxvINN51dJez7Jq4/FQF+A=";
|
||||
cargoHash = "sha256-gafj1Gm3YUVpLgZXN5lMRvEFo6GEHbmWbNDm+0OTi8w=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec {
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
click
|
||||
dulwich
|
||||
grpcio
|
||||
jinja2
|
||||
markupsafe
|
||||
@@ -55,10 +54,8 @@ python3Packages.buildPythonApplication rec {
|
||||
protobuf
|
||||
psutil
|
||||
pyroaring
|
||||
requests
|
||||
ruamel-yaml
|
||||
ruamel-yaml-clib
|
||||
tomlkit
|
||||
ujson
|
||||
])
|
||||
++ lib.optionals enableBuildstreamPlugins [
|
||||
|
||||
@@ -13,19 +13,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bumpp";
|
||||
version = "10.3.1";
|
||||
version = "10.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antfu-collective";
|
||||
repo = "bumpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-krJzPHlGgtEukOlSX0sXfCwXmdItDLhf6hS+zamNrN4=";
|
||||
hash = "sha256-1hGVLPogdeyWh/B2Yxfo/9YbJpFYl8ATh+QCa2VVyyk=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-N6boJiwq5G4L/vOqp+GoYWtSI1sYScYadxXueeJgGMo=";
|
||||
hash = "sha256-y7uHDtoOjsLnNF47r4aWHYXW0ui8shhn1M0cD2FpaCg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,6 +28,5 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/sainnhe/capitaine-cursors";
|
||||
license = licenses.lgpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.math-42 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ let
|
||||
"kvantum"
|
||||
"lazygit"
|
||||
"lxqt"
|
||||
"palette"
|
||||
"plymouth"
|
||||
"qt5ct"
|
||||
"refind"
|
||||
@@ -144,6 +145,14 @@ let
|
||||
hash = "sha256-3TuUkOwk6BSc7BnLnTowGAkSlNTOtGTRlEcjJ6MNJ5g=";
|
||||
};
|
||||
|
||||
palette = fetchFromGitHub {
|
||||
name = "palette";
|
||||
owner = "catppuccin";
|
||||
repo = "palette";
|
||||
rev = "0df7db6fe201b437d91e7288fa22807bb0e44701";
|
||||
hash = "sha256-R52Q1FVAclvBk7xNgj/Jl+GPCIbORNf6YbJ1nxH3Gzs=";
|
||||
};
|
||||
|
||||
plymouth = fetchFromGitHub {
|
||||
name = "plymouth";
|
||||
owner = "catppuccin";
|
||||
@@ -233,43 +242,43 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO
|
||||
''
|
||||
+ lib.optionalString (lib.elem "alacritty" themeList) ''
|
||||
mkdir -p "$out/alacritty"
|
||||
cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty/"
|
||||
cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "bat" themeList) ''
|
||||
mkdir -p "$out/bat"
|
||||
cp "${sources.bat}/themes/Catppuccin "$capitalizedVariant".tmTheme" "$out/bat/"
|
||||
cp "${sources.bat}/themes/Catppuccin $capitalizedVariant.tmTheme" "$out/bat"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "btop" themeList) ''
|
||||
mkdir -p "$out/btop"
|
||||
cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/"
|
||||
cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "bottom" themeList) ''
|
||||
mkdir -p "$out/bottom"
|
||||
cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/"
|
||||
cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "element" themeList) ''
|
||||
mkdir -p "$out/element"
|
||||
cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element/"
|
||||
cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "grub" themeList) ''
|
||||
mkdir -p "$out/grub"
|
||||
cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme/"* "$out/grub/"
|
||||
cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme"/* "$out/grub"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "hyprland" themeList) ''
|
||||
mkdir -p "$out/hyprland"
|
||||
cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/"
|
||||
cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "k9s" themeList) ''
|
||||
mkdir -p "$out/k9s"
|
||||
cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s/"
|
||||
cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s/"
|
||||
cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s"
|
||||
cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "kvantum" themeList) ''
|
||||
@@ -278,37 +287,42 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "lazygit" themeList) ''
|
||||
mkdir -p "$out/lazygit/"{themes,themes-mergable}
|
||||
cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes/"
|
||||
cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable/"
|
||||
mkdir -p "$out/lazygit"/themes{,-mergable}
|
||||
cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes"
|
||||
cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "lxqt" themeList) ''
|
||||
mkdir -p "$out/share/lxqt/themes/catppuccin-${variant}"
|
||||
cp -r "${sources.lxqt}/src/catppuccin-${variant}/"* "$out/share/lxqt/themes/catppuccin-${variant}"
|
||||
cp -r "${sources.lxqt}/src/catppuccin-${variant}"/* "$out/share/lxqt/themes/catppuccin-${variant}"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "palette" themeList) ''
|
||||
mkdir -p "$out/palette"
|
||||
cp "${sources.palette}/palette.json" "$out/palette"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "plymouth" themeList) ''
|
||||
mkdir -p "$out/share/plymouth/themes/catppuccin-${variant}"
|
||||
cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant}
|
||||
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth
|
||||
cp "${sources.plymouth}/themes/catppuccin-${variant}"/* "$out/share/plymouth/themes/catppuccin-${variant}"
|
||||
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' "$out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "qt5ct" themeList) ''
|
||||
mkdir -p "$out/qt5ct"
|
||||
cp "${sources.qt5ct}/themes/catppuccin-${variant}-${accent}.conf" "$out/qt5ct"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "rofi" themeList) ''
|
||||
mkdir -p "$out/rofi"
|
||||
cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "refind" themeList) ''
|
||||
mkdir -p "$out/refind/assets"
|
||||
cp "${sources.refind}/${variant}.conf" "$out/refind"
|
||||
cp -r "${sources.refind}/assets/${variant}" "$out/refind/assets"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "rofi" themeList) ''
|
||||
mkdir -p "$out/rofi"
|
||||
cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.elem "starship" themeList) ''
|
||||
mkdir -p "$out/starship"
|
||||
|
||||
@@ -53,7 +53,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/mrtazz/checkmake";
|
||||
changelog = "https://github.com/mrtazz/checkmake/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vidbina ];
|
||||
longDescription = ''
|
||||
checkmake is an experimental tool for linting and checking
|
||||
Makefiles. It may not do what you want it to.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.10.3.100-stable";
|
||||
rev = "1e703eae565a020b055213f9cecd60fb277263d2";
|
||||
hash = "sha256-cElRzd/NLPpmNl/J89hmsg4JtFY4jmFLIbK6F8tuYnA=";
|
||||
version = "25.11.1.558-stable";
|
||||
rev = "16f22f3d744fe760e05f288124b1f32f539a35aa";
|
||||
hash = "sha256-PJVw53iueh9kjWn7R7rgSVHokZq1Ot5GhRM1uSNY6o8=";
|
||||
lts = false;
|
||||
}
|
||||
|
||||
@@ -21,9 +21,6 @@ bundlerApp {
|
||||
homepage = "https://github.com/CocoaPods/CocoaPods";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [
|
||||
peterromfeldhk
|
||||
];
|
||||
mainProgram = "pod";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.21.5";
|
||||
version = "1.22.1";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
# vendored. See
|
||||
@@ -22,7 +22,7 @@ buildGoModule rec {
|
||||
owner = "hashicorp";
|
||||
repo = "consul";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-x5e0DhJ3qMh51E+bEIzl0JmH7bvdicVgOa0l1Qix9vI=";
|
||||
hash = "sha256-WlaJtiFlfLpdMATWHPbMneCqKzNcIRJrlf5TlbZgH8U=";
|
||||
};
|
||||
|
||||
# This corresponds to paths with package main - normally unneeded but consul
|
||||
@@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
"connect/certgen"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-PZtLz7jqtqYcBO/xrE/tE4vqNstLq9Iv20eWnW5xloQ=";
|
||||
vendorHash = "sha256-QthyylbEkyfDPJIzIyL4u+d92MTZxIjZHBW39AZKmzo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cspell";
|
||||
version = "9.3.2";
|
||||
version = "9.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "streetsidesoftware";
|
||||
repo = "cspell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XF94Bkxx+OAEldRD4L8TBokuzgGil0LaPBUbNBiEcVE=";
|
||||
hash = "sha256-sTH7JG1bHiMhOEVomTwH4TdeqOuTC9iy4mehVyd4Ewo=";
|
||||
};
|
||||
|
||||
pnpmWorkspaces = [ "cspell..." ];
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmWorkspaces
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-lp3rXW16/w3ZPXTg/B951SL/WN+QpUQLPjlvc6QaU20=";
|
||||
hash = "sha256-GgcqgnrBoWu0paVSyTPfZIsGaPEH+EADBYoiZzlVrs8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Command-line CSV to LaTeX file converter";
|
||||
homepage = "http://brouits.free.fr/csv2latex/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.catern ];
|
||||
mainProgram = "csv2latex";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -61,6 +61,5 @@ python3Packages.buildPythonApplication rec {
|
||||
mit
|
||||
bsd3
|
||||
];
|
||||
maintainers = with lib.maintainers; [ scalavision ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Structural variant caller for mapped DNA sequenced data";
|
||||
mainProgram = "delly";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ scalavision ];
|
||||
platforms = platforms.unix;
|
||||
longDescription = ''
|
||||
Delly is an integrated structural variant (SV) prediction method
|
||||
|
||||
@@ -12,20 +12,20 @@
|
||||
}:
|
||||
let
|
||||
pname = "dependabot-cli";
|
||||
version = "1.78.1";
|
||||
version = "1.79.0";
|
||||
|
||||
# `tag` is what `dependabot` uses to find the relevant docker images.
|
||||
tag = "nixpkgs-dependabot-cli-${version}";
|
||||
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
|
||||
updateJobProxy.imageDigest = "sha256:53f33581efa03f1ed691b44896b231923888ba24b0e12cdc440aac2333d532c5";
|
||||
updateJobProxy.hash = "sha256-M7vf5YS4ORG0TY+iHXL6nNAJhwgtO4PZbO4EEBBT6qo=";
|
||||
updateJobProxy.imageDigest = "sha256:e3361d9ba33ffcb1c72b2ac9feba766f0e941b0bf2b692029948f60262708ffa";
|
||||
updateJobProxy.hash = "sha256-1TPyyD2a4IN9UoAEZJCHFiOhsP/vIowuy0WfgSmRHpI=";
|
||||
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
|
||||
updaterGitHubActions.imageDigest = "sha256:a719a18ffb9aa87dba253be94e137ba7561fdf59f60d9a67c3ebc840ab2058a7";
|
||||
updaterGitHubActions.hash = "sha256-nb8uX3pu+m7cu6Owi9EnWmUT4Epr4yXScSIFBR/Kb6Q=";
|
||||
updaterGitHubActions.imageDigest = "sha256:01cad8bab547d5041cf11cb2f0287f091695d5971d3f7fb93b97817727093a2c";
|
||||
updaterGitHubActions.hash = "sha256-whFMv7MeyKeFmCDaoG6CxxENcHDC4HNmuNuA3AQTJJI=";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -34,7 +34,7 @@ buildGoModule {
|
||||
owner = "dependabot";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q6WZ7FrcEGfUfG/3Zx8Z4Jd+CB6pEcw1fDo3AF8ML4M=";
|
||||
hash = "sha256-JHuqgurzEO5XA7OHP32X9DcFpZbjbn/h5fZJXCUmOdE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0=";
|
||||
|
||||
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Lekensteyn/dmg2img";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ KSJ2000 ];
|
||||
mainProgram = "dmg2img";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Tool for those who are interested in hacking MIB2 firmware";
|
||||
homepage = "https://github.com/askac/dumpifs";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ KSJ2000 ];
|
||||
mainProgram = "dumpifs";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "eask-cli";
|
||||
version = "0.11.9";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eask";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-yI227/ZC+4qyg/H+4yuv1imuwIyCB8wDZ7Z3f0OPqXI=";
|
||||
hash = "sha256-W7RteTkfQMOxMTfEfDr9cQCXpQ3yPExLwdlrh7iR0EI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-v1o9ZSA+WRYjj2bH+w3lOCXbzqHvsHuvOejU8Ea9PR8=";
|
||||
npmDepsHash = "sha256-C/5PZv732ZrnGXrlrWZmjJzdyJ+tGAJ5UAw96hh6gaU=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ peterromfeldhk ];
|
||||
mainProgram = "elasticmq-server";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/emuflight/EmuConfigurator";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ beezow ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"name": "external_editor_revived",
|
||||
"description": "Edit emails in external editors such as Vim, Neovim, Emacs, etc.",
|
||||
"path": "@OUT@/bin/external-editor-revived",
|
||||
"type": "stdio",
|
||||
"allowed_extensions": [
|
||||
"external-editor-revived@tsundere.moe"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "external-editor-revived";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Frederick888";
|
||||
repo = "external-editor-revived";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-K5agRpFJ8iqvPnx3IIMTvrkObT/GB962EtdvWf7Eq4w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QYSsdEBNwjpR7lppyOcsc0F8ombBY+dlFRY1GO/D8so=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/lib/mozilla/native-messaging-hosts"
|
||||
substitute '${./native-messaging.json}' "$out/lib/mozilla/native-messaging-hosts/external_editor_revived.json" \
|
||||
--replace-fail "@OUT@" "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Native messaging host for the Thunderbird addon allowing to edit mails in external programs";
|
||||
homepage = "https://github.com/Frederick888/external-editor-revived";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ mofrim ];
|
||||
mainProgram = "external-editor-revived";
|
||||
};
|
||||
}
|
||||
@@ -24,7 +24,6 @@ bundlerApp {
|
||||
homepage = "https://fastlane.tools/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
peterromfeldhk
|
||||
nicknovitski
|
||||
shahrukh330
|
||||
];
|
||||
|
||||
@@ -39,7 +39,6 @@ stdenv.mkDerivation {
|
||||
description = "Small desktop application launcher with reasonable memory footprint";
|
||||
homepage = "https://codeberg.org/Chuvok/fehlstart";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.mounium ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fehlstart";
|
||||
};
|
||||
|
||||
@@ -64,7 +64,6 @@ stdenv.mkDerivation rec {
|
||||
# ‘GPL3-compatible’. See ${downloadPage} for detailed information.
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.vidbina ];
|
||||
mainProgram = "ganttproject";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
diff --git a/host/BorrowedImage.h b/host/BorrowedImage.h
|
||||
index ed2890568..51ea2b6b1 100644
|
||||
--- a/host/BorrowedImage.h
|
||||
+++ b/host/BorrowedImage.h
|
||||
@@ -12,6 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
+#include <cstdint>
|
||||
#pragma once
|
||||
|
||||
namespace gfxstream {
|
||||
diff --git a/host/compressedTextureFormats/AstcCpuDecompressor.h b/host/compressedTextureFormats/AstcCpuDecompressor.h
|
||||
index 4823ee255..3af0bdc64 100644
|
||||
--- a/host/compressedTextureFormats/AstcCpuDecompressor.h
|
||||
+++ b/host/compressedTextureFormats/AstcCpuDecompressor.h
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
|
||||
namespace gfxstream {
|
||||
namespace vk {
|
||||
diff --git a/host/magma/DrmContext.h b/host/magma/DrmContext.h
|
||||
index db3ef45e4..5030c7dd6 100644
|
||||
--- a/host/magma/DrmContext.h
|
||||
+++ b/host/magma/DrmContext.h
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
+#include <cstdint>
|
||||
|
||||
#include "aemu/base/Compiler.h"
|
||||
|
||||
diff --git a/host/vulkan/BufferVk.h b/host/vulkan/BufferVk.h
|
||||
index 9016fd745..a8a3fe3eb 100644
|
||||
--- a/host/vulkan/BufferVk.h
|
||||
+++ b/host/vulkan/BufferVk.h
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
+#include <cstdint>
|
||||
|
||||
namespace gfxstream {
|
||||
namespace vk {
|
||||
|
||||
@@ -25,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-AN6OpZQ2te4iVuh/kFHXzmLAWIMyuoj9FHTVicnbiPw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with gcc15
|
||||
./gfxstream-add-include-cstdint.patch
|
||||
];
|
||||
|
||||
# Ensure that meson can find an Objective-C compiler on Darwin.
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace meson.build \
|
||||
|
||||
@@ -49,7 +49,6 @@ buildGoModule rec {
|
||||
'';
|
||||
homepage = "https://github.com/gabrie30/ghorg";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ vidbina ];
|
||||
mainProgram = "ghorg";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.pc-tools.net/unix/grepcidr/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.fadenb ];
|
||||
mainProgram = "grepcidr";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Command line tool for interacting with grpc services";
|
||||
homepage = "https://github.com/grpc/grpc";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ doriath ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "grpc_cli";
|
||||
};
|
||||
|
||||
@@ -115,7 +115,6 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
luftmensch-luftmensch
|
||||
math-42
|
||||
d3vil0p3r
|
||||
];
|
||||
};
|
||||
|
||||
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://r-wos.org/hacks/gti";
|
||||
license = licenses.mit;
|
||||
description = "Humorous typo-based git runner; drives a car over the terminal";
|
||||
maintainers = with maintainers; [ fadenb ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "gti";
|
||||
};
|
||||
|
||||
@@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/noraj/haiti";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "haiti";
|
||||
maintainers = with lib.maintainers; [ KSJ2000 ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/hashcat/hashcat-utils";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fadenb ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-ls";
|
||||
version = "0.4.1";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjosh";
|
||||
repo = "helm-ls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z+gSD7kcDxgJPoYQ7HjokJONjgAAuIIkg1VGyV3v01k=";
|
||||
hash = "sha256-4M2o/M8mnO+9QwsjsGahY3i/pwtsNdCMCn5oCFGm0aI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w/BWPbpSYum0SU8PJj76XiLUjTWO4zNQY+khuLRK0O8=";
|
||||
vendorHash = "sha256-4zQy7PFC41iBVKvDRaW2zUnUzCSQmjAmyKsdnLDUHJ8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
stdenvNoCC,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "http-nu";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cablehead";
|
||||
repo = "http-nu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ri0/HnTINXGrdzh26uT+JD32sbKLnbzq8ps2+LUbbI8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C4VYE6dLHwYaJ9LI4A+R1AvK3Qu8lV2ISy+8ymFKQg8=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
# Most tests require sandbox-incompatible operations:
|
||||
# - Integration tests (server_test, server_missing_host) require network and curl binary
|
||||
# - test_handler requires temporary filesystem writes
|
||||
# - Only test_engine could run in sandbox, but selective enablement adds maintenance burden
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Serve a Nushell closure over HTTP";
|
||||
longDescription = ''
|
||||
http-nu is a tool that allows you to serve Nushell closures over HTTP,
|
||||
making it easy to create web services using Nushell's powerful scripting
|
||||
capabilities.
|
||||
'';
|
||||
homepage = "https://github.com/cablehead/http-nu";
|
||||
changelog = "https://github.com/cablehead/http-nu/blob/v${finalAttrs.version}/changes/v${finalAttrs.version}.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
cablehead
|
||||
cboecking
|
||||
];
|
||||
mainProgram = "http-nu";
|
||||
};
|
||||
})
|
||||
@@ -29,7 +29,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/infrahq/infra";
|
||||
changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.elastic20;
|
||||
maintainers = with lib.maintainers; [ peterromfeldhk ];
|
||||
mainProgram = "infra";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
|
||||
description = "Indexed queue";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ maintainers.catern ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,7 +48,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
hydraPlatforms = [ ]; # The build is little more than copying the binary
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [
|
||||
steinybot
|
||||
tricktron
|
||||
emaiax
|
||||
];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
let
|
||||
pname = "jai";
|
||||
minor = "2";
|
||||
patch = "018";
|
||||
patch = "020";
|
||||
version = "0.${minor}.${patch}";
|
||||
zipName = "jai-beta-${minor}-${patch}.zip";
|
||||
jai = stdenv.mkDerivation {
|
||||
@@ -20,7 +20,7 @@ let
|
||||
nix-store --add-fixed sha256 ${zipName}
|
||||
'';
|
||||
name = zipName;
|
||||
sha256 = "sha256-vs9YSQzeqp34OSSl8JghDVyyqegsQj3bhUDGNwecHRI=";
|
||||
sha256 = "sha256-4ni5psPUfoeupka8UryhWorCK9vptWZRPPDaRXAtN7M=";
|
||||
};
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildCommand = "unzip $src -d $out";
|
||||
|
||||
@@ -17,7 +17,6 @@ bundlerApp {
|
||||
license = licenses.mit;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [
|
||||
peterromfeldhk
|
||||
nicknovitski
|
||||
];
|
||||
};
|
||||
|
||||
@@ -66,7 +66,6 @@ stdenv.mkDerivation rec {
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mounium ];
|
||||
teams = [ teams.sage ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jsoncons";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielaparker";
|
||||
repo = "jsoncons";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7ySbnWiX5pHMG2BcnLowKegEwjSdkKReh72Y3z8cpLg=";
|
||||
hash = "sha256-brcOFD6EO6lVL4A+LrZp6CxZFY2mu+i10IQmjwf4XMo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
karabiner-dk,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
common-updater-scripts,
|
||||
nix-update,
|
||||
yq,
|
||||
curl,
|
||||
jq,
|
||||
@@ -16,16 +16,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kanata";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = "kanata";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-xxAIwiwCQugDXpWga9bQ9ZGfem46rwDlmf64dX/tw7g=";
|
||||
sha256 = "sha256-IicVuJZBHzBv9SNGQuWIIaLq2qpWfn/jMFh9KPvAThs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LfjuQHR3vVUr2e0efVymnfCnyYkFRx7ZiNdSIjBZc5s=";
|
||||
cargoHash = "sha256-2DTL1u17jUFiRoVe7973L5/352GtKte/vakk01SSRwY=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(writeShellScriptBin "sw_vers" ''
|
||||
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
darwinDriverVersion = "5.0.0"; # needs to be updated if karabiner-driverkit changes
|
||||
darwinDriverVersion = "6.2.0"; # needs to be updated if karabiner-driverkit changes
|
||||
updateScript = lib.getExe (writeShellApplication {
|
||||
name = "update-script-kanata";
|
||||
runtimeInputs = [
|
||||
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
gnused
|
||||
yq
|
||||
jq
|
||||
common-updater-scripts
|
||||
nix-update
|
||||
];
|
||||
text = builtins.readFile ./update.sh;
|
||||
});
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
NEW_VERSION="$(curl --silent https://api.github.com/repos/jtroo/kanata/releases/latest ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} | jq '.tag_name | ltrimstr("v")' --raw-output)"
|
||||
update-source-version "kanata" "$NEW_VERSION" --ignore-same-version
|
||||
nix-update
|
||||
|
||||
importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)"
|
||||
NEW_VERSION=$(nix-instantiate --eval -E "with $importTree; kanata.version" | tr -d '"')
|
||||
karabinerDriverCrateVersion="$(curl -L "https://raw.githubusercontent.com/jtroo/kanata/refs/tags/v$NEW_VERSION/Cargo.lock" | tomlq | jq --raw-output '.package[] | select(.name | test("karabiner-driverkit")) |.version')"
|
||||
newKarabinerDkVersion="$(curl -L "https://crates.io/api/v1/crates/karabiner-driverkit/$karabinerDriverCrateVersion/download" | tar xzvf - --strip-components=1 -O "karabiner-driverkit-$karabinerDriverCrateVersion/c_src/Karabiner-DriverKit-VirtualHIDDevice/version.json" | jq --raw-output0 .package_version)"
|
||||
importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)"
|
||||
oldDarwinVersion=$(nix-instantiate --eval -E "with $importTree; kanata.passthru.darwinDriverVersion" | tr -d '"')
|
||||
nixFile=$(nix-instantiate --eval --strict -A "kanata.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
|
||||
sed -i "$nixFile" -re "s|\"$oldDarwinVersion\"|\"$newKarabinerDkVersion\"|"
|
||||
|
||||
@@ -69,7 +69,6 @@ buildGoModule rec {
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
peefy
|
||||
selfuryon
|
||||
];
|
||||
mainProgram = "kcl";
|
||||
|
||||
@@ -49,7 +49,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
selfuryon
|
||||
peefy
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [
|
||||
selfuryon
|
||||
peefy
|
||||
];
|
||||
mainProgram = "kclvm_cli";
|
||||
};
|
||||
|
||||
@@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
mainProgram = "kdbg";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.catern ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "http://genome.ucsc.edu";
|
||||
changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${finalAttrs.version}_base";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ scalavision ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "keymapper";
|
||||
maintainers = with lib.maintainers; [
|
||||
dit7ya
|
||||
spitulax
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -39,6 +39,5 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/doitintl/kube-no-trouble";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "kubent";
|
||||
maintainers = with lib.maintainers; [ peterromfeldhk ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,7 +30,6 @@ buildGoModule rec {
|
||||
description = "KUbernetes Test TooL (KUTTL) provides a declarative approach to testing production-grade Kubernetes operators";
|
||||
homepage = "https://github.com/kudobuilder/kuttl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ diegolelis ];
|
||||
mainProgram = "kubectl-kuttl";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lockbook-desktop";
|
||||
version = "25.11.11";
|
||||
version = "25.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lockbook";
|
||||
repo = "lockbook";
|
||||
tag = version;
|
||||
hash = "sha256-MHeNa0MfPOslop9bdA1+5qiY9/r0TXca+UsahgyA34A=";
|
||||
hash = "sha256-Of3RjpBYzIW0ZUWJQxwVB+/NfCJUttEU28UvE5AA8OI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-whtucq2mmhp+UZYZS2MJ9jnIg7XOh4zziGD2lO710h8=";
|
||||
cargoHash = "sha256-uruy8BCPAu3kK2DrxX9BsnDHC2igabBdLGfwVLlhNIs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -12,16 +12,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lockbook";
|
||||
version = "25.11.11";
|
||||
version = "25.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lockbook";
|
||||
repo = "lockbook";
|
||||
tag = version;
|
||||
hash = "sha256-MHeNa0MfPOslop9bdA1+5qiY9/r0TXca+UsahgyA34A=";
|
||||
hash = "sha256-Of3RjpBYzIW0ZUWJQxwVB+/NfCJUttEU28UvE5AA8OI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-whtucq2mmhp+UZYZS2MJ9jnIg7XOh4zziGD2lO710h8=";
|
||||
cargoHash = "sha256-uruy8BCPAu3kK2DrxX9BsnDHC2igabBdLGfwVLlhNIs=";
|
||||
|
||||
doCheck = false; # there are no cli tests
|
||||
cargoBuildFlags = [
|
||||
|
||||
@@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ KSJ2000 ];
|
||||
mainProgram = "lzfse";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
mainProgram = "mas";
|
||||
maintainers = with maintainers; [
|
||||
steinybot
|
||||
zachcoyle
|
||||
];
|
||||
platforms = [
|
||||
|
||||
@@ -50,6 +50,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/nana-4/materia-theme";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.mounium ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "melodeon";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CDrummond";
|
||||
repo = "melodeon";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-WfDPmOysM3ya7PACROCxHjInF0q5AIJ3G4bdJsh8RxA=";
|
||||
hash = "sha256-jSzrz99TRcfVffnvr5PC2ipGl7g7mPc5NrxR15e9wOg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -60,7 +60,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
modules (written in Java or Scala) or through an external subprocesses.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [
|
||||
scalavision
|
||||
zenithal
|
||||
];
|
||||
platforms = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "minimal-grub-theme";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomdewildt";
|
||||
repo = "minimal-grub-theme";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CegLznlW+UJZbVe+WG/S8tREFdw0aq3flGvJeDrLWK0=";
|
||||
hash = "sha256-otGWChSgoxRKfJZkw9usY1sxAc/RsXmkNVMxbSqtc04=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@@ -21,9 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/
|
||||
|
||||
cp -r minimal/icons minimal/theme.txt minimal/*.png $out/
|
||||
cp -r minimal/ $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
fetchFromGitHub,
|
||||
fetchFromGitLab,
|
||||
rustPlatform,
|
||||
systemdMinimal,
|
||||
symlinkJoin,
|
||||
|
||||
# nativeBuildInputs
|
||||
blueprint-compiler,
|
||||
cargo,
|
||||
@@ -17,6 +19,7 @@
|
||||
python3,
|
||||
rustc,
|
||||
wrapGAppsHook4,
|
||||
|
||||
# buildInputs
|
||||
appstream-glib,
|
||||
cairo,
|
||||
@@ -35,11 +38,14 @@
|
||||
sqlite,
|
||||
udev,
|
||||
wayland,
|
||||
|
||||
# tests
|
||||
versionCheckHook,
|
||||
|
||||
# magpie wrapper
|
||||
addDriverRunpath,
|
||||
libGL,
|
||||
vulkan-loader,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
# UPDATE PROCESS:
|
||||
@@ -59,20 +65,20 @@ let
|
||||
nvtop = fetchFromGitHub {
|
||||
owner = "Syllo";
|
||||
repo = "nvtop";
|
||||
rev = "73291884d926445e499d6b9b71cb7a9bdbc7c393";
|
||||
hash = "sha256-8iChT55L2NSnHg8tLIry0rgi/4966MffShE0ib+2ywc=";
|
||||
rev = "339ee0b10a64ec51f43d27357b0068a40f16e9e4";
|
||||
hash = "sha256-QxGP6lHbjS7GAQGWUnxFdrYgxBVhtuk5CzS2EUVFjOs=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mission-center";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mission-center-devs";
|
||||
repo = "mission-center";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-TvrYwuJR03mvPc8oXBx6GClOLc+r5kblaOj0uaLwbwE=";
|
||||
hash = "sha256-KETaCjKTxEvh3tgLzJw5PLJHAQivqXhGYcluvFhGGd8=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -106,6 +112,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Patch the shebang of this python script called at build time
|
||||
+ ''
|
||||
patchShebangs $SRC_MAGPIE_DIR/platform-linux/hwdb/generate_hwdb.py
|
||||
''
|
||||
# Inject the absolute path to the udevadm binary in magpie's source code
|
||||
+ ''
|
||||
substituteInPlace subprojects/magpie/platform-linux/src/memory.rs \
|
||||
--replace-fail "udevadm" "${lib.getExe' systemdMinimal "udevadm"}"
|
||||
'';
|
||||
|
||||
cargoDeps = symlinkJoin {
|
||||
@@ -113,13 +124,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
paths = [
|
||||
(rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-1Bcxp0EuHbJrLQIb2STLNIL2BM2eOgL8ftx4g1o/JY4=";
|
||||
hash = "sha256-XS+/gpCMIqDgFR6AjuT2q+p+85GklUuRhKWzaBfQjZg=";
|
||||
})
|
||||
(rustPlatform.fetchCargoVendor {
|
||||
pname = "${finalAttrs.pname}-magpie";
|
||||
inherit (finalAttrs) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/subprojects/magpie";
|
||||
hash = "sha256-ouY9zSQ7csAqPzQrbWGtCTB9ECVBKOUX78K5SiqTTxg=";
|
||||
hash = "sha256-9YZ2dgIaq0AtS8QsIC/0cJlELIy/UbOvulgZFL/qRRs=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2025-11-28";
|
||||
version = "0-unstable-2025-12-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "models.dev";
|
||||
rev = "48358b91b776d0bd34cbbc4c70e7ac5ce827b916";
|
||||
hash = "sha256-Pvtc32s/p19Pg8JACSEmxj6Ldc5vl8ZOXiPbJ3ZAUqQ=";
|
||||
rev = "8bd2b3595f0731c4db5b6fb629655bdb7a23d78b";
|
||||
hash = "sha256-SNnqbC1XbeO9f8wSMHPIfdKkgyNbTTM6Lu4IVj9fTDQ=";
|
||||
postFetch = lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
|
||||
# NOTE: Normalize case-sensitive directory names that cause issues on case-insensitive filesystems
|
||||
cp -r "$out/providers/poe/models/openai"/* "$out/providers/poe/models/openAi/"
|
||||
|
||||
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/DanielAdolfsson/ndppd";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fadenb ];
|
||||
mainProgram = "ndppd";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
libsForQt5,
|
||||
qt6,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
doxygen,
|
||||
@@ -24,12 +24,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
"-DUSE_SYSTEM_MSGPACK=1"
|
||||
"-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
|
||||
"-DWITH_QT=Qt6"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
libsForQt5.wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
(python3.withPackages (ps: [
|
||||
ps.jinja2
|
||||
ps.msgpack
|
||||
@@ -38,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
neovim.unwrapped # only used to generate help tags at build time
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
msgpack-c
|
||||
];
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "netpeek";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZingyTomato";
|
||||
repo = "NetPeek";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mouXMFYhCBEUTyPfuaw570ZC40TJuprldiSiP0Il0KA=";
|
||||
hash = "sha256-b7XHBmFSI3ITojd05M6tytozgfBg0WvN/CWFbk5c/JQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -113,7 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
Etjean
|
||||
edmundmiller
|
||||
];
|
||||
mainProgram = "nextflow";
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
|
||||
description = "Simple NNTP proxy with SSL support";
|
||||
homepage = "https://github.com/nieluj/nntp-proxy";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.fadenb ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "nntp-proxy";
|
||||
};
|
||||
|
||||
@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://suso.suso.org/xulu/Num-utils";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.catern ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "okteto";
|
||||
version = "3.13.3";
|
||||
version = "3.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mHInKRsJSzhorDvsFETTpmIloO6MMs/OyueGb19alHA=";
|
||||
hash = "sha256-vC2X4iZLTUm0Tnc5zJDfKdmhn8wlFLbHRtNbqMmFAgQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8pfrp7eOsgpCB44TQXn98G8+5WSn4EnuGKt6JUajAQ8=";
|
||||
|
||||
@@ -0,0 +1,162 @@
|
||||
{
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
gtest,
|
||||
lib,
|
||||
ninja,
|
||||
protobuf,
|
||||
python3Packages,
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
cmakeFeature
|
||||
licenses
|
||||
maintainers
|
||||
mapAttrsToList
|
||||
;
|
||||
inherit (python3Packages)
|
||||
build
|
||||
pybind11
|
||||
python
|
||||
setuptools
|
||||
;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
pname = "onnx";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onnx";
|
||||
repo = "onnx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lIw65HAaNE+pOiHPpbOxzX+gk8ueJfuAHxs+DV99Jh0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dist" # Python wheel output
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build
|
||||
cmake
|
||||
ninja
|
||||
pybind11
|
||||
python
|
||||
setuptools
|
||||
];
|
||||
|
||||
# NOTE: Most of these can be removed after bumping to 1.20.
|
||||
# See:
|
||||
# - https://github.com/onnx/onnx/issues/7472
|
||||
# - https://github.com/pytorch/pytorch/issues/167525
|
||||
# NOTE: Darwin requires a static build, so this patch is unnecessary on that platform.
|
||||
prePatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
nixLog "patching $PWD/CMakeLists.txt to allow tests to build with shared libraries"
|
||||
substituteInPlace "$PWD/CMakeLists.txt" \
|
||||
--replace-fail \
|
||||
'message(FATAL_ERROR "Tests requires static build")' \
|
||||
""
|
||||
|
||||
nixLog "patching $PWD/CMakeLists.txt to correctly link onnx_cpp2py_export with shared libraries"
|
||||
substituteInPlace "$PWD/CMakeLists.txt" \
|
||||
--replace-fail \
|
||||
'target_link_libraries(onnx_cpp2py_export PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,onnx>)' \
|
||||
'target_link_libraries(onnx_cpp2py_export PRIVATE $<BUILD_INTERFACE:onnx> $<BUILD_INTERFACE:onnx_proto>)'
|
||||
|
||||
nixLog "patching $PWD/CMakeLists.txt to fix symbol visibility"
|
||||
substituteInPlace "$PWD/CMakeLists.txt" \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
'# set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \
|
||||
'# set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
'# set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \
|
||||
--replace-fail \
|
||||
'set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' \
|
||||
'# set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)'
|
||||
|
||||
nixLog "patching $PWD/cmake/ONNXConfig.cmake.in to fix CMake discovery"
|
||||
substituteInPlace "$PWD/cmake/ONNXConfig.cmake.in" \
|
||||
--replace-fail \
|
||||
'if((NOT @@ONNX_USE_PROTOBUF_SHARED_LIBS@@) AND @@Build_Protobuf@@)' \
|
||||
'if(NOT @ONNX_USE_PROTOBUF_SHARED_LIBS@)'
|
||||
'';
|
||||
|
||||
# NOTE: python3Packages.protobuf does not propagate a dependency on protobuf's dev output, so we must bring it in
|
||||
# for the CMake files.
|
||||
buildInputs = [
|
||||
protobuf
|
||||
python3Packages.protobuf
|
||||
];
|
||||
|
||||
# Declared in setup.py
|
||||
cmakeBuildDir = ".setuptools-cmake-build";
|
||||
|
||||
# Python setup.py just takes stuff from the environment.
|
||||
env = {
|
||||
# NOTE: Darwin requires a static build; otherwise, tests fail in the Python package.
|
||||
BUILD_SHARED_LIBS = if stdenv.hostPlatform.isDarwin then "0" else "1";
|
||||
ONNX_BUILD_PYTHON = "1";
|
||||
ONNX_BUILD_TESTS = if finalAttrs.doCheck then "1" else "0";
|
||||
# ONNX_ML is enabled by default, so we must explicitly disable it.
|
||||
# See: https://github.com/onnx/onnx/blob/b751946c3d59a3c8358abcc0569b59e6ddb08cdd/CMakeLists.txt#L66-L73
|
||||
# NOTE: If this is `true`, onnx-tensorrt fails to build due to missing protobuf files.
|
||||
ONNX_ML = "0";
|
||||
ONNX_NAMESPACE = "onnx";
|
||||
ONNX_USE_PROTOBUF_SHARED_LIBS = "1";
|
||||
};
|
||||
|
||||
cmakeFlags = mapAttrsToList cmakeFeature finalAttrs.env;
|
||||
|
||||
preConfigure = ''
|
||||
export MAX_JOBS=$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
# Leave the CMake bulid directory, export the `cmakeFlags` environment variable as CMAKE_ARGS so setup.py will pick
|
||||
# them up, do the python build from the top-level, then resume the C++ build.
|
||||
preBuild = ''
|
||||
pushd ..
|
||||
nixLog "exporting cmakeFlags as CMAKE_ARGS for Python build"
|
||||
export CMAKE_ARGS="''${cmakeFlags[*]}"
|
||||
nixLog "building Python wheel"
|
||||
pyproject-build \
|
||||
--no-isolation \
|
||||
--outdir "$dist/" \
|
||||
--wheel
|
||||
popd >/dev/null
|
||||
'';
|
||||
|
||||
# NOTE: Python specific tests happen in the python package.
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
preCheck = ''
|
||||
nixLog "running C++ tests with $PWD/onnx_gtests"
|
||||
"$PWD/onnx_gtests"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
nixLog "removing empty directories in $out/include/onnx"
|
||||
find "$out/include/onnx" -type d -empty -delete
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open Neural Network Exchange";
|
||||
homepage = "https://onnx.ai";
|
||||
license = licenses.asl20;
|
||||
changelog = "https://github.com/onnx/onnx/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with maintainers; [
|
||||
acairncross
|
||||
connorbaker
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -13,12 +13,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "opencode";
|
||||
version = "1.0.119";
|
||||
version = "1.0.126";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "opencode";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-U2oIEXhAWOaOZHGBlVUPgysW0AtEh/P8LxbGlm8Lquk=";
|
||||
hash = "sha256-eW/+MoGh5V1t+4m+EDAm7dhTwJ+yqYmbLkZ9blYeXqQ=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -70,7 +70,7 @@ let
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-rGmHVBhsyOmPD4kG8k0hhER5pZn2KVwBXk0O8MER8jc=";
|
||||
outputHash = "sha256-/AP7wVUGO/LlYaQPglYIZ3/w0WKuO25PZNWEV7lKjGM=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
in
|
||||
ocamlPackages.buildDunePackage {
|
||||
pname = "owi";
|
||||
version = "0.2-unstable-2025-11-25";
|
||||
version = "0.2-unstable-2025-12-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocamlpro";
|
||||
repo = "owi";
|
||||
rev = "23fb234334310ae8b4ba3c4a2def6a9fed7508fd";
|
||||
rev = "92403520c3ad8ea1a57d734772e2c4c22589eca3";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-I74mjs4GozMlUr+ezt22J6+cs8GDcNZkPC42W0kvGnI=";
|
||||
hash = "sha256-cVkHaXBeTgfHKLCIB3sTEIqu2kvYmo3gi42tRn2DcaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://gitlab.gnome.org/World/Phosh/phoc";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
masipcat
|
||||
zhaofengli
|
||||
armelclo
|
||||
];
|
||||
|
||||
@@ -69,7 +69,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
changelog = "https://pixi.sh/latest/CHANGELOG";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
edmundmiller
|
||||
xiaoxiangmoe
|
||||
];
|
||||
mainProgram = "pixi";
|
||||
|
||||
@@ -31,7 +31,6 @@ buildGoModule rec {
|
||||
mainProgram = "pluto";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
peterromfeldhk
|
||||
kashw2
|
||||
];
|
||||
};
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user