Merge remote-tracking branch 'origin/master' into haskell-updates.
This commit is contained in:
Peter Simons
commit
92805ab38d
@ -23,7 +23,7 @@ with lib;
|
||||
copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
|
||||
copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
|
||||
|
||||
substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \
|
||||
substitute "${pkgs.cloud-utils.guest}/bin/.growpart-wrapped" "$out/bin/growpart" \
|
||||
--replace "${pkgs.bash}/bin/sh" "/bin/sh" \
|
||||
--replace "awk" "gawk" \
|
||||
--replace "sed" "gnused"
|
||||
|
||||
@ -7,6 +7,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
inherit (import ./ssh-keys.nix pkgs)
|
||||
snakeOilPrivateKey snakeOilPublicKey;
|
||||
|
||||
metadataDrive = pkgs.stdenv.mkDerivation {
|
||||
name = "metadata";
|
||||
buildCommand = ''
|
||||
@ -18,13 +21,19 @@ let
|
||||
- content: |
|
||||
cloudinit
|
||||
path: /tmp/cloudinit-write-file
|
||||
|
||||
users:
|
||||
- default
|
||||
- name: nixos
|
||||
ssh_authorized_keys:
|
||||
- "${snakeOilPublicKey}"
|
||||
EOF
|
||||
|
||||
cat << EOF > $out/iso/meta-data
|
||||
instance-id: iid-local01
|
||||
local-hostname: "test"
|
||||
public-keys:
|
||||
- "should be a key!"
|
||||
- "${snakeOilPublicKey}"
|
||||
EOF
|
||||
${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso
|
||||
'';
|
||||
@ -34,19 +43,40 @@ in makeTest {
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ lewo ];
|
||||
};
|
||||
machine =
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
|
||||
services.cloud-init.enable = true;
|
||||
};
|
||||
machine = { ... }:
|
||||
{
|
||||
virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
|
||||
services.cloud-init.enable = true;
|
||||
services.openssh.enable = true;
|
||||
networking.hostName = "";
|
||||
};
|
||||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("cloud-init.service")
|
||||
machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'")
|
||||
machine.wait_for_unit("cloud-init.service")
|
||||
machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'")
|
||||
|
||||
machine.wait_until_succeeds(
|
||||
"cat /root/.ssh/authorized_keys | grep -q 'should be a key!'"
|
||||
)
|
||||
# install snakeoil ssh key and provision .ssh/config file
|
||||
machine.succeed("mkdir -p ~/.ssh")
|
||||
machine.succeed(
|
||||
"cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil"
|
||||
)
|
||||
machine.succeed("chmod 600 ~/.ssh/id_snakeoil")
|
||||
|
||||
machine.wait_for_unit("sshd.service")
|
||||
|
||||
# we should be able to log in as the root user, as well as the created nixos user
|
||||
machine.succeed(
|
||||
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil root@localhost 'true'"
|
||||
)
|
||||
machine.succeed(
|
||||
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'true'"
|
||||
)
|
||||
|
||||
# test changing hostname via cloud-init worked
|
||||
assert (
|
||||
machine.succeed(
|
||||
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'hostname'"
|
||||
).strip()
|
||||
== "test"
|
||||
)
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused gawk
|
||||
|
||||
# Update script for the vscode versions and hashes.
|
||||
# Usually doesn't need to be called by hand,
|
||||
# but is called by a bot: https://github.com/samuela/nixpkgs-upkeep/actions
|
||||
# Call it by hand if the bot fails to automatically update the versions.
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused gawk
|
||||
|
||||
# Update script for the vscode versions and hashes.
|
||||
# Usually doesn't need to be called by hand,
|
||||
# but is called by a bot: https://github.com/samuela/nixpkgs-upkeep/actions
|
||||
# Call it by hand if the bot fails to automatically update the versions.
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "12nrv037an4f6h8hrbmysc0lk5wm492hywa7lp64n4d308zg5567";
|
||||
x86_64-darwin = "1z22hn2ngx2x5l9h6zsblpyzr85lyjzv2ayplscbgaa9ff52l429";
|
||||
x86_64-linux = "0mpb4641icr3z89y2rlh5anli40p1f48sl5xagr7h3nb5c84k10x";
|
||||
x86_64-darwin = "1azmc79zf72007qc1xndp9wdkd078mvqgv35hf231q7kdi6wzxcp";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
@ -21,7 +21,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.50.0";
|
||||
version = "1.50.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0fhwqif9021sg22n8qqn3m2fml7sjb03ydgbakg1021i3y8zl599";
|
||||
x86_64-darwin = "1bsvkwymihkv0azf0mmy0f58zsxs6w13in6lfxzaz7s695csn9s0";
|
||||
x86_64-linux = "1sarih1yah69ympp12bmgyb0y9ybrxasppb47l58w05iz1wpn6v0";
|
||||
x86_64-darwin = "1pj041kccj2i77v223i86xxqj9bg88k0sfbshm7qiynwyj9p05ji";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
@ -27,7 +27,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.50.0";
|
||||
version = "1.50.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
"sha256bin64": "17isxkd80rccqim6izzl08vw4yr52qsk6djp1rmhhijzg9rsvghz"
|
||||
},
|
||||
"beta": {
|
||||
"version": "86.0.4240.75",
|
||||
"sha256": "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx",
|
||||
"sha256bin64": "16snxdka5bkbvybx6x0dzgfbfaifv0jcc1dcny6vlqqp2fmb2v39"
|
||||
"version": "87.0.4280.20",
|
||||
"sha256": "1lqdxy6pm72h8ym5ij713rp055csqn19agy3sp6wnmp3pj688ic8",
|
||||
"sha256bin64": "0r9wk2kgn7z0jjzpppr799jp5izxvh1ig4mv12iadz4y7dl47kaw"
|
||||
},
|
||||
"dev": {
|
||||
"version": "87.0.4278.0",
|
||||
"sha256": "1ywmv4iwn2as7vk2n0pslnmr300fl5y809ynxiw5xqcx9j6i8w85",
|
||||
"sha256bin64": "15dvwvk6l6n7l04085hr48hlvsijypasyk7d8iq3s6cxai3wx4cl"
|
||||
"version": "88.0.4292.2",
|
||||
"sha256": "0b8ihgbvdqpbcgw9p9sak8nz599pah94jmysqigs4phl9slvir5d",
|
||||
"sha256bin64": "13bx19r56m2r1yjy3b84phv96kkckf87n88kpscf867lgwbrc4fc"
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,12 +31,12 @@ let
|
||||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1n72dvrv4dch4i07lsis76p7g16a039fwx8rk7w8q9f60wgqb5i8";
|
||||
sha256 = "0jip413yvyhdaywz0iadc32aaanjnhbx1d1vwzx3z1xbgc4i9svn";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.3.0";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p";
|
||||
sha256 = "0bvvh68k2xjmmwafwdsijf3yb4ff9wbsl2ibad627l1y4js5615z";
|
||||
};
|
||||
|
||||
vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx";
|
||||
vendorSha256 = "05nwfxqgkpbv5i0365wpsnnaq528a7srycd1dsdlssz1cy7i0d31";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "1.36.3"; # Please backport all updates to the stable channel.
|
||||
version = "1.37.1"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1b75b5li0im2mwskkf1xsa6sjprl56isvcz2iy1gc48bambc72pc";
|
||||
sha256 = "0zj068wkgb0k7iq4ld0lb06vk2zlsvv5pf0csr4zkzkq0hgzx33s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "deepTools";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "05zw9gk17hz08hns5lnhn7l13idg9jdz4gdba6m6gbr84yz149gs";
|
||||
sha256 = "1a14a29e60be13eac11bd204dab9aef73cd72fe56a94c587333f21087584c0d8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
version = "0.3.7";
|
||||
version = "0.3.9";
|
||||
pname = "nbstripout";
|
||||
|
||||
# Mercurial should be added as a build input but because it's a Python
|
||||
@ -14,7 +14,7 @@ buildPythonApplication rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13w2zhw8vrfv6637bw5ygygj1dky55fvvncz11hq0abwkkzb3wb2";
|
||||
sha256 = "b46dddbf78b8b137176bc72729124e378242ef9ce93af63f6e0a8c4850c972e7";
|
||||
};
|
||||
|
||||
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "8.1.15";
|
||||
version = "8.3.9";
|
||||
packInstall = swiplPath: pack:
|
||||
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
|
||||
'';
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
owner = "SWI-Prolog";
|
||||
repo = "swipl-devel";
|
||||
rev = "V${version}";
|
||||
sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq";
|
||||
sha256 = "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -193,9 +193,12 @@ def _get_latest_version_github(package, extension, current_version, target):
|
||||
matches = re.findall(r"^([^0-9]*)", string)
|
||||
return next(iter(matches), "")
|
||||
|
||||
# when invoked as an updateScript, UPDATE_NIX_ATTR_PATH will be set
|
||||
# this allows us to work with packages which live outside of python-modules
|
||||
attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{package}")
|
||||
try:
|
||||
homepage = subprocess.check_output(
|
||||
["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"python3Packages.{package}.src.meta.homepage"])\
|
||||
["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\
|
||||
.decode('utf-8')
|
||||
except Exception as e:
|
||||
raise ValueError(f"Unable to determine homepage: {e}")
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
{ fetchFromGitHub, lib, stdenv, mkDerivation, standard-library }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "0.1";
|
||||
pname = "functional-linear-algebra";
|
||||
|
||||
buildInputs = [ standard-library ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "functional-linear-algebra";
|
||||
owner = "ryanorendorff";
|
||||
rev = "v${version}";
|
||||
sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
|
||||
description = ''
|
||||
Formalizing linear algebra in Agda by representing matrices as functions
|
||||
from one vector space to another.
|
||||
'';
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ryanorendorff ];
|
||||
};
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
|
||||
|
||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
|
||||
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.06"
|
||||
then throw "camlimages-4.1.2 is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let
|
||||
pname = "camlimages";
|
||||
version = "4.1.2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.bz2";
|
||||
sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
|
||||
|
||||
propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildPhase = ''
|
||||
omake
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
omake install
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://bitbucket.org/camlspotter/camlimages";
|
||||
description = "OCaml image processing library";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +1,27 @@
|
||||
{ lib, fetchzip, buildDunePackage, configurator, cppo, lablgtk }:
|
||||
{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo, lablgtk, stdio }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "camlimages";
|
||||
version = "5.0.1";
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://bitbucket.org/camlspotter/${pname}/get/${version}.tar.gz";
|
||||
sha256 = "1figrgzsdrrxzfza0bhz0225g1rwawdf5x2m9lw2kzrdb815khs5";
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "camlspotter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ng9pkvrzlibfyf97iqvmbsqcykz8v1ln106xhq9nigih5i68zyd";
|
||||
};
|
||||
|
||||
buildInputs = [ configurator cppo lablgtk ];
|
||||
buildInputs = [ dune-configurator cppo lablgtk stdio ];
|
||||
|
||||
meta = with lib; {
|
||||
branch = "5.0";
|
||||
homepage = "https://bitbucket.org/camlspotter/camlimages";
|
||||
inherit (src.meta) homepage;
|
||||
description = "OCaml image processing library";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.vbgl maintainers.mt-caret ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, buildDunePackage, configurator, cstruct, bigarray-compat, ounit }:
|
||||
{ stdenv, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "io-page";
|
||||
|
||||
@ -14,12 +14,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "accupy";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "be5c8c9ef2f83c9eeddac85463879957c87a93b257a6202a76ad6b43080b32f9";
|
||||
sha256 = "a234c9897a683a6ade44f0bafa71196f122a61e3ebeacb5b813e7d139d54f3c7";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,22 +1,32 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python
|
||||
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python
|
||||
, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens
|
||||
, brotli, fontmath, mutatormath, booleanoperations
|
||||
, ufoprocessor, ufonormalizer, psautohint
|
||||
, ufoprocessor, ufonormalizer, psautohint, tqdm
|
||||
, setuptools_scm
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "afdko";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck";
|
||||
sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw";
|
||||
};
|
||||
|
||||
# Skip date-dependent test. See
|
||||
# https://github.com/adobe-type-tools/afdko/pull/1232
|
||||
# https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/adobe-type-tools/afdko/commit/2c36ad10f9d964759f643e8ed7b0972a27aa26bd.patch";
|
||||
sha256 = "0p6a485mmzrbfldfbhgfghsypfiad3cabcw7qlw2rh993ivpnibf";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -35,6 +45,7 @@ buildPythonPackage rec {
|
||||
ufoprocessor
|
||||
ufonormalizer
|
||||
psautohint
|
||||
tqdm
|
||||
];
|
||||
|
||||
# tests are broken on non x86_64
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "auth0-python";
|
||||
version = "3.12.0";
|
||||
version = "3.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fbc54a231ca787ae0917223028269582abbd963cfa9d53ba822a601dd9cd2215";
|
||||
sha256 = "2e968d01364c8c94fbe85154ab77ebe9e51a3f8282405bb33748071452063004";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.14.3";
|
||||
version = "0.15.1";
|
||||
pname = "authlib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lepture";
|
||||
repo = "authlib";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ph97j94i40jj7nc5ya8pfq0ccx023zbqpcs5hrxmib53g64k5xy";
|
||||
sha256 = "0jh4kdi5spzhmgvq3ffz2q467hjycz3wg97f7n53rffiwd86jrh5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cryptography requests ];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-keys";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "e47b76ca5d99b12436c64ce4431271cd6744fba017f282991b84ce303e0b9eaa";
|
||||
sha256 = "064a98791fe447a0e57850bb5ec1ec43e7d5fd39266319b5acc44a9704a3b966";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-keyvault";
|
||||
version = "7.0.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "128c1424373aabab5ffcfa74a3ee73cf8bda0a9259229ce2c1d09a8bc9f7370a";
|
||||
sha256 = "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-web";
|
||||
version = "0.47.0";
|
||||
version = "0.48.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq";
|
||||
sha256 = "da0f9e3b57528c72a7bc92e3515413a4a4fdbc9626c26ac04b7551a7739a81ec";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
, wheel, pytestCheckHook, pytestrunner }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
pname = "bacpypes";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JoelBender";
|
||||
repo = "bacpypes";
|
||||
rev = "${version}";
|
||||
sha256 = "1nz0qi46z6n455mw2ppxgz091qh0irizlxpvkx7iw1l7f6mmgj0x";
|
||||
rev = version;
|
||||
sha256 = "1fxrh57z3fjl95db8jh71grkv5id8qk65g6k5jqcs9v3dgkg8jkl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ wheel ];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
let
|
||||
pname = "bellows";
|
||||
version = "0.18.1";
|
||||
version = "0.20.3";
|
||||
|
||||
in buildPythonPackage rec {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6a2e323c2be6f10a8e99fffccb5670bc77bbddb7b5bd9253b69021120f2ab9d7";
|
||||
sha256 = "9342b6b9423c818f99f7c6d9086fbb5e27d5c2efbb1f2a08f6f5a917c4991f86";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blessed";
|
||||
version = "1.17.10";
|
||||
version = "1.17.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09kcz6w87x34a3h4r142z3zgw0av19cxn9jrbz52wkpm1534dfaq";
|
||||
sha256 = "7d4914079a6e8e14fbe080dcaf14dee596a088057cdc598561080e3266123b48";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest mock glibcLocales ];
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-can";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488";
|
||||
sha256 = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chalice";
|
||||
version = "1.18.1";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zb4xk9b553pnfzh8s909cixfdplqnc3nda0fjwjrryi2nxjxd6a";
|
||||
sha256 = "562218c5d257607fba3440e0a1d09bdac81a11536c432ad2af1e2d46f1735df4";
|
||||
};
|
||||
|
||||
checkInputs = [ watchdog pytest hypothesis mock ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Cheetah3";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ececc9ca7c58b9a86ce71eb95594c4619949e2a058d2a1af74c7ae8222515eb1";
|
||||
sha256 = "f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b";
|
||||
};
|
||||
|
||||
doCheck = false; # Circular dependency
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "cmd2";
|
||||
version = "1.3.10";
|
||||
version = "1.3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "960d8288c8e3a093d04975e3dd8461ce2e43c1d0c70e54873f622f8f0b77d6f5";
|
||||
sha256 = "826a288ee6d9c4ec1184e64e9566c09d3b73be8f4283c1898fa4332f1daf8dbf";
|
||||
};
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
@ -6,20 +6,19 @@
|
||||
, toolz
|
||||
, python
|
||||
, fetchpatch
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cytoolz";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
disabled = isPy27 || isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0p4a9nadsy1337gy2cnb5yanbn03j3zm6d9adyqad9bk3nlbpxc2";
|
||||
sha256 = "c64f3590c3eb40e1548f0d3c6b2ccde70493d0b8dc6cc7f9f3fec0bb3dcd4222";
|
||||
};
|
||||
|
||||
# Extension types
|
||||
disabled = isPyPy;
|
||||
|
||||
checkInputs = [ nose ];
|
||||
propagatedBuildInputs = [ toolz ];
|
||||
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
pname = "DataModelDict";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "857d4bf33f0b26ca718bd821fda7502dd6fb15aa09201b1fbdfaf4dfc85b8f6c";
|
||||
sha256 = "b1be7573cb4401aa250fd00f2e6392543f6f2498f8e02f6313595aa220e5c99e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ xmltodict ];
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-cleanup";
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "84f0c0e0a74545adae4c944a76ccf8fb0c195dddccf3b7195c59267abb7763dd";
|
||||
sha256 = "8976aec12a22913afb3d1fcb541b1aedde2f5ec243e4260c5ff78bb6aa75a089";
|
||||
};
|
||||
|
||||
checkInputs = [ django ];
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-classy-tags";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1cayqddvxd5prhybqi77lif2z4j7mmfmxgc61pq9i82q5gy2asmd";
|
||||
sha256 = "d59d98bdf96a764dcf7a2929a86439d023b283a9152492811c7e44fc47555bc9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django six ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "10.4.1";
|
||||
version = "10.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-INA50DD3wfVPItGCgywZCe5bViatUkaaGdJ0vwcEHgY=";
|
||||
sha256 = "8a7c80eb70ec677a149173154a98cf1fa461c6b0e1a1d833c90e40a735eda2cd";
|
||||
};
|
||||
|
||||
# Set DROPBOX_TOKEN environment variable to a valid token.
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "entrypoint2";
|
||||
version = "0.2.1";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15dya04884armqjdyqz1jgachkqgh9dc3p25lvyz9afvg73k2qav";
|
||||
sha256 = "4ac1a8f08477d93282c422faa90875ce5edaa941e1f3fd410b95cb31d9f473a7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Eve";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a8a1216ef1d3f1a4c4fc5a7bd315eca5a3ef7dfc6b78807cdf19ddfeecafcc3e";
|
||||
sha256 = "ef335d13b798bc901636643f11455bab8b8698ddfe3a0b67bc251af1fd809b21";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, isPy27, fetchFromGitHub, buildPythonPackage, pythonOlder, fetchpatch, flake8, importlib-metadata, six }:
|
||||
{ lib, isPy27, isPy38, fetchFromGitHub, buildPythonPackage, pythonOlder, fetchpatch, flake8, importlib-metadata, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-future-import";
|
||||
@ -20,7 +20,8 @@ buildPythonPackage rec {
|
||||
# Upstream disables this test case naturally on python 3, but it also fails
|
||||
# inside NixPkgs for python 2. Since it's going to be deleted, we just skip it
|
||||
# on py2 as well.
|
||||
patches = lib.optionals isPy27 [ ./skip-test.patch ];
|
||||
patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ]
|
||||
++ lib.optionals isPy27 [ ./skip-test.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base";
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/flake8_future_import.py b/flake8_future_import.py
|
||||
index 92c3fda..27a1a66 100755
|
||||
--- a/flake8_future_import.py
|
||||
+++ b/flake8_future_import.py
|
||||
@@ -76,7 +76,7 @@ UNICODE_LITERALS = Feature(4, 'unicode_literals', (2, 6, 0), (3, 0, 0))
|
||||
GENERATOR_STOP = Feature(5, 'generator_stop', (3, 5, 0), (3, 7, 0))
|
||||
NESTED_SCOPES = Feature(6, 'nested_scopes', (2, 1, 0), (2, 2, 0))
|
||||
GENERATORS = Feature(7, 'generators', (2, 2, 0), (2, 3, 0))
|
||||
-ANNOTATIONS = Feature(8, 'annotations', (3, 7, 0), (4, 0, 0))
|
||||
+ANNOTATIONS = Feature(8, 'annotations', (3, 7, 0), (3, 10, 0))
|
||||
|
||||
|
||||
# Order important as it defines the error code
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "genanki";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c7c6c276f182a63a807b52a95f197df12794ff014f48dd287cb51ca2dcbe1b34";
|
||||
sha256 = "08eddb4a203e36e4fc3b66f85e00252070379867dbbc04fd8902ddc14fb352c6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "1.4.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e777333cbe85888f888c034d32880bb6a602ad83d8c81a95edca7c522cf430d8";
|
||||
sha256 = "25b869bb20ad6ee9f6e7fc3c95d973011ade8176af9197468686335e216c088e";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest mock ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "1.30.0";
|
||||
version = "1.31.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0634addb7576d48861d9963312fc82a0436042b8f282414ed58ca76d73edee54";
|
||||
sha256 = "74bbb5b2d0b249de4a52f561435d0c3570ddc19b249653ae588ec0abcc3c81e6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.13";
|
||||
version = "0.14.1";
|
||||
pname = "hdmedians";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "230f80e064d905c49a1941af1b7e806e2f22b3c9a90ad5c21fd17d72636ea277";
|
||||
sha256 = "ccefaae26302afd843c941b3b662f1119d5a36dec118077310f811a7a1ed8871";
|
||||
};
|
||||
|
||||
# nose was specified in setup.py as a build dependency...
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "islpy";
|
||||
version = "2020.2";
|
||||
version = "2020.2.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ee797e1284bffe897568f9cc1f063f1a6fac8d7b87596308b7467e9b870a90ef";
|
||||
sha256 = "7eb7dfa41d6a67d9ee4ea4bb9f08bdbcbee42b364502136b7882cfd80ff427e0";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "limnoria";
|
||||
version = "2020.08.30";
|
||||
version = "2020.10.10";
|
||||
disabled = isPy27; # abandoned upstream
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "44d81682cdf246a0324638707a2ef0819aae8c84fc0e69daaaa57cbc3f9e18e1";
|
||||
sha256 = "546fdfad14c645ebb56e20a83ce34259b91a6db5c50cf14df741771b28ac2e19";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.7";
|
||||
version = "2.1.0";
|
||||
pname = "mac_alias";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "08z2i68mk5j0vfy8jqihjm9m6njp1lpjh1m91b60h0k0kpmy71f4";
|
||||
sha256 = "9f07926e9befcc4ab35212d19541fe0e4e4abd67a7641aa75252a3ffd8deae94";
|
||||
};
|
||||
|
||||
# pypi package does not include tests;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, setuptools_scm
|
||||
, cython
|
||||
, numpy
|
||||
@ -12,11 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numcodecs";
|
||||
version = "0.6.4";
|
||||
version = "0.7.2";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ef4843d5db4d074e607e9b85156835c10d006afc10e175bda62ff5412fca6e4d";
|
||||
sha256 = "4a038064d5604e6181a64db668d7b700d9ae87e4041984c04cbf0042469664b0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "osmpythontools";
|
||||
version = "0.2.6";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "OSMPythonTools";
|
||||
inherit version;
|
||||
sha256 = "efc72e3963971c6c7fd94bd374704a5b78eb6c07397a4ffb5f9176c1e4aee096";
|
||||
sha256 = "8a33adbd266127e342d12da755075fae08f398032a6f0909b5e86bef13960a85";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -32,8 +32,6 @@ buildPythonPackage rec {
|
||||
xarray
|
||||
];
|
||||
|
||||
patches = [ ./remove-unused-dependency.patch ];
|
||||
|
||||
# no tests included
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/OSMPythonTools.egg-info/requires.txt b/OSMPythonTools.egg-info/requires.txt
|
||||
index 16a5019..e58155c 100644
|
||||
--- a/OSMPythonTools.egg-info/requires.txt
|
||||
+++ b/OSMPythonTools.egg-info/requires.txt
|
||||
@@ -1,5 +1,4 @@
|
||||
beautifulsoup4
|
||||
-datetime
|
||||
geojson
|
||||
lxml
|
||||
matplotlib
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 08e9455..1a6435e 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -14,7 +14,6 @@ setup(
|
||||
packages = ['OSMPythonTools', 'OSMPythonTools.internal'],
|
||||
install_requires = [
|
||||
'beautifulsoup4',
|
||||
- 'datetime',
|
||||
'geojson',
|
||||
'lxml',
|
||||
'matplotlib',
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oyaml";
|
||||
version = "0.9";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wimglenn";
|
||||
repo = "oyaml";
|
||||
rev = "v${version}";
|
||||
sha256 = "13xjdym0p0jh9bvyjsbhi4yznlp68bamy3xi4w5wpcrzlcq6cfh9";
|
||||
sha256 = "0qkj8g87drvjqiqqmz36gyqiczdfcfv8zk96kkifzk4f9dl5f02j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plone.testing";
|
||||
version = "8.0.1";
|
||||
version = "8.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e079c87f821cf2e411826940e65577a88e08827cf9a2b771070f2917a439b642";
|
||||
sha256 = "082b03aebe81d0bdcc44a917a795ae60d3add2c2abbee11e7c335fb13d5e7ca7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six setuptools zope_testing ];
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pq";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f54143844e73f4182532e68548dee447dd78dd00310a087e8cdee756d476a173";
|
||||
sha256 = "c664ee3a9a25efcb583e3d1d797588fb7c2fb5096220689eec78a7946b01b5ff";
|
||||
};
|
||||
|
||||
# tests require running postgresql cluster
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "PQ is a transactional queue for PostgreSQL";
|
||||
homepage = https://github.com/malthe/pq/;
|
||||
homepage = "https://github.com/malthe/pq/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybullet";
|
||||
version = "2.8.7";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9d3a8bdc9b4acce086c485ba719aabee33de7a867d84a058b182b139c789ad55";
|
||||
sha256 = "db4eea782c4d4808ef73b305a729d94f89035f7ad1b84032432e9dd101f689e4";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -21,11 +21,11 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pycuda";
|
||||
version = "2019.1.2";
|
||||
version = "2020.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a";
|
||||
sha256 = "effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5";
|
||||
};
|
||||
|
||||
preConfigure = with stdenv.lib.versions; ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylast";
|
||||
version = "3.3.0";
|
||||
version = "4.0.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1wqd23bbk5si2mcmswsi486zqnydjjf8g7924gcz6cc1x036lasd";
|
||||
sha256 = "8ec555d6c4c1b474e9b3c96c3786abd38303a1a5716d928b0f3cfdcb4499b093";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymavlink";
|
||||
version = "2.4.9";
|
||||
version = "2.4.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6049f270aa0a1013c7dcd32b9f4756d79b6a2ccf73babeca2c46b9e391e644fe";
|
||||
sha256 = "0b1265b169f809c6ca94911ad2d7649b8e087a7cc573a0a6ea62ade9bea7ca5c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future lxml ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyowm";
|
||||
version = "3.0.0";
|
||||
version = "3.1.1";
|
||||
|
||||
disabled = pythonOlder "3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f06ac5f2356f0964f088b1f840a6d382499054bd18539ffb1e7c84f29c2c39b6";
|
||||
sha256 = "a7b18297a9189dbe5f6b454b12d61a407e35c7eb9ca75bcabfe5e1c83245290d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests geojson ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
, setuptools }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
pname = "pyshp";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1h75a5fisqqj48m6wq7jhdxv6arjg3mvnr5q404pvfbjscj7yp76";
|
||||
sha256 = "a0aa668cd0fc09b873f10facfe96971c0496b7fe4f795684d96cc7306ac5841c";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmb";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
extension = "zip";
|
||||
sha256 = "59ccd07537fb2a630b0d8cccd78e80180bcca72150d7322c318e1bdae927e125";
|
||||
sha256 = "0937cb44936805d403e8e678d7042feb6d85da950a7019e8ae6842a0720fb00c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-bdd";
|
||||
version = "3.2.1";
|
||||
version = "4.0.1";
|
||||
|
||||
# tests are not included in pypi tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytest-dev";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02y28l5h1m9grj54p681qvv7nrhd7ly9jkqdchyw4p0lnmcmnsrd";
|
||||
sha256 = "1yqzz44as4pxffmg4hk9lijvnvlc2chg1maq1fbj5i4k4jpagvjz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ glob2 Mako parse parse-type py pytest six ];
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
# Tests require extra dependencies
|
||||
checkInputs = [ execnet mock pytest ];
|
||||
checkPhase = ''
|
||||
pytest
|
||||
PATH=$PATH:$out/bin pytest
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-igraph";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
disabled = !isPy3k; # fails to build
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72";
|
||||
sha256 = "e1f27622eddeb2bd5fdcbadb41ef048e884790bb050f9627c086dc609d0f1236";
|
||||
};
|
||||
|
||||
# NB: We want to use our igraph, not vendored igraph, but even with
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qtconsole";
|
||||
version = "4.7.6";
|
||||
version = "4.7.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6c24397c19a49a5cf69582c931db4b0f6b00a78530a2bfd122936f2ebfae2fef";
|
||||
sha256 = "f236ead8711dba0702507dd8fad473c7216a86eefa6098eff8ec4b54f57d7804";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
buildPythonPackage rec {
|
||||
|
||||
pname = "sharedmem";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "483e414b8c5d03093a02baf548449f1d8426a88855556fa42102bba82b86b2a8";
|
||||
sha256 = "c654a6bee2e2f35c82e6cc8b6c262fcabd378f5ba11ac9ef71530f8dabb8e2f7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smart_open";
|
||||
version = "2.1.1";
|
||||
version = "3.0.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "51b05acd85ec007e1d4dcdbf2bbf917218a45026f37d559559401114bb5e5840";
|
||||
sha256 = "7f4e85b71df5a3618f5447d0b417b7a3576308c839690a24a70338b8993684c3";
|
||||
};
|
||||
|
||||
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchgpipe";
|
||||
version = "0.0.5";
|
||||
version = "0.0.7";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "kakaobrain";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mqdavnqb8a320li2r7xw11w2lg03l59xxyg2fxpg4z57v0rbasi";
|
||||
sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pytorch ];
|
||||
|
||||
@ -25,12 +25,12 @@ with stdenv.lib;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "trytond";
|
||||
version = "5.6.5";
|
||||
version = "5.6.7";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a373d73b141d71f8e30d728dd8380955bc0f33daaa097201fa9a952e3663e6d8";
|
||||
sha256 = "aca005639931835f4f0eaa92ae48ffebb94551af91649a96018694ea448ca0ae";
|
||||
};
|
||||
|
||||
# Tells the tests which database to use
|
||||
|
||||
@ -6,21 +6,23 @@
|
||||
, scikitlearn
|
||||
, scipy
|
||||
, numba
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "umap-learn";
|
||||
version = "0.3.10";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmcinnes";
|
||||
repo = "umap";
|
||||
rev = version;
|
||||
sha256 = "0nck5va5km7qkbrhn15dsn0p2mms9kc641lcypy7l8haqgm44h8x";
|
||||
sha256 = "080by8h4rxr5ijx8vp8kn952chiqz029j26c04k4js4g9s7201bq";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -30,15 +32,15 @@ buildPythonPackage rec {
|
||||
numba
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace umap/tests/test_umap.py \
|
||||
--replace "def test_umap_transform_on_iris()" "@SkipTest
|
||||
def test_umap_transform_on_iris()"
|
||||
'';
|
||||
disabledTests = [
|
||||
# Plot functionality requires additional packages.
|
||||
# These test also fail with 'RuntimeError: cannot cache function' error.
|
||||
"test_umap_plot_testability"
|
||||
"test_plot_runs_at_all"
|
||||
|
||||
checkPhase = ''
|
||||
nosetests -s umap
|
||||
'';
|
||||
# Flaky test. Fails with AssertionError sometimes.
|
||||
"test_sparse_hellinger"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Uniform Manifold Approximation and Projection";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vertica-python";
|
||||
version = "0.11.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cceb39d081b8d1628956205642e740a9fabcfd2c6ecd982c51134fba8215d0bd";
|
||||
sha256 = "f042cf60ddd69eeb17c9f1586bae25da5b7282ca53d9afe0be30b943b4194d52";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future dateutil six ];
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zarr";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "53aa21b989a47ddc5e916eaff6115b824c0864444b1c6f3aaf4f6cf9a51ed608";
|
||||
sha256 = "d54f060739208392494c3dbcbfdf41c8df9fa23d9a32b91aea0549b4c5e2b77f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,18 +1,22 @@
|
||||
{ stdenv, python3Packages, nginx }:
|
||||
{ stdenv, fetchFromGitHub, python3Packages, nginx }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "devpi-server";
|
||||
version = "5.5.0";
|
||||
version = "6.0.0.dev0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0lily4a0k13bygx07x2f2q4nkwny0fj34hpac9i6mc70ysdn1hhi";
|
||||
src = fetchFromGitHub {
|
||||
owner = "devpi";
|
||||
repo = "devpi";
|
||||
rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c";
|
||||
sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm";
|
||||
};
|
||||
sourceRoot = "source/server";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
py
|
||||
appdirs
|
||||
devpi-common
|
||||
defusedxml
|
||||
execnet
|
||||
itsdangerous
|
||||
repoze_lru
|
||||
|
||||
25
pkgs/development/tools/knightos/mktiupgrade/default.nix
Normal file
25
pkgs/development/tools/knightos/mktiupgrade/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mktiupgrade";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KnightOS";
|
||||
repo = "mktiupgrade";
|
||||
rev = version;
|
||||
sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ asciidoc cmake ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://knightos.org/";
|
||||
description = "Makes TI calculator upgrade files from ROM dumps";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -4,11 +4,11 @@ with python.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rdbtools";
|
||||
version = "0.1.14";
|
||||
version = "0.1.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "03vdwwkqz8py6c3wfgx402rn8pjjfn44w3gbxzr60lbkx27m63yj";
|
||||
sha256 = "689e57e42f43bdc73ea4e893d9676819980d17968696826b69fbd951f59772de";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ redis python-lzf ];
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-c";
|
||||
version = "0.6.13";
|
||||
version = "0.6.15";
|
||||
|
||||
src = stdenv.mkDerivation rec {
|
||||
name = "${pname}-source-${version}";
|
||||
@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "lu-zero";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ks2w3gclahidv6r6i0d0d6sli7r8wabxzgmhq03czy5w7kr0x56";
|
||||
sha256 = "04hrk3vy8294vxcsggdpcs8hg3ykzj2564ifsqc4zwz4b4wd1p8l";
|
||||
};
|
||||
cargoLock = fetchurl {
|
||||
url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock";
|
||||
sha256 = "0czy5q8hkjqyn53p7cjxnxfgwygx2a6casjb4nj5gxss2x3haih6";
|
||||
sha256 = "0rqb6ssqsdlm8zbshbxkwxlyy7j7p2gyficavzz33cw9g6fpmzbd";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoSha256 = "0jjkcawcz6wacx22zir9ay1qsi5ffk7c4gwa6jpky4a94zr1h690";
|
||||
cargoSha256 = "1q2s28nqd6l9qmhmdksdjjlypxry5ff18i2pgwmgiilcry51mj4b";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
|
||||
@ -194,6 +194,8 @@ in
|
||||
lldb = llvmPackages_latest.lldb;
|
||||
};
|
||||
|
||||
ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {};
|
||||
|
||||
vscodevim.vim = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vim";
|
||||
|
||||
@ -0,0 +1,138 @@
|
||||
# Baseed on previous attempts:
|
||||
# - <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix>
|
||||
# - <https://github.com/NixOS/nixpkgs/issues/41189>
|
||||
{ lib, gccStdenv, vscode-utils, autoPatchelfHook, bash, file, makeWrapper, dotnet-sdk_3
|
||||
, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, utillinux, zlib
|
||||
, desktop-file-utils, xprop
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
# https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually
|
||||
libs = [
|
||||
# .NET Core
|
||||
openssl
|
||||
libkrb5
|
||||
zlib
|
||||
icu
|
||||
|
||||
# Credential Storage
|
||||
libsecret
|
||||
|
||||
# NodeJS
|
||||
libX11
|
||||
|
||||
# https://github.com/flathub/com.visualstudio.code.oss/issues/11#issuecomment-392709170
|
||||
libunwind
|
||||
lttng-ust
|
||||
curl
|
||||
|
||||
# General
|
||||
gcc.cc.lib
|
||||
utillinux # libuuid
|
||||
];
|
||||
|
||||
in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vsliveshare";
|
||||
publisher = "ms-vsliveshare";
|
||||
version = "1.0.2902";
|
||||
sha256 = "0fx2vi0wxamcwqcgcx7wpg8hi7f1c2pibrmd2qy2whilpsv3gzmb";
|
||||
};
|
||||
}).overrideAttrs(attrs: {
|
||||
buildInputs = attrs.buildInputs ++ libs ++ [ autoPatchelfHook bash file makeWrapper ];
|
||||
|
||||
# Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates.
|
||||
# Rather than patching the calls to functions, we modify the functions to return what we want,
|
||||
# which is less likely to break in the future.
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's/updateExecutablePermissionsAsync() {/& return;/' \
|
||||
-e 's/isInstallCorrupt(traceSource, manifest) {/& return false;/' \
|
||||
out/prod/extension-prod.js
|
||||
|
||||
declare ext_unique_id
|
||||
ext_unique_id="$(basename "$out")"
|
||||
|
||||
# Fix extension attempting to write to 'modifiedInternalSettings.json'.
|
||||
# Move this write to the tmp directory indexed by the nix store basename.
|
||||
sed -i \
|
||||
-E -e $'s/path\.resolve\(constants_1\.EXTENSION_ROOT_PATH, \'\.\/modifiedInternalSettings\.json\'\)/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-modifiedInternalSettings.json"\)/g' \
|
||||
out/prod/extension-prod.js
|
||||
|
||||
# Fix extension attempting to write to 'vsls-agent.lock'.
|
||||
# Move this write to the tmp directory indexed by the nix store basename.
|
||||
sed -i \
|
||||
-E -e $'s/(Agent_1.getAgentPath\(\) \+ \'.lock\')/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-vsls-agent.lock"\)/g' \
|
||||
out/prod/extension-prod.js
|
||||
|
||||
# TODO: Under 'node_modules/@vsliveshare/vscode-launcher-linux' need to hardcode path to 'desktop-file-install'
|
||||
# 'update-desktop-database' and 'xprop'. Might want to wrap the script instead.
|
||||
'';
|
||||
|
||||
# Support for the `postInstall` hook was added only in nixos-20.03,
|
||||
# so for backwards compatibility reasons lets not use it yet.
|
||||
installPhase = attrs.installPhase + ''
|
||||
# Support both the new and old directory structure of vscode extensions.
|
||||
if [[ -d $out/ms-vsliveshare.vsliveshare ]]; then
|
||||
cd $out/ms-vsliveshare.vsliveshare
|
||||
elif [[ -d $out/share/vscode/extensions/ms-vsliveshare.vsliveshare ]]; then
|
||||
cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare
|
||||
else
|
||||
echo "Could not find extension directory 'ms-vsliveshare.vsliveshare'." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
bash -s <<ENDSUBSHELL
|
||||
shopt -s extglob
|
||||
|
||||
# A workaround to prevent the journal filling up due to diagnostic logging.
|
||||
# See: https://github.com/MicrosoftDocs/live-share/issues/1272
|
||||
# See: https://unix.stackexchange.com/questions/481799/how-to-prevent-a-process-from-writing-to-the-systemd-journal
|
||||
gcc -fPIC -shared -ldl -o dotnet_modules/noop-syslog.so ${./noop-syslog.c}
|
||||
|
||||
# Normally the copying of the right executables is done externally at a later time,
|
||||
# but we want it done at installation time.
|
||||
cp dotnet_modules/exes/linux-x64/* dotnet_modules
|
||||
|
||||
# The required executables are already copied over,
|
||||
# and the other runtimes won't be used and thus are just a waste of space.
|
||||
rm -r dotnet_modules/exes dotnet_modules/runtimes/!(linux-x64)
|
||||
|
||||
# Not all executables and libraries are executable, so make sure that they are.
|
||||
find . -type f ! -executable -exec file {} + | grep -w ELF | cut -d ':' -f1 | xargs -rd'\n' chmod +x
|
||||
|
||||
# Not all scripts are executed by passing them to a shell, so they need to be executable as well.
|
||||
find . -type f -name '*.sh' ! -executable -exec chmod +x {} +
|
||||
|
||||
# Lock the extension downloader.
|
||||
touch install-linux.Lock externalDeps-linux.Lock
|
||||
ENDSUBSHELL
|
||||
'';
|
||||
|
||||
rpath = makeLibraryPath libs;
|
||||
|
||||
postFixup = ''
|
||||
# We cannot use `wrapProgram`, because it will generate a relative path,
|
||||
# which will break when copying over the files.
|
||||
mv dotnet_modules/vsls-agent{,-wrapped}
|
||||
makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \
|
||||
--prefix LD_LIBRARY_PATH : "$rpath" \
|
||||
--set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \
|
||||
--set DOTNET_ROOT ${dotnet-sdk_3}
|
||||
|
||||
for bn in check-reqs.sh install.sh uninstall.sh; do
|
||||
wrapProgram "$PWD/node_modules/@vsliveshare/vscode-launcher-linux/$bn" \
|
||||
--prefix PATH : "${makeBinPath [desktop-file-utils xprop]}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development";
|
||||
homepage = "https://aka.ms/vsls-docs";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ jraygauthier ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1 @@
|
||||
void syslog(int priority, const char *format, ...) { }
|
||||
@ -1,9 +1,18 @@
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
, gawk, gnused, utillinux, file
|
||||
, wget, python3, qemu-utils, euca2ools
|
||||
, e2fsprogs, cdrkit }:
|
||||
, e2fsprogs, cdrkit
|
||||
, gptfdisk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
# according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils
|
||||
guestDeps = [
|
||||
e2fsprogs gptfdisk gawk gnused utillinux
|
||||
];
|
||||
binDeps = guestDeps ++ [
|
||||
wget file qemu-utils cdrkit
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
# NOTICE: if you bump this, make sure to run
|
||||
# $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
|
||||
# growpart is needed in initrd in nixos/system/boot/grow-partition.nix
|
||||
@ -17,15 +26,24 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ python3 ];
|
||||
installFlags = [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/bin" "MANDIR=$(out)/man/man1" "DOCDIR=$(out)/doc" ];
|
||||
|
||||
# according to https://packages.ubuntu.com/source/zesty/cloud-utils
|
||||
binDeps = [
|
||||
wget e2fsprogs file gnused gawk utillinux qemu-utils euca2ools cdrkit
|
||||
];
|
||||
# $guest output contains all executables needed for cloud-init and $out the rest + $guest
|
||||
# This is similar to debian's package split into cloud-image-utils and cloud-guest-utils
|
||||
# The reason is to reduce the closure size
|
||||
outputs = [ "out" "guest"];
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput bin/ec2metadata $guest
|
||||
moveToOutput bin/growpart $guest
|
||||
moveToOutput bin/vcs-run $guest
|
||||
|
||||
for i in $out/bin/*; do
|
||||
wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin"
|
||||
done
|
||||
|
||||
for i in $guest/bin/*; do
|
||||
wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath guestDeps}:$guest/bin"
|
||||
ln -s $i $out/bin
|
||||
done
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -9,30 +9,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdf";
|
||||
version = "4.2.14";
|
||||
version = "4.2.15";
|
||||
src = fetchurl {
|
||||
url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2";
|
||||
sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l";
|
||||
sha256 = "04nbgfxyj5jg4d6sr28162cxbfwqgv0sa7vz1ayzvm8wbbpkbq5x";
|
||||
};
|
||||
|
||||
patches = let
|
||||
# The Debian patch revision to fetch from; this may differ from our package
|
||||
# version, but older patches should still apply.
|
||||
patchRev = "4.2.13-4";
|
||||
getPatch = name: sha256: fetchpatch {
|
||||
inherit sha256;
|
||||
url = "https://salsa.debian.org/debian-gis-team/hdf4/raw/debian/${patchRev}/debian/patches/${name}";
|
||||
};
|
||||
|
||||
in [
|
||||
(getPatch "64bit" "1xqk9zpch4m6ipa0f3x2cm8rwaz4p0ppp1vqglvz18j6q91p8b5y")
|
||||
(getPatch "hdfi.h" "01fr9csylnvk9jd9jn9y23bvxy192s07p32pr76mm3gwhgs9h7r4")
|
||||
(getPatch "hdf-4.2.10-aarch64.patch" "1hl0xw5pd9xhpq49xpwgg7c4z6vv5p19x6qayixw0myvgwj1r4zn")
|
||||
(getPatch "reproducible-builds.patch" "02j639w26xkxpxx3pdhbi18ywz8w3qmjpqjb83n47gq29y4g13hc")
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
libjpeg
|
||||
szip
|
||||
zlib
|
||||
|
||||
20
pkgs/tools/system/snooze/default.nix
Normal file
20
pkgs/tools/system/snooze/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snooze";
|
||||
version = "0.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "leahneukirchen";
|
||||
repo = "snooze";
|
||||
rev = "v${version}";
|
||||
sha256 = "0a114brvvjf6vl7grviv0gd6gmikr447m8kq1wilp4yj51sfyxa9";
|
||||
};
|
||||
makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description =
|
||||
"Tool for waiting until a particular time and then running a command.";
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
license = licenses.cc0;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,36 @@
|
||||
diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/__init__.py cloud-init-0.7.6/cloudinit/distros/__init__.py
|
||||
--- cloud-init-0.7.6.orig/cloudinit/distros/__init__.py 2014-10-10 15:26:25.000000000 +0000
|
||||
+++ cloud-init-0.7.6/cloudinit/distros/__init__.py 2016-06-08 07:51:45.230357099 +0000
|
||||
@@ -43,6 +43,7 @@
|
||||
'freebsd': ['freebsd'],
|
||||
'suse': ['sles'],
|
||||
'arch': ['arch'],
|
||||
From 269cc4c9558549f340ec186d9246654564b2f633 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Tue, 18 Aug 2020 10:22:36 +0100
|
||||
Subject: [PATCH] add nixos support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
cloudinit/distros/__init__.py | 1 +
|
||||
cloudinit/distros/nixos.py | 103 ++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 104 insertions(+)
|
||||
create mode 100644 cloudinit/distros/nixos.py
|
||||
|
||||
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
|
||||
index 2537608f..c533b585 100755
|
||||
--- a/cloudinit/distros/__init__.py
|
||||
+++ b/cloudinit/distros/__init__.py
|
||||
@@ -47,6 +47,7 @@ OSFAMILIES = {
|
||||
'gentoo': ['gentoo'],
|
||||
'redhat': ['amazon', 'centos', 'fedora', 'rhel'],
|
||||
'suse': ['opensuse', 'sles'],
|
||||
+ 'nixos': ['nixos'],
|
||||
}
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/cloudinit/distros/nixos.py
|
||||
--- cloud-init-0.7.6.orig/cloudinit/distros/nixos.py 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cloud-init-0.7.6/cloudinit/distros/nixos.py 2016-06-08 07:50:58.602616595 +0000
|
||||
@@ -0,0 +1,98 @@
|
||||
diff --git a/cloudinit/distros/nixos.py b/cloudinit/distros/nixos.py
|
||||
new file mode 100644
|
||||
index 00000000..d53d2a61
|
||||
--- /dev/null
|
||||
+++ b/cloudinit/distros/nixos.py
|
||||
@@ -0,0 +1,103 @@
|
||||
+# vi: ts=4 expandtab
|
||||
+#
|
||||
+# Copyright (C) 2012 Canonical Ltd.
|
||||
@ -35,10 +53,13 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+import os
|
||||
+
|
||||
+from cloudinit import distros
|
||||
+from cloudinit import helpers
|
||||
+from cloudinit import log as logging
|
||||
+from cloudinit import util
|
||||
+from cloudinit import atomic_helper
|
||||
+
|
||||
+from cloudinit.distros.parsers.hostname import HostnameConf
|
||||
+
|
||||
@ -52,6 +73,8 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou
|
||||
+ # calls from repeatly happening (when they
|
||||
+ # should only happen say once per instance...)
|
||||
+ self._runner = helpers.Runners(paths)
|
||||
+ self.usr_lib_exec = os.path.join(os.path.dirname(__file__),
|
||||
+ "../../../../../libexec")
|
||||
+ self.osfamily = 'nixos'
|
||||
+
|
||||
+ def _select_hostname(self, hostname, fqdn):
|
||||
@ -72,7 +95,7 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou
|
||||
+ if not conf:
|
||||
+ conf = HostnameConf('')
|
||||
+ conf.set_hostname(your_hostname)
|
||||
+ util.write_file(out_fn, str(conf), 0644)
|
||||
+ atomic_helper.write_file(out_fn, str(conf).encode("utf-8"))
|
||||
+
|
||||
+ def _read_system_hostname(self):
|
||||
+ sys_hostname = self._read_hostname(self.hostname_conf_fn)
|
||||
@ -111,3 +134,6 @@ diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/clou
|
||||
+
|
||||
+ def update_package_sources(self):
|
||||
+ raise NotImplementedError()
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,40 +1,85 @@
|
||||
{ lib, pythonPackages, fetchurl, cloud-utils }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonApplication
|
||||
, jinja2
|
||||
, oauthlib
|
||||
, configobj
|
||||
, pyyaml
|
||||
, requests
|
||||
, jsonschema
|
||||
, jsonpatch
|
||||
, pytest
|
||||
, httpretty
|
||||
, dmidecode
|
||||
, pytestCheckHook
|
||||
, shadow
|
||||
, cloud-utils
|
||||
, openssh
|
||||
}:
|
||||
|
||||
let version = "0.7.9";
|
||||
let version = "20.3";
|
||||
|
||||
in pythonPackages.buildPythonApplication {
|
||||
in buildPythonApplication {
|
||||
pname = "cloud-init";
|
||||
inherit version;
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/cloud-init/trunk/${version}/+download/cloud-init-${version}.tar.gz";
|
||||
sha256 = "0wnl76pdcj754pl99wxx76hkir1s61x0bg0lh27sdgdxy45vivbn";
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "cloud-init";
|
||||
rev = version;
|
||||
sha256 = "1fmckxf4q4sxjqs758vw7ca0rnhl9hyq67cqpqzz2v3s1gqzjhm4";
|
||||
};
|
||||
|
||||
patches = [ ./add-nixos-support.patch ];
|
||||
patches = [ ./0001-add-nixos-support.patch ];
|
||||
prePatch = ''
|
||||
patchShebangs ./tools
|
||||
substituteInPlace setup.py --replace /lib/systemd $out/lib/systemd
|
||||
'';
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace /usr $out \
|
||||
--replace /etc $out/etc \
|
||||
--replace /lib/systemd $out/lib/systemd \
|
||||
--replace 'self.init_system = ""' 'self.init_system = "systemd"'
|
||||
postInstall = ''
|
||||
install -D -m755 ./tools/write-ssh-key-fingerprints $out/libexec/write-ssh-key-fingerprints
|
||||
for i in $out/libexec/*; do
|
||||
wrapProgram $i --prefix PATH : "${lib.makeBinPath [ openssh ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
substituteInPlace cloudinit/config/cc_growpart.py \
|
||||
--replace 'util.subp(["growpart"' 'util.subp(["${cloud-utils}/bin/growpart"'
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
oauthlib
|
||||
configobj
|
||||
pyyaml
|
||||
requests
|
||||
jsonschema
|
||||
jsonpatch
|
||||
];
|
||||
|
||||
# Argparse is part of python stdlib
|
||||
sed -i s/argparse// requirements.txt
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
httpretty
|
||||
dmidecode
|
||||
# needed for tests; at runtime we rather want the setuid wrapper
|
||||
shadow
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable
|
||||
oauthlib pyserial configobj pyyaml requests jsonpatch ];
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [
|
||||
dmidecode cloud-utils.guest
|
||||
]}/bin"
|
||||
];
|
||||
|
||||
checkInputs = with pythonPackages; [ contextlib2 httpretty mock unittest2 ];
|
||||
disabledTests = [
|
||||
# tries to create /var
|
||||
"test_dhclient_run_with_tmpdir"
|
||||
# clears path and fails because mkdir is not found
|
||||
"test_path_env_gets_set_from_main"
|
||||
# tries to read from /etc/ca-certificates.conf while inside the sandbox
|
||||
"test_handler_ca_certs"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
preCheck = ''
|
||||
# TestTempUtils.test_mkdtemp_default_non_root does not like TMPDIR=/build
|
||||
export TMPDIR=/tmp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://cloudinit.readthedocs.org";
|
||||
|
||||
@ -25,6 +25,9 @@ let
|
||||
|
||||
cubical = callPackage ../development/libraries/agda/cubical { };
|
||||
|
||||
functional-linear-algebra = callPackage
|
||||
../development/libraries/agda/functional-linear-algebra { };
|
||||
|
||||
generic = callPackage ../development/libraries/agda/generic { };
|
||||
};
|
||||
in mkAgdaPackages Agda
|
||||
|
||||
@ -1622,7 +1622,7 @@ in
|
||||
|
||||
clog-cli = callPackage ../development/tools/clog-cli { };
|
||||
|
||||
cloud-init = callPackage ../tools/virtualization/cloud-init { };
|
||||
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { };
|
||||
|
||||
cloudflared = callPackage ../applications/networking/cloudflared { };
|
||||
|
||||
@ -2986,6 +2986,8 @@ in
|
||||
|
||||
cron = callPackage ../tools/system/cron { };
|
||||
|
||||
snooze = callPackage ../tools/system/snooze { };
|
||||
|
||||
cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {});
|
||||
inherit (cudaPackages)
|
||||
cudatoolkit_6
|
||||
@ -9364,6 +9366,10 @@ in
|
||||
|
||||
knightos-patchrom = callPackage ../development/tools/knightos/patchrom { };
|
||||
|
||||
knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade {
|
||||
asciidoc = asciidoc-full;
|
||||
};
|
||||
|
||||
knightos-scas = callPackage ../development/tools/knightos/scas { };
|
||||
|
||||
kotlin = callPackage ../development/compilers/kotlin { };
|
||||
@ -12412,7 +12418,7 @@ in
|
||||
openal = if stdenv.isDarwin then null else openal;
|
||||
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
|
||||
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
|
||||
rav1e = if stdenv.isDarwin then null else rav1e;
|
||||
rav1e = null;
|
||||
samba = if stdenv.isDarwin then null else samba;
|
||||
vid-stab = if stdenv.isDarwin then null else vid-stab;
|
||||
x265 = if stdenv.isDarwin then null else x265;
|
||||
|
||||
@ -101,13 +101,7 @@ let
|
||||
libpng = pkgs.libpng12;
|
||||
giflib = pkgs.giflib_4_1;
|
||||
};
|
||||
camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {
|
||||
giflib = pkgs.giflib_4_1;
|
||||
};
|
||||
camlimages =
|
||||
if lib.versionOlder "4.06" ocaml.version
|
||||
then callPackage ../development/ocaml-modules/camlimages { }
|
||||
else camlimages_4_1;
|
||||
camlimages = callPackage ../development/ocaml-modules/camlimages { };
|
||||
|
||||
benchmark = callPackage ../development/ocaml-modules/benchmark { };
|
||||
|
||||
|
||||
@ -14970,6 +14970,24 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
NetServerSSPrefork = buildPerlPackage {
|
||||
pname = "Net-Server-SS-PreFork";
|
||||
version = "0.06pre";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kazuho";
|
||||
repo = "p5-Net-Server-SS-PreFork";
|
||||
rev = "5fccc0c270e25c65ef634304630af74b48807d21";
|
||||
sha256 = "0z02labw0dd76sdf301bhrmgnsjds0ddsg22138g8ys4az49bxx6";
|
||||
};
|
||||
checkInputs = [ HTTPMessage LWP TestSharedFork HTTPServerSimple TestTCP TestUNIXSock ];
|
||||
buildInputs = [ ModuleInstall ];
|
||||
propagatedBuildInputs = [ NetServer ServerStarter ];
|
||||
meta = {
|
||||
description = "A hot-deployable variant of Net::Server::PreFork";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
NetSMTPSSL = buildPerlPackage {
|
||||
pname = "Net-SMTP-SSL";
|
||||
version = "1.04";
|
||||
@ -17987,7 +18005,7 @@ let
|
||||
};
|
||||
buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ];
|
||||
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ];
|
||||
propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork ];
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/starman
|
||||
'';
|
||||
@ -20536,6 +20554,21 @@ let
|
||||
buildInputs = [ TestSharedFork ];
|
||||
};
|
||||
|
||||
TestUNIXSock = buildPerlModule rec {
|
||||
pname = "Test-UNIXSock";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/F/FU/FUJIWARA/${pname}-${version}.tar.gz";
|
||||
sha256 = "0gwgd2w16dsppmf1r6yc17ipvs8b62ybsiz2dyzwy4il236b8c1p";
|
||||
};
|
||||
meta = {
|
||||
description = "Testing UNIX domain socket program";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
buildInputs = [ ModuleBuildTiny ];
|
||||
propagatedBuildInputs = [ TestSharedFork TestTCP ];
|
||||
};
|
||||
|
||||
TestTime = buildPerlPackage {
|
||||
pname = "Test-Time";
|
||||
version = "0.08";
|
||||
|
||||
@ -5215,7 +5215,7 @@ in {
|
||||
throw "pyobjc can only be built on Mac OS";
|
||||
|
||||
pyocr = callPackage ../development/python-modules/pyocr {
|
||||
tesseract = pkgs.tesseract_4;
|
||||
tesseract = pkgs.tesseract4;
|
||||
};
|
||||
|
||||
pyodbc = callPackage ../development/python-modules/pyodbc { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user