Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
35885ddb23
|
|
@ -64,6 +64,12 @@
|
|||
githubId = 64707304;
|
||||
name = "Dmitry Kulikov";
|
||||
};
|
||||
_0x120581f = {
|
||||
email = "nixpkgs@0x120581f.dev";
|
||||
name = "0x120581f";
|
||||
github = "0x120581f";
|
||||
githubId = 130835755;
|
||||
};
|
||||
_0x4A6F = {
|
||||
email = "mail-maintainer@0x4A6F.dev";
|
||||
matrix = "@0x4a6f:matrix.org";
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ in
|
|||
description = "GNUnet";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ configFile ];
|
||||
restartTriggers = [ config.environment.etc."gnunet.conf".source ];
|
||||
path = [ cfg.package pkgs.miniupnpc ];
|
||||
serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf";
|
||||
serviceConfig.User = "gnunet";
|
||||
|
|
|
|||
|
|
@ -103,6 +103,10 @@ in
|
|||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
User = "go2rtc";
|
||||
SupplementaryGroups = [
|
||||
# for v4l2 devices
|
||||
"video"
|
||||
];
|
||||
StateDirectory = "go2rtc";
|
||||
ExecStart = "${cfg.package}/bin/go2rtc -config ${configFile}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, config ? { }
|
||||
, pkgs ? import ../../.. { inherit system config; }
|
||||
, lib ? pkgs.lib
|
||||
, kernelVersionsToTest ? [ "4.19" "5.4" "5.10" "5.15" "latest" ]
|
||||
, kernelVersionsToTest ? [ "4.19" "5.4" "5.10" "5.15" "6.1" "latest" ]
|
||||
}:
|
||||
|
||||
# For quickly running a test, the nixosTests.lvm2.lvm-thinpool-linux-latest attribute is recommended
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ kernelPackages ? null }:
|
||||
import ../make-test-python.nix ({ pkgs, ... }: {
|
||||
import ../make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "lvm2-thinpool";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ ajs124 ];
|
||||
|
||||
|
|
@ -17,11 +17,13 @@ import ../make-test-python.nix ({ pkgs, ... }: {
|
|||
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
testScript = let
|
||||
mkXfsFlags = lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.10") "-m bigtime=0 -m inobtcount=0";
|
||||
in ''
|
||||
machine.succeed("vgcreate test_vg /dev/vdb")
|
||||
machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool")
|
||||
machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg")
|
||||
machine.succeed("mkfs.xfs /dev/test_vg/test_lv")
|
||||
machine.succeed("mkfs.xfs ${mkXfsFlags} /dev/test_vg/test_lv")
|
||||
machine.succeed("mkdir /mnt; mount /dev/test_vg/test_lv /mnt")
|
||||
assert "/dev/mapper/test_vg-test_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip()
|
||||
machine.succeed("dd if=/dev/zero of=/mnt/empty.file bs=1M count=1024")
|
||||
|
|
|
|||
32
pkgs/applications/audio/brutefir/default.nix
Normal file
32
pkgs/applications/audio/brutefir/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, stdenv, fetchurl, alsa-lib, fftw, fftwFloat, flex, libjack2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brutefir";
|
||||
version = "1.0o";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://torger.se/anders/files/brutefir-${version}.tar.gz";
|
||||
sha256 = "caae4a933b53b55b29d6cb7e2803e20819f31def6d0e4e12f9a48351e6dbbe9f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
fftw
|
||||
fftwFloat
|
||||
libjack2
|
||||
];
|
||||
|
||||
postPatch = "substituteInPlace bfconf.c --replace /usr/local $out";
|
||||
|
||||
installFlags = [ "INSTALL_PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://torger.se/anders/brutefir.html";
|
||||
description = "A software convolution engine";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ auchter ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.13";
|
||||
version = "10.14";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${
|
||||
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
|
||||
sha256 = "sha256-r+Xjp5q7ehrF34j1FndiKZ+y+FTG1ORXS+9p+R2KbOQ=";
|
||||
sha256 = "sha256-AsWBcEVyHAFzJd9PhbEA866yCGAmgJedvDUP1G7JfUY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "erigon";
|
||||
version = "2.43.0";
|
||||
version = "2.45.1";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -11,11 +11,11 @@ buildGoModule {
|
|||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3o7vu2bA8lB1CiVaSF6YU9WjwNliQAK5AcGl82GCqFg=";
|
||||
sha256 = "sha256-uaEGshpAmCXIIcpN5Fx/VNUK8DgQp9yFm2xBDGz7FNo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-JhMefeUxo9ksyCnNsLgAhGG0Ix7kxCA/cYyiELd0H64=";
|
||||
vendorSha256 = "sha256-Yd78OW48HsOgxT5R3QT6/xDzPsRNFRE2nKocljTKKBA=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "regreet";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rharish101";
|
||||
repo = "ReGreet";
|
||||
rev = version;
|
||||
hash = "sha256-9Wae2sYiRpWYXdBKsSNKhG5RhIun/Ro9xIV4yl1/pUc=";
|
||||
hash = "sha256-MPLlHYTfDyL2Uy50A4lVke9SblXCErgJ24SP3kFuIPw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yDfUD5Uag3UM/2Q7ofvh6iGcB3n21m1gKo7SKqTWamc=";
|
||||
cargoHash = "sha256-dR6veXCGVMr5TbCvP0EqyQKTG2XM65VHF9U2nRWyzfA=";
|
||||
|
||||
buildFeatures = [ "gtk4_8" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip
|
||||
, appimage-run, nix-update-script }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ldtk";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
|
||||
hash = "sha256-8GiMm1Nb2jRLFWtGNsSfrW1jIi9yKCcyuUKwMEqoUZI=";
|
||||
url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip";
|
||||
hash = "sha256-egvAe4nAzPDBeTaAzrqhlDsG60bGNnKXB5Vt16vIZrQ";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preUnpack
|
||||
|
||||
unzip $src
|
||||
appimage-run -x src 'LDtk ${version} installer.AppImage'
|
||||
appimage-run -x src 'LDtk ${finalAttrs.version} installer.AppImage'
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 'LDtk ${version} installer.AppImage' $out/share/ldtk.AppImage
|
||||
install -Dm644 'LDtk ${finalAttrs.version} installer.AppImage' $out/share/ldtk.AppImage
|
||||
makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \
|
||||
--add-flags $out/share/ldtk.AppImage
|
||||
install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png
|
||||
|
|
@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Modern, lightweight and efficient 2D level editor";
|
||||
homepage = "https://ldtk.io/";
|
||||
changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}";
|
||||
changelog = "https://github.com/deepnight/ldtk/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ felschr ];
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0kir1grd150gb7im6yx2l16hi43wwsi8q3dlpgah4m7na064xgyd";
|
||||
x86_64-darwin = "1fw73483ja4zav8xd0j03ygib5zbviy3kd02jzmgbbbsac5li96m";
|
||||
aarch64-linux = "1w0dxpvrj06m1d15q45xi4sl4g3fk0nf04vh2ar956lg67dqj7i6";
|
||||
aarch64-darwin = "0i5vj3km6wkdc2mrks2rjbqbn1isg4l4ss6zs7qfra3zcj62bkc2";
|
||||
armv7l-linux = "1jx8cz43ac35as414mxsj9abpkr4a7v10fg1msjy2ykcrzv9v3dr";
|
||||
x86_64-linux = "13yd42jqlzjxg5afs05ph2z4xwsfkbcddqvc4fvz1qqwr698mkjj";
|
||||
x86_64-darwin = "1slmqrxhrwm04v0lisc200mx6jv86vf5p62as4brzz9irnv707ry";
|
||||
aarch64-linux = "1q99y9jx3c8z0l3pda0b79c50yff8as4z9c4dxwf7b67argi5ls6";
|
||||
aarch64-darwin = "0ykb0ifkswv3rcp3x6rkm8r88flsfmwhlrlc4f55mbgj7jbfn5k3";
|
||||
armv7l-linux = "0gshhing3drsrmf17jykafks7z587ixk63xinrdv62xl4x4qxca8";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.78.2";
|
||||
version = "1.79.0";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
38
pkgs/applications/misc/genesys/default.nix
Normal file
38
pkgs/applications/misc/genesys/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib, stdenv, fetchurl, jre, graphviz, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "genesys";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mrlem/genesys/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-I1lEVvwRiGf1f4zUtqKhSb+it/nC8WAmw5S6edquOj8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# The package is distributed as a prebuilt JAVA binary
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
mv bin lib $out
|
||||
wrapProgram $out/bin/${finalAttrs.pname} \
|
||||
--set JAVA_HOME "${jre.home}" \
|
||||
--prefix PATH : "${graphviz}/bin"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A simple family tree generator that scales";
|
||||
homepage = "https://github.com/mrlem/genesys";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ rogarb ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
34
pkgs/applications/misc/nwg-dock-hyprland/default.nix
Normal file
34
pkgs/applications/misc/nwg-dock-hyprland/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, gtk-layer-shell
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-dock-hyprland";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7vdfxE3X2J7bDLzose0dKmjxNQhS5+/ROky9wkK1gc0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ gtk-layer-shell ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GTK3-based dock for Hyprland";
|
||||
homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -3,10 +3,10 @@
|
|||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "114.0";
|
||||
version = "114.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "c6929d34583f25119738d1c817a24fd358fcada1f0ba5c14bab07c2acd35f18a012f23d054bfe8c6b12c0dda7bd3abdc7a305a36c7a4d36542885abeea3aafec";
|
||||
sha512 = "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ let
|
|||
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "12.0.6";
|
||||
version = "12.0.7";
|
||||
|
||||
lang = "ALL";
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
hash = "sha256-MLy/T8A+udasITWYSzaqXSFhA3PJsG7DnKJG0b9UYvA=";
|
||||
hash = "sha256-lo+Iy6I7S1NV1E9CBPqJjRFzuEXGC80NRUUlpZfG5wU=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
|
@ -111,7 +111,7 @@ let
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
hash = "sha256-njJB5k7rQxRyL7foU8fLCQxy43dJvV26oKvQ+fw6U0o=";
|
||||
hash = "sha256-aLHZUFDZZ4i7BXoM5YxPrznYw812/OGmhG97t9okOvs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -469,7 +469,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.torproject.org/";
|
||||
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
|
||||
platforms = attrNames sources;
|
||||
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ];
|
||||
maintainers = with maintainers; [ felschr panicgh joachifm hax404 ];
|
||||
mainProgram = "tor-browser";
|
||||
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
||||
# the compound is "libre" in a strict sense (some components place certain
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aiac";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
excludedPackages = [".ci"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gofireflyio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C9eQdN8S8Qe0x+Uly69nbYNXDKpi1uZ6qNBetn2P4Gk=";
|
||||
hash = "sha256-BCcoMftnvfAqmabnSz/oRAlJg95KJ236mduxV2DfRG4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Uqr9wH7hCLdZEu6DXddgB7NuLtqcjUbOPJ2YX+9ehKM=";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-80AmGc3SdniKayvviVoItrj8v+3m1sAJXSjoRJzw7mE=";
|
||||
sha256 = "sha256-pti52JlnIxinKg2DxNfLewoJuhMohsAVmHgvR2N5shg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-K4/sIHWVe1Wj8LJgrqfoOg1hHXvH3HEgU5vq82tzMSk=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeconform";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yannh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-98wSFntt5ERbQ7URMlRz3iMTuL1beuX2nXbdWe+6Quw=";
|
||||
sha256 = "sha256-TPT+zO5WHW/D04dLMJLJ7uAYoDLky75kWqaN7PsyzEo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -363,11 +363,11 @@
|
|||
"vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-wWGqEwo8dMD+2UeaHSzoo+uXrsHNZRDrGhgneACScPM=",
|
||||
"hash": "sha256-DD6CkdZ9KCCkPCgPyWXaAvHfHyn9rYXRsXg9BVJkELM=",
|
||||
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
|
||||
"owner": "exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.48.0",
|
||||
"rev": "v0.49.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -620,11 +620,11 @@
|
|||
"vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y="
|
||||
},
|
||||
"keycloak": {
|
||||
"hash": "sha256-557IxT6Zpfig7XLpWG0DahsWsgnTD7XAlIgU9CmQH5c=",
|
||||
"hash": "sha256-itnXalLx5Bku7sxM5wKJs2vCvDeJnhR1bQ55ye1tpKs=",
|
||||
"homepage": "https://registry.terraform.io/providers/mrparkers/keycloak",
|
||||
"owner": "mrparkers",
|
||||
"repo": "terraform-provider-keycloak",
|
||||
"rev": "v4.3.0",
|
||||
"rev": "v4.3.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-GhmawLENmRuG5ZbXEZAw8pYmHn2SN2ONzfSIVEyN4U4="
|
||||
},
|
||||
|
|
@ -764,11 +764,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-Dz+aVO6RpGcgo9LCPHFdYCiJ3ja+ftJFii5wWQm0/jc=",
|
||||
"hash": "sha256-Qm5rMgJ4SN3gmhoMaDDcXg75r7mYHavQzoiscsUk6Vk=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.24.0",
|
||||
"rev": "v3.24.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8="
|
||||
},
|
||||
|
|
@ -927,11 +927,11 @@
|
|||
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
|
||||
},
|
||||
"rancher2": {
|
||||
"hash": "sha256-UDVKmOON190eQzGrxzVtq7gDYeKBBM1nnL2ujU1wDo8=",
|
||||
"hash": "sha256-tkr1zqHeIMrselvnlv+n7kTM89T7zYW82UeQPucG50I=",
|
||||
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
|
||||
"owner": "rancher",
|
||||
"repo": "terraform-provider-rancher2",
|
||||
"rev": "v3.0.0",
|
||||
"rev": "v3.0.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc="
|
||||
},
|
||||
|
|
@ -981,13 +981,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"selectel": {
|
||||
"hash": "sha256-gZiDFcrQZsOE0R74LYwoitAjuPqPZCPLTEL3giom+c8=",
|
||||
"hash": "sha256-Mpf7BcT7uRqqDNHk+IqfjIuRgrzMMcGn71exKBbymd8=",
|
||||
"homepage": "https://registry.terraform.io/providers/selectel/selectel",
|
||||
"owner": "selectel",
|
||||
"repo": "terraform-provider-selectel",
|
||||
"rev": "v3.9.1",
|
||||
"rev": "v3.10.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-+Duf/wdjmw6NBhmy1KmNRJ+ZEjjwtJoXXQCw2lJzxS4="
|
||||
"vendorHash": "sha256-mIIp9+jGfCEe2HFdlARVFldNYBNPTRP8s/G0/URgxVA="
|
||||
},
|
||||
"sentry": {
|
||||
"hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=",
|
||||
|
|
|
|||
|
|
@ -94,6 +94,15 @@ stdenv.mkDerivation rec {
|
|||
url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
|
||||
hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
|
||||
})
|
||||
# Bring custom xdg-activation implementation back
|
||||
# Fixes https://github.com/telegramdesktop/tdesktop/issues/2635: TG desktop doen't open links
|
||||
# https://github.com/desktop-app/lib_base/pull/180
|
||||
(fetchpatch {
|
||||
url = "https://github.com/desktop-app/lib_base/commit/6041498fbafcd0a22df88b7973d9e8f9bdf16958.patch";
|
||||
extraPrefix = "Telegram/lib_base/";
|
||||
stripLen = 1;
|
||||
hash = "sha256-9IV1T/tjN2VA7wcpbt2GRpOMC76yOzRlGWuIAa8HTX0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "netmaker";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pzU9MiUL5M7EkGIXjZ0VqJmk4qOlbgCLCg84iPIXG70=";
|
||||
hash = "sha256-1h/UQXaLcc962IMw9Vt79GR0qx1rYcmy5E+duisi0ck=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-euqQztEUEejCWy7WqtzMEIZrBDZpD/6dqnFsYhXajdE=";
|
||||
vendorHash = "sha256-0iByCr//nOaEjfGT2alxZpzSl57x2GxXAOIiza4gnGQ=";
|
||||
|
||||
inherit subPackages;
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
assert withQt -> qt6 != null;
|
||||
|
||||
let
|
||||
version = "4.0.5";
|
||||
version = "4.0.6";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation {
|
|||
repo = "wireshark";
|
||||
owner = "wireshark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9U0V2oLVyzq+3HxvOuD8Uzj1tjoMtYBws43fn5RfGhQ=";
|
||||
hash = "sha256-hQpnD1BWOdb1YuG2BaQI+q1EkkTF1Du/HezrYr/Fl7w=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sniffnet";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gyulyvgc";
|
||||
repo = "sniffnet";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hZK+lLH9fCEvujLuvAqkVVmRCRM9DfhCUv7JbirTIu4=";
|
||||
hash = "sha256-IJfXQ/d1amm6rCdArWoHXFhN9s//7hYoWMt66mv4Bbw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hAxIS9gc5EBDy00U1JSnLZYifCzJAEcwhaalzrUjT9M=";
|
||||
cargoHash = "sha256-FMpTHm8eEXnVfMMY1iUkJPnRRK10u9l8tCaemM6L1gE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "chirp";
|
||||
version = "unstable-2023-03-15";
|
||||
version = "unstable-2023-06-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "33402b7c545c5a92b7042369867e7eb75ef32a59";
|
||||
hash = "sha256-duSEpd2GBBskoKNFos5X9wFtsjRct1918VhZd1T2rvU=";
|
||||
rev = "72789c3652c332dc68ba694f8f8f005913fe5c95";
|
||||
hash = "sha256-WQwCX7h9BFLdYOBVVntxQ6g4t3j7QLfNmlHVLzlRh7U=";
|
||||
};
|
||||
buildInputs = [
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-oauth";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hickford";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f12PgTtfs/S9RI8+QFROkNqccRWeIW1/YkynqvKJc7I=";
|
||||
hash = "sha256-t1P20BDNQ0aJRgQhOgYP2Md44+I8xs6884ktBO4nGjY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-9X7ti3NR5MKK0MpiyTOTO+EtdMuu4/TW/diHq9FjSHY=";
|
||||
vendorHash = "sha256-oHusgU5SMkFDY2dhFRdDonyYkyOBGOp+zqx2nFmOWXk=";
|
||||
|
||||
meta = {
|
||||
description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, makeWrapper
|
||||
, git
|
||||
, bash
|
||||
, coreutils
|
||||
, gitea
|
||||
, gzip
|
||||
, openssh
|
||||
|
|
@ -34,7 +35,7 @@ buildGoModule rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace modules/setting/setting.go --subst-var data
|
||||
substituteInPlace modules/setting/server.go --subst-var data
|
||||
'';
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
|
@ -62,7 +63,7 @@ buildGoModule rec {
|
|||
cp -R ./options/locale $out/locale
|
||||
|
||||
wrapProgram $out/bin/gitea \
|
||||
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ bash coreutils git gzip openssh ]}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar";
|
||||
hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "filebot";
|
||||
version = "5.0.2";
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
hash = "sha256-XnzBXZy/gNA8qf7XairoviRmdQiXHbW19BgbHL52SP0=";
|
||||
url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz";
|
||||
hash = "sha256-8FTmR+ztR2ugPcgHvfwyh9yfxPiUJdeAVvjjl5cQCy0=";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvf $src";
|
||||
|
|
@ -68,4 +68,4 @@ in stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ gleber felschr ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,31 +9,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gvisor";
|
||||
version = "20230529.0";
|
||||
version = "20221102.1";
|
||||
|
||||
# gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
|
||||
# that can be used to build gvisor without bazel.
|
||||
#
|
||||
# For updates, you should stick to the commits labeled "Merge release-** (automated)"
|
||||
# Make sure to check that the tagged commit for a release aligns with the version in
|
||||
# the message for good measure; e.g. the commit
|
||||
#
|
||||
# 142d38d770a07291877dc0d50b88b719dbef76dc is "Merge release-20230522.0-11-g919cfd12b (automated)"
|
||||
#
|
||||
# on the 'go' branch. But the mentioned commit, 919cfd12b..., is actually tagged as release-20230529.0
|
||||
#
|
||||
# https://github.com/google/gvisor/releases/tag/release-202329.0
|
||||
#
|
||||
# Presumably this is a result of the release process. Handle with care.
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "gvisor";
|
||||
rev = "142d38d770a07291877dc0d50b88b719dbef76dc";
|
||||
hash = "sha256-Ukcjlz/6iUmDAUpQpIVfZHKbwK90Mt6fukcFaw64hQI=";
|
||||
rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff";
|
||||
sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-COr47mZ4tsbzMjkv63l+fexo0RL5lrBXeewak9CuZVk=";
|
||||
vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unscii";
|
||||
version = "1.1";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
|
||||
sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
|
||||
url = "http://viznut.fi/${pname}/${pname}-${version}-src.tar.gz";
|
||||
sha256 = "0msvqrq7x36p76a2n5bzkadh95z954ayqa08wxd017g4jpa1a4jd";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
|
|||
# version. The reduced version is public domain.
|
||||
license = "http://unifoundry.com/LICENSE.txt";
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
homepage = "http://pelulamu.net/unscii/";
|
||||
homepage = "http://viznut.fi/unscii/";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ llvmPackages
|
||||
{ stdenv
|
||||
, llvmPackages
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
|
||||
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halide";
|
||||
version = "15.0.1";
|
||||
|
||||
|
|
@ -24,7 +25,15 @@ llvmPackages.stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-mnZ6QMqDr48bH2W+andGZj2EhajXKApjuW6B50xtzx0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" "-DTARGET_WEBASSEMBLY=OFF" ];
|
||||
cmakeFlags = [
|
||||
"-DWARNINGS_AS_ERRORS=OFF"
|
||||
"-DWITH_PYTHON_BINDINGS=OFF"
|
||||
"-DTARGET_WEBASSEMBLY=OFF"
|
||||
# Disable performance tests since they may fail on busy machines
|
||||
"-DWITH_TEST_PERFORMANCE=OFF"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Note: only openblas and not atlas part of this Nix expression
|
||||
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
|
||||
|
|
|
|||
|
|
@ -24,24 +24,24 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-AMYURm75gJwusjSA440ZaixXf/8nMMT4PRNbkT1HM1k=";
|
||||
hash = "sha256-zeFKWPiZJR8wz87YcFVib0SEV4Blnr6NUMvExnsxmXw=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
|
||||
hash = "sha256-ChQxW1Os2X8i0m1Kj9LCN+Uk6Vw77JjS14tU2Awrw2Q=";
|
||||
hash = "sha256-tkPM0+Kllg985wVSQ3Q9Cjm63aOXS849d4Yd02O63RA=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz";
|
||||
hash = "sha256-ALxMJ+6xvr01BZcxL/CRkXYxX9MZnGPslj+0HjsEv68=";
|
||||
hash = "sha256-STaN2u9ON+1gaAimyli6DxpEUaJ7ggGu1NnXskwnaBc=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz";
|
||||
hash = "sha256-U+YncKaZDVqJ56AB72iqJd4lEmo76DggDEyacF2uo3w=";
|
||||
hash = "sha256-nj4CymVGUT3OJlN5q+lXyytbDM9AZiGUhtoOuHLdzrw=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
hash = "sha256-Ii61M8ncVHNJSes6QWn1Su+hvCC+OF/Bz3mMghn+ZAA=";
|
||||
hash = "sha256-oTznFrY9PkbZEIOV4f/Iod5xLmqEimA6xZK88IDqATk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "25.3.2.1";
|
||||
sha256 = "4PDK18/tekJHgNGECG5hv/HvwvteR+FeN6hlpB9FC9o=";
|
||||
version = "25.3.2.2";
|
||||
sha256 = "TeDszsF9X4ExnOfP20ujlJpfxKK1zwhHHnPAbSnm/YQ=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.0.28";
|
||||
hash = "sha256-nV50k1yQDjuce2vHQFlrcZM2MOufY3F8DEkj2MeIxi4=";
|
||||
version = "8.0.29";
|
||||
hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ callPackage, lib, stdenv, ... }@_args:
|
||||
{ callPackage, ... }@_args:
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.19";
|
||||
hash = "sha256-ZCByB/2jC+kmou8fZv8ma/H9x+AzObyZ+7oKEkXkJ5s=";
|
||||
version = "8.1.20";
|
||||
hash = "sha256-VVeFh1FKJwdQD4UxnlfA1N+biAPNsmVmWVrEv0WdxN0=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ callPackage, lib, stdenv, fetchurl, ... }@_args:
|
||||
{ callPackage, ... }@_args:
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.6";
|
||||
hash = "sha256-RKcMUvU3ZiwQ2R7tv1H9dlyZYb5rolCO1jv3omzdMQA=";
|
||||
version = "8.2.7";
|
||||
hash = "sha256-W/sqNcZ5Ib3K3VyQyykK11N9JNoROl6LwtZGsC3nSI8=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -57,10 +57,10 @@ in {
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "8";
|
||||
patch = "16";
|
||||
patch = "17";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI=";
|
||||
hash = "sha256-LlSwxoGR8WVS9t4ul6I5ZUBXKiGfa7soWRoTfOzEkKk=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
@ -70,10 +70,10 @@ in {
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "9";
|
||||
patch = "16";
|
||||
patch = "17";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-It3cCZJG3SdgZlVh6K23OU6gzEOnJoTGSA+TgPd4ZDk=";
|
||||
hash = "sha256-MM4FfETyg/jtk2Bsy9uNUd1Sa9xMYszl4Nwhe/o+jO4=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
@ -96,9 +96,9 @@ in {
|
|||
major = "3";
|
||||
minor = "12";
|
||||
patch = "0";
|
||||
suffix = "b1";
|
||||
suffix = "b2";
|
||||
};
|
||||
hash = "sha256-i6dspkrNdFur37hGeCCWTfmIWO5qlXe/HZNEcle+WB4=";
|
||||
hash = "sha256-jfxC3abk0GR8+Kb3zZAHBN6p/YZkAqKCgpvS5uJxuBg=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,15 +32,15 @@ in {
|
|||
# This patch is the merged commit from the above PR.
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-19876.patch";
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
|
||||
sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1";
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
|
||||
hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ=";
|
||||
})
|
||||
|
||||
# Fix PDF output.
|
||||
# https://gitlab.freedesktop.org/cairo/cairo/issues/342
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch";
|
||||
sha256 = "yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o=";
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch";
|
||||
hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o=";
|
||||
})
|
||||
|
||||
# Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364.
|
||||
|
|
@ -49,8 +49,8 @@ in {
|
|||
(fetchpatch {
|
||||
name = "CVE-2020-35492.patch";
|
||||
includes = [ "src/cairo-image-compositor.c" ];
|
||||
url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch";
|
||||
sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki";
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch";
|
||||
hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE=";
|
||||
})
|
||||
|
||||
# Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121
|
||||
|
|
@ -60,7 +60,7 @@ in {
|
|||
# Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff";
|
||||
sha256 = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s=";
|
||||
hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s=";
|
||||
})
|
||||
|
||||
# Fix clang build failures on newer LLVM versions
|
||||
|
|
@ -68,7 +68,7 @@ in {
|
|||
(fetchpatch {
|
||||
name = "fix-types.patch";
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch";
|
||||
sha256 = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo=";
|
||||
hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo=";
|
||||
})
|
||||
|
||||
# Fix unexpected color addition on grayscale images (usually text).
|
||||
|
|
@ -77,7 +77,7 @@ in {
|
|||
(fetchpatch {
|
||||
name = "fix-grayscale-anialias.patch";
|
||||
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff";
|
||||
sha256 = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM=";
|
||||
hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM=";
|
||||
})
|
||||
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone-cloud";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Noltari";
|
||||
repo = "aioairzone-cloud";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IkV0gwsd/87GZ9LSQu6azQuoxPXuKNbjZMekVKxAl/A=";
|
||||
hash = "sha256-VuUvutotxkC0Xur7kBBTwjzE+F1I3JSydcHkjrpbeUg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-98VoRo3gxS70M/R0HYEK5VItJWcwMi8Z3r2eJ5lEeMw=";
|
||||
hash = "sha256-Q5pz/irC+yA/A2GhGCug+jmxr4tCnPpkAV/AZEhd64A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,32 +1,49 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, pytest-runner
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, coverage, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "diceware";
|
||||
version = "0.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ coverage pytest ];
|
||||
|
||||
# see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733
|
||||
checkPhase = ''
|
||||
py.test -m 'not packaging'
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest_runner'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733
|
||||
"-m 'not packaging'"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"diceware"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generates passphrases by concatenating words randomly picked from wordlists";
|
||||
homepage = "https://github.com/ulif/diceware";
|
||||
changelog = "https://github.com/ulif/diceware/blob/v${version}/CHANGES.rst";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ asymmetric ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "0.54.3";
|
||||
version = "0.55.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xkLqZmAzYfmfv9l1+PR8j5S7O5gKVh63+Jb9aZiLS8s=";
|
||||
hash = "sha256-eE1cVzhwyClVYmaotw37sG46g5W1ToUE/f3pZ2CCcE0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dV6ob+TXzQOuHU9bybAO8sVmrJ7yP8vwp0pXXFVNb34=";
|
||||
hash = "sha256-zr8fLRwan1/G8RMHa6lf4Qa5fTh5DzVLO53PMW0fm4c=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "elkm1-lib";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "gwww";
|
||||
repo = "elkm1";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-z/ltpypCGJ3ORHOlLjicKlqIoxqGzVt588OHmNO65bg=";
|
||||
hash = "sha256-d676gLABChQn67E4q4koxwBRmurBWuFxSo/u+W5F8CI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tbNatosXt+KV1K3bvdz8lY73Yx/ClJcxUWHiPetp5wM=";
|
||||
hash = "sha256-S2gU16kO8QVdhgjsfIeuv0ypcYSjWOFaVFGJdQsdijg=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -1,28 +1,43 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, fonttools, setuptools-scm
|
||||
, pytest, pytest-runner
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fonttools
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fontMath";
|
||||
pname = "fontmath";
|
||||
version = "0.9.3";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "fontMath";
|
||||
inherit version;
|
||||
hash = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ fonttools ];
|
||||
nativeCheckInputs = [ pytest pytest-runner ];
|
||||
propagatedBuildInputs = [
|
||||
fonttools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of objects that implement fast font, glyph, etc. math";
|
||||
homepage = "https://github.com/robotools/fontMath/";
|
||||
changelog = "https://github.com/robotools/fontMath/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
maintainers = with maintainers; [ sternenseemann ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
39
pkgs/development/python-modules/frida-python/default.nix
Normal file
39
pkgs/development/python-modules/frida-python/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, typing-extensions }:
|
||||
let
|
||||
version = "16.0.19";
|
||||
devkit = fetchurl {
|
||||
url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz";
|
||||
hash = "sha256-yNXNqv8eCbpdQKFShpAh6rUCEuItrOSNNLOjESimPdk=";
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "frida-python";
|
||||
inherit version;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "frida";
|
||||
inherit version;
|
||||
hash = "sha256-rikIjjn9wA8VL/St/2JJTcueimn+q/URbt9lw/+nalY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
mkdir assets
|
||||
pushd assets
|
||||
tar xvf ${devkit}
|
||||
export FRIDA_CORE_DEVKIT=$PWD
|
||||
popd
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ typing-extensions ];
|
||||
|
||||
pythonImportsCheck = [ "frida" ];
|
||||
|
||||
passthru = { inherit devkit; };
|
||||
|
||||
meta = {
|
||||
description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (Python bindings)";
|
||||
homepage = "https://www.frida.re";
|
||||
license = lib.licenses.wxWindows;
|
||||
maintainers = with lib.maintainers; [ s1341 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +1,49 @@
|
|||
{ lib, buildPythonPackage, fetchPypi,
|
||||
six, pytest, pytest-runner, pytest-cov, coverage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libais";
|
||||
version = "0.17";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0pyka09h8nb0vlzh14npq4nxmzg1046lr3klgn97dsf5k0iflapb";
|
||||
hash = "sha256-6yrqIpjF6XaSfXSOTA0B4f3aLcHXkgA/3WBZBBNQ018=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# data files missing
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
pythonImportsCheck = [
|
||||
"ais"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/schwehr/libais";
|
||||
description = "Library for decoding maritime Automatic Identification System messages";
|
||||
homepage = "https://github.com/schwehr/libais";
|
||||
changelog = "https://github.com/schwehr/libais/blob/master/Changelog.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,26 +2,38 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pytest-runner
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwparserfromhell";
|
||||
version = "0.6.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mwparserfromhell"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MWParserFromHell is a parser for MediaWiki wikicode";
|
||||
homepage = "https://mwparserfromhell.readthedocs.io/en/latest/";
|
||||
homepage = "https://mwparserfromhell.readthedocs.io/";
|
||||
changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,21 +1,43 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, watchdog, flake8
|
||||
, pytest, pytest-runner, coverage, sphinx, twine }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
, watchdog
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ndjson";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
|
||||
hash = "sha256-v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner', " ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
six
|
||||
watchdog
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ndjson"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module supports ndjson";
|
||||
homepage = "https://github.com/rhgrant10/ndjson";
|
||||
description = "JsonDecoder";
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://github.com/rhgrant10/ndjson/blob/v${version}/HISTORY.rst";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,16 +15,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdm-backend";
|
||||
version = "2.0.7";
|
||||
version = "2.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdm-project";
|
||||
repo = "pdm-backend";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+d5EkpF9rZksoR5lahN7XE/jAQpNz7IjWueFYPPGyQs=";
|
||||
hash = "sha256-asW5L9jS++9ovq7WFh0rU7aB7R2rwi5ce80Hxk9NrI4=";
|
||||
};
|
||||
|
||||
env.PDM_BUILD_SCM_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
|
@ -40,6 +42,10 @@ buildPythonPackage rec {
|
|||
setuptools
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
unset PDM_BUILD_SCM_VERSION
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policyuniverse";
|
||||
version = "1.5.1.20230526";
|
||||
version = "1.5.1.20230608";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-80Q1qkCAD3VwNk0pblPWni3qY/8Dc2YrOLDjPrg/2Os=";
|
||||
hash = "sha256-q0Btbo5jznv3mUXh5SjVU7SmdxFpPkiVe/ZNY+lzUCg=";
|
||||
};
|
||||
|
||||
# Tests are not shipped and there are no GitHub tags
|
||||
|
|
|
|||
|
|
@ -1,45 +1,50 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, lib
|
||||
, morphys
|
||||
, pytest
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, python-baseconv
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "py-multibase";
|
||||
version = "1.0.3";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version ;
|
||||
sha256 = "d28a20efcbb61eec28f55827a0bf329c7cea80fffd933aecaea6ae8431267fe4";
|
||||
inherit pname version;
|
||||
hash = "sha256-0oog78u2Huwo9VgnoL8ynHzqgP/9kzrsrqauhDEmf+Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "[pytest]" ""
|
||||
substituteInPlace setup.cfg --replace "python_classes = *TestCase" ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "[pytest]" "" \
|
||||
--replace "python_classes = *TestCase" ""
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
morphys
|
||||
six
|
||||
python-baseconv
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"multibase"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multibase is a protocol for distinguishing base encodings and other simple string encodings";
|
||||
description = "Module for distinguishing base encodings and other simple string encodings";
|
||||
homepage = "https://github.com/multiformats/py-multibase";
|
||||
changelog = "https://github.com/multiformats/py-multibase/blob/v${version}/HISTORY.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rakesh4g ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-runner
|
||||
, morphys
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, morphys
|
||||
, six
|
||||
, varint
|
||||
}:
|
||||
|
|
@ -12,36 +11,39 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "py-multicodec";
|
||||
version = "0.2.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "multiformats";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4=";
|
||||
};
|
||||
|
||||
# Error when not substituting:
|
||||
# Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "[pytest]" "[tool:pytest]"
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
varint
|
||||
six
|
||||
morphys
|
||||
six
|
||||
varint
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "multicodec" ];
|
||||
pythonImportsCheck = [
|
||||
"multicodec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compact self-describing codecs";
|
||||
|
|
|
|||
|
|
@ -1,34 +1,42 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, callPackage
|
||||
, pytest-cov
|
||||
, fetchPypi
|
||||
, lib
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytest-runner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycategories";
|
||||
version = "1.2.0";
|
||||
disabled = pythonOlder "3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099";
|
||||
hash = "sha256-vXDstelOdlnlZOoVPwx2cykdw3xSbCRoAPwI1sU3gJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov-report term --cov=categories" ""
|
||||
'';
|
||||
|
||||
# Is private because the author states it's unmaintained
|
||||
# and shouldn't be used in production code
|
||||
propagatedBuildInputs = [ (callPackage ./infix.nix { }) ];
|
||||
|
||||
nativeCheckInputs = [ pytest pytest-cov ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/danielhones/pycategories";
|
||||
description = "Implementation of some concepts from category theory";
|
||||
homepage = "https://gitlab.com/danielhones/pycategories";
|
||||
changelog = "https://gitlab.com/danielhones/pycategories/-/blob/v${version}/CHANGELOG.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dmvianna ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyschlage";
|
||||
version = "2023.5.0";
|
||||
version = "2023.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "dknowles2";
|
||||
repo = "pyschlage";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-l9Xi1VffvobSjluParvQjCTsCMWvhSV975j1OVclBWw=";
|
||||
hash = "sha256-ogYVk0Kvv595IlIa/qdV1lqlnW45IG29PX5EEaMaphw=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,30 +1,43 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pytest-runner
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysrim";
|
||||
version = "0.5.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8";
|
||||
hash = "sha256-raCI9z9+GjvwhSBugeD4PticHQsjp4ns0LoKJQckrug=";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest-runner ];
|
||||
propagatedBuildInputs = [ numpy pyyaml ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner', " ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pyyaml
|
||||
];
|
||||
|
||||
# Tests require git lfs download of repository
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
# pythonImportsCheck does not work
|
||||
# TypeError: load() missing 1 required positional argument: 'Loader'
|
||||
|
||||
meta = with lib; {
|
||||
description = "Srim Automation of Tasks via Python";
|
||||
homepage = "https://gitlab.com/costrouc/pysrim";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ costrouc ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.23.4";
|
||||
version = "0.23.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8rcttFo1kkx0JfySjcKchlPc0RjutF6MuA/DVSpclKo=";
|
||||
hash = "sha256-5WgCVdmEhFrKYT7Uflnjv6OIISk//VH2aoxVwlWuPTk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.10.1";
|
||||
version = "4.10.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DJxfr4pQna+up5XYi4zs66oTuHzLVz0bEuql6mW2e70=";
|
||||
hash = "sha256-q54TLmPVo7dz9IkTZfz2qk13TQkMIopWhxlPac0IBGA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.5.16";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FyrTZqp4h4GOCxld+y3wDEfLOl6a6dCgs/LJetjmr8I=";
|
||||
hash = "sha256-fDtZEcHv13f9WtNZKoT8/I+Hz145n7SmQz0t9CVqE3g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
52
pkgs/development/python-modules/sensirion-ble/default.nix
Normal file
52
pkgs/development/python-modules/sensirion-ble/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, bluetooth-data-tools
|
||||
, bluetooth-sensor-state-data
|
||||
, home-assistant-bluetooth
|
||||
, sensor-state-data
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensirion-ble";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akx";
|
||||
repo = "sensirion-ble";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7l76/Bci1ztt2CfwytLOySK6IL8IDijpB0AYhksRP7o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=sensirion_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-data-tools
|
||||
bluetooth-sensor-state-data
|
||||
home-assistant-bluetooth
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sensirion_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parser for Sensirion BLE devices";
|
||||
homepage = "https://github.com/akx/sensirion-ble";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,39 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, six, pytest, pytest-runner }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srptools";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7fa4337256a1542e8f5bb4bed19e1d9aea98fe5ff9baf76693342a1dd6ac7c96";
|
||||
hash = "sha256-f6QzclahVC6PW7S+0Z4dmuqY/l/5uvdmkzQqHdasfJY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytest pytest-runner ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"srptools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python-Tools to implement Secure Remote Password (SRP) authentication";
|
||||
description = "Module to implement Secure Remote Password (SRP) authentication";
|
||||
homepage = "https://github.com/idlesign/srptools";
|
||||
changelog = "https://github.com/idlesign/srptools/blob/v${version}/CHANGELOG";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
|
||||
, colorama, regex
|
||||
, pytest-runner, pytestCheckHook, pytest-mypy
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, pytest-mypy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, regex
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tatsu";
|
||||
version = "5.8.3";
|
||||
# upstream only supports 3.10+
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -16,11 +22,19 @@ buildPythonPackage rec {
|
|||
hash = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
propagatedBuildInputs = [ colorama regex ];
|
||||
nativeCheckInputs = [ pytestCheckHook pytest-mypy ];
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
regex
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tatsu" ];
|
||||
nativeCheckInputs = [
|
||||
pytest-mypy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tatsu"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generates Python parsers from grammars in a variation of EBNF";
|
||||
|
|
@ -30,8 +44,8 @@ buildPythonPackage rec {
|
|||
Python.
|
||||
'';
|
||||
homepage = "https://tatsu.readthedocs.io/";
|
||||
changelog = "https://github.com/neogeny/TatSu/releases/tag/v${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,10 +38,8 @@ in buildPythonPackage {
|
|||
|
||||
src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
addOpenGLRunpath
|
||||
patchelf
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
autoPatchelfHook
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wasabi";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY=";
|
||||
hash = "sha256-Gq7zrOqjLtuckTMNKdOTbAw5/blldDVJwXPLVLFsMLU=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -3,26 +3,33 @@
|
|||
, click
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, pythonOlder
|
||||
, websocket-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "waterfurnace";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdague";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
pytest-runner
|
||||
requests
|
||||
websocket-client
|
||||
];
|
||||
|
|
@ -32,11 +39,14 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "waterfurnace" ];
|
||||
pythonImportsCheck = [
|
||||
"waterfurnace"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface to waterfurnace geothermal systems";
|
||||
homepage = "https://github.com/sdague/waterfurnace";
|
||||
changelog = "https://github.com/sdague/waterfurnace/blob/v${version}/HISTORY.rst";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sbt";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "sha256-IfQhB4b9aP0V3KP0yO6crg2yScVOGw726Cnp+kk2Qjo=";
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-zFWTSOr5z75s4i9omx5EDI4FtOSc1r6jmHZHd7N5SMQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ nequissimus ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "squirrel-sql";
|
||||
version = "4.5.1";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
|
||||
sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0=";
|
||||
sha256 = "sha256-MMRn83yAi9saUI3/QHggj4s2t0uzZ1oJf9+CIqf4dGc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tYoC9OCNAtdQwWyznac5PVl7KLObbFfjs138y5LeQ2A=";
|
||||
sha256 = "sha256-zLv0wuAM6d84Z2jCf89KDIIqX+Hiiw40g3DnTZxVTYY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1y34WH1JGAs1eDxreHMqUlGTyrixUFIV1DPN/N5wzS4=";
|
||||
vendorHash = "sha256-NUm+vkJsT78pxrPqwDofPlrc6jQMTFjsRF7uPUPhDGQ=";
|
||||
subPackages = [ "cmd/earthly" "cmd/debugger" ];
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
|||
31
pkgs/development/tools/go-callvis/default.nix
Normal file
31
pkgs/development/tools/go-callvis/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-callvis";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ofabry";
|
||||
repo = "go-callvis";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PIzmnqlK+uFtzZW4H0xpP5c+X30hFvOjQydvreJn4xM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AfbUxA5C5dH70+vqC+1RGaTt7S0FL9CBcxel0ifmHKs=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
# Build errors in github.com/goccy/go-graphviz/internal/ccall when format hardening is enabled:
|
||||
# cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Visualize call graph of a Go program using Graphviz";
|
||||
homepage = "https://github.com/ofabry/go-callvis";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ meain ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, llvm_12, ncurses, readline, zlib, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
{ lib
|
||||
, stdenv
|
||||
, llvmPackages_10
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvm_12
|
||||
, ncurses
|
||||
, readline
|
||||
, zlib
|
||||
, libxml2
|
||||
, python3
|
||||
}:
|
||||
llvmPackages_10.stdenv.mkDerivation {
|
||||
pname = "hobbes";
|
||||
version = "unstable-2021-04-28";
|
||||
version = "unstable-2023-06-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "morgan-stanley";
|
||||
owner = "morganstanley";
|
||||
repo = "hobbes";
|
||||
rev = "737c7ca63516f6b3dca0e659c3de75d4325472d6";
|
||||
sha256 = "0fjsmz1sbrp6464mrb9ha7p615w2l2pdldsc2ayvcrvxfyi1r4gj";
|
||||
rev = "88a712b85bc896a4c87e60c12321445f1cdcfd00";
|
||||
hash = "sha256-2v0yk35/cLKTjX0Qbc8cjc7Y6bamRSa9GpPvGoxL2Cw=";
|
||||
};
|
||||
|
||||
# TODO: re-enable Python tests once they work on Python 3
|
||||
|
|
@ -27,6 +37,7 @@ stdenv.mkDerivation {
|
|||
readline
|
||||
zlib
|
||||
libxml2
|
||||
python3
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "runme";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stateful";
|
||||
repo = "runme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SVYxFutmDDHEbYLExy0IxqZZZO13gUVPAA0X1ehVXME=";
|
||||
hash = "sha256-AhGApOUzmdf9TOF0cESrvg8CVT918nzolVHriVNxsaE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-el+gM3GRN5KU4RlSAx02rn+22xj28IZq3erZUzPbUUw=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-vet";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PAqpVixBdytHvSUu03OyoA1QGBxmmoeV78x6wCiCemQ=";
|
||||
sha256 = "sha256-URTWfV/weXWvgaZv7RWKqr7w3dnad2Pr5wNv0rcm2eg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-dsaDpDa/BNqnL3K4a1mg3uEyM094/UO73MzJD9YaAwE=";
|
||||
cargoSha256 = "sha256-cnxVcq5v6MXH7hrdT4kE+8DxJY5z2fGCF3G6GGJx8pw=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.14.12";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mHgGNSG0mKuI3fIgbfcTI6rnsLiL41g6GZAyN8ZRXI0=";
|
||||
hash = "sha256-SbWwrvfLawWoVuCG9b4PrA5cdc+DLqJw2uSF3oha9Po=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mHmnQ2hntP/FRHgKrwQHcY1+l9ukIvu8SNUSzuRbyf4=";
|
||||
cargoHash = "sha256-XLnN6kCjHntqZu80Uvm95pCabjR5QMvsumb+V002N2Y=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
40
pkgs/development/tools/xcodes/default.nix
Normal file
40
pkgs/development/tools/xcodes/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib, stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xcodes";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/XcodesOrg/xcodes/releases/download/${finalAttrs.version}/xcodes.zip";
|
||||
hash = "sha256:0cqb0gfb80xrnm4fipr46kbzqz2kicc13afhdxkbifzm4k83any5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
unzip -q $src
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -m755 xcodes $out/bin/xcodes
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool to install and switch between multiple versions of Xcode";
|
||||
homepage = "https://github.com/XcodesOrg/xcodes";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ _0x120581f ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "zprint";
|
||||
version = "1.2.6";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
|
||||
sha256 = "sha256-mzhl7boAMKZ5bj184LLCWR/faDjJI+crX4Vzbh7eosY=";
|
||||
sha256 = "sha256-C2WEzF7Xl37/LDlk6f77/WcWNadE0zAfzxEw+RTRGto=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "20.2.0";
|
||||
sha256 = "sha256-IlI98jFsNVaXFP8fabBTwuKGztRgiYQX3uRpRe/N+Yk=";
|
||||
version = "20.3.0";
|
||||
sha256 = "sha256-G6jUlCPtOnVykGa7PqJkk+6ct9ZWjvlIWX/J70VPdDU=";
|
||||
patches = [
|
||||
./revert-arm64-pointer-auth.patch
|
||||
./disable-darwin-v8-system-instrumentation-node19.patch
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arx-libertatis";
|
||||
version = "2020-10-20";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arx";
|
||||
repo = "ArxLibertatis";
|
||||
rev = "21df2e37664de79e117eff2af164873f05600f4c";
|
||||
sha256 = "06plyyh0ddqv1j04m1vclz9j72609pgrp61v8wfjdcln8djm376i";
|
||||
rev = version;
|
||||
sha256 = "GBJcsibolZP3oVOTSaiVqG2nMmvXonKTp5i/0NNODKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Galkin <paraseba@gmail.com>
|
||||
Date: Wed, 20 Dec 2017 18:23:03 -0200
|
||||
Subject: [PATCH] put fonts in $out
|
||||
|
||||
---
|
||||
Makefile.conf | 22 ++++------------------
|
||||
configure | 12 ------------
|
||||
2 files changed, 4 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/Makefile.conf b/Makefile.conf
|
||||
index e7f8de9..87f3fff 100644
|
||||
--- a/Makefile.conf
|
||||
+++ b/Makefile.conf
|
||||
@@ -226,19 +226,11 @@ install_scid: all_scid
|
||||
fi
|
||||
install -m 755 -d $(SHAREDIR)/bitmaps
|
||||
cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/
|
||||
- @if [ "`id -u`" -eq 0 ]; then \
|
||||
- install -m 755 -d $(FONTDIR); \
|
||||
- install -m 644 -p fonts/*.ttf $(FONTDIR); \
|
||||
- else \
|
||||
- install -m 755 -d ~/.fonts; \
|
||||
- install -m 644 -p fonts/*.ttf ~/.fonts; \
|
||||
- fi
|
||||
+ install -m 755 -d $(FONTDIR); \
|
||||
+ install -m 644 -p fonts/*.ttf $(FONTDIR); \
|
||||
+
|
||||
@if [ ! -z "`which fc-cache`" ]; then \
|
||||
- if [ "`id -u`" -eq 0 ]; then \
|
||||
- fc-cache -fv $(FONTDIR); \
|
||||
- else \
|
||||
- fc-cache -fv ~/.fonts; \
|
||||
- fi; \
|
||||
+ fc-cache -fv $(FONTDIR); \
|
||||
else \
|
||||
echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
|
||||
echo "Please contact your system administrator."; \
|
||||
@@ -292,12 +284,6 @@ uninstall:
|
||||
for f in `ls fonts/*.ttf`; do \
|
||||
rm -f ~/.$$f; \
|
||||
done; \
|
||||
- if [ ! -z "`which fc-cache`" ]; then \
|
||||
- fc-cache -fv ~/.fonts; \
|
||||
- fi; \
|
||||
- if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \
|
||||
- rmdir ~/.fonts; \
|
||||
- fi; \
|
||||
fi
|
||||
|
||||
clean:
|
||||
diff --git a/configure b/configure
|
||||
index 4599c77..8b09678 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} {
|
||||
exit 1
|
||||
}
|
||||
|
||||
- if {[isDarwin]} {
|
||||
- set var(FONTDIR) /Library/Fonts/
|
||||
- } else {
|
||||
- # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active
|
||||
- set prefix /usr
|
||||
- if {![file isdirectory $prefix/share/fonts]} {
|
||||
- set var(FONTDIR) "~/.fonts"
|
||||
- } else {
|
||||
- set var(FONTDIR) $prefix/share/fonts/truetype/Scid
|
||||
- }
|
||||
- }
|
||||
-
|
||||
set line [gets $from]
|
||||
while {1} {
|
||||
set line [gets $from]
|
||||
--
|
||||
2.15.1
|
||||
|
||||
|
|
@ -1,59 +1,28 @@
|
|||
{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
|
||||
{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, which, makeDesktopItem }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "scid-vs-pc";
|
||||
version = "4.22";
|
||||
version = "4.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz";
|
||||
sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM=";
|
||||
hash = "sha256-x4Ljn1vaXrue16kUofWAH2sDNYC8h3NvzFjffRo0EhA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postPatch = ''
|
||||
substituteInPlace configure Makefile.conf \
|
||||
--replace "~/.fonts" "$out/share/fonts/truetype/Scid" \
|
||||
--replace "which fc-cache" "false"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper which ];
|
||||
buildInputs = [ tk libX11 zlib ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
|
||||
-e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \
|
||||
-e '/^ *set x11Path *{/a ${libX11}/lib/' \
|
||||
configure
|
||||
|
||||
sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \
|
||||
tcl/config.tcl
|
||||
'';
|
||||
|
||||
# configureFlags = [
|
||||
# "BINDIR=$(out)/bin"
|
||||
# "SHAREDIR=$(out)/share"
|
||||
# "FONTDIR=$(out)/fonts"
|
||||
# ];
|
||||
|
||||
preConfigure = ''configureFlags="
|
||||
BINDIR=$out/bin
|
||||
SHAREDIR=$out/share
|
||||
FONTDIR=$out/fonts"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001-put-fonts-in-out.patch
|
||||
configureFlags = [
|
||||
"BINDIR=${placeholder "out"}/bin"
|
||||
"SHAREDIR=${placeholder "out"}/share"
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
dontPatchShebangs = true;
|
||||
|
||||
# TODO: can this use tclWrapperArgs?
|
||||
postFixup = ''
|
||||
sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn"
|
||||
sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote"
|
||||
sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid"
|
||||
|
||||
for cmd in $out/bin/* ; do
|
||||
wrapProgram "$cmd" \
|
||||
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
|
||||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp $desktopItem/share/applications/* $out/share/applications/
|
||||
|
|
|
|||
222
pkgs/games/shipwright/default.nix
Normal file
222
pkgs/games/shipwright/default.nix
Normal file
|
|
@ -0,0 +1,222 @@
|
|||
{ stdenv
|
||||
, cmake
|
||||
, lsb-release
|
||||
, ninja
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, makeDesktopItem
|
||||
, python3
|
||||
, libX11
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libXext
|
||||
, glew
|
||||
, boost
|
||||
, SDL2
|
||||
, SDL2_net
|
||||
, pkg-config
|
||||
, libpulseaudio
|
||||
, libpng
|
||||
, imagemagick
|
||||
, requireFile
|
||||
|
||||
, oot ? rec {
|
||||
enable = true;
|
||||
variant = "debug";
|
||||
|
||||
rom = requireFile {
|
||||
name = "oot-${variant}.z64";
|
||||
message = ''
|
||||
This nix expression requires that oot-${variant}.z64 is already part of the store.
|
||||
To get this file you can dump your Ocarina of Time's cartridge to a file,
|
||||
and add it to the nix store with nix-store --add-fixed sha1 <FILE>, or override the package:
|
||||
shipwright.override { oot = { enable = true; variant = "debug"; rom = path/to/oot-debug-mq.z64; } }
|
||||
|
||||
The supported variants are:
|
||||
- debug: Ocarina of Time Debug PAL GC (not Master Quest)
|
||||
- pal-gc: Ocarina of Time PAL GameCube (may lead to crashes and instability)
|
||||
|
||||
This is optional if you have imported an Ocarina of Time Master Quest ROM.
|
||||
If so, please set oot.enable to false and ootMq.enable to true.
|
||||
If both are enabled, Ship of Harkinian will be built with both ROMs.
|
||||
'';
|
||||
|
||||
# From upstream: https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/README.md#1-check-your-sha1
|
||||
sha1 = {
|
||||
debug = "cee6bc3c2a634b41728f2af8da54d9bf8cc14099";
|
||||
pal-gc = "0227d7c0074f2d0ac935631990da8ec5914597b4";
|
||||
}.${variant} or (throw "Unsupported romVariant ${variant}. Valid options are 'debug' and 'pal-gc'.");
|
||||
};
|
||||
}
|
||||
|
||||
, ootMq ? rec {
|
||||
enable = false;
|
||||
variant = "debug-mq";
|
||||
|
||||
rom = requireFile {
|
||||
name = "oot-${variant}.z64";
|
||||
message = ''
|
||||
This nix expression requires that oot-${variant}.z64 is already part of the store.
|
||||
To get this file you can dump your Ocarina of Time Master Quest's cartridge to a file,
|
||||
and add it to the nix store with nix-store --add-fixed sha1 <FILE>, or override the package:
|
||||
shipwright.override { ootMq = { enable = true; variant = "debug-mq"; rom = path/to/oot-debug-mq.z64; } }
|
||||
|
||||
The supported variants are:
|
||||
- debug-mq: Ocarina of Time Debug PAL GC MQ (Dungeons will be Master Quest)
|
||||
- debug-mq-alt: Alternate ROM, not produced by decompilation.
|
||||
|
||||
This is optional if you have imported an Ocarina of Time ROM.
|
||||
If so, please set oot.enable to true and ootMq.enable to false.
|
||||
If both are enabled, Ship of Harkinian will be built with both ROMs.
|
||||
'';
|
||||
|
||||
# From upstream: https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/README.md#1-check-your-sha1
|
||||
sha1 = {
|
||||
debug-mq = "079b855b943d6ad8bd1eb026c0ed169ecbdac7da";
|
||||
debug-mq-alt = "50bebedad9e0f10746a52b07239e47fa6c284d03";
|
||||
}.${variant} or (throw "Unsupported mqRomVariant ${variant}. Valid options are 'debug-mq' and 'debug-mq-alt'.");
|
||||
};
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
checkAttrs = attrs:
|
||||
let
|
||||
validAttrs = [ "enable" "rom" "variant" ];
|
||||
in
|
||||
lib.all (name: lib.elem name validAttrs) (lib.attrNames attrs);
|
||||
in
|
||||
assert (lib.assertMsg (checkAttrs oot) "oot must have the attributes 'enable' and 'rom', and none other");
|
||||
assert (lib.assertMsg (checkAttrs ootMq) "ootMq must have the attributes 'enable' and 'rom', and none other");
|
||||
assert (lib.assertMsg (oot.enable || ootMq.enable) "At least one of 'oot.enable' and 'ootMq.enable' must be true");
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shipwright";
|
||||
version = "7.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "harbourmasters";
|
||||
repo = "shipwright";
|
||||
rev = version;
|
||||
hash = "sha256-2VCcczGWSvp6hk8FTA1/T1E1KkrrvWyOdkEw8eiYYnY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# This would get fetched at build time otherwise, see:
|
||||
# https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736
|
||||
gamecontrollerdb = fetchurl {
|
||||
name = "gamecontrollerdb.txt";
|
||||
url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/c5b4df0e1061175cb11e3ebbf8045178339864a5/gamecontrollerdb.txt";
|
||||
hash = "sha256-2VFCsaalXoe+JYWCH6IbgjnLXNKxe0UqSyJNGZMn5Ko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
lsb-release
|
||||
python3
|
||||
imagemagick
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
libX11
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXcursor
|
||||
libXi
|
||||
libXext
|
||||
glew
|
||||
SDL2
|
||||
SDL2_net
|
||||
libpulseaudio
|
||||
libpng
|
||||
];
|
||||
|
||||
patches = [
|
||||
# These patches make soh look inside the nix store for data files (the controller database and the OTRs)
|
||||
./lus-install-paths.patch
|
||||
./soh-misc-otr-patches.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib"
|
||||
];
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
# Linking fails without this
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postBuild = ''
|
||||
cp ${gamecontrollerdb} ${gamecontrollerdb.name}
|
||||
|
||||
pushd ../OTRExporter
|
||||
${lib.optionalString oot.enable "python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out ${oot.rom}"}
|
||||
${lib.optionalString ootMq.enable "python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out ${ootMq.rom}"}
|
||||
popd
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Cmake likes it here for its install paths
|
||||
cp ../OTRExporter/soh.otr ..
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
# Copy the extracted assets, required to be in the same directory as the executable
|
||||
${lib.optionalString oot.enable "cp ../OTRExporter/oot.otr $out/lib"}
|
||||
${lib.optionalString ootMq.enable "cp ../OTRExporter/oot-mq.otr $out/lib"}
|
||||
|
||||
ln -s $out/lib/soh.elf $out/bin/soh
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "soh";
|
||||
icon = "soh";
|
||||
exec = "soh";
|
||||
genericName = "Ship of Harkinian";
|
||||
desktopName = "soh";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/HarbourMasters/Shipwright";
|
||||
description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
|
||||
longDescription = ''
|
||||
An PC port of Ocarina of Time with modern controls, widescreen, high-resolution and more, based off of decompilation.
|
||||
Note that you must supply an OoT rom yourself to use this package because propietary assets are extracted from it.
|
||||
|
||||
You can change the game variant like this:
|
||||
shipwright.override { oot.enable = false; ootMq.enable = true }
|
||||
|
||||
The default ROM variants for Oot and OotMq are debug and debug-mq respectively.
|
||||
If you have a pal-gc rom, you should override like this:
|
||||
shipwright.override { oot = { enable = true; variant = "pal-gc"; rom = path/to/oot-pal-gc.z64; } }
|
||||
|
||||
The supported Oot variants are:
|
||||
- debug: Ocarina of Time Debug PAL GC (not Master Quest)
|
||||
- pal-gc: Ocarina of Time PAL GameCube (may lead to crashes and instability)
|
||||
|
||||
The supported OotMq variants are:
|
||||
- debug-mq: Ocarina of Time Debug PAL GC MQ (Dungeons will be Master Quest)
|
||||
- debug-mq-alt: Alternate ROM, not produced by decompilation.
|
||||
'';
|
||||
mainProgram = "soh";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ivar j0lol ];
|
||||
license = with licenses; [
|
||||
# OTRExporter, OTRGui, ZAPDTR, libultraship
|
||||
mit
|
||||
# Ship of Harkinian itself
|
||||
unfree
|
||||
];
|
||||
};
|
||||
}
|
||||
146
pkgs/games/shipwright/lus-install-paths.patch
Normal file
146
pkgs/games/shipwright/lus-install-paths.patch
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
Submodule libultraship contains modified content
|
||||
diff --git a/libultraship/src/CMakeLists.txt b/libultraship/src/CMakeLists.txt
|
||||
index f95c3c9..5b967b9 100644
|
||||
--- a/libultraship/src/CMakeLists.txt
|
||||
+++ b/libultraship/src/CMakeLists.txt
|
||||
@@ -74,7 +74,10 @@ target_sources(libultraship PRIVATE ${Source_Files__Controller})
|
||||
|
||||
#=================== Core ===================
|
||||
|
||||
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/install_config.h.in ${CMAKE_BINARY_DIR}/install_config.h @ONLY)
|
||||
+
|
||||
set(Source_Files__Core
|
||||
+ ${CMAKE_BINARY_DIR}/install_config.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/core/Window.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/core/Window.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/core/ConsoleVariable.h
|
||||
@@ -329,7 +332,7 @@ endif()
|
||||
#=================== Packages & Includes ===================
|
||||
|
||||
target_include_directories(libultraship
|
||||
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern
|
||||
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern ${CMAKE_BINARY_DIR}
|
||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../extern/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/../extern/stb
|
||||
)
|
||||
|
||||
diff --git a/libultraship/src/core/Context.cpp b/libultraship/src/core/Context.cpp
|
||||
index 776333e..fa546e6 100644
|
||||
--- a/libultraship/src/core/Context.cpp
|
||||
+++ b/libultraship/src/core/Context.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#elif defined(__WIIU__)
|
||||
#include "port/wiiu/WiiUImpl.h"
|
||||
#endif
|
||||
+#include "install_config.h"
|
||||
|
||||
namespace LUS {
|
||||
std::weak_ptr<Context> Context::mContext;
|
||||
@@ -281,6 +282,18 @@ std::string Context::GetShortName() {
|
||||
}
|
||||
|
||||
std::string Context::GetAppBundlePath() {
|
||||
+#ifdef CMAKE_INSTALL_PREFIX
|
||||
+ static const std::string fpath = CMAKE_INSTALL_PREFIX;
|
||||
+ static int exists = -1;
|
||||
+
|
||||
+ if (exists == -1) {
|
||||
+ exists = fpath.size() > 0 && std::filesystem::is_directory(fpath);
|
||||
+ }
|
||||
+
|
||||
+ if (exists) {
|
||||
+ return fpath;
|
||||
+ }
|
||||
+#else
|
||||
#ifdef __APPLE__
|
||||
FolderManager folderManager;
|
||||
return folderManager.getMainBundlePath();
|
||||
@@ -291,6 +304,7 @@ std::string Context::GetAppBundlePath() {
|
||||
if (fpath != NULL) {
|
||||
return std::string(fpath);
|
||||
}
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
return ".";
|
||||
@@ -304,6 +318,13 @@ std::string Context::GetAppDirectoryPath() {
|
||||
}
|
||||
#endif
|
||||
|
||||
+ char *prefpath = SDL_GetPrefPath(NULL, "soh");
|
||||
+ if (prefpath != NULL) {
|
||||
+ std::string ret(prefpath);
|
||||
+ SDL_free(prefpath);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
return ".";
|
||||
}
|
||||
|
||||
@@ -315,7 +336,24 @@ std::string Context::GetPathRelativeToAppDirectory(const char* path) {
|
||||
return GetAppDirectoryPath() + "/" + path;
|
||||
}
|
||||
|
||||
+std::string Context::FindFileFromAllAppDirectories(const char* path) {
|
||||
+ std::string fpath;
|
||||
+
|
||||
+ // app configuration dir (eg. ~/.local/share)
|
||||
+ fpath = GetPathRelativeToAppDirectory(path);
|
||||
+ if (std::filesystem::exists(fpath)) {
|
||||
+ return fpath;
|
||||
+ }
|
||||
+ // app install dir (eg. /usr/)
|
||||
+ fpath = GetPathRelativeToAppBundle(path);
|
||||
+ if (std::filesystem::exists(fpath)) {
|
||||
+ return fpath;
|
||||
+ }
|
||||
+ // current dir
|
||||
+ return "./" + std::string(path);
|
||||
+}
|
||||
+
|
||||
bool Context::DoesOtrFileExist() {
|
||||
return mOtrFileExists;
|
||||
}
|
||||
-} // namespace LUS
|
||||
\ No newline at end of file
|
||||
+} // namespace LUS
|
||||
diff --git a/libultraship/src/core/Context.h b/libultraship/src/core/Context.h
|
||||
index c32f4dd..a9f1639 100644
|
||||
--- a/libultraship/src/core/Context.h
|
||||
+++ b/libultraship/src/core/Context.h
|
||||
@@ -26,6 +26,7 @@ class Context {
|
||||
static std::string GetAppDirectoryPath();
|
||||
static std::string GetPathRelativeToAppDirectory(const char* path);
|
||||
static std::string GetPathRelativeToAppBundle(const char* path);
|
||||
+ static std::string FindFileFromAllAppDirectories(const char* path);
|
||||
|
||||
Context(std::string name, std::string shortName);
|
||||
|
||||
diff --git a/libultraship/src/core/libultra/os.cpp b/libultraship/src/core/libultra/os.cpp
|
||||
index 9058fe1..7d9387e 100644
|
||||
--- a/libultraship/src/core/libultra/os.cpp
|
||||
+++ b/libultraship/src/core/libultra/os.cpp
|
||||
@@ -21,8 +21,8 @@ int32_t osContInit(OSMesgQueue* mq, uint8_t* controllerBits, OSContStatus* statu
|
||||
}
|
||||
|
||||
#ifndef __SWITCH__
|
||||
- const char* controllerDb = "gamecontrollerdb.txt";
|
||||
- int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb);
|
||||
+ std::string controllerDb = LUS::Context::GetPathRelativeToAppBundle("gamecontrollerdb.txt");
|
||||
+ int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb.c_str());
|
||||
if (mappingsAdded >= 0) {
|
||||
SPDLOG_INFO("Added SDL game controllers from \"{}\" ({})", controllerDb, mappingsAdded);
|
||||
} else {
|
||||
@@ -90,4 +90,4 @@ int32_t osRecvMesg(OSMesgQueue* mq, OSMesg* msg, int32_t flag) {
|
||||
mq->validCount--;
|
||||
return 0;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/libultraship/src/install_config.h.in b/libultraship/src/install_config.h.in
|
||||
new file mode 100644
|
||||
index 0000000..029753c
|
||||
--- /dev/null
|
||||
+++ b/libultraship/src/install_config.h.in
|
||||
@@ -0,0 +1 @@
|
||||
+#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
|
||||
119
pkgs/games/shipwright/soh-misc-otr-patches.patch
Normal file
119
pkgs/games/shipwright/soh-misc-otr-patches.patch
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp
|
||||
index a9ddc4f4..f6d45fe2 100644
|
||||
--- a/soh/soh/Extractor/Extract.cpp
|
||||
+++ b/soh/soh/Extractor/Extract.cpp
|
||||
@@ -490,28 +490,27 @@ const char* Extractor::GetZapdVerStr() const {
|
||||
|
||||
extern "C" int zapd_main(int argc, char** argv);
|
||||
|
||||
-bool Extractor::CallZapd() {
|
||||
+bool Extractor::CallZapd(std::string &assetPath) {
|
||||
constexpr int argc = 16;
|
||||
- char xmlPath[100];
|
||||
- char confPath[100];
|
||||
std::array<const char*, argc> argv;
|
||||
const char* version = GetZapdVerStr();
|
||||
|
||||
- snprintf(xmlPath, 100, "assets/extractor/xmls/%s", version);
|
||||
- snprintf(confPath, 100, "assets/extractor/Config_%s.xml", version);
|
||||
+ std::string xmlPath = assetPath + "/assets/extractor/xmls/" + version;
|
||||
+ std::string confPath = assetPath + "/assets/extractor/Config_" + version + ".xml";
|
||||
+ std::string fileListsPath = assetPath + "/assets/extractor/filelists";
|
||||
|
||||
argv[0] = "ZAPD";
|
||||
argv[1] = "ed";
|
||||
argv[2] = "-i";
|
||||
- argv[3] = xmlPath;
|
||||
+ argv[3] = xmlPath.c_str();
|
||||
argv[4] = "-b";
|
||||
argv[5] = mCurrentRomPath.c_str();
|
||||
argv[6] = "-fl";
|
||||
- argv[7] = "assets/extractor/filelists";
|
||||
+ argv[7] = fileListsPath.c_str();
|
||||
argv[8] = "-gsf";
|
||||
- argv[9] = "1";
|
||||
+ argv[9] = "0";
|
||||
argv[10] = "-rconf";
|
||||
- argv[11] = confPath;
|
||||
+ argv[11] = confPath.c_str();
|
||||
argv[12] = "-se";
|
||||
argv[13] = "OTR";
|
||||
argv[14] = "--otrfile";
|
||||
diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h
|
||||
index e4eb2e5b..3c95b025 100644
|
||||
--- a/soh/soh/Extractor/Extract.h
|
||||
+++ b/soh/soh/Extractor/Extract.h
|
||||
@@ -57,7 +57,7 @@ class Extractor {
|
||||
bool IsMasterQuest() const;
|
||||
|
||||
bool Run(RomSearchMode searchMode = RomSearchMode::Both);
|
||||
- bool CallZapd();
|
||||
+ bool CallZapd(std::string& assetPath);
|
||||
const char* GetZapdStr();
|
||||
};
|
||||
#endif
|
||||
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
|
||||
index d192de6a..cc516085 100644
|
||||
--- a/soh/soh/OTRGlobals.cpp
|
||||
+++ b/soh/soh/OTRGlobals.cpp
|
||||
@@ -201,11 +201,11 @@ const char* constCameraStrings[] = {
|
||||
|
||||
OTRGlobals::OTRGlobals() {
|
||||
std::vector<std::string> OTRFiles;
|
||||
- std::string mqPath = LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr");
|
||||
+ std::string mqPath = LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr");
|
||||
if (std::filesystem::exists(mqPath)) {
|
||||
OTRFiles.push_back(mqPath);
|
||||
}
|
||||
- std::string ootPath = LUS::Context::GetPathRelativeToAppDirectory("oot.otr");
|
||||
+ std::string ootPath = LUS::Context::FindFileFromAllAppDirectories("oot.otr");
|
||||
if (std::filesystem::exists(ootPath)) {
|
||||
OTRFiles.push_back(ootPath);
|
||||
}
|
||||
@@ -213,7 +213,7 @@ OTRGlobals::OTRGlobals() {
|
||||
if (std::filesystem::exists(sohOtrPath)) {
|
||||
OTRFiles.push_back(sohOtrPath);
|
||||
}
|
||||
- std::string patchesPath = LUS::Context::GetPathRelativeToAppDirectory("mods");
|
||||
+ std::string patchesPath = LUS::Context::FindFileFromAllAppDirectories("mods");
|
||||
if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) {
|
||||
if (std::filesystem::is_directory(patchesPath)) {
|
||||
for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath)) {
|
||||
@@ -709,8 +709,10 @@ extern "C" void OTRExtScanner() {
|
||||
|
||||
extern "C" void InitOTR() {
|
||||
#if not defined (__SWITCH__) && not defined(__WIIU__)
|
||||
- if (!std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr")) &&
|
||||
- !std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot.otr"))){
|
||||
+ if (!std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr")) &&
|
||||
+ !std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot.otr"))){
|
||||
+ std::string exporterAssetPath = LUS::Context::GetAppBundlePath();
|
||||
+
|
||||
bool generatedOtrIsMQ = false;
|
||||
if (Extractor::ShowYesNoBox("No OTR Files", "No OTR files found. Generate one now?") == IDYES) {
|
||||
Extractor extract;
|
||||
@@ -718,7 +720,7 @@ extern "C" void InitOTR() {
|
||||
Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated. Exiting...");
|
||||
exit(1);
|
||||
}
|
||||
- extract.CallZapd();
|
||||
+ extract.CallZapd(exporterAssetPath);
|
||||
generatedOtrIsMQ = extract.IsMasterQuest();
|
||||
} else {
|
||||
exit(1);
|
||||
@@ -728,7 +730,7 @@ extern "C" void InitOTR() {
|
||||
if (!extract.Run(generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {
|
||||
Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step. Continuing...");
|
||||
} else {
|
||||
- extract.CallZapd();
|
||||
+ extract.CallZapd(exporterAssetPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2018,4 +2020,4 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla
|
||||
|
||||
extern "C" void SaveManager_ThreadPoolWait() {
|
||||
SaveManager::Instance->ThreadPoolWait();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
|
|
@ -10,15 +10,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urbit";
|
||||
version = "2.8";
|
||||
version = "2.9";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-reU8i7++VdAiuH36AyfhZhAJPnE4t0nBnYvWoglrKwA=";
|
||||
aarch64-linux = "sha256-l3190BUIeJVbQI1tfP8W6WHw6WyfoYpI8rnjbgevznk=";
|
||||
x86_64-darwin = "sha256-tsBuIcbWiK1oyu9UzHfwJe/nsVrLWXzoX/eIHyg4uaU=";
|
||||
aarch64-darwin = "sha256-f+C5DB+IeN6ZcZ4oES4dc3LQ4pwDDszffu/U/KFwqmg=";
|
||||
x86_64-linux = "sha256-CX3KoB5NNZBfikARh0ikeKQocaGIhbWcZsTFWOFk5oI=";
|
||||
aarch64-linux = "sha256-PHVh4ktUe2HIPyudiwEUNuAfwOu4yCI9lxgbjrIllSU=";
|
||||
x86_64-darwin = "sha256-lACh1UYtGrZUw+dtR0Ye6zqdtgp7llV9EkUoGOi+V4c=";
|
||||
aarch64-darwin = "sha256-IRVMIriFVEsv69yUCxsiUaEgIlc618tf9dHiz76D+ug=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3500,10 +3500,11 @@
|
|||
psutil-home-assistant
|
||||
pyserial
|
||||
pyudev
|
||||
sensirion-ble
|
||||
sqlalchemy
|
||||
webrtcvad
|
||||
zeroconf
|
||||
]; # missing inputs: sensirion-ble
|
||||
];
|
||||
"sensor" = ps: with ps; [
|
||||
fnv-hash-fast
|
||||
psutil-home-assistant
|
||||
|
|
@ -5280,6 +5281,7 @@
|
|||
"sense"
|
||||
"senseme"
|
||||
"sensibo"
|
||||
"sensirion_ble"
|
||||
"sensor"
|
||||
"sensorpro"
|
||||
"sensorpush"
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.85.1";
|
||||
version = "1.85.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I/InjuTJOwYXw98qW7zT+fTnyLUo96xsVkFGSL+x+5k=";
|
||||
hash = "sha256-pFafBsisBPfpDnFYWcimUuBgfFVPZzLna3yHeqIBAAE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-KE56crjZDM1cJnVS7MvObIQ7NvH7+fUm1Mlb6HcT9+U=";
|
||||
hash = "sha256-dnno+5Ma0YNYpmj3oZ5UG22uAanKwVT67BwQW+mHoFc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -210,6 +210,12 @@ let
|
|||
"-DMAC_CODESIGN_ID=OFF"
|
||||
];
|
||||
|
||||
# Fish’s test suite needs to be able to look up process information and send signals.
|
||||
sandboxProfile = lib.optionalString stdenv.isDarwin ''
|
||||
(allow mach-lookup mach-task-name)
|
||||
(allow signal (target children))
|
||||
'';
|
||||
|
||||
# The optional string is kind of an inelegant way to get fish to cross compile.
|
||||
# Fish needs coreutils as a runtime dependency, and it gets put into
|
||||
# CMAKE_PREFIX_PATH, which cmake uses to look up build time programs, so it
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acme.sh";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acmesh-official";
|
||||
repo = "acme.sh";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IDhJRIsk+a+tP+ZeNm6nGvkDh54M0uvAMnSWHbCF3E8=";
|
||||
hash = "sha256-4Chqdr4a9+T+/o1vCPY5xMREoYl0HxY3OlGRD86ulGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.16.1";
|
||||
version = "6.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Hyt5Y3n4bi3Ffxv+QoikbJdqHUBtYiHuRuOsgwf3PKM=";
|
||||
hash = "sha256-xtoS6ett1YIjsKSEAKqiXmd69srD2dtB+xtiAG3euzY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
# https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in
|
||||
ansible-core
|
||||
ansible-compat
|
||||
black
|
||||
filelock
|
||||
jsonschema
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.42.0";
|
||||
version = "0.42.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TmtQ7rs77W6YFjh3y9kvIZabcGT6U/SCr5Hg6pa7K+s=";
|
||||
sha256 = "sha256-QEjhnZmrmVzNG1/Zj8z/76v0Fb1N0rMYlvGb2pid2VM=";
|
||||
};
|
||||
# hash missmatch on across linux and darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-4YUJ4HfbAvYt/QtI9wmh8326T4avIXCtPkICo4lEpqQ=";
|
||||
vendorHash = "sha256-bEmp3Fq9Zop3YCbZH4lOG71osY0P71xuhpIPOUSnHSY=";
|
||||
|
||||
excludedPackages = [ "magefiles" "misc" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "otfried";
|
||||
repo = "ipe-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
|
||||
hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -22,9 +22,16 @@ stdenv.mkDerivation rec {
|
|||
# https://github.com/otfried/ipe-tools/pull/48
|
||||
(fetchpatch {
|
||||
url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch";
|
||||
sha256 = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc=";
|
||||
hash = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc=";
|
||||
stripLen = 1;
|
||||
name = "poppler_fix_build.patch";
|
||||
name = "poppler_fix_build_48.patch";
|
||||
})
|
||||
# https://github.com/otfried/ipe-tools/pull/55
|
||||
(fetchpatch {
|
||||
url = "https://github.com/otfried/ipe-tools/commit/65586fcd9cc39e482ae5a9abdb6f4932d9bb88c4.patch";
|
||||
hash = "sha256-qr1AQyWHz1e2a65m05xSHFnP6oSP6qSmMVekNk2flRc=";
|
||||
stripLen = 1;
|
||||
name = "poppler_fix_build_55.patch";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -40,6 +47,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A program that tries to convert arbitrary PDF documents to Ipe files";
|
||||
homepage = "https://github.com/otfried/ipe-tools";
|
||||
changelog = "https://github.com/otfried/ipe-tools/releases";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ yrd ];
|
||||
};
|
||||
|
|
|
|||
32
pkgs/tools/misc/ical2orgpy/default.nix
Normal file
32
pkgs/tools/misc/ical2orgpy/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, python3Packages, fetchPypi, ... }:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "ical2orgpy";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7/kWW1oTSJXPJtN02uIDrFdNJ9ExKRUa3tUNA0oJSoc=";
|
||||
};
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.9";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click
|
||||
future
|
||||
icalendar
|
||||
pytz
|
||||
tzlocal
|
||||
recurring-ical-events
|
||||
];
|
||||
checkInputs = with python3Packages; [ freezegun pytest pyyaml ];
|
||||
nativeBuildInputs = [ python3Packages.pbr ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Converting ICAL file into org-mode format.";
|
||||
homepage = "https://github.com/ical2org-py/ical2org.py";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ StillerHarpo ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ nimPackages.buildNimPackage rec {
|
|||
version = "0.1.6";
|
||||
nimBinOnly = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "unxsh";
|
||||
owner = "ssleert";
|
||||
repo = "nitch";
|
||||
rev = "42ad6899931dd5e0cec7b021c2b7e383fcc891f3";
|
||||
hash = "sha256-QI7CbP0lvvjD+g29FR/YJjuZboZ+PoHynsNbpYC9SvE=";
|
||||
|
|
@ -15,6 +15,10 @@ nimPackages.buildNimPackage rec {
|
|||
url = "https://github.com/unxsh/nitch/commit/6831cf96144f58c4da298a0bc9b50d33056f6c08.patch";
|
||||
sha256 = "sha256-uZUzUBLHBsssNqDxZ0NuTRMN9/gBxIlIiGgQkqCqEFc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ssleert/nitch/commit/ff10dea47dbc4d9736bd839b87869f53166cf395.patch";
|
||||
hash = "sha256-n7JtI1Td0xMqhuScnMvxTkbY2I+l+FcUTz7aytxFasE=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -23,6 +27,5 @@ nimPackages.buildNimPackage rec {
|
|||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ michaelBelsanti ];
|
||||
mainProgram = "nitch";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.78.2";
|
||||
version = "0.79.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zYKm5P+o59F1g5kCMirCEW0X5FrOwMdIRw64CMbUsAg=";
|
||||
hash = "sha256-OTddX0hTrcxvU1XI5DSXOYPhVrn3dJ9Ryvr/wf1AHQ0=";
|
||||
};
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "source/cmd/otelcorecol";
|
||||
vendorHash = "sha256-7rnj3hIdp12CMva0zxWzkTi+a4N1uBIbG6BBaKjzH+4=";
|
||||
vendorHash = "sha256-Efsgogk3C7oroniRPrl5GwTogBk7lT0XPkbz0ygJh48=";
|
||||
|
||||
# upstream strongly recommends disabling CGO
|
||||
# additionally dependencies have had issues when GCO was enabled that weren't caught upstream
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "phrase-cli";
|
||||
version = "2.8.0";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phrase";
|
||||
repo = "phrase-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-Gima27E77iJEgOVY49Y2s9kQkd+rnzS359ru5NAyGik=";
|
||||
sha256 = "sha256-jsN7JouIyrFd//+kDAcEEsXiGLZx8e5jQsiNVQuDiQg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-a0QA/1vUryAnO0Nr+m8frxtpnSHBOSOP1pq+BORTIJw=";
|
||||
|
|
|
|||
85
pkgs/tools/networking/mailctl/default.nix
Normal file
85
pkgs/tools/networking/mailctl/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ mkDerivation
|
||||
, fetchFromSourcehut
|
||||
, aeson
|
||||
, base
|
||||
, bytestring
|
||||
, containers
|
||||
, directory
|
||||
, hsyslog
|
||||
, http-conduit
|
||||
, lib
|
||||
, network-uri
|
||||
, optparse-applicative
|
||||
, pretty-simple
|
||||
, process
|
||||
, template-haskell
|
||||
, text
|
||||
, time
|
||||
, twain
|
||||
, utf8-string
|
||||
, warp
|
||||
, yaml
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "mailctl";
|
||||
version = "0.8.8";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~petrus";
|
||||
repo = "mailctl";
|
||||
rev = version;
|
||||
hash = "sha256-aFt6y2DzreROLcOLU8ynnSSVQW840T5wFqSRdSODQX4=";
|
||||
};
|
||||
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
||||
libraryHaskellDepends = [
|
||||
aeson
|
||||
base
|
||||
bytestring
|
||||
containers
|
||||
directory
|
||||
hsyslog
|
||||
http-conduit
|
||||
network-uri
|
||||
optparse-applicative
|
||||
pretty-simple
|
||||
process
|
||||
template-haskell
|
||||
text
|
||||
time
|
||||
twain
|
||||
utf8-string
|
||||
warp
|
||||
yaml
|
||||
];
|
||||
|
||||
executableHaskellDepends = [
|
||||
aeson
|
||||
base
|
||||
bytestring
|
||||
containers
|
||||
directory
|
||||
hsyslog
|
||||
http-conduit
|
||||
network-uri
|
||||
optparse-applicative
|
||||
pretty-simple
|
||||
process
|
||||
template-haskell
|
||||
text
|
||||
time
|
||||
twain
|
||||
utf8-string
|
||||
warp
|
||||
yaml
|
||||
];
|
||||
|
||||
description = "OAuth2 tool for mail clients";
|
||||
homepage = "https://sr.ht/~petrus/mailctl/";
|
||||
changelog = "https://git.sr.ht/~petrus/mailctl/refs/${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ aidalgol ];
|
||||
mainProgram = "mailctl";
|
||||
}
|
||||
|
|
@ -5,6 +5,8 @@
|
|||
, gnupg
|
||||
, makeWrapper
|
||||
, autoPatchelfHook
|
||||
, testers
|
||||
, browserpass
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
@ -18,7 +20,7 @@ buildGoModule rec {
|
|||
sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
|
||||
vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
|
||||
|
||||
|
|
@ -56,6 +58,11 @@ buildGoModule rec {
|
|||
ln -s $out/lib/browserpass/hosts/firefox/*.json $out/lib/mozilla/native-messaging-hosts
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = browserpass;
|
||||
command = "browserpass --version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Browserpass native client app";
|
||||
homepage = "https://github.com/browserpass/browserpass-native";
|
||||
|
|
|
|||
25
pkgs/tools/security/frida-tools/default.nix
Normal file
25
pkgs/tools/security/frida-tools/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, fetchPypi, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "frida-tools";
|
||||
version = "12.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9SlDyp1fLOzLqu6sxVqY2jwEzQjrnbzfQXIRoyviPJY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygments
|
||||
prompt-toolkit
|
||||
colorama
|
||||
frida-python
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (client tools)";
|
||||
homepage = "https://www.frida.re/";
|
||||
maintainers = with lib.maintainers; [ s1341 ];
|
||||
license = lib.licenses.wxWindows;
|
||||
};
|
||||
}
|
||||
31
pkgs/tools/security/goblob/default.nix
Normal file
31
pkgs/tools/security/goblob/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goblob";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Macmod";
|
||||
repo = "goblob";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FnSlfLi40VwDyQY77PvhV7EbhUDs1uGx0VsgP8HgKTw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Enumeration tool for publicly exposed Azure Storage blobs";
|
||||
homepage = "https://github.com/Macmod/goblob";
|
||||
changelog = "https://github.com/Macmod/goblob/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue