Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
7e7fb6332c
@ -27,6 +27,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Spotify lyrics in your terminal";
|
||||
homepage = "https://github.com/raitonoberu/sptlrx";
|
||||
changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ MoritzBoehme ];
|
||||
};
|
||||
|
||||
@ -28,16 +28,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lapce";
|
||||
version = "0.0.12";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lapce";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZFQjQ5+G0b0Fgg3+du/drt+62rC/TCNR5MIdJXAkTrE=";
|
||||
sha256 = "sha256-KSumy7M7VNUib4CZ0ikBboEFMzDQt4xW+aUFHOi+0pA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sMTootPsenaWzLLFImo6HWC1pcm2uFupPhVWsUJp1Ak=";
|
||||
cargoSha256 = "sha256-7SVTcH9/Ilq8HcpJJI0KFiQA076lR2CAIBwmTVgmnjE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -175,7 +175,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
done
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# Until https://github.com/NixOS/nixpkgs/pull/172617 is applied,
|
||||
# parallel builds do not always work because of a bug in dlltool.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
# https://bugs.winehq.org/show_bug.cgi?id=43530
|
||||
# https://github.com/NixOS/nixpkgs/issues/31989
|
||||
|
||||
@ -46,22 +46,22 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "7.4";
|
||||
version = "7.8";
|
||||
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY=";
|
||||
sha256 = "sha256-j3bpyWtQ8qyOJOXe7fo+DZWWpXBnCSJvZalMahYAGbg=";
|
||||
inherit (stable) gecko32 gecko64 patches;
|
||||
|
||||
mono = fetchurl rec {
|
||||
version = "7.1.1";
|
||||
version = "7.2.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
sha256 = "sha256-ncjlYDt7xkNU65SuTqD2ghQkdno/9E/w0Z40akkMEeo=";
|
||||
sha256 = "sha256-Xwbq+646SezDHfzqd3B1vUTwzBJuT7Tijs76ButDYyM=";
|
||||
};
|
||||
};
|
||||
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q";
|
||||
sha256 = "sha256-payP+lx/aGZErGbkpogNMgsE393e7F2VGrllDKu/Lws=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
@ -84,8 +84,8 @@ in rec {
|
||||
|
||||
winetricks = fetchFromGitHub rec {
|
||||
# https://github.com/Winetricks/winetricks/releases
|
||||
version = "20210825";
|
||||
sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8=";
|
||||
version = "20220411";
|
||||
sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU=";
|
||||
owner = "Winetricks";
|
||||
repo = "winetricks";
|
||||
rev = version;
|
||||
|
||||
@ -22,20 +22,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rnote";
|
||||
version = "0.5.1-hotfix-1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Oq/RKeKICyImSPr4GSNjPXZWtuRQ7+9nRfl9MmC+UYI=";
|
||||
hash = "sha256-v4cca4tSv//VFUvOfemkueELxlez2TdtynqbzjCTlB4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-gdVy+7xSQVkI84Ta6KLOLR9UUsDoD2Cd0cuNU+OXf2M=";
|
||||
hash = "sha256-sK8GOLxNG4mu45oQSaFi467DHYt00Pxu3vMM6Po/YqI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -26,6 +26,12 @@ stdenv.mkDerivation {
|
||||
sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp
|
||||
'';
|
||||
|
||||
# Add workaround for -fno-common toolchains like upstream gcc-10 to
|
||||
# avoid build failures like:
|
||||
# ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of
|
||||
# `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out/{bin,share} -p
|
||||
cp src/cgg{,-dirgen} $out/bin/
|
||||
|
||||
@ -4,11 +4,11 @@ let
|
||||
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cinny";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
|
||||
sha256 = "sha256-tM3YA0GW8Z24gt8t9dOyr10GCINodAB0b4/gD7jfgOM=";
|
||||
sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "1.10.4-sc.1",
|
||||
"rev": "v1.10.4-sc.1",
|
||||
"srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl",
|
||||
"webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw",
|
||||
"jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di",
|
||||
"reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f",
|
||||
"desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn"
|
||||
"version": "1.10.12-sc.1",
|
||||
"rev": "v1.10.12-sc.1",
|
||||
"srcHash": "1rpfax6xx731w59a2i7v6jr17l3rnrn79d666f0cjchg36nkqqg9",
|
||||
"webYarnHash": "0m5dnz3m68iz94siwmavzj50wxd6w6wanjsm1zhq76lgymgcbqc2",
|
||||
"jsSdkYarnHash": "1k1jvavbqr7vcbdaxc6yqiq5254kxhywn1s2zndrfny7ap8z5c1c",
|
||||
"reactSdkYarnHash": "0cz7pgrbysljmhpf4m0wqwqjqijxahl3wz5qhczlkj46dvq6qyxb",
|
||||
"desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn"
|
||||
}
|
||||
|
||||
@ -78,13 +78,8 @@ in stdenv.mkDerivation rec {
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pushd matrix-react-sdk
|
||||
../element-web/node_modules/.bin/reskindex -h ../element-web/src/header
|
||||
popd
|
||||
|
||||
pushd element-web
|
||||
node scripts/copy-res.js
|
||||
node_modules/.bin/reskindex -h ../element-web/src/header
|
||||
node_modules/.bin/webpack --progress --mode production
|
||||
popd
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, avahi
|
||||
, cups
|
||||
, gnutls
|
||||
@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-FsmR0fFb9bU9G3oUyJU1eDLcoZ6OQ2//TINlPrW6lU0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "file-offset-bits-64-linux.patch";
|
||||
url = "https://github.com/michaelrsweet/pappl/commit/7ec4ce4331b6637c54a37943269e05d15ff6dd47.patch";
|
||||
sha256 = "sha256-x5lriopWw6Mn2qjv19flsleEzPMHU4jYWRy0y6hTL5k=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
51
pkgs/applications/science/math/primecount/default.nix
Normal file
51
pkgs/applications/science/math/primecount/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, primesieve
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "primecount";
|
||||
version = "7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primecount";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hxnn1uiGSB6XRC7yK+SXTwTsJfjhemWXsMNhhL7Ghek=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ primesieve ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_LIBPRIMESIEVE=ON"
|
||||
"-DBUILD_PRIMECOUNT=ON"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_STATIC_LIBS=OFF"
|
||||
"-DBUILD_TESTS=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kimwalisch/primecount";
|
||||
description = "Fast prime counting function implementations";
|
||||
longDescription = ''
|
||||
primecount is a command-line program and C/C++ library that counts the
|
||||
primes below an integer x ≤ 10^31 using highly optimized implementations
|
||||
of the combinatorial prime counting algorithms.
|
||||
|
||||
primecount includes implementations of all important combinatorial prime
|
||||
counting algorithms known up to this date all of which have been
|
||||
parallelized using OpenMP. primecount contains the first ever open source
|
||||
implementations of the Deleglise-Rivat algorithm and Xavier Gourdon's
|
||||
algorithm (that works). primecount also features a novel load balancer
|
||||
that is shared amongst all implementations and that scales up to hundreds
|
||||
of CPU cores. primecount has already been used to compute several prime
|
||||
counting function world records.
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
inherit (primesieve.meta) maintainers platforms;
|
||||
};
|
||||
}
|
||||
36
pkgs/applications/science/math/primesieve/default.nix
Normal file
36
pkgs/applications/science/math/primesieve/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "primesieve";
|
||||
version = "7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primesieve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://primesieve.org/";
|
||||
description = "Fast C/C++ prime number generator";
|
||||
longDescription = ''
|
||||
primesieve is a command-line program and C/C++ library for quickly
|
||||
generating prime numbers. It is very cache efficient, it detects your
|
||||
CPU's L1 & L2 cache sizes and allocates its main data structures
|
||||
accordingly. It is also multi-threaded by default, it uses all available
|
||||
CPU cores whenever possible i.e. if sequential ordering is not
|
||||
required. primesieve can generate primes and prime k-tuplets up to 264.
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
maintainers = teams.sage.members ++
|
||||
(with maintainers; [ abbradar AndersonTorres ]);
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -35,14 +35,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "recoll";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-TtkfohzeT0HO6ywCMNxrODW1DnJg5KMFkx9AbDfQt+c=";
|
||||
sha256 = "sha256-4kt6g5MVZTyYLSH7q2z72nzAsU6fatC0vTebEKhSA6E=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-recollq" "--disable-webkit" ]
|
||||
configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ]
|
||||
++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
|
||||
++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
|
||||
|
||||
@ -87,6 +87,9 @@ mkDerivation rec {
|
||||
done
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
|
||||
'' + lib.optionalString (stdenv.isDarwin && withGui) ''
|
||||
mkdir $out/Applications
|
||||
mv $out/bin/recoll.app $out/Applications
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,28 +1,43 @@
|
||||
{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }:
|
||||
{ fetchFromGitHub
|
||||
, gitMinimal
|
||||
, gfold
|
||||
, lib
|
||||
, libiconv
|
||||
, makeWrapper
|
||||
, rustPlatform
|
||||
, Security
|
||||
, stdenv
|
||||
, testVersion
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
let
|
||||
pname = "gfold";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickgerace";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63";
|
||||
sha256 = "1yh5173qhi9bd41zss9k21nm0xnr2sa918kvlyr5xvzhq47rrwz5";
|
||||
};
|
||||
|
||||
cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2";
|
||||
cargoSha256 = "sha256-o2fMIlj+veTmhfqi7BVpxr3520SOwWLmVS2UU83EVjo=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin"
|
||||
'';
|
||||
passthru.tests.version = testVersion {
|
||||
package = gfold;
|
||||
command = "gfold --version";
|
||||
inherit version;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description =
|
||||
"A tool to help keep track of your Git repositories, written in Rust";
|
||||
"CLI tool to help keep track of your Git repositories, written in Rust";
|
||||
homepage = "https://github.com/nickgerace/gfold";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.shanesveller ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, primesieve }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "primecount";
|
||||
version = "7.2";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ primesieve ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primecount";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_STATIC_LIBS=OFF"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_TESTS=ON"
|
||||
"-DBUILD_PRIMECOUNT=ON"
|
||||
"-DBUILD_LIBPRIMESIEVE=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast prime counting function implementations";
|
||||
homepage = "https://github.com/kimwalisch/primecount";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.sage.members;
|
||||
};
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "primesieve";
|
||||
version = "7.8";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primesieve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M35CP/xEyC7mEh84kaGsgfsDI9fnanHraNPgTvpqimI=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast C/C++ prime number generator";
|
||||
homepage = "https://primesieve.org/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z3VMQ5pW3xLwFJ/FaQpCJ3TprDOV+2eYiCwX+8OinS0=";
|
||||
hash = "sha256-bqZULh6//p/ZW6Ae8/UTUerGwgCpdFYsdHMFm5zSCqc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.16.3";
|
||||
version = "1.16.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-7URIk76iQ1u59RM1VeqO5qqTg+0kCPtsP+2Y5CxCZ3I=";
|
||||
sha256 = "sha256-/zIx1GlzAnQf0t2d8ME+bi2CZGj6Qr9f5Z4afrQD8FY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, llvm
|
||||
, pytestCheckHook
|
||||
, typesentry
|
||||
, isPy310
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -63,6 +64,6 @@ buildPythonPackage rec {
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
# uses custom build system and adds -Wunused-variable -Werror
|
||||
# warning: ‘dt::expr::doc_first’ defined but not used [-Wunused-variable]
|
||||
broken = true;
|
||||
broken = isPy310;
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-auth-ldap";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "276f79e624ce083ce13f161387f65ff1c0efe83ef8a42f2b9830d43317b15239";
|
||||
sha256 = "sha256-d/dJ07F4B86OtWqcnI5XRv8xZWf4HVumE0ldnHSVqUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-jinja";
|
||||
version = "2.10.0";
|
||||
version = "2.10.2";
|
||||
|
||||
meta = {
|
||||
description = "Simple and nonobstructive jinja2 integration with Django";
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ae6a3fdf1ffa7a9ef6fd2f0a59c1a68c96b29f7f00f5166375658ef392f1ed32";
|
||||
sha256 = "sha256-v9+7VcH1pnnWmtV11VDEcH04ZjQAkVLv4BQInzxNFBI=";
|
||||
};
|
||||
|
||||
buildInputs = [ django pytz tox ];
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.5.23";
|
||||
version = "1.5.24";
|
||||
pname = "pyglet";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3ukgIDzzBhWcUDurti84eHJocIl39clF0oM3WUt5fEY=";
|
||||
sha256 = "sha256-W0pNXlrVSUbjFJLqxn9ykuUaZXckRkGidxgPkKAZKo4=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@ -1,15 +1,22 @@
|
||||
{ buildPythonPackage, fetchFromGitHub, pytestCheckHook, glib, vips, cffi
|
||||
, pkgconfig, lib }:
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, glib
|
||||
, vips
|
||||
, cffi
|
||||
, pkgconfig
|
||||
, lib }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvips";
|
||||
version = "2.1.16";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libvips";
|
||||
repo = "pyvips";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8CeQbx3f2i0lEU0wxPeUwHlUGtzOztzTOdFNjIDy8s0=";
|
||||
sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@ -20,6 +27,14 @@ buildPythonPackage rec {
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyvips/__init__.py \
|
||||
--replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
|
||||
--replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
|
||||
--replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \
|
||||
--replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pyvips" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.19";
|
||||
version = "1.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+LKZ0pbSlqY8rbz96HZ59XYKsSJDMOrJMxblXNj74Yw=";
|
||||
sha256 = "sha256-hxG7e5JBDv79eA7IQEdU8kpvE0B69Gqc+aPdCoc6Uf4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ZEHc67jgLSZV6JH5/owAGTxxnbnYnx2fIUf0mQ14qvg=";
|
||||
cargoSha256 = "sha256-7CMNJb/HGHPP4CIBEYK+2HC/JAce25qGI86NkSvyxos=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
||||
@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell}
|
||||
'';
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of
|
||||
# `cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
installTargets = [ "install-cups" ];
|
||||
|
||||
installFlags = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.96.0";
|
||||
version = "0.97.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AmwkWFhoGRBWrEhRlTRLGRu79ayWceszZi2hgx388Eg=";
|
||||
sha256 = "sha256-WqYal+SDJNBCYc4vxUvYUXnKtmlV/ttfeQKAeOsy5lE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-akFclhx6c18u3z2oa6EvLd2NwkVCgJrYWv8Vbp1hZ9g=";
|
||||
vendorSha256 = "sha256-0uur+L4bSVn6S8yBbdjIdMIgTY4pbQzVPGEVDgYISuw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -3,16 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arc_unpacker";
|
||||
version = "unstable-2021-05-17";
|
||||
version = "unstable-2021-08-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vn-tools";
|
||||
repo = "arc_unpacker";
|
||||
# Since the latest release (0.11) doesn't build, we've opened an upstream
|
||||
# issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a
|
||||
# a new release is upcoming
|
||||
rev = "9c2781fcf3ead7641e873b65899f6abeeabb2fc8";
|
||||
sha256 = "1xxrc9nww0rla3yh10z6glv05ax4rynwwbd0cdvkp7gyqzrv97xp";
|
||||
rev = "456834ecf2e5686813802c37efd829310485c57d";
|
||||
hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper catch2 ];
|
||||
|
||||
@ -20,6 +20,12 @@ stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: CMakeFiles/rbal.dir/src/statsearchbl.cpp.o:(.bss+0x0):
|
||||
# multiple definition of `minrow'; CMakeFiles/rbal.dir/src/linban.c.o:(.bss+0xa3a): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
postPatch = ''
|
||||
rm cuneiform_src/Kern/hhh/tigerh/h/strings.h
|
||||
'';
|
||||
|
||||
@ -999,6 +999,7 @@ with pkgs;
|
||||
|
||||
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
|
||||
boost = boost16x; # checkPhase fails with Boost 1.77
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
};
|
||||
|
||||
adminer = callPackage ../servers/adminer { };
|
||||
@ -5430,7 +5431,7 @@ with pkgs;
|
||||
|
||||
schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||
electron = electron_15;
|
||||
electron = electron_17;
|
||||
};
|
||||
schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
|
||||
#!/bin/sh
|
||||
@ -6152,7 +6153,9 @@ with pkgs;
|
||||
|
||||
gfbgraph = callPackage ../development/libraries/gfbgraph { };
|
||||
|
||||
gfold = callPackage ../applications/version-management/git-and-tools/gfold { };
|
||||
gfold = callPackage ../applications/version-management/git-and-tools/gfold {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
ggobi = callPackage ../tools/graphics/ggobi { };
|
||||
|
||||
@ -20115,9 +20118,9 @@ with pkgs;
|
||||
|
||||
prime-server = callPackage ../development/libraries/prime-server { };
|
||||
|
||||
primecount = callPackage ../development/libraries/science/math/primecount { };
|
||||
primecount = callPackage ../applications/science/math/primecount { };
|
||||
|
||||
primesieve = callPackage ../development/libraries/science/math/primesieve { };
|
||||
primesieve = callPackage ../applications/science/math/primesieve { };
|
||||
|
||||
prison = callPackage ../development/libraries/prison { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user