Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
+11
-3
@@ -87,8 +87,10 @@ let
|
||||
export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk"
|
||||
echo "Chunk $myChunk on $system start"
|
||||
set +e
|
||||
command time -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \
|
||||
command time -o "$outputDir/timestats/$myChunk" \
|
||||
-f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \
|
||||
nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \
|
||||
--eval-system "$system" \
|
||||
--option restrict-eval true \
|
||||
--option allow-import-from-derivation false \
|
||||
--query --available \
|
||||
@@ -102,13 +104,19 @@ let
|
||||
--arg includeBroken ${lib.boolToString includeBroken} \
|
||||
-I ${nixpkgs} \
|
||||
-I ${attrpathFile} \
|
||||
> "$outputDir/result/$myChunk"
|
||||
> "$outputDir/result/$myChunk" \
|
||||
2> "$outputDir/stderr/$myChunk"
|
||||
exitCode=$?
|
||||
set -e
|
||||
cat "$outputDir/stderr/$myChunk"
|
||||
cat "$outputDir/timestats/$myChunk"
|
||||
if (( exitCode != 0 )); then
|
||||
echo "Evaluation failed with exit code $exitCode"
|
||||
# This immediately halts all xargs processes
|
||||
kill $PPID
|
||||
elif [[ -s "$outputDir/stderr/$myChunk" ]]; then
|
||||
echo "Nixpkgs on $system evaluated with warnings, aborting"
|
||||
kill $PPID
|
||||
fi
|
||||
'';
|
||||
in
|
||||
@@ -164,7 +172,7 @@ let
|
||||
''}
|
||||
|
||||
chunkOutputDir=$(mktemp -d)
|
||||
mkdir "$chunkOutputDir"/{result,stats}
|
||||
mkdir "$chunkOutputDir"/{result,stats,timestats,stderr}
|
||||
|
||||
seq -w 0 "$seq_end" |
|
||||
command time -f "%e" -o "$out/total-time" \
|
||||
|
||||
@@ -3065,6 +3065,12 @@
|
||||
githubId = 19915050;
|
||||
name = "binarycat";
|
||||
};
|
||||
binarydigitz01 = {
|
||||
email = "binarydigitz01@protonmail.com";
|
||||
github = "binarydigitz01";
|
||||
githubId = 47600778;
|
||||
name = "Arnav Vijaywargiya";
|
||||
};
|
||||
binary-eater = {
|
||||
email = "sergeantsagara@protonmail.com";
|
||||
github = "Binary-Eater";
|
||||
|
||||
+3
-3
@@ -87,7 +87,7 @@ Now that this is out of the way. To add a package to Nixpkgs:
|
||||
|
||||
- XML::Simple, a Perl module: [`pkgs/top-level/perl-packages.nix`](top-level/perl-packages.nix) (search for the `XMLSimple` attribute). Most Perl modules are so simple to build that they are defined directly in `perl-packages.nix`; no need to make a separate file for them.
|
||||
|
||||
- Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the [builder](applications/misc/adobe-reader/builder.sh) uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime.
|
||||
- Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the `postFixup` phase uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime.
|
||||
|
||||
Some notes:
|
||||
|
||||
@@ -337,7 +337,7 @@ In Nixpkgs, there are generally three different names associated with a package:
|
||||
|
||||
- The `pname` attribute of the derivation. This is what most users see, in particular when using `nix-env`.
|
||||
|
||||
- The attribute name used for the package in the [`pkgs/by-name` structure](./pkgs/by-name/README.md) or in [`all-packages.nix`](./pkgs/top-level/all-packages.nix), and when passing it as a dependency in recipes.
|
||||
- The attribute name used for the package in the [`pkgs/by-name` structure](./by-name/README.md) or in [`all-packages.nix`](./top-level/all-packages.nix), and when passing it as a dependency in recipes.
|
||||
|
||||
- The filename for (the directory containing) the Nix expression.
|
||||
|
||||
@@ -729,7 +729,7 @@ $ nix-build -A phoronix-test-suite.tests
|
||||
|
||||
Here are examples of package tests:
|
||||
|
||||
- [Jasmin compile test](development/compilers/jasmin/test-assemble-hello-world/default.nix)
|
||||
- [Jasmin compile test](by-name/ja/jasmin/test-assemble-hello-world/default.nix)
|
||||
- [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix)
|
||||
- [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix)
|
||||
- [Libtorch test](development/libraries/science/math/libtorch/test/default.nix)
|
||||
|
||||
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "shellcheck";
|
||||
publisher = "timonwong";
|
||||
version = "0.37.6";
|
||||
sha256 = "sha256-xfVKI+xxA/8YUcCWpskxZLbBLPsYCF46iKJkrV2zODs=";
|
||||
version = "0.37.7";
|
||||
sha256 = "sha256-i8cVY8EcKSxnmWmRWDiARF79pOEcYMc+y+7i4d8EDTo=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tellico";
|
||||
version = "4.1";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xzMPYze77oajMjS2fprjGu2FsZgI7MjnWVxIxYYN0TY=";
|
||||
hash = "sha256-eYmLDQfnC0/R7VF+oMBwb5Q56CBl2icusoit/LIIpUs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.32.1";
|
||||
version = "1.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6KZlbwSMmFvh6XKJR1W/qa3xU0O3fuQaMW/P5An/AtQ=";
|
||||
hash = "sha256-pie36Y3zKGKvnCDHtjNHYox1b2xhy6w7MShkAfkDVrs=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "anilibria-winmaclinux";
|
||||
version = "2.2.24";
|
||||
version = "2.2.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anilibria";
|
||||
repo = "anilibria-winmaclinux";
|
||||
rev = version;
|
||||
hash = "sha256-FAnVgrH6ZXfIp8FaacSpcHIwF6DCFt4K5e+UMAUb6qI=";
|
||||
hash = "sha256-9jlGENJVgzQi5oEspM6JHIgYt9np8WNKPJzoW2kSgQs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
@@ -85,7 +85,7 @@ though it is expected to still take some time to get done.
|
||||
If you're interested in helping out with this effort,
|
||||
please see [this ticket](https://github.com/NixOS/nixpkgs-vet/issues/56).
|
||||
|
||||
Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests),
|
||||
Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests-yourself),
|
||||
if package maintainers would like to use this feature, they are welcome to migrate their packages to `pkgs/by-name`.
|
||||
To lessen PR traffic, they're encouraged to also perform some more general maintenance on the package in the same PR,
|
||||
though this is not required and must not be expected.
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aardvark-dns";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VXuTHc/t+5QidTqMptoQqircHTtYzeEXfFFII8jeOrI=";
|
||||
hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ydvvV3w8VmfdSTXeJvMuN0oqkkZdWs6/9KocalRGWpg=";
|
||||
cargoHash = "sha256-t9qfPz4Jy1RueiDEY2fB3Y1uty0i/Wf0ElsR+nSVF5g=";
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
dontInstall = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-E9l5zjOOfyDBzYJOU94VrRvt7Hi4XkRTDav9bVlXvlQ=";
|
||||
outputHash = "sha256-OuBxx0nrZ/KVFD1JinjBBXiQUcePWx5zRACld1CoHX0=";
|
||||
};
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ec2-metadata-mock";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ec2-metadata-mock";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU=";
|
||||
|
||||
subPackages = [ "cmd/ec2-metadata-mock" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgram = "${builtins.placeholder "out"}/bin/ec2-metadata-mock";
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Tool to simulate Amazon EC2 instance metadata";
|
||||
homepage = "https://github.com/aws/amazon-ec2-metadata-mock";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "ec2-metadata-mock";
|
||||
maintainers = with lib.maintainers; [ arianvp ];
|
||||
};
|
||||
}
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "angular-language-server";
|
||||
version = "19.0.4";
|
||||
version = "19.1.0";
|
||||
src = fetchurl {
|
||||
name = "angular-language-server-${finalAttrs.version}.zip";
|
||||
url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
|
||||
hash = "sha256-0vED1AcNIbZ7SmXn4KaBBajxfAptQg+XKL3NtJfnvG8=";
|
||||
hash = "sha256-ipF8UOUUuUr6LWetJ9V7Mm1EcxL4fQCZvl1ti5VBo5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
copyPkgconfigItems,
|
||||
makePkgconfigItem,
|
||||
version ? "2.1.2",
|
||||
version ? "2.1.3",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
rev = "rel-${version}";
|
||||
hash =
|
||||
{
|
||||
"2.1.2" = "sha256-fhvQd/f8eaw7OA2/XoOTVOnQxSSxUvugu6VWo2nmpQ0=";
|
||||
"2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4=";
|
||||
"2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
|
||||
}
|
||||
.${version};
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
autoPatchelfHook,
|
||||
versionCheckHook,
|
||||
copyDesktopItems,
|
||||
desktop-file-utils,
|
||||
dbus,
|
||||
dpkg,
|
||||
fetchurl,
|
||||
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
versionCheckHook
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -60,6 +60,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
--replace-fail '-Xmx1024m' '-Xmx${override_xmx}'
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# most directories are for different architectures, only keep what we need
|
||||
shopt -s extglob
|
||||
pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/
|
||||
rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
if !stdenvNoCC.hostPlatform.isDarwin then
|
||||
''
|
||||
@@ -81,7 +89,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
}"
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps
|
||||
ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
|
||||
# for some reason it's missing from the aarch64 build
|
||||
if [ -e $out/opt/dbeaver/dbeaver.png ]; then
|
||||
ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
|
||||
fi
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop
|
||||
@@ -107,10 +118,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
"libc.so.8"
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "evolve-core";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arcnations-united";
|
||||
repo = "evolve-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-W8KpGQ81wjv/tAl09ax/a4Any5PNhhl1DIABhWgAwdc=";
|
||||
hash = "sha256-U5qMJ3aquD2EzWXwTKw0GJPdaCmK68v8DLdJMAwKrzs=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "factoriolab";
|
||||
version = "3.10.0";
|
||||
version = "3.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "factoriolab";
|
||||
repo = "factoriolab";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MSiwtFd9u8IFrHDy++jO//P7Yn4Arip1DwBufR8KIRU=";
|
||||
hash = "sha256-fn9qvUC14a37vQJJiu5jf+wOpeMFsUeR47TDmemNdEc=";
|
||||
};
|
||||
buildInputs = [ vips ];
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "fanficfare";
|
||||
version = "4.41.0";
|
||||
version = "4.42.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KZm3hhJzXZzHy11Ad6IdB5ixlLtIDFcx5X8ydqVpJKA=";
|
||||
hash = "sha256-DfiZqndOh9XENU3MVubKydhdyeUdzhmRyHhLdxU+qDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "foundry";
|
||||
version = "0.3.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foundry-rs";
|
||||
repo = "foundry";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SdxcNbe8/dNZ4JcxKksWmDBAvQorpC8ePvQgnyeKgxU=";
|
||||
hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-5URvuHnpaceRbMqzTA+NRvpp/WLdf+zfmYhIMPiOhNk=";
|
||||
cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ];
|
||||
|
||||
|
||||
@@ -18,16 +18,17 @@
|
||||
wxGTK32,
|
||||
sioclient,
|
||||
pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freedv";
|
||||
version = "1.9.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g=";
|
||||
};
|
||||
|
||||
@@ -75,6 +76,14 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
# avoid pre‐releases
|
||||
"--version-regex"
|
||||
''^v(\d\.\d\.\d(\.\d)?)$''
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://freedv.org/";
|
||||
description = "Digital voice for HF radio";
|
||||
@@ -86,4 +95,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "freedv";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -35,37 +35,36 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitbutler";
|
||||
version = "0.14.4";
|
||||
version = "0.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitbutlerapp";
|
||||
repo = "gitbutler";
|
||||
tag = "release/${version}";
|
||||
hash = "sha256-JeiiV7OXRI4xTTQp1dXqT1ozTrIc7cltvZ6yVOhcjGU=";
|
||||
hash = "sha256-4RWZ1eRUvHj+PU9iNnDsq8k5qHpkAn6g4Zn0cXyUEzM=";
|
||||
};
|
||||
|
||||
# Deactivate the upstream updater, set the version, and merge Tauri's
|
||||
# configuration files
|
||||
# Let Tauri know what version we're building
|
||||
#
|
||||
# Remove references to non-existent workspaces in `gix` crates
|
||||
#
|
||||
# Deactivate the built-in updater
|
||||
postPatch = ''
|
||||
jq --slurp \
|
||||
'.[0] * .[1]
|
||||
| .version = "${version}"
|
||||
| .bundle.createUpdaterArtifacts = false
|
||||
| .plugins.updater.endpoints = [ ]' \
|
||||
crates/gitbutler-tauri/tauri.conf{,.release}.json \
|
||||
| sponge crates/gitbutler-tauri/tauri.conf.json
|
||||
tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json"
|
||||
jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
|
||||
|
||||
tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml
|
||||
|
||||
substituteInPlace apps/desktop/src/lib/backend/tauri.ts \
|
||||
--replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;'
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ooe9in3JfEPMbZSMjobVJpWZdqBTf2AsfEkcsQc0Fts=";
|
||||
cargoHash = "sha256-f7FMJ4h+gFwHnKwisbn1c7Si2/aPJqxhqQ7ablNu3yo=";
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-bLuKG+7QncLwiwKDrlcHKaSrUmDaJUxdvpdv0Jc6UPo=";
|
||||
hash = "sha256-w7DGB9OlzXMsgikCbhBcsVQzKx2atSqIOAKF+kfNoTM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -96,7 +95,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
tauriBuildFlags = [
|
||||
"--config"
|
||||
"crates/gitbutler-tauri/tauri.conf.json"
|
||||
"crates/gitbutler-tauri/tauri.conf.release.json"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
@@ -107,9 +106,18 @@ rustPlatform.buildRustPackage rec {
|
||||
[
|
||||
"--workspace"
|
||||
]
|
||||
# Errors with "Lazy instance has previously been poisoned"
|
||||
++ excludeSpec "gitbutler-branch-actions"
|
||||
++ excludeSpec "gitbutler-stack";
|
||||
++ lib.concatMap excludeSpec [
|
||||
# Requires Git directories
|
||||
"but-core"
|
||||
# Fails due to the issues above and below
|
||||
"but-hunk-dependency"
|
||||
# Errors with "Lazy instance has previously been poisoned"
|
||||
"gitbutler-branch-actions"
|
||||
"gitbutler-stack"
|
||||
# `Expecting driver to be located at "../../target/debug/gitbutler-cli" - we also assume a certain crate location`
|
||||
# We're not (usually) building in debug mode and always have a different target directory, so...
|
||||
"gitbutler-edit-mode"
|
||||
];
|
||||
|
||||
env = {
|
||||
# Make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnustep-back";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg=";
|
||||
sha256 = "sha256-E9rg3ySRUXSVgdPLeg1WrMO8u+SHHmM2Kb/XDAYqIOQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.31.1";
|
||||
version = "0.32.0";
|
||||
pname = "gnustep-gui";
|
||||
|
||||
src = fetchzip {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo=";
|
||||
sha256 = "sha256-HEH80P51mnLRt4+d+gzpGCv4u6oOdf+x68CcvkR6G/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGNUstepAppsHook ];
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnustep-make";
|
||||
version = "2.9.2";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-9UDfnw4drrPSOwjhSyBLKkbx0KQAXLFxyVMjQTgG5OE=";
|
||||
sha256 = "sha256-k8oyC3BieevKU3YNqJ1MPyu8VH9HI5ZxQKNDRtnwTCQ=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -14,15 +14,15 @@
|
||||
desktopToDarwinBundle,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpscorrelate";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dfandrich";
|
||||
repo = "gpscorrelate";
|
||||
rev = version;
|
||||
hash = "sha256-H1kqOzL79/Y1kHVEQ5y9JRWTDCBMbtEPo75drm8+7Qo=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7uNYwnMkW9jlt3kBrNqkhJsDoVkUFbCmqt0lQv8bRE0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -55,14 +55,14 @@ stdenv.mkDerivation rec {
|
||||
"install-desktop-file"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "GPS photo correlation tool, to add EXIF geotags";
|
||||
|
||||
longDescription = ''
|
||||
Digital cameras are cool. So is GPS. And, EXIF tags are really
|
||||
Digital cameras are cool. So is GPS. And, EXIF tags are really
|
||||
cool too.
|
||||
|
||||
What happens when you merge the three? You end up with a set of
|
||||
What happens when you merge the three? You end up with a set of
|
||||
photos taken with a digital camera that are "stamped" with the
|
||||
location at which they were taken.
|
||||
|
||||
@@ -70,14 +70,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
A variety of programs exist around the place to match GPS data
|
||||
with digital camera photos, but most of them are Windows or
|
||||
MacOS only. Which doesn't really suit me that much. Also, each
|
||||
MacOS only. Which doesn't really suit me that much. Also, each
|
||||
one takes the GPS data in a different format.
|
||||
'';
|
||||
|
||||
license = licenses.gpl2Plus;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "https://dfandrich.github.io/gpscorrelate/";
|
||||
changelog = "https://github.com/dfandrich/gpscorrelate/releases/tag/${src.rev}";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
changelog = "https://github.com/dfandrich/gpscorrelate/releases/tag/${finalAttrs.version}";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
mainProgram = "gpscorrelate";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
guile,
|
||||
guile-gnutls,
|
||||
texinfo,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "guile-websocket";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://files.dthompson.us/releases/guile-websocket/guile-websocket-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-7jxj+I5WpqtGu99zrzl92eIZUThy69A4CsLzXnp4dpA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
guile
|
||||
pkg-config
|
||||
texinfo
|
||||
];
|
||||
buildInputs = [
|
||||
guile
|
||||
guile-gnutls
|
||||
];
|
||||
doCheck = true;
|
||||
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
||||
|
||||
meta = {
|
||||
description = "Provides an implementation of the WebSocket protocol in Guile";
|
||||
homepage = "https://dthompson.us/projects/guile-websocket.html";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ binarydigitz01 ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gworkspace";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-M7dV7RVatw8gdYHQlRi5wNBd6MGT9GqW04R/DoKNu6I=";
|
||||
sha256 = "sha256-zjBOtVgQAILI5EozTzyO5pKglG2BBrwaZqVJCxT/Pzw=";
|
||||
};
|
||||
|
||||
# additional dependencies:
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "hyprprop";
|
||||
version = "0.1-unstable-2025-01-29";
|
||||
version = "0.1-unstable-2025-02-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "contrib";
|
||||
rev = "d449f6e1fc31084437ebc0c45057ee656f593efd";
|
||||
hash = "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg=";
|
||||
rev = "59178a657b7e09ddf82b9e79681f482b6c2f378b";
|
||||
hash = "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/hyprprop";
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inputplumber";
|
||||
version = "0.42.2";
|
||||
version = "0.45.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wIncdLGQUpAxldKg4rp8KK6qhOBlzo4AqHQk4Q+rMnU=";
|
||||
hash = "sha256-mapuj/9VCrzux5yS3+NeMw1xG70+xglshOs9O+RIHKM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-C0zRUNQQ/Gw8InmX+SmQV/oj8T2IxtwQPyBKga7Ju2Y=";
|
||||
cargoHash = "sha256-QUTMzHAdB4GJMO+LZP5VFTJRvRHUa6XIcP+1bRSaGdg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
flutterPackages,
|
||||
flutter327,
|
||||
corrosion,
|
||||
rustPlatform,
|
||||
cargo,
|
||||
@@ -10,15 +10,18 @@
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
flutterPackages.stable.buildFlutterApplication rec {
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "intiface-central";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intiface";
|
||||
repo = "intiface-central";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QBNEKhjBfKxArBykUq/fE4lftCYzGdAaWYD1F7rar5Y=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./corrosion.patch
|
||||
];
|
||||
@@ -29,8 +32,9 @@ flutterPackages.stable.buildFlutterApplication rec {
|
||||
name = "${pname}-${version}-cargo-deps";
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/intiface-engine-flutter-bridge";
|
||||
hash = "sha256-1j1maTrR7V/Tlu7uimTJuoEtxhn5Hn0VmR0GnJuKIoo=";
|
||||
hash = "sha256-z9i0xT0e8G9spOmXpI2yFee/y3ZEh69YqL+7zRWszzA=";
|
||||
};
|
||||
|
||||
cargoRoot = "intiface-engine-flutter-bridge";
|
||||
|
||||
preConfigure = ''
|
||||
@@ -45,19 +49,14 @@ flutterPackages.stable.buildFlutterApplication rec {
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
# without this, only the splash screen will be shown and the logs will contain the
|
||||
# line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'`
|
||||
# Environmental variables don't quite eval outside of hooks so use pname and
|
||||
# version directly.
|
||||
extraWrapProgramArgs = "--chdir $out/app/${pname}";
|
||||
extraWrapProgramArgs = "--chdir $out/app/intiface-central";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp $out/app/$pname/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png
|
||||
install -Dm644 $out/app/intiface-central/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
@@ -70,12 +69,12 @@ flutterPackages.stable.buildFlutterApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
mainProgram = "intiface_central";
|
||||
description = "Intiface Central (Buttplug Frontend) Application for Desktop";
|
||||
homepage = "https://intiface.com/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ _999eagle ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ _999eagle ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,27 +4,27 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
|
||||
"sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "72.0.0"
|
||||
"version": "76.0.0"
|
||||
},
|
||||
"_macros": {
|
||||
"dependency": "transitive",
|
||||
"description": "dart",
|
||||
"source": "sdk",
|
||||
"version": "0.3.2"
|
||||
"version": "0.3.3"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
|
||||
"sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.7.0"
|
||||
"version": "6.11.0"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "transitive",
|
||||
@@ -76,6 +76,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"buffer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "buffer",
|
||||
"sha256": "389da2ec2c16283c8787e0adaede82b1842102f8c8aae2f49003a766c5c6b3d1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.3"
|
||||
},
|
||||
"build": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -230,11 +240,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "collection",
|
||||
"sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
|
||||
"sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.18.0"
|
||||
"version": "1.19.0"
|
||||
},
|
||||
"console": {
|
||||
"dependency": "transitive",
|
||||
@@ -316,6 +326,16 @@
|
||||
"source": "hosted",
|
||||
"version": "7.0.1"
|
||||
},
|
||||
"discord_rich_presence": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "discord_rich_presence",
|
||||
"sha256": "ed30f3aa310fb96afe1d410ac0263f4f3013943981935332db08a037f340f4fd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.1"
|
||||
},
|
||||
"easy_debounce": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -668,21 +688,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker",
|
||||
"sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
|
||||
"sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.5"
|
||||
"version": "10.0.7"
|
||||
},
|
||||
"leak_tracker_flutter_testing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker_flutter_testing",
|
||||
"sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
|
||||
"sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.5"
|
||||
"version": "3.0.8"
|
||||
},
|
||||
"leak_tracker_testing": {
|
||||
"dependency": "transitive",
|
||||
@@ -728,11 +748,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "macros",
|
||||
"sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
|
||||
"sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.2-main.4"
|
||||
"version": "0.1.3-main.0"
|
||||
},
|
||||
"markdown": {
|
||||
"dependency": "direct main",
|
||||
@@ -1258,7 +1278,7 @@
|
||||
"dependency": "transitive",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.99"
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"source_gen": {
|
||||
"dependency": "transitive",
|
||||
@@ -1304,11 +1324,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "stack_trace",
|
||||
"sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
|
||||
"sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.11.1"
|
||||
"version": "1.12.0"
|
||||
},
|
||||
"stream_channel": {
|
||||
"dependency": "transitive",
|
||||
@@ -1334,11 +1354,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "string_scanner",
|
||||
"sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
|
||||
"sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
@@ -1354,11 +1374,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
|
||||
"sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.2"
|
||||
"version": "0.7.3"
|
||||
},
|
||||
"timezone": {
|
||||
"dependency": "transitive",
|
||||
@@ -1394,11 +1414,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "typed_data",
|
||||
"sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
|
||||
"sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.2"
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"url_launcher": {
|
||||
"dependency": "direct main",
|
||||
@@ -1484,11 +1504,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "uuid",
|
||||
"sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90",
|
||||
"sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.4.2"
|
||||
"version": "4.5.1"
|
||||
},
|
||||
"vector_math": {
|
||||
"dependency": "transitive",
|
||||
@@ -1514,11 +1534,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
|
||||
"sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "14.2.5"
|
||||
"version": "14.3.0"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
@@ -1622,7 +1642,7 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.5.0-259.0.dev <4.0.0",
|
||||
"dart": ">=3.5.3 <4.0.0",
|
||||
"flutter": ">=3.22.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,9 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm build
|
||||
pnpm prune --prod --ignore-scripts
|
||||
rm -rf .next/cache
|
||||
|
||||
# Clean up broken symlinks left behind by `pnpm prune`
|
||||
# https://github.com/pnpm/pnpm/issues/3645
|
||||
find node_modules -xtype l -delete
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "lldap-cli";
|
||||
version = "0-unstable-2024-11-11";
|
||||
version = "0-unstable-2025-01-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zepmann";
|
||||
repo = "lldap-cli";
|
||||
rev = "2a80dc47c334c88faf3000b45c631bc2cea09906";
|
||||
hash = "sha256-uk7SOiQmUYtoJnihSnPsu/7Er4wXX4xvPboJaNSMjkM=";
|
||||
rev = "e383494b4dd89ae4e028958b268e200fd85a7a64";
|
||||
hash = "sha256-k6UDLOyP+EvKmC1TmbMObgAw2IIs7ekIZxJOWbwc+jg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1600871..1536c55 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -158,7 +158,7 @@ elseif(${SSE} AND (${SSE_PRESENT} OR ${SSE_PRESENT} GREATER 0))
|
||||
# AVX and AVX2 machines will also match on SSE
|
||||
message(STATUS "sse processor flags found or enabled.")
|
||||
set(LPCNET_C_PROC_FLAGS -msse4.1)
|
||||
-elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0))
|
||||
+elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0) AND NOT APPLE)
|
||||
# RPi / ARM 32bit
|
||||
message(STATUS "neon processor flags found or enabled.")
|
||||
set(LPCNET_C_PROC_FLAGS -mfpu=neon -march=armv8-a -mtune=cortex-a53)
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
cmake,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -13,29 +14,38 @@ let
|
||||
sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "lpcnetfreedv";
|
||||
version = "unstable-2022-08-22";
|
||||
version = "0.5-unstable-2025-01-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "LPCNet";
|
||||
rev = "67a6eb74d0c07faddcdce199856862cc45779d25";
|
||||
sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk=";
|
||||
rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246";
|
||||
sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
patches = [
|
||||
# extracted from https://github.com/drowe67/LPCNet/pull/59
|
||||
./darwin.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mkdir build
|
||||
ln -s ${data} build/lpcnet_${dataVersion}.tgz
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://freedv.org/";
|
||||
description = "Experimental Neural Net speech coding for FreeDV";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ fetchurl {
|
||||
homepage = "https://netboot.xyz/";
|
||||
description = "Tool to boot OS installers and utilities over the network, to be run from a bootloader";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ pinpox ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -85,12 +85,12 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nim-unwrapped";
|
||||
version = "2.2.0";
|
||||
version = "2.2.2";
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-zphChJyXYOSH7N0c2t98DyhEyvrmBUAcfHKuJXZEiTw=";
|
||||
hash = "sha256-f8ybh6ycC6Wkif3Cbi2EgM6Wo8piIQDWJn75ITX9ih8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nix-search-tv";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "3timeslazy";
|
||||
repo = "nix-search-tv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SKLvN67GHLHGj0bUYdFutiLzRVCCtxNokWP0z3Za9UU=";
|
||||
hash = "sha256-C8RTUwTkMgROipLgoDrm3L5aTBwOJ+cVr38xx1+sJCQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uzNDhkovlXx0tIgSJ3E08d0TNmktSrlOOe8Iwi4ZfmU=";
|
||||
vendorHash = "sha256-0spLr6Qn2eQZC5Wwe6d+0o6B3r9CIgJt2X5/E/UMvg8=";
|
||||
|
||||
subPackages = [ "cmd/nix-search-tv" ];
|
||||
|
||||
|
||||
@@ -18,23 +18,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "passes";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pablo-s";
|
||||
repo = "passes";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RfoqIyqc9zwrWZ5RLhQl+6vTccbCTwtDcMlnWPCDOag=";
|
||||
hash = "sha256-e6nHCOrb2PX47REr7sy80n1aTdMZ0c2QZlIIib4vll8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/model/meson.build \
|
||||
--replace /app/lib ${zint}/lib
|
||||
substituteInPlace src/view/window.blp \
|
||||
--replace reveal_flap reveal-flap
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace gtk-update-icon-cache gtk4-update-icon-cache
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
--replace-fail /app/lib ${zint}/lib
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -13,12 +13,12 @@ let
|
||||
{
|
||||
aarch64-darwin = {
|
||||
arch = "arm64";
|
||||
sha256 = "sha256-V+JLXl12DnwZlPF0qNs2lQqRpWbSDiPXDTtl4FGcZcM=";
|
||||
sha256 = "sha256-tp8qKk06HvSVY1GggOv9VYH+1Ntlirf8Pf2FY0Qhksk=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
arch = "64";
|
||||
sha256 = "sha256-l7J4Rrq+kUyk+0Chq5qo50K1VXC/7E3FC/hQ1DQ0PGA=";
|
||||
sha256 = "sha256-8hSxtLGoAcTLmUpr3Il/1wii2MgLqOJ3oAYSSPq7a1o=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system}
|
||||
|
||||
@@ -56,12 +56,12 @@ let
|
||||
{
|
||||
aarch64-linux = {
|
||||
arch = "arm64";
|
||||
sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo=";
|
||||
sha256 = "sha256-JKE6riUJXAiCwT0yp5ncoExiRAnFmuefmPkwWmvRjV4=";
|
||||
};
|
||||
|
||||
x86_64-linux = {
|
||||
arch = "64";
|
||||
sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM=";
|
||||
sha256 = "sha256-w7R4IsWMtW37BwGHBY9UweMR6PaZpkya401ARGeR1wY=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "postman";
|
||||
version = "11.1.0";
|
||||
version = "11.32.2";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.getpostman.com";
|
||||
description = "API Development Environment";
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
|
||||
# Remove unnecessary external dependencies
|
||||
rm -rf node_modules
|
||||
find . -name node_modules -type d -prune -exec rm -rf {} +
|
||||
pnpm install --offline --ignore-scripts --frozen-lockfile --prod
|
||||
cp -r node_modules $out/lib/prisma
|
||||
|
||||
@@ -72,10 +72,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
for package in cli $deps; do
|
||||
filename=$(npm pack --json ./packages/$package | jq -r '.[].filename')
|
||||
mkdir -p $out/lib/prisma/packages/$package
|
||||
cp -r packages/$package/node_modules $out/lib/prisma/packages/$package
|
||||
[ -d "packages/$package/node_modules" ] && \
|
||||
cp -r packages/$package/node_modules $out/lib/prisma/packages/$package
|
||||
tar xf $filename --strip-components=1 -C $out/lib/prisma/packages/$package
|
||||
done
|
||||
|
||||
# Remove dangling symlinks to packages we didn't copy to $out
|
||||
find $out/lib/prisma/node_modules/.pnpm/node_modules -type l -exec test ! -e {} \; -delete
|
||||
|
||||
makeWrapper "${lib.getExe nodejs}" "$out/bin/prisma" \
|
||||
--add-flags "$out/lib/prisma/packages/cli/build/index.js" \
|
||||
--set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
{
|
||||
cmake,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
monado,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
SDL2_ttf,
|
||||
SDL2_net,
|
||||
SDL2_gfx,
|
||||
SDL2_sound,
|
||||
SDL2_mixer,
|
||||
SDL2_image,
|
||||
sdl3,
|
||||
stdenv,
|
||||
testers,
|
||||
testSupport ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdl2-compat";
|
||||
version = "2.30.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "sdl2-compat";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-pdY+yrLWIjMTjmKdYvX4DjzXy2cKaw6P90BPu8K163k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sdl3
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
outputBin = "dev";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "SDL2COMPAT_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
doCheck = testSupport && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
postFixup =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
install_name_tool -add_rpath ${lib.makeLibraryPath [ sdl3 ]} $out/lib/libSDL2.dylib
|
||||
''
|
||||
else
|
||||
''
|
||||
patchelf --add-rpath ${lib.makeLibraryPath [ sdl3 ]} $out/lib/libSDL2.so
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests =
|
||||
let
|
||||
replaceSDL2 = drv: drv.override { SDL2 = finalAttrs.finalPackage; };
|
||||
in
|
||||
{
|
||||
pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
|
||||
SDL2_ttf = replaceSDL2 SDL2_ttf;
|
||||
SDL2_net = replaceSDL2 SDL2_net;
|
||||
SDL2_gfx = replaceSDL2 SDL2_gfx;
|
||||
SDL2_sound = replaceSDL2 SDL2_sound;
|
||||
SDL2_mixer = replaceSDL2 SDL2_mixer;
|
||||
SDL2_image = replaceSDL2 SDL2_image;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
monado = replaceSDL2 monado;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"release-(.*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "SDL2 compatibility layer that uses SDL3 behind the scenes";
|
||||
homepage = "https://libsdl.org";
|
||||
changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.zlib;
|
||||
maintainers = with lib.maintainers; [ nadiaholmquist ];
|
||||
platforms = lib.platforms.unix;
|
||||
pkgConfigModules = [ "sdl2_compat" ];
|
||||
};
|
||||
})
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop";
|
||||
version = "7.41.0";
|
||||
version = "7.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-0nolZgoTlmfsAUWUXITTa1FzBHyfHWTZRO2LjccdjNg=";
|
||||
hash = "sha256-N/BgLpEvpcl29+AN0zZDBGBwkYqYqjW953jfdwm5+/4=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.41.0";
|
||||
version = "7.42.0";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-au0a//9P0dNDZnh1LzuHhpimWAzKRj5oJmUHls5mSxU=";
|
||||
hash = "sha256-LuqE2SE6RurcwU5fl3uOJNtNZTBTR+xO2W6z98Gv53A=";
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "soplex";
|
||||
version = "712";
|
||||
version = "713";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "soplex";
|
||||
rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
|
||||
hash = "sha256-8muN9wYDQX5CULifKBYO/t9whS2LsatrYB2khlV0akg=";
|
||||
hash = "sha256-qI7VGPAm3ALzeiD/OgvlZ1w2GzHRYdBajTW5XdIN9pU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
withDaemon ? true,
|
||||
withAudioBackend ? "rodio", # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl
|
||||
withMediaControl ? true,
|
||||
withLyrics ? true,
|
||||
withImage ? true,
|
||||
withNotify ? true,
|
||||
withSixel ? true,
|
||||
@@ -47,17 +46,17 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "spotify-player";
|
||||
version = "0.20.3";
|
||||
version = "0.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aome510";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9iXsZod1aLdCQYUKBjdRayQfRUz770Xw3/M85Rp/OCw=";
|
||||
hash = "sha256-5N/zTkNgcIk/Ml11Oo+jyoO0r2Hh9SxFL+tdhD/1X/4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-LX4DuIIL9jGQLEzECydIdPEdPGdRTYREwFbMCS8CoNo=";
|
||||
cargoHash = "sha256-0vIhAJ3u+PfujUGI07fddDs33P35Q4CSDz1sMuQwVws=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
@@ -100,13 +99,17 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ]
|
||||
++ lib.optionals withMediaControl [ "media-control" ]
|
||||
++ lib.optionals withImage [ "image" ]
|
||||
++ lib.optionals withLyrics [ "lyric-finder" ]
|
||||
++ lib.optionals withDaemon [ "daemon" ]
|
||||
++ lib.optionals withNotify [ "notify" ]
|
||||
++ lib.optionals withStreaming [ "streaming" ]
|
||||
++ lib.optionals withSixel [ "sixel" ]
|
||||
++ lib.optionals withFuzzy [ "fzf" ];
|
||||
|
||||
# tries to access HOME only in aarch64-darwin environment when building mac-notification-sys
|
||||
preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
# sixel-sys is dynamically linked to libsixel
|
||||
postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) ''
|
||||
wrapProgram $out/bin/spotify_player \
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sydbox";
|
||||
version = "3.30.0";
|
||||
version = "3.30.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "Sydbox";
|
||||
repo = "sydbox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EbdJuJefFQaL6e+2AcsPF4eXin3ky+jlt4s68mSusoc=";
|
||||
hash = "sha256-Vby+2uSosp5yHc99lB2nMozMfsLowPunXuS30evKiZk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-+tyUKX0hzVt2CkbbNYuonWfh1sJBaqmbaeYdctHbPVw=";
|
||||
cargoHash = "sha256-1Em6ibjYXWnCIF1r7qS2uKvBAhb1klGjwrv9E6PTQCU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandoc
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tabiew";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shshemi";
|
||||
repo = "tabiew";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q/GX3kcGx83h0XFlG0r2RGpoh63ijnaM4mp/ewrf920=";
|
||||
hash = "sha256-bYmHFH39DYtv7AbKTteiAiRyzTJXzBHmQ/Mu/oEQ3fI=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-rViJDF0cC8j8OVGNCxf6C1xpA8GXrt2UZvnkOuEJEmA=";
|
||||
cargoHash = "sha256-JECqyR+ONiotJhKv3AJv1JfFtP2XBECqmvXTc1kNL20=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nI+6EzbGQzfM/pG4d5O4I5BEJ2aNaZ/sE28/EcgQmCs=";
|
||||
hash = "sha256-gD9fIBILqSFExTIziNx6Hy6TpsBC90yHSfSDB9fhKwA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o/PYWR7KOWCVXUhzdPY0bxRhCROXzp/UAXgFkWpggC8=";
|
||||
vendorHash = "sha256-ECTR1U2RlatLK3c3UP/aHzYMkN6WxPsHuwoXUzIYsAA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tippecanoe";
|
||||
version = "2.75.0";
|
||||
version = "2.75.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felt";
|
||||
repo = "tippecanoe";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-0ayEGmIUw5jI5utp689oxlFR15TeQ1gbLJIos4AXdd4=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rBuk34lOrp9aW7yK0LOTRqFJg3J8IogR01kcFhgK12Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Build vector tilesets from large collections of GeoJSON features";
|
||||
homepage = "https://github.com/felt/tippecanoe";
|
||||
license = licenses.bsd2;
|
||||
maintainers = teams.geospatial.members;
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = lib.teams.geospatial.members;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "tippecanoe";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
{
|
||||
lib,
|
||||
gccStdenv,
|
||||
cudaPackages,
|
||||
fetchFromGitLab,
|
||||
cudatoolkit,
|
||||
config,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
pkg-config,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
gccStdenv.mkDerivation rec {
|
||||
let
|
||||
stdenv = if cudaSupport then cudaPackages.backendStdenv else gccStdenv;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "truecrack";
|
||||
version = "3.6";
|
||||
|
||||
@@ -22,12 +25,14 @@ gccStdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./fix-empty-return.patch
|
||||
./remove-opencc-options.patch
|
||||
./set-cuda-archs.patch
|
||||
];
|
||||
|
||||
configureFlags = (
|
||||
if cudaSupport then
|
||||
[
|
||||
"--with-cuda=${cudatoolkit}"
|
||||
"--with-cuda=${cudaPackages.cudatoolkit}"
|
||||
]
|
||||
else
|
||||
[
|
||||
@@ -40,7 +45,8 @@ gccStdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals cudaSupport [
|
||||
cudatoolkit
|
||||
cudaPackages.cudatoolkit
|
||||
cudaPackages.cuda_cudart
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString ([
|
||||
@@ -61,7 +67,7 @@ gccStdenv.mkDerivation rec {
|
||||
|
||||
installFlags = [ "prefix=$(out)" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
doInstallCheck = !cudaSupport;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
@@ -88,7 +94,6 @@ gccStdenv.mkDerivation rec {
|
||||
description = "Brute-force password cracker for TrueCrypt volumes, optimized for Nvidia Cuda technology";
|
||||
mainProgram = "truecrack";
|
||||
homepage = "https://gitlab.com/kalilinux/packages/truecrack";
|
||||
broken = cudaSupport;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ethancedwards8 ];
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index e4cac89..50d9b02 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -56,7 +56,7 @@ $(OBJ_CUDA):
|
||||
cat Cuda/Sha2.cu >> Cuda.cu
|
||||
cat Cuda/Whirlpool.cu >> Cuda.cu
|
||||
|
||||
- $(COMPILER) -c Cuda.cu $(CFLAGS) --opencc-options -OPT:Olimit=0 $< -o $@
|
||||
+ $(COMPILER) -c Cuda.cu $(CFLAGS) $< -o $@
|
||||
|
||||
$(OBJS_COMMON): %.o: Common/%.c
|
||||
$(COMPILER) -c $(CFLAGS) $< -o $@
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 86f76ad..7a5c77b 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -435,7 +435,7 @@ $(OBJ_CUDA):
|
||||
cat Cuda/Sha2.cu >> Cuda.cu
|
||||
cat Cuda/Whirlpool.cu >> Cuda.cu
|
||||
|
||||
- $(COMPILER) -c Cuda.cu $(CFLAGS) --opencc-options -OPT:Olimit=0 $< -o $@
|
||||
+ $(COMPILER) -c Cuda.cu $(CFLAGS) $< -o $@
|
||||
|
||||
$(OBJS_COMMON): %.o: Common/%.c
|
||||
$(COMPILER) -c $(CFLAGS) $< -o $@
|
||||
@@ -0,0 +1,32 @@
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index e4cac89..599b7a3 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -30,10 +30,7 @@ OBJ_CUDA=Cuda.o
|
||||
CFLAGS += -D_GPU_
|
||||
COMPILER=$(NVCC)
|
||||
# CUDA code generation flags
|
||||
-GENCODE_SM10= -gencode arch=compute_10,code=sm_10
|
||||
-GENCODE_SM20= -gencode arch=compute_20,code=sm_20
|
||||
-GENCODE_SM30= -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35
|
||||
-GENCODE_FLAGS= $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
|
||||
+GENCODE_FLAGS= -gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_89,code=sm_89 -gencode arch=compute_90,code=sm_90 -gencode arch=compute_90a,code=sm_90a
|
||||
CFLAGS += $(GENCODE_FLAGS) -ftz=true -use_fast_math
|
||||
endif
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 86f76ad..123255b 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -181,10 +181,7 @@ LFLAGS = -lm -O3
|
||||
@ENABLE_CPU_TRUE@COMPILER = $(CC)
|
||||
@ENABLE_CPU_FALSE@OBJ_CUDA = Cuda.o
|
||||
# CUDA code generation flags
|
||||
-@ENABLE_CPU_FALSE@GENCODE_SM10 = -gencode arch=compute_10,code=sm_10
|
||||
-@ENABLE_CPU_FALSE@GENCODE_SM20 = -gencode arch=compute_20,code=sm_20
|
||||
-@ENABLE_CPU_FALSE@GENCODE_SM30 = -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35
|
||||
-@ENABLE_CPU_FALSE@GENCODE_FLAGS = $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
|
||||
+@ENABLE_CPU_FALSE@GENCODE_FLAGS = -gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_89,code=sm_89 -gencode arch=compute_90,code=sm_90 -gencode arch=compute_90a,code=sm_90a
|
||||
truecrack_SOURCES =
|
||||
truecrack_CFLAGS = $(CUDA_CFLAGS)
|
||||
truecrack_LDADD = $(CUDA_LIBS)
|
||||
@@ -14,21 +14,21 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison-code-manager";
|
||||
version = "0.5.29";
|
||||
version = "0.5.33";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
|
||||
hash = "sha256-iSyhPCn8+u/kKW1NVorUaRXaP0Q771m6G1ICsHp1/Rs=";
|
||||
hash = "sha256-DXqQMv1pEEFSHDsY8BICFfKAD4zaishRIDo1hwCVj54=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
|
||||
hash = "sha256-Rukx1I67jq78xvDB7eYP6TvZZBZtWisOv2WZe6/KlHE=";
|
||||
hash = "sha256-ffHbkujs3UMChPM2uL3tBcxInKEOHwRUMrIeh+k5ghY=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz";
|
||||
hash = "sha256-fVsKPTi9j+LVWDPhuHYb7NKD2JXJz7nRE6yuE7rQ3e0=";
|
||||
hash = "sha256-+kBuQn73P8yxa8l6/R3NGj61LB6kKwa2lfNKZmhI5Dk=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "VictoriaMetrics";
|
||||
version = "1.110.0";
|
||||
version = "1.111.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TrM2YyxZZZw+wGMIFACJExtQb6aJwDe1xe63OQqCjDo=";
|
||||
hash = "sha256-KLRaAGLh7SYPQERZvuj5Jlu1oIrvQPFCQJRlHedLezk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -6,46 +6,56 @@
|
||||
wrapGAppsHook4,
|
||||
glib,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
meson,
|
||||
ninja,
|
||||
cargo,
|
||||
rustc,
|
||||
sqlite,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waytrogen";
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolaizombie1";
|
||||
repo = "waytrogen";
|
||||
tag = version;
|
||||
hash = "sha256-/NvLgC1IB3YrilnuuZFMuDYaUDQ4fDrtYNf1xL8H+Ng=";
|
||||
hash = "sha256-bHQhgavD7L0jCWafOGnGRGOBigdcpSBvsFxTlJudZSY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-cdomE3K8T1urvRK1TAm+IvnKC8ZuPgEVnN3TzlJVtBQ=";
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-577bzSc2iEoTotG55qBZOR3SdRUvp3gGQP2zrtkePAw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
meson
|
||||
ninja
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
];
|
||||
|
||||
buildInputs = [ glib ];
|
||||
buildInputs = [
|
||||
glib
|
||||
sqlite
|
||||
openssl
|
||||
];
|
||||
|
||||
preBuild = ''export OUT_PATH=$out'';
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas
|
||||
glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop
|
||||
install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg
|
||||
while IFS= read -r lang; do
|
||||
mkdir -p $out/share/locale/$lang/LC_MESSAGES
|
||||
msgfmt locales/$lang/LC_MESSAGES/waytrogen.po -o $out/share/locale/$lang/LC_MESSAGES/waytrogen.mo
|
||||
done < locales/LINGUAS
|
||||
'';
|
||||
mesonFlags = [ "-Dcargo_features=nixos" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yabai";
|
||||
version = "7.1.8";
|
||||
version = "7.1.10";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
|
||||
@@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
|
||||
"aarch64-darwin" = fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-lD+n3QYI53AiCi32Ci06bNulwdyhRG7xQDVqJqlHOcs=";
|
||||
hash = "sha256-mWN59BfexCmaahADzUP+B1xGQK8TNyrKOBKKJ00D7tg=";
|
||||
};
|
||||
"x86_64-darwin" = fetchFromGitHub {
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nbPs8xPh1TW6HU1yl0gStSzsj6yxsBhHUI63y1GGGW0=";
|
||||
hash = "sha256-4OYB+RlAUD8LcRcUNIEXWfFFedTmQFzcTgqd1g/tdWc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ytDownloader";
|
||||
version = "3.18.5";
|
||||
version = "3.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aandrew-me";
|
||||
repo = "ytDownloader";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-914sEFUVwiHMXwnwZjdeSQmeSPRREeoihLKYYTTKAcs=";
|
||||
hash = "sha256-Oj462x1oyhaLFbVNr90hKmg0S+BZXUv1DyNdxsc2L7Y=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-zBFRzVBmKAncZFTFa0hhv5BaE0rsAv9IdezZBNd5J2E=";
|
||||
npmDepsHash = "sha256-ZJdPfNndYOWzvJpgra16/tCuWTvPLd4ZhSFualJB00E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
pulseaudioSupport ? true,
|
||||
libpulseaudio,
|
||||
pulseaudio,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -50,23 +51,23 @@ let
|
||||
# and often with different versions. We write them on three lines
|
||||
# like this (rather than using {}) so that the updater script can
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "6.3.1.45300";
|
||||
versions.x86_64-darwin = "6.3.1.45300";
|
||||
versions.x86_64-linux = "6.2.11.5069";
|
||||
versions.aarch64-darwin = "6.3.6.47101";
|
||||
versions.x86_64-darwin = "6.3.6.47101";
|
||||
versions.x86_64-linux = "6.3.6.6315";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
|
||||
name = "zoomusInstallerFull.pkg";
|
||||
hash = "sha256-WPhqYof/XR6TDkuA4NK2a30ksdhN7NBfs4KCQwqKJ0g=";
|
||||
hash = "sha256-tqDf3Z5RRf4aRvtINWdM3oppZXbDdtihhPBHu4QxzDM=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
|
||||
hash = "sha256-BywBvJCcNXARHTkO/UJbOFRjuiXRkmFWmSuZsW9t1pk=";
|
||||
hash = "sha256-BZkBx5eZ3c3p9JIz+ChyJrGM12HwyNToSuS86f9QnF0=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw=";
|
||||
hash = "sha256-QJR8SsMtyYBvd5G+mEjEEISkJJukCYeHErKrgs1uDQc=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -122,6 +123,7 @@ let
|
||||
coreutils
|
||||
glib.dev
|
||||
pciutils
|
||||
pipewire
|
||||
procps
|
||||
util-linux
|
||||
]
|
||||
@@ -179,7 +181,7 @@ stdenv.mkDerivation {
|
||||
substituteInPlace $out/share/applications/Zoom.desktop \
|
||||
--replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom"
|
||||
|
||||
for i in aomhost zopen zoom ZoomLauncher ZoomWebviewHost; do
|
||||
for i in aomhost zopen ZoomLauncher ZoomWebviewHost; do
|
||||
if [ -f $out/opt/zoom/$i ]; then
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i
|
||||
fi
|
||||
@@ -187,8 +189,14 @@ stdenv.mkDerivation {
|
||||
|
||||
# ZoomLauncher sets LD_LIBRARY_PATH before execing zoom
|
||||
# IPC breaks if the executable name does not end in 'zoom'
|
||||
# zoom binary does not like being touched by patchelf
|
||||
# => we call it indirectly via the dynamic linker
|
||||
# zoom binary inspects /proc/self/exe to find its data files
|
||||
# => we must place a copy (not symlink) of the linker in zoom's data dir
|
||||
mv $out/opt/zoom/zoom $out/opt/zoom/.zoom
|
||||
makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \
|
||||
cp "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/ld.so
|
||||
makeWrapper $out/opt/zoom/ld.so $out/opt/zoom/zoom \
|
||||
--add-flags $out/opt/zoom/.zoom \
|
||||
--prefix LD_LIBRARY_PATH ":" ${libs}
|
||||
|
||||
rm $out/bin/zoom
|
||||
@@ -220,6 +228,7 @@ stdenv.mkDerivation {
|
||||
dontPatchELF = true;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru.tests.startwindow = callPackage ./test.nix { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://zoom.us/";
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
xvfb-run,
|
||||
zoom-us,
|
||||
runCommand,
|
||||
writeShellApplication,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
let
|
||||
testScript = writeShellApplication {
|
||||
name = "zoom-us-test-script";
|
||||
runtimeInputs = [
|
||||
xorg.xwininfo
|
||||
zoom-us
|
||||
];
|
||||
text = ''
|
||||
function is_zoom_window_present {
|
||||
echo
|
||||
xwininfo -root -tree \
|
||||
| sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \
|
||||
| tee window-names
|
||||
grep -q "Zoom Workplace" window-names
|
||||
}
|
||||
# don't let zoom eat all RAM, like it did
|
||||
# https://github.com/NixOS/nixpkgs/issues/371488
|
||||
prlimit --{as,data}=$((4*2**30)):$((4*2**30)) zoom-us &
|
||||
for _ in {0..900} ; do
|
||||
if is_zoom_window_present ; then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# if libraries are missing, the window still appears,
|
||||
# but disappears again immediatelly; check for that too:
|
||||
sleep 20
|
||||
is_zoom_window_present
|
||||
'';
|
||||
};
|
||||
in
|
||||
runCommand "zoom-us-test" { buildInputs = [ xvfb-run ]; } ''
|
||||
HOME=$PWD xvfb-run ${lib.getExe testScript}
|
||||
touch ${placeholder "out"}
|
||||
''
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-greeter";
|
||||
version = "8.0.0";
|
||||
version = "8.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "greeter";
|
||||
rev = version;
|
||||
sha256 = "sha256-fx3KHMF6UhIFXyJHQ4dKJnVidsNMBk7AvHzaF3ELH1k=";
|
||||
sha256 = "sha256-T/tI8WRVbTLdolDYa98M2Vm26p0xhGiai74lXAlpQ8k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-power";
|
||||
version = "8.0.1";
|
||||
version = "8.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zMvw96uRr9hrgXck+OhMiPku9qu8/zUtusiaJLUcuys=";
|
||||
sha256 = "sha256-AeeL/OcQ7V3HT3IWhTQHx/dcCSqL/0s/fShPq96V3xE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
mkCoqDerivation,
|
||||
coq,
|
||||
mathcomp-ssreflect,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
@@ -33,7 +34,7 @@ mkCoqDerivation {
|
||||
}
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-ssreflect ];
|
||||
propagatedBuildInputs = [ mathcomp-ssreflect stdlib ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.ps.uni-saarland.de/autosubst/";
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
mkCoqDerivation,
|
||||
coq,
|
||||
mathcomp,
|
||||
mathcomp-algebra-tactics,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
@@ -35,7 +37,7 @@ mkCoqDerivation {
|
||||
release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";
|
||||
release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.algebra ];
|
||||
propagatedBuildInputs = [ mathcomp.algebra mathcomp-algebra-tactics stdlib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Formalization of bitset operations in Coq";
|
||||
|
||||
@@ -27,7 +27,6 @@ default-elpi-version = if elpi-version != null then elpi-version else (
|
||||
elpi = coq.ocamlPackages.elpi.override { version = default-elpi-version; };
|
||||
propagatedBuildInputs_wo_elpi = [
|
||||
coq.ocamlPackages.findlib
|
||||
stdlib
|
||||
];
|
||||
derivation = mkCoqDerivation {
|
||||
pname = "elpi";
|
||||
@@ -120,4 +119,12 @@ patched-derivation2 = patched-derivation1.overrideAttrs
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ];
|
||||
}
|
||||
);
|
||||
in patched-derivation2
|
||||
patched-derivation3 = patched-derivation2.overrideAttrs
|
||||
(
|
||||
o:
|
||||
lib.optionalAttrs (o.version != null && o.version == "2.4.0")
|
||||
{
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ];
|
||||
}
|
||||
);
|
||||
in patched-derivation3
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
mkCoqDerivation,
|
||||
autoconf,
|
||||
coq,
|
||||
stdlib,
|
||||
ssreflect,
|
||||
version ? null,
|
||||
}:
|
||||
@@ -56,7 +57,7 @@ mkCoqDerivation {
|
||||
releaseRev = v: "coquelicot-${v}";
|
||||
|
||||
nativeBuildInputs = [ autoconf ];
|
||||
propagatedBuildInputs = [ ssreflect ];
|
||||
propagatedBuildInputs = [ stdlib ssreflect ];
|
||||
useMelquiondRemake.logpath = "Coquelicot";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
coq,
|
||||
version ? null,
|
||||
ssreflect,
|
||||
stdlib,
|
||||
}:
|
||||
|
||||
mkCoqDerivation {
|
||||
@@ -47,7 +48,7 @@ mkCoqDerivation {
|
||||
release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI=";
|
||||
release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh";
|
||||
|
||||
propagatedBuildInputs = [ ssreflect ];
|
||||
propagatedBuildInputs = [ ssreflect stdlib ];
|
||||
|
||||
mlPlugin = true;
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
mkCoqDerivation,
|
||||
coq,
|
||||
mathcomp,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
@@ -67,6 +68,7 @@ mkCoqDerivation {
|
||||
mathcomp.algebra
|
||||
mathcomp.ssreflect
|
||||
mathcomp.fingroup
|
||||
stdlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
mkCoqDerivation,
|
||||
coq,
|
||||
mathcomp,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
@@ -52,6 +53,7 @@ mkCoqDerivation {
|
||||
mathcomp.ssreflect
|
||||
mathcomp.algebra
|
||||
mathcomp.fingroup
|
||||
stdlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
coq,
|
||||
mathcomp,
|
||||
mathcomp-finmap,
|
||||
mathcomp-algebra-tactics,
|
||||
fourcolor,
|
||||
hierarchy-builder,
|
||||
version ? null,
|
||||
@@ -68,6 +69,7 @@ mkCoqDerivation {
|
||||
mathcomp.algebra
|
||||
mathcomp-finmap
|
||||
mathcomp.fingroup
|
||||
mathcomp-algebra-tactics
|
||||
fourcolor
|
||||
hierarchy-builder
|
||||
];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
coq,
|
||||
mkCoqDerivation,
|
||||
mathcomp,
|
||||
stdlib,
|
||||
lib,
|
||||
version ? null,
|
||||
}:
|
||||
@@ -107,7 +108,7 @@ mkCoqDerivation {
|
||||
"1.0.0".sha256 = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.ssreflect ];
|
||||
propagatedBuildInputs = [ mathcomp.ssreflect stdlib ];
|
||||
|
||||
meta = {
|
||||
description = "Finset and finmap library";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
mkCoqDerivation,
|
||||
mathcomp,
|
||||
mathcomp-bigenough,
|
||||
stdlib,
|
||||
lib,
|
||||
version ? null,
|
||||
}:
|
||||
@@ -115,6 +116,7 @@ mkCoqDerivation {
|
||||
mathcomp.fingroup
|
||||
mathcomp.solvable
|
||||
mathcomp-bigenough
|
||||
stdlib
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
mkCoqDerivation,
|
||||
mathcomp-ssreflect,
|
||||
mathcomp-fingroup,
|
||||
stdlib,
|
||||
lib,
|
||||
version ? null,
|
||||
}@args:
|
||||
@@ -52,6 +53,7 @@ mkCoqDerivation {
|
||||
propagatedBuildInputs = [
|
||||
mathcomp-ssreflect
|
||||
mathcomp-fingroup
|
||||
stdlib
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
mathcomp-algebra,
|
||||
mathcomp-ssreflect,
|
||||
mathcomp-fingroup,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
@@ -56,6 +57,7 @@ mkCoqDerivation rec {
|
||||
mathcomp-algebra
|
||||
mathcomp-ssreflect
|
||||
mathcomp-fingroup
|
||||
stdlib
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -136,13 +136,20 @@ let
|
||||
installFlags = o.installFlags ++ [ "-f Makefile.coq" ];
|
||||
}
|
||||
);
|
||||
patched-derivation = patched-derivation2.overrideAttrs (o:
|
||||
patched-derivation3 = patched-derivation2.overrideAttrs (o:
|
||||
lib.optionalAttrs (o.version != null
|
||||
&& (o.version == "dev" || lib.versions.isGe "2.0.0" o.version))
|
||||
{
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++ [ hierarchy-builder ];
|
||||
}
|
||||
);
|
||||
in patched-derivation;
|
||||
patched-derivation4 = patched-derivation3.overrideAttrs (o:
|
||||
lib.optionalAttrs (o.version != null
|
||||
&& lib.versions.isLe "2.3.0" o.version)
|
||||
{
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ];
|
||||
}
|
||||
);
|
||||
in patched-derivation4;
|
||||
in
|
||||
mathcomp_ (if single then "single" else "all")
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
mkCoqDerivation,
|
||||
mathcomp,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
@@ -45,6 +46,7 @@ mkCoqDerivation {
|
||||
mathcomp.solvable
|
||||
mathcomp.field
|
||||
mathcomp.all
|
||||
stdlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
mkCoqDerivation,
|
||||
coq,
|
||||
mathcomp,
|
||||
stdlib,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
@@ -46,7 +47,7 @@ mkCoqDerivation {
|
||||
]
|
||||
null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.ssreflect ];
|
||||
propagatedBuildInputs = [ mathcomp.ssreflect stdlib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Regular Language Representations in Coq";
|
||||
|
||||
@@ -49,8 +49,14 @@ buildPythonPackage rec {
|
||||
|
||||
patchShebangs --build packaging/cli-doc/build.py
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools >= 66.1.0, <= 75.6.0" setuptools
|
||||
SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"'
|
||||
PYPROJECT=$(cat pyproject.toml)
|
||||
if [[ "$PYPROJECT" =~ $SETUPTOOLS_PATTERN ]]; then
|
||||
echo "setuptools replace: ''${BASH_REMATCH[0]}"
|
||||
echo "''${PYPROJECT//''${BASH_REMATCH[0]}/'"setuptools"'}" > pyproject.toml
|
||||
else
|
||||
exit 2
|
||||
fi
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "astropy-healpix";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = lib.replaceStrings [ "-" ] [ "_" ] pname;
|
||||
hash = "sha256-3l0qfsl7FnBFBmlx8loVDR5AYfBxWb4jZJY02zbnl0Y=";
|
||||
hash = "sha256-0YFlh6YEkYjiqi6fABJZ3j+LoVjwS5O1BruEcmQAf24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,20 +2,14 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
python,
|
||||
xvfb-run,
|
||||
imageio,
|
||||
matplotlib,
|
||||
scikit-image,
|
||||
numpy,
|
||||
pandas,
|
||||
imageio,
|
||||
snakeviz,
|
||||
fn,
|
||||
pyopengl,
|
||||
scikit-image,
|
||||
seaborn,
|
||||
torch,
|
||||
pythonOlder,
|
||||
torchvision,
|
||||
snakeviz,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -23,37 +17,24 @@ buildPythonPackage rec {
|
||||
version = "0.10.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-unGnmPksEuqFXHTWJkj9Gv2G/qPDgT6AZXYiG2gtkEA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
imageio
|
||||
matplotlib
|
||||
scikit-image
|
||||
numpy
|
||||
pandas
|
||||
imageio
|
||||
snakeviz
|
||||
fn
|
||||
pyopengl
|
||||
scikit-image
|
||||
seaborn
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
xvfb-run
|
||||
torch
|
||||
torchvision
|
||||
snakeviz
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "boxx" ];
|
||||
|
||||
checkPhase = ''
|
||||
xvfb-run ${python.interpreter} -m unittest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool-box for efficient build and debug for Scientific Computing and Computer Vision";
|
||||
homepage = "https://github.com/DIYer22/boxx";
|
||||
|
||||
@@ -57,7 +57,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/DIYer22/bpycv";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lucasew ];
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
inherit (blender.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
dash,
|
||||
dash-bootstrap-components,
|
||||
numpy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash-bootstrap-templates";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AnnMarieW";
|
||||
repo = "dash-bootstrap-templates";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-dbXqqncxfIZ6traVQ2a/2E1Co4MVdoiU8ox6nBnqviE=";
|
||||
};
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
dash
|
||||
dash-bootstrap-components
|
||||
numpy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dash_bootstrap_templates" ];
|
||||
|
||||
# There are no tests.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A collection of 52 Plotly figure templates with a Bootstrap theme";
|
||||
homepage = "https://github.com/AnnMarieW/dash-bootstrap-templates";
|
||||
changelog = "https://github.com/AnnMarieW/dash-bootstrap-templates/releases/tag/V${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
@@ -1,47 +1,85 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
numpy,
|
||||
scipy,
|
||||
|
||||
# build-system
|
||||
pybind11,
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
ase,
|
||||
joblib,
|
||||
sparse,
|
||||
pybind11,
|
||||
numpy,
|
||||
scikit-learn,
|
||||
scipy,
|
||||
sparse,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dscribe";
|
||||
version = "2.1.1";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "singroup";
|
||||
repo = "dscribe";
|
||||
rev = "v${version}";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true; # Bundles a specific version of Eigen
|
||||
hash = "sha256-2JY24cR2ie4+4svVWC4rm3Iy6Wfg0n2vkINz032kPWc=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
build-system = [
|
||||
pybind11
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
ase
|
||||
joblib
|
||||
sparse
|
||||
numpy
|
||||
scikit-learn
|
||||
scipy
|
||||
sparse
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
pythonImportsCheck = [
|
||||
"dscribe"
|
||||
"dscribe.ext"
|
||||
];
|
||||
|
||||
# Prevents python from loading dscribe from the current working directory instead of using $out
|
||||
preCheck = ''
|
||||
rm -rf dscribe
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# AttributeError: module 'numpy' has no attribute 'product'
|
||||
"test_extended_system"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# AssertionError on a numerical test
|
||||
"test_cell_list"
|
||||
|
||||
# Fatal Python error: Aborted
|
||||
# matplotlib/backend_bases.py", line 2654 in create_with_canvas
|
||||
"test_examples"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Machine learning descriptors for atomistic systems";
|
||||
homepage = "https://github.com/SINGROUP/dscribe";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langsmith";
|
||||
version = "0.3.4";
|
||||
version = "0.3.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langsmith-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mJS9Sdt4ESh9YRyjiUdVHC6R400SKhTeSdTjnbtY61I=";
|
||||
hash = "sha256-V52sBGC4acQHfgsK5uCKQIWoeiaUnyEObVrt5TBRukU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo";
|
||||
version = "0.13.4";
|
||||
version = "0.14.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "NeuralEnsemble";
|
||||
repo = "python-neo";
|
||||
tag = version;
|
||||
hash = "sha256-iBrZXJ4I0PWMwkLBSbtfImNPqupr4GyXNvGqwqEp6Qs=";
|
||||
hash = "sha256-lLs70BsbFxTmd/qR0EqsceG+fAKI1P+em5Ix2kM9w/w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parallel-ssh";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ParallelSSH";
|
||||
repo = "parallel-ssh";
|
||||
tag = version;
|
||||
hash = "sha256-J/rwlJ9BOcENngIVz5cU+uA34hEEw7QsgsPnpNbbZbk=";
|
||||
hash = "sha256-TeNQitaNVbK96Aui8OcKin2sHpF8VlMQmb5ODT2lQh4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Asynchronous parallel SSH client library";
|
||||
homepage = "https://github.com/ParallelSSH/parallel-ssh";
|
||||
changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${version}/Changelog.rst";
|
||||
changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${src.tag}/Changelog.rst";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
maintainers = with lib.maintainers; [ infinidoge ];
|
||||
};
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pglast";
|
||||
version = "7.2";
|
||||
version = "7.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wOlhmlivkyO79Rr4tUcmOPGro5FmZfC2VA5GOHgxcr4=";
|
||||
hash = "sha256-jl0LSJGJlKYU1eX7y1ElDNbtkORo7grR3Bz5Ot5pabA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
pyasn1,
|
||||
cryptography,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pgpy-dtc";
|
||||
version = "0.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DigitalTrustCenter";
|
||||
repo = "PGPy_dtc";
|
||||
tag = version;
|
||||
hash = "sha256-0zv2gtgp/iGDQescaDpng1gqbgjv7iXFvtwEt3YIPy4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
pyasn1
|
||||
cryptography
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "pgpy_dtc" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/DigitalTrustCenter/PGPy_dtc";
|
||||
changelog = "https://github.com/DigitalTrustCenter/PGPy_dtc/releases/tag/${src.tag}";
|
||||
description = "Pretty Good Privacy for Python";
|
||||
license = lib.licenses.eupl12;
|
||||
maintainers = with lib.maintainers; [ networkexception ];
|
||||
};
|
||||
}
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plyara";
|
||||
version = "2.2.7";
|
||||
version = "2.2.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10"; # https://github.com/plyara/plyara: "Plyara requires Python 3.10+"
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6gYD9BePlxGvSUg9ENa7a9uzU0pOl+IJs8ZVRekDVHY=";
|
||||
hash = "sha256-zmpb5r3BcveLsQ0uIgQJx2vUaz2p/0PlO76E0e7elwA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pulsar";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "pulsar-client-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2Ahv0lfeHuBhGIYhiTjKegEKsJqHkpK3Qu6xBnjsanI=";
|
||||
hash = "sha256-/b3ha+FtZeLioRKGGjaW7x4jXu/cXxBX9GV2KyQpCkQ=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyxnat";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "pyxnat";
|
||||
repo = "pyxnat";
|
||||
tag = version;
|
||||
hash = "sha256-21nTIYbIYlFWNJTxqsuijamqRunpdc7/VBawvrWadWI=";
|
||||
hash = "sha256-peyQQ1fc+0O1I9LztYSgk2VBC17Y3UlOZGR2WSYKVTk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -77,7 +77,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://pyxnat.github.io/pyxnat";
|
||||
description = "Python API to XNAT";
|
||||
mainProgram = "sessionmirror.py";
|
||||
changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${version}";
|
||||
changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${src.tag}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyzx";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zxcalc";
|
||||
repo = "pyzx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4yc4P2v2L/F/A1A9z41ow2KA0aUA+3SJyC+wyMWzhwM=";
|
||||
hash = "sha256-MhsbJIDeSIeF0LaHhI6nNxPD3ZjBWh5yvLGuwBH41a4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -62,7 +62,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Library for quantum circuit rewriting and optimisation using the ZX-calculus";
|
||||
homepage = "https://github.com/zxcalc/pyzx";
|
||||
changelog = "https://github.com/zxcalc/pyzx/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/zxcalc/pyzx/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rclone-python";
|
||||
version = "0.1.20";
|
||||
version = "0.1.21";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Johannes11833";
|
||||
repo = "rclone_python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TGSASkvlh4ku7gZ7JhKX5yEKgSZp5VDyNz962gG6Lk0=";
|
||||
hash = "sha256-lYrPSDBWGVQmT2/MgzbtZ6hHNZXINCmmFP+ZHFZQDw8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pythonOlder,
|
||||
requests,
|
||||
python-dateutil,
|
||||
langcodes,
|
||||
pgpy-dtc,
|
||||
validators,
|
||||
requests-mock,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sectxt";
|
||||
version = "0.9.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DigitalTrustCenter";
|
||||
repo = "sectxt";
|
||||
tag = version;
|
||||
hash = "sha256-49YxhcOpi1wofKMRuNxt8esBtfaSoBrGu+yBCRFWZYY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
python-dateutil
|
||||
langcodes
|
||||
pgpy-dtc
|
||||
validators
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"requests"
|
||||
"langcodes"
|
||||
"pgpy-dtc"
|
||||
"validators"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sectxt" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/DigitalTrustCenter/sectxt";
|
||||
changelog = "https://github.com/DigitalTrustCenter/sectxt/releases/tag/${src.tag}";
|
||||
description = "security.txt parser and validator";
|
||||
license = lib.licenses.eupl12;
|
||||
maintainers = with lib.maintainers; [ networkexception ];
|
||||
};
|
||||
}
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stravalib";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "stravalib";
|
||||
repo = "stravalib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VEVy9BAAoLsBCwMNFpsCjhacFbsgNswYoJ5tTcOQccw=";
|
||||
hash = "sha256-4T5/Sqni9DCE/sIyNCZA8FzFo7lRAsrF+2JP8ydSGqw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -46,11 +46,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "stravalib" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python library for interacting with Strava v3 REST API";
|
||||
homepage = "https://github.com/stravalib/stravalib";
|
||||
changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,22 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
jinja2,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
markdown-it-py,
|
||||
platformdirs,
|
||||
poetry-core,
|
||||
rich,
|
||||
typing-extensions,
|
||||
|
||||
# optional-dependencies
|
||||
tree-sitter,
|
||||
tree-sitter-languages,
|
||||
|
||||
# tests
|
||||
jinja2,
|
||||
pytest-aiohttp,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
rich,
|
||||
syrupy,
|
||||
time-machine,
|
||||
tree-sitter,
|
||||
tree-sitter-languages,
|
||||
typing-extensions,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -35,8 +42,8 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies =
|
||||
[
|
||||
platformdirs
|
||||
markdown-it-py
|
||||
platformdirs
|
||||
rich
|
||||
typing-extensions
|
||||
]
|
||||
@@ -59,15 +66,14 @@ buildPythonPackage rec {
|
||||
tree-sitter
|
||||
];
|
||||
|
||||
disabledTestPaths =
|
||||
[
|
||||
# Snapshot tests require syrupy<4
|
||||
"tests/snapshot_tests/test_snapshots.py"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# RuntimeError: There is no current event loop in thread 'MainThread'.
|
||||
"tests/test_focus.py"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# Snapshot tests require syrupy<4
|
||||
"tests/snapshot_tests/test_snapshots.py"
|
||||
|
||||
# Flaky: https://github.com/Textualize/textual/issues/5511
|
||||
# RuntimeError: There is no current event loop in thread 'MainThread'.
|
||||
"tests/test_focus.py"
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
@@ -101,6 +107,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/Textualize/textual";
|
||||
changelog = "https://github.com/Textualize/textual/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ gepbird ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gauge";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
patches = [
|
||||
# adds a check which adds an error message when trying to
|
||||
@@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
owner = "getgauge";
|
||||
repo = "gauge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CstlH7KOSUK3Oe5d8LyUswcebwusVv5iuB7gaZOKpVg=";
|
||||
hash = "sha256-oyZDz3SX68rlnAG+JzKeIKyKUjQ+ttTrzthHUwW0b54=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nqyzNbD2j6b34QpFiv2yVxEVkrZkuzcwAt9uqAB2iA4=";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire";
|
||||
version = "2.28.22";
|
||||
version = "2.28.23";
|
||||
|
||||
src =
|
||||
passthru.sources.${stdenv.hostPlatform.system}
|
||||
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "vZemxC5Vg916imzecW2Wa88nBO9NH8zMY0RFfRjKoF4=";
|
||||
sha256 = "rhcZZc77Y9zIYFbqDU9l+5vhQTSKs+tLzCEKLP6x/jo=";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "hTqeL5xLyd6QWk4aFH3k5/GBc4fsc4EHZ5PMpT9j24g=";
|
||||
sha256 = "Iqq7hBlO2XF2Sv0bdBXj93BQxHzayKJGAPDDB/peAW4=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "ARYJY5xDDzhatUWmyyjmewRV47hmNYgC5xlOdHBV0Po=";
|
||||
sha256 = "lzTuEMEtLTFrMeRhYinEUrxZA3+uI+cykHHpslR19kU=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "gqA40eKuDneFKAC1oCby9aE6iLGwO2VNjazkf0U+uzU=";
|
||||
sha256 = "rXSC16/bJfGATlhdN+DfhxDqBAUrtyHtM149if5fgxA=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "hgtQJtu3beRrcDuR8reX+82D/5n8XiRBOSmNtykf1RE=";
|
||||
sha256 = "NW2zlaT5+NdXxBuyt5iBd3AmjaNbd1ktCi7HtXh5MmI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user