Merge staging-next into staging
This commit is contained in:
@@ -285,3 +285,6 @@ b4532efe93882ae2e3fc579929a42a5a56544146
|
||||
# nixfmt 1.0.0
|
||||
62fe01651911043bd3db0add920af3d2935d9869 # !autorebase nix-shell --run treefmt
|
||||
5a0711127cd8b916c3d3128f473388c8c79df0da # !autorebase nix-shell --run treefmt
|
||||
|
||||
# systemd: nixfmt
|
||||
b1c5cd3e794cdf89daa5e4f0086274a416a1cded
|
||||
|
||||
@@ -11959,6 +11959,12 @@
|
||||
githubId = 51518420;
|
||||
name = "jitwit";
|
||||
};
|
||||
jjacke13 = {
|
||||
email = "vaios.k@pm.me";
|
||||
github = "jjacke13";
|
||||
githubId = 156372486;
|
||||
name = "Vaios Karastathis";
|
||||
};
|
||||
jjjollyjim = {
|
||||
email = "jamie@kwiius.com";
|
||||
github = "JJJollyjim";
|
||||
@@ -16169,6 +16175,13 @@
|
||||
githubId = 318066;
|
||||
name = "Mirco Bauer";
|
||||
};
|
||||
meenzen = {
|
||||
name = "Samuel Meenzen";
|
||||
email = "samuel@meenzen.net";
|
||||
matrix = "@samuel:mnzn.dev";
|
||||
github = "meenzen";
|
||||
githubId = 22305878;
|
||||
};
|
||||
megheaiulian = {
|
||||
email = "iulian.meghea@gmail.com";
|
||||
github = "megheaiulian";
|
||||
|
||||
@@ -309,6 +309,7 @@ with lib.maintainers;
|
||||
raphaelr
|
||||
jamiemagee
|
||||
anpin
|
||||
meenzen
|
||||
];
|
||||
scope = "Maintainers of the .NET build tools and packages";
|
||||
shortName = "dotnet";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "leo-editor";
|
||||
version = "6.8.4";
|
||||
version = "6.8.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leo-editor";
|
||||
repo = "leo-editor";
|
||||
rev = version;
|
||||
sha256 = "sha256-CSugdfkAMy6VFdNdSGR+iCrK/XhwseoiMQ4mfgu4F/E=";
|
||||
sha256 = "sha256-3ojiIjsGJpPgVSUi0QhIddqwsDxfRWxhxAQ5YmzwZiQ=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -902,8 +902,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "catppuccin-vsc-icons";
|
||||
publisher = "catppuccin";
|
||||
version = "1.21.0";
|
||||
hash = "sha256-rWExJ9XJ8nKki8TP0UNLCmslw+aCm1hR2h2xxhnY9bg=";
|
||||
version = "1.23.0";
|
||||
hash = "sha256-jnn169toS1zaixiOrtWjgOvv3UskM13vfFcvaQEesjU=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog";
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "lldb-dap";
|
||||
publisher = "llvm-vs-code-extensions";
|
||||
version = "0.2.15";
|
||||
hash = "sha256-Xr/TUpte9JqdvQ8eoD0l8ztg0tR8qwX/Ju1eVU6Xc0s=";
|
||||
version = "0.2.16";
|
||||
hash = "sha256-q0wBPSQHy/R8z5zb3iMdapzrn7c9y9X6Ow9CXY3lwtc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2025-07-23";
|
||||
version = "0-unstable-2025-08-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "78c184bca1063d5482cbfad924af72dd23ebbff1";
|
||||
hash = "sha256-0n6PQqepc7xKVMf8slN9aOodzBbt7J2c68z7200q07M=";
|
||||
rev = "c7e327b5b86bfeaf13e89440a319ee5b0c039a3d";
|
||||
hash = "sha256-J7rCOl7vHX/2Jy/fPh8yDAf8xQc41wmkMcC9SSRqxF0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,137 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchurl,
|
||||
boost,
|
||||
cmake,
|
||||
ffmpeg,
|
||||
libsForQt5,
|
||||
gdal,
|
||||
gfortran,
|
||||
libXt,
|
||||
makeWrapper,
|
||||
ninja,
|
||||
mpi,
|
||||
python312,
|
||||
tbb,
|
||||
libGLU,
|
||||
libGL,
|
||||
withDocs ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.13.2";
|
||||
|
||||
docFiles = [
|
||||
(fetchurl {
|
||||
url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf";
|
||||
name = "Tutorial.pdf";
|
||||
hash = "sha256-jJ6YUT2rgVExfKv900LbSO+MDQ4u73K7cBScHxWoP+g=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf";
|
||||
name = "GettingStarted.pdf";
|
||||
hash = "sha256-ptPQA8By8Hj0qI5WRtw3ZhklelXeYeJwVaUdfd6msJM=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf";
|
||||
name = "CatalystGuide.pdf";
|
||||
hash = "sha256-Pl7X5cBj3OralkOw5A29CtXnA+agYr6kWHf/+KZNHow=";
|
||||
})
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "paraview";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.kitware.com";
|
||||
owner = "paraview";
|
||||
repo = "paraview";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-29PLXVpvj8RLkSDWQgj5QjBZ6l1/0NoVx/qcJXOSssU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Find the Qt platform plugin "minimal"
|
||||
preConfigure = ''
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPARAVIEW_ENABLE_FFMPEG=ON"
|
||||
"-DPARAVIEW_ENABLE_GDAL=ON"
|
||||
"-DPARAVIEW_ENABLE_MOTIONFX=ON"
|
||||
"-DPARAVIEW_ENABLE_VISITBRIDGE=ON"
|
||||
"-DPARAVIEW_ENABLE_XDMF3=ON"
|
||||
"-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
|
||||
"-DPARAVIEW_USE_MPI=ON"
|
||||
"-DPARAVIEW_USE_PYTHON=ON"
|
||||
"-DVTK_SMP_IMPLEMENTATION_TYPE=TBB"
|
||||
"-DVTKm_ENABLE_MPI=ON"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
"-GNinja"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
ninja
|
||||
gfortran
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGLU
|
||||
libGL
|
||||
libXt
|
||||
mpi
|
||||
tbb
|
||||
boost
|
||||
ffmpeg
|
||||
gdal
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtx11extras
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtxmlpatterns
|
||||
libsForQt5.qtsvg
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc";
|
||||
in
|
||||
lib.optionalString withDocs ''
|
||||
mkdir -p ${docDir};
|
||||
for docFile in ${lib.concatStringsSep " " docFiles}; do
|
||||
cp $docFile ${docDir}/$(stripHash $docFile);
|
||||
done;
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
(python312.withPackages (
|
||||
ps: with ps; [
|
||||
numpy
|
||||
matplotlib
|
||||
mpi4py
|
||||
]
|
||||
))
|
||||
];
|
||||
|
||||
# 23k objects, >4h on a normal build slot
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.paraview.org";
|
||||
description = "3D Data analysis and visualization application";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ guibert ];
|
||||
changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion version)}-release-notes";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -70,17 +70,17 @@ python3.pkgs.buildPythonApplication {
|
||||
aiorpcx
|
||||
attrs
|
||||
bitstring
|
||||
certifi
|
||||
cryptography
|
||||
dnspython
|
||||
jsonrpclib-pelix
|
||||
matplotlib
|
||||
pbkdf2
|
||||
protobuf
|
||||
py-scrypt
|
||||
pysocks
|
||||
qrcode
|
||||
requests
|
||||
certifi
|
||||
scrypt
|
||||
# plugins
|
||||
btchip-python
|
||||
ckcc-protocol
|
||||
|
||||
@@ -45,13 +45,13 @@
|
||||
"vendorHash": "sha256-jZ950/nPFt3+t3CHsNEkYo7POabRCHVvcfu04Iq3cJc="
|
||||
},
|
||||
"akamai": {
|
||||
"hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=",
|
||||
"hash": "sha256-pXBQikG5yjCPj/Nv6+qJBv3+BpRx04CbDQo9Q9nU0o4=",
|
||||
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
|
||||
"owner": "akamai",
|
||||
"repo": "terraform-provider-akamai",
|
||||
"rev": "v8.0.0",
|
||||
"rev": "v8.1.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q="
|
||||
"vendorHash": "sha256-WT4sjem80445Qwlr3i/OuQMujrxEKqhws1GLpvbqKaU="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-ITu569Um+3Y7FPCBNALvePAjCCIf/3+Hu0831o7rZCU=",
|
||||
@@ -570,13 +570,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"harbor": {
|
||||
"hash": "sha256-KYCyqNKqW/I4q1JHVK4rD9H8/D60IL7H9cCgz6wLg5Q=",
|
||||
"hash": "sha256-RZkXUB4Msmsm+1mQij+577d7KUrDpk50oPc2rcFevi4=",
|
||||
"homepage": "https://registry.terraform.io/providers/goharbor/harbor",
|
||||
"owner": "goharbor",
|
||||
"repo": "terraform-provider-harbor",
|
||||
"rev": "v3.10.21",
|
||||
"rev": "v3.10.23",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-C1MT4mA7ubh1mN4+HO0bwMpjVHjDIG6UXZI6gvXHFZE="
|
||||
"vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
|
||||
},
|
||||
"hcloud": {
|
||||
"hash": "sha256-O6GaMSL5E9t5v9nsRh7aGIXy/w04sCy7AYG4AvGsbLc=",
|
||||
@@ -1309,11 +1309,11 @@
|
||||
"vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
|
||||
},
|
||||
"sysdig": {
|
||||
"hash": "sha256-q7HXqmvOiUktGOas9Xjt2hucxqasnPZ2O9uIn1gL1FE=",
|
||||
"hash": "sha256-KAwuE67gNOrDDLxgbxMtub0tMa45IiIOJ9Sq9mncK4c=",
|
||||
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
|
||||
"owner": "sysdiglabs",
|
||||
"repo": "terraform-provider-sysdig",
|
||||
"rev": "v1.58.0",
|
||||
"rev": "v1.59.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
|
||||
},
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
pkg-config,
|
||||
qt5,
|
||||
cmake,
|
||||
ninja,
|
||||
avahi,
|
||||
boost,
|
||||
libopus,
|
||||
@@ -51,6 +52,7 @@ let
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
qt5.wrapQtAppsHook
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.70.1";
|
||||
version = "1.70.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Jztu8xQWLeJVSk+yx3julu0wkQNpgQtzZvrKP71T7Eg=";
|
||||
hash = "sha256-2ILG+FW+58WnmL5Ts1K32ee0SR15yp9NnEtmEo6r6w8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wIZdL393uPVqz0rJV5NU6SHm8RU5orrHREhKbjBHTYU=";
|
||||
vendorHash = "sha256-CHObiSQudxZw5KjimQk8myTsLeQMBZU8SewW4I2dNsw=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
|
||||
@@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "art";
|
||||
version = "1.25.7";
|
||||
version = "1.25.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artpixls";
|
||||
repo = "ART";
|
||||
tag = version;
|
||||
hash = "sha256-VrIayD7Gj0j5Rfs6sl2tZTqPFTvQcJHgUnGQ6IGiUmU=";
|
||||
hash = "sha256-FsaTXGlQ390XgFrV4InF+xFr+Y9JgZefsR/AyHOuSsA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "azurite";
|
||||
version = "3.34.0";
|
||||
version = "3.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "Azurite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6NECduq2ewed8bR4rlF5MW8mGcsgu8bqgA/DBt8ywtM=";
|
||||
hash = "sha256-sVYiHQJ3nR5vM+oPAHzr/MjuNBMY14afqCHpw32WCiQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-WRaD99CsIuH3BrO01eVuoEZo40VjuScnVzmlFcKpj8g=";
|
||||
npmDepsHash = "sha256-UBHjb65Ud7IANsR30DokbI/16+dVjDEtfhqRPAQhGUw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bluemap";
|
||||
version = "5.10";
|
||||
version = "5.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
|
||||
hash = "sha256-vz6ReXfgqWYnyFQNBgqaWLZ0sOJqHOmFcAnuwbbOmGA=";
|
||||
hash = "sha256-DhsnuwVDvIb7eR4Hs2jOTufY2ysd+Awo0b8xg84quGU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bngblaster";
|
||||
version = "0.9.22";
|
||||
version = "0.9.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtbrick";
|
||||
repo = "bngblaster";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-vLvPiHwrFLqNV9ReeFAr0YBn8HUt6SazanpwZ1q09oU=";
|
||||
hash = "sha256-qo48OW02IMAAxMYTYguv5jKvy/GPq1WKgcluSrMIt2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-xwin";
|
||||
version = "0.19.1";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-cross";
|
||||
repo = "cargo-xwin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rmbu3WNwCmgojAWAthIQ9/XiSS04d9DoZwGRGAuRfDw=";
|
||||
hash = "sha256-qWHpExVt/a20GrP2uVvGbubF+Nr71Ob6abGLcnlpKJc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7xpkxJh5KVJVw6wQZGr2daU1qg0e969EWflf4Z/01oY=";
|
||||
cargoHash = "sha256-HctMp95J8ovYuvh7m5wxrNt+ZCVCzwPSSm71Ma1cVxI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross compile Cargo project to Windows MSVC target with ease";
|
||||
|
||||
+4
-4
@@ -6,13 +6,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^1.0.70"
|
||||
"@anthropic-ai/claude-code": "^1.0.71"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "1.0.70",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.70.tgz",
|
||||
"integrity": "sha512-gJ/bdT/XQ/hp5EKM0QoOWj/eKmK3wvs1TotTLq1unqahiB6B+EAQeRy/uvxv2Ua9nI8p5Bogw8hXB1uUmAHb+A==",
|
||||
"version": "1.0.71",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.71.tgz",
|
||||
"integrity": "sha512-2Z1HU8TiOSRZSZdHCPs+ih942cteUQ9Yx1EHHW5fO9y+gwxPYDR8Xbh/rAJMl/G58cJIn2jRiZmkWcGMN+Iqqg==",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.70";
|
||||
version = "1.0.71";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-7nqhJNhO+QollwVtVlKDYHOlPDT6Erk6wI/voiAYXY4=";
|
||||
hash = "sha256-ZJUvscbEaWHILL77R5/sPdNcxCLc2BL9P6tR+S7QnHg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-nBLaWDwSPOfZx26UU2QQpp/r8HPHAO4EnPkb/gcTPrg=";
|
||||
npmDepsHash = "sha256-wQ/DRPefziSRv6aFZXRpmz2vC6mQRqgc7r3++cDpYSg=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "csharpier";
|
||||
version = "1.0.3";
|
||||
version = "1.1.1";
|
||||
executables = "csharpier";
|
||||
|
||||
nugetHash = "sha256-DJe3zpzFCBjmsNmLMgIC1clLxo/exPZ+xHUmdpKMaMo=";
|
||||
nugetHash = "sha256-B0ijqWm3eZ31T+C5zRr4TkmfPsOfseaHpGPYZf5Yiw4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Opinionated code formatter for C#";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-language-server";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "docker-language-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ht63NilujpbDhBjkzCNpY95AAuwqya37qchgqKLlTw8=";
|
||||
hash = "sha256-cxLg0fLUC4dj3QUax+vIsJENRXNifbXMoRkldM44i+0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w7CDl27178oe/DpfqSbNbyOsR3D34EpcCMZNQ7i3JE4=";
|
||||
vendorHash = "sha256-xvRHxi7aem88mrmdAmSyRNtBUSZD4rjUut2VjPeoejg=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
docker
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dosage";
|
||||
version = "1.9.9";
|
||||
version = "1.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diegopvlk";
|
||||
repo = "Dosage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UVcbZgPk35VsYvyzIJrR79vAhSByJjn8kh+y0KQcwpM=";
|
||||
hash = "sha256-aLZ1Jl2h5KmZQ8zNyNqivAkf4Gjqh2eQfoKLabdXhBI=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/318830
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "dotenvx";
|
||||
version = "1.48.3";
|
||||
version = "1.48.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotenvx";
|
||||
repo = "dotenvx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5clMrH9r7CltZ2oEfDvyubFroOq/YVRaPkBfRnMyHNc=";
|
||||
hash = "sha256-reWOFI17YSaCTFriCpJELdDj9K2MintKt9OBy/2aXE4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-O8w5gyG2PDUSGuAcSQ4ccvkYhb9pQL5NjWXjSoXk6gQ=";
|
||||
npmDepsHash = "sha256-XPkqJVkShCzft4LEobCUgbsyl5W/vHXRPNPKltFO5hc=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "enzyme";
|
||||
version = "0.0.187";
|
||||
version = "0.0.188";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnzymeAD";
|
||||
repo = "Enzyme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vdLt7LtVkgcgoUzzl5jb7ERIyQMpY+iSwJpdQpWxoJw=";
|
||||
hash = "sha256-CoImpu1Hwn11s+6GeYPIyaIHz7kdjrBMpbxAUzaJWZU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fh";
|
||||
version = "0.1.24";
|
||||
version = "0.1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeterminateSystems";
|
||||
repo = "fh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t7IZlG7rKNbkt2DIU5H0/B0+b4e9YEVJx14ijpOycCw=";
|
||||
hash = "sha256-YVtFzJMdHpshtRqBDVw3Kr88psAPfcdOI0XVDGnFkq0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IXzqcIVk7F/MgWofzlwEkXfu7s8e7GdjYhdFbXUTeeo=";
|
||||
cargoHash = "sha256-D/8YYv9V1ny9AWFkVPgcE9doq+OxN+yiCCt074FKgn0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
Generated
+2
-2
@@ -31,8 +31,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "KeraLua",
|
||||
"version": "1.4.4",
|
||||
"hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs="
|
||||
"version": "1.4.6",
|
||||
"hash": "sha256-7lXJhhQlEuRoaF18XiZYJDyhA8RIWpYWNB9kr4aARQc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "garnet";
|
||||
version = "1.0.79";
|
||||
version = "1.0.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "garnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8=";
|
||||
hash = "sha256-9B2Ai+W6+rZ8xLrrO7d8jd6LYWaMGIq3a+lz8rY32uA=";
|
||||
};
|
||||
|
||||
projectFile = "main/GarnetServer/GarnetServer.csproj";
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gearlever";
|
||||
version = "3.3.4";
|
||||
version = "3.4.0";
|
||||
pyproject = false; # Built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mijorus";
|
||||
repo = "gearlever";
|
||||
tag = version;
|
||||
hash = "sha256-n7R4BiNxEy2uL6yg5h/L+l/EiQFTc5uND4ZVdERll08=";
|
||||
hash = "sha256-3kTgYlsVumTVH5X6h3YvS0tdex/OGQyn5MzevQ+GuH4=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gersemi";
|
||||
version = "0.21.0";
|
||||
version = "0.22.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BlankSpruce";
|
||||
repo = "gersemi";
|
||||
tag = version;
|
||||
hash = "sha256-TOrnaYvI4U7+q7ANNThZ3M3XhZS/Y8m48mNAqwjjBsg=";
|
||||
hash = "sha256-ckK0Tv1aUHJcM1RH20ejBvq49xksUZmqveCcMmpnVGo=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ghostfolio";
|
||||
version = "2.185.0";
|
||||
version = "2.189.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostfolio";
|
||||
repo = "ghostfolio";
|
||||
tag = version;
|
||||
hash = "sha256-jnC2u9ZZcOSux6UUzW9Ot02aFWeGYhrdCC9d4xM0efA=";
|
||||
hash = "sha256-rHqg7ziUdir6jWL4Xo/n9I2lNCmpBWFI34LQAS5mPsM=";
|
||||
# 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.
|
||||
leaveDotGit = true;
|
||||
@@ -27,7 +27,7 @@ buildNpmPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-FCH0v9jRviH33mfIVX8967X1u494qToHraYVn5pbSPw=";
|
||||
npmDepsHash = "sha256-hRDBNt2JIdjWYJLmW5BkW5wJ8yzcqQRwS2jRJKFrZL0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
prisma
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitmux";
|
||||
version = "0.11.3";
|
||||
version = "0.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arl";
|
||||
repo = "gitmux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Jw2yl95vCQ5JcRGvBeLlGuAagTHUf+IEF7XvzehcMvU=";
|
||||
sha256 = "sha256-TObnmV/NiMCcyC9zG0OcCuCqUChQZmpqPptQUDtF85A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MvvJGB9KPMYeqYclmAAF6qlU7vrJFMPToogbGDRoCpU=";
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-mockery";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vektra";
|
||||
repo = "mockery";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x7WniZ4wpnuzUHM2ZC2P7Ns67bIp4V4F9f4xQEJONEk=";
|
||||
hash = "sha256-/OMUL/C/uUKT5GvEd3ylpS72XfGTnD+J7EuOR1LovB0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-cNMknwlU7ENwN67CtyU1YgYIXCJbh4b7Z3oUK7kkEkk=";
|
||||
vendorHash = "sha256-PAJymNrl83knDXP9ukUbfEdtabE4+k16Ygzwvfu5ZR8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -100,7 +100,6 @@ python3Packages.buildPythonApplication rec {
|
||||
changelog = "https://github.com/hhd-dev/hhd/releases/tag/${src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
appsforartists
|
||||
toast
|
||||
];
|
||||
mainProgram = "hhd";
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "iotas";
|
||||
version = "0.11.0";
|
||||
version = "0.11.2";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "World";
|
||||
repo = "iotas";
|
||||
tag = version;
|
||||
hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw=";
|
||||
hash = "sha256-nDmofssoaB3BKh6X3Lpi5xftyo9Zw3IUoD3wte0wPM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,34 @@
|
||||
diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake
|
||||
index edd96b0..1fbdb3c 100644
|
||||
--- a/Tools/CMake/Install.cmake
|
||||
+++ b/Tools/CMake/Install.cmake
|
||||
@@ -229,24 +229,10 @@ if(LINUX)
|
||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/
|
||||
DESTINATION ${JASP_INSTALL_RESOURCEDIR})
|
||||
|
||||
- install(
|
||||
- DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools
|
||||
- DESTINATION ${JASP_INSTALL_MODULEDIR}
|
||||
- REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE
|
||||
- REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE)
|
||||
-
|
||||
install(
|
||||
FILES ${MODULES_BINARY_PATH}/modules-settings.json
|
||||
DESTINATION ${JASP_INSTALL_MODULEDIR}
|
||||
)
|
||||
- # we do not need renv-root in an install
|
||||
- #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/
|
||||
- # DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root)
|
||||
-
|
||||
-if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway
|
||||
- install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/
|
||||
- DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache)
|
||||
-endif()
|
||||
|
||||
#Flatpak wrapper that sets some environment variables that JASP needs
|
||||
install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP
|
||||
diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake
|
||||
index a95ef78..6ee84cd 100644
|
||||
index a6673d9..a079021 100644
|
||||
--- a/Tools/CMake/Libraries.cmake
|
||||
+++ b/Tools/CMake/Libraries.cmake
|
||||
@@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
|
||||
@@ -20,8 +49,32 @@ index a95ef78..6ee84cd 100644
|
||||
HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED)
|
||||
|
||||
if(EXISTS ${LIBREADSTAT_LIBRARIES})
|
||||
diff --git a/Tools/CMake/Modules.cmake b/Tools/CMake/Modules.cmake
|
||||
index ca8e040..875db1f 100644
|
||||
--- a/Tools/CMake/Modules.cmake
|
||||
+++ b/Tools/CMake/Modules.cmake
|
||||
@@ -13,19 +13,6 @@ configure_file(${PROJECT_SOURCE_DIR}/Modules/modules-settings.json
|
||||
configure_file(${PROJECT_SOURCE_DIR}/Modules/install-modules.R.in
|
||||
${SCRIPT_DIRECTORY}/install-modules.R @ONLY)
|
||||
|
||||
-#create modules install target
|
||||
-add_custom_target(
|
||||
- Modules
|
||||
- USES_TERMINAL
|
||||
- WORKING_DIRECTORY ${R_HOME_PATH}
|
||||
- DEPENDS ${JASP_MODULE_BUNDLE_MANAGER_LIBRARY}/jaspModuleBundleManager
|
||||
- DEPENDS ${SCRIPT_DIRECTORY}/install-modules.R
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "JASP_R_HOME=${R_HOME_PATH}" ${R_EXECUTABLE} --slave --no-restore --no-save
|
||||
- --file=${SCRIPT_DIRECTORY}/install-modules.R
|
||||
- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-downloaded.txt
|
||||
- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-installed.txt
|
||||
- COMMENT "------ Installing Modules"
|
||||
-)
|
||||
|
||||
|
||||
|
||||
diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake
|
||||
index bfdc8dc..af5ac03 100644
|
||||
index 4e7c052..abb5b48 100644
|
||||
--- a/Tools/CMake/Programs.cmake
|
||||
+++ b/Tools/CMake/Programs.cmake
|
||||
@@ -38,8 +38,9 @@ if(NOT WIN32)
|
||||
@@ -37,35 +90,26 @@ index bfdc8dc..af5ac03 100644
|
||||
message(CHECK_START "Looking for 'gfortran'")
|
||||
find_program(
|
||||
diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake
|
||||
index 9ae27d4..64fd96a 100644
|
||||
index 42e7b88..405b434 100644
|
||||
--- a/Tools/CMake/R.cmake
|
||||
+++ b/Tools/CMake/R.cmake
|
||||
@@ -841,11 +841,6 @@ message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}")
|
||||
configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in
|
||||
${SCRIPT_DIRECTORY}/setup_renv.R @ONLY)
|
||||
@@ -867,14 +867,6 @@ else()
|
||||
configure_file(${PROJECT_SOURCE_DIR}/Modules/install-renv.R.in
|
||||
${SCRIPT_DIRECTORY}/install-renv.R @ONLY)
|
||||
|
||||
-
|
||||
-execute_process(
|
||||
- COMMAND_ECHO STDOUT
|
||||
- #ERROR_QUIET OUTPUT_QUIET
|
||||
- WORKING_DIRECTORY ${R_HOME_PATH}
|
||||
- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R)
|
||||
- COMMAND
|
||||
- ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/install-renv.R
|
||||
-)
|
||||
|
||||
if(APPLE)
|
||||
# Patch renv
|
||||
@@ -867,11 +862,6 @@ endif()
|
||||
configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in
|
||||
${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY)
|
||||
|
||||
-execute_process(
|
||||
- COMMAND_ECHO STDOUT
|
||||
- #ERROR_QUIET OUTPUT_QUIET
|
||||
- WORKING_DIRECTORY ${R_HOME_PATH}
|
||||
- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R)
|
||||
|
||||
if(APPLE)
|
||||
# Patch RInside and RCpp
|
||||
@@ -892,8 +882,8 @@ endif()
|
||||
|
||||
@@ -937,8 +929,8 @@ execute_process(
|
||||
|
||||
include(FindRPackagePath)
|
||||
|
||||
-find_package_path(RCPP_PATH ${R_CPP_INCLUDES_LIBRARY} "Rcpp")
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -14,6 +14,7 @@
|
||||
boost,
|
||||
freexl,
|
||||
libarchive,
|
||||
librdata,
|
||||
qt6,
|
||||
R,
|
||||
readstat,
|
||||
@@ -21,14 +22,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.19.3";
|
||||
version = "0.95.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasp-stats";
|
||||
repo = "jasp-desktop";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-p489Q3jMQ7UWOCdAGskRF9KSLoRSatUwGVfj0/g4aPo=";
|
||||
hash = "sha256-RR7rJJb0qKqZs7K3zP6GxlDXpmSNnGQ3WDExUgm9pKQ=";
|
||||
};
|
||||
|
||||
moduleSet = import ./modules.nix {
|
||||
@@ -37,7 +38,7 @@ let
|
||||
jasp-version = version;
|
||||
};
|
||||
|
||||
inherit (moduleSet) engine modules;
|
||||
inherit (moduleSet) jaspBase modules;
|
||||
|
||||
# Merges ${R}/lib/R with all used R packages (even propagated ones)
|
||||
customREnv = buildEnv {
|
||||
@@ -45,12 +46,12 @@ let
|
||||
paths = [
|
||||
"${R}/lib/R"
|
||||
rPackages.RInside
|
||||
engine.jaspBase # Should already be propagated from modules, but include it again, just in case
|
||||
jaspBase # Should already be propagated from modules, but include it again, just in case
|
||||
]
|
||||
++ lib.attrValues modules;
|
||||
};
|
||||
|
||||
modulesDir = linkFarm "jasp-${version}-modules" (
|
||||
moduleLibs = linkFarm "jasp-${version}-module-libs" (
|
||||
lib.mapAttrsToList (name: drv: {
|
||||
name = name;
|
||||
path = "${drv}/library";
|
||||
@@ -89,6 +90,7 @@ stdenv.mkDerivation {
|
||||
customREnv
|
||||
freexl
|
||||
libarchive
|
||||
librdata
|
||||
readstat
|
||||
|
||||
qt6.qtbase
|
||||
@@ -102,20 +104,17 @@ stdenv.mkDerivation {
|
||||
env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib";
|
||||
|
||||
postInstall = ''
|
||||
# Remove unused cache locations
|
||||
rm -r $out/lib64 $out/Modules
|
||||
|
||||
# Remove flatpak proxy script
|
||||
rm $out/bin/org.jaspstats.JASP
|
||||
substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \
|
||||
--replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP"
|
||||
|
||||
# symlink modules from the store
|
||||
ln -s ${modulesDir} $out/Modules
|
||||
ln -s ${moduleLibs} $out/Modules/module_libs
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit modules engine;
|
||||
inherit jaspBase modules;
|
||||
env = customREnv;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 19bd5be..d12a927 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -14,7 +14,6 @@ AC_ARG_ENABLE([sanitizers], AS_HELP_STRING([--enable-sanitizers], [Enable addres
|
||||
[SANITIZERS="-fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp"], [SANITIZERS=""])
|
||||
AC_SUBST([SANITIZERS])
|
||||
|
||||
-AM_ICONV
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
AS_CASE([$host],
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "librdata";
|
||||
version = "0-unstable-2023-10-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WizardMac";
|
||||
repo = "librdata";
|
||||
rev = "33bd276ecb0bbcd8997ccc71a544149b3da0d940";
|
||||
hash = "sha256-njTlKK++v7IbaRWJw8hWpE4tXh8MjPRijacqor7Rwes=";
|
||||
};
|
||||
|
||||
patches = [ ./gettext-fix.patch ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = {
|
||||
description = "Read and write R data frames from C";
|
||||
homepage = "https://github.com/WizardMac/librdata";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
From 4ee5d9b78ca1425b4473ede98602b656f28027e8 Mon Sep 17 00:00:00 2001
|
||||
From: David Disseldorp <ddiss@suse.de>
|
||||
Date: Fri, 4 Jul 2025 15:51:14 +1000
|
||||
Subject: [PATCH] lkl: fix hijack and zpoline parallel builds
|
||||
|
||||
This is a follow up change for commit 3c97822a40cb1 ("lkl: add tests
|
||||
build barrier") tracked via https://github.com/lkl/linux/issues/558.
|
||||
The hijack and zpoline libraries also share object files, so need a
|
||||
barrier to avoid parallel build failures.
|
||||
|
||||
Signed-off-by: David Disseldorp <ddiss@suse.de>
|
||||
---
|
||||
tools/lkl/Makefile | 7 ++++---
|
||||
tools/lkl/Targets | 2 ++
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile
|
||||
index 9ca22b7605e3ad..dfe7f6aef5fe02 100644
|
||||
--- a/tools/lkl/Makefile
|
||||
+++ b/tools/lkl/Makefile
|
||||
@@ -176,10 +176,11 @@ headers_install: $(TARGETS)
|
||||
include/lkl_config.h $(DESTDIR)$(INCDIR) ; \
|
||||
cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR)
|
||||
|
||||
-libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a
|
||||
- $(call QUIET_INSTALL, libraries) \
|
||||
+libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a
|
||||
+ # filter out special .WAIT targets from install
|
||||
+ $(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \
|
||||
install -d $(DESTDIR)$(LIBDIR) ; \
|
||||
- install -m 644 $^ $(DESTDIR)$(LIBDIR)
|
||||
+ install -m 644 $^ $(DESTDIR)$(LIBDIR))
|
||||
|
||||
programs_install: $(call expand-targets,$(progs-y),$(EXESUF))
|
||||
$(call QUIET_INSTALL, programs) \
|
||||
diff --git a/tools/lkl/Targets b/tools/lkl/Targets
|
||||
index 3d30bd8be3c840..089a832ee23627 100644
|
||||
--- a/tools/lkl/Targets
|
||||
+++ b/tools/lkl/Targets
|
||||
@@ -2,6 +2,8 @@ libs-y += lib/liblkl
|
||||
|
||||
ifneq ($(LKL_HOST_CONFIG_BSD),y)
|
||||
libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack
|
||||
+# hijack and zpoline targets share object files, breaking parallel builds
|
||||
+libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT
|
||||
libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline
|
||||
endif
|
||||
LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs
|
||||
@@ -43,6 +43,14 @@ stdenv.mkDerivation {
|
||||
libarchive
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix corruption in hijack and zpoline libraries when building in parallel,
|
||||
# because both hijack and zpoline share object files, which may result in
|
||||
# missing symbols.
|
||||
# https://github.com/lkl/linux/pull/612/commits/4ee5d9b78ca1425b4473ede98602b656f28027e8
|
||||
./fix-hijack-and-zpoline-parallel-builds.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
|
||||
patchShebangs arch/lkl/scripts
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lock";
|
||||
version = "1.6.7";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "konstantintutsch";
|
||||
repo = "Lock";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc=";
|
||||
hash = "sha256-RuxlMPboNODfSQXeGQWCpeNDI3HQNjx+ILsKAEttL6A=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ly";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "AnErrupTion";
|
||||
repo = "ly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q/MFI02YdAkPdkbi8FtsM46MNalraz2MJf4Oav3fCZA=";
|
||||
hash = "sha256-xD1FLW8LT+6szfjZbP++qJThf4xxbmw4jRHB8TdrG70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+6
-9
@@ -1,13 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonPackage;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "meerk40t-camera";
|
||||
version = "0.1.9";
|
||||
format = "setuptools";
|
||||
@@ -21,7 +18,7 @@ buildPythonPackage rec {
|
||||
sed -i '/meerk40t/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
opencv4
|
||||
];
|
||||
|
||||
@@ -31,10 +28,10 @@ buildPythonPackage rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "MeerK40t camera plugin";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/meerk40t/meerk40t-camera";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meerk40t";
|
||||
repo = pname;
|
||||
repo = "MeerK40t";
|
||||
tag = version;
|
||||
hash = "sha256-7igY6qEHDUAyyKK+T0WFNfGPYy8VnMLYaWHyBE8EMSs=";
|
||||
};
|
||||
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
||||
dontWrapGApps = true;
|
||||
|
||||
# https://github.com/meerk40t/meerk40t/blob/main/setup.py
|
||||
propagatedBuildInputs =
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
meerk40t-camera
|
||||
@@ -75,12 +75,12 @@ python3Packages.buildPythonApplication rec {
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${src.tag}";
|
||||
meta = {
|
||||
changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}";
|
||||
description = "MeerK40t LaserCutter Software";
|
||||
mainProgram = "meerk40t";
|
||||
homepage = "https://github.com/meerk40t/meerk40t";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@@ -25,14 +25,14 @@ in
|
||||
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "oci-cli";
|
||||
version = "3.63.0";
|
||||
version = "3.63.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle";
|
||||
repo = "oci-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-29jEfzS/hJQKX6P3VL/Wy+0/3DFmOKFj4RTTGkVhXXM=";
|
||||
hash = "sha256-Z9KVHD0LEz/6Mu6+pSlWZ8ie2p/qJ9DuFkG3xqxN0G4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -45,8 +45,12 @@ stdenv.mkDerivation rec {
|
||||
expat
|
||||
];
|
||||
|
||||
# Needed with GCC 12
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=uninitialized";
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=uninitialized"
|
||||
# Needed with GCC 14
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/osrm-backend
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
cmake,
|
||||
ninja,
|
||||
qt6Packages,
|
||||
protobuf,
|
||||
vtk-full,
|
||||
testers,
|
||||
}:
|
||||
let
|
||||
paraviewFilesUrl = "https://www.paraview.org/files";
|
||||
doc = fetchurl {
|
||||
url = "${paraviewFilesUrl}/v6.0/ParaViewGettingStarted-6.0.0.pdf";
|
||||
name = "GettingStarted.pdf";
|
||||
hash = "sha256-2ghvb0UXa0Z/YGWzCchB1NKowRdlC/ZQCI3y0tZUdbo=";
|
||||
};
|
||||
examples = fetchurl {
|
||||
# see https://gitlab.kitware.com/paraview/paraview-superbuild/-/blob/v6.0.0/versions.cmake?ref_type=tags#L21
|
||||
url = "${paraviewFilesUrl}/data/ParaViewTutorialData-20220629.tar.gz";
|
||||
hash = "sha256-OCLvWlwhBL9R981zXWZueMyXVeiqbxsmUYcwIu1doQ4=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "paraview";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${paraviewFilesUrl}/v${lib.versions.majorMinor finalAttrs.version}/ParaView-v${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-DuB65jd+Xpd2auv4WOuXWGaKUt8EHzGefJdQN6Y78Yk=";
|
||||
};
|
||||
|
||||
# When building paraview with external vtk, we can not infer resource_dir
|
||||
# from the path of vtk's libraries. Thus hardcoding the resource_dir.
|
||||
# See https://gitlab.kitware.com/paraview/paraview/-/issues/23043.
|
||||
postPatch = ''
|
||||
substituteInPlace Remoting/Core/vtkPVFileInformation.cxx \
|
||||
--replace-fail "return resource_dir;" "return \"$out/share/paraview\";"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
qt6Packages.wrapQtAppsHook
|
||||
vtk-full.vtkPackages.python3Packages.pythonRecompileBytecodeHook
|
||||
];
|
||||
|
||||
# propagation required by paraview-config.cmake
|
||||
propagatedBuildInputs = [
|
||||
qt6Packages.qttools
|
||||
qt6Packages.qt5compat
|
||||
protobuf
|
||||
vtk-full
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "PARAVIEW_VERSIONED_INSTALL" false)
|
||||
(lib.cmakeBool "PARAVIEW_BUILD_WITH_EXTERNAL" true)
|
||||
(lib.cmakeBool "PARAVIEW_USE_EXTERNAL_VTK" true)
|
||||
(lib.cmakeBool "PARAVIEW_USE_QT" true)
|
||||
(lib.cmakeBool "PARAVIEW_USE_MPI" true)
|
||||
(lib.cmakeBool "PARAVIEW_USE_PYTHON" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_WEB" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_CATALYST" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_VISITBRIDGE" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_ADIOS2" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_FFMPEG" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_FIDES" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_ALEMBIC" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_LAS" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_GDAL" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_PDAL" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_OPENTURNS" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_MOTIONFX" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_OCCT" true)
|
||||
(lib.cmakeBool "PARAVIEW_ENABLE_XDMF3" true)
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/paraview/doc")
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 ${doc} $out/share/paraview/doc/${doc.name}
|
||||
mkdir -p $out/share/paraview/examples
|
||||
tar --strip-components=1 -xzf ${examples} -C $out/share/paraview/examples
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
install -Dm644 ../Qt/Components/Resources/Icons/pvIcon.svg $out/share/icons/hicolor/scalable/apps/paraview.svg
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
ln -s ../Applications/paraview.app/Contents/MacOS/paraview $out/bin/paraview
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "ParaView" ];
|
||||
|
||||
package = finalAttrs.finalPackage;
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "3D Data analysis and visualization application";
|
||||
homepage = "https://www.paraview.org";
|
||||
changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version)}-release-notes";
|
||||
mainProgram = "paraview";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
guibert
|
||||
qbisi
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "12.2.7";
|
||||
version = "12.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pSmxvDGsD2NFKwP0tA8LTBxfZEXDJFwLACdmK//6Ks8=";
|
||||
hash = "sha256-t1BABpCkWqnjIE25HNzh/oWE5uYRUtm824t3dPtWq8w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-py1mJRNb8Wcsw9sq0sGZc7lHzi52Ui4HmTUeAvTaXwY=";
|
||||
vendorHash = "sha256-nXVaLzbUDqrmWW+uvuHkUBBC0Spp8UxX40ifTbUq8MA=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasmusic-toolbar";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccatterina";
|
||||
repo = "plasmusic-toolbar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Epix3gqQGc8MXMcoQ1YxrEXafuPZUOTKdute5eoJ2nI=";
|
||||
hash = "sha256-Kjzutah8CIHN3NZcxGB1FXlCNn5dnTQxJITUptaXNrs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "platform-folders";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sago007";
|
||||
repo = "PlatformFolders";
|
||||
rev = version;
|
||||
hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA=";
|
||||
hash = "sha256-8dKW9nmxiqt47Z9RBNuHjFRyOhwmi+9mR7prUOxXIRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -34,11 +34,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.78.0";
|
||||
version = "0.78.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-f5xPXBzwa9VOutiG5uYQ5FqC6Avd+VAIyDlLW7db82Y=";
|
||||
hash = "sha256-R6Z201767c61S/KAMtArzIuPjQbXMVym8KLZKMVdr+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-go";
|
||||
version = "1.36.6";
|
||||
version = "1.36.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protocolbuffers";
|
||||
repo = "protobuf-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6Wx1XoHZS1RM0hpgVE85U7huVS4IK+AroTE2zpZR4VI=";
|
||||
hash = "sha256-8ePIQ62ewJ1Bp+rG+R7o8Vx++zp8VK0MeEb8ASGZQ7E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "railway";
|
||||
version = "4.5.6";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xoBGYdcef1xBlPlUOPudhX0t59OBbNavcg5CeRJiQIY=";
|
||||
hash = "sha256-+nweRMHwQbt/Nn/i0P3s7kziP7Z8RnEszqcVzjTthes=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o/wbBp2gIl+Dyxnee7mChVzv5qmrVAcG95i9YMxd5AI=";
|
||||
cargoHash = "sha256-u86v7DeWCdeODP+mHL0mYvas1lpCEWuI15ua1LUzDak=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rattler-build";
|
||||
version = "0.44.0";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prefix-dev";
|
||||
repo = "rattler-build";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VgthpzZNFBIV4SwikmHJkRsuEP0j16hVt+CxOBuOy6s=";
|
||||
hash = "sha256-nk4orzkmgKQ6UfRpA9suh7FxiPh4P+F4NagY22if5Iw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HO4DXuCs/Jtz7kzp3jn/X/75Zdh9gS0ZO3eS9GFCbXA=";
|
||||
cargoHash = "sha256-LvdFKguUMplNbJLh6CTy6enfg1PGqjawku/tBjwf30o=";
|
||||
|
||||
doCheck = false; # test requires network access
|
||||
|
||||
|
||||
@@ -25,16 +25,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "restate";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "restatedev";
|
||||
repo = "restate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0p3pH2lQnb3oOsGtKP8olVUefobGa3DsnB2LMx06+no=";
|
||||
hash = "sha256-s7HoPuye31zATAtekWAqJz8gc/vy+vWoM68QwpjdH3o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9EeS599rZLLKkdBS1bTX7y7CTmeTBlgHZ8c0WBlbZmk=";
|
||||
cargoHash = "sha256-jkwi533Vem62vxq47EXIy/2mTHMB61DGmUyQfm3/BCE=";
|
||||
|
||||
env = {
|
||||
PROTOC = lib.getExe protobuf;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-07-29";
|
||||
version = "0-unstable-2025-08-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "fc421183a024cb3abb4c3343ed7a1954f53e4511";
|
||||
hash = "sha256-V4sjCCie5LKXQTrso8ysFDCQJ60BUx/+OHuB9ntFLUs=";
|
||||
rev = "d57b86769653ae2651533dbc2a1ffe25b119b801";
|
||||
hash = "sha256-+bcjZVwsuHnKtKkM+4vd5fY6xLidpOKXMxMQuBLwbKo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -20,16 +20,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rusty-psn";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RainbowCookie32";
|
||||
repo = "rusty-psn";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-n2h+sgqNZhFgUa4MFp501W4YPtlWN94GhP9Rlu5plBA=";
|
||||
hash = "sha256-Al0cT4WaOX7gxOkD5ciRntbGLCCDFSjj83E4n8nXp6I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ffqTzu8/ra6SwvqDne/g9EgISGlEBSleEGn6gQ/DWAY=";
|
||||
cargoHash = "sha256-FaKUQk/Q2hE0lZ11QSKA2P2BLlBNih47zzuwpMsblhw=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "schemat";
|
||||
version = "0.4.2";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raviqqe";
|
||||
repo = "schemat";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JOrBQvrnA/qSmI+jJjGjcxEWFDCfiUmtJaZPI3N0rMk=";
|
||||
hash = "sha256-gGHAkNFEkcbWqel3kr6fUiUDHwZJdf9FLHfQjD9RPUc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zGP8m05g6zEQ/dx9ChLhUCM2x9q3bltPW+9ku05rzCE=";
|
||||
cargoHash = "sha256-qbn/s5wMRt0Qj/H4SVP8fCcb5cMAXETzuPm68NdgkBE=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "secretspec";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-6a3BerjcLn86XCakyYlMm4FUUQTc7iq/hCvZEbHnp4g=";
|
||||
hash = "sha256-CYIAbp6O2e8WQcaffJ6fNY0hyKduu9mfH4xkC6ZEEWU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4sKja7dED1RuiRYA2BNqvvYlJhPFiM8IzAgQVeSa9Oc=";
|
||||
cargoHash = "sha256-cKV4rrIBKPPNfBeHdZ6K8+2yU5gznPGSlFcHfKVCnNM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dbus ];
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
gdk-pixbuf,
|
||||
librsvg,
|
||||
nix-update-script,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -29,6 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
glib
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "skim";
|
||||
version = "0.20.3";
|
||||
version = "0.20.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0=";
|
||||
hash = "sha256-KgJ22Q0+tAfO6fHLYBM5mxqYJjjfmIb7hY+FcQM4j3c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg=";
|
||||
cargoHash = "sha256-H9hCYPpsefLu35RIr3qURmrwnAOIevsd2E5LkK6Ay+4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${jre}/bin/java $out/bin/snpeff --add-flags "-jar $out/libexec/snpeff/snpEff.jar"
|
||||
makeWrapper ${jre}/bin/java $out/bin/snpsift --add-flags "-jar $out/libexec/snpeff/SnpSift.jar"
|
||||
# camelCase is the default
|
||||
ln -s $out/bin/snpeff $out/bin/snpEff
|
||||
ln -s $out/bin/snpsift $out/bin/snpSift
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -62,7 +62,7 @@ let
|
||||
stdenv.cc.cc
|
||||
stdenv.cc.libc
|
||||
];
|
||||
version = "1.0.37";
|
||||
version = "1.0.38";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "tana";
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
|
||||
hash = "sha256-S7aihKoeP1zJpMd+mdb6D9QEtFBghyVU+K0nSzGd2ew=";
|
||||
hash = "sha256-40yhEOgIfb2PalrNYn10QMW5oHsxJZwHRoal8//GDnk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "task-keeper";
|
||||
version = "0.29.3";
|
||||
version = "0.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-china";
|
||||
repo = "task-keeper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-89KR1u4aTd32tGPiW4qUUk9eC7d9pGSBuZ8C8QVgMQ4=";
|
||||
hash = "sha256-/ZmwCvoYdX733c5QkUE0KuUdHeibJkXD5wNHR7Cr7aU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cargoHash = "sha256-eLdGLKem/Sh9cQ7TRbKymUIldpctBKk1JBjWiSwLloo=";
|
||||
cargoHash = "sha256-Z56p2jeHvNAT4Pwl8kt1l9RopYCKk5Tt/XWZ7AqIFYw=";
|
||||
|
||||
# tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅
|
||||
doCheck = false;
|
||||
|
||||
@@ -2,22 +2,35 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
testers,
|
||||
television,
|
||||
nix-update-script,
|
||||
extraPackages ? [ ],
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "television";
|
||||
version = "0.11.9";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexpasmantier";
|
||||
repo = "television";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9ug3MFBAvdOpA7Cw5eqCjS2gWK0InqlfUAOItE0o40s=";
|
||||
hash = "sha256-Ur6UTd3XsI2ZyVboQA9r3WDkl7hd1wQ0NCgTlYFF/C0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-n417hrDLpBD7LhtHfqHPgr9N+gkdC9nw+iDnNRcTqQQ=";
|
||||
cargoHash = "sha256-LfaYRrJ4ZXoNVDsI650t+A7mWB9+2+znATp+mqDwTiE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = lib.optionalString (extraPackages != [ ]) ''
|
||||
wrapProgram $out/bin/tv \
|
||||
--prefix PATH : ${lib.makeBinPath extraPackages}
|
||||
'';
|
||||
|
||||
# TODO(@getchoo): Investigate selectively disabling some tests, or fixing them
|
||||
# https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tidy-viewer";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexhallam";
|
||||
repo = "tv";
|
||||
rev = version;
|
||||
sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4=";
|
||||
sha256 = "sha256-ZiwZS7fww1dphEhJsScFfu1sBs35CB9LsGnI3qsyvrk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-k/8crmGkFOLcakL5roYrSBVoYyGMELh1Mu/X6SlUeds=";
|
||||
cargoHash = "sha256-Cd3yNqDZcvaO8H9IwSOvZ+HGQ85fubbBYztOCgy60ls=";
|
||||
|
||||
# this test parses command line arguments
|
||||
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
appimageTools,
|
||||
}:
|
||||
let
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
pname = "Vial";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
|
||||
hash = "sha256-SxZC+ihJsmIQAZ31G6wS42qTxdt1/8lx80bHox3sy28=";
|
||||
hash = "sha256-sN8i/MOPhaLZ4iJNKz/MdpRIGTZVV/G5qD7o+ID8dAM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-3j6Kqlo/nsc+gjSrW5Afuamnh0qb9TnG+sFN4E5pnxc=",
|
||||
"version": "0.2025.07.30.08.12.stable_02"
|
||||
"hash": "sha256-s4SHM2pU1CZPJZFiWE5VDeSEprLsSYChFazNGOpz+oo=",
|
||||
"version": "0.2025.08.06.08.12.stable_01"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-GbkTghYchdUdYdvPNAqPv+PD7UJ2sgVc7+AAA+5bHGI=",
|
||||
"version": "0.2025.07.30.08.12.stable_02"
|
||||
"hash": "sha256-u0TH9u1o+g3GngEMg6r78fSZH778kGcKe5tB/lpExZE=",
|
||||
"version": "0.2025.08.06.08.12.stable_01"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-xIf12oEOHQE1+Sz3L/nrqli2tlP0+wWFA9dA+HHNrr0=",
|
||||
"version": "0.2025.07.30.08.12.stable_02"
|
||||
"hash": "sha256-smg2QiXRlADGBKxl9Wlq2yWsCCi3JwjxhwR13yG70mA=",
|
||||
"version": "0.2025.08.06.08.12.stable_01"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.40.3";
|
||||
version = "1.40.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-0IyFSdOam+ft9PRs6j2IdzPWI9CexUHwocbiOgZXLuE=";
|
||||
hash = "sha256-17alwgsvFrR7RChEr8po4K7t9t3aZnvFbLUGsEtUXdA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ciscoconfparse2";
|
||||
version = "0.8.17";
|
||||
version = "0.8.29";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpenning";
|
||||
repo = "ciscoconfparse2";
|
||||
tag = version;
|
||||
hash = "sha256-G6FR2v/FJE0ySpNXJ9603O16UjSqOkRB2+7xNoLBJAM=";
|
||||
hash = "sha256-Dvryv3VPdyRuvIPksEnSlKnCJU70j2xd2aWpwXUGbUY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -84,5 +84,7 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/mpenning/ciscoconfparse2/blob/${src.tag}/CHANGES.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
# https://github.com/mpenning/ciscoconfparse2/issues/19
|
||||
broken = lib.versionAtLeast hier-config.version "3";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-mcp";
|
||||
version = "0.3.7";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tadata-org";
|
||||
repo = "fastapi_mcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WQ+Y/TM5fz0lHjCKvEuYGY6hzxo2ePcgRnq7piNC+KQ=";
|
||||
hash = "sha256-TCmM5n6BF3CWEuGVSZnUL2rTYitKtn4vSCkiQvKFLKw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -74,7 +74,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Expose your FastAPI endpoints as Model Context Protocol (MCP) tools, with Auth";
|
||||
homepage = "https://github.com/tadata-org/fastapi_mcp";
|
||||
changelog = "https://github.com/tadata-org/fastapi_mcp/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/tadata-org/fastapi_mcp/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
||||
@@ -8,7 +8,10 @@
|
||||
|
||||
# dependencies
|
||||
click,
|
||||
langgraph,
|
||||
langgraph-runtime-inmem,
|
||||
langgraph-sdk,
|
||||
python-dotenv,
|
||||
|
||||
# testing
|
||||
pytest-asyncio,
|
||||
@@ -40,21 +43,20 @@ buildPythonPackage rec {
|
||||
langgraph-sdk
|
||||
];
|
||||
|
||||
# Not yet. Depemnds on `langgraph-runtime-inmem` which isn't in github yet
|
||||
# https://github.com/langchain-ai/langgraph/issues/5802
|
||||
# optional-dependencies = {
|
||||
# "inmem" = [
|
||||
# langgraph-api
|
||||
# langgraph-runtime-inmem
|
||||
# python-dotenv
|
||||
# ]
|
||||
# }
|
||||
optional-dependencies = {
|
||||
"inmem" = [
|
||||
langgraph
|
||||
langgraph-runtime-inmem
|
||||
python-dotenv
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
docker-compose
|
||||
];
|
||||
]
|
||||
++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
enabledTestPaths = [ "tests/unit_tests" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
blockbuster,
|
||||
langgraph,
|
||||
langgraph-checkpoint,
|
||||
sse-starlette,
|
||||
starlette,
|
||||
structlog,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-runtime-inmem";
|
||||
version = "0.6.8";
|
||||
pyproject = true;
|
||||
|
||||
# Not available in any repository
|
||||
src = fetchPypi {
|
||||
pname = "langgraph_runtime_inmem";
|
||||
inherit version;
|
||||
hash = "sha256-chPmwJ+tUJoRK5xX9+r6mbYf95ZbX4Z3mP6Ra19nBxM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
blockbuster
|
||||
langgraph
|
||||
langgraph-checkpoint
|
||||
sse-starlette
|
||||
starlette
|
||||
structlog
|
||||
];
|
||||
|
||||
# Can remove after blockbuster version bump
|
||||
# https://github.com/NixOS/nixpkgs/pull/431547
|
||||
pythonRelaxDeps = [
|
||||
"blockbuster"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"langgraph_runtime_inmem"
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Inmem implementation for the LangGraph API server";
|
||||
homepage = "https://pypi.org/project/langgraph-runtime-inmem/";
|
||||
# no changelog
|
||||
license = lib.licenses.elastic20;
|
||||
maintainers = with lib.maintainers; [ sarahec ];
|
||||
};
|
||||
}
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lib50";
|
||||
version = "3.0.12";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
# latest GitHub release is several years old. Pypi is up to date.
|
||||
src = fetchPypi {
|
||||
pname = "lib50";
|
||||
inherit version;
|
||||
hash = "sha256-Fc4Hb1AbSeetK3gH1/dRCUfHGDlMzfzgF1cnK3Se01U=";
|
||||
hash = "sha256-DSAYgtce9lU9dlfLejdIH9K8jVeNaPl0wSqStMgwUD4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -40,14 +40,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcp";
|
||||
version = "1.12.2";
|
||||
version = "1.12.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modelcontextprotocol";
|
||||
repo = "python-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-K3S+2Z4yuo8eAOo8gDhrI8OOfV6ADH4dAb1h8PqYntc=";
|
||||
hash = "sha256-FHVhufv4O7vM/9fNHyDU4L15dNLFMmoVaYd98Iw6l2o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,18 +12,20 @@
|
||||
pytestCheckHook,
|
||||
python-dotenv,
|
||||
smolagents,
|
||||
soundfile,
|
||||
torchaudio,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcpadapt";
|
||||
version = "0.1.10";
|
||||
version = "0.1.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grll";
|
||||
repo = "mcpadapt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-605e28p1rlJ5teCLxL/Lh8p5zV7cPuSzZWwfkE1gM5I=";
|
||||
hash = "sha256-mU/zcNEHmPfSMEMgjj4u0iwmXBH2cJzGEANPxyiR1l0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -35,12 +37,18 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
audio = [
|
||||
torchaudio
|
||||
soundfile
|
||||
];
|
||||
# crewai = [ crewai ];
|
||||
langchain = [
|
||||
langchain
|
||||
# langchain-anthropic
|
||||
langgraph
|
||||
];
|
||||
llamaindex = [ llama-index ];
|
||||
smolagents = [ smolagents ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "mcpadapt" ];
|
||||
|
||||
@@ -130,8 +130,8 @@ rec {
|
||||
"sha256-xrpy1Eq+Kleg0oYEQY/UDXvUUdZp9B6rz4OrXo/A9bA=";
|
||||
|
||||
mypy-boto3-appstream =
|
||||
buildMypyBoto3Package "appstream" "1.40.0"
|
||||
"sha256-TuIQx9qeu+JL1+Y3Gp83J4am1IYua7Ps40mqN8YLln8=";
|
||||
buildMypyBoto3Package "appstream" "1.40.4"
|
||||
"sha256-AgYaQp4AQUly5DO83NgCojU7cKOP5LdStYr1X3lMAE0=";
|
||||
|
||||
mypy-boto3-appsync =
|
||||
buildMypyBoto3Package "appsync" "1.40.0"
|
||||
@@ -178,8 +178,8 @@ rec {
|
||||
"sha256-YZKJblhTzoW0I/ozKw+RzELF9nJ0+3Z/zjZhb/lEd80=";
|
||||
|
||||
mypy-boto3-budgets =
|
||||
buildMypyBoto3Package "budgets" "1.40.0"
|
||||
"sha256-nY9RvXgjyeNsiuVtM+2pWsc0kGuAggZNpkF7SXkHVwk=";
|
||||
buildMypyBoto3Package "budgets" "1.40.4"
|
||||
"sha256-6kCRDur13G+GTZK8R7gknc1J3L/E3YA4/xi+9qQhVp0=";
|
||||
|
||||
mypy-boto3-ce =
|
||||
buildMypyBoto3Package "ce" "1.40.0"
|
||||
@@ -446,8 +446,8 @@ rec {
|
||||
"sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.40.0"
|
||||
"sha256-iyPAkVpfnqz2RX12klUOTH2NaFO/tAfiWFXLF+FHGe0=";
|
||||
buildMypyBoto3Package "ec2" "1.40.4"
|
||||
"sha256-fotmSGj+r85lJZPKq4UOc3OvCdnX0pO+qSQVQozxGJw=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.40.0"
|
||||
@@ -974,8 +974,8 @@ rec {
|
||||
"sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU=";
|
||||
|
||||
mypy-boto3-opensearchserverless =
|
||||
buildMypyBoto3Package "opensearchserverless" "1.40.0"
|
||||
"sha256-IKxLTdH0V590cXVZ1JNdp3Hg4sFEs2ZAiAir4eicpZ4=";
|
||||
buildMypyBoto3Package "opensearchserverless" "1.40.4"
|
||||
"sha256-nkt68bkNRfKMeO9TJV/P5PGzy8ps4CZpYcF2LmDUs2c=";
|
||||
|
||||
mypy-boto3-opsworks =
|
||||
buildMypyBoto3Package "opsworks" "1.40.0"
|
||||
|
||||
@@ -36,14 +36,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orbax-checkpoint";
|
||||
version = "0.11.20";
|
||||
version = "0.11.21";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "orbax";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZZTmWW0PZHk8Evhk6JnbAyl7RQOAxN4GwXUv5M6GfIQ=";
|
||||
hash = "sha256-hb7Y/usg4JFRKsahKNV8rvjMGAN4xYEaaWsedGKcK+Y=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/checkpoint";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-ocsf-models";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "prowler-cloud";
|
||||
repo = "py-ocsf-models";
|
||||
tag = version;
|
||||
hash = "sha256-9aKZtSolUARl70QdavQ6mkW7jk3OlOAIoy/8I6o1+0M=";
|
||||
hash = "sha256-6mVu508FyLUUqKTKSFHXnsna/KDMh3RXVQ051sqozQs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-scrypt";
|
||||
version = "0.8.27";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "scrypt";
|
||||
inherit version;
|
||||
hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bindings for scrypt key derivation function library";
|
||||
homepage = "https://pypi.python.org/pypi/scrypt";
|
||||
maintainers = [ ];
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
}
|
||||
@@ -32,14 +32,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylance";
|
||||
version = "0.32.0";
|
||||
version = "0.32.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hVWyZv978hDjAOdk4S9S9RJOkxqhOL0ZBpi4wGk0h1c=";
|
||||
hash = "sha256-P40m8ak0A2l4zGAYcbvXGidQpIT3+ayERbleWcVuLbE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
@@ -51,7 +51,7 @@ buildPythonPackage rec {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-ZUNAZsOpLdpdsKhIp/6QD3Ys7MOeO6H3ve8au7g+riU=";
|
||||
hash = "sha256-rCaLREl2LSfpu0vwa1Vx2rQ7phWsGz58RTjo6yfHKLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyobjc-core";
|
||||
version = "11.0";
|
||||
version = "11.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ronaldoussoren";
|
||||
repo = "pyobjc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg=";
|
||||
hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/pyobjc-core";
|
||||
@@ -31,18 +31,6 @@ buildPythonPackage rec {
|
||||
darwin.DarwinTools # sw_vers
|
||||
];
|
||||
|
||||
# See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we
|
||||
# cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727.
|
||||
postPatch = ''
|
||||
for file in Modules/objc/test/*.m; do
|
||||
substituteInPlace "$file" --replace "[[clang::suppress]]" ""
|
||||
done
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "-buildversion" "-buildVersion" \
|
||||
--replace-fail "-productversion" "-productVersion"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${darwin.libffi.dev}/include"
|
||||
"-Wno-error=cast-function-type-mismatch"
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyobjc-framework-Cocoa";
|
||||
version = "11.0";
|
||||
version = "11.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ronaldoussoren";
|
||||
repo = "pyobjc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg=";
|
||||
hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/pyobjc-framework-Cocoa";
|
||||
@@ -25,7 +25,6 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
darwin.libffi
|
||||
darwin.DarwinTools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,7 +36,9 @@ buildPythonPackage rec {
|
||||
postPatch = ''
|
||||
substituteInPlace pyobjc_setup.py \
|
||||
--replace-fail "-buildversion" "-buildVersion" \
|
||||
--replace-fail "-productversion" "-productVersion"
|
||||
--replace-fail "-productversion" "-productVersion" \
|
||||
--replace-fail "/usr/bin/sw_vers" "sw_vers" \
|
||||
--replace-fail "/usr/bin/xcrun" "xcrun"
|
||||
'';
|
||||
|
||||
dependencies = [ pyobjc-core ];
|
||||
@@ -47,7 +48,13 @@ buildPythonPackage rec {
|
||||
"-Wno-error=unused-command-line-argument"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "Cocoa" ];
|
||||
pythonImportsCheck = [
|
||||
"Cocoa"
|
||||
"CoreFoundation"
|
||||
"Foundation"
|
||||
"AppKit"
|
||||
"PyObjCTools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PyObjC wrappers for the Cocoa frameworks on macOS";
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcengine";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HvvWak7a2djF6wDJaHsBltaG1dTGbKH7wjsngO+fh2U=";
|
||||
hash = "sha256-Ute8puO2qc679ttZgzQRnVO8OuBmYnqLT3y7faHpRgA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qdrant-client";
|
||||
version = "1.14.3";
|
||||
version = "1.15.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "qdrant";
|
||||
repo = "qdrant-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OcSR8iYwX1az5BFVNp6xHpVE//Nyk4Nk97SaxAMJQRI=";
|
||||
hash = "sha256-tZu6NeoStPwZ1f+AlVws8iS3UwpKikxE6Es7WKlFQfw=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scalar-fastapi";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "scalar_fastapi";
|
||||
inherit version;
|
||||
hash = "sha256-r5GoX6f7Ru078WcRvGNyhyYDxL1w4yjbfHvlf+ZF/sc=";
|
||||
hash = "sha256-z5ujaUfqGwQC/B+jEfMKaQs547rt7x97RVPPVwAtrOs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrypt";
|
||||
version = "0.8.27";
|
||||
version = "0.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holgern";
|
||||
repo = "py-scrypt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-r5tXRq4VFieqw3Plx6W5imDIeGIldW1BREdm6/Kav3M=";
|
||||
hash = "sha256-4jVXaPD57RMe4ef1PVgZwPGAhEHL3RGlu2DSC6lGuR4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,31 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
async-timeout,
|
||||
bleak,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
intelhex,
|
||||
poetry-core,
|
||||
poetry-dynamic-versioning,
|
||||
pyserial,
|
||||
smp,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
smp,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smpclient";
|
||||
version = "4.5.0";
|
||||
version = "5.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intercreate";
|
||||
repo = "smpclient";
|
||||
tag = version;
|
||||
hash = "sha256-Z0glcCy3JsL45iT8Q82Vtxozi3hv6xaRJvJ3BkHX4PQ=";
|
||||
hash = "sha256-NQRVEvi/B+KdhPIzw8pm22uXpYPkoaatkCNFnEcibzo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "smp" ];
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -41,13 +45,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"smp"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"smpclient"
|
||||
];
|
||||
pythonImportsCheck = [ "smpclient" ];
|
||||
|
||||
meta = {
|
||||
description = "Simple Management Protocol (SMP) Client for remotely managing MCU firmware";
|
||||
|
||||
@@ -7,9 +7,7 @@
|
||||
ifaddr,
|
||||
lxml,
|
||||
mock,
|
||||
nix-update-script,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
requests-mock,
|
||||
setuptools,
|
||||
@@ -18,16 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "soco";
|
||||
version = "0.30.10";
|
||||
version = "0.30.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoCo";
|
||||
repo = "SoCo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BTDKn6JVqXfLiry6jES/OnsO3SGniEMWW2osf9veukU=";
|
||||
hash = "sha256-x5WKG2KFBr0FQu28160qHB2ckKdpx0cKhgYTH6sLnuw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -49,12 +45,10 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "soco" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI and library to control Sonos speakers";
|
||||
homepage = "http://python-soco.com/";
|
||||
changelog = "https://github.com/SoCo/SoCo/releases/tag/v${version}";
|
||||
changelog = "https://github.com/SoCo/SoCo/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "speak2mary";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5W2E/leT/IiXFVXD+LSPE99zGlz+yKm5XCv830rt8O0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Tests require a running MaryTTS server
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "speak2mary" ];
|
||||
|
||||
meta = {
|
||||
description = "Python wrapper for a running MaryTTS server";
|
||||
homepage = "https://github.com/Poeschl/speak2mary";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
}
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchmetrics";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lightning-AI";
|
||||
repo = "torchmetrics";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zoKULi12vIKMzPRE6I4Rtq4dVQL/GfNFjHR+BId1ADg=";
|
||||
hash = "sha256-Qisp5RTfcKr6W9K6FDFUHMqICSpVshsrZWwpDEgTTQM=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -35,6 +35,8 @@ buildPythonPackage rec {
|
||||
version = "65.1";
|
||||
pyproject = true;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kozea";
|
||||
repo = "WeasyPrint";
|
||||
@@ -112,10 +114,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://weasyprint.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
teams = [ lib.teams.apm ];
|
||||
badPlatforms = [
|
||||
# Fatal Python error: Segmentation fault
|
||||
# "...weasyprint/pdf/fonts.py", line 221 in _harfbuzz_subset
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetify-com";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-LAYGjpaHxlolzzpilD3DOvd+J0eNJ0p+VdRayGQvUWo=";
|
||||
hash = "sha256-ANbIwR3XiphHbaeg3YtwtHZ9UbwK3BOnPb5ZF1EJtEw=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -27,7 +27,7 @@ buildGoModule rec {
|
||||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-cBRdJUviqtzX1W85/rZr23W51mdjoEPCwXxF754Dhqw=";
|
||||
vendorHash = "sha256-0lDPK9InxoQzndmQvhKCYvqEt2NL2A+rt3sGg+o1HTY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trace-cmd";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz";
|
||||
hash = "sha256-35BEzuevGiRQFqvWOQK1m20juhSd5101a8bBsNtM8Eo=";
|
||||
hash = "sha256-B3bwHV+f6IuoNESz5B4ij5KsIcCcpUPmoSnJeJj0J0Y=";
|
||||
};
|
||||
|
||||
# Don't build and install html documentation
|
||||
|
||||
@@ -7,11 +7,6 @@
|
||||
crt ? stdenv.hostPlatform.libc,
|
||||
}:
|
||||
|
||||
assert lib.assertOneOf "crt" crt [
|
||||
"msvcrt"
|
||||
"ucrt"
|
||||
];
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mingw-w64";
|
||||
inherit (mingw_w64_headers) version src meta;
|
||||
|
||||
@@ -1,20 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
crt ? stdenvNoCC.hostPlatform.libc,
|
||||
}:
|
||||
assert lib.assertOneOf "crt" crt [
|
||||
"msvcrt"
|
||||
"ucrt"
|
||||
];
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mingw_w64-headers";
|
||||
version = "12.0.0";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-zEGJiqxLbo3Vz/1zMbnZUVuRLfRCCjphK16ilVu+7S8=";
|
||||
hash = "sha256-Wv6CKvXE7b9n2q9F7sYdU49J7vaxlSTeZIl8a5WCjK8=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@@ -25,6 +22,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
cd mingw-w64-headers
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) wine;
|
||||
};
|
||||
updateScript = ./update.nu;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.mingw-w64.org/";
|
||||
downloadPage = "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/";
|
||||
|
||||
Executable
+77
@@ -0,0 +1,77 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i nu -p nushell nix
|
||||
|
||||
use std/log
|
||||
|
||||
def replace [ p: path old: string new: string ] {
|
||||
open $p
|
||||
| str replace $old $new
|
||||
| save -f $p
|
||||
}
|
||||
|
||||
def eval [ attr: string ] {
|
||||
with-env {
|
||||
NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1
|
||||
} {
|
||||
nix eval -f ./. $attr --json
|
||||
}
|
||||
| from json
|
||||
}
|
||||
|
||||
def main [] {
|
||||
# List of all the link in the RSS feed for
|
||||
# https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/
|
||||
let links = http get https://sourceforge.net/projects/mingw-w64/rss?path=/mingw-w64/mingw-w64-release/
|
||||
| from xml
|
||||
| get content.content.0
|
||||
| where tag == item
|
||||
| get content
|
||||
| flatten
|
||||
| where tag == title
|
||||
| get content
|
||||
| flatten
|
||||
| get content
|
||||
|
||||
# Select only files ending in "tar.bz2", then select the largest value
|
||||
# We only consider values with at least two digits cause they are at
|
||||
# 13.0 and sorting strings doesn't work well if they aren't the same length
|
||||
let newest = $links
|
||||
| where { ($in | str ends-with "tar.bz2") and ($in =~ v[0-9][0-9]\.) }
|
||||
| sort -r
|
||||
| get 0
|
||||
|
||||
# Extract the newest version out of the URL
|
||||
let new_version = $newest
|
||||
| split column /
|
||||
| get column4.0
|
||||
| split column -
|
||||
| get column3.0
|
||||
| str replace .tar.bz2 ""
|
||||
| str trim -c v
|
||||
|
||||
# Get the current version in the drv
|
||||
let current_version = eval "windows.mingw_w64_headers.version"
|
||||
|
||||
if $new_version == $current_version {
|
||||
log info "Current mingw-w64 version matches the latest, exiting..."
|
||||
return
|
||||
} else {
|
||||
log info $"Current version is ($current_version)\nLatest version is ($new_version)"
|
||||
}
|
||||
|
||||
# Get the current hash
|
||||
let current_hash = eval "windows.mingw_w64_headers.src.outputHash"
|
||||
|
||||
# Set to the new version
|
||||
replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_version $new_version
|
||||
|
||||
# The nix derivation creates the URL from the version, so just grab that.
|
||||
let new_url = eval "windows.mingw_w64_headers.src.url"
|
||||
|
||||
# Prefetch to get the new hash
|
||||
let new_hash = nix-prefetch-url --type sha256 $new_url
|
||||
| nix hash to-sri --type sha256 $in
|
||||
|
||||
# Set the hash
|
||||
replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_hash $new_hash
|
||||
}
|
||||
@@ -3406,7 +3406,8 @@
|
||||
];
|
||||
"marytts" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: speak2mary
|
||||
speak2mary
|
||||
];
|
||||
"mastodon" =
|
||||
ps: with ps; [
|
||||
mastodon-py
|
||||
@@ -7290,6 +7291,7 @@
|
||||
"mailgun"
|
||||
"manual"
|
||||
"manual_mqtt"
|
||||
"marytts"
|
||||
"mastodon"
|
||||
"matrix"
|
||||
"matter"
|
||||
|
||||
@@ -12304,10 +12304,6 @@ with pkgs;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
meerk40t = callPackage ../applications/misc/meerk40t { };
|
||||
|
||||
meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { };
|
||||
|
||||
libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { };
|
||||
|
||||
mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
|
||||
@@ -13132,8 +13128,6 @@ with pkgs;
|
||||
|
||||
parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
|
||||
|
||||
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
|
||||
|
||||
pekwm = callPackage ../by-name/pe/pekwm/package.nix {
|
||||
awk = gawk;
|
||||
grep = gnugrep;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user