1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 18:41:33 +09:00

Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2025-03-22 18:05:14 +00:00 committed by GitHub
commit a9379697ea
Signed by: github
GPG key ID: B5690EEEBB952194
100 changed files with 1829 additions and 1045 deletions

View file

@ -99,12 +99,17 @@ failure. To prevent this, guard the completion generation commands.
```nix ```nix
{ {
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
# using named fd let
installShellCompletion --cmd foobar \ emulator = stdenv.hostPlatform.emulator buildPackages;
--bash <($out/bin/foobar --bash-completion) \ in
--fish <($out/bin/foobar --fish-completion) \ ''
--zsh <($out/bin/foobar --zsh-completion) # using named fd
''; installShellCompletion --cmd foobar \
--bash <(${emulator} $out/bin/foobar --bash-completion) \
--fish <(${emulator} $out/bin/foobar --fish-completion) \
--zsh <(${emulator} $out/bin/foobar --zsh-completion)
''
);
} }
``` ```

View file

@ -6410,7 +6410,7 @@
name = "Sebastian Krohn"; name = "Sebastian Krohn";
}; };
drawbu = { drawbu = {
email = "clement2104.boillot@gmail.com"; email = "nixpkgs@drawbu.dev";
github = "drawbu"; github = "drawbu";
githubId = 69208565; githubId = 69208565;
name = "Clément Boillot"; name = "Clément Boillot";
@ -20723,6 +20723,13 @@
keys = [ { fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; } ]; keys = [ { fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; } ];
name = "Rahul Butani"; name = "Rahul Butani";
}; };
rseichter = {
email = "nixos.org@seichter.de";
github = "rseichter";
githubId = 30873939;
keys = [ { fingerprint = "6AE2 A847 23D5 6D98 5B34 0BC0 8E5F A470 9F69 E911"; } ];
name = "Ralph Seichter";
};
rski = { rski = {
name = "rski"; name = "rski";
email = "rom.skiad+nix@gmail.com"; email = "rom.skiad+nix@gmail.com";

View file

@ -202,8 +202,9 @@ in
systemd.user.services = systemd.user.services =
let let
lomiriService = "lomiri.service";
lomiriServiceNames = [ lomiriServiceNames = [
"lomiri.service" lomiriService
"lomiri-full-greeter.service" "lomiri-full-greeter.service"
"lomiri-full-shell.service" "lomiri-full-shell.service"
"lomiri-greeter.service" "lomiri-greeter.service"
@ -225,9 +226,9 @@ in
"lomiri-polkit-agent" = { "lomiri-polkit-agent" = {
description = "Lomiri Polkit agent"; description = "Lomiri Polkit agent";
wantedBy = lomiriServiceNames; wantedBy = [ lomiriService ];
after = [ "graphical-session.target" ]; after = [ lomiriService ];
partOf = lomiriServiceNames; partOf = [ lomiriService ];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
Restart = "always"; Restart = "always";

View file

@ -83,7 +83,7 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.orthanc.settings = options.services.orthanc.settings.default; services.orthanc.settings = opt.settings.default;
systemd.services.orthanc = { systemd.services.orthanc = {
description = "Orthanc is a lightweight, RESTful DICOM server for healthcare and medical research"; description = "Orthanc is a lightweight, RESTful DICOM server for healthcare and medical research";

View file

@ -29,10 +29,12 @@ def config(*path: List[str]) -> Optional[Any]:
def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str: def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str:
basename = f'{profile}-{gen}-link' if gen is not None else profile
profiles_dir = '/nix/var/nix/profiles'
if profile == 'system': if profile == 'system':
result = os.path.join('/nix', 'var', 'nix', 'profiles', 'system') result = os.path.join(profiles_dir, basename)
else: else:
result = os.path.join('/nix', 'var', 'nix', 'profiles', 'system-profiles', profile + f'-{gen}-link' if gen is not None else '') result = os.path.join(profiles_dir, 'system-profiles', basename)
if spec is not None: if spec is not None:
result = os.path.join(result, 'specialisation', spec) result = os.path.join(result, 'specialisation', spec)
@ -169,8 +171,8 @@ def generate_config_entry(profile: str, gen: str) -> str:
boot_spec = bootjson_to_bootspec(boot_json) boot_spec = bootjson_to_bootspec(boot_json)
entry = config_entry(2, boot_spec, f'Generation {gen}', time) entry = config_entry(2, boot_spec, f'Generation {gen}', time)
for spec in boot_spec.specialisations: for spec, spec_boot_spec in boot_spec.specialisations.items():
entry += config_entry(2, boot_spec, f'Generation {gen}, Specialisation {spec}', str(time)) entry += config_entry(2, spec_boot_spec, f'Generation {gen}, Specialisation {spec}', str(time))
return entry return entry

View file

@ -2,6 +2,7 @@
channel, channel,
pname, pname,
version, version,
versionPrefix,
sha256Hash, sha256Hash,
}: }:
@ -51,7 +52,7 @@
let let
drvName = "${pname}-${version}"; drvName = "${pname}-${version}";
filename = "asfp-${version}-linux.deb"; filename = "asfp-${versionPrefix}-${version}-linux.deb";
androidStudioForPlatform = stdenv.mkDerivation { androidStudioForPlatform = stdenv.mkDerivation {
name = "${drvName}-unwrapped"; name = "${drvName}-unwrapped";
@ -67,7 +68,7 @@ let
]; ];
installPhase = '' installPhase = ''
cp -r "./opt/${pname}/" $out cp -r ./tmp/*/ $out
wrapProgram $out/bin/studio.sh \ wrapProgram $out/bin/studio.sh \
--set-default JAVA_HOME "$out/jbr" \ --set-default JAVA_HOME "$out/jbr" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \

View file

@ -16,12 +16,15 @@ let
inherit tiling_wm; inherit tiling_wm;
}; };
stableVersion = { stableVersion = {
version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2 version = "2024.2.2.13";
sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY="; # this seems to be a fuckup on google's side
versionPrefix = "Ladybug%20Feature%20Drop";
sha256Hash = "sha256-yMUTWOpYHa/Aizrgvs/mbofrDqrbL5bJYjuklIdyU/0=";
}; };
canaryVersion = { canaryVersion = {
version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1 version = "2024.3.1.9";
sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM="; versionPrefix = "canary-meerkat";
sha256Hash = "sha256-j5KEwHbc+0eFi3GZlD5PMuM/RWw2MJ1PaXZrPMvhCik=";
}; };
in in
{ {

View file

@ -21,13 +21,13 @@ assert
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "box64"; pname = "box64";
version = "0.3.2"; version = "0.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ptitSeb"; owner = "ptitSeb";
repo = "box64"; repo = "box64";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-SHAfZatLrc6+8kRHGwUlXuUP0blQazZtdQmDv58Csv4="; hash = "sha256-CY5Emg5TsMVs++2EukhVzqn9440kF/BO8HZGQgCpGu4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -32,7 +32,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ"; description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ";
homepage = "https://kcc.iosphe.re"; homepage = "https://github.com/ciromattia/kcc";
license = licenses.isc; license = licenses.isc;
maintainers = with maintainers; [ dawidsowa ]; maintainers = with maintainers; [ dawidsowa ];
}; };

View file

@ -43,6 +43,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = description; description = description;
homepage = "https://github.com/Attempto/APE";
license = license; license = license;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ yrashk ]; maintainers = with maintainers; [ yrashk ];

View file

@ -71,7 +71,7 @@ buildGoModule rec {
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/kubernetes/helm"; homepage = "https://github.com/helm/helm";
description = "Package manager for kubernetes"; description = "Package manager for kubernetes";
mainProgram = "helm"; mainProgram = "helm";
license = licenses.asl20; license = licenses.asl20;

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "roxctl"; pname = "roxctl";
version = "4.6.3"; version = "4.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stackrox"; owner = "stackrox";
repo = "stackrox"; repo = "stackrox";
rev = version; rev = version;
sha256 = "sha256-QrQLIqP70IUDY9lOZ0cTBIRYY8mVVW4sRt8522y/q80="; sha256 = "sha256-hi9K1FIMxDJKEyabPNWTwLkZJTm+iAuMfoH3cywVTkI=";
}; };
vendorHash = "sha256-Zuln5na8MrL+IVOk+NOBrrYJIQ3RincJRYgpAd1WiS8="; vendorHash = "sha256-T3A0Sm2eKIO3UcyReFRfpKUgLM15AhSgcGpJbYgmnHA=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -3,16 +3,16 @@
buildGoModule rec { buildGoModule rec {
pname = "discordo"; pname = "discordo";
version = "0-unstable-2025-02-08"; version = "0-unstable-2025-03-19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ayn2op"; owner = "ayn2op";
repo = pname; repo = pname;
rev = "ea51fac7d6ea0fcb48decac8600d82e39a6879dd"; rev = "aa58ee2a8a177f01d39bde7368f017fe0fcf425a";
hash = "sha256-pQjukqycdiMG9aCk37+LKZXlJPxgi8ZrI0G5Tsnv9xg="; hash = "sha256-H+m5HqHGC1DzWgTQ0cyD5uwGLiRrKU3eJZ5M/InNmBg=";
}; };
vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg="; vendorHash = "sha256-tKY/8JUWNnHXtl305k/azAVsVihjC7TBYpopf/Ocqac=";
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;

View file

@ -113,6 +113,7 @@ stdenv.mkDerivation rec {
opencv4' opencv4'
openssl' openssl'
pango pango
pcsclite
speex speex
(lib.getLib systemd) (lib.getLib systemd)
stdenv.cc.cc stdenv.cc.cc

View file

@ -82,6 +82,18 @@ let
x86suffix = ""; x86suffix = "";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
}; };
"24.11.0" = {
major = "24";
minor = "11";
patch = "0";
x64hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
x86hash = "";
x64suffix = "85";
x86suffix = "";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
}; };
# Retain attribute-names for abandoned versions of Citrix workspace to # Retain attribute-names for abandoned versions of Citrix workspace to

File diff suppressed because it is too large Load diff

View file

@ -135,3 +135,33 @@
comphelper::LibreOfficeKit::setActive(); comphelper::LibreOfficeKit::setActive();
SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
// - Error: "2001-01-01" does not satisfy the "dateTime" type
// because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.
loadAndReload("midnight_redline.fodt");
+ return; // fails on aarch64
xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
assertXPathContent(pXmlDoc,
--- a/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:46:52.202082763 +0100
+++ b/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:49:22.947719369 +0100
@@ -785,6 +785,7 @@
void testTdf104597_textrun()
{
+ return; // apparently geometry-sensitive ?
#if HAVE_FEATURE_POPPLER
rtl::Reference<pdfi::PDFIRawAdaptor> xAdaptor(new pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-03-22 14:51:45.421728759 +0100
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-03-22 14:51:59.684729699 +0100
@@ -5721,6 +5721,7 @@
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters)
{
+ return; // Unsure where the extra objects on the page come from
aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
saveAsPDF(u"tdf164106.fodt");

View file

@ -105,11 +105,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
} }
{ {
name = "curl-8.11.1.tar.xz"; name = "curl-8.12.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz"; url = "https://dev-www.libreoffice.org/src/curl-8.12.0.tar.xz";
sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56"; sha256 = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d";
md5 = ""; md5 = "";
md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz"; md5name = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d-curl-8.12.0.tar.xz";
} }
{ {
name = "libe-book-0.1.3.tar.xz"; name = "libe-book-0.1.3.tar.xz";
@ -385,11 +385,11 @@
md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
} }
{ {
name = "gpgme-1.24.0.tar.bz2"; name = "gpgme-1.24.2.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.24.0.tar.bz2"; url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2";
sha256 = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da"; sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581";
md5 = ""; md5 = "";
md5name = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da-gpgme-1.24.0.tar.bz2"; md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2";
} }
{ {
name = "graphite2-minimal-1.3.14.tgz"; name = "graphite2-minimal-1.3.14.tgz";
@ -539,11 +539,11 @@
md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
} }
{ {
name = "language-subtag-registry-2024-11-19.tar.bz2"; name = "language-subtag-registry-2025-02-06.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-11-19.tar.bz2"; url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2";
sha256 = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864"; sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662";
md5 = ""; md5 = "";
md5name = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864-language-subtag-registry-2024-11-19.tar.bz2"; md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2";
} }
{ {
name = "lcms2-2.16.tar.gz"; name = "lcms2-2.16.tar.gz";
@ -616,11 +616,11 @@
md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";
} }
{ {
name = "libwebp-1.4.0.tar.gz"; name = "libwebp-1.5.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz"; url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz";
sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5"; sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c";
md5 = ""; md5 = "";
md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz"; md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz";
} }
{ {
name = "xmlsec1-1.3.5.tar.gz"; name = "xmlsec1-1.3.5.tar.gz";
@ -658,11 +658,11 @@
md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz";
} }
{ {
name = "mariadb-connector-c-3.3.13-src.tar.gz"; name = "mariadb-connector-c-3.3.14-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz"; url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz";
sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef"; sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49";
md5 = ""; md5 = "";
md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz"; md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz";
} }
{ {
name = "mdds-2.1.1.tar.xz"; name = "mdds-2.1.1.tar.xz";
@ -742,11 +742,11 @@
md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";
} }
{ {
name = "openssl-3.0.15.tar.gz"; name = "openssl-3.0.16.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz"; url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz";
sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533"; sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86";
md5 = ""; md5 = "";
md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz"; md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";
} }
{ {
name = "liborcus-0.19.2.tar.xz"; name = "liborcus-0.19.2.tar.xz";
@ -777,11 +777,11 @@
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
} }
{ {
name = "libpng-1.6.44.tar.xz"; name = "libpng-1.6.46.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; url = "https://dev-www.libreoffice.org/src/libpng-1.6.46.tar.xz";
sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; sha256 = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1";
md5 = ""; md5 = "";
md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; md5name = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1-libpng-1.6.46.tar.xz";
} }
{ {
name = "tiff-4.7.0.tar.xz"; name = "tiff-4.7.0.tar.xz";
@ -791,11 +791,11 @@
md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
} }
{ {
name = "poppler-24.08.0.tar.xz"; name = "poppler-25.01.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz"; url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz";
sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"; sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112";
md5 = ""; md5 = "";
md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz"; md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz";
} }
{ {
name = "poppler-data-0.4.12.tar.gz"; name = "poppler-data-0.4.12.tar.gz";

View file

@ -1,5 +1,5 @@
{ fetchurl, ... }: { fetchurl, ... }:
fetchurl { fetchurl {
sha256 = "0z09pif1xmivmrnf5rjbcqc72khj0sg44905qrphp8cgvbx4n3ph"; sha256 = "1g1fzp5bd5rim3wdqjwfgzyw14g7bdkc4i0pdfymybgsgxdrcc5z";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-help-24.8.4.2.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-help-24.8.5.2.tar.xz";
} }

View file

@ -1,5 +1,5 @@
{ fetchurl, ... }: { fetchurl, ... }:
fetchurl { fetchurl {
sha256 = "05qs12z0xkpqy3yl7378d99y82rswic101aw65k1macslcpdwr0m"; sha256 = "0sdqap232lcs8jkrxxs4h29zncyg9pibx8w6bczwa2nr2i0vv2ls";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-24.8.4.2.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-24.8.5.2.tar.xz";
} }

View file

@ -1,5 +1,5 @@
{ fetchurl, ... }: { fetchurl, ... }:
fetchurl { fetchurl {
sha256 = "0z84m2q5c9zjbb491m84s8sf2dgaxvvx03dl3f1qyajvpf1mnlld"; sha256 = "108qfnxdz9xw9njkq1lmiwa72ygiwnpzb5ghzr13v8jmhlk1a3fd";
url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-translations-24.8.4.2.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-translations-24.8.5.2.tar.xz";
} }

View file

@ -1 +1 @@
"24.8.4.2" "24.8.5.2"

View file

@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Safely store secrets in a VCS repo"; description = "Safely store secrets in a VCS repo";
homepage = "https://github.com/StackExchange/blackbox";
maintainers = with maintainers; [ ericsagnes ]; maintainers = with maintainers; [ ericsagnes ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.all; platforms = platforms.all;

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
meta = { meta = {
homepage = "https://docs.qameta.io/allure/"; homepage = "https://allurereport.org/";
description = "Allure Report is a flexible, lightweight multi-language test reporting tool"; description = "Allure Report is a flexible, lightweight multi-language test reporting tool";
longDescription = '' longDescription = ''
Allure Report is a flexible, lightweight multi-language test reporting Allure Report is a flexible, lightweight multi-language test reporting

View file

@ -8,17 +8,17 @@
buildGoModule rec { buildGoModule rec {
pname = "argocd"; pname = "argocd";
version = "2.14.4"; version = "2.14.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo-cd"; repo = "argo-cd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-CL6LPjTngAW/SI+qH4HHZ1NTkmSKUWc8GCIRjcB2GyA="; hash = "sha256-ilXJWPvu3qwzuUN6AsQNyzrTHdQO51IFZcvZiQ/+/tU=";
}; };
proxyVendor = true; # darwin/linux hash mismatch proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-uKqiA/ybe0P0rpLFasq6BC/NzhQGgZf5dx2hUYHtPI8="; vendorHash = "sha256-sfyTXP2vKVJQdUti0TNW/vrKovvN1/PMhEOUI8IiY44=";
# Set target as ./cmd per cli-local # Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

View file

@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-power"; pname = "ayatana-indicator-power";
version = "24.5.1"; version = "24.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AyatanaIndicators"; owner = "AyatanaIndicators";
repo = "ayatana-indicator-power"; repo = "ayatana-indicator-power";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-M7BzyQRPKyXMEY0FTMBXsCemC3+w8upjTHApWkRf71I="; hash = "sha256-A9Kbs+qH01rkuLt8GINdPI2vCu0bCO+/g4kZhDj8GsY=";
}; };
postPatch = '' postPatch = ''

View file

@ -22,16 +22,16 @@ let
in in
buildNpmPackage' rec { buildNpmPackage' rec {
pname = "balena-cli"; pname = "balena-cli";
version = "20.2.10"; version = "21.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "balena-io"; owner = "balena-io";
repo = "balena-cli"; repo = "balena-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-kY8hXNDxbQwM2QleQ8MafDuANQzBRL3+Tei10P976bU="; hash = "sha256-STixd/xJikV9qt2aG3smyLPEwG7fLYrN3jfVTwBxJrI=";
}; };
npmDepsHash = "sha256-AD/5QMgko1l8xH8dwua6YkrYuXe1Af7eo17p2L2PkyY="; npmDepsHash = "sha256-dyUWQoR0EweHdNc5NN+qW2OdbCIspTQ1C/QsesnlvRU=";
postPatch = '' postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json ln -s npm-shrinkwrap.json package-lock.json

View file

@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-about"; pname = "cargo-about";
version = "0.6.6"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EmbarkStudios"; owner = "EmbarkStudios";
repo = "cargo-about"; repo = "cargo-about";
rev = version; rev = version;
sha256 = "sha256-6jza0IHdX7vyjZt1lknoVhlu7RONF5SnTdn7EDsj2oo="; sha256 = "sha256-h5+Fp6+yGa1quJENsCv6WE4NC2A+ceIGMXVWyeTPPLQ=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-MXUfldlAu+SezlNi0QbqKJ/ddJiKCrs4bi4ryG68EPU="; cargoHash = "sha256-JTcRYdBZdXxM7r+XZSbFaAeWrJ5HULM1YE3p3smRW/Q=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -6,7 +6,7 @@
cargo-shear, cargo-shear,
}: }:
let let
version = "1.1.9"; version = "1.1.11";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "cargo-shear"; pname = "cargo-shear";
@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
owner = "Boshen"; owner = "Boshen";
repo = "cargo-shear"; repo = "cargo-shear";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-+FScGNBLEHO12i4szKqIU+8eYQHz3m16FeoYIuT5XDo="; hash = "sha256-2M0C4BCDWxcLz3X1exBjGqv5Ep/XKkGEuR5fBvusShU=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-6qHUbfx3ej8Srp/BivuLXjQKZcCN1mNOi+aVa0Q7wtY="; cargoHash = "sha256-ADbB5KvT0TlHAffFZiJpJDmEzwogfQi1SuA9UKL2H/U=";
# https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
SHEAR_VERSION = version; SHEAR_VERSION = version;

View file

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-spellcheck"; pname = "cargo-spellcheck";
version = "0.15.2"; version = "0.15.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drahnr"; owner = "drahnr";
repo = "cargo-spellcheck"; repo = "cargo-spellcheck";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-KiulbQhSg5CCZlts8FLsfOrN7nz16u3gRnQrWTFAzdc="; hash = "sha256-saRr1xEBefLoCgCxU/pyQOmmt/di+DOQHMoVc4LgRm0=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-iDulfKsw3Ui5b1v7QakIcf7HXNEBlMbhbzqLekuSsUU="; cargoHash = "sha256-MGjyoHejsUd6HCoZVlw1NDG6TE9Anh05IeObHmcnwg0=";
nativeBuildInputs = [ rustPlatform.bindgenHook ]; nativeBuildInputs = [ rustPlatform.bindgenHook ];

View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-update"; pname = "cargo-update";
version = "16.2.0"; version = "16.2.1";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-dO8A4XAFms31hWVpZelMnDmn0sPpCh4S4byEVRYjOTI="; hash = "sha256-Vl5ClzS3OULsd+3dlaN5iZPw2YZeBSPHWFOS+izmr7Q=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-DxY03sqr/upJbNm8EkoIN96SOhZr1jm/6dgtKwyDFEU="; cargoHash = "sha256-Yq2jT8YnWPsNe7akShsj0nWxXXpgNvX1A95x7O8LOes=";
nativeBuildInputs = nativeBuildInputs =
[ [

View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cifs-utils"; pname = "cifs-utils";
version = "7.2"; version = "7.3";
src = fetchurl { src = fetchurl {
url = "https://download.samba.org/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; url = "https://download.samba.org/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
sha256 = "sha256-ElZKM+1nwkHYyEeSTq8Epa4LrxkoiDcJTasVc51UAX4="; sha256 = "sha256-xOHrX0rYgNluFtlaHNvH7JeKtRxbbYogrgnaxjjzbdU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,15 +2,15 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudfoundry-cli"; pname = "cloudfoundry-cli";
version = "8.10.2"; version = "8.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudfoundry"; owner = "cloudfoundry";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+1+EXcbGs2e1kqvHF5kK1yQGNPkw0ZA6djJeDFtMsDs="; sha256 = "sha256-1OJWkhXw/VYerQgaYFgX6mPIAtD3GKDhI+/a8TJS5Yg=";
}; };
vendorHash = "sha256-IyPTsVQSHXiMsF3N0b6udnV4EY5nTIyBx4zGM/2SL/c="; vendorHash = "sha256-c0RThHxnT/OU+sFZlACKoFYmFM1P3XItvF0XiGKBVZ8=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ctlptl"; pname = "ctlptl";
version = "0.8.39"; version = "0.8.40";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tilt-dev"; owner = "tilt-dev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RZdS1Gl8CGzvgRiPKie+Pv4kCHdRmGp1DbCjswhLAxg="; hash = "sha256-O6oAkYzkBUecwAcLjPIR7D/k4REWND8TWdstPNVJ0MU=";
}; };
vendorHash = "sha256-NAL6O5042cWE56vDONyIfuKSfi1hWuRr4C7Dwfz7PzE="; vendorHash = "sha256-1BrohvN3Eefuy2y7pjdwhzFQG9YLr9X/CLbOeTBZkjY=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -19,17 +19,17 @@
let let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "1.156.2"; version = "1.157.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deltachat"; owner = "chatmail";
repo = "deltachat-core-rust"; repo = "core";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-CpFnO8stLLTH/XOZZS3j9nVrf2FRekjkQ/R1pmw5o9A="; hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA=";
}; };
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust"; pname = "deltachat-core-rust";
inherit version src; inherit version src;
hash = "sha256-jrsGMNgKglk+Rq/ZGiZgSZrT4uSA5RjbTYaDtW0Ijyg="; hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U=";
}; };
}; };
electron = electron_34; electron = electron_34;
@ -37,18 +37,18 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop"; pname = "deltachat-desktop";
version = "1.54.2"; version = "1.56.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deltachat"; owner = "deltachat";
repo = "deltachat-desktop"; repo = "deltachat-desktop";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-KN8VO03/f143qMBv9Z6K75Mb3S1QQjgzt0psTnBFLyw="; hash = "sha256-XkA1WOMLe0+Fz0wE54KSZWeN+rRqT0TE1PXDppPm6SI=";
}; };
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
hash = "sha256-dRnmu5tEqrWn2AizLvd/ZMsiQJP4qtq/+SOSidpzLbY="; hash = "sha256-4VvJNpuO7P6m6BBxBWFebtRsXvqkjdAjmnBwxG+qNns=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -31,6 +31,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/thorkill/eresi/commit/bc5b9a75c326f277e5f89e01a3b8f7f0519a99f6.patch"; url = "https://github.com/thorkill/eresi/commit/bc5b9a75c326f277e5f89e01a3b8f7f0519a99f6.patch";
sha256 = "0lqwrnkkhhd3vi1r8ngvziyqkk09h98h93rrs3ndqi048a898ys1"; sha256 = "0lqwrnkkhhd3vi1r8ngvziyqkk09h98h93rrs3ndqi048a898ys1";
}) })
# Fix compilation for gcc14 and newer
# https://github.com/thorkill/eresi/pull/167
(fetchpatch {
url = "https://github.com/thorkill/eresi/commit/f85397c4dce633764fab29b0642f59fc4764658a.patch";
sha256 = "sha256-mKmJHjyWwCNh/pueB94Ndhj/3uZLBZNn/m9gXenP5ns=";
})
]; ];
postPatch = '' postPatch = ''

View file

@ -0,0 +1,43 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "git-dumper";
version = "1.0.8";
pyproject = true;
src = fetchFromGitHub {
owner = "arthaud";
repo = "git-dumper";
tag = version;
hash = "sha256-XU+6Od+mC8AV+w7sd8JaMB2Lc81ekeDLDiGGNu6bU0A=";
};
build-system = [
python3Packages.setuptools
];
dependencies = with python3Packages; [
beautifulsoup4
dulwich
pysocks
requests
requests-pkcs12
];
pythonImportsCheck = [
"git_dumper"
];
meta = {
description = "Tool to dump a git repository from a website";
homepage = "https://github.com/arthaud/git-dumper";
changelog = "https://github.com/arthaud/git-dumper/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ yechielw ];
mainProgram = "git-dumper";
};
}

View file

@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Tubing and extrusion library"; description = "Tubing and extrusion library";
homepage = "https://www.linas.org/gle/";
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.raskin ]; maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "GTK-based audio CD player/ripper"; description = "GTK-based audio CD player/ripper";
homepage = "http://nostatic.org/grip"; homepage = "https://sourceforge.net/projects/grip/";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ marcweber ]; maintainers = with lib.maintainers; [ marcweber ];

View file

@ -8,6 +8,7 @@
pkgsBuildHost, pkgsBuildHost,
openssl, openssl,
pkg-config, pkg-config,
writableTmpDirAsHomeHook,
versionCheckHook, versionCheckHook,
nix-update-script, nix-update-script,
gurk-rs, gurk-rs,
@ -18,13 +19,13 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gurk-rs"; pname = "gurk-rs";
version = "0.6.2"; version = "0.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boxdot"; owner = "boxdot";
repo = "gurk-rs"; repo = "gurk-rs";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-FSnKBSRhnHwjMzC8zGU/AHBuPX44EjMLS+3wHkf6IZw="; hash = "sha256-6WU5epBnCPCkEYPZvWMOGOdkw8cL+nvHKs3RnsrhJO0=";
}; };
postPatch = '' postPatch = ''
@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-6+AFyQjbtxKHbMhYhfu9pUoz/cWGtl5o+IA6kFO4Zjk="; cargoHash = "sha256-qW+9d2Etwh9sPxgy0mZtUFtkjlFTHU5uJYTW5jLcBlo=";
nativeBuildInputs = [ nativeBuildInputs = [
protobuf protobuf
@ -53,6 +54,8 @@ rustPlatform.buildRustPackage rec {
useNextest = true; useNextest = true;
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
nativeInstallCheckInputs = [ nativeInstallCheckInputs = [
versionCheckHook versionCheckHook
]; ];

View file

@ -8,10 +8,10 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "halo"; pname = "halo";
version = "2.20.16"; version = "2.20.17";
src = fetchurl { src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
hash = "sha256-wWn4GXcER1ialDVrBuceVC9KKiJYXWCYkYS+rwYTVaE="; hash = "sha256-DBXtSA06MzhVySHZstRgML/CU8SSry9vVIbg30/Jo9g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,15 +8,23 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "highs"; pname = "highs";
version = "1.9.0"; version = "1.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ERGO-Code"; owner = "ERGO-Code";
repo = "HiGHS"; repo = "HiGHS";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-VUbYg1NRoRk0IzO6y+NaWnfjOuIYoM8pfPPqJcG7Bbo="; hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
}; };
# CMake Error in CMakeLists.txt:
# Imported target "highs::highs" includes non-existent path
# "/include"
# in its INTERFACE_INCLUDE_DIRECTORIES.
postPatch = ''
sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt
'';
strictDeps = true; strictDeps = true;
outputs = [ "out" ]; outputs = [ "out" ];

View file

@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
version = "0.1.2"; version = "0.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "araekiel"; owner = "shashwatah";
repo = "jot"; repo = "jot";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM="; sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM=";
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "Rapid note management for the terminal"; description = "Rapid note management for the terminal";
homepage = "https://github.com/araekiel/jot"; homepage = "https://github.com/shashwatah/jot";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ dit7ya ]; maintainers = with maintainers; [ dit7ya ];
mainProgram = "jt"; mainProgram = "jt";

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kafkactl"; pname = "kafkactl";
version = "5.5.1"; version = "5.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deviceinsight"; owner = "deviceinsight";
repo = pname; repo = pname;
tag = "v${version}"; tag = "v${version}";
hash = "sha256-lsYdq3+hf+8EPLmLbgnzuVHfeZXrUlqYmHY4kJ6HzC4="; hash = "sha256-hhFQbs7p3j8y845asZt6c+OcZ6WgpoTBttGG5IwT7Kc=";
}; };
vendorHash = "sha256-0Kc8Z32YdmwhKMTBMBAK0ZdnXnH8/Ze1HcMDafosLvw="; vendorHash = "sha256-0Kc8Z32YdmwhKMTBMBAK0ZdnXnH8/Ze1HcMDafosLvw=";

View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ boost ]; buildInputs = [ boost ];
meta = with lib; { meta = with lib; {
homepage = "https://knightos.org/"; homepage = "https://github.com/KnightOS/kcc";
description = "KnightOS C compiler"; description = "KnightOS C compiler";
mainProgram = "kcc"; mainProgram = "kcc";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View file

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ]; buildInputs = [ readline ];
meta = { meta = {
description = "Lambda calculus interpreter"; description = "Lambda calculus interpreter";
homepage = "https://www.chatzi.org/lci/";
mainProgram = "lci"; mainProgram = "lci";
maintainers = with lib.maintainers; [ raskin ]; maintainers = with lib.maintainers; [ raskin ];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;

View file

@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Lightweight device mounter, with libudev as only dependency"; description = "Lightweight device mounter, with libudev as only dependency";
homepage = "https://github.com/LemonBoy/ldm";
mainProgram = "ldm"; mainProgram = "ldm";
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libdeltachat"; pname = "libdeltachat";
version = "1.157.2"; version = "1.157.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chatmail"; owner = "chatmail";
repo = "core"; repo = "core";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-BWG3752UA6Ap6lgL4fxwGqqExZzZAGMEFp3d3udfGBk="; hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA=";
}; };
patches = [ patches = [
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust"; pname = "deltachat-core-rust";
inherit version src; inherit version src;
hash = "sha256-YjUfNLpb215Jo1qPfrrklTPLualWdfbEvNXtiz/F5qY="; hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -20,11 +20,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lunacy"; pname = "lunacy";
version = "11.0"; version = "11.1";
src = fetchurl { src = fetchurl {
url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb";
hash = "sha256-++UJiJBsb+ywLOVmmUt/YZe3yadF/8ZLIAmm6sygcQ0="; hash = "sha256-bxJ5gvI0N55+RzFELfkr9HbB//GRiHSlLHTK7Ki0Z+c=";
}; };
buildInputs = [ buildInputs = [

View file

@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
doCheck = false; doCheck = false;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chxrlt"; owner = "lyrebird-voice-changer";
repo = "lyrebird"; repo = "lyrebird";
tag = "v${version}"; tag = "v${version}";
sha256 = "sha256-VIYcOxvSpzRvJMzEv2i5b7t0WMF7aQxB4Y1jfvuZN/Y="; sha256 = "sha256-VIYcOxvSpzRvJMzEv2i5b7t0WMF7aQxB4Y1jfvuZN/Y=";
@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "Simple and powerful voice changer for Linux, written in GTK 3"; description = "Simple and powerful voice changer for Linux, written in GTK 3";
mainProgram = "lyrebird"; mainProgram = "lyrebird";
homepage = "https://github.com/chxrlt/lyrebird"; homepage = "https://github.com/lyrebird-voice-changer/lyrebird";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ OPNA2608 ]; maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Motif-based sequence analysis tools"; description = "Motif-based sequence analysis tools";
homepage = "https://meme-suite.org/meme/meme-software/";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ gschwartz ]; maintainers = with maintainers; [ gschwartz ];
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -0,0 +1,20 @@
diff --git a/Libraries/MiKTeX/Core/Session/filetypes.cpp b/Libraries/MiKTeX/Core/Session/filetypes.cpp
index 82e55382f..84ac206e9 100644
--- a/Libraries/MiKTeX/Core/Session/filetypes.cpp
+++ b/Libraries/MiKTeX/Core/Session/filetypes.cpp
@@ -198,6 +198,15 @@ void SessionImpl::RegisterFileType(FileType fileType)
searchPath.push_back(myPrefixBinCanon.ToString());
}
#endif
+ if (Utils::GetEnvironmentString("PATH", str))
+ {
+ PathName binDir(str);
+ binDir.Canonicalize();
+ if (std::find(searchPath.begin(), searchPath.end(), binDir.ToString()) == searchPath.end())
+ {
+ searchPath.push_back(binDir.ToString());
+ }
+ }
break;
}
case FileType::OTF:

View file

@ -0,0 +1,247 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
runCommand,
writeText,
biber,
# nativeBuildInputs
bison,
cmake,
curl,
flex,
fop,
libxslt,
pkg-config,
writableTmpDirAsHomeHook,
# buildInputs
apr,
aprutil,
boost,
bzip2,
cairo,
expat,
fontconfig,
freetype,
fribidi,
gd,
gmp,
graphite2,
harfbuzzFull,
hunspell,
libjpeg,
log4cxx,
xz,
mpfr,
mpfi,
libmspack,
libressl,
pixman,
libpng,
popt,
uriparser,
zziplib,
qt6Packages,
}:
let
# This is needed for some bootstrap packages.
webArchivePrefix = "https://web.archive.org/web/20250323131915if_";
miktexRemoteRepository = "https://ctan.org/tex-archive/systems/win32/miktex/tm/packages";
miktexLocalRepository =
runCommand "miktex-local-repository"
{
src1 = fetchurl {
url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-zzdb1-2.9.tar.lzma";
hash = "sha256-XYhbKlxhVSOlCcm0IOs2ddFgAt/CWXJoY6IuLSw74y4=";
};
src2 = fetchurl {
url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-zzdb3-2.9.tar.lzma";
hash = "sha256-5vLuGwjddqtJ5F/DtVKuRVRqgGNbkGFxRF41cXwseIs=";
};
src3 = fetchurl {
url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-config-2.9.tar.lzma";
hash = "sha256-fkh5KL+BU+gl8Sih8xBLi1DOx2vMuSflXlSTchjlGWQ=";
};
src4 = fetchurl {
url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-dvips.tar.lzma";
hash = "sha256-eJQdLhYetNlXAyyiGD/JRDA3fv0BbALwXtNfRxkLM7o=";
};
src5 = fetchurl {
url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-fontconfig.tar.lzma";
hash = "sha256-dxH/0iIL3SnjCSXLGAcNTb5cGJb5AQmV/JbH5CcPHdk=";
};
src6 = fetchurl {
url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-misc.tar.lzma";
hash = "sha256-ysNREvnKWseqqN59cwNzlV21UmccbjSGFyno8lv2H+M=";
};
src7 = fetchurl {
url = "${webArchivePrefix}/${miktexRemoteRepository}/tetex.tar.lzma";
hash = "sha256-DE1o66r2SFxxxuYeCRuFn6L1uBn26IFnje9b/qeVl6Q=";
};
}
''
mkdir $out
cp $src1 $out/miktex-zzdb1-2.9.tar.lzma
cp $src2 $out/miktex-zzdb3-2.9.tar.lzma
cp $src3 $out/miktex-config-2.9.tar.lzma
cp $src4 $out/miktex-dvips.tar.lzma
cp $src5 $out/miktex-fontconfig.tar.lzma
cp $src6 $out/miktex-misc.tar.lzma
cp $src7 $out/tetex.tar.lzma
'';
in
stdenv.mkDerivation (finalAttrs: {
pname = "miktex";
version = "25.2";
src = fetchFromGitHub {
owner = "miktex";
repo = "miktex";
tag = finalAttrs.version;
hash = "sha256-egN9+BRO/EAcbrn/jZac4Lb79H5N/LEjReMPGHVM/yM=";
};
patches = [
./startup-config-support-nix-store.patch
# Miktex will search exectables in "GetMyPrefix(true)/bin".
# The path evalutate to "/usr/bin" in FHS style linux distrubution,
# compared to "/nix/store/.../bin" in NixOS.
# As a result, miktex will fail to find e.g. 'pkexec','ksudo','gksu'
# under /run/wrappers/bin in NixOS.
# We fix this by adding the PATH environment variable to exectables' search path.
./find-exectables-in-path.patch
];
postPatch =
''
# dont symlink fontconfig to /etc/fonts/conf.d
substituteInPlace Programs/MiKTeX/miktex/topics/fontmaps/commands/FontMapManager.cpp \
--replace-fail 'this->ctx->session->IsAdminMode()' 'false'
substituteInPlace \
Libraries/MiKTeX/App/app.cpp \
Programs/Editors/TeXworks/miktex/miktex-texworks.cpp \
Programs/MiKTeX/Console/Qt/main.cpp \
Programs/MiKTeX/PackageManager/mpm/mpm.cpp \
Programs/MiKTeX/Yap/MFC/StdAfx.h \
Programs/MiKTeX/initexmf/initexmf.cpp \
Programs/MiKTeX/miktex/miktex.cpp \
--replace-fail "log4cxx/rollingfileappender.h" "log4cxx/rolling/rollingfileappender.h"
substitute cmake/modules/FindPOPPLER_QT5.cmake \
cmake/modules/FindPOPPLER_QT6.cmake \
--replace-fail "QT5" "QT6" \
--replace-fail "qt5" "qt6"
substituteInPlace Programs/TeXAndFriends/omega/otps/source/outocp.c \
--replace-fail 'fprintf(stderr, s);' 'fprintf(stderr, "%s", s);'
''
# This patch fixes mismatch char types (signed int and unsigned int) on aarch64-linux platform.
# Should not be applied to other platforms otherwise the build will fail.
+ lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
sed -i 's/--using-namespace=MiKTeX::TeXAndFriends/& --chars-are-unsigned/g' \
Programs/TeXAndFriends/Knuth/web/CMakeLists.txt
'';
strictDeps = true;
nativeBuildInputs = [
bison
cmake
curl
flex
fop
libxslt
pkg-config
writableTmpDirAsHomeHook
qt6Packages.wrapQtAppsHook
qt6Packages.qttools
qt6Packages.qt5compat
];
buildInputs = [
apr
aprutil
boost
bzip2
cairo
expat
fontconfig
freetype
fribidi
gd
gmp
graphite2
harfbuzzFull
hunspell
libjpeg
log4cxx
xz
mpfr
mpfi
libmspack
libressl
pixman
libpng
popt
uriparser
zziplib
qt6Packages.poppler
];
cmakeFlags = [
(lib.cmakeBool "WITH_BOOTSTRAPPING" true)
(lib.cmakeBool "USE_SYSTEM_POPPLER" true)
(lib.cmakeBool "USE_SYSTEM_POPPLER_QT" true)
(lib.cmakeBool "MIKTEX_SELF_CONTAINED" false)
# Miktex infers install prefix by stripping CMAKE_INSTALL_BINDIR from the called program.
# It should not be set to absolute path in default cmakeFlags, otherwise an infinite loop will happen.
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
(lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "libexec")
(lib.cmakeFeature "MIKTEX_SYSTEM_LINK_TARGET_DIR" "${placeholder "out"}/bin")
(lib.cmakeFeature "MIKTEX_USER_LINK_TARGET_DIR" "${placeholder "out"}/bin")
];
env = {
LANG = "C.UTF-8";
MIKTEX_REPOSITORY = "file://${miktexLocalRepository}/";
};
enableParallelBuilding = false;
enableParallelChecking = false;
doCheck = true;
# Todo: figure out the exact binary to be Qt wrapped.
dontWrapQtApps = true;
postFixup =
''
wrapQtApp $out/bin/miktex-console
wrapQtApp $out/bin/miktex-texworks
$out/bin/miktexsetup finish --verbose
''
# Biber binary is missing on ctan.org for aarch64-linux platform.
+ lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
ln -sf ${biber}/bin/biber $out/bin/biber
'';
meta = {
description = "A modern TeX distribution";
homepage = "https://miktex.org";
platforms = lib.platforms.linux;
license = with lib.licenses; [
lppl13c
gpl2Plus
gpl3Plus
publicDomain
];
maintainers = with lib.maintainers; [
qbisi
];
};
})

View file

@ -0,0 +1,40 @@
diff --git a/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp b/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp
index 1728e7af9..727c36d8c 100644
--- a/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp
+++ b/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp
@@ -90,6 +90,10 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver
{
pos = n - 2;
}
+ else if (n > 3 && splittedPrefix[1] == "nix" && splittedPrefix[2] == "store")
+ {
+ pos = 1;
+ }
if (pos < n)
{
PathName destdir;
@@ -98,10 +102,10 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver
destdir /= splittedPrefix[i];
}
MIKTEX_ASSERT(MIKTEX_SYSTEM_VAR_LIB_DIR[0] == '/');
- ret.commonConfigRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf";
+ ret.commonConfigRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf" / "config";
MIKTEX_ASSERT(MIKTEX_SYSTEM_VAR_CACHE_DIR[0] == '/');
ret.commonDataRoot = destdir / (MIKTEX_SYSTEM_VAR_CACHE_DIR + 1) / MIKTEX_PREFIX "texmf";
- ret.commonInstallRoot = destdir / "usr" / "local" / MIKTEX_INSTALL_DIR;
+ ret.commonInstallRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf" / "install";
}
#endif
if (ret.commonConfigRoot.Empty())
@@ -124,9 +128,9 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver
PathName myLoc = GetMyLocation(true);
#if defined(MIKTEX_MACOS_BUNDLE)
- ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/Applications"), myLoc) ? TriState::True : TriState::False;
+ ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/nix/store"), myLoc) || Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/Applications"), myLoc) ? TriState::True : TriState::False;
#else
- ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/opt"), myLoc) ? TriState::True : TriState::False;
+ ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/nix/store"), myLoc) || Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/opt"), myLoc) ? TriState::True : TriState::False;
#endif
return ret;

View file

@ -1,185 +1,5 @@
{ {
"depends": [ "depends": [
{
"method": "fetchzip",
"path": "/nix/store/y6w1gzbf6i691z35rbn6kzrmf1n5bmdc-source",
"rev": "cb8b7bfdcdc2272aadf92153c668acd3c901bd6b",
"sha256": "1ggp5rvs217dv2n0p5ddm5h17pv2mc7724n8cd0b393kmsjiykhz",
"srcDir": "src",
"url": "https://github.com/nitely/nim-regex/archive/cb8b7bfdcdc2272aadf92153c668acd3c901bd6b.tar.gz",
"subDir": "",
"packages": [
"regex"
]
},
{
"method": "fetchzip",
"path": "/nix/store/wb2x78l0bcjax6mzh6kc0ir7081hwsqp-source",
"rev": "15c5e25e2a49a924bc97647481ff50125bba2c76",
"sha256": "13s6mmsy5ah4sjpcl53x0qd8szc040s4nd47kszqyj1qxy340j6j",
"srcDir": "src",
"url": "https://github.com/nitely/nim-unicodedb/archive/15c5e25e2a49a924bc97647481ff50125bba2c76.tar.gz",
"subDir": "",
"packages": [
"unicodedb"
]
},
{
"method": "fetchzip",
"path": "/nix/store/vmy6gkjzq9h7myz0x6d9nhvkbbsyswxm-source",
"rev": "c04576d829b8a0a1b12baaa8bc92037501b3a4a0",
"sha256": "0plwammxi4iis59p2416g7420f5fx38jziwhmi082c5lm2x658x9",
"srcDir": "",
"url": "https://github.com/status-im/nim-chronos/archive/c04576d829b8a0a1b12baaa8bc92037501b3a4a0.tar.gz",
"subDir": "",
"packages": [
"chronos"
]
},
{
"method": "fetchzip",
"path": "/nix/store/nl53j85lzfw7292g7ly0nydp60icp1ba-source",
"rev": "8bb1acbaa4b86eb866145b0d468eff64a57d1897",
"sha256": "0p8gs6q91j0s8k7f83j07v0ka75jgbd3x6n5fcjp76yyfxq6nll4",
"srcDir": "",
"url": "https://github.com/status-im/nim-http-utils/archive/8bb1acbaa4b86eb866145b0d468eff64a57d1897.tar.gz",
"subDir": "",
"packages": [
"httputils"
]
},
{
"method": "fetchzip",
"path": "/nix/store/ldwb9l3j8xz8z591v9954asg1f6sx990-source",
"rev": "3236fa68394f1e3a06e2bc34218aacdd2d675923",
"sha256": "0k8q80s8ibhb5dssbg87z4rlhpqkmwhccpl8djg2l671bjbpc1hp",
"srcDir": "",
"url": "https://github.com/status-im/nim-stint/archive/3236fa68394f1e3a06e2bc34218aacdd2d675923.tar.gz",
"subDir": "",
"packages": [
"stint"
]
},
{
"method": "fetchzip",
"path": "/nix/store/2ksmfd7p93a1a7ibcv3qzsk8h3c3shz7-source",
"rev": "845b6af28b9f68f02d320e03ad18eccccea7ddb9",
"sha256": "1c55kl05pbavm9v5dv42n43sql9qcrblhh3hnp99p5xmlv20c9vf",
"srcDir": "",
"url": "https://github.com/status-im/nim-unittest2/archive/845b6af28b9f68f02d320e03ad18eccccea7ddb9.tar.gz",
"subDir": "",
"packages": [
"unittest2"
]
},
{
"method": "fetchzip",
"path": "/nix/store/jk20z5n9y08il34a6w0wzkiak1vyww57-source",
"rev": "179f81dedaddb5ba8d02534ccc8b7a8335981f49",
"sha256": "04l35gx67pyaja1zf14ix1ykvf985affxrwdz9j01pdq89mi4wzi",
"srcDir": "",
"url": "https://github.com/status-im/nim-websock/archive/179f81dedaddb5ba8d02534ccc8b7a8335981f49.tar.gz",
"subDir": "",
"packages": [
"websock"
]
},
{
"method": "fetchzip",
"path": "/nix/store/d6c7dvmzzvc1ja7kf65jbclbjv74zll7-source",
"rev": "2086c99608b4bf472e1ef5fe063710f280243396",
"sha256": "1m7c9bvxarw167kd5mpfnddzydji03azhz347hvad592qfw4vwrc",
"srcDir": "",
"url": "https://github.com/status-im/nim-serialization/archive/2086c99608b4bf472e1ef5fe063710f280243396.tar.gz",
"subDir": "",
"packages": [
"serialization"
]
},
{
"method": "fetchzip",
"path": "/nix/store/cgk4hrq58z2lkyvw50z48fx2amknznwk-source",
"rev": "a6e198132097fb544d04959aeb3b839e1408f942",
"sha256": "0g9k6f6myjbzqnvpw031jbndld24vhgzbw04mhrg8drshkcc8hl5",
"srcDir": "",
"url": "https://github.com/status-im/nim-stew/archive/a6e198132097fb544d04959aeb3b839e1408f942.tar.gz",
"subDir": "",
"packages": [
"stew"
]
},
{
"method": "fetchzip",
"path": "/nix/store/8ijlgkqw88mgn94xagrjclixsi0czcmz-source",
"rev": "c246d00eaa7d6f52019464b37da510a8be23e939",
"sha256": "0b23xim2vprz2kfycj63kz4hmga92rvxx37a4r4dp562p5rncjgv",
"srcDir": "",
"url": "https://github.com/status-im/nim-faststreams/archive/c246d00eaa7d6f52019464b37da510a8be23e939.tar.gz",
"subDir": "",
"packages": [
"faststreams"
]
},
{
"method": "fetchzip",
"path": "/nix/store/0fqfwjcwsln69s6kjg21nan1zpjkhm5a-source",
"rev": "bd36a44410dd8365649e425ccade817178628e12",
"sha256": "159h07k8axskgpq64b79qsixf83nq7b9r09367ghj7f1bgbgfa6w",
"srcDir": "",
"url": "https://github.com/zevv/with/archive/bd36a44410dd8365649e425ccade817178628e12.tar.gz",
"subDir": "",
"packages": [
"with"
]
},
{
"method": "fetchzip",
"path": "/nix/store/68bbq8adcyng1n6wlh1mxs9zrvmlqfhj-source",
"rev": "e4fb95cbe36ad1e231661c922da04b81e0ffeed9",
"sha256": "0gqhag91f8dkdv0v2mg6pz5q6afl70bbnk628i52p4wsi4bl49jj",
"srcDir": "",
"url": "https://github.com/status-im/nim-testutils/archive/e4fb95cbe36ad1e231661c922da04b81e0ffeed9.tar.gz",
"subDir": "",
"packages": [
"testutils"
]
},
{
"method": "fetchzip",
"path": "/nix/store/d2k2zimyby03ppam7a3jagjp64s7kv66-source",
"rev": "57b2392ad69849e3e2d02b74a8a0feee2c3d9570",
"sha256": "1wma3dhrrdfxn05ds6yiv9mj071czv90x06bm7f5rslzk0s7m1af",
"srcDir": "",
"url": "https://github.com/arnetheduck/nim-results/archive/57b2392ad69849e3e2d02b74a8a0feee2c3d9570.tar.gz",
"subDir": "",
"packages": [
"results"
]
},
{
"method": "fetchzip",
"path": "/nix/store/ifn939s0mkrk8apgzw9zx8r7qlqq7hff-source",
"rev": "31af0f2bda1486ffb7326c5df1dc47dc63d73fff",
"sha256": "1vsbrs2fyais2x58sz5a214zbvjbczzj4ph8hjmaxc7gwmh901xn",
"srcDir": "",
"url": "https://github.com/status-im/nim-json-rpc/archive/31af0f2bda1486ffb7326c5df1dc47dc63d73fff.tar.gz",
"subDir": "",
"packages": [
"json_rpc"
]
},
{
"method": "fetchzip",
"path": "/nix/store/1y5divckxhpdlhjf25jakr3fnlbqqv0k-source",
"rev": "dc07e3058c6904eef965394493b6ea99aa2adefc",
"sha256": "1nj45bn99lyylzd3add01irxn2irhpj2ll9sphjf1zlczmga7d49",
"srcDir": "",
"url": "https://github.com/cheatfate/nimcrypto/archive/dc07e3058c6904eef965394493b6ea99aa2adefc.tar.gz",
"subDir": "",
"packages": [
"nimcrypto"
]
},
{ {
"method": "git", "method": "git",
"path": "/nix/store/mki47dpj9mi8wa7gwhp3n0q6z9lhn1mv-nim-bearssl-667b404", "path": "/nix/store/mki47dpj9mi8wa7gwhp3n0q6z9lhn1mv-nim-bearssl-667b404",
@ -194,18 +14,6 @@
"bearssl" "bearssl"
] ]
}, },
{
"method": "fetchzip",
"path": "/nix/store/jfiwlq3w0jq79aj3izx5zdrv218phjqy-source",
"rev": "ab1a061756bb6fc2e0f98cb57852f2bb0c6f9772",
"sha256": "0926ixcw451qdfvcfx0b7g7bm3345gvnchfy349v3pf8vh3nn7jz",
"srcDir": "",
"url": "https://github.com/status-im/nim-json-serialization/archive/ab1a061756bb6fc2e0f98cb57852f2bb0c6f9772.tar.gz",
"subDir": "",
"packages": [
"json_serialization"
]
},
{ {
"method": "fetchzip", "method": "fetchzip",
"path": "/nix/store/s0xpqswh05sy658ah0jxwvarczi2p8b1-source", "path": "/nix/store/s0xpqswh05sy658ah0jxwvarczi2p8b1-source",
@ -218,11 +26,203 @@
"chronicles" "chronicles"
] ]
}, },
{
"method": "fetchzip",
"path": "/nix/store/7sgxspvgamvlsds48j7lb3p48qcwz1iw-source",
"rev": "0646c444fce7c7ed08ef6f2c9a7abfd172ffe655",
"sha256": "1r499jl0lhnjq7hgddwgjl0gh3y1mprnqkhk0h6yh3cwgsmr5ym9",
"srcDir": "",
"url": "https://github.com/status-im/nim-chronos/archive/0646c444fce7c7ed08ef6f2c9a7abfd172ffe655.tar.gz",
"subDir": "",
"packages": [
"chronos"
]
},
{
"method": "fetchzip",
"path": "/nix/store/cxdwn7p4cis5hd5w4jsn8lql5vzx5civ-source",
"rev": "2b08c774afaafd600cf4c6f994cf78b8aa090c0c",
"sha256": "10zl9a5phdsjj811v8by0yzadfc8d3azaj878an2hr8qsfi9y1ps",
"srcDir": "",
"url": "https://github.com/status-im/nim-faststreams/archive/2b08c774afaafd600cf4c6f994cf78b8aa090c0c.tar.gz",
"subDir": "",
"packages": [
"faststreams"
]
},
{
"method": "fetchzip",
"path": "/nix/store/m2c5l6z5mgknzkidhjsaz7n8pr1lb5ia-source",
"rev": "79cbab1460f4c0cdde2084589d017c43a3d7b4f1",
"sha256": "14nfr78anj3vsj5rwy7ikjnggzdzb7m2x2pjjgi8z20a6pv9p1ha",
"srcDir": "",
"url": "https://github.com/status-im/nim-http-utils/archive/79cbab1460f4c0cdde2084589d017c43a3d7b4f1.tar.gz",
"subDir": "",
"packages": [
"httputils"
]
},
{
"method": "fetchzip",
"path": "/nix/store/s6inc18jrmmnzpvdnms6lh85bv25523w-source",
"rev": "274372132de497e6b7b793c9d5d5474b71bf80a2",
"sha256": "04p030b0lk6j54bwyh47mc4qhvbym0px5l4y69p51n953s7affy7",
"srcDir": "",
"url": "https://github.com/status-im/nim-json-rpc/archive/274372132de497e6b7b793c9d5d5474b71bf80a2.tar.gz",
"subDir": "",
"packages": [
"json_rpc"
]
},
{
"method": "fetchzip",
"path": "/nix/store/p6c3fm650blwa95zvf52vh08lmjk3vfj-source",
"rev": "6eadb6e939ffa7882ff5437033c11a9464d3385c",
"sha256": "00w5kv5w4hz9yq5xzkxk95591n1m56z76j1al8kqhsabbgvnab8a",
"srcDir": "",
"url": "https://github.com/status-im/nim-json-serialization/archive/6eadb6e939ffa7882ff5437033c11a9464d3385c.tar.gz",
"subDir": "",
"packages": [
"json_serialization"
]
},
{
"method": "fetchzip",
"path": "/nix/store/1y5divckxhpdlhjf25jakr3fnlbqqv0k-source",
"rev": "dc07e3058c6904eef965394493b6ea99aa2adefc",
"sha256": "1nj45bn99lyylzd3add01irxn2irhpj2ll9sphjf1zlczmga7d49",
"srcDir": "",
"url": "https://github.com/cheatfate/nimcrypto/archive/dc07e3058c6904eef965394493b6ea99aa2adefc.tar.gz",
"subDir": "",
"packages": [
"nimcrypto"
]
},
{
"method": "fetchzip",
"path": "/nix/store/zk3nnz2rphdjll15cfws3k1m16gs7zpf-source",
"rev": "0673df07cb266e15942c3b5f5b8a4732f049cd73",
"sha256": "1aip87rhvl6jhxkpj0gw9z18g5k03qjkhwi15rgqh7dmy4f7qggv",
"srcDir": "src",
"url": "https://github.com/nitely/nim-regex/archive/0673df07cb266e15942c3b5f5b8a4732f049cd73.tar.gz",
"subDir": "",
"packages": [
"regex"
]
},
{
"method": "fetchzip",
"path": "/nix/store/17gj9sw2hw818cbxvd6i94n734inm1vf-source",
"rev": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
"sha256": "1h7amas16sbhlr7zb7n3jb5434k98ji375vzw72k1fsc86vnmcr9",
"srcDir": "",
"url": "https://github.com/arnetheduck/nim-results/archive/df8113dda4c2d74d460a8fa98252b0b771bf1f27.tar.gz",
"subDir": "",
"packages": [
"results"
]
},
{
"method": "fetchzip",
"path": "/nix/store/d6c7dvmzzvc1ja7kf65jbclbjv74zll7-source",
"rev": "2086c99608b4bf472e1ef5fe063710f280243396",
"sha256": "1m7c9bvxarw167kd5mpfnddzydji03azhz347hvad592qfw4vwrc",
"srcDir": "",
"url": "https://github.com/status-im/nim-serialization/archive/2086c99608b4bf472e1ef5fe063710f280243396.tar.gz",
"subDir": "",
"packages": [
"serialization"
]
},
{
"method": "fetchzip",
"path": "/nix/store/a5kmnnbk27rxk9vsx1vchiiq9znkpijf-source",
"rev": "79e4fa5a9d3374db17ed63622714d3e1094c7f34",
"sha256": "0x92sgnxczwx5ak067d6169j9qm0cdpbrcpp1ijrzgyfgknpyq0r",
"srcDir": "",
"url": "https://github.com/status-im/nim-stew/archive/79e4fa5a9d3374db17ed63622714d3e1094c7f34.tar.gz",
"subDir": "",
"packages": [
"stew"
]
},
{
"method": "fetchzip",
"path": "/nix/store/ch40287lsmlpcrimi6p32irsyp8750dz-source",
"rev": "1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc",
"sha256": "1791gj3nxn8cffw0q5id5fahyqz6chl4b94hbvvcj45nv7drj8ms",
"srcDir": "",
"url": "https://github.com/status-im/nim-stint/archive/1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc.tar.gz",
"subDir": "",
"packages": [
"stint"
]
},
{
"method": "fetchzip",
"path": "/nix/store/5zsg89yl1c4xbwxz204f89fhqw0pfyh2-source",
"rev": "4d37244f9f5e1acd8592a4ceb5c3fc47bc160181",
"sha256": "1knxmh42y10lgk2np3msacb0p01m071zq522sz19rc7c192qylin",
"srcDir": "",
"url": "https://github.com/status-im/nim-testutils/archive/4d37244f9f5e1acd8592a4ceb5c3fc47bc160181.tar.gz",
"subDir": "",
"packages": [
"testutils"
]
},
{
"method": "fetchzip",
"path": "/nix/store/kfq6qp0l8vcr7dlnb4ahjldyp2wmg9d2-source",
"rev": "66f2458710dc641dd4640368f9483c8a0ec70561",
"sha256": "092z3glgdb7rmwajm7dmqzvralkm7ixighixk8ycf8sf17zm72ck",
"srcDir": "src",
"url": "https://github.com/nitely/nim-unicodedb/archive/66f2458710dc641dd4640368f9483c8a0ec70561.tar.gz",
"subDir": "",
"packages": [
"unicodedb"
]
},
{
"method": "fetchzip",
"path": "/nix/store/2ksmfd7p93a1a7ibcv3qzsk8h3c3shz7-source",
"rev": "845b6af28b9f68f02d320e03ad18eccccea7ddb9",
"sha256": "1c55kl05pbavm9v5dv42n43sql9qcrblhh3hnp99p5xmlv20c9vf",
"srcDir": "",
"url": "https://github.com/status-im/nim-unittest2/archive/845b6af28b9f68f02d320e03ad18eccccea7ddb9.tar.gz",
"subDir": "",
"packages": [
"unittest2"
]
},
{
"method": "fetchzip",
"path": "/nix/store/y0bn3k5amqv7dymdg4743f6ib3xjv9c2-source",
"rev": "ebe308a79a7b440a11dfbe74f352be86a3883508",
"sha256": "0xzkhx0hbzidxfasy0sna9jnr83qfnddklmm4ngvp11fgz29licd",
"srcDir": "",
"url": "https://github.com/status-im/nim-websock/archive/ebe308a79a7b440a11dfbe74f352be86a3883508.tar.gz",
"subDir": "",
"packages": [
"websock"
]
},
{
"method": "fetchzip",
"path": "/nix/store/0fqfwjcwsln69s6kjg21nan1zpjkhm5a-source",
"rev": "bd36a44410dd8365649e425ccade817178628e12",
"sha256": "159h07k8axskgpq64b79qsixf83nq7b9r09367ghj7f1bgbgfa6w",
"srcDir": "",
"url": "https://github.com/zevv/with/archive/bd36a44410dd8365649e425ccade817178628e12.tar.gz",
"subDir": "",
"packages": [
"with"
]
},
{ {
"method": "git", "method": "git",
"path": "/nix/store/yz5sl71l2s8fa0af2afrip4adv5yz681-nim-zlib-02311a3", "path": "/nix/store/5wiybf9wc0fajjh5d4f9gi4k4d92yakz-nim-zlib-3f79980",
"rev": "02311a35623964a3ef37da8cd896ed95be06e6da", "rev": "3f7998095264d262a8d99e2be89045e6d9301537",
"sha256": "105yzm4phva8ga2nw9yy9kk37lwanpgiq9g77ag54fc005cr0sm6", "sha256": "054raay2cx5yyq7bda7pvfa5d5m7shv70kp21l9g767idybc7jr8",
"srcDir": "", "srcDir": "",
"url": "https://github.com/status-im/nim-zlib", "url": "https://github.com/status-im/nim-zlib",
"subDir": "", "subDir": "",

View file

@ -6,17 +6,17 @@
buildNimPackage ( buildNimPackage (
final: prev: rec { final: prev: rec {
pname = "nimlangserver"; pname = "nimlangserver";
version = "1.8.1"; version = "1.10.0";
# nix build ".#nimlangserver.src" # nix build ".#nimlangserver.src"
# nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --prefetch-git:bearssl,zlib # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --git,=,bearssl,zlib
lockFile = ./lock.json; lockFile = ./lock.json;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nim-lang"; owner = "nim-lang";
repo = "langserver"; repo = "langserver";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-j5YnTGPtt0WhRvNfpgO9tjAqZJA5Kt1FE1Mjqn0/DNY="; hash = "sha256-KApIzGknWDb7UJkzii9rGOING4G8D31zUoWvMH4iw4A=";
}; };
doCheck = false; doCheck = false;

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "odp-dpdk"; pname = "odp-dpdk";
version = "1.44.0.0_DPDK_22.11"; version = "1.46.0.0_DPDK_22.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenDataPlane"; owner = "OpenDataPlane";
repo = "odp-dpdk"; repo = "odp-dpdk";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hYtQ7kKB08BImkTYXqtnv1Ny1SUPCs6GX7WOYks8iKA="; hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,44 @@
{
lib,
stdenv,
orthanc,
gtest,
icu,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "orthanc-framework";
inherit (orthanc)
src
version
nativeBuildInputs
strictDeps
cmakeFlags
;
sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary";
outputs = [
"out"
"dev"
];
buildInputs = orthanc.buildInputs ++ [
icu
];
NIX_LDFLAGS = lib.strings.concatStringsSep " " [
"-L${lib.getLib zlib}"
"-lz"
"-L${lib.getLib gtest}"
"-lgtest"
];
meta = {
description = "SDK for building Orthanc plugins and related applications";
homepage = "https://www.orthanc-server.com/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ drupol ];
platforms = lib.platforms.linux;
};
})

View file

@ -0,0 +1,16 @@
diff -r ad41d16f36b1 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Jan 17 12:24:54 2025 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Mar 20 17:45:59 2025 +0100
@@ -552,9 +552,10 @@
set(ORTHANC_FRAMEWORK_INCLUDE_DIR ${ORTHANC_FRAMEWORK_ROOT})
else()
find_path(ORTHANC_FRAMEWORK_INCLUDE_DIR OrthancFramework.h
- /usr/include/orthanc-framework
- /usr/local/include/orthanc-framework
+ /usr/
+ /usr/local/
${ORTHANC_FRAMEWORK_ROOT}
+ PATH_SUFFIXES include include/orthanc-framework
)
endif()

View file

@ -0,0 +1,106 @@
{
lib,
stdenv,
fetchhg,
fetchurl,
orthanc,
cmake,
python3,
unzip,
gtest,
jsoncpp,
boost,
pugixml,
libuuid,
zlib,
pkg-config,
}:
let
bootstrap = fetchurl {
url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/bootstrap-5.3.3.zip";
hash = "sha256-VdfxznlQQK+4MR3wnSnQ00ZIQAweqrstCi7SIWs9sF0=";
};
vuejs = fetchurl {
url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/vuejs-2.6.10.tar.gz";
hash = "sha256-49kAzZJmtb7Zu21XX8mrZ4fnnnrSHAHuEne/9UUxIfI=";
};
axios = fetchurl {
url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/axios-0.19.0.tar.gz";
hash = "sha256-KVd8YIWwkLTkqZOS/N1YL7a7y0myqvLMe3+jh0Ups4A=";
};
font-awesome = fetchurl {
url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/Font-Awesome-4.7.0.tar.gz";
hash = "sha256-3lEroOHerTgrv843LN50s/GJcdh2//tjXukzPw2wXUM=";
};
babel-polyfill = fetchurl {
url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/babel-polyfill-6.26.0.min.js.gz";
hash = "sha256-CH09LWISr7QY9QSRhY9/BVy1Te+2NR1sXQCPZioqlcI=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "orthanc-plugin-dicomweb";
version = "1.18";
src = fetchhg {
url = "https://orthanc.uclouvain.be/hg/orthanc-dicomweb/";
rev = "OrthancDicomWeb-${finalAttrs.version}";
hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc=";
};
patches = [
# Fix Orthanc Framework headers files detection
./fix-orthanc-framework-headers-detection.patch
];
postPatch = ''
mkdir -p ThirdPartyDownloads
ln -s ${bootstrap} ThirdPartyDownloads/bootstrap-5.3.3.zip
ln -s ${vuejs} ThirdPartyDownloads/vuejs-2.6.10.tar.gz
ln -s ${axios} ThirdPartyDownloads/axios-0.19.0.tar.gz
ln -s ${font-awesome} ThirdPartyDownloads/Font-Awesome-4.7.0.tar.gz
ln -s ${babel-polyfill} ThirdPartyDownloads/babel-polyfill-6.26.0.min.js.gz
'';
SourceRoot = "${finalAttrs.src.name}/Build";
nativeBuildInputs = [
cmake
python3
unzip
];
buildInputs = [
orthanc
orthanc.framework
jsoncpp
boost
gtest
libuuid
pugixml
zlib
];
strictDeps = true;
NIX_LDFLAGS = lib.strings.concatStringsSep " " [
"-L${lib.getLib gtest}"
"-lgtest"
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DSTATIC_BUILD=OFF"
"-DORTHANC_FRAMEWORK_SOURCE=system"
];
meta = {
description = "Plugin that extends Orthanc with support for the DICOMweb protocols";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
drupol
dvcorreia
];
platforms = lib.platforms.linux;
};
})

View file

@ -23,6 +23,7 @@
unzip, unzip,
versionCheckHook, versionCheckHook,
nixosTests, nixosTests,
orthanc-framework,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -41,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
./add-missing-include.patch ./add-missing-include.patch
]; ];
outputs = [
"out"
"dev"
"doc"
];
sourceRoot = "${finalAttrs.src.name}/OrthancServer"; sourceRoot = "${finalAttrs.src.name}/OrthancServer";
nativeBuildInputs = [ nativeBuildInputs = [
@ -98,6 +105,15 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "USE_SYSTEM_ZLIB" true) (lib.cmakeBool "USE_SYSTEM_ZLIB" true)
]; ];
# Remove warnings during the build
env.NIX_CFLAGS_COMPILE = "-Wno-builtin-macro-redefined";
postInstall = ''
mkdir -p $doc/share/doc/orthanc
cp -r $src/OrthancServer/Resources/Samples $doc/share/doc/orthanc/Samples
cp -r $src/OrthancServer/Plugins/Samples $doc/share/doc/orthanc/OrthancPluginSamples
'';
nativeInstallCheckInputs = [ nativeInstallCheckInputs = [
versionCheckHook versionCheckHook
]; ];
@ -105,8 +121,11 @@ stdenv.mkDerivation (finalAttrs: {
versionCheckProgramArg = "--version"; versionCheckProgramArg = "--version";
doInstallCheck = true; doInstallCheck = true;
passthru.tests = { passthru = {
inherit (nixosTests) orthanc; framework = orthanc-framework;
tests = {
inherit (nixosTests) orthanc;
};
}; };
meta = { meta = {

View file

@ -0,0 +1,13 @@
--- a/cmdline.c 2021-10-05 22:29:41.000000000 -0700
+++ a/cmdline.c 2024-05-30 12:05:29.146787602 -0700
@@ -22,10 +22,8 @@
* @APPLE_LICENSE_HEADER_END@
*/
#include <stdio.h>
-#ifndef __linux__
#include <stdlib.h>
#include <unistd.h>
-#endif
#include <string.h>
#include <errno.h>
#include <fcntl.h>

View file

@ -5,18 +5,16 @@
fetchpatch, fetchpatch,
installShellFiles, installShellFiles,
libbsd, libbsd,
CoreFoundation,
IOKit,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "pdisk"; pname = "pdisk";
version = "0.9"; version = "0.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "apple-oss-distributions"; owner = "apple-oss-distributions";
repo = pname; repo = "pdisk";
rev = "${pname}-${lib.versions.minor version}"; tag = "pdisk-${lib.versions.minor finalAttrs.version}";
hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs=";
}; };
@ -41,30 +39,30 @@ stdenv.mkDerivation rec {
url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=d0c930ea8bcac008bbd0ade1811133a625caea54"; url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=d0c930ea8bcac008bbd0ade1811133a625caea54";
sha256 = "sha256-HGJIS+vTn6456KtaETutIgTPPBm2C9OHf1anG8yaJPo="; sha256 = "sha256-HGJIS+vTn6456KtaETutIgTPPBm2C9OHf1anG8yaJPo=";
}) })
# Fix missing includes on Linux
./cmdline.patch
]; ];
postPatch = postPatch =
'' ''
substituteInPlace makefile \ substituteInPlace makefile \
--replace 'cc' '${stdenv.cc.targetPrefix}cc' --replace-fail 'cc' '${stdenv.cc.targetPrefix}cc'
'' ''
+ lib.optionalString stdenv.hostPlatform.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace makefile \ substituteInPlace makefile \
--replace '-lbsd' '-framework CoreFoundation -framework IOKit' --replace-fail '-lbsd' '-framework CoreFoundation -framework IOKit'
''; '';
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
]; ];
buildInputs = buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
lib.optionals (!stdenv.hostPlatform.isDarwin) [ libbsd
libbsd ];
]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
CoreFoundation
IOKit
];
env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
@ -73,8 +71,9 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dm755 cvt_pt $out/bin/cvt_pt for exe in pdisk cvt_pt; do
install -Dm755 pdisk $out/bin/pdisk install -Dm755 -t $out/bin $exe
done
installManPage pdisk.8 installManPage pdisk.8
install -Dm644 pdisk.html $out/share/doc/pdisk/pdisk.html install -Dm644 pdisk.html $out/share/doc/pdisk/pdisk.html
@ -82,14 +81,15 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = {
description = "Low-level Apple partition table editor for Linux, OSS Apple version"; description = "Low-level Apple partition table editor for Linux, OSS Apple version";
homepage = "https://github.com/apple-oss-distributions/pdisk"; homepage = "https://github.com/apple-oss-distributions/pdisk";
license = with licenses; [ license = with lib.licenses; [
hpnd # original license statements seems to match this (in files that are shared with mac-fdisk) hpnd # original license statements seems to match this (in files that are shared with mac-fdisk)
apple-psl10 # new files apple-psl10 # new files
]; ];
maintainers = with maintainers; [ OPNA2608 ]; mainProgram = "pdisk";
platforms = platforms.unix; maintainers = with lib.maintainers; [ OPNA2608 ];
platforms = lib.platforms.unix;
}; };
} })

View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rustypaste"; pname = "rustypaste";
version = "0.16.0"; version = "0.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "orhun"; owner = "orhun";
repo = "rustypaste"; repo = "rustypaste";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Kv6hmqqGY9SssiT/MYmYCZ71N8CHFTT7K4q7eMdQTQU="; sha256 = "sha256-Jfi2Q6551g58dfOqtHtWxkbxwYV71f7MIuLB8RbaR94=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-g7HoDPNP6DeV6NlC/F5KxBVMMgLw6zvVmOUe6yndRMQ="; cargoHash = "sha256-10tBbn4XtdUNhfzb+KpwFGZAc7YVIEQRaqNLzJC1GGI=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.CoreServices

View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "steamguard-cli"; pname = "steamguard-cli";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dyc3"; owner = "dyc3";
repo = "steamguard-cli"; repo = "steamguard-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-gPw0D5/XpT1bRYgG6GgDSP47Pa6MR3qzKhVwB4MrLKU="; hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-uu+Ngz5hfH1Pg2KcumpHW3BDggBGJgRh0W06a6fPrfg="; cargoHash = "sha256-OBftq8bPqmc77oeOStAeXZN5DHfASdOJCrmgDTgHFWc=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

View file

@ -0,0 +1,41 @@
{
lib,
python3Packages,
fetchFromGitHub,
tree,
versionCheckHook,
}:
let
version = "1.2.0";
in
python3Packages.buildPythonApplication {
pname = "stown";
inherit version;
pyproject = true;
src = fetchFromGitHub {
owner = "rseichter";
repo = "stown";
tag = version;
hash = "sha256-iHeqmlo7be28ISJfPZ7GZC2gj2VVgt20ORnfYVToo0A=";
};
build-system = [
python3Packages.setuptools
];
nativeCheckInputs = [
python3Packages.pytestCheckHook
tree
versionCheckHook
];
meta = {
description = "Manage file system object mapping via symlinks. Lightweight alternative to GNU Stow";
homepage = "https://www.seichter.de/stown/";
changelog = "https://github.com/rseichter/stown/blob/${version}/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ rseichter ];
mainProgram = "stown";
};
}

View file

@ -2,6 +2,8 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchurl,
llvmPackages,
cmake, cmake,
gfortran, gfortran,
blas, blas,
@ -10,7 +12,9 @@
mpiCheckPhaseHook, mpiCheckPhaseHook,
metis, metis,
parmetis, parmetis,
withExamples ? false,
fortranSupport ? stdenv.hostPlatform.isLinux,
enableOpenMP ? true,
# Todo: ask for permission of unfree parmetis # Todo: ask for permission of unfree parmetis
withParmetis ? false, withParmetis ? false,
}: }:
@ -34,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ patches = [
./mc64ad_dist-stub.patch ./mc64ad_dist-stub.patch
(fetchurl {
url = "https://github.com/xiaoyeli/superlu_dist/commit/8ef3f7fda091529d7e7f16087864fee66c4834c9.patch";
hash = "sha256-kCSqojYKpk75m+FwhS0hXHSybm+GZzOYikePcf2U3Fw=";
})
]; ];
postPatch = '' postPatch = ''
@ -41,13 +49,20 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "LargeDiag_MC64" "NOROWPERM" --replace-fail "LargeDiag_MC64" "NOROWPERM"
''; '';
nativeBuildInputs = [ nativeBuildInputs =
cmake [
gfortran cmake
]; ]
++ lib.optionals fortranSupport [
gfortran
];
buildInputs = buildInputs =
[ lib.optionals (enableOpenMP && stdenv.cc.isClang) [
# cmake can not find mpi if openmp is placed after mpi
llvmPackages.openmp
]
++ [
mpi mpi
lapack lapack
] ]
@ -60,9 +75,11 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = cmakeFlags =
[ [
(lib.cmakeBool "enable_examples" withExamples)
(lib.cmakeBool "enable_openmp" enableOpenMP)
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
(lib.cmakeBool "enable_fortran" true) (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
(lib.cmakeBool "enable_complex16" true) (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport)
(lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false) (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false)
(lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true) (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true)
(lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis) (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis)
@ -96,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
asl20 asl20
]; ];
description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations"; description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations";
platforms = lib.platforms.linux; platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ qbisi ]; maintainers = with lib.maintainers; [ qbisi ];
}; };
}) })

View file

@ -17,6 +17,11 @@ buildGoModule rec {
vendorHash = "sha256-yQien8v7Ru+JWLou9QfyKZAR2ENMHO2aF2vzuWyQcjY="; vendorHash = "sha256-yQien8v7Ru+JWLou9QfyKZAR2ENMHO2aF2vzuWyQcjY=";
ldflags = [
# Fix protobuf errors https://github.com/tenable/terrascan/pull/1703/files
"-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=ignore"
];
# Tests want to download a vulnerable Terraform project # Tests want to download a vulnerable Terraform project
doCheck = false; doCheck = false;

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "vals"; pname = "vals";
version = "0.39.2"; version = "0.39.4";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "helmfile"; owner = "helmfile";
repo = pname; repo = pname;
sha256 = "sha256-FRFkr3bic2bXC+k+Zbbi9Oni/m4uiOqY6cIgzuJZiqU="; sha256 = "sha256-UHiVAT7EE+rH+fcTDtTrTTVYktsePUojfAQgPWRNui0=";
}; };
vendorHash = "sha256-DOnoO5LaLilqlEfbZQw46l1LtHuxj6OfuwVZZNYuQB8="; vendorHash = "sha256-5Wg5cRr470GikN1cuot4HkErK0VPHYPfQiC4d/frSsc=";
proxyVendor = true; proxyVendor = true;

View file

@ -1,22 +1,22 @@
{ {
lib, lib,
buildGoModule, buildGo124Module,
fetchFromGitHub, fetchFromGitHub,
}: }:
buildGoModule rec { buildGo124Module rec {
pname = "vuls"; pname = "vuls";
version = "0.29.0"; version = "0.30.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "future-architect"; owner = "future-architect";
repo = "vuls"; repo = "vuls";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-aQwQgQPuzsqm05m4Qf4cJBPrKU/TLai88CbDOWs9s58="; hash = "sha256-lDLT5GNFL2LtooHNlpKrewzxVK5W8u+0U47BDvMG8l4=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
vendorHash = "sha256-OOU4m3qo6AFAXzCZMQyhdwj9USE9PV4zv4NjDwgZnxE="; vendorHash = "sha256-X9PWg4vB07Bh9w8Lw3cdEaciVvRhvQD0L5n4cFKf880=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-terminal-app"; pname = "lomiri-terminal-app";
version = "2.0.3"; version = "2.0.4";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ubports"; owner = "ubports";
repo = "development/apps/lomiri-terminal-app"; repo = "development/apps/lomiri-terminal-app";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-374ATxF+XhoALzYv6DEyj6IYgb82Ch4zcmqK0RXmlzI="; hash = "sha256-X+bq/6QPjNfHrOuSvNhFsKALoj9DSvxuyC3YoXBgBHE=";
}; };
postPatch = '' postPatch = ''
@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
cmakeFlags = [ cmakeFlags = [
"-DINSTALL_TESTS=OFF" (lib.cmakeBool "INSTALL_TESTS" false)
"-DCLICK_MODE=OFF" (lib.cmakeBool "CLICK_MODE" false)
]; ];
passthru = { passthru = {
@ -72,12 +72,15 @@ stdenv.mkDerivation (finalAttrs: {
}; };
}; };
meta = with lib; { meta = {
description = "Terminal app for desktop and mobile devices"; description = "Terminal app for desktop and mobile devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app";
license = licenses.gpl3Only; changelog = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/blob/${
if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
mainProgram = "lomiri-terminal-app"; mainProgram = "lomiri-terminal-app";
maintainers = teams.lomiri.members; maintainers = lib.teams.lomiri.members;
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
}) })

View file

@ -2,8 +2,8 @@
stdenv, stdenv,
lib, lib,
fetchFromGitLab, fetchFromGitLab,
fetchpatch,
gitUpdater, gitUpdater,
nixosTests,
cmake, cmake,
cmake-extras, cmake-extras,
dbus, dbus,
@ -18,51 +18,15 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-polkit-agent"; pname = "lomiri-polkit-agent";
version = "0.1"; version = "0.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ubports"; owner = "ubports";
repo = "development/core/lomiri-polkit-agent"; repo = "development/core/lomiri-polkit-agent";
rev = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-nA2jkyNQC1YIMpJkfJt2F97txGUT4UO7+aSgzr7IUU0="; hash = "sha256-U4NNPBuLhe+m5WvfOYq5ZFE70OYJ/mn69wyK+ALebRE=";
}; };
patches = [
# Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/2 merged & in release
(fetchpatch {
name = "0001-lomiri-polkit-agent-Fix-authentication-test-with-libnotify-gteq-0.8.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/415d897735b9005426ec29348a882b9080fcd808.patch";
hash = "sha256-fAJJ5Bz4P76arhSmiWVa/8S+mb/NqPr65Nm3MkwKtjA=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/9 merged & in release
(fetchpatch {
name = "0002-lomiri-polkit-agent-Make-tests-optional-and-use-BUILD_TESTING.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/908177fa24b79b06161116c3c274357122984d36.patch";
hash = "sha256-duHx4iNqgAlS649BO1s6D5E2SX9MPRCKb+mit+2cybM=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/10 merged & in release
(fetchpatch {
name = "0003-lomiri-polkit-agent-Explicitly-look-for-properties-cpp.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/08bf36e50025aeefc5ba388d6d0f84d760add9cb.patch";
hash = "sha256-OFzj/FFXm1fX6+1GY97CON7Nne9wVPmQAxVFpP9rIpU=";
})
];
postPatch = ''
# Partial application of still-under-discussion https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/8
substituteInPlace data/lomiri-polkit-agent.service.in \
--replace-fail 'After=lomiri-full-greeter.service lomiri-full-shell.service lomiri-greeter.service lomiri-shell.service' 'After=graphical-session.target' \
--replace-fail 'PartOf=' 'PartOf=lomiri.service ' \
--replace-fail 'WantedBy=' 'WantedBy=lomiri.service '
# Workaround to avoid coredump on logout
# https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/issues/1
substituteInPlace service/main.cpp \
--replace-fail 'retval.set_value(0);' 'try { retval.set_value(0); } catch (const std::future_error& ex) {}'
'';
strictDeps = true; strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
@ -92,11 +56,20 @@ stdenv.mkDerivation (finalAttrs: {
# Parallelism breaks dbus during tests # Parallelism breaks dbus during tests
enableParallelChecking = false; enableParallelChecking = false;
passthru.updateScript = gitUpdater { }; passthru = {
# Involves a test to check polkit agent functionality.
# The pop-up dialogue times out after awhile, and OCR can't find it in time.
# Please check the screenshots after running that test, to verify that the pop-up actually happened!
tests.vm = nixosTests.lomiri.desktop-appinteractions;
updateScript = gitUpdater { };
};
meta = { meta = {
description = "Policy kit agent for the Lomiri desktop"; description = "Policy kit agent for the Lomiri desktop";
homepage = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent"; homepage = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent";
changelog = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/blob/${
if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
maintainers = lib.teams.lomiri.members; maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

View file

@ -1,32 +1,33 @@
{ stdenv {
, lib stdenv,
, fetchFromGitHub lib,
, bash fetchFromGitHub,
, cmake bash,
, cfitsio cmake,
, libusb1 cfitsio,
, kmod libusb1,
, zlib kmod,
, boost zlib,
, libev boost,
, libnova libev,
, curl libnova,
, libjpeg curl,
, gsl libjpeg,
, fftw gsl,
, gtest fftw,
, indi-full gtest,
indi-full,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "indilib"; pname = "indilib";
version = "2.1.1"; version = "2.1.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "indilib"; owner = "indilib";
repo = "indi"; repo = "indi";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-S9FXa+yBA4IYPOiiFkLUNdEFZPraVV5vjtgwDQ/FbNY="; hash = "sha256-EaLmwPyoQfdTUURKb6bBhg9kz7wSEzRdH3QQkayJDjA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -46,13 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
fftw fftw
]; ];
cmakeFlags = [ cmakeFlags =
"-DCMAKE_INSTALL_LIBDIR=lib" [
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DCMAKE_INSTALL_LIBDIR=lib"
] ++ lib.optional finalAttrs.finalPackage.doCheck [ "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
"-DINDI_BUILD_UNITTESTS=ON" ]
"-DINDI_BUILD_INTEGTESTS=ON" ++ lib.optional finalAttrs.finalPackage.doCheck [
]; "-DINDI_BUILD_UNITTESTS=ON"
"-DINDI_BUILD_INTEGTESTS=ON"
];
checkInputs = [ gtest ]; checkInputs = [ gtest ];
@ -81,7 +84,11 @@ stdenv.mkDerivation (finalAttrs: {
description = "Implementation of the INDI protocol for POSIX operating systems"; description = "Implementation of the INDI protocol for POSIX operating systems";
changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}"; changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 sheepforce returntoreality ]; maintainers = with maintainers; [
hjones2199
sheepforce
returntoreality
];
platforms = platforms.unix; platforms = platforms.unix;
}; };
}) })

View file

@ -45,7 +45,7 @@ let
owner = "indilib"; owner = "indilib";
repo = "indi-3rdparty"; repo = "indi-3rdparty";
rev = "v${indilib.version}"; rev = "v${indilib.version}";
hash = "sha256-J9WPoaULH6UXL1q1O76+IDW97ydQWkHIID6n7wvOdE4="; hash = "sha256-WYvinfAbMxgF5Q9iB/itQTMsVmG83lY45JriUo3kzFg=";
}; };
buildIndi3rdParty = buildIndi3rdParty =
@ -172,8 +172,9 @@ let
postPatch = '' postPatch = ''
substituteInPlace 99-asi.rules \ substituteInPlace 99-asi.rules \
--replace-fail "/bin/echo" "${coreutils}/bin/echo" \ --replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \
--replace-fail "/bin/sh" "${bash}/bin/sh" --replace-fail "/bin/sh" "${lib.getExe bash}" \
--replace-fail "/bin/chmod" "${lib.getBin coreutils}/bin/chmod"
''; '';
buildInputs = [ buildInputs = [
@ -350,8 +351,8 @@ let
pname = "libplayerone"; pname = "libplayerone";
postPatch = '' postPatch = ''
substituteInPlace 99-player_one_astronomy.rules \ substituteInPlace 99-player_one_astronomy.rules \
--replace-fail "/bin/echo" "${coreutils}/bin/echo" \ --replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \
--replace-fail "/bin/sh" "${bash}/bin/sh" --replace-fail "/bin/sh" "${lib.getExe bash}"
''; '';
buildInputs = [ buildInputs = [
@ -376,7 +377,7 @@ let
substituteInPlace 85-qhyccd.rules \ substituteInPlace 85-qhyccd.rules \
--replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \
--replace-fail "/lib/firmware" "$out/lib/firmware" \ --replace-fail "/lib/firmware" "$out/lib/firmware" \
--replace-fail "/bin/sleep" "${coreutils}/bin/sleep" --replace-fail "/bin/sleep" "${lib.getBin coreutils}/bin/sleep"
sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 85-qhyccd.rules sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 85-qhyccd.rules
''; '';
@ -464,6 +465,15 @@ let
}; };
}; };
libsvbonycam = buildIndi3rdParty {
pname = "libsvbonycam";
nativeBuildInputs = [ autoPatchelfHook ];
meta = with lib; {
license = lib.licenses.unfreeRedistributable;
platforms = with platforms; x86_64 ++ aarch64 ++ arm;
};
};
libtoupcam = buildIndi3rdParty { libtoupcam = buildIndi3rdParty {
pname = "libtoupcam"; pname = "libtoupcam";
nativeBuildInputs = [ autoPatchelfHook ]; nativeBuildInputs = [ autoPatchelfHook ];
@ -490,12 +500,21 @@ in
buildInputs = [ indilib ]; buildInputs = [ indilib ];
}; };
# libahc-xc needs libdfu, which is not packaged indi-ahp-xc = buildIndi3rdParty {
# indi-ahp-xc = buildIndi3rdParty { pname = "indi-ahp-xc";
# pname = "indi-ahp-xc"; buildInputs = [
# buildInputs = [ cfitsio indilib libahp-xc libnova zlib ]; cfitsio
# meta.platforms = libahp-xc.meta.platforms; indilib
# }; libahp-xc
libnova
zlib
];
meta = {
platforms = libahp-xc.meta.platforms;
# libahc-xc needs libdfu, which is not packaged
broken = true;
};
};
indi-aok = buildIndi3rdParty { indi-aok = buildIndi3rdParty {
pname = "indi-aok"; pname = "indi-aok";
@ -762,7 +781,6 @@ in
meta.platforms = libinovasdk.meta.platforms; meta.platforms = libinovasdk.meta.platforms;
}; };
# broken, wants rpicam-apps
indi-libcamera = buildIndi3rdParty { indi-libcamera = buildIndi3rdParty {
pname = "indi-libcamera"; pname = "indi-libcamera";
buildInputs = [ buildInputs = [
@ -778,6 +796,7 @@ in
zlib zlib
]; ];
meta.platforms = [ ]; meta.platforms = [ ];
# broken, wants rpicam-apps
meta.broken = true; meta.broken = true;
}; };
@ -879,6 +898,7 @@ in
cfitsio cfitsio
indilib indilib
libraw libraw
libjpeg
zlib zlib
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -1041,6 +1061,7 @@ in
libogmacam libogmacam
libomegonprocam libomegonprocam
libstarshootg libstarshootg
libsvbonycam
libtoupcam libtoupcam
libtscam libtscam
]; ];

View file

@ -37,6 +37,7 @@
libxslt, libxslt,
harfbuzz, harfbuzz,
hyphen, hyphen,
icu,
libsysprof-capture, libsysprof-capture,
libpthreadstubs, libpthreadstubs,
nettle, nettle,
@ -79,7 +80,7 @@
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
clangStdenv.mkDerivation (finalAttrs: { clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk"; pname = "webkitgtk";
version = "2.46.6"; version = "2.48.0";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
if lib.versionAtLeast gtk3.version "4.0" then if lib.versionAtLeast gtk3.version "4.0" then
"6.0" "6.0"
@ -99,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-8rMd5pMiC6m6t2zm3f5bC/qyUVyysKcPPFTUBQdmwys="; hash = "sha256-lJBKVc8S1EpONs6tr/8C1G2nPXa+m0dp80y/3w7r+I4=";
}; };
patches = lib.optionals clangStdenv.hostPlatform.isLinux [ patches = lib.optionals clangStdenv.hostPlatform.isLinux [
@ -135,6 +136,7 @@ clangStdenv.mkDerivation (finalAttrs: {
at-spi2-core at-spi2-core
cairo # required even when using skia cairo # required even when using skia
enchant2 enchant2
flite
libavif libavif
libepoxy libepoxy
libjxl libjxl
@ -143,6 +145,7 @@ clangStdenv.mkDerivation (finalAttrs: {
gst-plugins-base gst-plugins-base
harfbuzz harfbuzz
hyphen hyphen
icu
libGL libGL
libGLU libGLU
libgbm libgbm
@ -186,7 +189,7 @@ clangStdenv.mkDerivation (finalAttrs: {
geoclue2 geoclue2
] ]
++ lib.optionals enableExperimental [ ++ lib.optionals enableExperimental [
flite # For ENABLE_WEB_RTC
openssl openssl
] ]
++ lib.optionals withLibsecret [ ++ lib.optionals withLibsecret [

View file

@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Standard software-system definition library for Common Lisp"; description = "Standard software-system definition library for Common Lisp";
homepage = "https://asdf.common-lisp.dev/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Standard software-system definition library for Common Lisp"; description = "Standard software-system definition library for Common Lisp";
homepage = "https://asdf.common-lisp.dev/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.unix; platforms = platforms.unix;

View file

@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Standard software-system definition library for Common Lisp"; description = "Standard software-system definition library for Common Lisp";
homepage = "https://asdf.common-lisp.dev/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.unix; platforms = platforms.unix;

View file

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Standard software-system definition library for Common Lisp"; description = "Standard software-system definition library for Common Lisp";
homepage = "https://asdf.common-lisp.dev/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.unix; platforms = platforms.unix;

View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cli-helpers"; pname = "cli-helpers";
version = "2.3.1"; version = "2.4.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "cli_helpers"; pname = "cli_helpers";
inherit version; inherit version;
hash = "sha256-uCqJg87uIfGA5v0N23yo2uQ8QOkglR44F/mWqyBNrmo="; hash = "sha256-VZA7cFohKkc3Mdsg+ib1hlXjVAeLmcsTyZ7AaUAoek0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -17,14 +17,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "essentials-openapi"; pname = "essentials-openapi";
version = "1.1.0"; version = "1.1.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Neoteroi"; owner = "Neoteroi";
repo = "essentials-openapi"; repo = "essentials-openapi";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-XPsVPeKaaDwBFrUoydSa/7UPhw46JWMu3ww3MZfy7wg="; hash = "sha256-CdDRPzRNx/5docikL8BYdFnEIr/qav8ij/1exWb24fg=";
}; };
nativeBuildInputs = [ hatchling ]; nativeBuildInputs = [ hatchling ];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "llama-index-embeddings-google"; pname = "llama-index-embeddings-google";
version = "0.3.0"; version = "0.3.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "llama_index_embeddings_google"; pname = "llama_index_embeddings_google";
inherit version; inherit version;
hash = "sha256-XS0ZYLxe7/ezeLEJE/lEUzcaIwN1TzS/bA5sCRyx/Lk="; hash = "sha256-gMFfA/USIYkOIaNPZfpLoRzkDGnN2e+gNlylAOrTxKs=";
}; };
pythonRelaxDeps = [ "google-generativeai" ]; pythonRelaxDeps = [ "google-generativeai" ];

View file

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "msmart-ng"; pname = "msmart-ng";
version = "2025.2.2"; version = "2025.3.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mill1000"; owner = "mill1000";
repo = "midea-msmart"; repo = "midea-msmart";
tag = version; tag = version;
hash = "sha256-h+yWa1N5XmYdWzpEyVtdD/n+A0V1aFRvMHCaty6SnnM="; hash = "sha256-hTYqRJn/ixseHHezfTOG0UzdQmnpn4hACijYOMtwtT8=";
}; };
build-system = [ build-system = [
@ -47,7 +47,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "msmart" ]; pythonImportsCheck = [ "msmart" ];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/mill1000/midea-msmart/releases/tag/${version}"; changelog = "https://github.com/mill1000/midea-msmart/releases/tag/${src.tag}";
description = "Python library for local control of Midea (and associated brands) smart air conditioners"; description = "Python library for local control of Midea (and associated brands) smart air conditioners";
homepage = "https://github.com/mill1000/midea-msmart"; homepage = "https://github.com/mill1000/midea-msmart";
license = licenses.mit; license = licenses.mit;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nvdlib"; pname = "nvdlib";
version = "0.7.9"; version = "0.8.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Vehemont"; owner = "Vehemont";
repo = "nvdlib"; repo = "nvdlib";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-D4IzY6CZm9jxjupif9VnxI3uPlnhe1/Vsjhs2XX5v1c="; hash = "sha256-fj7tgTv3r++oo+45QFQy/rmXYdKyKhR74maHOdp+0yA=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];
@ -37,7 +37,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Module to interact with the National Vulnerability CVE/CPE API"; description = "Module to interact with the National Vulnerability CVE/CPE API";
homepage = "https://github.com/Vehemont/nvdlib/"; homepage = "https://github.com/Vehemont/nvdlib/";
changelog = "https://github.com/vehemont/nvdlib/releases/tag/v${version}"; changelog = "https://github.com/vehemont/nvdlib/releases/tag/${src.tag}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };

View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "persim"; pname = "persim";
version = "0.3.7"; version = "0.3.8";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-dvcpj7ekbNvsc2+FSXfx4Xlt3y1pdO2n2FnKKEf032Q="; hash = "sha256-4T0YWEF2uKdk0W1+Vt8I3Mi6ZsazJXoHI0W+O9WbpA0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "prometheus-fastapi-instrumentator"; pname = "prometheus-fastapi-instrumentator";
version = "7.0.2"; version = "7.1.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "trallnag"; owner = "trallnag";
repo = "prometheus-fastapi-instrumentator"; repo = "prometheus-fastapi-instrumentator";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-ObzaKWrN+9+MUpSOlqbW16KKTklMVo5nPRHodk+GEPs="; hash = "sha256-54h/kwIdzFzxdYglwcEBPkLYno1YH2iWklg35qY2b00=";
}; };
build-system = [ build-system = [

View file

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyaprilaire"; pname = "pyaprilaire";
version = "0.8.0"; version = "0.8.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chamberlain2007"; owner = "chamberlain2007";
repo = "pyaprilaire"; repo = "pyaprilaire";
tag = version; tag = version;
hash = "sha256-W94NsL3hPIsi0WJ9EL4Z+IuoU9e0gZq3m+ntz+vShno="; hash = "sha256-wkeaGd76OoXF18lP+N9a2hu7KjPPg88V0S2yEQoft5g=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyytlounge"; pname = "pyytlounge";
version = "2.2.1"; version = "2.3.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FabioGNR"; owner = "FabioGNR";
repo = "pyytlounge"; repo = "pyytlounge";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-ZK52xh6IGhINQMakfjG759earUgvNoTNeBcUlFBSALo="; hash = "sha256-VcGZV5AjRWtJeHT6+PUn23k6g1dRFzZM/JWGkVhF4ec=";
}; };
build-system = [ hatchling ]; build-system = [ hatchling ];

View file

@ -1,5 +1,6 @@
{ {
lib, lib,
stdenv,
accelerate, accelerate,
buildPythonPackage, buildPythonPackage,
docker, docker,
@ -106,22 +107,27 @@ buildPythonPackage rec {
pythonImportsCheck = [ "smolagents" ]; pythonImportsCheck = [ "smolagents" ];
disabledTests = [ disabledTests =
# Missing dependencies [
"test_ddgs_with_kwargs" # Missing dependencies
"test_e2b_executor_instantiation" "test_ddgs_with_kwargs"
"test_flatten_messages_as_text_for_all_models" "test_e2b_executor_instantiation"
"test_from_mcp" "test_flatten_messages_as_text_for_all_models"
"test_import_smolagents_without_extras" "test_from_mcp"
"test_vision_web_browser_main" "test_import_smolagents_without_extras"
# Tests require network access "test_vision_web_browser_main"
"test_agent_type_output" # Tests require network access
"test_can_import_sklearn_if_explicitly_authorized" "test_agent_type_output"
"test_transformers_message_no_tool" "test_can_import_sklearn_if_explicitly_authorized"
"test_transformers_message_vl_no_tool" "test_transformers_message_no_tool"
"test_transformers_toolcalling_agent" "test_transformers_message_vl_no_tool"
"test_visit_webpage" "test_transformers_toolcalling_agent"
]; "test_visit_webpage"
]
++ lib.optionals stdenv.isDarwin [
# Missing dependencies
"test_get_mlx"
];
meta = { meta = {
description = "Barebones library for agents"; description = "Barebones library for agents";

View file

@ -1,40 +1,44 @@
{ {
stdenv,
lib, lib,
fetchurl, stdenv,
buildPythonPackage, buildPythonPackage,
isPy3k, fetchurl,
astor,
# buildInputs
llvmPackages,
# build-system
distutils,
# dependencies
ml-dtypes,
absl-py,
astunparse,
flatbuffers,
gast, gast,
google-pasta, google-pasta,
wrapt, grpcio,
h5py,
libclang,
numpy, numpy,
six, opt-einsum,
termcolor,
packaging, packaging,
protobuf, protobuf,
absl-py, requests,
grpcio, six,
mock,
scipy,
distutils,
wheel,
jax,
ml-dtypes,
opt-einsum,
tensorflow-estimator-bin,
tensorboard, tensorboard,
termcolor,
typing-extensions,
wrapt,
isPy3k,
mock,
config, config,
cudaSupport ? config.cudaSupport, cudaSupport ? config.cudaSupport,
cudaPackages, cudaPackages,
zlib, zlib,
python, python,
addDriverRunpath, addDriverRunpath,
astunparse,
flatbuffers,
h5py,
llvmPackages,
typing-extensions,
}: }:
# We keep this binary build for three reasons: # We keep this binary build for three reasons:
@ -50,7 +54,6 @@ let
inherit (cudaPackages) cudatoolkit cudnn; inherit (cudaPackages) cudatoolkit cudnn;
isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild;
isCudaX64 = cudaSupport && stdenv.hostPlatform.isx86_64;
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; pname = "tensorflow" + lib.optionalString cudaSupport "-gpu";
@ -68,38 +71,36 @@ buildPythonPackage rec {
buildInputs = [ llvmPackages.openmp ]; buildInputs = [ llvmPackages.openmp ];
build-system = [
distutils
];
nativeBuildInputs =
lib.optionals cudaSupport [ addDriverRunpath ]
++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ];
dependencies = [ dependencies = [
absl-py
astunparse astunparse
flatbuffers flatbuffers
typing-extensions gast
distutils google-pasta
grpcio
h5py
libclang
ml-dtypes
numpy
opt-einsum
packaging packaging
protobuf protobuf
numpy requests
scipy
(if isCudaX64 then jax else ml-dtypes)
termcolor
grpcio
six six
astor
absl-py
gast
opt-einsum
google-pasta
wrapt
tensorflow-estimator-bin
tensorboard tensorboard
h5py termcolor
typing-extensions
wrapt
] ++ lib.optional (!isPy3k) mock; ] ++ lib.optional (!isPy3k) mock;
build-system =
[
distutils
wheel
]
++ lib.optionals cudaSupport [ addDriverRunpath ]
++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ];
preConfigure = '' preConfigure = ''
unset SOURCE_DATE_EPOCH unset SOURCE_DATE_EPOCH
@ -113,28 +114,6 @@ buildPythonPackage rec {
mv "$f" "$(sed -E 's/(nv[0-9]+)\.0*([0-9]+)/\1.\2/' <<< "$f")" mv "$f" "$(sed -E 's/(nv[0-9]+)\.0*([0-9]+)/\1.\2/' <<< "$f")"
done done
wheel unpack --dest unpacked ./*.whl
rm ./*.whl
(
cd unpacked/tensorflow*
# Adjust dependency requirements:
# - Relax flatbuffers, gast, protobuf, tensorboard, and tensorflow-estimator version requirements that don't match what we have packaged
# - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet
# - keras and tensorlow-io-gcs-filesystem will be considered as optional for now.
# - numpy was pinned to fix some internal tests: https://github.com/tensorflow/tensorflow/issues/60216
sed -i *.dist-info/METADATA \
-e "/Requires-Dist: flatbuffers/d" \
-e "/Requires-Dist: gast/d" \
-e "/Requires-Dist: keras/d" \
-e "/Requires-Dist: libclang/d" \
-e "/Requires-Dist: protobuf/d" \
-e "/Requires-Dist: tensorboard/d" \
-e "/Requires-Dist: tensorflow-estimator/d" \
-e "/Requires-Dist: tensorflow-io-gcs-filesystem/d" \
-e "s/Requires-Dist: numpy (.*)/Requires-Dist: numpy/"
)
wheel pack ./unpacked/tensorflow*
popd popd
''; '';

View file

@ -22,7 +22,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "translate-toolkit"; pname = "translate-toolkit";
version = "3.15.0"; version = "3.15.1";
pyproject = true; pyproject = true;
build-system = [ setuptools-scm ]; build-system = [ setuptools-scm ];
@ -30,7 +30,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "translate_toolkit"; pname = "translate_toolkit";
inherit version; inherit version;
hash = "sha256-16evXSr6Znwber/UNSMVd86toWZGswPSQO7Y5ySCYIY="; hash = "sha256-Omapbrcv6+A5fGb34xLdlmoh3QAXN1+5VxoCRdyX9mM=";
}; };
dependencies = [ dependencies = [
@ -66,6 +66,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Useful localization tools for building localization & translation systems"; description = "Useful localization tools for building localization & translation systems";
homepage = "https://toolkit.translatehouse.org/"; homepage = "https://toolkit.translatehouse.org/";
changelog = "https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/${version}.html";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ erictapen ]; maintainers = with maintainers; [ erictapen ];
}; };

View file

@ -21,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "twilio"; pname = "twilio";
version = "9.5.0"; version = "9.5.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "twilio"; owner = "twilio";
repo = "twilio-python"; repo = "twilio-python";
tag = version; tag = version;
hash = "sha256-Md9TjsUem+npAG2PWezmSpGcxtQlhdyvNaDs4AkX/Vo="; hash = "sha256-qmXvs9CjHjkd/DsbqMPA90wCDiS+pMwaHXCRBUNnv30=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-markdown"; pname = "types-markdown";
version = "3.7.0.20241204"; version = "3.7.0.20250322";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "types_markdown"; pname = "types_markdown";
inherit version; inherit version;
hash = "sha256-7MorJc0jFj/SjtW6NNGD1zHaA+il7Togtg2t7TBMVBA="; hash = "sha256-pI7YLfy2lUWSoQ8QRonS1E35ElzlGzzuIOAZilIW1Vw=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-pytz"; pname = "types-pytz";
version = "2025.1.0.20250204"; version = "2025.1.0.20250318";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "types_pytz"; pname = "types_pytz";
inherit version; inherit version;
hash = "sha256-APdQEydp8cZaT3JAvITxOYW02ndL0X375dnNRCdGvUk="; hash = "sha256-l+DjUYTG/hTjpQFFEgV/LFe7DGWC1jwc/MSAn4IYBEk=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -6,13 +6,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-retry"; pname = "types-retry";
version = "0.9.9.20241221"; version = "0.9.9.20250322";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
pname = "types_retry"; pname = "types_retry";
inherit version; inherit version;
hash = "sha256-661tSVpaBKsNBtQVamZVKMO4SoRhqgGd1uXT4zwqoeA="; hash = "sha256-LqpvS4MsGHEhBWmIu+bS0Lb06wNjH9yXUuKsKAL3tyY=";
}; };
# Modules doesn't have tests # Modules doesn't have tests

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "apko"; pname = "apko";
version = "0.25.2"; version = "0.25.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chainguard-dev"; owner = "chainguard-dev";
repo = pname; repo = pname;
tag = "v${version}"; tag = "v${version}";
hash = "sha256-lvxdpc8rXGgebxjFEeQOlpDfLwwe8a0QAfqApCgWAHw="; hash = "sha256-t5ktcl52KOinqqFNNQISqAUBZ08qfR3VBXFTF9k3bsQ=";
# populate values that require us to use git. By doing this in postFetch we # populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -25,7 +25,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf find "$out" -name .git -print0 | xargs -0 rm -rf
''; '';
}; };
vendorHash = "sha256-EE59/VyP/dK9qZuTSQqqxAhcJUh/hfSopR7x6k5Eunc="; vendorHash = "sha256-pFraDvKiQdj7zx20gZbE76mtfkUnnJnUDsdQus+SDes=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -8,13 +8,13 @@
buildHomeAssistantComponent rec { buildHomeAssistantComponent rec {
owner = "mill1000"; owner = "mill1000";
domain = "midea_ac"; domain = "midea_ac";
version = "2025.2.3"; version = "2025.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mill1000"; owner = "mill1000";
repo = "midea-ac-py"; repo = "midea-ac-py";
tag = version; tag = version;
hash = "sha256-GfIdt5HRjtTKrndsICrLL3mttVzlMbOd9GP7+2HUPTA="; hash = "sha256-UJS9z+t+Tb/w7yRHKXJ6HoQ4uS1guM8PYl0OcLz4EJM=";
}; };
dependencies = [ msmart-ng ]; dependencies = [ msmart-ng ];

View file

@ -7,13 +7,13 @@
postgresqlBuildExtension rec { postgresqlBuildExtension rec {
pname = "pg_tle"; pname = "pg_tle";
version = "1.4.0"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "pg_tle"; repo = "pg_tle";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-crxj5R9jblIv0h8lpqddAoYe2UqgUlnvbOajKTzVces="; hash = "sha256-GuHlmFQjMr9Kv4NqIm9mcVfLc36EQVj5Iy7Kh26k0l4=";
}; };
buildInputs = postgresql.buildInputs; buildInputs = postgresql.buildInputs;

View file

@ -11,18 +11,18 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nushell_plugin_highlight"; pname = "nushell_plugin_highlight";
version = "1.4.3+0.102.0"; version = "1.4.4+0.103.0";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "nu-plugin-highlight"; repo = "nu-plugin-highlight";
owner = "cptpiepmatz"; owner = "cptpiepmatz";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-0gKwk5YGysKWAFZdUAWzw3wiCvzF43N9f5Bj5NnDTJ4="; hash = "sha256-XxYsxoHeRhZ4A52ctyJZVqJ40J3M3R42NUetZZIbk0w=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-Z7fTKMZacNTRrcwJNb8kiH5G8irITQMNpt+pcskDbKQ="; cargoHash = "sha256-y0SCpDU1GM5JrixOffP1DRGtaXZsBjr7fYgYxhn4NDg=";
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

View file

@ -2728,8 +2728,9 @@ with pkgs;
citrix_workspace_24_02_0 citrix_workspace_24_02_0
citrix_workspace_24_05_0 citrix_workspace_24_05_0
citrix_workspace_24_08_0 citrix_workspace_24_08_0
citrix_workspace_24_11_0
; ;
citrix_workspace = citrix_workspace_24_08_0; citrix_workspace = citrix_workspace_24_11_0;
cmst = libsForQt5.callPackage ../tools/networking/cmst { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { };
@ -3537,10 +3538,6 @@ with pkgs;
gzip = callPackage ../tools/compression/gzip { }; gzip = callPackage ../tools/compression/gzip { };
pdisk = callPackage ../tools/system/pdisk {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
};
plplot = callPackage ../development/libraries/plplot { plplot = callPackage ../development/libraries/plplot {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
@ -5324,10 +5321,6 @@ with pkgs;
unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { };
vuls = callPackage ../by-name/vu/vuls/package.nix {
buildGoModule = buildGo123Module;
};
xdp-tools = callPackage ../tools/networking/xdp-tools { }; xdp-tools = callPackage ../tools/networking/xdp-tools { };
ugarit = callPackage ../tools/backup/ugarit { ugarit = callPackage ../tools/backup/ugarit {