Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -279,12 +279,6 @@
|
||||
githubId = 43320117;
|
||||
name = "Sebastian Marquardt";
|
||||
};
|
||||
_8aed = {
|
||||
email = "8aed@riseup.net";
|
||||
github = "8aed";
|
||||
githubId = 140662578;
|
||||
name = "Huit Aed";
|
||||
};
|
||||
_9999years = {
|
||||
email = "rbt@fastmail.com";
|
||||
github = "9999years";
|
||||
@@ -25566,11 +25560,6 @@
|
||||
github = "tfkhdyt";
|
||||
githubId = 47195537;
|
||||
};
|
||||
tfmoraes = {
|
||||
name = "Thiago Franco de Moraes";
|
||||
github = "tfmoraes";
|
||||
githubId = 351108;
|
||||
};
|
||||
tg-x = {
|
||||
email = "*@tg-x.net";
|
||||
github = "tg-x";
|
||||
|
||||
@@ -145,7 +145,7 @@ in
|
||||
'';
|
||||
"~* ^(\\/cache\\/files.*)(\\/.*)".extraConfig = ''
|
||||
alias /var/lib/onlyoffice/documentserver/App_Data$1;
|
||||
more_set_headers Content-Disposition "attachment; filename*=UTF-8''$arg_filename";
|
||||
more_set_headers "Content-Disposition: attachment; filename*=UTF-8''$arg_filename";
|
||||
|
||||
set $secure_link_secret verysecretstring;
|
||||
secure_link $arg_md5,$arg_expires;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bash_unit";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgrange";
|
||||
owner = "bash-unit";
|
||||
repo = "bash_unit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0=";
|
||||
hash = "sha256-uRUqa6sXaXXDes9JjyTsMlA+nYdTGdioM0/y2XDIiEw=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
libnotify,
|
||||
libavif,
|
||||
kdePackages,
|
||||
autoPatchelfHook,
|
||||
libpulseaudio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -17,7 +19,8 @@ stdenv.mkDerivation {
|
||||
cmake
|
||||
pkg-config
|
||||
kdePackages.wrapQtAppsHook
|
||||
];
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs =
|
||||
(with kdePackages; [
|
||||
@@ -38,6 +41,8 @@ stdenv.mkDerivation {
|
||||
]
|
||||
++ lib.optional enableAvifSupport libavif;
|
||||
|
||||
runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio ];
|
||||
|
||||
preConfigure = ''
|
||||
if [[ -f "$src/GIT_HASH" ]]; then
|
||||
export GIT_HASH="$(cat $src/GIT_HASH)"
|
||||
|
||||
@@ -112,8 +112,8 @@ stdenv.mkDerivation (
|
||||
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
|
||||
|
||||
# icon
|
||||
mkdir -p "$out/share/icons/hicolor/icon/apps"
|
||||
ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/icon/apps/element.png"
|
||||
mkdir -p "$out/share/icons/hicolor/512x512/apps"
|
||||
ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
|
||||
|
||||
# desktop item
|
||||
mkdir -p "$out/share"
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ethersync";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersync";
|
||||
repo = "ethersync";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Swh8C8FMjPdIFpHOsNb3W9W7JAZGzPXHXTwwnr1gFok=";
|
||||
hash = "sha256-GPZD/TshZMr+WeCd4WRN/Ewu7zINSzPNPci52bjsV3E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/daemon";
|
||||
|
||||
cargoHash = "sha256-ZgbxaEtsaBQLl9PJbo1O2wA3OxEfPKRl3KkFvR4c97Q=";
|
||||
cargoHash = "sha256-F2wVRha63TOdMCWW3KNaQ8kbYjuYbdY5yKmTHOJqODA=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitLab,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2025-09-18";
|
||||
@@ -22,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share
|
||||
cp --recursive . $out/share/exploitdb
|
||||
|
||||
substituteInPlace $out/share/exploitdb/.searchsploit_rc \
|
||||
--replace-fail 'path_array+=("/opt/exploitdb")' 'path_array+=("'$out'/share/exploitdb")' \
|
||||
--replace-fail 'path_array+=("/opt/exploitdb-papers")' 'path_array+=("'$out'/share/exploitdb")'
|
||||
|
||||
makeWrapper $out/share/exploitdb/searchsploit $out/bin/searchsploit
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -152,13 +152,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fish";
|
||||
version = "4.0.8";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fish-shell";
|
||||
repo = "fish-shell";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bve82WLP/mZrGZNW9JZFCnFiEy1QNB9M8+r3OVh9E3w=";
|
||||
hash = "sha256-J1/Uup/HJP2COkUaDXg6pO6pKTq/44WKqWFqbv89bZk=";
|
||||
};
|
||||
|
||||
env = {
|
||||
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src patches;
|
||||
hash = "sha256-f1nxATT2iJiqQiYc6qHrUvRscupvZa8R41W4fvrgj08=";
|
||||
hash = "sha256-9neZKkuQSOPRrBmjYQ5HYHAORNIjSaSAGN+bDqxb4wk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace src/builtins/tests/test_tests.rs \
|
||||
--replace-fail '"/bin/ls"' '"${lib.getExe' coreutils "ls"}"'
|
||||
|
||||
substituteInPlace src/tests/highlight.rs \
|
||||
substituteInPlace src/highlight/tests.rs \
|
||||
--replace-fail '"/bin/echo"' '"${lib.getExe' coreutils "echo"}"' \
|
||||
--replace-fail '"/bin/c"' '"${lib.getExe' coreutils "c"}"' \
|
||||
--replace-fail '"/bin/ca"' '"${lib.getExe' coreutils "ca"}"' \
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
luajit,
|
||||
luajitPackages,
|
||||
libpulseaudio,
|
||||
libinput,
|
||||
libevdev,
|
||||
features ? [ ],
|
||||
systemd,
|
||||
}:
|
||||
@@ -58,7 +60,11 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals (hasFeature "http") [ openssl ]
|
||||
++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
|
||||
++ lib.optionals (hasFeature "cairo") [ luajit ]
|
||||
++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ];
|
||||
++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ]
|
||||
++ lib.optionals (hasFeature "keyboard") [
|
||||
libinput
|
||||
libevdev
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/OdfGenerator.cxx b/src/OdfGenerator.cxx
|
||||
index adf176b0a4..79de4dd2b7 100644
|
||||
--- a/src/OdfGenerator.cxx
|
||||
+++ b/src/OdfGenerator.cxx
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <math.h>
|
||||
|
||||
#include <cctype>
|
||||
+#include <cstdint>
|
||||
#include <limits>
|
||||
#include <string>
|
||||
#include <stack>
|
||||
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Mj5JH5VsjKKrsSyZjjUGcJMKMjF7+WYrBhXdSzkiuDE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with gcc15, based on:
|
||||
# https://sourceforge.net/p/libwpd/libodfgen/ci/4da0b148def5b40ee60d4cd79762c0f158d64cc7/
|
||||
./libodfgen-add-include-cstdint-gcc15.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost
|
||||
|
||||
@@ -21,14 +21,16 @@ buildNpmPackage {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fsevents is needed on Darwin, but its dependency "nan" in the upstream package-lock.json
|
||||
# is too old for the Node 18.x in Nixpkgs.
|
||||
# This patch is generated by checking out the upstream source and running
|
||||
# npm update nan --lockfile-version 1
|
||||
./update-nan.patch
|
||||
# Remove the dependency on "nodemon", which is only needed for interactive
|
||||
# development. This package depends on fsevents on macOS, which has
|
||||
# repeatedly caused build problems. This patch is generated by checking out
|
||||
# the upstream source and removing the "nodemon" line, and then running
|
||||
#
|
||||
# npm install --lockfile-version 1
|
||||
./remove-nodemon.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U=";
|
||||
npmDepsHash = "sha256-GyNUPgLJhdjzbIpld916/l8durIw0aQRHojjSmGgEJE=";
|
||||
nativeBuildInputs = [
|
||||
node-gyp
|
||||
python3
|
||||
@@ -43,8 +45,12 @@ buildNpmPackage {
|
||||
cp -r build_old/Release build/
|
||||
rm -rf build_old
|
||||
rm -rf build/Release/.deps
|
||||
|
||||
# Remove a development script to eliminate runtime dependency on node
|
||||
rm node_modules/node-addon-api/tools/conversion.js
|
||||
|
||||
# Remove dangling symlinks
|
||||
rm -rf $out/lib/node_modules/nodehun/node_modules/.bin
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,150 +0,0 @@
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index 3c577dd..64be338 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -932,10 +932,6 @@
|
||||
"concat-map": "0.0.1"
|
||||
}
|
||||
},
|
||||
- "chownr": {
|
||||
- "version": "1.1.1",
|
||||
- "bundled": true
|
||||
- },
|
||||
"code-point-at": {
|
||||
"version": "1.1.0",
|
||||
"bundled": true,
|
||||
@@ -987,13 +983,6 @@
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
- "fs-minipass": {
|
||||
- "version": "1.2.5",
|
||||
- "bundled": true,
|
||||
- "requires": {
|
||||
- "minipass": "^2.2.1"
|
||||
- }
|
||||
- },
|
||||
"fs.realpath": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
@@ -1100,22 +1089,6 @@
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
- "minipass": {
|
||||
- "version": "2.3.5",
|
||||
- "bundled": true,
|
||||
- "optional": true,
|
||||
- "requires": {
|
||||
- "safe-buffer": "^5.1.2",
|
||||
- "yallist": "^3.0.0"
|
||||
- }
|
||||
- },
|
||||
- "minizlib": {
|
||||
- "version": "1.2.1",
|
||||
- "bundled": true,
|
||||
- "requires": {
|
||||
- "minipass": "^2.2.1"
|
||||
- }
|
||||
- },
|
||||
"mkdirp": {
|
||||
"version": "0.5.1",
|
||||
"bundled": true,
|
||||
@@ -1300,6 +1273,7 @@
|
||||
"safe-buffer": {
|
||||
"version": "5.1.2",
|
||||
"bundled": true,
|
||||
+ "dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"safer-buffer": {
|
||||
@@ -1332,24 +1306,24 @@
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
- "string-width": {
|
||||
- "version": "1.0.2",
|
||||
+ "string_decoder": {
|
||||
+ "version": "1.1.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
- "code-point-at": "^1.0.0",
|
||||
- "is-fullwidth-code-point": "^1.0.0",
|
||||
- "strip-ansi": "^3.0.0"
|
||||
+ "safe-buffer": "~5.1.0"
|
||||
}
|
||||
},
|
||||
- "string_decoder": {
|
||||
- "version": "1.1.1",
|
||||
+ "string-width": {
|
||||
+ "version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
- "safe-buffer": "~5.1.0"
|
||||
+ "code-point-at": "^1.0.0",
|
||||
+ "is-fullwidth-code-point": "^1.0.0",
|
||||
+ "strip-ansi": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"strip-ansi": {
|
||||
@@ -1387,11 +1361,6 @@
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
- },
|
||||
- "yallist": {
|
||||
- "version": "3.0.3",
|
||||
- "bundled": true,
|
||||
- "optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -2096,9 +2065,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"nan": {
|
||||
- "version": "2.14.0",
|
||||
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
|
||||
- "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
|
||||
+ "version": "2.17.0",
|
||||
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
|
||||
+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
@@ -2768,6 +2737,15 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
+ "string_decoder": {
|
||||
+ "version": "1.1.1",
|
||||
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
+ "dev": true,
|
||||
+ "requires": {
|
||||
+ "safe-buffer": "~5.1.0"
|
||||
+ }
|
||||
+ },
|
||||
"string-width": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
|
||||
@@ -2798,15 +2776,6 @@
|
||||
"function-bind": "^1.1.1"
|
||||
}
|
||||
},
|
||||
- "string_decoder": {
|
||||
- "version": "1.1.1",
|
||||
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
- "dev": true,
|
||||
- "requires": {
|
||||
- "safe-buffer": "~5.1.0"
|
||||
- }
|
||||
- },
|
||||
"strip-ansi": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
|
||||
@@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
xorg.libxcb
|
||||
xorg.libX11
|
||||
xorg.libXrandr
|
||||
xorg.libXcursor
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
abseil-cpp_202407,
|
||||
cmake,
|
||||
cpuinfo,
|
||||
@@ -84,7 +85,15 @@ effectiveStdenv.mkDerivation rec {
|
||||
pname = "onnxruntime";
|
||||
inherit src version;
|
||||
|
||||
patches = lib.optionals cudaSupport [
|
||||
patches = [
|
||||
# https://github.com/microsoft/onnxruntime/pull/24583
|
||||
(fetchpatch {
|
||||
name = "fix-compilation-with-gcc-15.patch";
|
||||
url = "https://github.com/microsoft/onnxruntime/commit/f7619dc93f592ddfc10f12f7145f9781299163a0.patch";
|
||||
hash = "sha256-jxfMB+/Zokcu5DSfZP7QV1E8mTrsLe/sMr+ZCX/Y3m0=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
# We apply the referenced 1064.patch ourselves to our nix dependency.
|
||||
# FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0
|
||||
./nvcc-gsl.patch
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
curl,
|
||||
libtins,
|
||||
mongosh,
|
||||
usrsctp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -75,23 +76,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libyaml
|
||||
libmicrohttpd
|
||||
libgcrypt
|
||||
lksctp-tools
|
||||
libidn
|
||||
openssl
|
||||
curl
|
||||
libtins
|
||||
gnutls
|
||||
libnghttp2.dev
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
lksctp-tools
|
||||
]
|
||||
++ lib.optionals (!stdenv.isLinux) [
|
||||
usrsctp
|
||||
];
|
||||
|
||||
# For subproject
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=array-bounds"
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
cp -R --no-preserve=mode,ownership ${finalAttrs.diameter} subprojects/freeDiameter
|
||||
cp -R --no-preserve=mode,ownership ${finalAttrs.libtins} subprojects/libtins
|
||||
|
||||
@@ -191,6 +191,5 @@ stdenv.mkDerivation rec {
|
||||
license = with licenses; [ asl20 ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
licenses.gpl2Plus
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ _8aed ];
|
||||
mainProgram = "passt";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-ge-bin";
|
||||
version = "GE-Proton10-16";
|
||||
version = "GE-Proton10-17";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-pwnYnO6JPoZS8w2kge98WQcTfclrx7U2vwxGc6uj9k4=";
|
||||
hash = "sha256-GMwAAKuaBhDv1TvAuW9DVcXSYPRM87NP6NnJfk8O8ZU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -42,18 +42,27 @@ stdenv.mkDerivation rec {
|
||||
yaml-cpp
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString isLinux ''
|
||||
substituteInPlace doc/docbook_man.debian.xsl \
|
||||
--replace /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl
|
||||
'';
|
||||
postPatch =
|
||||
let
|
||||
file = "doc/docbook_man.${if isLinux then "debian" else "macports"}.xsl";
|
||||
path =
|
||||
if isLinux then
|
||||
"/usr/share/xml/docbook/stylesheet/docbook-xsl"
|
||||
else
|
||||
"/opt/local/share/xsl/docbook-xsl-nons";
|
||||
in
|
||||
''
|
||||
substituteInPlace ${file} \
|
||||
--replace ${path}/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_MAN=ON"
|
||||
"-DCMAKE_INSTALL_FULL_MANDIR=share/man"
|
||||
"-DINSTALL_UDEV_RULES=OFF"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/dmrconf.1 doc/qdmr.1
|
||||
postInstall = lib.optionalString isLinux ''
|
||||
mkdir -p "$out/etc/udev/rules.d"
|
||||
cp ${src}/dist/99-qdmr.rules $out/etc/udev/rules.d/
|
||||
'';
|
||||
@@ -65,6 +74,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://dm3mat.darc.de/qdmr/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ _0x4A6F ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
Generated
+45
-45
@@ -43,9 +43,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-dlQ7KyYZLqSE3D0j6ZAPBv8gbSuE+8IVQhJAeoo2K8g=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25418.8/microsoft.codeanalysis.analyzers.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-BsNPX6p08WG5unEZOq/m8c9iKQ2tcX8LiUj2Icf9Mm8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25452.2/microsoft.codeanalysis.analyzers.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
|
||||
@@ -55,27 +55,27 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-O1yCn9+EAwtxZ/GwmAcyDWDPrhjMM4jAuSHvDYCMYiI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25418.8/microsoft.codeanalysis.common.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-C5ymxF29vgwu9Jwl7CwNEf4+zpb7fFLUdBGPVnf+Ixs=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25452.2/microsoft.codeanalysis.common.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-aO1ZCPkpE0SiF1YgELlOVTe2Mq6mbdZhc8acKsgGYCM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-foZzAkEdfdtvF3WJwUhdC51KeBHnTdBoH+JGV5XD5A0=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp.Features",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-KFlqI0142Cli+8LgWlfK1DCNO+TlFPQK8NtmCvJZz6A=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.features.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-3J+9YhYUePNRX8sWJQNbK3G/FjS+sh5ML1ix1zn5B5Q=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.features.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-TigMGogMhbbRaWR4/9Aj+o5lxmVWUoIjBtmUiBHFhxM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-Wnqq7HFdRvwde+tx1fLufiVOeAZul5jDasswEKFLhdk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Elfie",
|
||||
@@ -85,21 +85,21 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-153NrMy6dA1FuUD0XfRASHiALANMSKXIigf49pQ8emI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25418.8/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-cfOyGxroU5SZAUar6YROo2o6lsr2lVAkYMQopIsIRnc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25452.2/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Features",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-dYmfiCnerjAArbF4LuXNi6oF9dY8lcDw2M3MX1IswhI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25418.8/microsoft.codeanalysis.features.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-3flzK3w1P+YEm93XeKyWKKu0de7uaSJhRR6CjDi2uAo=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25452.2/microsoft.codeanalysis.features.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-cgAS5pZY6qb2I8QlTaDWl3zLGURNBblPKf69lYHF+xc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25418.8/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-VbfgcAULLmLjGHfqYD1ohJPLZn65b8JFaOnP0kucqJg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25452.2/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
|
||||
@@ -109,27 +109,27 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Remote.Workspaces",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-bHlIsWZus8Ms10WTAgSsKaAsIWyxwCMLd3zfXO3eFXA=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-jYHylTS3OO84UFz1vfB8ST/k5G/XI6Ks4lOE5DYlPcw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Scripting.Common",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-jmvE90GOWoZLsHcX0SaBHXSJIfDeL/s/47k7uaG0DiE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25418.8/microsoft.codeanalysis.scripting.common.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-dG632yqX95EwXqDfhnBwhbS1/fuex7fUjM/wUnPQaR0=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25452.2/microsoft.codeanalysis.scripting.common.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Workspaces.Common",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-+LI3eEQDmdLTGaab4gu225NblD1l+RWZ+noosDWbxFM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25418.8/microsoft.codeanalysis.workspaces.common.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-JNadLPLKA2wuThQABqj3/PKPhMTrn72VjNumkGbkNm4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25452.2/microsoft.codeanalysis.workspaces.common.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CommonLanguageServerProtocol.Framework",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-b5QMnPTP/+wpkD2RmS6UtaO5RNYC3PxirboyVgniG04=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25418.8/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-b/kxQt5KyluSGkkmFzy9+EGlTOW5gBv3bkM/t5PbB+8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25452.2/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CSharp",
|
||||
@@ -145,15 +145,15 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.Arcade.Sdk",
|
||||
"version": "9.0.0-beta.25255.5",
|
||||
"hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg"
|
||||
"version": "9.0.0-beta.25428.3",
|
||||
"hash": "sha256-imlZjZcVWjNXO0yZmSoXPOlxX/qaJ96LeN8Xb/ox+Vk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25428.3/microsoft.dotnet.arcade.sdk.9.0.0-beta.25428.3.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.XliffTasks",
|
||||
"version": "9.0.0-beta.25255.5",
|
||||
"hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg"
|
||||
"version": "9.0.0-beta.25428.3",
|
||||
"hash": "sha256-4Jgieh85GiTg8rmQb3esR0UZTuj+L2cLzwyC0ziOBDc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25428.3/microsoft.dotnet.xlifftasks.9.0.0-beta.25428.3.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
@@ -181,9 +181,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Net.Compilers.Toolset",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-/Vr5J7ORwruP5mLMeVdbUPjUWYmCbLmZbi+aJBq8HmU=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25418.8/microsoft.net.compilers.toolset.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-lrjvenHm6/z8Fy37UaUdKjM36zlwe43revlQjg+aqV4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25452.2/microsoft.net.compilers.toolset.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.StringTools",
|
||||
|
||||
@@ -29,11 +29,11 @@ buildDotnetModule {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "razor";
|
||||
rev = "f2270a5492e831864b60a8853c7435ded110ad6f";
|
||||
hash = "sha256-QMeIQmX/1W3N3r27fG5/Q6CsW/Wh+EI5+poGlJ2sbsQ=";
|
||||
rev = "bde4f70c9560811a7f25023b9d8ac42fd7d0e99f";
|
||||
hash = "sha256-wS7JKHLpX9/JluID94HXUkepaX9eoceRzuIofBICiBk=";
|
||||
};
|
||||
|
||||
version = "10.0.0-preview.25424.9";
|
||||
version = "10.0.0-preview.25464.2";
|
||||
projectFile = "src/Razor/src/rzls/rzls.csproj";
|
||||
useDotnetFromEnv = true;
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
@@ -2,29 +2,36 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "s5";
|
||||
version = "0.1.15";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvisonneau";
|
||||
repo = "s5";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QQMnzDRWdW0awwNx2vqtzrOW9Ua7EmJ9YFznQoK33J0=";
|
||||
hash = "sha256-aNNf7ntGg2A84jD6UeoF4gFv8S/FonbIhV3ZOd/P4bw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-axcZ4XzgsPVU9at/g3WS8Hv92P2hmZRb+tUfw+h9iH0=";
|
||||
vendorHash = "sha256-NmnYv0yAHmlOY9UK7GQtb5e9DwbyEbqQ2O6cpqkwtww=";
|
||||
|
||||
subPackages = [ "cmd/s5" ];
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=v${version}"
|
||||
"-X github.com/mvisonneau/s5/internal/app.Version=v${version}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cipher/decipher text within a file";
|
||||
mainProgram = "s5";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.0.1253";
|
||||
version = "1.0.1256";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lollipopkit";
|
||||
repo = "flutter_server_box";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UflskghSx9ODQ8q2TI9DRjfmWSxp5wSDYGomUcv/Oy4=";
|
||||
hash = "sha256-V4Y4JoUsca2MmPJd1t+IWrNiIj5oslaj6736rPUT9hM=";
|
||||
};
|
||||
in
|
||||
flutter335.buildFlutterApplication {
|
||||
@@ -37,7 +37,7 @@ flutter335.buildFlutterApplication {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "server-box";
|
||||
exec = "server-box";
|
||||
exec = "ServerBox";
|
||||
icon = "server-box";
|
||||
genericName = "ServerBox";
|
||||
desktopName = "ServerBox";
|
||||
@@ -78,9 +78,10 @@ flutter335.buildFlutterApplication {
|
||||
meta = {
|
||||
description = "Server status & toolbox";
|
||||
homepage = "https://github.com/lollipopkit/flutter_server_box";
|
||||
changelog = "https://github.com/lollipopkit/flutter_server_box/releases/tag/${src.tag}";
|
||||
mainProgram = "ServerBox";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "smtp4dev";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rnwood";
|
||||
repo = "smtp4dev";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bhS2/YO7jejw6+qx6EdLH98SnxeqMWajSz8i7ocNVX8=";
|
||||
hash = "sha256-0j5r5YO1wHg3N/OX81UE2YCqhqIaQuSGZa2uh2y+zqs=";
|
||||
};
|
||||
|
||||
patches = [ ./smtp4dev-npm-packages.patch ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "symfony-cli";
|
||||
version = "5.13.0";
|
||||
version = "5.14.2";
|
||||
vendorHash = "sha256-SGD8jFRvdJ5GOeQiW3Whe6EnybQ60wOsC/OureOCn7k=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F+OES8F2KdYuIq28z02/8HINddfbZuxY/pJtcx9V3xk=";
|
||||
hash = "sha256-qgCuerKn7R4bn3YgzpMprIUDfn2SJdIiXC+9avnzDm4=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
alsa-lib,
|
||||
curl,
|
||||
freetype,
|
||||
gtk3,
|
||||
libGL,
|
||||
libX11,
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXinerama,
|
||||
webkitgtk_4_0,
|
||||
libXrandr,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
@@ -36,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
alsa-lib
|
||||
curl
|
||||
freetype
|
||||
gtk3
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXinerama
|
||||
webkitgtk_4_0
|
||||
libXrandr
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
@@ -60,11 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/{lv2,vst,vst3/Tunefish4.vst3}
|
||||
mkdir -p $out/lib/{lv2,vst,vst3}
|
||||
|
||||
pushd src/tunefish4/Builds/LinuxMakefile/build
|
||||
cp -r "Tunefish4.lv2" $out/lib/lv2
|
||||
cp -r "Tunefish4.vst3/Contents/x86_64-linux"/* $out/lib/vst3/Tunefish4.vst3
|
||||
cp -r "Tunefish4.vst3" $out/lib/vst3
|
||||
cp "Tunefish4.so" $out/lib/vst
|
||||
popd
|
||||
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
openjdk,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "visual-paradigm-ce";
|
||||
version = "17.3.20250906";
|
||||
|
||||
src =
|
||||
let
|
||||
splitted = lib.versions.splitVersion finalAttrs.version;
|
||||
majorMinor = builtins.concatStringsSep "." (lib.dropEnd 1 splitted);
|
||||
suffix = lib.last splitted;
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://eu8.dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] majorMinor
|
||||
}_${suffix}_Linux64_InstallFree.tar.gz";
|
||||
hash = "sha256-9BaAJKzK8jjQ1W+eSyJFI2NfizNCwY7PpSZoje2Zd38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "visualparadigm";
|
||||
desktopName = "Visual Paradigm";
|
||||
exec = "Visual_Paradigm %f";
|
||||
icon = "vpuml";
|
||||
})
|
||||
(makeDesktopItem {
|
||||
name = "visualparadigmproductselector";
|
||||
desktopName = "Visual Paradigm Product Selector";
|
||||
exec = "Visual_Paradigm_Product_Selector";
|
||||
icon = "ProductSelector";
|
||||
})
|
||||
(makeDesktopItem {
|
||||
name = "visualparadigmshapeeditor";
|
||||
desktopName = "Visual Paradigm Shape Editor";
|
||||
exec = "Visual_Paradigm_Shape_Editor";
|
||||
icon = "vpuml";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D Application/resources/vpuml.png $out/share/icons/hicolor/512x512/apps/vpuml.png
|
||||
install -D Application/resources/ProductSelector.png $out/share/icons/hicolor/512x512/apps/ProductSelector.png
|
||||
|
||||
mkdir -p $out/{bin,share/visual-paradigm-ce}
|
||||
mv {Application,.install4j} $out/share/visual-paradigm-ce/
|
||||
|
||||
for bin in Visual_Paradigm Visual_Paradigm_Product_Selector Visual_Paradigm_Shape_Editor; do
|
||||
substituteInPlace $out/share/visual-paradigm-ce/Application/bin/$bin \
|
||||
--replace-fail '# INSTALL4J_JAVA_HOME_OVERRIDE=' "INSTALL4J_JAVA_HOME_OVERRIDE=${openjdk}" \
|
||||
--replace-fail 'app_home=../../' "app_home=${placeholder "out"}/share/visual-paradigm-ce"
|
||||
ln -s $out/share/visual-paradigm-ce/Application/bin/$bin $out/bin/
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "All-in-one UML CASE tool for software development";
|
||||
homepage = "https://www.visual-paradigm.com/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
mainProgram = "Visual_Paradigm";
|
||||
};
|
||||
})
|
||||
@@ -45,6 +45,10 @@
|
||||
libnotify,
|
||||
buildFHSEnv,
|
||||
writeShellScript,
|
||||
runCommandLocal,
|
||||
cacert,
|
||||
coreutils,
|
||||
curl,
|
||||
}:
|
||||
let
|
||||
wechat-uos-env = stdenvNoCC.mkDerivation {
|
||||
@@ -123,66 +127,84 @@ let
|
||||
bzip2
|
||||
];
|
||||
|
||||
sources = import ./sources.nix;
|
||||
wechat =
|
||||
let
|
||||
sources = import ./sources.nix;
|
||||
|
||||
wechat = stdenvNoCC.mkDerivation rec {
|
||||
pname = "wechat-uos";
|
||||
version = sources.version;
|
||||
pname = "wechat-uos";
|
||||
version = sources.version;
|
||||
fetch =
|
||||
{
|
||||
url,
|
||||
hash,
|
||||
}:
|
||||
runCommandLocal "wechat-uos-${version}-src"
|
||||
{
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = hash;
|
||||
|
||||
src =
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = sources.amd64_url;
|
||||
hash = sources.amd64_hash;
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = sources.arm64_url;
|
||||
hash = sources.arm64_hash;
|
||||
};
|
||||
loongarch64-linux = fetchurl {
|
||||
url = sources.loongarch64_url;
|
||||
hash = sources.loongarch64_hash;
|
||||
};
|
||||
}
|
||||
.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
coreutils
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
}
|
||||
''
|
||||
curl -A "debian APT-HTTP/1.3 (1.6.11)" --retry 3 --retry-delay 3 -L "${url}" > $out
|
||||
'';
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
srcs = {
|
||||
x86_64-linux = fetch sources.amd64;
|
||||
aarch64-linux = fetch sources.arm64;
|
||||
loongarch64-linux = fetch sources.loongarch64;
|
||||
};
|
||||
|
||||
dpkg -x $src ./wechat-uos
|
||||
src =
|
||||
srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname src version;
|
||||
|
||||
# Use ln for license to prevent being garbage collection
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
cp -r wechat-uos/* $out
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
dpkg -x $src ./wechat-uos
|
||||
|
||||
meta = with lib; {
|
||||
description = "Messaging app";
|
||||
homepage = "https://weixin.qq.com/";
|
||||
license = licenses.unfree;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"loongarch64-linux"
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [
|
||||
pokon548
|
||||
xddxdd
|
||||
];
|
||||
mainProgram = "wechat-uos";
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
# Use ln for license to prevent being garbage collection
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
|
||||
cp -r wechat-uos/* $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Messaging app";
|
||||
homepage = "https://weixin.qq.com/";
|
||||
license = licenses.unfree;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"loongarch64-linux"
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [
|
||||
pokon548
|
||||
xddxdd
|
||||
];
|
||||
mainProgram = "wechat-uos";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
buildFHSEnv {
|
||||
inherit (wechat) pname version meta;
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2025-02-21
|
||||
# Last updated: 2025-09-25
|
||||
{
|
||||
version = "4.0.1.12";
|
||||
amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb";
|
||||
arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb";
|
||||
loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb";
|
||||
amd64_hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU=";
|
||||
arm64_hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8=";
|
||||
loongarch64_hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo=";
|
||||
amd64 = {
|
||||
url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb";
|
||||
hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU=";
|
||||
};
|
||||
arm64 = {
|
||||
url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb";
|
||||
hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8=";
|
||||
};
|
||||
loongarch64 = {
|
||||
url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb";
|
||||
hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git gzip
|
||||
|
||||
base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle/appstore/binary-"
|
||||
base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle-pro/appstore/binary-"
|
||||
base_url_appendix="/Packages.gz"
|
||||
target_package="com.tencent.wechat"
|
||||
packages_file="Packages.gz"
|
||||
@@ -13,7 +13,7 @@ hash=()
|
||||
for i in amd64 arm64 loongarch64
|
||||
do
|
||||
current_url=$base_url_suffix$i$base_url_appendix
|
||||
curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0" -v -L -O $current_url
|
||||
curl -A "debian APT-HTTP/1.3 (1.6.11)" -v -L -O $current_url
|
||||
current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" '
|
||||
BEGIN { found = 0 }
|
||||
{
|
||||
@@ -39,8 +39,8 @@ do
|
||||
}
|
||||
}
|
||||
')
|
||||
hash+=("$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $sha256sum)")
|
||||
url+=("https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_"$version"_"$i".deb")
|
||||
hash+=("$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $sha256sum)")
|
||||
done
|
||||
|
||||
cat >sources.nix <<EOF
|
||||
@@ -48,12 +48,18 @@ cat >sources.nix <<EOF
|
||||
# Last updated: $(date +%F)
|
||||
{
|
||||
version = "${version[0]}";
|
||||
amd64_url = "${url[0]}";
|
||||
arm64_url = "${url[1]}";
|
||||
loongarch64_url = "${url[2]}";
|
||||
amd64_hash = "${hash[0]}";
|
||||
arm64_hash = "${hash[1]}";
|
||||
loongarch64_hash = "${hash[2]}";
|
||||
amd64 = {
|
||||
url = "${url[0]}";
|
||||
hash = "${hash[0]}";
|
||||
};
|
||||
arm64 = {
|
||||
url = "${url[1]}";
|
||||
hash = "${hash[1]}";
|
||||
};
|
||||
loongarch64 = {
|
||||
url = "${url[2]}";
|
||||
hash = "${hash[2]}";
|
||||
};
|
||||
}
|
||||
EOF
|
||||
|
||||
|
||||
@@ -130,7 +130,6 @@ stdenv.mkDerivation rec {
|
||||
lgpl2Plus
|
||||
wxWindowsException31
|
||||
];
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -152,7 +152,6 @@ stdenv.mkDerivation rec {
|
||||
wxWindowsException31
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
tfmoraes
|
||||
fliegendewurst
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -132,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wxWindowsException31
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
tfmoraes
|
||||
fliegendewurst
|
||||
wegank
|
||||
];
|
||||
|
||||
@@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
|
||||
hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
|
||||
})
|
||||
# Fix build with gcc15
|
||||
# https://github.com/jbeder/yaml-cpp/pull/1310
|
||||
(fetchpatch {
|
||||
name = "yaml-cpp-add-include-cstdint-gcc15.patch";
|
||||
url = "https://github.com/jbeder/yaml-cpp/commit/7b469b4220f96fb3d036cf68cd7bd30bd39e61d2.patch";
|
||||
hash = "sha256-4Mua6cYD8UR+fJfFeu0fdYVFprsiuF89HvbaTByz9nI=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
iana-etc,
|
||||
installShellFiles,
|
||||
libredirect,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
@@ -20,7 +22,10 @@ buildGoModule rec {
|
||||
vendorHash = "sha256-As7xDEo+bMslv9Xd6CbHTqvf2XaXmO6Gp3f9+xD3kNU=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p build/ui
|
||||
@@ -43,17 +48,17 @@ buildGoModule rec {
|
||||
"k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
# Breaks with sandbox on Darwin because it wants to read /etc/protocols
|
||||
postInstall =
|
||||
lib.optionalString
|
||||
((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && !stdenv.buildPlatform.isDarwin)
|
||||
''
|
||||
export K9S_LOGS_DIR=$(mktemp -d)
|
||||
installShellCompletion --cmd zarf \
|
||||
--bash <($out/bin/zarf completion bash) \
|
||||
--fish <($out/bin/zarf completion fish) \
|
||||
--zsh <($out/bin/zarf completion zsh)
|
||||
'';
|
||||
(stdenv.buildPlatform.canExecute stdenv.hostPlatform && stdenv.hostPlatform.isDarwin)
|
||||
"export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services"
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
export K9S_LOGS_DIR=$(mktemp -d)
|
||||
installShellCompletion --cmd zarf \
|
||||
--bash <($out/bin/zarf completion bash) \
|
||||
--fish <($out/bin/zarf completion fish) \
|
||||
--zsh <($out/bin/zarf completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev";
|
||||
|
||||
@@ -42,7 +42,6 @@ appimageTools.wrapType2 rec {
|
||||
homepage = "https://www.zettlr.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ tfmoraes ];
|
||||
mainProgram = "zettlr";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -121,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bsd3
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ tfmoraes ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
poetry-core,
|
||||
pytest-aiohttp,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
yarl,
|
||||
}:
|
||||
|
||||
@@ -16,8 +15,6 @@ buildPythonPackage rec {
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "playpauseandstop";
|
||||
repo = "aiohttp-middlewares";
|
||||
@@ -46,10 +43,18 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "aiohttp_middlewares" ];
|
||||
|
||||
disabledTests = [
|
||||
# TRests are outdated
|
||||
"test_shield_middleware_funcitonal[DELETE-False]"
|
||||
"test_shield_middleware_funcitonal[GET-False]"
|
||||
"test_shield_middleware_funcitonal[POST-True]"
|
||||
"test_shield_middleware_funcitonal[PUT-False]"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of useful middlewares for aiohttp.web applications";
|
||||
homepage = "https://github.com/playpauseandstop/aiohttp-middlewares";
|
||||
changelog = "https://github.com/playpauseandstop/aiohttp-middlewares/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/playpauseandstop/aiohttp-middlewares/blob/${src.tag}/CHANGELOG.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@ buildPythonPackage rec {
|
||||
pyproject = true;
|
||||
inherit (basemap) version src;
|
||||
|
||||
sourceRoot = "${src.name}/packages/basemap_data_hires";
|
||||
sourceRoot = "${src.name}/data/basemap_data_hires";
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
@@ -26,5 +26,6 @@ buildPythonPackage rec {
|
||||
description = "High-resolution data assets for matplotlib basemap";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ moraxyc ];
|
||||
teams = with lib.teams; [ geospatial ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
format = "setuptools";
|
||||
inherit (basemap) version src;
|
||||
|
||||
sourceRoot = "${src.name}/packages/basemap_data";
|
||||
sourceRoot = "${src.name}/data/basemap_data";
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
@@ -23,6 +23,6 @@ buildPythonPackage rec {
|
||||
mit
|
||||
lgpl3Plus
|
||||
];
|
||||
maintainers = [ ];
|
||||
teams = [ teams.geospatial ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,8 +26,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-1T1FTcR99KbpqiYzrd2r5h1wTcygBEU7BLZXZ8uMthU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/basemap";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
geos
|
||||
@@ -65,9 +63,9 @@ buildPythonPackage rec {
|
||||
longDescription = ''
|
||||
An add-on toolkit for matplotlib that lets you plot data on map projections with
|
||||
coastlines, lakes, rivers and political boundaries. See
|
||||
http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do.
|
||||
https://matplotlib.org/basemap/stable/users/examples.html for examples of what it can do.
|
||||
'';
|
||||
maintainers = [ ];
|
||||
teams = [ teams.geospatial ];
|
||||
license = with licenses; [
|
||||
mit
|
||||
lgpl21
|
||||
|
||||
@@ -82,7 +82,14 @@ buildPythonPackage rec {
|
||||
transforms3d
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
disabledTests = [
|
||||
# AttributeError: 'functools.partial' object has no attribute 'value'
|
||||
"testModelEncoding0"
|
||||
"testModelEncoding1"
|
||||
"testTrain"
|
||||
"testTrainDomainRandomize"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
# Flaky:
|
||||
# AssertionError: Array(-0.00135638, dtype=float32) != 0.0 within 0.001 delta (Array(0.00135638, dtype=float32) difference)
|
||||
"test_pendulum_period2"
|
||||
|
||||
@@ -214,7 +214,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/keras-team/keras/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
# Not yet released for tensorflow >= 2.20.0
|
||||
broken = lib.versionAtLeast tensorflow.version "2.20";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,6 +31,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-TNb3oKZvgBuXoSwsTuEJjFKEVZyHynazuPInj7wVKs8=";
|
||||
};
|
||||
|
||||
# pipes has been removed in python 3.13
|
||||
postPatch = ''
|
||||
substituteInPlace mhcflurry/downloads.py \
|
||||
--replace-fail \
|
||||
"from pipes import quote" \
|
||||
"from shlex import quote"
|
||||
'';
|
||||
|
||||
# keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run.
|
||||
dependencies = [
|
||||
appdirs
|
||||
|
||||
@@ -40,6 +40,5 @@ buildPythonPackage {
|
||||
applications.
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ markdown ];
|
||||
dependencies = [ markdown ];
|
||||
|
||||
meta = {
|
||||
description = "Math extension for Python-Markdown";
|
||||
|
||||
@@ -22,8 +22,6 @@ buildPythonPackage rec {
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy-znp";
|
||||
@@ -41,15 +39,15 @@ buildPythonPackage rec {
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
async-timeout
|
||||
coloredlogs
|
||||
jsonschema
|
||||
voluptuous
|
||||
zigpy
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [
|
||||
async-timeout
|
||||
];
|
||||
|
||||
doCheck = false; # tests are not compatible with zigpy 0.65.3
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
@@ -61,17 +59,6 @@ buildPythonPackage rec {
|
||||
|
||||
pytestFlags = [ "--reruns=3" ];
|
||||
|
||||
disabledTests = [
|
||||
# failing since zigpy 0.60.0
|
||||
"test_join_device"
|
||||
"test_nonstandard_profile"
|
||||
"test_permit_join"
|
||||
"test_request_recovery_route_rediscovery_zdo"
|
||||
"test_watchdog"
|
||||
"test_zigpy_request"
|
||||
"test_zigpy_request_failure"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "zigpy_znp" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "klevernotes";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz";
|
||||
hash = "sha256-eWCjZrOfjqu6uC9WDqwoYg9Vyss8PGxEXKzR+MgEg24=";
|
||||
hash = "sha256-btnCn9YhA0aIhg6PXYuxsZQa6JeHyIrYwSKvTuqrsj8=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-gopass";
|
||||
version = "1.15.17";
|
||||
version = "1.15.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = "git-credential-gopass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dMCDRrq0o6naobsnKLedY6ORJdEOPdGG7L49VmcQiJQ=";
|
||||
hash = "sha256-tW4tPSZErVGZyPgLyQBbwDqmuYyl4nB/qCdAad+Kro4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MoellcZ/4iDu1hZ/5qvupfozl+iUP7Uc4RV0LxPaIOc=";
|
||||
vendorHash = "sha256-Yqhl1e0fFykFv/T3yaRkEyOKWBfaJXVrjrUWTToWd5s=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-hibp";
|
||||
version = "1.15.17";
|
||||
version = "1.15.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = "gopass-hibp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MUC9eYpm+1inkJtTmXxfS3bTMcsQCZlpNhqlq0p7fEY=";
|
||||
hash = "sha256-tlElF7AO4eJQAYwqBdwf6140Y1lsB8xdPCPfZZe/d8k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-58coZrNZdCK3R5EeJ/xQbRr94Y4ugufjrkaoeQgN1YY=";
|
||||
vendorHash = "sha256-3uxKxpIgnQvTA1v/IJU7Z8IfIjjyhOFU7Py8uPIQ1q8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -35,6 +35,8 @@ buildGoModule rec {
|
||||
--prefix PATH : "${lib.makeBinPath [ gopass ]}"
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gopass haveibeenpwnd.com integration";
|
||||
homepage = "https://github.com/gopasspw/gopass-hibp";
|
||||
|
||||
Reference in New Issue
Block a user