Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -3407,6 +3407,12 @@
|
||||
github = "blenderfreaky";
|
||||
githubId = 14351657;
|
||||
};
|
||||
blghnks = {
|
||||
email = "bilgehankuch@gmail.com";
|
||||
name = "Bilgehan Kuş";
|
||||
github = "blghnks";
|
||||
githubId = 175811412;
|
||||
};
|
||||
blinry = {
|
||||
name = "blinry";
|
||||
email = "mail@blinry.org";
|
||||
@@ -7651,6 +7657,12 @@
|
||||
github = "ErinvanderVeen";
|
||||
githubId = 10973664;
|
||||
};
|
||||
ern775 = {
|
||||
email = "eren.demir2479090@gmail.com";
|
||||
github = "ern775";
|
||||
githubId = 188162351;
|
||||
name = "Eren Demir";
|
||||
};
|
||||
erooke = {
|
||||
email = "ethan@roo.ke";
|
||||
name = "Ethan Rooke";
|
||||
|
||||
@@ -46,11 +46,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.56.1";
|
||||
version = "3.56.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-39/lmRCdI5vFbajpYlssGVcGegGujv81BmOj2q50vRY=";
|
||||
hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
|
||||
let
|
||||
pname = "autobrr";
|
||||
version = "1.62.0";
|
||||
version = "1.63.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "autobrr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lygDs92WiIzHYgYqel2nseWcXgBFEQV+i5tC0NYpYUE=";
|
||||
hash = "sha256-yQ7gS2nKqMiEGDifiCe/Mfat3xx+LYrJiPC7ltVeQlU=";
|
||||
};
|
||||
|
||||
autobrr-web = stdenvNoCC.mkDerivation {
|
||||
@@ -40,7 +40,7 @@ let
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
|
||||
hash = "sha256-TbdRJqLdNI7wchUsx2Kw1LlDyv50XlCiKyn6rhZyN1U=";
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
@@ -60,7 +60,7 @@ buildGoModule rec {
|
||||
src
|
||||
;
|
||||
|
||||
vendorHash = "sha256-/MOP06po885vg1C6j+let8UC710j68oP+L3j9oEU0Lw=";
|
||||
vendorHash = "sha256-kaHTH3gR0bTD89L8GLgntiOJ8S5dIzvpU27ma4cb/Do=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${autobrr-web}/* web/dist
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blst";
|
||||
version = "0.3.14";
|
||||
version = "0.3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supranational";
|
||||
repo = "blst";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q9/zGN93TnJt2c8YvSaURstoxT02ts3nVkO5V08m4TI=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
@@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/supranational/blst/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Multilingual BLS12-381 signature library";
|
||||
homepage = "https://github.com/supranational/blst";
|
||||
license = licenses.isc;
|
||||
|
||||
@@ -104,9 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -rf updater
|
||||
|
||||
# patch cargo-deps
|
||||
pushd $cargoDepsCopy/tauri-plugin-shell-*
|
||||
patch -p1 < /build/source/src-tauri/patches/tauri-plugin-shell+*.patch
|
||||
popd
|
||||
patch -d $cargoDepsCopy/tauri-plugin-shell-* -p1 < ./src-tauri/patches/tauri-plugin-shell+*.patch
|
||||
|
||||
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
|
||||
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
@@ -120,7 +118,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ln -s ${shelter} src-tauri/injection/shelter.js
|
||||
|
||||
# link html/frontend data
|
||||
ln -s /build/source/src /build/source/src-tauri/html
|
||||
ln -s $(pwd)/src src-tauri/html
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
@@ -130,7 +128,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
buildPhase = ''
|
||||
ninjaBuildPhase
|
||||
cd /build/source
|
||||
cd ../..
|
||||
tauriBuildHook
|
||||
'';
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.56.1";
|
||||
version = "3.56.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
|
||||
hash = "sha256-ZGzAA32j+fKVeUxjfZU5StdvjJvuImi+LEGD4ncgwTc=";
|
||||
hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gexiv2";
|
||||
version = "0.14.3";
|
||||
version = "0.14.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "IeZNLFbpszPUT+8/KkslZT2SLEGazZcvqW+raVIX4sg=";
|
||||
sha256 = "CRPFPaq6sfGrWGr9VbtVNweW8rirzG43ZAq3cErZnOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-backgrounds";
|
||||
version = "48.0";
|
||||
version = "48.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz";
|
||||
hash = "sha256-LWuqAR7peATHVh9+HL2NR2PjC1W4gY3aePn3WvuNjQU=";
|
||||
hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -75,11 +75,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-control-center";
|
||||
version = "48.1";
|
||||
version = "48.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-AYPbNlqqj4W0SyPMnK5nXRyDNgSf7BGoym6pvb6MSP4=";
|
||||
hash = "sha256-0uxKXifhkdkvmO1NvEqGHX8axKWiS2UktJKhIAfdRgw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -28,9 +28,9 @@
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-desktop";
|
||||
version = "44.1";
|
||||
version = "44.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-rnylXcngiRSZl0FSOhfSnOIjkVYmvSRioSC/lvR6eas=";
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
@@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
teams = [ teams.gnome ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -30,11 +30,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-maps";
|
||||
version = "48.2";
|
||||
version = "48.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-rW3WEmiF+xaG7kv0mnh6clfHzF93nlQTQVWmgKMKjLk=";
|
||||
hash = "sha256-rocWuLCz/r0+0iwX6QYuuA9tbSXFBQHATUIwuXzuRco=";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.54.2";
|
||||
version = "3.54.3";
|
||||
|
||||
outputs =
|
||||
[
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-D389KcBmb/vMUD8+DzOWNi7/25MX1BZkzmXfFH7zU3I=";
|
||||
hash = "sha256-vPZV3R3cIrwleTtoQNoZ9crXugtyJ/+WntnCUvA2qsU=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell-extensions";
|
||||
version = "48.1";
|
||||
version = "48.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-m2f8LFgC2hcTp3sZ/6BCMY3XHnva6EN3lsX1GXlTOTw=";
|
||||
hash = "sha256-6Sh+hjSJ5fpqLFWuW+ocqRCuQBbe6zQXNiZ4sEqR7P8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -69,7 +69,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell";
|
||||
version = "48.1";
|
||||
version = "48.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-uk9FWv1iE/OHVFlG482dqjnJBPerFt2DCsd6c/8QAso=";
|
||||
hash = "sha256-XSbMfvymNIW33bbHo5Msoa+fqPy+OLjJnqP0qyFzpqk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -48,11 +48,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-software";
|
||||
version = "48.1";
|
||||
version = "48.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-CEqYUEApTDZFS0ZKIUT5gcAnSQa0xJ1xYT5hztapbo8=";
|
||||
hash = "sha256-q/0wZDqGxl9IhrZ2XrO7YhXJ6gmBfWvRZcUAVokIIsk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -30,11 +30,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-terminal";
|
||||
version = "3.56.1";
|
||||
version = "3.56.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ojB1PlC9Qx27EwDhV7/XMXMA4lIm/zCJMxY2OhOGT/g=";
|
||||
hash = "sha256-I1vAnfo0zF8elRIum/YCA6hNr4Yc+s9+RJbF9UgjmXg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-text-editor";
|
||||
version = "48.2";
|
||||
version = "48.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-/B9dR1vdJ9TAQ5pbj+ENbkAbQvHbo9BLdWeDkDbuICs=";
|
||||
hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-user-docs";
|
||||
version = "48.1";
|
||||
version = "48.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-rJc9kk4AVFoUWNhqEQ1Hc+a743w3KEDXbtZAyyaMYf0=";
|
||||
hash = "sha256-Z4Kfdkumctf5n/cu9lE7QMyTH7QBv3vX21+AXnv6Pbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grilo";
|
||||
version = "0.3.16"; # if you change minor, also change ./setup-hook.sh
|
||||
version = "0.3.19"; # if you change minor, also change ./setup-hook.sh
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "iEWA6MXs4oDfI6pj/1I0t9SJiKQE331r/M0ed7RzvZY=";
|
||||
sha256 = "CGnIHRmrE5xmfXlWfBTdy2y1y/wBCNBMreKH6ylTZwY=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "hypercore";
|
||||
version = "11.8.3";
|
||||
version = "11.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holepunchto";
|
||||
repo = "hypercore";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3b1Q2fDEGEqI/HW/zKgxbzqFn368V5kHVETqRcJF+1U=";
|
||||
hash = "sha256-aOF/wsq3m+CBrnZkkheukSmYuujOzRb8nJKp4AhZ3kc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZJxVmQWKgHyKkuYfGIlANXFcROjI7fibg6mxIhDZowM=";
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.217";
|
||||
version = "1.218";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-x5wxexU9hvVCR50f89dbg1HAW+qh6j3ZUJ0CormeBYo=";
|
||||
hash = "sha256-TGl4J4r7ueAahrTgsJH0DlucuT2OrW3NzR1jQGwQA7E=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mm-common";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "tVxGA3282rxc7js4nqEcw5EK22jr6IPpR3hHqmYIYuc=";
|
||||
sha256 = "SUq/zngUGCWbHp2IiMc69N5LbzvjbMddm6qLqg8qejk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "48.2";
|
||||
version = "48.3.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-PBi6Tgk+qaN4ET3K+nvbXB+db1r5dlAmt+Zst42vYU4=";
|
||||
hash = "sha256-BvimrX/0+HOa9q8uF1PJHfp7mDl+UpRmMloQGMeVCmo=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nautilus";
|
||||
version = "48.1";
|
||||
version = "48.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-eZWioXwp1LCav53ZrKFLje597DvXR3bdN5US8ubXNH8=";
|
||||
hash = "sha256-oDD2Fj+KaAZPrlqeieN/Gcuyk94uEqGd1eIQlW0N9LU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
--- a/src/nerofs.cpp
|
||||
+++ b/src/nerofs.cpp
|
||||
@@ -173,31 +173,19 @@
|
||||
|
||||
QString NeroFS::GetIcoextract()
|
||||
{
|
||||
- // TODO: this is for flexibility in sandboxed environments(?)
|
||||
- // idk what the "good" path should be for Flatpak, so...
|
||||
- if(QDir("/usr/bin").exists("icoextract")) {
|
||||
- return "/usr/bin/icoextract";
|
||||
- } else return "";
|
||||
+ return QStandardPaths::findExecutable("icoextract");
|
||||
}
|
||||
|
||||
|
||||
QString NeroFS::GetIcoutils()
|
||||
{
|
||||
- // TODO: this is for flexibility in sandboxed environments(?)
|
||||
- // idk what the "good" path should be for Flatpak, so...
|
||||
- if(QDir("/usr/bin").exists("icotool")) {
|
||||
- return "/usr/bin/icotool";
|
||||
- } else return "";
|
||||
+ return QStandardPaths::findExecutable("icotool");
|
||||
}
|
||||
|
||||
|
||||
QString NeroFS::GetUmU()
|
||||
{
|
||||
- // TODO: this is for flexibility in sandboxed environments(?)
|
||||
- // idk what the "good" path should be for Flatpak, so...
|
||||
- if(QDir("/usr/bin").exists("umu-run")) {
|
||||
- return "/usr/bin/umu-run";
|
||||
- } else return "";
|
||||
+ return QStandardPaths::findExecutable("umu-run");
|
||||
}
|
||||
|
||||
QString NeroFS::GetWinetricks(const QString &runner)
|
||||
@@ -207,17 +195,13 @@
|
||||
return protonsPath.path() + '/' + runner + "/protonfixes/winetricks";
|
||||
else {
|
||||
// fall back to system winetricks
|
||||
- if(QDir("/usr/bin").exists("winetricks"))
|
||||
- return "/usr/bin/winetricks";
|
||||
- else return "";
|
||||
+ return QStandardPaths::findExecutable("winetricks");
|
||||
}
|
||||
} else if(QDir(protonsPath.path() + '/' + currentRunner + "/protonfixes").exists("winetricks"))
|
||||
return protonsPath.path() + '/' + currentRunner + "/protonfixes/winetricks";
|
||||
else {
|
||||
// fall back to system winetricks
|
||||
- if(QDir("/usr/bin").exists("winetricks"))
|
||||
- return "/usr/bin/winetricks";
|
||||
- else return "";
|
||||
+ return QStandardPaths::findExecutable("winetricks");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/neroprefixsettings.cpp
|
||||
+++ b/src/neroprefixsettings.cpp
|
||||
@@ -598,7 +598,7 @@
|
||||
tmpDir.mkdir("nero-manager");
|
||||
QProcess process;
|
||||
process.setWorkingDirectory(tmpDir.path()+"/nero-manager");
|
||||
- process.start("/usr/bin/curl", { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" });
|
||||
+ process.start(QStandardPaths::findExecutable("curl"), { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" });
|
||||
printf("Downloading Discord RPC Bridge...\n");
|
||||
|
||||
NeroPrefixSettingsWindow::blockSignals(true);
|
||||
@@ -0,0 +1,99 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qt6,
|
||||
qt6Packages,
|
||||
icu,
|
||||
icoextract,
|
||||
icoutils,
|
||||
umu-launcher,
|
||||
winetricks,
|
||||
curl,
|
||||
mangohud,
|
||||
gamescope,
|
||||
gamemode,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nero-umu";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SeongGino";
|
||||
repo = "Nero-umu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sX/Z/b5stauut8qg6IV/DdsCIkdx1N3+y1jwoXHr1LY=";
|
||||
};
|
||||
|
||||
#Replace quazip git submodule with pre-packaged quazip
|
||||
postUnpack = ''
|
||||
rmdir source/lib/quazip/
|
||||
ln -s ${qt6Packages.quazip.src} source/lib/quazip
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qttools
|
||||
qt6.qt5compat
|
||||
qt6Packages.quazip
|
||||
icu
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
icoextract
|
||||
icoutils
|
||||
winetricks
|
||||
curl
|
||||
umu-launcher
|
||||
mangohud
|
||||
gamescope
|
||||
gamemode
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "NERO_QT_VERSION" "Qt6")
|
||||
];
|
||||
|
||||
#Fixes to be able to find binaries for nix
|
||||
patches = [
|
||||
./nerofs.patch
|
||||
./neroprefix.patch
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 "nero-umu" "$out/bin/nero-umu"
|
||||
for size in 32 48 64 128; do
|
||||
install -Dm644 "$src/img/ico/ico_"$size".png" "$out/share/icons/hicolor/"$size"x"$size"/apps/xyz.TOS.Nero.png"
|
||||
done
|
||||
install -Dm644 "$src/xyz.TOS.Nero.desktop" "$out/share/applications/xyz.TOS.Nero.desktop"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}
|
||||
)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/SeongGino/Nero-umu";
|
||||
description = "Fast and efficient Proton prefix runner and manager using umu as backend";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "nero-umu";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [
|
||||
ern775
|
||||
blghnks
|
||||
keenanweaver
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -61,14 +61,14 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvino";
|
||||
version = "2025.1.0";
|
||||
version = "2025.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openvinotoolkit";
|
||||
repo = "openvino";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-KufQjBSzhj1N+T95PjlNU3Tc9V5/X2OLwCbXoI2fdZk=";
|
||||
hash = "sha256-EtXHMOIk4hGcLiaoC0ZWYF6XZCD2qNtt1HeJoJIuuTA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "48.1";
|
||||
version = "48.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
|
||||
hash = "sha256-ZsbwmCIUnaJDpGM6fYSnsduq8UU0qf653yv+AaUFF4o=";
|
||||
hash = "sha256-oIPaV4ZLVLoqPl9IG1QM/L5hiASjZDZoJ3Jw4mNTaf4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -30,18 +30,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pipeline";
|
||||
version = "2.1.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "pipeline";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-51ru1L+wxPtrNlnHyTouVxR6oZjanYvCoouB+eNOSD0=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Q1Y8a9EQUwgxlkYy+vbilHz7RVwkxXknVhc3u+dlNBE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-G6E+V4hXqz/ec5qKV43IUlwM866iurbptYFxidASJz0=";
|
||||
hash = "sha256-pbYpJ2TyrBg3CMCshHnzb4hjq6SLfxXJyAElllicFDM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
diff --git a/vobcopy.h b/vobcopy.h
|
||||
index dcf4266..d34c2b4 100644
|
||||
--- a/vobcopy.h
|
||||
+++ b/vobcopy.h
|
||||
@@ -115,6 +115,7 @@ typedef enum { FALSE=0, TRUE=1 } bool;
|
||||
|
||||
#ifdef HAVE_SYS_STATVFS_H
|
||||
#include <sys/statvfs.h>
|
||||
+#ifndef __APPLE__
|
||||
#ifndef USE_STATFS
|
||||
#define USE_STATVFS
|
||||
#ifndef USE_STATFS_FOR_DEV
|
||||
@@ -122,6 +123,7 @@ typedef enum { FALSE=0, TRUE=1 } bool;
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifdef HAVE_MNTENT_H
|
||||
#include <mntent.h>
|
||||
@@ -164,6 +166,6 @@ char *safestrncpy(char *dest, const char *src, size_t n);
|
||||
int check_progress( void ); /* this can be removed because the one below supersedes it */
|
||||
int progressUpdate( int starttime, int cur, int tot, int force );
|
||||
|
||||
-#ifndef HAVE_FDATASYNC
|
||||
+#if !defined(HAVE_FDATASYNC) || defined(__APPLE__)
|
||||
#define fdatasync(fd) 0
|
||||
#endif
|
||||
@@ -1,32 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gettext,
|
||||
libdvdread,
|
||||
libdvdcss,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "vobcopy";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1-unstable-2023-08-29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2";
|
||||
sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "barak";
|
||||
repo = "vobcopy";
|
||||
rev = "cb560b3a67358f51d51ecc0e511f49f09f304a13";
|
||||
hash = "sha256-2EtSO39yOFoCZ5GMqtp+SvmzqSevlqYDo73p0lVHZ3o=";
|
||||
};
|
||||
|
||||
# Based on https://github.com/barak/vobcopy/issues/14, but also fixes
|
||||
# "error: call to undeclared function 'fdatasync'". The latter patch
|
||||
# is inspired by https://github.com/php/php-src/commit/e69729f2ba02ddc26c70b4bd88ef86c0a2277bdc
|
||||
patches = [ ./fix-darwin.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
buildInputs = [
|
||||
gettext # Fails on Darwin otherwise
|
||||
libdvdread
|
||||
libdvdcss
|
||||
];
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"PREFIX=/"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Copies DVD .vob files to harddisk, decrypting them on the way";
|
||||
homepage = "http://vobcopy.org/projects/c/c.shtml";
|
||||
homepage = "https://github.com/barak/vobcopy";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "vobcopy";
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl
|
||||
index 77aed075..82832fb4 100644
|
||||
--- a/xslt/common/html.xsl
|
||||
+++ b/xslt/common/html.xsl
|
||||
@@ -266,6 +266,16 @@ certain tokens, and you can add your own with {html.sidebar.mode}. See
|
||||
-->
|
||||
<xsl:param name="html.sidebar.right" select="''"/>
|
||||
|
||||
+<!--@@==========================================================================
|
||||
+html.csp.nonce
|
||||
+An optional CSP nonce string to allow the execution of scripts and styles.
|
||||
+@revision[version=42.2 date=2025-02-22 status=final]
|
||||
+
|
||||
+This parameter takes a string value that will be added to the 'nonce' attribute
|
||||
+of all 'style' and 'script' tags in the generated HTML output. This paramter is used
|
||||
+to whitelist script and style tags that are allowed to be executed.
|
||||
+-->
|
||||
+<xsl:param name="html.csp.nonce" select="false()"/>
|
||||
|
||||
<!--**==========================================================================
|
||||
html.output
|
||||
@@ -1124,6 +1134,11 @@ dimensions. All parameters can be automatically computed if not provided.
|
||||
</xsl:call-template>
|
||||
</xsl:param>
|
||||
<style type="text/css">
|
||||
+ <xsl:if test="$html.csp.nonce">
|
||||
+ <xsl:attribute name="nonce">
|
||||
+ <xsl:value-of select="$html.csp.nonce" />
|
||||
+ </xsl:attribute>
|
||||
+ </xsl:if>
|
||||
<xsl:call-template name="html.css.content">
|
||||
<xsl:with-param name="node" select="$node"/>
|
||||
<xsl:with-param name="direction" select="$direction"/>
|
||||
@@ -1533,6 +1548,11 @@ copy, override this template and provide the necessary files.
|
||||
<xsl:param name="node" select="."/>
|
||||
<xsl:if test="$node//mml:*[1]">
|
||||
<script type="text/javascript">
|
||||
+ <xsl:if test="$html.csp.nonce">
|
||||
+ <xsl:attribute name="nonce">
|
||||
+ <xsl:value-of select="$html.csp.nonce" />
|
||||
+ </xsl:attribute>
|
||||
+ </xsl:if>
|
||||
<xsl:attribute name="src">
|
||||
<xsl:text>http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=MML_HTMLorMML</xsl:text>
|
||||
</xsl:attribute>
|
||||
@@ -1558,6 +1578,11 @@ result of {html.js.content} to that file.
|
||||
<xsl:template name="html.js.script">
|
||||
<xsl:param name="node" select="."/>
|
||||
<script type="text/javascript">
|
||||
+ <xsl:if test="$html.csp.nonce">
|
||||
+ <xsl:attribute name="nonce">
|
||||
+ <xsl:value-of select="$html.csp.nonce" />
|
||||
+ </xsl:attribute>
|
||||
+ </xsl:if>
|
||||
<xsl:call-template name="html.js.content">
|
||||
<xsl:with-param name="node" select="$node"/>
|
||||
</xsl:call-template>
|
||||
@@ -2035,8 +2060,19 @@ on all `code` elements with `"syntax"` in the class value.
|
||||
<xsl:template name="html.js.syntax">
|
||||
<xsl:param name="node" select="."/>
|
||||
<xsl:if test="$html.syntax.highlight">
|
||||
- <script type="text/javascript" src="{$html.js.root}highlight.pack.js"></script>
|
||||
- <script><![CDATA[
|
||||
+ <script type="text/javascript" src="{$html.js.root}highlight.pack.js">
|
||||
+ <xsl:if test="$html.csp.nonce">
|
||||
+ <xsl:attribute name="nonce">
|
||||
+ <xsl:value-of select="$html.csp.nonce" />
|
||||
+ </xsl:attribute>
|
||||
+ </xsl:if>
|
||||
+ </script>
|
||||
+ <script>
|
||||
+ <xsl:if test="$html.csp.nonce">
|
||||
+ <xsl:attribute name="nonce">
|
||||
+ <xsl:value-of select="$html.csp.nonce" />
|
||||
+ </xsl:attribute>
|
||||
+ </xsl:if><![CDATA[
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
var matches = document.querySelectorAll('code.syntax')
|
||||
for (var i = 0; i < matches.length; i++) {
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
meson,
|
||||
ninja,
|
||||
gettext,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
@@ -10,17 +12,19 @@
|
||||
gnome,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yelp-xsl";
|
||||
version = "42.1";
|
||||
version = "42.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/yelp-xsl-${version}.tar.xz";
|
||||
hash = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80=";
|
||||
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major finalAttrs.version}/yelp-xsl-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-/euwfrLman+3oNzmrYJIrSmku7E0uoKRKMoQT1ir19E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
itstool
|
||||
libxml2
|
||||
@@ -29,9 +33,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
patches = [
|
||||
./cve-2025-3155.patch
|
||||
];
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
xslt/common/domains/gen_yelp_xml.sh
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
@@ -54,4 +59,4 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,38 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
|
||||
# tests
|
||||
pytest-cov,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "autograd";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3nQ/02jW31I803MF3NFxhhqXUqFESTZ30sn1pWmD/y8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "HIPS";
|
||||
repo = "autograd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-k4rcalwznKS2QvmyTLra+ciWFifnILW/DDdB8D+clxQ=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [ numpy ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytest-cov
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "autograd" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Compute derivatives of NumPy code efficiently";
|
||||
homepage = "https://github.com/HIPS/autograd";
|
||||
changelog = "https://github.com/HIPS/autograd/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jluttine ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
django,
|
||||
djangorestframework,
|
||||
inflection,
|
||||
mcp,
|
||||
uritemplate,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pytest,
|
||||
httpx,
|
||||
asgiref,
|
||||
anyio,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-mcp-server";
|
||||
version = "0.5.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omarbenhamid";
|
||||
repo = "django-mcp-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MaJq+NCfYuNyvDhz5oZ3po5+XkJeE1qSOwcaqJfJl+o=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
django
|
||||
djangorestframework
|
||||
inflection
|
||||
mcp
|
||||
uritemplate
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
export PYTHONPATH="$PWD/examples:$PYTHONPATH"
|
||||
export DJANGO_SETTINGS_MODULE=mcpexample.mcpexample.settings
|
||||
'';
|
||||
|
||||
pythonImportsCheck = "mcp_server";
|
||||
|
||||
doCheck = false; # Needs to run both test server and client simultaneously
|
||||
|
||||
meta = {
|
||||
description = "Django MCP Server implementation";
|
||||
homepage = "https://github.com/omarbenhamid/django-mcp-server";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mrmebelman ];
|
||||
};
|
||||
}
|
||||
@@ -2,28 +2,36 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonAtLeast,
|
||||
setuptools,
|
||||
standard-cgi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "htmlmin";
|
||||
version = "0.1.12";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178";
|
||||
hash = "sha256-UMHvRjA3Sl1yOQAJapYc/0Jt/0a0jzTRlKgbvhTsoXg=";
|
||||
};
|
||||
|
||||
# Tests run fine in a normal source checkout, but not when being built by nix.
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
standard-cgi
|
||||
];
|
||||
|
||||
# pypi tarball does not contain tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Configurable HTML Minifier with safety features";
|
||||
mainProgram = "htmlmin";
|
||||
homepage = "https://pypi.python.org/pypi/htmlmin";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
broken = pythonAtLeast "3.13"; # requires removed cgi module
|
||||
homepage = "https://github.com/mankyd/htmlmin";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,32 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
autograd,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
autograd,
|
||||
future,
|
||||
matplotlib,
|
||||
numba,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pandas,
|
||||
patsy,
|
||||
scikit-learn,
|
||||
scipy,
|
||||
statsmodels,
|
||||
|
||||
# tests
|
||||
matplotlib,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
seaborn,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hyppo";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neurodata";
|
||||
repo = "hyppo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bYxqYSOOifQE3gbw8vNk/A13D5TPx7ERSgFvRHMXKGM=";
|
||||
hash = "sha256-7Y+UhneIGwqjsPCnGAQWF/l4r1gFbYs3fdHhV46ZBjA=";
|
||||
};
|
||||
|
||||
# some of the doctests (4/21) are broken, e.g. unbound variables, nondeterministic with insufficient tolerance, etc.
|
||||
@@ -42,11 +49,15 @@ buildPythonPackage rec {
|
||||
future
|
||||
numba
|
||||
numpy
|
||||
pandas
|
||||
patsy
|
||||
scikit-learn
|
||||
scipy
|
||||
statsmodels
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
matplotlib
|
||||
seaborn
|
||||
@@ -55,11 +66,11 @@ buildPythonPackage rec {
|
||||
"hyppo"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/neurodata/hyppo";
|
||||
description = "Python package for multivariate hypothesis testing";
|
||||
changelog = "https://github.com/neurodata/hyppo/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ical";
|
||||
version = "10.0.3";
|
||||
version = "10.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "ical";
|
||||
tag = version;
|
||||
hash = "sha256-6YppLRXpcT/eeDM15WT0gBLNk3r/4woudkeQUsF1fHY=";
|
||||
hash = "sha256-T58A2oBDD97C5Jz5WlbAJYOnoJzP+jAryKb5Oim4TuU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libcst";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Instagram";
|
||||
repo = "LibCST";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mHYcbw3BfvntKHadObYow8H/2f0LqpfSTbKju0CKhx4=";
|
||||
hash = "sha256-DsbigWFFYmucOa3uHdvMFd4nbgwKLzRVdI6SjUUdFWU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
src
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-K8hug7JeLPIvrqgVaONKfixu8XRvn+pnqS0fHV+nTqg=";
|
||||
hash = "sha256-dwqs9hXedX1jJJANyZ8nMivZBrLcMAi5NMJscW3oSdQ=";
|
||||
};
|
||||
|
||||
cargoRoot = "native";
|
||||
|
||||
@@ -49,10 +49,11 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"h11" # https://github.com/NixOS/nixpkgs/pull/399393
|
||||
"cryptography"
|
||||
"flask"
|
||||
"h2"
|
||||
"passlib"
|
||||
"typing-extensions" # https://github.com/NixOS/nixpkgs/pull/397082
|
||||
"pyopenssl"
|
||||
"tornado"
|
||||
];
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
buildPythonPackage,
|
||||
isPy3k,
|
||||
olm,
|
||||
setuptools,
|
||||
cffi,
|
||||
future,
|
||||
aspectlib,
|
||||
pytest-benchmark,
|
||||
pytestCheckHook,
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "python-olm";
|
||||
format = "setuptools";
|
||||
inherit (olm) src version;
|
||||
pyproject = true;
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@@ -23,9 +23,12 @@ buildPythonPackage {
|
||||
make include/olm/olm.h
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
cffi
|
||||
future
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = [ cffi ];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
cython,
|
||||
cython_3_1,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
libyaml,
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyyaml-ft";
|
||||
version = "7.0.1";
|
||||
version = "8.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
@@ -20,17 +20,17 @@ buildPythonPackage rec {
|
||||
owner = "Quansight-Labs";
|
||||
repo = "pyyaml-ft";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hmHozVmqQuS+NqRN2SSEqNCemyKcBM19elhka4GykE0=";
|
||||
hash = "sha256-GiXYpcAccKgROw144eOPY0gS0xW+3K/jRUl+JnBEaO8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
cython_3_1
|
||||
setuptools
|
||||
];
|
||||
|
||||
buildInputs = [ libyaml ];
|
||||
|
||||
pythonImportsCheck = [ "yaml" ];
|
||||
pythonImportsCheck = [ "yaml_ft" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@@ -3871,6 +3871,8 @@ self: super: with self; {
|
||||
|
||||
django-markup = callPackage ../development/python-modules/django-markup { };
|
||||
|
||||
django-mcp-server = callPackage ../development/python-modules/django-mcp-server { };
|
||||
|
||||
django-mdeditor = callPackage ../development/python-modules/django-mdeditor { };
|
||||
|
||||
django-mfa3 = callPackage ../development/python-modules/django-mfa3 { };
|
||||
|
||||
Reference in New Issue
Block a user