mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 03:10:19 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmmp";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-Jb4/KxnY1wtrUTbD+X04Wl7b9A2sZ92E/N1K+dVU95U=";
|
||||
hash = "sha256-knqo5yCkcO/bFmM++z+SdiWzpDKK9ooV0wqlcIKj7so=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
# use ./update.sh to help with updating for each quarterly release
|
||||
#
|
||||
# then, to test:
|
||||
# for e in cpp dsl embedcpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done
|
||||
# for e in cpp dsl embedcpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix-build -A ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done
|
||||
|
||||
let
|
||||
platform_major = "4";
|
||||
|
||||
@@ -30,14 +30,24 @@
|
||||
|
||||
let
|
||||
gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
|
||||
supported = {
|
||||
x86_64-linux = {
|
||||
sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
aarch64-linux = {
|
||||
sha256 = "sha256-Kjl8mEpayA1xMHEAMJ5k3Ctk3l48KlUBU5w3dL4pGWM=";
|
||||
arch = "linux-arm64";
|
||||
};
|
||||
};
|
||||
|
||||
base = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
|
||||
in
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
mktplcRef = base // {
|
||||
name = "cpptools";
|
||||
publisher = "ms-vscode";
|
||||
version = "1.17.3";
|
||||
sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -85,6 +95,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.jraygauthier lib.maintainers.stargate01 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
, pkg-config
|
||||
|
||||
, alsa-lib
|
||||
, binutils
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
@@ -25,16 +26,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xournalpp";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xournalpp";
|
||||
repo = pname;
|
||||
repo = "xournalpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6ND0Y+TzdN2rRI10cusgSK1sYMC55Wn5qFCHP4hsdes=";
|
||||
sha256 = "sha256-8UAAX/kixqiY9zEYs5eva0G2K2vlfnYd1yyVHMSfSeY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/util/Stacktrace.cpp \
|
||||
--replace-fail "addr2line" "${binutils}/bin/addr2line"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
@@ -56,8 +63,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildFlags = [ "translations" ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
|
||||
homepage = "https://xournalpp.github.io/";
|
||||
@@ -65,5 +70,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ andrew-d sikmir ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "xournalpp";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "halloy";
|
||||
version = "2024.2";
|
||||
version = "2024.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidowl";
|
||||
repo = "halloy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SzjMoXISd4fMHoenF1CK3Yn8bfLq9INuOmt86QTcgk8=";
|
||||
hash = "sha256-9yEkM65c8R71oQ0C54xZqwRh609+HSaq4Hb8izNM52A=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -1,4 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, wrapGAppsHook, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
, ant
|
||||
, jdk
|
||||
, jre
|
||||
, gtk2
|
||||
, glib
|
||||
, libXtst
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
let
|
||||
_version = "2.10.4";
|
||||
@@ -26,10 +39,6 @@ stdenv.mkDerivation rec {
|
||||
pname = "jameica";
|
||||
inherit version;
|
||||
|
||||
nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ]
|
||||
++ lib.optional stdenv.isDarwin Cocoa;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "willuhn";
|
||||
repo = "jameica";
|
||||
@@ -37,15 +46,29 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-MSVSd5DyVL+dcfTDv1M99hxickPwT2Pt6QGNsu6DGZI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Fix jar timestamps for reproducibility
|
||||
substituteInPlace build/build.xml \
|
||||
--replace-fail '<jar ' '<jar modificationtime="0" '
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib libXtst ]
|
||||
++ lib.optional stdenv.isDarwin Cocoa;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries
|
||||
# and is not able to build the application itself
|
||||
buildPhase = ''
|
||||
(cd build; ant -Dsystem.version=${version} init compile jar)
|
||||
runHook preBuild
|
||||
ant -f build -Dsystem.version=${version} init compile jar
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/
|
||||
|
||||
# copy libraries except SWT
|
||||
@@ -57,6 +80,8 @@ stdenv.mkDerivation rec {
|
||||
install -Dm644 plugin.xml $out/share/java/
|
||||
install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -2,7 +2,7 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/componen
|
||||
index c51e76d..ae8159e 100644
|
||||
--- a/src/elan-dist/src/component/package.rs
|
||||
+++ b/src/elan-dist/src/component/package.rs
|
||||
@@ -56,6 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
|
||||
@@ -56,6 +56,37 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
|
||||
entry
|
||||
.unpack(&full_path)
|
||||
.chain_err(|| ErrorKind::ExtractingPackage)?;
|
||||
@@ -26,9 +26,11 @@ index c51e76d..ae8159e 100644
|
||||
+ use std::os::unix::fs::PermissionsExt;
|
||||
+ let new_path = dest_path.with_extension("orig");
|
||||
+ ::std::fs::rename(dest_path, &new_path)?;
|
||||
+ ::std::fs::write(dest_path, format!(r#"#! @shell@
|
||||
+LEAN_CC="${{LEAN_CC:-@cc@}}" exec -a "$0" {} "$@" -L {}/lib # use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS
|
||||
+"#, new_path.to_str().unwrap(), dest_path.parent().unwrap().parent().unwrap().to_str().unwrap()))?;
|
||||
+ ::std::fs::write(dest_path, r#"#! @shell@
|
||||
+dir="$(dirname "${BASH_SOURCE[0]}")"
|
||||
+# use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS
|
||||
+LEAN_CC="${LEAN_CC:-@cc@}" exec -a "$0" "$dir/leanc.orig" "$@" -L"$dir/../lib"
|
||||
+"#)?;
|
||||
+ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;
|
||||
+ }
|
||||
+
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell, fetchpatch
|
||||
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell
|
||||
, openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -23,14 +23,6 @@ rustPlatform.buildRustPackage rec {
|
||||
buildFeatures = [ "no-self-update" ];
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
# revert temporary directory creation, because it break the wrapper
|
||||
# https://github.com/NixOS/nixpkgs/pull/289941#issuecomment-1980778358
|
||||
(fetchpatch {
|
||||
url = "https://github.com/leanprover/elan/commit/bd54acaab75d08b3912ee1f051af8657f3a9cfdf.patch";
|
||||
hash = "sha256-6If/wxWSea8Zjlp3fx9wh3D0TjmWZbvCuY9q5c2qJGA=";
|
||||
revert = true;
|
||||
})
|
||||
|
||||
# Run patchelf on the downloaded binaries.
|
||||
# This is necessary because Lean 4 is now dynamically linked.
|
||||
(runCommand "0001-dynamically-patchelf-binaries.patch" {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
, libogg
|
||||
, libpng
|
||||
, libtheora
|
||||
, lua
|
||||
, lua5_4
|
||||
, minizip
|
||||
, openal
|
||||
, SDL2
|
||||
@@ -23,7 +23,7 @@
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
version = "2.81.1";
|
||||
version = "2.82.0";
|
||||
|
||||
fetchAsset = { asset, hash }: fetchurl {
|
||||
url = "https://mirror.etlegacy.com/etmain/${asset}";
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
|
||||
owner = "etlegacy";
|
||||
repo = "etlegacy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CGXtc51vaId/SHbD34ZeT0gPsrl7p2DEw/Kp+GBZIaA="; # 2.81.1
|
||||
hash = "sha256-yNVVEa+3+Swm3hgwm9cSLV0K88E37TgVVjh1uUl8O2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
|
||||
libogg
|
||||
libpng
|
||||
libtheora
|
||||
lua
|
||||
lua5_4
|
||||
minizip
|
||||
openal
|
||||
SDL2
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.123.7";
|
||||
version = "0.123.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uUE694xbu508vny/sbxndGlsFXnBz45fLhieuK4sX/c=";
|
||||
hash = "sha256-sL/LiQwbn3nD2eDFNuAbDHRGemTiBhTfb5IaugYL9dM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V7YRrC+6fOIjXOu7E0kIOZZt++4oFLPhmHeWmOVU3Xw=";
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mystmd";
|
||||
version = "1.1.45";
|
||||
version = "1.1.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "mystmd";
|
||||
rev = "mystmd@${version}";
|
||||
hash = "sha256-qHlgAc1ddSVevH/82QCVXjIlht/RMcypTUcY+A/gRRg=";
|
||||
hash = "sha256-rMmq2xArkbVIZRFGCYSl9D65LxUdyiZMR6CbYJbKNSw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-yEeATMpSEr20MJdzq8HWSSjRBd+rHEq2oMVOnKymWhY=";
|
||||
npmDepsHash = "sha256-cwuKexK0S3pW0rJpjfbAHu7/MLSs8axbyX6BWJq2Ieo=";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "numbat";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "numbat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/jt1+21yem0q/dlc7z89MRaVrnllb9QLSQUo2f/9q8o=";
|
||||
hash = "sha256-/XUDtyOk//J4S9NoRP/s5s6URkdzePhW7UQ4FxDgmhs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8AA0LTw/9kd6yDme4N3/ANVkS67eoLrJviNhdqUftXM=";
|
||||
cargoHash = "sha256-uM4LmD78ZHAzx5purTO+MUstaSrR+j2LuSDUBI2tl3s=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "scsh";
|
||||
@@ -12,6 +12,15 @@ stdenv.mkDerivation {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Don't not include util.h if libutil.h is available
|
||||
# https://github.com/scheme/scsh/pull/49
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scheme/scsh/commit/b04e902de983761d7f432b2cfa364ca5d162a364.patch";
|
||||
hash = "sha256-XSHzzCOBkraqW2re1ePoFl9tKQB81iQ0W9wvv83iGdA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ scheme48 ];
|
||||
configureFlags = [ "--with-scheme48=${scheme48}" ];
|
||||
@@ -22,5 +31,6 @@ stdenv.mkDerivation {
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ joachifm ];
|
||||
platforms = with platforms; unix;
|
||||
mainProgram = "scsh";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -112,11 +112,11 @@ let
|
||||
in
|
||||
{
|
||||
ogre_14 = common {
|
||||
version = "14.1.2";
|
||||
hash = "sha256-qPoC5VXA9IC1xiFLrvE7cqCZFkuiEM0OMowUXDlmhF4=";
|
||||
# https://github.com/OGRECave/ogre/blob/v14.1.2/Components/Overlay/CMakeLists.txt
|
||||
imguiVersion = "1.89.8";
|
||||
imguiHash = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo=";
|
||||
version = "14.2.2";
|
||||
hash = "sha256-85hpujmlM3N81mkiA80xx2C4GsdzWkP61bwdfmw1zt8=";
|
||||
# https://github.com/OGRECave/ogre/blob/v14.2.2/Components/Overlay/CMakeLists.txt
|
||||
imguiVersion = "1.90.4";
|
||||
imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw=";
|
||||
};
|
||||
|
||||
ogre_13 = common {
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc";
|
||||
version = "17.3.48";
|
||||
version = "17.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AVavnUsx/hUrT1gspfMNxtmyDLUty+ocPqRZAun036I=";
|
||||
hash = "sha256-SJyCxKncHRdWZUdsosOCLLRYG+ym8utXwAJjn3BRRHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apprise";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MeKmOUB7uNJmJJ/Adf8xfp00/1lRxuFr/u/dwq9f6Ew=";
|
||||
hash = "sha256-716DAFEUDUIop1nFvC1oV7zH+GZN8+RPMPZGF84MenM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -365,14 +365,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.58";
|
||||
version = "1.34.59";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FOqFo1X5hL19wX45I3v8JMOlVHn7y4fxfAAmm9laK0Q=";
|
||||
hash = "sha256-Yb6i+oGvd1TBCG4WHkuDm7+MCOSKr27i/2rN2OtuFuU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.58";
|
||||
version = "1.34.59";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-f4IO03oREJdEqMSuufAiTHEUtaqry9RvxsT2Cvafqj4=";
|
||||
hash = "sha256-uUbRzDRMafLopqi7EgZQ5Iwf0yEvdvWGurKw+K/qynU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, cheroot
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, jaraco-collections
|
||||
, more-itertools
|
||||
@@ -24,23 +25,34 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cherrypy";
|
||||
version = "18.8.0";
|
||||
format = "setuptools";
|
||||
version = "18.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "CherryPy";
|
||||
inherit version;
|
||||
hash = "sha256-m0jPuoovFtW2QZzGV+bVHbAFujXF44JORyi7A7vH75s=";
|
||||
hash = "sha256-awbBkc5xqGRh8wVyoatX/8CfQxQ7qOQsEDx7M0ciDrE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Replace distutils.spawn.find_executable with shutil.which, https://github.com/cherrypy/cherrypy/pull/2023
|
||||
(fetchpatch {
|
||||
name = "remove-distutils.patch";
|
||||
url = "https://github.com/cherrypy/cherrypy/commit/8a19dd5f1e712a326a3613b17e6fc900012ed09a.patch";
|
||||
hash = "sha256-fXECX0CdU74usiq9GEkIG9CF+dueszblT4qOeF6B700=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"setuptools_scm_git_archive >= 1.1",' ""
|
||||
# Disable doctest plugin because times out
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--doctest-modules" "-vvv" \
|
||||
--replace "-p pytest_cov" "" \
|
||||
--replace "--no-cov-on-fail" ""
|
||||
--replace-fail "--doctest-modules" "-vvv" \
|
||||
--replace-fail "-p pytest_cov" "" \
|
||||
--replace-fail "--no-cov-on-fail" ""
|
||||
sed -i "/--cov/d" pytest.ini
|
||||
'';
|
||||
|
||||
@@ -50,10 +62,10 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cheroot
|
||||
portend
|
||||
more-itertools
|
||||
zc-lockfile
|
||||
jaraco-collections
|
||||
more-itertools
|
||||
portend
|
||||
zc-lockfile
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -126,6 +138,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Object-oriented HTTP framework";
|
||||
homepage = "https://cherrypy.dev/";
|
||||
changelog = "https://github.com/cherrypy/cherrypy/blob/v${version}/CHANGES.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-asset";
|
||||
version = "3.24.3";
|
||||
version = "3.25.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-owRdxr4Kr6VehuHl/mZuZo7XqixX2glWwJ3F/tq82bc=";
|
||||
hash = "sha256-JiPKFOew9Pd2NuY7wDlFQ/N06m9IRutWO+d/YJspry0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.15.3";
|
||||
version = "3.16.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9BCV3jYq8svvMbhKoQVMAlGYTggyi1qreG6T/yEIfy8=";
|
||||
hash = "sha256-DWmh96XviHVsmeVrivTDnq5A0hBog/DieUxcs2QmltU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-netapp";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g+tH/u2lEbQDdMPo/4+kl03+d9mrLzR2Eo/H8e8Niic=";
|
||||
hash = "sha256-va5Ql8GPMLszgjjSkI6am6IGQnEqvi+YSBcTFeu254U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-loiKMV7guByukm9XBohVbCDsV607i8PXiQaJ8GZS6Go=";
|
||||
hash = "sha256-Wp88cJqlAaAkaemHzkgKuhU4v4dFpgn5Sf+uqGKTeWQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,25 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, requests
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, psutil
|
||||
, pylibmc
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, toml
|
||||
, mysqlclient
|
||||
, zc-lockfile
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-services";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2da740487d08ea63dfdf718f5d4ba11e590c99ddf5481549edebf7a3a42ca536";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytest-dev";
|
||||
repo = "pytest-services";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-E/VcKcAb1ekypm5jP4lsSz1LYJTcTSed6i5OY5ihP30=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Replace distutils.spawn.find_executable with shutil.which, https://github.com/pytest-dev/pytest-services/pull/46
|
||||
(fetchpatch {
|
||||
name = "replace-distutils.patch";
|
||||
url = "https://github.com/pytest-dev/pytest-services/commit/e0e2a85434a2dcbcc0584299c5b2b751efe0b6db.patch";
|
||||
hash = "sha256-hvr7EedfjfonHDn6v2slwUBqz1xQoF7Ez/kqAhZRXEc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
toml
|
||||
@@ -33,14 +51,27 @@ buildPythonPackage rec {
|
||||
zc-lockfile
|
||||
];
|
||||
|
||||
# no tests in PyPI tarball
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
mysqlclient
|
||||
pylibmc
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pytest_services" ];
|
||||
pythonImportsCheck = [
|
||||
"pytest_services"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require binaries and additional parts
|
||||
"test_memcached"
|
||||
"test_mysql"
|
||||
"test_xvfb "
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Services plugin for pytest testing framework";
|
||||
homepage = "https://github.com/pytest-dev/pytest-services";
|
||||
changelog = "https://github.com/pytest-dev/pytest-services/blob/${version}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rns";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7j82M2T3bPypcXa3SsAflrN5T+d+JJlg3voYu8ALmXE=";
|
||||
hash = "sha256-QcYjqqeXBKx+Ef00Bw1OJMWDMdQgp/fqh3r5yhsa0Kg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
# darwin
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
|
||||
# tests
|
||||
, firefox-esr-unwrapped
|
||||
@@ -43,6 +44,7 @@ rustPlatform.buildRustPackage {
|
||||
openssl
|
||||
] ++ lib.optionals (stdenv.isDarwin) [
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
|
||||
@@ -21,13 +21,13 @@ in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
version = "0.124.8";
|
||||
version = "0.124.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
rev = version;
|
||||
hash = "sha256-u4p22efkwpIY447O+F83pcz8C+iSwLHocsbZdRpgSmE=";
|
||||
hash = "sha256-I5dotao26D2fn1opQunUOFtJ/vS19lGumN6A21jkBjA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PZWMqv3R4Dq4cLtGNuvHCQ/GiYvlKJfSKEmBn0JYnb8=";
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
pname = "antidote";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattmc3";
|
||||
repo = "antidote";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eS2sf+N50N+oyk8wCp71hYF7WDagFBlTcAB/sFdhw9U=";
|
||||
hash = "sha256-8kNMCo/DwZvBwqh/434GqK7z4KXgkwZH9SazLbH8SfM=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "zfs_replicate";
|
||||
version = "3.2.9";
|
||||
version = "3.2.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JMkZ4AexN++vPIPqzv9majdUkoAyos+Nm4Vlgeyx0Jg=";
|
||||
hash = "sha256-LEBCdrJZLddJm2nz2JLfwskU8roN/MZlr79exFEWnRI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,38 +1,64 @@
|
||||
{ fetchurl, lib, stdenv, ant, jdk, runtimeShell }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, ant
|
||||
, jdk
|
||||
, jre
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fop";
|
||||
version = "2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz";
|
||||
sha256 = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc=";
|
||||
url = "mirror://apache/xmlgraphics/fop/fop-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc=";
|
||||
};
|
||||
|
||||
buildInputs = [ ant jdk ];
|
||||
postPatch = ''
|
||||
# Fix jar timestamps for reproducibility
|
||||
substituteInPlace fop/build.xml \
|
||||
--replace-fail '<jar ' '<jar modificationtime="0" '
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
# Note: not sure if this is needed anymore
|
||||
env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8";
|
||||
|
||||
# build only the "package" target, which generates the fop command.
|
||||
buildPhase = ''
|
||||
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
|
||||
ant -f fop/build.xml package
|
||||
runHook preBuild
|
||||
|
||||
# build only the "package" target, which generates the fop command.
|
||||
ant -f fop/build.xml package
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib $out/share/doc/fop
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib $out/share/doc/fop
|
||||
cp fop/build/*.jar fop/lib/*.jar $out/lib/
|
||||
cp -r README fop/examples/ $out/share/doc/fop/
|
||||
|
||||
# There is a fop script in the source archive, but it has many impurities.
|
||||
# Instead of patching out 90 % of the script, we write our own.
|
||||
cat > "$out/bin/fop" <<EOF
|
||||
#!${runtimeShell}
|
||||
java_exec_args="-Djava.awt.headless=true"
|
||||
exec ${jdk.jre}/bin/java \$java_exec_args -classpath "$out/lib/*" org.apache.fop.cli.Main "\$@"
|
||||
EOF
|
||||
chmod a+x $out/bin/fop
|
||||
makeWrapper ${jre}/bin/java $out/bin/fop \
|
||||
--add-flags "-Djava.awt.headless=true" \
|
||||
--add-flags "-classpath $out/lib/\*" \
|
||||
--add-flags "org.apache.fop.cli.Main"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://xmlgraphics.apache.org/fop/changes.html";
|
||||
description = "XML formatter driven by XSL Formatting Objects (XSL-FO)";
|
||||
longDescription = ''
|
||||
FOP is a Java application that reads a formatting object tree and then
|
||||
@@ -47,13 +73,13 @@ stdenv.mkDerivation rec {
|
||||
This package contains the fop command line tool.
|
||||
'';
|
||||
homepage = "https://xmlgraphics.apache.org/fop/";
|
||||
license = licenses.asl20;
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "fop";
|
||||
maintainers = with lib.maintainers; [ bjornfor tomasajt ];
|
||||
platforms = jre.meta.platforms;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1785,8 +1785,6 @@ with pkgs;
|
||||
|
||||
dysk = callPackage ../tools/filesystems/dysk { };
|
||||
|
||||
etlegacy = callPackage ../games/etlegacy { lua = lua5_4; };
|
||||
|
||||
fastfetch = callPackage ../tools/misc/fastfetch {
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
};
|
||||
@@ -5406,9 +5404,7 @@ with pkgs;
|
||||
texlive = callPackage ../tools/typesetting/tex/texlive { };
|
||||
inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX;
|
||||
|
||||
fop = callPackage ../tools/typesetting/fop {
|
||||
jdk = openjdk8;
|
||||
};
|
||||
fop = callPackage ../tools/typesetting/fop { };
|
||||
|
||||
fondu = callPackage ../tools/misc/fondu {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
@@ -7596,7 +7592,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
dump_syms = callPackage ../development/tools/dump_syms {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
|
||||
dumpasn1 = callPackage ../tools/security/dumpasn1 { };
|
||||
@@ -36288,7 +36284,7 @@ with pkgs;
|
||||
inherit (gnome2) libgnomecanvas;
|
||||
};
|
||||
|
||||
xournalpp = callPackage ../applications/graphics/xournalpp {
|
||||
xournalpp = darwin.apple_sdk_11_0.callPackage ../applications/graphics/xournalpp {
|
||||
lua = lua5_3;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user