mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c5a290d7d7
@ -7700,6 +7700,12 @@
|
||||
fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A";
|
||||
}];
|
||||
};
|
||||
Golo300 = {
|
||||
email = "lanzingertm@gmail.com";
|
||||
github = "Golo300";
|
||||
githubId = 58785758;
|
||||
name = "Tim Lanzinger";
|
||||
};
|
||||
Gonzih = {
|
||||
email = "gonzih@gmail.com";
|
||||
github = "Gonzih";
|
||||
|
||||
@ -429,7 +429,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
||||
|
||||
- `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment.
|
||||
|
||||
- `security.pam.enableSSHAgentAuth` now requires `services.openssh.authorizedKeysFiles` to be non-empty,
|
||||
- `security.pam.sshAgentAuth.enable` now requires `services.openssh.authorizedKeysFiles` to be non-empty,
|
||||
which is the case when `services.openssh.enable` is true. Previously, `pam_ssh_agent_auth` silently failed to work.
|
||||
|
||||
- `security.pam.enableSSHAgentAuth` was replaced by the `sshAgentAuth` attrset, and **only**
|
||||
|
||||
@ -43,13 +43,10 @@ in
|
||||
)
|
||||
|
||||
# Start MuseScore window
|
||||
machine.execute("DISPLAY=:0.0 mscore >&2 &")
|
||||
machine.execute("env XDG_RUNTIME_DIR=$PWD DISPLAY=:0.0 mscore >&2 &")
|
||||
|
||||
# Wait until MuseScore has launched
|
||||
machine.wait_for_window("MuseScore 4")
|
||||
|
||||
# Wait until the window has completely initialised
|
||||
machine.wait_for_text("MuseScore 4")
|
||||
machine.wait_for_window("MuseScore Studio")
|
||||
|
||||
machine.screenshot("MuseScore0")
|
||||
|
||||
@ -75,29 +72,22 @@ in
|
||||
machine.screenshot("MuseScore2")
|
||||
|
||||
# Go to the export dialogue and create a PDF
|
||||
machine.send_key("alt-f")
|
||||
machine.sleep(1)
|
||||
machine.send_key("e")
|
||||
machine.send_key("ctrl-p")
|
||||
|
||||
# Wait until the export dialogue appears.
|
||||
machine.wait_for_text("Export")
|
||||
|
||||
machine.screenshot("MuseScore3")
|
||||
|
||||
machine.send_key("shift-tab")
|
||||
machine.sleep(1)
|
||||
machine.send_key("ret")
|
||||
machine.sleep(1)
|
||||
machine.send_key("ret")
|
||||
# Wait until the Print dialogue appears.
|
||||
machine.wait_for_window("Print")
|
||||
|
||||
machine.screenshot("MuseScore4")
|
||||
|
||||
# Wait until PDF is exported
|
||||
machine.wait_for_file('"/root/Documents/MuseScore4/Scores/Untitled score.pdf"')
|
||||
|
||||
# Check that it contains the title of the score
|
||||
machine.succeed('pdfgrep "Untitled score" "/root/Documents/MuseScore4/Scores/Untitled score.pdf"')
|
||||
machine.send_key("alt-p")
|
||||
machine.sleep(1)
|
||||
|
||||
machine.screenshot("MuseScore5")
|
||||
|
||||
# Wait until PDF is exported
|
||||
machine.wait_for_file('"/root/Untitled score.pdf"')
|
||||
|
||||
## Check that it contains the title of the score
|
||||
machine.succeed('pdfgrep "Untitled score" "/root/Untitled score.pdf"')
|
||||
machine.copy_from_vm("/root/Untitled score.pdf")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -20,6 +20,9 @@
|
||||
, qtdeclarative
|
||||
, qtgraphicaleffects
|
||||
, flac
|
||||
, libopusenc
|
||||
, libopus
|
||||
, tinyxml-2
|
||||
, qtquickcontrols
|
||||
, qtquickcontrols2
|
||||
, qtscript
|
||||
@ -47,13 +50,13 @@ let
|
||||
} else portaudio;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "musescore";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musescore";
|
||||
repo = "MuseScore";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-X3zvrIf5DOC5PWcnuw0aClm++IWUED1ZzAyjnp7Mo+g=";
|
||||
sha256 = "sha256-EqPofl2l+UBkmuzym4bL0EyFx+SOxVy0EXtxbw9Sqiw=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -62,8 +65,12 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
# not useful on NixOS, see:
|
||||
# https://github.com/musescore/MuseScore/issues/15571
|
||||
"-DMUE_BUILD_CRASHPAD_CLIENT=OFF"
|
||||
# Use our freetype
|
||||
# Use our versions of system libraries
|
||||
"-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON"
|
||||
"-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON"
|
||||
# Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON
|
||||
"-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON"
|
||||
"-DMUE_COMPILE_USE_SYSTEM_FLAC=ON"
|
||||
# From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake,
|
||||
# upstream defaults to compiling to x86_64 only, unless this cmake flag is
|
||||
# set
|
||||
@ -102,6 +109,9 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
portaudio'
|
||||
portmidi
|
||||
flac
|
||||
libopusenc
|
||||
libopus
|
||||
tinyxml-2
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtgraphicaleffects
|
||||
|
||||
@ -165,10 +165,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "bsnes-libretro",
|
||||
"rev": "37606e377ebae5d3175cd6267e4ddfa3f3c5091f",
|
||||
"hash": "sha256-B1ragos8ZeCjg8Xlt6SC8V69iTZ6OXTpPptlWw4EMOU="
|
||||
"rev": "44f6ce5dedb138ded8e59d71df18cae5b0655eba",
|
||||
"hash": "sha256-7iB2VQ3f8YVOV3C+Rkviaj7USoZdO/riDnT9kCdzc8k="
|
||||
},
|
||||
"version": "unstable-2024-05-17"
|
||||
"version": "unstable-2024-05-31"
|
||||
},
|
||||
"bsnes-hd": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -297,21 +297,21 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-fceumm",
|
||||
"rev": "0dc5915f0ba10d4bb63b35fbfa57b81a3dd0955e",
|
||||
"hash": "sha256-fLgJ3EWOaHMpBxPqhjcyYKuwVzIiAmKhk0KUmUswlmY="
|
||||
"rev": "c970bcc2b527f2c9d072e3ad2a5e3b4143246e25",
|
||||
"hash": "sha256-EOtUExsYIXyuX2bTzs9Ia0i9aIMdXVByhZ+S0bSPfJw="
|
||||
},
|
||||
"version": "unstable-2024-05-27"
|
||||
"version": "unstable-2024-05-29"
|
||||
},
|
||||
"flycast": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "90896368b80531e492fede0e17c54f7e6855a13b",
|
||||
"hash": "sha256-7JhHpNYxC6oNyvLCMmBie0pkPgWJ9hxfeYRxmmgpBso=",
|
||||
"rev": "021249c321826ecb6b0a0ed6e5d2af9044e973a3",
|
||||
"hash": "sha256-/S/43/fKZrUjZTSq51NY3OU3oDpyoqNbHB2QGzqBOuk=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-05-27"
|
||||
"version": "unstable-2024-06-02"
|
||||
},
|
||||
"fmsx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-201zceUedEl93nyglWJo0f9SDfFX31toP0MzzHQeJds=";
|
||||
hash = "sha256-g0aMpSENMKHCyKyB2Lhq9XjH9GIx7l4/Sz9GDXmzUqU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q=";
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, clangStdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, spdlog
|
||||
@ -9,6 +10,7 @@
|
||||
, libbpf
|
||||
, elfutils
|
||||
, bpftools
|
||||
, pcre2
|
||||
, zlib
|
||||
}:
|
||||
|
||||
@ -24,6 +26,15 @@ clangStdenv.mkDerivation rec {
|
||||
sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: remove this when updating to next stable release
|
||||
(fetchpatch {
|
||||
name = "allow-regex-pattern-matching.patch";
|
||||
url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch";
|
||||
hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,6 +44,7 @@ clangStdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pcre2
|
||||
spdlog
|
||||
nlohmann_json
|
||||
systemd
|
||||
@ -51,6 +63,7 @@ clangStdenv.mkDerivation rec {
|
||||
"-DUSE_BPF_PROC_IMPL=ON"
|
||||
"-DBPF_BUILD_LIBBPF=OFF"
|
||||
"-DENABLE_SYSTEMD=ON"
|
||||
"-DENABLE_REGEX_SUPPORT=ON"
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
|
||||
@ -59,12 +72,15 @@ clangStdenv.mkDerivation rec {
|
||||
rm -rf "$out"/lib/cmake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp";
|
||||
description = "Rewrite of ananicy in c++ for lower cpu and memory usage";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
artturin
|
||||
johnrtitor
|
||||
];
|
||||
mainProgram = "ananicy-cpp";
|
||||
};
|
||||
}
|
||||
@ -8,12 +8,12 @@
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "2.7.6";
|
||||
version = "2.8.4";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aZ7hdAZJH1PvrX9GQLzLquzzZG3LZSKOvt7sWQhTiR8=";
|
||||
hash = "sha256-O4s7PhSUTXoNEIi+zYASx8AgClMC5rs7se863G6w+l0=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
@ -24,10 +24,10 @@ buildGoModule {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-th0R3Q1nGT0q5PGOygtD1/CpJmrT5TYagrwQR4t/Fvg=";
|
||||
hash = "sha256-CBfyqtWp3gYsYwaIxbfXO3AYaBiM7LutLC7uZgYXfkQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ebnSehuhbCY58ctM8IRVMfNxxbJBp6ht9cbuLdGFNek=";
|
||||
vendorHash = "sha256-1Api8bBZJ1/oYk4ZGIiwWCSraLzK9L+hsKXkFtk6iVM=";
|
||||
|
||||
subPackages = [ "cmd/caddy" ];
|
||||
|
||||
@ -36,6 +36,9 @@ buildGoModule {
|
||||
"-X github.com/caddyserver/caddy/v2.CustomVersion=${version}"
|
||||
];
|
||||
|
||||
# matches upstream since v2.8.0
|
||||
tags = [ "nobadger" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
|
||||
let
|
||||
pname = "jan";
|
||||
version = "0.4.14";
|
||||
version = "0.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
|
||||
hash = "sha256-nqTvLZ0upNI82R4QaHTKaGQLVC3eHMVEHoOZ4JvXR1E=";
|
||||
hash = "sha256-yU2J9RctID/n0INAFyHbdbaHvWJm1384p1Za3MCJuL0=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@ -71,13 +71,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "3015";
|
||||
version = "3070";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-/n5SiTU5//Vx/vtIev8Yxc/xYwjxVpPhiTr1LnDp4fs=";
|
||||
hash = "sha256-3PJ3YBFMSv2bFHkcDpOAZ/ZbuKEGjyfeLI7oavDbfBc=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2024-05-29";
|
||||
version = "0-unstable-2024-05-31";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "ed137a21c1d18272a16d6801de1029d183ab11c8";
|
||||
hash = "sha256-SbWRgTz/zxLcM+Zr0IW4gZTspumFSDA9FcfOwAGOeUI=";
|
||||
rev = "fadea1fb13d562e52de95d3f2724c4110bb258d0";
|
||||
hash = "sha256-Jbog3YgaoTUEdb1G9eS9SAhlbQRITS2jSsp0yeTHdnI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
renode.overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.0+20240517gitf683c4f59";
|
||||
version = "1.15.0+20240603gitf830e6345";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-fbGzh2vBKmtLbji8FunbNmbONZdFpJ/r6VUEO8odUec=";
|
||||
hash = "sha256-4DV5dYnT7oZl/i7k3g6ydXxIRt4+z/jLZAB7c6JDgO4=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "snipe-it";
|
||||
version = "6.4.1";
|
||||
version = "6.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snipe";
|
||||
repo = "snipe-it";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7IK5KLdWYcdzsJwzXfHsYvxWiR/R4407gGAGiY9+czY=";
|
||||
hash = "sha256-wNHFFqi1WNTzI3xv1/aXTPpVXe7oxiTqWMEYhplNM9A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KkFoc/fqYVgA5Vv6oEk+1/Rcj9VA52ZnH5O5qmLhmE4=";
|
||||
|
||||
3983
pkgs/by-name/sn/snx-rs/Cargo.lock
generated
Normal file
3983
pkgs/by-name/sn/snx-rs/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
33
pkgs/by-name/sn/snx-rs/package.nix
Normal file
33
pkgs/by-name/sn/snx-rs/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup, webkitgtk_4_1 }:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "snx-rs";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ancwrd1";
|
||||
repo = "snx-rs";
|
||||
rev = "v2.2.0";
|
||||
hash = "sha256-9aBJM20+G1U2NuJXBmax50o3M/lwRpLeqdcHCA28iAw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl glib atk gtk3 libsoup webkitgtk_4_1 ];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=platform::linux::net::tests::test_default_ip"
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"isakmp-0.1.0" = "sha256-Gk0/tyIQ62kH6ZSW6ov8SMVR2UBEWkz8HfqeWjSXmlY=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Open source Linux client for Checkpoint VPN tunnels";
|
||||
homepage = "https://github.com/ancwrd1/snx-rs";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ lib.maintainers.lheckemann ];
|
||||
};
|
||||
}
|
||||
50
pkgs/by-name/st/stash/package.nix
Normal file
50
pkgs/by-name/st/stash/package.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
|
||||
version = "0.25.1";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-linux";
|
||||
hash = "sha256-Rb4x6iKx6T9NPuWWDbNaz+35XPzLqZzSm0psv+k2Gw4=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-linux-arm64v8";
|
||||
hash = "sha256-6qPyIYKFkhmBNO47w9E91FSKlByepBOnl0MNJighGSc=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-macos";
|
||||
hash = "sha256-W8+rgqWUDTOB8ykGO2GL9tKEjaDXdx9LpFg0TAtJsxM=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit version;
|
||||
|
||||
pname = "stash";
|
||||
|
||||
src = fetchurl { inherit (sources.${stdenv.system}) url hash; };
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 $src $out/bin/stash
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stash is a self-hosted porn app.";
|
||||
homepage = "https://github.com/stashapp/stash";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ Golo300 ];
|
||||
platforms = builtins.attrNames sources;
|
||||
mainProgram = "stash";
|
||||
};
|
||||
})
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xcaddy";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
subPackages = [ "cmd/xcaddy" ];
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
owner = "caddyserver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xEPSRKrQC9hb+G9/rV9/k4btvZxXZkcsxmaxWcgl2fk=";
|
||||
hash = "sha256-4evqpkDb6/sduPuqRlnvvi/kS4H2zpYB8LB2PXmoopA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
"-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-7yd/6h1DKw7X/1NbHtr2vbpyapF81HPmDm7O4oV5nlc=";
|
||||
vendorHash = "sha256-NoOEvvaD3oUejlFIe1s95SjL/YRsuCSHFElnxaweA/s=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/caddyserver/xcaddy";
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "groovy";
|
||||
version = "3.0.11";
|
||||
version = "4.0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip";
|
||||
sha256 = "85abb44e81f94d794230cf5c2c7f1003e598a5f8a6ae04322f28c6f9efe395f6";
|
||||
sha256 = "sha256-Xvh49w24tkLSBOmkEMUZwRMaPnqd20tpENIUkJyy6Yo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out
|
||||
mkdir -p $out/share/doc/groovy
|
||||
rm bin/*.bat
|
||||
mv {bin,conf,grooid,indy,lib} $out
|
||||
mv {bin,conf,grooid,lib} $out
|
||||
mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy
|
||||
|
||||
sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proj";
|
||||
version = "9.4.0";
|
||||
version = "9.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA=";
|
||||
hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,13 +5,14 @@
|
||||
stdenv,
|
||||
|
||||
autoreconfHook,
|
||||
boost,
|
||||
boost185,
|
||||
cairomm,
|
||||
cgal,
|
||||
expat,
|
||||
gmp,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
llvmPackages,
|
||||
matplotlib,
|
||||
mpfr,
|
||||
numpy,
|
||||
@ -23,32 +24,51 @@
|
||||
sparsehash,
|
||||
}:
|
||||
|
||||
let
|
||||
# graph-tool doesn't build against boost181 on Darwin
|
||||
boost = boost185.override {
|
||||
enablePython = true;
|
||||
inherit python;
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "graph-tool";
|
||||
version = "2.65";
|
||||
version = "2.68";
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
|
||||
hash = "sha256-ozpFv9rri2toG8BeNTqzoJdkwB06GdJ69XjtPkjUKZw=";
|
||||
hash = "sha256-jB+/R6yZVhU0iohxYVNHdD205MauRxMoohbj4a2T+rw=";
|
||||
};
|
||||
|
||||
# Remove error messages about tput during build process without adding ncurses,
|
||||
# and replace unavailable git commit hash and date.
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'tput setaf $1' : \
|
||||
--replace-fail 'tput sgr0' : \
|
||||
--replace-fail \
|
||||
"\"esyscmd(git show | head -n 1 | sed 's/commit //' | grep -o -e '.\{8\}' | head -n 1 |tr -d '\n')\"" \
|
||||
'["(nixpkgs-${version})"]' \
|
||||
--replace-fail \
|
||||
"\"esyscmd(git log -1 | head -n 3 | grep 'Date:' | sed s/'Date: '// | tr -d '\n')\"" \
|
||||
'["(unavailable)"]'
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-python-module-path=$(out)/${python.sitePackages}"
|
||||
"--with-boost-libdir=${boost}/lib"
|
||||
"--with-expat=${expat}"
|
||||
"--with-cgal=${cgal}"
|
||||
"--enable-openmp"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# https://git.skewed.de/count0/graph-tool/-/wikis/installation-instructions#manual-compilation
|
||||
# https://graph-tool.skewed.de/installation.html#manual-compilation
|
||||
dependencies = [
|
||||
boost
|
||||
cairomm
|
||||
@ -64,13 +84,15 @@ buildPythonPackage rec {
|
||||
pygobject3
|
||||
scipy
|
||||
sparsehash
|
||||
];
|
||||
] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
|
||||
meta = with lib; {
|
||||
pythonImportsCheck = [ "graph_tool" ];
|
||||
|
||||
meta = {
|
||||
description = "Python module for manipulation and statistical analysis of graphs";
|
||||
homepage = "https://graph-tool.skewed.de";
|
||||
license = licenses.lgpl3Plus;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ ];
|
||||
changelog = "https://git.skewed.de/count0/graph-tool/commits/release-${version}";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2024.4.12";
|
||||
version = "2024.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = "hahomematic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-iWl9kDLRh9CAk0tOibDOHcBV7lwVY/TWKYMBZW9G2k0=";
|
||||
hash = "sha256-pNG1R19H3fRje2pfW2hZw3zuGnElksI+Ugm6imnzK/w=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lupa";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dgAwcS1SczlvXpY92HMa77WsZdku/4v4/UEkwWMP6VA=";
|
||||
hash = "sha256-ZloAa8+Nmqzf25U4JLkp0GoMVZEKZitZvi8VerTIkk0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -7,24 +7,28 @@
|
||||
python,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
which,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nodeenv";
|
||||
version = "1.8.0";
|
||||
format = "setuptools";
|
||||
version = "1.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ekalinin";
|
||||
repo = pname;
|
||||
repo = "nodeenv";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aW/aNZbFXfP4bF/Nlvv419IDfaJRA1pJYM7awj+6Hz0=";
|
||||
hash = "sha256-85Zr4RbmNeW3JAdtvDblWaPTivWWUJKh+mJbtsGJVO4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.2.19";
|
||||
version = "0.2.20";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyExploitDb";
|
||||
inherit version;
|
||||
hash = "sha256-coxO3WQt60b6I2QfhViuTiOp+VuktUoddWjbMxUOx7E=";
|
||||
hash = "sha256-vRh99vi+24euDF3FwYs5KgYlWymCRK8fh8yp2FYYHkQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -2,17 +2,18 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
proj,
|
||||
fetchpatch,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
substituteAll,
|
||||
cython,
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
|
||||
certifi,
|
||||
cython,
|
||||
mock,
|
||||
numpy,
|
||||
shapely,
|
||||
pandas,
|
||||
proj,
|
||||
shapely,
|
||||
xarray,
|
||||
}:
|
||||
|
||||
@ -36,6 +37,12 @@ buildPythonPackage rec {
|
||||
proj = proj;
|
||||
projdev = proj.dev;
|
||||
})
|
||||
|
||||
# fix test failure caused by update of EPSG DB
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch";
|
||||
hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
@ -44,11 +51,11 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [ certifi ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
numpy
|
||||
shapely
|
||||
pandas
|
||||
pytestCheckHook
|
||||
shapely
|
||||
xarray
|
||||
];
|
||||
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
qtsvg,
|
||||
qtmultimedia,
|
||||
qtnetworkauth,
|
||||
qqc2-desktop-style,
|
||||
ffmpeg-full,
|
||||
mediainfo,
|
||||
mlt,
|
||||
@ -29,6 +30,8 @@ mkKdeDerivation {
|
||||
qtmultimedia
|
||||
qtnetworkauth
|
||||
|
||||
qqc2-desktop-style
|
||||
|
||||
mlt
|
||||
shared-mime-info
|
||||
libv4l
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "danielperna84";
|
||||
domain = "homematicip_local";
|
||||
version = "1.60.1";
|
||||
version = "1.62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielperna84";
|
||||
repo = "custom_homematic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EJj9zmDdJ+T7yrANmRJuLRCSwvGLy2CkIBsO9H3LIs4=";
|
||||
hash = "sha256-jvjbo4nOh19o/Z/cDJ+DqDnP/d5YDZjDJjBp5I6yRQc=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mushroom";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piitaya";
|
||||
repo = "lovelace-mushroom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lF6CBKQc1gu4ajD973xn75ZAs0vP7YGI3Dlc9YLvINo=";
|
||||
hash = "sha256-vMBjVPMofQb2mXFCkkEQM8TcOI9BBoosppbBr8jUKh4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-hexrJUrSJBv1hsLKnWOkm8E4KtD4W3YQZf/8/6BAaVw=";
|
||||
npmDepsHash = "sha256-nufQRdBiYzB9+eTYNb0iwLIAF9OQ7feVfMFcGjFowoc=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -21,15 +21,15 @@ let
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-aa9mkFRdvAi/A6OQnxDOiQ5yDXBbPbQxet8+XqHxrtE=";
|
||||
aarch64-linux = "sha256-neTIMWdx1UX9REZkLZtXpmyPb+NrbkMnXNrTn9bsECE=";
|
||||
x86_64-darwin = "sha256-JM0VhAbA72ZmZGZ8ke2MtB4Fi5//hr+Etk5UiMpq1LA=";
|
||||
x86_64-linux = "sha256-bYIavvea6Nwbn22CFiWXpzPGAI13oJYAIZr2FdLkyb8=";
|
||||
aarch64-darwin = "sha256-Scv4gXZZBujz/lq4QphH7rCQxTS7JT9wHpG4qsPK1mA=";
|
||||
aarch64-linux = "sha256-fEDXNUrhSpheBFis7OdK4+fvpvm4+D4ulM/+h5erZLA=";
|
||||
x86_64-darwin = "sha256-dgPuqclFQp/fOEIY32rlIqZIYbDzRbgHiYJRoICYWhg=";
|
||||
x86_64-linux = "sha256-c89EiThP2LgkaeDxx01rQTtFZGcXvpMgo6yp+VViJO0=";
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.17.2.4511";
|
||||
version = "1.18.0.4543";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
||||
@ -103,6 +103,12 @@ stdenv.mkDerivation rec {
|
||||
mv "$file" "''${file%%-shared}"
|
||||
done
|
||||
popd
|
||||
'' + lib.optionalString fortranSupport
|
||||
''
|
||||
mv $out/mod/shared $dev/include
|
||||
rm -r $out/mod
|
||||
|
||||
find "$out" -type f -exec remove-references-to -t ${fortran} '{}' +
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
1263
pkgs/tools/text/difftastic/Cargo.lock
generated
Normal file
1263
pkgs/tools/text/difftastic/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,10 +1,20 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
, difftastic
|
||||
}:
|
||||
|
||||
let
|
||||
mimallocPatch = fetchpatch {
|
||||
# fixes compilation error on x86_64-darwin
|
||||
# remove after update to libmimalloc-sys >= 0.1.29
|
||||
# (fixed in mimalloc >= 1.7.6 which is included with libmimalloc-sys >= 0.1.29)
|
||||
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
|
||||
hash = "sha256-DK0LqsVXXiEVQSQCxZ5jyZMg0UJJx9a/WxzCroYSHZc=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "difftastic";
|
||||
version = "0.58.0";
|
||||
@ -16,13 +26,18 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-PTc8/NhWsLcKJj+9ebV/YaWEmyOWKJCYUjmVbr4z2SY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wtWJ32bBoCmx+eGkrOk8o0OQFMhGYZEBEDI1oHn3Zuw=";
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
"--skip=options::tests::test_detect_display_width"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patch -d $cargoDepsCopy/libmimalloc-sys-0.1.24/c_src/mimalloc \
|
||||
-p1 < ${mimallocPatch}
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = difftastic; };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -28201,8 +28201,6 @@ with pkgs;
|
||||
|
||||
ananicy = callPackage ../misc/ananicy { };
|
||||
|
||||
ananicy-cpp = callPackage ../misc/ananicy-cpp { };
|
||||
|
||||
andagii = callPackage ../data/fonts/andagii { };
|
||||
|
||||
andika = callPackage ../data/fonts/andika { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user