forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
fd0f377048
|
|
@ -7655,6 +7655,12 @@
|
|||
githubId = 628342;
|
||||
name = "Tim Steinbach";
|
||||
};
|
||||
nerdypepper = {
|
||||
email = "nerdy@peppe.rs";
|
||||
github = "nerdypepper";
|
||||
githubId = 23743547;
|
||||
name = "Akshay Oppiliappan";
|
||||
};
|
||||
nessdoor = {
|
||||
name = "Tomas Antonio Lopez";
|
||||
email = "entropy.overseer@protonmail.com";
|
||||
|
|
|
|||
|
|
@ -26,21 +26,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "4.5";
|
||||
version = "4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w=";
|
||||
sha256 = "0csp8iddhc901vv09gl5lj970g6ili696vwj4vdpkiprp7gh26r5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with GLib 2.68.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch";
|
||||
sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,19 +18,20 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "purescript";
|
||||
version = "0.14.3";
|
||||
version = "0.14.4";
|
||||
|
||||
# These hashes can be updated automatically by running the ./update.sh script.
|
||||
src =
|
||||
if stdenv.isDarwin
|
||||
then
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
|
||||
sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj";
|
||||
sha256 = "0m6zwb5f890d025zpn006qr8cky6zhjycap5az9zh6h47jfbrcf9";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
|
||||
sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0";
|
||||
sha256 = "0hgsh6l52z873b2zk3llvqik18ifika48lmr71qyhlqf250ng9m0";
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -51,8 +52,11 @@ in stdenv.mkDerivation rec {
|
|||
$PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
minimal-module = pkgs.callPackage ./test-minimal-module {};
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = {
|
||||
minimal-module = pkgs.callPackage ./test-minimal-module {};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
43
pkgs/development/compilers/purescript/purescript/update.sh
Executable file
43
pkgs/development/compilers/purescript/purescript/update.sh
Executable file
|
|
@ -0,0 +1,43 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq -I nixpkgs=.
|
||||
#
|
||||
# This script will update the purescript derivation to the latest version.
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
# This is the directory of this update.sh script.
|
||||
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
|
||||
purescript_derivation_file="${script_dir}/default.nix"
|
||||
|
||||
# This is the current revision of PureScript in Nixpkgs.
|
||||
old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$purescript_derivation_file")"
|
||||
|
||||
# This is the latest release version of PureScript on GitHub.
|
||||
new_version=$(curl --silent "https://api.github.com/repos/purescript/purescript/releases" | jq '.[0].tag_name' --raw-output | sed -e 's/v//')
|
||||
|
||||
echo "Updating purescript from old version v${old_version} to new version v${new_version}."
|
||||
echo
|
||||
|
||||
echo "Fetching both old and new release tarballs for Darwin and Linux in order to confirm hashes."
|
||||
echo
|
||||
old_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/linux64.tar.gz")"
|
||||
echo "v${old_version} linux tarball hash (current version): $old_linux_version_hash"
|
||||
new_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux64.tar.gz")"
|
||||
echo "v${new_version} linux tarball hash: $new_linux_version_hash"
|
||||
old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos.tar.gz")"
|
||||
echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash"
|
||||
new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")"
|
||||
echo "v${new_version} darwin tarball hash: $new_darwin_version_hash"
|
||||
echo
|
||||
|
||||
echo "Replacing version and hashes in ${purescript_derivation_file}."
|
||||
sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file"
|
||||
sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file"
|
||||
sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file"
|
||||
echo
|
||||
|
||||
echo "Finished. Make sure you run the following commands to confirm PureScript builds correctly:"
|
||||
echo ' - `nix build -L -f ./. purescript`'
|
||||
echo ' - `nix build -L -f ./. purescript.passthru.tests.minimal-module`'
|
||||
echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`'
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls,
|
||||
libidn2, libunistring, nghttp2 }:
|
||||
{ lib, stdenv, fetchurl, libtool, perl, pkg-config, python3, zlib, gnutls
|
||||
, libidn2, libunistring }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgnurl";
|
||||
|
|
@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool groff perl pkg-config python2 ];
|
||||
nativeBuildInputs = [ libtool perl pkg-config python3 ];
|
||||
|
||||
buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
|
||||
buildInputs = [ gnutls zlib libidn2 libunistring ];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-ntlm-wb"
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
lib.fix (self:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlsec";
|
||||
version = "1.2.31";
|
||||
version = "1.2.32";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
|
||||
sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY=";
|
||||
sha256 = "sha256-44NwKFMjYATlsI5CS4r+m1P+nzGqp6U4LznZUz63wEM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
31
pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
Normal file
31
pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildDunePackage
|
||||
, dune-build-info
|
||||
, bos
|
||||
}:
|
||||
let
|
||||
author = "avsm";
|
||||
pname = "ocaml-print-intf";
|
||||
version = "1.2.0";
|
||||
in
|
||||
buildDunePackage rec {
|
||||
inherit pname version;
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = author;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0hw4gl7irarcywibdjqxmrga8f7yj52wgy7sc7n0wyy74jzxb8np";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-build-info bos ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form ";
|
||||
homepage = "https://github.com/${author}/${pname}";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.nerdypepper ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "agate-sql";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "056dc9e587fbdfdf3f1c9950f4793a5ee87622c19deba31aa0a6d6681816dcde";
|
||||
sha256 = "7622c1f243b5a9a5efddfe28c36eeeb30081e43e3eb72e8f3da22c2edaecf4d8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ agate sqlalchemy ];
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioextensions";
|
||||
version = "20.11.1621472";
|
||||
version = "21.7.2261349";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "abfb2a27590f20b04808192e6c9c5f93298656c013546850c4505b5070a8cc82";
|
||||
sha256 = "2eacc52692495f331437e8c8e9782ca71f4617ec84f174ca17acdd77631efc47";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ uvloop ];
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioprocessing";
|
||||
version = "1.1.0";
|
||||
version = "2.0.0";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4603c86ff3fea673d4c643ad3adc519988cd778771b75079bc3be9e5ed4c5b66";
|
||||
sha256 = "469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e";
|
||||
};
|
||||
|
||||
# Tests aren't included in pypi package
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-batch";
|
||||
version = "10.0.0";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0";
|
||||
sha256 = "ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -25,6 +25,8 @@ buildPythonPackage rec {
|
|||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.batch" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure Batch Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-eventgrid";
|
||||
version = "4.3.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "bf50c8a4dc022ff9b1810800cb431b2c68b748eed160dd71fb8eb9bd860c7ecc";
|
||||
sha256 = "41ce94305fd3c4e2534f7663fb1be79819fc7d59f2b20544593ea6c914839351";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
pname = "azure-mgmt-apimanagement";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "54fade87af54904c8ac9785efccebc537c58a3c1f8726e929e473698f06ebbfc";
|
||||
sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "22.0.0";
|
||||
version = "22.1.0";
|
||||
pname = "azure-mgmt-compute";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7d582f3a4331f681f6bc358b796d9c33d7c0d55aa95c2874fc8dbe692e6bfa6d";
|
||||
sha256 = "2aad414843aee0f54427f887f7536cc5155d6852728d44dfeef633ac52135fdc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -25,6 +25,8 @@ buildPythonPackage rec {
|
|||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.compute" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure Compute Management Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-datamigration";
|
||||
version = "9.0.0";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "70373dbeb35a7768a47341bb3b570c559197bc1ba36fc8f8bf15139e4c8bad70";
|
||||
sha256 = "5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-iothub";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b";
|
||||
sha256 = "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, isPy3k
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
|
|
@ -12,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-loganalytics";
|
||||
version = "10.0.0";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "29330984d0f084dff26cea239d7b733c1a26844da85d33bf3bb53b515ce0bc23";
|
||||
sha256 = "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -33,6 +31,8 @@ buildPythonPackage rec {
|
|||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.loganalytics" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure Log Analytics Management Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-media";
|
||||
version = "7.0.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b45e82a594ed91cd5aa7a5cd5d01f038b7ac3cf12233e7ba2beaaa3477900e8e";
|
||||
sha256 = "c08e687c0afa061a3e05acaf29ce81e737480d592b07e0de5f77e9a7f9f00c00";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,6 +31,8 @@ buildPythonPackage rec {
|
|||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.media" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure Media Services Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-recoveryservicesbackup";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "fd915aa6a76ef9e0e963615d4c909400c8d5646e26273ae25fa1418ce61e28d2";
|
||||
sha256 = "d3e60daefbc20a7fa381c7ad1498f4bf4bb5a1414c1c64188cc9d5c98c4e12ac";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -29,6 +29,8 @@ buildPythonPackage rec {
|
|||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure Recovery Services Backup Management Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "18.0.0";
|
||||
version = "19.0.0";
|
||||
pname = "azure-mgmt-resource";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c";
|
||||
sha256 = "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-sql";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21";
|
||||
sha256 = "129042cc011225e27aee6ef2697d585fa5722e5d1aeb0038af6ad2451a285457";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,6 +31,8 @@ buildPythonPackage rec {
|
|||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.sql" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure SQL Management Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-synapse-accesscontrol";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2f8f71561ca30ff3b04b172f5a64b231baeb02f4bce4bd6763df93a178c8b5d7";
|
||||
sha256 = "565aa26336d560c028775e8ae50d0691aa7089e96170e78342371b773da3137c";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
@ -20,6 +20,9 @@ buildPythonPackage rec {
|
|||
msrest
|
||||
];
|
||||
|
||||
# zero tests run
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.synapse.accesscontrol" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-synapse-spark";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2b037024dc7c034f47aac551cc918f78590a1e1ae30cd2370c8a14da15994970";
|
||||
sha256 = "ac7564a61ba314e0a9406c0f73c3cede04091a131a0c58971bcba0c158b7455d";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "babelfish";
|
||||
version = "0.5.5";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104";
|
||||
sha256 = "2dadfadd1b205ca5fa5dc9fa637f5b7933160a0418684c7c46a7a664033208a2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
||||
# no tests executed
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "babelfish" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.python.org/pypi/babelfish";
|
||||
description = "A module to work with countries and languages";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,19 @@
|
|||
{ lib, fetchPypi, buildPythonPackage
|
||||
, click, pytest
|
||||
, click, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-help-colors";
|
||||
version = "0.9";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "eb037a2dd95a9e20b3897c2b3ca57e7f6797f76a8d93f7eeedda7fcdcbc9b635";
|
||||
sha256 = "78cbcf30cfa81c5fc2a52f49220121e1a8190cd19197d9245997605d3405824d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
|
||||
# tries to use /homeless-shelter to mimic container usage, etc
|
||||
#doCheck = false;
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "click_help_colors" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "8.1.10";
|
||||
version = "8.1.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "831ba3d50552c4b7821670ad01b73406aef5092498b29d3ddb24a5063bbcf0b5";
|
||||
sha256 = "cd9d1b27edd9345a2a32b365a511f8457c5c1a8f107546fe1ef9063dd15aac00";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, chardet, six}:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, chardet
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-debian";
|
||||
version = "0.1.39";
|
||||
version = "0.1.40";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6cca96239b5981f5203216d2113fea522477628607ed0a8427e15094a792541c";
|
||||
sha256 = "385dfb965eca75164d256486c7cf9bae772d24144249fd18b9d15d3cffb70eea";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ chardet six ];
|
||||
|
|
@ -15,8 +19,11 @@ buildPythonPackage rec {
|
|||
# No tests in archive
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [ "debian" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Debian package related modules";
|
||||
license = lib.licenses.gpl2;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dockerspawner";
|
||||
version = "0.11.1";
|
||||
version = "12.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "83fd8ee012bb32432cb57bd408ff65534749aed8696648e6ac029a87fc474928";
|
||||
sha256 = "3894ed8a9157f8ac8f42e0130f43932490ac5d1e89e6f295b1252f08c00ba36b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flexmock";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh";
|
||||
sha256 = "003422fdbcf5d6570e60a0eafeb54c0af624c6cddab5fc3bfe026e52dd0f9c5a";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hmmlearn";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
|
||||
sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01";
|
||||
sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools-scm cython ];
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "junos-eznc";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2f5de7dedaac8dd71bfea23c6a7d883e29947c91de1ba299a9242e0a4406ee46";
|
||||
sha256 = "878c479c933346cc8cc60b6d145973568ac23e7c453e193cf55625e7921a9b62";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -40,6 +40,8 @@ buildPythonPackage rec {
|
|||
nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "jnpr.junos" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.github.com/Juniper/py-junos-eznc";
|
||||
description = "Junos 'EZ' automation for non-programmers";
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "3.0.16";
|
||||
version = "3.1.6";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7ad4fbe1f6d38255869410fd151a8b15692a663ca97c0a8146b3f5c40e275c23";
|
||||
sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jupyter-packaging ];
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab_server";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f300adf6bb0a952bebe9c807a3b2a345d62da39b476b4f69ea0dc6b5f3f6b97d";
|
||||
sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,24 +2,25 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pkgs
|
||||
, git
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "limnoria";
|
||||
version = "2021.06.15";
|
||||
version = "2021.07.21";
|
||||
disabled = isPy27; # abandoned upstream
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "47290281f3f945261a7f8d8c6f207dcb1d277b241f58827d5a76ab8cd453a1d0";
|
||||
sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i 's/version=version/version="${version}"/' setup.py
|
||||
'';
|
||||
buildInputs = [ pkgs.git ];
|
||||
buildInputs = [ git ];
|
||||
|
||||
# cannot be imported
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -49,19 +49,19 @@ let
|
|||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "tokenizers";
|
||||
version = "0.10.3";
|
||||
version = "unstable-2021-08-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "python-v${version}";
|
||||
hash = "sha256-X7aUiJJjB2ZDlE8LbK7Pn/15SLTZbP8kb4l9ED7/xvU=";
|
||||
rev = "e7dd6436dd4a4ffd9e8a4f110ca68e6a38677cb6";
|
||||
sha256 = "1p7w9a43a9h6ys5nsa4g89l65dj11037p7a1lqkj4x1yc9kv2y1r";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src sourceRoot;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-gRqxlL6q87sGC0birDhCmGF+CVbfxwOxW6Tl6+5mGoo=";
|
||||
sha256 = "1yb4jsx6mp9jgd1g3mli6vr6mri2afnwqlmxq1rpvn34z6b3iw9q";
|
||||
};
|
||||
|
||||
sourceRoot = "source/bindings/python";
|
||||
|
|
@ -97,6 +97,10 @@ in buildPythonPackage rec {
|
|||
ln -s ${openaiMerges} openai-gpt-merges.txt )
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
echo 'import multiprocessing; multiprocessing.set_start_method("fork")' >> tests/__init__.py
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "teleport";
|
||||
version = "7.0.2";
|
||||
version = "7.0.3";
|
||||
|
||||
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitational";
|
||||
repo = "teleport";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY=";
|
||||
sha256 = "sha256-pWe4n/HilieUYfoO0OElC9ccMaTOaMcVadUfWUJJGhk=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "s5cmd";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peak";
|
||||
repo = "s5cmd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-09vBYwnTfLIuu2SPP7DYB+U6sUkQffglIOHNn4+47qQ=";
|
||||
sha256 = "sha256-sood01wI0ZnkXUKDHX14ix3bWHR/PRu6+MDNeos5Jk0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uuHvU/KUHliY3FUwknp7ninKTY9qs+gI7WljgIvJEF4=";
|
||||
sha256 = "sha256-8PX1jUbS5qf5KqeZXv3oijtZCPo5LsabqHSA3rsd3tQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/xip2lwmpaSvnQoGj3de8Tgeog+HPrI8mF6catC1O4s=";
|
||||
vendorSha256 = "sha256-bkk/gXMLiZGHebrIeDsj3OyiEcH4hriI4TFNdoh3SBk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and multi-purpose HTTP toolkit";
|
||||
|
|
|
|||
41
pkgs/tools/typesetting/soupault/default.nix
Normal file
41
pkgs/tools/typesetting/soupault/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ fetchFromGitHub, ocamlPackages, lib }:
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "soupault";
|
||||
version = "3.1.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmbaturin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SVNC2DbdciunSKTCmmX0SqaEXMe1DkVX4VJTqriI8Y4=";
|
||||
};
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
base64
|
||||
containers
|
||||
ezjsonm
|
||||
fileutils
|
||||
fmt
|
||||
jingoo
|
||||
lambdasoup
|
||||
lua-ml
|
||||
logs
|
||||
odate
|
||||
otoml
|
||||
re
|
||||
spelll
|
||||
tsort
|
||||
yaml
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool that helps you create and manage static websites";
|
||||
homepage = "https://soupault.app/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.toastal ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -3,26 +3,85 @@
|
|||
, buildPythonPackage
|
||||
, bash
|
||||
, bashInteractive
|
||||
, systemd
|
||||
, util-linux
|
||||
, boto
|
||||
, setuptools
|
||||
, distro
|
||||
, stdenv
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
let
|
||||
guest-configs = stdenv.mkDerivation rec {
|
||||
pname = "guest-configs";
|
||||
version = "20210702.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "guest-configs";
|
||||
rev = version;
|
||||
sha256 = "1965kdrb1ig3z4qwzvyzx1fb4282ak5vgxcvvg5k9c759pzbc5nn";
|
||||
};
|
||||
|
||||
buildInputs = [ bash ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# allows to install the package in `services.udev.packages` in NixOS
|
||||
mkdir -p $out/lib/udev $out/bin
|
||||
|
||||
cp -r "src/lib/udev/rules.d" $out/lib/udev
|
||||
cp "src/lib/udev/google_nvme_id" $out/bin
|
||||
|
||||
for rules in $out/lib/udev/*.rules; do
|
||||
substituteInPlace "$rules" \
|
||||
--replace /bin/sh "${bash}/bin/sh" \
|
||||
--replace /bin/umount "${util-linux}/bin/umount" \
|
||||
--replace /usr/bin/logger "${util-linux}/bin/logger"
|
||||
done
|
||||
|
||||
# sysctl snippets will be used by google-compute-config.nix
|
||||
cp -r "src/etc/sysctl.d" $out
|
||||
|
||||
patchShebangs $out/bin/*
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "google-compute-engine";
|
||||
version = "20190124";
|
||||
version = "20200113.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "compute-image-packages";
|
||||
rev = version;
|
||||
sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp";
|
||||
rev = "506b9a0dbffec5620887660cd42c57b3cbbadba6";
|
||||
sha256 = "0lmc426mvrajghpavhs6hwl19mgnnh08ziqx5yi15fzpnvwmb8vz";
|
||||
};
|
||||
|
||||
buildInputs = [ bash ];
|
||||
propagatedBuildInputs = [ boto setuptools distro ];
|
||||
buildInputs = [ bash guest-configs ];
|
||||
propagatedBuildInputs = [ (if pythonOlder "3.7" then boto else distro) setuptools ];
|
||||
|
||||
preBuild = ''
|
||||
cd packages/python-google-compute-engine
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"testExtractInterfaceMetadata"
|
||||
"testCallDhclientIpv6"
|
||||
"testWriteConfig"
|
||||
"testCreateInterfaceMapNetifaces"
|
||||
"testCreateInterfaceMapSysfs"
|
||||
"testGetNetworkInterface"
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
postPatch = ''
|
||||
for file in $(find google_compute_engine -type f); do
|
||||
|
|
@ -32,33 +91,15 @@ buildPythonPackage rec {
|
|||
--replace /sbin/hwclock "${util-linux}/bin/hwclock"
|
||||
# SELinux tool ??? /sbin/restorecon
|
||||
done
|
||||
|
||||
substituteInPlace google_config/udev/64-gce-disk-removal.rules \
|
||||
--replace /bin/sh "${bash}/bin/sh" \
|
||||
--replace /bin/umount "${util-linux}/bin/umount" \
|
||||
--replace /usr/bin/logger "${util-linux}/bin/logger"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# allows to install the package in `services.udev.packages` in NixOS
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
cp -r google_config/udev/*.rules $out/lib/udev/rules.d
|
||||
|
||||
# sysctl snippets will be used by google-compute-config.nix
|
||||
mkdir -p $out/sysctl.d
|
||||
cp google_config/sysctl/*.conf $out/sysctl.d
|
||||
|
||||
patchShebangs $out/bin/*
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "google_compute_engine" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google Compute Engine tools and services";
|
||||
homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
maintainers = with maintainers; [ cpcloud zimbatm ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4497,6 +4497,8 @@ with pkgs;
|
|||
|
||||
sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { };
|
||||
|
||||
soupault = callPackage ../tools/typesetting/soupault { };
|
||||
|
||||
strawberry = libsForQt5.callPackage ../applications/audio/strawberry { };
|
||||
|
||||
tealdeer = callPackage ../tools/misc/tealdeer {
|
||||
|
|
|
|||
|
|
@ -878,6 +878,8 @@ let
|
|||
|
||||
ocaml_pcre = callPackage ../development/ocaml-modules/pcre {};
|
||||
|
||||
ocaml-print-intf = callPackage ../development/ocaml-modules/ocaml-print-intf { };
|
||||
|
||||
pgocaml = callPackage ../development/ocaml-modules/pgocaml {};
|
||||
|
||||
pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {};
|
||||
|
|
|
|||
Loading…
Reference in a new issue