Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-16 12:20:04 +00:00 committed by GitHub
commit b31a0f36f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 893 additions and 957 deletions

View file

@ -0,0 +1,24 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kube-capacity";
version = "0.5.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "robscott";
repo = pname;
sha256 = "127583hmpj04y522wir76a39frm6zg9z7mb4ny5lxxjqhn0q0cd5";
};
vendorSha256 = "sha256-EgLWZs282IV1euCUCc5ucf267E2Z7GF9SgoImiGvuVM=";
meta = with lib; {
description =
"A simple CLI that provides an overview of the resource requests, limits, and utilization in a Kubernetes cluster";
homepage = "https://github.com/robscott/kube-capacity";
changelog = "https://github.com/robscott/kube-capacity/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ maintainers.bryanasdev000 ];
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "starboard";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZIAdYuJ8LS8x2h+VXQrkgdmKkw9VKl7FcnOVZNSnXM0=";
sha256 = "sha256-w+xaZPEMmJYDPQG4MuAlWMhwhEyeVcpaeDwqsnIbIHA=";
};
vendorSha256 = "sha256-aVKQcRZgxhIph+y28HhR15DUjwiz/4+t1bMrYXjPW7Q=";

View file

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.20",
"version": "1.7.21",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {

View file

@ -8,12 +8,12 @@
let
executableName = "element-desktop";
version = "1.7.20";
version = "1.7.21";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-kQMswcEGsefQ8HCWxYPgvxOKP5cgvXx8oCl5Inh6sOg=";
sha256 = "sha256-tpFiKaJB6KN97ipN3OCTyxpiS0b980MQ1Ynxj8CjCuI=";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

View file

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.20";
version = "1.7.21";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-8R7l/Pmymd5+/Fri7z2/TDj1h2FL0QgLICoXajePing=";
sha256 = "sha256-JJXl+jDlXw8fZ1ZeeAACvilbqG9zanCmBsHy6BEla8M=";
};
installPhase = ''

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncgopher";
version = "0.1.5";
version = "0.2.0";
src = fetchFromGitHub {
owner = "jansc";
repo = "ncgopher";
rev = "v${version}";
sha256 = "1mv89sanmr49b9za95jl5slpq960b246j2054r8xfafzqmbp44af";
sha256 = "sha256-Yny5zZe5x7/pWda839HcFkHFuL/jl1Q7ykTZzKy871I=";
};
cargoSha256 = "12r4vgrg2bkr3p61yxcsg02kppg84vn956l0v1vb08i94rxzc8zk";
cargoSha256 = "sha256-IsRaDhnRamMSbtXG1r1j0jZYjFiSjRdwOaUVyqy4ZJw=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JvHuOMpt62tw7ewDev7unAgZGV+ZSo6wDuiPhWap2v0=";
sha256 = "sha256-wOeWqgN0VYmTXPTU3z5Utau8diW18QKV7w/2y86R8U0=";
};
vendorSha256 = "sha256-0nnrH3GJhd4wlRETo9iSlFkXq358m30k7Fsb5haHlpQ=";
vendorSha256 = "sha256-Ge3nwI0cY2JxRTn3EZtlal5c6A6TIKfH/CkJnQ1C6PY=";
runVend = true;
# Tests are trying to access /homeless-shelter

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
, libtiff, freetype, mjpegtools, x264, gettext, openexr
@ -7,23 +7,15 @@
, fontconfig, intltool }:
stdenv.mkDerivation {
name = "cinelerra-cv-2018-05-16";
name = "cinelerra-cv-2021-02-14";
src = fetchFromGitHub {
owner = "cinelerra-cv-team";
repo = "cinelerra-cv";
rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc";
sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk";
rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e";
sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj";
};
patches = [
# avoid gcc10 error about narrowing
(fetchpatch {
url = "https://github.com/cinelerra-cv-team/cinelerra-cv/pull/2/commits/a1b2d9c3bd5730ec0284894f3d81892af3e77f1f.patch";
sha256 = "1cjyv1m174dblpa1bs5dggk24h4477zqvc5sbfc0m5rpkndx5ycp";
})
];
preConfigure = ''
find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i
./autogen.sh
@ -50,8 +42,8 @@ stdenv.mkDerivation {
];
meta = with lib; {
description = "Video Editor";
homepage = "https://www.cinelerra.org/";
description = "Professional video editing and compositing environment (community version)";
homepage = "http://cinelerra-cv.wikidot.com/";
maintainers = with maintainers; [ marcweber ];
license = licenses.gpl2Only;
};

View file

@ -50,8 +50,9 @@ stdenv.mkDerivation rec {
sha256 = "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b";
};
nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja autoPatchelfHook ]
++ optionals gtkSupport [ wrapGAppsHook ];
nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja ]
++ optionals gtkSupport [ wrapGAppsHook ]
++ optionals stdenv.isLinux [ autoPatchelfHook ];
buildInputs =
[ zlib glib perl pixman
vde2 texinfo makeWrapper lzo snappy
@ -108,6 +109,10 @@ stdenv.mkDerivation rec {
# this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang
chmod +x ./scripts/shaderinclude.pl
patchShebangs .
# avoid conflicts with libc++ include for <version>
mv VERSION QEMU_VERSION
substituteInPlace meson.build \
--replace "'VERSION'" "'QEMU_VERSION'"
'' + optionalString stdenv.hostPlatform.isMusl ''
NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H"
'';
@ -119,8 +124,6 @@ stdenv.mkDerivation rec {
"--enable-guest-agent"
"--sysconfdir=/etc"
]
# disable sysctl check on darwin.
++ optional stdenv.isDarwin "--cpu=x86_64"
++ optional numaSupport "--enable-numa"
++ optional seccompSupport "--enable-seccomp"
++ optional smartcardSupport "--enable-smartcard"

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "luna-icons";
version = "0.9.2";
version = "1.0";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p";
sha256 = "1gggsd7scf15vrpgzvskx4p3jifnjdx0aqndqhvpc6ksdbh3nzqd";
};
nativeBuildInputs = [
@ -35,12 +35,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/icons
cp -a Luna* $out/share/icons
# remove files with spaces in the name, otherwise
# gtk-update-icon-cache fails with the message "The generated cache
# was invalid"
# https://github.com/darkomarko42/Luna-Icons/issues/2
rm "$out/share/icons/Luna/scalable/apps/yast-checkmedia (copia).svg"
for theme in $out/share/icons/*; do
gtk-update-icon-cache "$theme"
done

View file

@ -10,47 +10,6 @@
let
common = callPackage ./common.nix;
in rec {
cudatoolkit_6 = common {
version = "6.0.37";
url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run";
sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
gcc = gcc48;
};
cudatoolkit_6_5 = common {
version = "6.5.19";
url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run";
sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
gcc = gcc48;
};
cudatoolkit_7 = common {
version = "7.0.28";
url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run";
sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
gcc = gcc6;
};
cudatoolkit_7_5 = common {
version = "7.5.18";
url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run";
sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88";
gcc = gcc6;
};
cudatoolkit_8 = common {
version = "8.0.61.2";
url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run";
sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w";
runPatches = [
(fetchurl {
url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run";
sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d";
})
];
gcc = gcc6;
};
cudatoolkit_9_0 = common {
version = "9.0.176.1";
url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run";

File diff suppressed because it is too large Load diff

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.15.0";
version = "1.15.2";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NLPmuS7HTPY8OfeppqVhrj4iVZix4orr1oYilcXaAqI=";
sha256 = "sha256-xIvcHMDBPdmNSp0/aaVDXxCmCpQOtSFG99lyHAWmbY0=";
};
nativeBuildInputs = [ meson ninja ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "quickjs";
version = "2019-12-21";
version = "2020-11-08";
src = fetchurl {
url = "https://bellard.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p";
sha256 = "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f";
};
makeFlags = [ "prefix=${placeholder "out"}" ];
@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
# Programs exit with code 1 when testing help, so grep for a string
set +o pipefail
qjs --help 2>&1 | grep "QuickJS version"
qjsbn --help 2>&1 | grep "QuickJS version"
qjscalc --help 2>&1 | grep "QuickJS version"
set -o pipefail
@ -27,9 +26,7 @@ stdenv.mkDerivation rec {
echo "console.log('Output from compiled program');" > "$temp"
set -o verbose
out=$(mktemp) && qjsc "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
out=$(mktemp) && qjsbnc "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
out=$(mktemp) && qjsc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
'';
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }:
{ callPackage, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -6,35 +6,6 @@ let
};
in rec {
cudnn_cudatoolkit_7 = generic rec {
# Old URL is v4 instead of v4.0 for some reason...
version = "4";
cudatoolkit = cudatoolkit_7;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz";
sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd";
};
cudnn_cudatoolkit_7_5 = generic rec {
version = "6.0";
cudatoolkit = cudatoolkit_7_5;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an";
};
cudnn6_cudatoolkit_8 = generic rec {
version = "6.0";
cudatoolkit = cudatoolkit_8;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv";
};
cudnn_cudatoolkit_8 = generic rec {
version = "7.0.5";
cudatoolkit = cudatoolkit_8;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e";
};
cudnn_cudatoolkit_9_0 = generic rec {
version = "7.3.0";
cudatoolkit = cudatoolkit_9_0;

View file

@ -2,8 +2,13 @@
set -eu -o pipefail
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix)
node2nix=$(nix-build ../../.. -A nodePackages.node2nix)
cd ${DIR}
rm -f ./node-env.nix
${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix
# using --no-out-link in nix-build argument would cause the
# gc to run before the script finishes
# which would cause a failure
# it's safer to just remove the link after the script finishes
# see https://github.com/NixOS/nixpkgs/issues/112846 for more details
rm ./result

View file

@ -0,0 +1,66 @@
{ lib, buildDunePackage, fetchurl
, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
, bigarray-compat, checkseum, logs, psq, fmt
, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner
}:
buildDunePackage rec {
pname = "carton";
version = "0.2.0";
useDune2 = true;
minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn";
};
# remove changelogs for mimic and the git* packages
postPatch = ''
rm CHANGES.md CHANGES.mimic.md
'';
buildInputs = [
cmdliner
digestif
mmap
result
rresult
fpath
bos
];
propagatedBuildInputs = [
ke
duff
decompress
cstruct
optint
bigstringaf
stdlib-shims
bigarray-compat
checkseum
logs
psq
fmt
];
doCheck = true;
checkInputs = [
base64
alcotest
alcotest-lwt
crowbar
lwt
findlib
mirage-flow
];
meta = with lib; {
description = "Implementation of PACKv2 file in OCaml";
license = licenses.mit;
homepage = "https://github.com/mirage/ocaml-git";
maintainers = [ maintainers.sternenseemann ];
};
}

View file

@ -0,0 +1,28 @@
{ buildDunePackage, carton, carton-lwt
, bigarray-compat, bigstringaf, lwt, fpath, result
, mmap, fmt, decompress, astring
, alcotest, alcotest-lwt, cstruct, logs
, mirage-flow, rresult, ke
}:
buildDunePackage {
pname = "carton-git";
inherit (carton) version src useDune2 minimumOCamlVersion postPatch;
propagatedBuildInputs = [
carton
carton-lwt
bigarray-compat
bigstringaf
lwt
fpath
result
mmap
fmt
decompress
astring
];
inherit (carton) meta;
}

View file

@ -0,0 +1,46 @@
{ buildDunePackage, carton
, lwt, decompress, optint, bigstringaf
, alcotest, alcotest-lwt, cstruct, fmt, logs
, mirage-flow, result, rresult, bigarray-compat
, ke, base64, bos, checkseum, digestif, fpath, mmap
, stdlib-shims
, git-binary # pkgs.git
}:
buildDunePackage {
pname = "carton-lwt";
inherit (carton) version src useDune2 minimumOCamlVersion postPatch;
propagatedBuildInputs = [
carton
lwt
decompress
optint
bigstringaf
];
doCheck = true;
checkInputs = [
git-binary
alcotest
alcotest-lwt
cstruct
fmt
logs
mirage-flow
result
rresult
bigarray-compat
ke
base64
bos
checkseum
digestif
fpath
mmap
stdlib-shims
];
inherit (carton) meta;
}

View file

@ -1,22 +1,23 @@
{ lib, fetchurl, buildDunePackage
, checkseum, cmdliner
, alcotest, bos, camlzip, mmap, re
, checkseum, bigarray-compat, optint
, bigstringaf, alcotest, hxd, camlzip, base64
}:
buildDunePackage rec {
version = "0.9.0";
version = "1.2.0";
pname = "decompress";
minimumOCamlVersion = "4.07";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
};
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ checkseum ];
checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
checkInputs = [ alcotest bigstringaf hxd camlzip base64 ];
doCheck = true;
meta = {

View file

@ -1,24 +1,29 @@
{ lib, fetchurl, buildDunePackage
, cstruct, fmt
, bos, cmdliner, fpath, logs
, alcotest
, stdlib-shims, bigarray-compat, fmt
, alcotest, hxd, crowbar, bigstringaf
}:
buildDunePackage rec {
pname = "duff";
version = "0.2";
version = "0.3";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
sha256 = "0bi081w4349cqc1n9jsjh1lrcqlnv3nycmvh9fniscv8lz1c0gjq";
sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm";
};
buildInputs = [ bos cmdliner fpath logs ] ++ lib.optional doCheck alcotest;
propagatedBuildInputs = [ cstruct fmt ];
propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ];
doCheck = true;
checkInputs = [
alcotest
crowbar
hxd
bigstringaf
];
meta = {
description = "Pure OCaml implementation of libXdiff (Rabins fingerprint)";

View file

@ -1,19 +1,20 @@
{ lib, buildDunePackage, fetchurl, ocaml
, fmt, bigstringaf, bigarray-compat
, bigarray-overlap, angstrom, ke, alcotest }:
, fmt, bigstringaf, angstrom, alcotest }:
buildDunePackage rec {
pname = "encore";
version = "0.5";
version = "0.7";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
sha256 = "15n0dla149k9h7migs76wap08z5402qcvxyqxzl887ha6isj3p9n";
sha256 = "0cwmhkj5jmk3z5y0agmkf5ygpgxynjkq2d7d50jgzmnqs7f6g7nh";
};
useDune2 = true;
propagatedBuildInputs = [ angstrom ke fmt bigstringaf bigarray-compat bigarray-overlap ];
propagatedBuildInputs = [ angstrom fmt bigstringaf ];
checkInputs = [ alcotest ];
doCheck = true;

View file

@ -1,15 +0,0 @@
{ buildDunePackage, git, cohttp, cohttp-lwt }:
buildDunePackage {
pname = "git-http";
inherit (git) version src minimumOCamlVersion;
useDune2 = true;
propagatedBuildInputs = [ git cohttp cohttp-lwt ];
meta = {
description = "Client implementation of the Smart HTTP Git protocol in pure OCaml";
inherit (git.meta) homepage license maintainers;
};
}

View file

@ -1,20 +0,0 @@
{ stdenv, buildDunePackage, git-http, cohttp, cohttp-lwt-unix
, mmap, cmdliner, mtime, alcotest, mirage-crypto-rng, tls
, io-page, git-binary
}:
buildDunePackage {
pname = "git-unix";
inherit (git-http) version src minimumOCamlVersion;
useDune2 = true;
propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
doCheck = !stdenv.isAarch64;
meta = {
description = "Unix backend for the Git protocol(s)";
inherit (git-http.meta) homepage license maintainers;
};
}

View file

@ -0,0 +1,18 @@
{ lib, buildDunePackage
, git, mimic, cohttp-mirage, cohttp, cohttp-lwt
, fmt, lwt, result, rresult, uri
}:
buildDunePackage {
pname = "git-cohttp-mirage";
inherit (git) version src minimumOCamlVersion useDune2;
propagatedBuildInputs = [
git mimic cohttp-mirage cohttp cohttp-lwt fmt lwt result rresult uri
];
meta = git.meta // {
description = "A package to use HTTP-based ocaml-git with MirageOS backend";
};
}

View file

@ -0,0 +1,17 @@
{ buildDunePackage, git, git-cohttp
, cohttp-lwt-unix, cohttp-lwt, fmt, lwt, result, rresult, uri
}:
buildDunePackage {
pname = "git-cohttp-unix";
inherit (git) version src minimumOCamlVersion useDune2;
propagatedBuildInputs = [
git git-cohttp cohttp-lwt-unix cohttp-lwt fmt lwt result rresult uri
];
meta = git.meta // {
description = "A package to use HTTP-based ocaml-git with Unix backend";
};
}

View file

@ -0,0 +1,19 @@
{ buildDunePackage, git
, cohttp, cohttp-lwt, fmt, lwt, result, rresult, uri
, alcotest, alcotest-lwt, bigstringaf, cstruct, logs
, mirage-flow, ke
}:
buildDunePackage rec {
pname = "git-cohttp";
inherit (git) version minimumOCamlVersion src useDune2;
propagatedBuildInputs = [
git cohttp cohttp-lwt fmt lwt result rresult uri
];
meta = git.meta // {
description = "A package to use HTTP-based ocaml-git with Unix backend";
};
}

View file

@ -1,27 +1,31 @@
{ stdenv, lib, fetchurl, buildDunePackage
, alcotest, mtime, mirage-crypto-rng, tls, git-binary
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult
, stdlib-shims
, fpath, ke, logs, lwt, ocamlgraph, uri, rresult
, result, bigstringaf, optint, mirage-flow, domain-name, emile
, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt
}:
buildDunePackage rec {
pname = "git";
version = "2.1.3";
version = "3.2.0";
minimumOCamlVersion = "4.07";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
sha256 = "14rq7h1n5v2n0507ycbac8sq21xnzhgirxmlmqv4j5k3aajdcj16";
};
propagatedBuildInputs = [
angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
domain-name emile mimic carton carton-lwt carton-git ipaddr psq
];
checkInputs = [
alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar
];
checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
doCheck = !stdenv.isAarch64;
meta = {

View file

@ -0,0 +1,44 @@
{ buildDunePackage, fetchpatch, git
, mmap, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
, cohttp-lwt-unix, decompress, domain-name, ipaddr, mtime
, tcpip, awa-mirage, mirage-flow
, alcotest, alcotest-lwt, base64, cstruct
, ke, mirage-crypto-rng, ocurl, git-binary
}:
buildDunePackage {
pname = "git-unix";
inherit (git) version src minimumOCamlVersion;
useDune2 = true;
buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip
];
propagatedBuildInputs = [
mmap rresult result bigstringaf
fmt bos fpath uri digestif logs lwt
astring cohttp-lwt-unix decompress
domain-name ipaddr mtime mirage-flow
];
checkInputs = [
alcotest alcotest-lwt base64 cstruct ke
mirage-crypto-rng ocurl git-binary
];
doCheck = true;
patches = [
(fetchpatch {
url = "https://github.com/mirage/ocaml-git/commit/09b41073fa869c0a595e1d8ed7224d539682af1c.patch";
sha256 = "1avbxv60gbrll9gny1pl6jwbx5b8282h3frhzy2ghb0fx1pggp6w";
})
];
meta = {
description = "Unix backend for the Git protocol(s)";
inherit (git.meta) homepage license maintainers;
};
}

View file

@ -1,30 +1,28 @@
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }:
{ lib, fetchurl, buildDunePackage
, decompress, stdlib-shims, alcotest
}:
buildDunePackage rec {
minimumOCamlVersion = "4.07";
version = "20191011";
version = "20200929";
pname = "imagelib";
useDune2 = true;
src = fetchFromGitHub {
owner = "rlepigre";
repo = "ocaml-imagelib";
rev = "03fed7733825cef7e0465163f398f6af810e2e75";
sha256 = "0h7vgyss42nhlfqpbdnb54nxq86rskqi2ilx8b87r0hi19hqx463";
src = fetchurl {
url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/ocaml-imagelib_${version}/imagelib-ocaml-imagelib_${version}.tbz";
sha256 = "1wyq4xxj0dxwafbcmd7jylsd8w1gbyl7j4ak6jbq1n0ardwmpwca";
};
patches = [ (fetchpatch {
url = "https://github.com/rlepigre/ocaml-imagelib/pull/24/commits/4704fd44adcda62e0d96ea5b1927071326aa6111.patch";
sha256 = "0ipjab1hfa2v2pnd8g1k3q2ia0plgiw7crm3fa4w2aqpzdyabkb9";
}) ];
propagatedBuildInputs = [ decompress stdlib-shims ];
propagatedBuildInputs = [ decompress ];
doCheck = true;
checkInputs = [ alcotest ];
meta = {
description = "Image formats such as PNG and PPM in OCaml";
license = lib.licenses.lgpl3;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
homepage = "https://github.com/rlepigre/ocaml-imagelib";
};
}

View file

@ -1,8 +0,0 @@
{ buildDunePackage, imagelib }:
buildDunePackage {
pname = "imagelib-unix";
inherit (imagelib) version src useDune2 meta;
propagatedBuildInputs = [ imagelib ];
}

View file

@ -1,18 +1,29 @@
{ lib, fetchurl, buildDunePackage, fmt, logs, mtime, stdlib-shims }:
{ lib, fetchurl, buildDunePackage
, repr, ppx_repr, fmt, logs, mtime, stdlib-shims
, cmdliner, progress, semaphore-compat
, alcotest, crowbar, re
}:
buildDunePackage rec {
pname = "index";
version = "1.2.1";
version = "1.3.0";
minimumOCamlVersion = "4.07";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
sha256 = "1a9b6rsazrjy07syxl9ix5002i95mlvx5vk7nl2x9cs6s0zw906d";
sha256 = "00qwhwg79scs5bgp8nbppv06qs9yhicf686q7lh64ngh0642iz6n";
};
buildInputs = [ stdlib-shims ];
propagatedBuildInputs = [ fmt logs mtime ];
propagatedBuildInputs = [
fmt logs mtime repr ppx_repr cmdliner progress semaphore-compat
];
doCheck = true;
checkInputs = [ alcotest crowbar re ];
meta = {
homepage = "https://github.com/mirage/index";
@ -20,5 +31,4 @@ buildDunePackage rec {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, buildDunePackage, irmin, irmin-mem, irmin-test }:
{ lib, buildDunePackage, irmin, irmin-test, alcotest }:
buildDunePackage rec {
@ -8,7 +8,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ irmin ];
doCheck = true;
checkInputs = [ irmin-mem irmin-test ];
checkInputs = [ alcotest irmin-test ];
meta = irmin.meta // {
description = "Irmin backend which allow to store values into chunks";

View file

@ -0,0 +1,27 @@
{ buildDunePackage
, irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime
, alcotest, alcotest-lwt
}:
buildDunePackage {
pname = "irmin-containers";
inherit (ppx_irmin) src version useDune2;
nativeBuildInputs = [
ppx_irmin
];
propagatedBuildInputs = [
irmin irmin-unix irmin-git ppx_irmin lwt mtime
];
doCheck = true;
checkInputs = [
alcotest alcotest-lwt
];
meta = ppx_irmin.meta // {
description = "Mergeable Irmin data structures";
};
}

View file

@ -1,6 +1,6 @@
{ lib, fetchurl, buildDunePackage
{ lib, buildDunePackage
, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, alcotest, hex, ppx_irmin
, repr, ppx_irmin, bheap
}:
buildDunePackage {
@ -11,10 +11,23 @@ buildDunePackage {
useDune2 = true;
minimumOCamlVersion = "4.07";
propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ];
propagatedBuildInputs = [
astring
base64
digestif
fmt
jsonm
logs
ocaml_lwt
ocamlgraph
uri
repr
bheap
ppx_irmin
];
checkInputs = [ alcotest hex ppx_irmin ];
doCheck = true;
# circular dependency on irmin-mem
doCheck = false;
meta = ppx_irmin.meta // {
description = "A distributed database built on the same principles as Git";

View file

@ -1,6 +1,10 @@
{ lib, buildDunePackage, git, irmin, irmin-mem, irmin-test, git-unix }:
{ lib, buildDunePackage
, git, irmin, irmin-test, ppx_irmin, git-cohttp-unix, git-unix
, digestif, cstruct, fmt, astring, fpath, logs, lwt, uri
, mtime, alcotest
}:
buildDunePackage rec {
buildDunePackage {
pname = "irmin-git";
@ -8,9 +12,21 @@ buildDunePackage rec {
useDune2 = true;
propagatedBuildInputs = [ git irmin ];
propagatedBuildInputs = [
git
irmin
ppx_irmin
digestif
cstruct
fmt
astring
fpath
logs
lwt
uri
];
checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ];
checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test ];
doCheck = true;

View file

@ -1,5 +1,5 @@
{ lib, buildDunePackage, cohttp-lwt, irmin, webmachine
, checkseum, git-unix, irmin-git, irmin-mem, irmin-test
, checkseum, git-unix, irmin-git, irmin-test, digestif, git-cohttp-unix
}:
buildDunePackage rec {
@ -12,7 +12,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cohttp-lwt irmin webmachine ];
checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ];
checkInputs = [ digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test ];
doCheck = true;

View file

@ -0,0 +1,21 @@
{ buildDunePackage, irmin, mtime, logs, lwt }:
buildDunePackage {
pname = "irmin-layers";
inherit (irmin) version src useDune2;
propagatedBuildInputs = [
irmin
mtime
logs
lwt
];
# mutual dependency on irmin-test
doCheck = false;
meta = irmin.meta // {
description = "Combine different Irmin stores into a single, layered store";
};
}

View file

@ -1,21 +0,0 @@
{ lib, buildDunePackage, irmin, irmin-test }:
buildDunePackage rec {
pname = "irmin-mem";
inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ irmin ];
checkInputs = lib.optional doCheck irmin-test;
doCheck = true;
meta = irmin.meta // {
description = "Generic in-memory Irmin stores";
};
}

View file

@ -0,0 +1,27 @@
{ buildDunePackage, irmin-mirage, irmin-git
, mirage-kv, cohttp, conduit-lwt, conduit-mirage
, git-cohttp-mirage, fmt, git, lwt, mirage-clock, uri
}:
buildDunePackage {
pname = "irmin-mirage-git";
inherit (irmin-mirage) version src useDune2;
propagatedBuildInputs = [
irmin-mirage
irmin-git
mirage-kv
cohttp
conduit-lwt
conduit-mirage
git-cohttp-mirage
fmt
git
lwt
mirage-clock
uri
];
inherit (irmin-mirage) meta;
}

View file

@ -0,0 +1,21 @@
{ buildDunePackage, irmin-mirage, irmin-graphql
, mirage-clock, cohttp-lwt, lwt, uri, git
}:
buildDunePackage {
pname = "irmin-mirage-graphql";
inherit (irmin-mirage) version src useDune2;
propagatedBuildInputs = [
irmin-mirage
irmin-graphql
mirage-clock
cohttp-lwt
lwt
uri
git
];
inherit (irmin-mirage) meta;
}

View file

@ -0,0 +1,15 @@
{ buildDunePackage, irmin, fmt, ptime, mirage-clock }:
buildDunePackage {
pname = "irmin-mirage";
inherit (irmin) version src useDune2;
propagatedBuildInputs = [
irmin fmt ptime mirage-clock
];
meta = irmin.meta // {
description = "MirageOS-compatible Irmin stores";
};
}

View file

@ -1,4 +1,6 @@
{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test, ocaml_lwt }:
{ lib, buildDunePackage
, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath
}:
buildDunePackage rec {
minimumOCamlVersion = "4.02.3";
@ -9,9 +11,10 @@ buildDunePackage rec {
useDune2 = true;
propagatedBuildInputs = [ index irmin ocaml_lwt ];
buildInputs = [ fpath ];
propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt ];
checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ];
checkInputs = [ alcotest-lwt irmin-test ];
doCheck = true;

View file

@ -1,23 +1,24 @@
{ lib, fetchurl, buildDunePackage, ppxlib, ocaml-syntax-shims }:
{ lib, fetchurl, buildDunePackage, ppxlib, ppx_repr }:
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.2.0";
version = "2.4.0";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "0gzw918b661qkvd140hilww9jsc49rxsxz1k4iihyvikjn202km4";
sha256 = "1b6lav5br1b83cwdc3gj9mqkzhlbfjrbyjx0107zvj54m82dbrxb";
};
minimumOCamlVersion = "4.06";
minimumOCamlVersion = "4.08";
useDune2 = true;
buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ ppxlib ];
propagatedBuildInputs = [
ppx_repr
ppxlib
];
# tests depend on irmin, would create mutual dependency
# opt to test irmin instead of ppx_irmin
doCheck = false;
meta = {

View file

@ -1,4 +1,6 @@
{ buildDunePackage, alcotest, cmdliner, irmin, metrics-unix, mtime }:
{ buildDunePackage
, alcotest, cmdliner, irmin, metrics-unix, mtime, irmin-layers
}:
buildDunePackage {
@ -8,7 +10,9 @@ buildDunePackage {
useDune2 = true;
propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ];
propagatedBuildInputs = [
alcotest cmdliner irmin metrics-unix mtime irmin-layers
];
meta = irmin.meta // {
description = "Irmin test suite";

View file

@ -1,7 +1,7 @@
{ lib, buildDunePackage
, checkseum, cmdliner, git-unix, yaml
, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http, irmin-mem, irmin-pack, irmin-watcher
, irmin-test
, checkseum, cmdliner, git-unix, git-cohttp-unix, yaml, fpath
, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http
, irmin-pack, irmin-watcher, irmin-test
}:
buildDunePackage rec {
@ -12,8 +12,10 @@ buildDunePackage rec {
useDune2 = true;
propagatedBuildInputs = [ checkseum cmdliner git-unix yaml
irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher
propagatedBuildInputs = [
checkseum cmdliner git-unix yaml fpath
irmin irmin-fs irmin-git irmin-graphql irmin-http
irmin-pack irmin-watcher git-cohttp-unix
];
checkInputs = lib.optional doCheck irmin-test;

View file

@ -6,6 +6,8 @@ buildDunePackage rec {
minimumOCamlVersion = "4.03";
useDune2 = true;
src = fetchurl {
url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz";
sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb";

View file

@ -1,14 +1,16 @@
{ lib, buildDunePackage, ocaml_gettext, ounit }:
{ buildDunePackage, ocaml_gettext, dune-configurator, ounit }:
buildDunePackage rec {
pname = "gettext-stub";
inherit (ocaml_gettext) src version meta;
inherit (ocaml_gettext) src version useDune2 meta;
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ ocaml_gettext ];
doCheck = true;
checkInputs = lib.optional doCheck ounit;
checkInputs = [ ounit ];
}

View file

@ -15,6 +15,12 @@ buildDunePackage rec {
wodan
];
meta = wodan.meta // { description = "Wodan as an Irmin store"; };
meta = wodan.meta // {
# wodan is currently incompatible with irmin 2.3.0.
# additionally upgrading to current master (unclear
# if the issue is fixed there) is not possible as it
# depends on a custom fork of mirage-block
broken = true;
description = "Wodan as an Irmin store";
};
}

View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "2.6.4";
version = "2.6.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "d8def7a909c0471479e1d8b0965de6bb7644b8de315d6e578f9d848b8a6812d0";
sha256 = "sha256-inktluPKefrFQCF2yadvHwT9Rw+pJLw8pjdUc35IJoc=";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "hatasmota";
version = "0.2.8";
version = "0.2.9";
src = fetchFromGitHub {
owner = "emontnemery";
repo = pname;
rev = version;
sha256 = "sha256-DuVpo+g5VS7bkj/DZi0vNOAPjPkzfIA5I2BD5KJ/rNQ=";
sha256 = "sha256-+4jlzemF5f4Qz4QHDaErsmVHq1Pjn/vsvoq/oCbW/hI=";
};
propagatedBuildInputs = [

View file

@ -1,33 +1,39 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, fetchzip
, alembic
, ipython
, jinja2
, python-oauth2
, prometheus_client
, async_generator
, certipy
, dateutil
, entrypoints
, jinja2
, jupyter-telemetry
, oauthlib
, pamela
, prometheus_client
, requests
, sqlalchemy
, tornado
, traitlets
, requests
, notebook
, pythonOlder
, nodePackages
, oauthlib
, certipy
, jupyter-telemetry
, beautifulsoup4
, cryptography
, notebook
, pytest-asyncio
, pytestCheckHook
, requests-mock
, virtualenv
}:
let
# js/css assets that setup.py tries to fetch via `npm install` when building
# from source.
# from source. https://github.com/jupyterhub/jupyterhub/blob/master/package.json
bootstrap =
fetchzip {
url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz";
sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd";
url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz";
sha256 = "1ywmxqdccg0mgx0xknrn1hlrfnhcwphc12y9l91zizx26fqfmzgc";
};
font-awesome =
fetchzip {
@ -36,30 +42,30 @@ let
};
jquery =
fetchzip {
url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz";
sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi";
url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz";
sha256 = "0yi9ql493din1qa1s923nd5zvd0klk1sx00xj1wx2yambmq86vm9";
};
moment =
fetchzip {
url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
sha256 = "12gb3p0rz5wyjwykv9g0pix7dd352lx1z7rzdjsf2brhwc4ffyip";
url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
sha256 = "0ifzzla4zffw23g3xvhwx3fj3jny6cjzxfzl1x0317q8wa0c7w5i";
};
requirejs =
fetchzip {
url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz";
sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja";
url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz";
sha256 = "165hkli3qcd59cjqvli9r5f92i0h7czkmhcg1cgwamw2d0b7xibz";
};
in
buildPythonPackage rec {
pname = "jupyterhub";
version = "1.1.0";
disabled = pythonOlder "3.5";
version = "1.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1mqknz0rxqzx4nc57vscvfh2d4znzlzpy83ancqxdaq3b8i70al5";
sha256 = "13pf6qhimpaxj20871ff5rvwwan59320cdhhrn9cfh6314971zq5";
};
# Most of this only applies when building from source (e.g. js/css assets are
@ -86,12 +92,7 @@ buildPythonPackage rec {
"'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'"
substituteInPlace setup.py --replace \
"'npm', 'run', 'lessc', '--'" \
"'${nodePackages.less}/bin/lessc'"
substituteInPlace setup.py --replace \
"'npm', 'install', '--progress=false'" \
"'true'"
"'npm'" "'true'"
declare -A deps
deps[bootstrap]=${bootstrap}
@ -109,14 +110,45 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado
traitlets prometheus_client async_generator notebook certipy oauthlib
# https://github.com/jupyterhub/jupyterhub/blob/master/requirements.txt
alembic
async_generator
certipy
dateutil
entrypoints
jinja2
jupyter-telemetry
oauthlib
pamela
prometheus_client
requests
sqlalchemy
tornado
traitlets
];
# Disable tests because they take an excessive amount of time to complete.
doCheck = false;
preCheck = ''
substituteInPlace jupyterhub/tests/test_spawner.py --replace \
"'jupyterhub-singleuser'" "'$out/bin/jupyterhub-singleuser'"
'';
checkInputs = [
# https://github.com/jupyterhub/jupyterhub/blob/master/dev-requirements.txt
beautifulsoup4
cryptography
notebook
pytest-asyncio
pytestCheckHook
requests-mock
virtualenv
];
disabledTests = [
# Tries to install older versions through pip
"test_upgrade"
# Testcase fails to find requests import
"test_external_service"
];
meta = with lib; {
description = "Serves multiple Jupyter notebook instances";

View file

@ -1,41 +1,42 @@
{ lib
, buildPythonPackage
, jupyterhub
, globus-sdk
, mwoauth
, codecov
, flake8
, pyjwt
, pytest
, pytestcov
, pytest-tornado
, requests-mock
, pythonOlder
, fetchPypi
, google_api_python_client
, google-auth-oauthlib
, jupyterhub
, mwoauth
, pyjwt
, pytest-asyncio
, pytestCheckHook
, requests-mock
}:
buildPythonPackage rec {
pname = "oauthenticator";
version = "0.12.3";
version = "0.13.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "f86e18e954ae37796ee149fe01ab0be0707d9e0415d62336ba3447e7b4383461";
sha256 = "5202adcd96ddbbccbc267da02f2d14e977300c81291aaa77be4fd9f2e27cfa37";
};
checkPhase = ''
py.test oauthenticator/tests
'';
propagatedBuildInputs = [
jupyterhub
];
# No tests in archive
doCheck = false;
pytestFlagsArray = [ "oauthenticator/tests" ];
checkInputs = [ globus-sdk mwoauth codecov flake8 pytest
pytestcov pytest-tornado requests-mock pyjwt ];
propagatedBuildInputs = [ jupyterhub ];
disabled = pythonOlder "3.4";
checkInputs = [
google_api_python_client
google-auth-oauthlib
mwoauth
pyjwt
pytest-asyncio
pytestCheckHook
requests-mock
];
meta = with lib; {
description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more.";

View file

@ -1,34 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, pytestCheckHook
, numpy
, pandas
, python
, setuptools
, isPy3k
}:
buildPythonPackage rec {
pname = "xarray";
version = "0.16.1";
version = "0.16.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "5e1af056ff834bf62ca57da917159328fab21b1f8c25284f92083016bb2d92a5";
sha256 = "sha256-OOhDnWyRvNW3wPyjSdr44GQ6xohQyYcmLVNSbp19AeQ=";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ numpy pandas setuptools ];
checkInputs = [ pytestCheckHook ];
checkPhase = ''
pytest $out/${python.sitePackages}
'';
# There always seem to be broken tests...
doCheck = false;
disabled = !isPy3k;
pythonImportsCheck = [ "xarray" ];
meta = {
description = "N-D labeled arrays and datasets in Python";

View file

@ -5534,7 +5534,7 @@ in with self; {
arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; };
arrangements = derive2 { name="arrangements"; version="1.1.9"; sha256="0nrlyxgn6667l2rb1q5rvps1anld9aq88qqr3ch2i6zchnqxrdg9"; depends=[gmp R6]; };
arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; };
arrow = derive2 { name="arrow"; version="2.0.0"; sha256="0n9g8j7bis7aga2icc8gd6mv7fnh2d5m7fy62fqs4z69l69y19r8"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; };
arrow = derive { snapshot = "2021-02-01"; } { name="arrow"; version="3.0.0"; sha256="0wgdj6fr4vbz91s76gfwyv2q66p8z3fwf9zgk4112rjhj60q7qfq"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; };
ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; };
arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; };
arsenal = derive2 { name="arsenal"; version="3.5.0"; sha256="0avi434wkk3w7axd89a4jwsbb11fi0239mkkla6zasnjwbqgjim0"; depends=[knitr]; };

View file

@ -231,6 +231,7 @@ let
};
packagesWithNativeBuildInputs = {
arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ];
adimpro = [ pkgs.imagemagick ];
animation = [ pkgs.which ];
audio = [ pkgs.portaudio ];

View file

@ -8,7 +8,7 @@ GEM
rainbow (3.0.0)
regexp_parser (2.0.3)
rexml (3.2.4)
rubocop (1.9.1)
rubocop (1.10.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)

View file

@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922";
sha256 = "1ncd6w4sc112j86j9j12ws7flxfi8dk8nal2kyxg7phdfr703qlz";
type = "gem";
};
version = "1.9.1";
version = "1.10.0";
};
rubocop-ast = {
dependencies = ["parser"];

View file

@ -15,13 +15,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "ryujinx";
version = "1.0.6498"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
version = "1.0.6574"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "67033ed8e05eb70860ac6af2b83deab0256c11eb";
sha256 = "1lg0cybbrf0x3jl10jwdwcg1zyhxsqfdnwnsvdm1lah75xg15ymw";
rev = "80ed8596c165127fb52026c697a9b6b515dabbd4";
sha256 = "0jhrl8g9fbz3w2hzmy9jm22cvjfa0x5vh3912rz1rvnd41qb9vs8";
};
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_NOLOGO=1
nuget sources Add -Name nixos -Source "$PWD/nixos"
nuget init "$nugetDeps" "$PWD/nixos"

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
version = "4.0.0";
version = "4.0.1";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
sha256 = "10kgg2i5yzdfhylrdkmh8rsc4cgdnhcgfa8fa4dm8m3licjciwam";
sha256 = "sha256-FJqUYQDDOuO0EcZ8+el/MUcJJzWL7vgGhEFo7v4HpOw=";
};
vendorSha256 = "1l3b86f5xmyc6lskvb4ab30adcgzb69ayccc0wcz2f28sda3i80r";
vendorSha256 = "sha256-CO4U8uSQeHXLPj5PH/SsOI/LjT2Rs/mBHsvNTudx72I=";
doCheck = false;

View file

@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "09pv1xvycgfai151z6kbsggyldcd3cx6x1p04dcim2xrawqvng6s";
sha256 = "135xbaz6q4565mklxjmm4mybm5qayvz34m0bdg609597kxw6l97j";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "1iybbvxjny33mw3h2f81fdvsvp65xa62c2qrzjv8hkrqkw69ckrp";
sha256 = "1i4cp6kyqbqj0fnmwx11bq6a1k4hrhyxz9qifr1qjfi7n8ybqrqy";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
version = "325.0.0";
version = "327.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@ -41,11 +41,15 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ jq ];
patches = [
# For kubectl configs, don't store the absolute path of the `gcloud` binary as it can be garbage-collected
./gcloud-path.patch
# Disable checking for updates for the package
./gsutil-disable-updates.patch
];
installPhase = ''
runHook preInstall
mkdir -p $out/google-cloud-sdk
cp -R * .install $out/google-cloud-sdk/
@ -91,6 +95,8 @@ in stdenv.mkDerivation rec {
jq -c . $path > $path.min
mv $path.min $path
done
runHook postInstall
'';
meta = with lib; {

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.10.10";
version = "2.11.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "sha256-Rt+60j1+uwL6g4HGc+xdUzGK6nanGfRYbekO54iKsPE=";
sha256 = "sha256-c+3zB0bxohQQsOjcTLHgRQamJfm7iUdz79t8q8wAFL8=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-6L1J5RHI657Z03rMmhwEzgpQ0//dykqGi8bI2Enc3N8=";
cargoSha256 = "sha256-ORkj6T9O/NKuaILm5NFGePYxKMaCAAydascelaEvYVw=";
doCheck = false;

View file

@ -2,16 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
version = "0.1.13";
version = "0.1.14";
src = fetchFromGitHub {
owner = "printfn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dz6vGRsWc7ubc/drj2Qw/of8AciPgVzc4++Eozg0Luo=";
sha256 = "sha256-zKjYUkkm15YRF0YFJKi2A6twvmHuEyxdWcNs37r2dJg=";
};
cargoSha256 = "sha256-/HBTmLZLhv89mvIVLocw9XbfOgxh9KsjA6KT60IuJeA=";
cargoSha256 = "sha256-e95DRhD22zvizUJOM2It45Bx05iK3KtaMgFPkMbR7iI=";
doInstallCheck = true;
installCheckPhase = ''
[[ "$($out/bin/fend "1 km to m")" = "1000 m" ]]
'';
meta = with lib; {
description = "Arbitrary-precision unit-aware calculator";

View file

@ -0,0 +1,25 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
pname = "savepagenow";
version = "1.1.1";
src = fetchFromGitHub {
owner = "pastpages";
repo = pname;
rev = "v${version}";
sha256 = "1lz6rc47cds9rb35jdf8n13gr61wdkh5jqzx4skikm1yrqkwjyhm";
};
propagatedBuildInputs = with python3Packages; [ click requests ];
# requires network access
doCheck = false;
meta = with lib; {
description = "A simple Python wrapper for archive.org's \"Save Page Now\" capturing service";
homepage = "https://github.com/pastpages/savepagenow";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "skim";
version = "0.9.3";
version = "0.9.4";
src = fetchCrate {
inherit pname version;
sha256 = "026mgqcp9sg6wwikghrc3rgh5p6wdbnvav5pb3xvs79lj85d5ga7";
sha256 = "0yvjzmz2vqc63l8911jflqf5aww7wxsav2yal5wg9ci9hzq6dl7j";
};
outputs = [ "out" "vim" ];
cargoSha256 = "07bs23x2vxzlrca5swwq8khmd9fbdhlhm0avwp9y231df6xdi2ys";
cargoSha256 = "0xh4f8c62kzj2fx7hyhdy13zhay13a6d2d7i9yz0n40dfgf70qx0";
postPatch = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "6.5.0";
version = "6.5.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-O2k9eUs+aopwtT/DXYIv9pc9z8W4K6cXUE6diqNDTrg=";
sha256 = "sha256-5S9mKmnrycrL7DFq8duWVbzEHQfiXAXQYcc3bdiVu1k=";
};
cargoSha256 = "1yjhphw680cf93lgknksa67k0w0rhq6s3jinyn649wd71gbc5656";
cargoSha256 = "0sbkqdwfsfb7q52a9vh5lmggrc8ny2l0xr4qx3m42xm0h64f3y6n";
buildInputs = lib.optional stdenv.isDarwin Foundation;

View file

@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Yet another HTTPie clone in Rust";
homepage = "https://github.com/ducaale/xh";
changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ payas SuperSandro2000 ];
};

View file

@ -113,6 +113,15 @@ mapAliases ({
cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30
cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21
cpp-gsl = microsoft_gsl; # added 2019-05-24
cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14
cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # added 2021-02-14
cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14
cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14
cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14
cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14
cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";

View file

@ -3398,11 +3398,6 @@ in
cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {});
inherit (cudaPackages)
cudatoolkit_6
cudatoolkit_6_5
cudatoolkit_7
cudatoolkit_7_5
cudatoolkit_8
cudatoolkit_9
cudatoolkit_9_0
cudatoolkit_9_1
@ -3420,10 +3415,6 @@ in
cudnnPackages = callPackages ../development/libraries/science/math/cudnn { };
inherit (cudnnPackages)
cudnn_cudatoolkit_7
cudnn_cudatoolkit_7_5
cudnn6_cudatoolkit_8
cudnn_cudatoolkit_8
cudnn_cudatoolkit_9
cudnn_cudatoolkit_9_0
cudnn_cudatoolkit_9_1
@ -20781,6 +20772,8 @@ in
sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { };
savepagenow = callPackage ../tools/misc/savepagenow { };
scheme-manpages = callPackage ../data/documentation/scheme-manpages { };
scowl = callPackage ../data/misc/scowl { };
@ -23238,6 +23231,8 @@ in
popeye = callPackage ../applications/networking/cluster/popeye { };
kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { };
fluxctl = callPackage ../applications/networking/cluster/fluxctl { };
fluxcd = callPackage ../applications/networking/cluster/fluxcd { };

View file

@ -82,6 +82,14 @@ let
ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
carton = callPackage ../development/ocaml-modules/carton { };
carton-git = callPackage ../development/ocaml-modules/carton/git.nix { };
carton-lwt = callPackage ../development/ocaml-modules/carton/lwt.nix {
git-binary = pkgs.git;
};
camlidl = callPackage ../development/tools/ocaml/camlidl { };
camlp4 =
@ -391,8 +399,6 @@ let
imagelib = callPackage ../development/ocaml-modules/imagelib { };
imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { };
inotify = callPackage ../development/ocaml-modules/inotify { };
integers = callPackage ../development/ocaml-modules/integers { };
@ -425,9 +431,13 @@ let
git-binary = pkgs.git;
};
git-http = callPackage ../development/ocaml-modules/git-http { };
git-cohttp = callPackage ../development/ocaml-modules/git/cohttp.nix { };
git-unix = callPackage ../development/ocaml-modules/git-unix {
git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { };
git-cohttp-mirage = callPackage ../development/ocaml-modules/git/cohttp-mirage.nix { };
git-unix = callPackage ../development/ocaml-modules/git/unix.nix {
git-binary = pkgs.git;
};
@ -464,6 +474,8 @@ let
irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { };
irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { };
irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { };
irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { };
@ -472,7 +484,13 @@ let
irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { };
irmin-mem = callPackage ../development/ocaml-modules/irmin/mem.nix { };
irmin-layers = callPackage ../development/ocaml-modules/irmin/layers.nix { };
irmin-mirage = callPackage ../development/ocaml-modules/irmin/mirage.nix { };
irmin-mirage-git = callPackage ../development/ocaml-modules/irmin/mirage-git.nix { };
irmin-mirage-graphql = callPackage ../development/ocaml-modules/irmin/mirage-graphql.nix { };
irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { };

View file

@ -16629,6 +16629,10 @@ let
description = "Indent and reformat perl scripts";
license = lib.licenses.gpl2Plus;
};
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/perltidy
'';
};
PHPSerialization = buildPerlPackage {