Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
612f0525b3
@ -1758,7 +1758,7 @@
|
||||
name = "Chris Double";
|
||||
};
|
||||
dpaetzel = {
|
||||
email = "david.a.paetzel@gmail.com";
|
||||
email = "david.paetzel@posteo.de";
|
||||
github = "dpaetzel";
|
||||
githubId = 974130;
|
||||
name = "David Pätzel";
|
||||
@ -6708,6 +6708,11 @@
|
||||
githubId = 483735;
|
||||
name = "Dmitry Geurkov";
|
||||
};
|
||||
tscholak = {
|
||||
email = "torsten.scholak@googlemail.com";
|
||||
github = "tscholak";
|
||||
name = "Torsten Scholak";
|
||||
};
|
||||
tstrobel = {
|
||||
email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains";
|
||||
name = "Thomas Strobel";
|
||||
|
||||
@ -109,6 +109,22 @@
|
||||
reconfiguring <literal>hostsdir</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>99-main.network</literal> file was removed. Maching all
|
||||
network interfaces caused many breakages, see
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/18962">#18962</link>
|
||||
and <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>.
|
||||
</para>
|
||||
<para>
|
||||
We already don't support the global <link linkend="opt-networking.useDHCP">networking.useDHCP</link>,
|
||||
<link linkend="opt-networking.defaultGateway">networking.defaultGateway</link> and
|
||||
<link linkend="opt-networking.defaultGateway6">networking.defaultGateway6</link> options
|
||||
if <link linkend="opt-networking.useNetworkd">networking.useNetworkd</link> is enabled,
|
||||
but direct users to configure the per-device
|
||||
<link linkend="opt-networking.interfaces">networking.interfaces.<name>.…</link> options.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
||||
@ -251,7 +251,7 @@ let
|
||||
default = [];
|
||||
example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";
|
||||
description = ''
|
||||
The set of packages that should be made availabe to the user.
|
||||
The set of packages that should be made available to the user.
|
||||
This is in contrast to <option>environment.systemPackages</option>,
|
||||
which adds packages to all users.
|
||||
'';
|
||||
|
||||
@ -61,7 +61,7 @@ let
|
||||
'' else ''
|
||||
echo "Checking that Nix can read nix.conf..."
|
||||
ln -s $out ./nix.conf
|
||||
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null
|
||||
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net --option experimental-features nix-command"} >/dev/null
|
||||
'')
|
||||
);
|
||||
|
||||
|
||||
@ -299,7 +299,8 @@ in
|
||||
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
|
||||
rm -f ${smokepingHome}/cropper
|
||||
ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper
|
||||
cp ${cgiHome} ${smokepingHome}/smokeping.fcgi
|
||||
rm -f ${smokepingHome}/smokeping.fcgi
|
||||
ln -s ${cgiHome} ${smokepingHome}/smokeping.fcgi
|
||||
${cfg.package}/bin/smokeping --check --config=${configPath}
|
||||
${cfg.package}/bin/smokeping --static --config=${configPath}
|
||||
'';
|
||||
@ -314,5 +315,7 @@ in
|
||||
serviceConfig.Restart = "always";
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ erictapen ];
|
||||
}
|
||||
|
||||
|
||||
@ -76,15 +76,6 @@ in
|
||||
};
|
||||
in mkMerge [ {
|
||||
enable = true;
|
||||
networks."99-main" = (genericNetwork mkDefault) // {
|
||||
# We keep the "broken" behaviour of applying this to all interfaces.
|
||||
# In general we want to get rid of this workaround but there hasn't
|
||||
# been any work on that.
|
||||
# See the following issues for details:
|
||||
# - https://github.com/NixOS/nixpkgs/issues/18962
|
||||
# - https://github.com/NixOS/nixpkgs/issues/61629
|
||||
matchConfig = mkDefault { Name = "*"; };
|
||||
};
|
||||
}
|
||||
(mkMerge (forEach interfaces (i: {
|
||||
netdevs = mkIf i.virtual ({
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy";
|
||||
version = "2.2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i9rpnlmgrnkgmr9hyx9sky9gzj2cjhay84a0yaijwcb9nmr8nnc";
|
||||
sha256 = "1qdflxr0an6l2m3j90h55bzyj7rjlkkwmxx945hwv8xi472rcgdj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtractor";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0qlbccdxyfy0f09y6qg1xkg12fm67bf2f2c27c22cg8lzk9ang5j";
|
||||
sha256 = "00fj762qdna4bm8hshdhkwfa48s01bi5sk4f030rfk77mivl09jk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jormungandr";
|
||||
version = "0.6.5";
|
||||
version = "0.7.0-alpha.dev.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/input-output-hk/${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "16s6ks63194w35xlgzbhjdb3h606hkj049bap52sd6qf637bw2p7";
|
||||
sha256 = "0r3icx42glrpa68sjxz4gr0z5660gh4n79lncy720s04cmgjcjci";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoSha256 = "1kba65rnm2vyqsjhcnfwy1m44x1w3xxlzinykmb89jy6qr8gvp42";
|
||||
cargoSha256 = "0f9b2lr2xxlcn9j33b5ahzbndz6sjm8ybhqm472bv5hzisqm4lg4";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig protobuf ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "OpenOrienteering-Mapper";
|
||||
version = "0.8.4";
|
||||
version = "0.9.0";
|
||||
|
||||
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
|
||||
qtsensors clipper zlib proj doxygen cups];
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rw34kp2vd1la97vnk9plwvis6lvyib2bvs7lgkhpnm4p5l7dp1g";
|
||||
sha256 = "0wnxj2xf529941dwss6ygb1krfx18lzl6rf67060b0zndc7n6l8f";
|
||||
};
|
||||
|
||||
cmakeFlags =
|
||||
@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
|
||||
"-DMapper_PACKAGE_GDAL=0"
|
||||
]);
|
||||
|
||||
# Needs to be available when proj_api.h gets evaluted by CPP
|
||||
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
|
||||
|
||||
postInstall =
|
||||
stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
# Fixes "This application failed to start because it could not find or load the Qt
|
||||
@ -60,6 +57,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://www.openorienteering.org/apps/mapper/;
|
||||
license = licenses.gpl3;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [mpickering];
|
||||
maintainers = with maintainers; [ mpickering sikmir ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw";
|
||||
sha256 = "a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kanboard";
|
||||
version = "1.2.9";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hdr95cpxgdzrzhffs63gdl0g7122ma2zg8bkqwp42p5xphx0xan";
|
||||
sha256 = "0k45vfiacvwmrglpqwjq22pvdg4n0mf75x0r8nb79bmxp8sk0j0c";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -42,6 +42,7 @@ with python3.pkgs; buildPythonApplication rec {
|
||||
install -D misc/__khal $out/share/zsh/site-functions/__khal
|
||||
|
||||
# man page
|
||||
PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \
|
||||
make -C doc man
|
||||
install -Dm755 doc/build/man/khal.1 -t $out/share/man/man1
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qtpass";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IJHack";
|
||||
repo = "QtPass";
|
||||
rev = "v${version}";
|
||||
sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08";
|
||||
sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x";
|
||||
};
|
||||
|
||||
buildInputs = [ git gnupg pass qtbase qtsvg ];
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.20";
|
||||
version = "2.20.2";
|
||||
pname = "links2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/download/links-${version}.tar.bz2";
|
||||
sha256 = "0bchwqa87dc8cb55spyybkqpc456pp4x2n9aw587wr7pn96cvp9v";
|
||||
sha256 = "097ll98ympzfx7qfdyhc52yzvsp167x5nnjs6v8ih496wv80fksb";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filezilla";
|
||||
version = "3.44.2";
|
||||
version = "3.45.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
|
||||
sha256 = "1dny16ybzml6py1y8vprylqq1xc08221w5xcwcmygkjrb0820kax";
|
||||
sha256 = "1hhyknmbvkyq50m7lp41n7g0818frpig8xmxliy501bz4jkhi748";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ott";
|
||||
version = "0.28";
|
||||
version = "0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ott-lang";
|
||||
repo = "ott";
|
||||
rev = version;
|
||||
sha256 = "0mzbrvqayqpns9zzg4m1scxx24dv9askhn51dawyb9pisvlyvai0";
|
||||
sha256 = "0saznk2mjbhp3j57imy2p2j0938026bw5m5gqbj59vcvk1rwwl22";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, srht, redis, celery, pyyaml, markdown }:
|
||||
|
||||
let
|
||||
version = "0.47.8";
|
||||
version = "0.47.9";
|
||||
|
||||
buildWorker = src: buildGoModule {
|
||||
inherit src version;
|
||||
@ -20,7 +20,7 @@ in buildPythonPackage rec {
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/builds.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "0agnxf118nlfykxbja8mnk4cal56rb2z8mhvyphnxm0ac28iq6jx";
|
||||
sha256 = "1zgaba58svhksxb1pzz8bym9p0pm7fnxsj5k6jz86095xmfijp34";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srht";
|
||||
version = "0.54.2";
|
||||
version = "0.54.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/core.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "1m9nblm0ygjjdzcf79jk5v8p74dgyby15mqkggw9i3smz9r3afim";
|
||||
sha256 = "1f4srhp5g6652anifs1vyijzi2v23l2rnfpf3x96j9r8rdap42rq";
|
||||
};
|
||||
|
||||
node_modules = fetchNodeModules {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, srht, pygit2, scmsrht }:
|
||||
|
||||
let
|
||||
version = "0.33.1";
|
||||
version = "0.34.2";
|
||||
|
||||
buildDispatcher = src: buildGoModule {
|
||||
inherit src version;
|
||||
@ -20,7 +20,7 @@ in buildPythonPackage rec {
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/git.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "0vwjkpvgscr01xhbzmhizqmg1wjhnj7jw9qcsv0s190fqach7ml8";
|
||||
sha256 = "1z10r2d9x71n1n36g55j4cswh0dqnzmgj2qiy1h92wwgq8azpiyy";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hgsrht";
|
||||
version = "0.15.2";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "097ikrr8bks4lag1lbaznj0zr1c56lmm5lgm5rfjq0k20l7n2bk0";
|
||||
sha256 = "0ncrj1cbls9ix2ig3qqwbzs6q6cmpqy3zs21p9fw3idfw703j3g0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "listssrht";
|
||||
version = "0.38.1";
|
||||
version = "0.38.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/lists.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "02nfl9xnqx0p98kmcy8bzdwzlnl57k5a04i6gnvimc84c11a9chz";
|
||||
sha256 = "020s6kglm7620pjn2j7fxvaqd5lpz7y7x0wf014jsrm71l6w0rla";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "metasrht";
|
||||
version = "0.35.2";
|
||||
version = "0.35.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/meta.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "10x00lydnrcgk7s27fddbrdb8bwc5ivwlpswkcrsi302qcjdff9w";
|
||||
sha256 = "1kcmlmdk9v59fr3r0g2q2gfkb735xza0wni9s942wh418dr66x2f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pastesrht";
|
||||
version = "0.5.2";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/paste.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "16d0qviw3qifyqn94fj03mwxd65abf8bhrvn1fn6ramaq8zpx794";
|
||||
sha256 = "19y9ghhi4llyg7kd3a888gbjc698vdamin4hb8dk1j6pd2f0qmjp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmsrht";
|
||||
version = "0.14.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/scm.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "1xi4l1ycdglfm22ybawh5nbwgday0nfb1vqsjqvp2y7ysizwdxc1";
|
||||
sha256 = "1rzm3r280211w51sjngm5a3pdlzg07c64324k99bqs1fkc2yrfy6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
@ -37,13 +37,13 @@ let
|
||||
optional = stdenv.lib.optional;
|
||||
in mkDerivation rec {
|
||||
pname = "obs-studio";
|
||||
version = "24.0.1";
|
||||
version = "24.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jp9000";
|
||||
repo = "obs-studio";
|
||||
rev = version;
|
||||
sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5";
|
||||
sha256 = "0g8nzs696f3myz4hvygav85b0jgjmn6dicy50axmapdv8miff9xa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }:
|
||||
{ stdenv, lib, fetchFromGitHub, Hypervisor, vmnet, xpc, libobjc, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xhyve";
|
||||
version = "20190124";
|
||||
version = "20191001";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/machyve/xhyve/archive/1dd9a5165848c7ed56dafc41932c553ea56a12af.tar.gz";
|
||||
sha256 = "18zd74pd0azf43csbqb14srbyclfgx28dpgm8ygjmbcazbnipc1k";
|
||||
src = fetchFromGitHub {
|
||||
owner = "machyve";
|
||||
repo = "xhyve";
|
||||
rev = "1f46a3d0bbeb6c90883f302425844fcc3800a776";
|
||||
sha256 = "0mm9xa0v6n7xl2qypnppq5abdncd31vffiklrhcrlni5ymyh9ia5";
|
||||
};
|
||||
|
||||
buildInputs = [ Hypervisor vmnet xpc libobjc zlib ];
|
||||
|
||||
@ -92,13 +92,15 @@ rec {
|
||||
PATH=${makeBinPath [
|
||||
pkgs.binutils-unwrapped
|
||||
pkgs.coreutils
|
||||
pkgs.findutils
|
||||
pkgs.gcc
|
||||
pkgs.pkgconfig
|
||||
]}
|
||||
export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries}
|
||||
gcc \
|
||||
${optionalString (libraries != [])
|
||||
"$(pkg-config --cflags --libs ${
|
||||
concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgsconfig -name \*.pc -exec basename {} \;)") libraries
|
||||
concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgconfig -name \\*.pc)") libraries
|
||||
})"
|
||||
} \
|
||||
-O \
|
||||
|
||||
@ -1,4 +1,16 @@
|
||||
{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers, writeText }:
|
||||
{
|
||||
glib,
|
||||
haskellPackages,
|
||||
lib,
|
||||
nodePackages,
|
||||
perlPackages,
|
||||
python2Packages,
|
||||
python3Packages,
|
||||
runCommand,
|
||||
stdenv,
|
||||
writers,
|
||||
writeText
|
||||
}:
|
||||
with writers;
|
||||
let
|
||||
|
||||
@ -49,9 +61,11 @@ let
|
||||
python2 = writePython2Bin "test_writers" { libraries = [ python2Packages.enum ]; } ''
|
||||
from enum import Enum
|
||||
|
||||
|
||||
class Test(Enum):
|
||||
a = "success"
|
||||
|
||||
|
||||
print Test.a
|
||||
'';
|
||||
|
||||
@ -70,9 +84,19 @@ let
|
||||
if [[ "test" == "test" ]]; then echo "success"; fi
|
||||
'';
|
||||
|
||||
c = writeC "test_c" { libraries = [ ]; } ''
|
||||
c = writeC "test_c" { libraries = [ glib.dev ]; } ''
|
||||
#include <gio/gio.h>
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
GApplication *application = g_application_new ("hello.world", G_APPLICATION_FLAGS_NONE);
|
||||
g_application_register (application, NULL, NULL);
|
||||
GNotification *notification = g_notification_new ("Hello world!");
|
||||
g_notification_set_body (notification, "This is an example notification.");
|
||||
GIcon *icon = g_themed_icon_new ("dialog-information");
|
||||
g_notification_set_icon (notification, icon);
|
||||
g_object_unref (icon);
|
||||
g_object_unref (notification);
|
||||
g_object_unref (application);
|
||||
printf("success\n");
|
||||
return 0;
|
||||
}
|
||||
@ -112,9 +136,11 @@ let
|
||||
python2 = writePython2 "test_python2" { libraries = [ python2Packages.enum ]; } ''
|
||||
from enum import Enum
|
||||
|
||||
|
||||
class Test(Enum):
|
||||
a = "success"
|
||||
|
||||
|
||||
print Test.a
|
||||
'';
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "man-pages";
|
||||
version = "5.02";
|
||||
version = "5.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
|
||||
sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
|
||||
sha256 = "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz";
|
||||
};
|
||||
|
||||
makeFlags = [ "MANDIR=$(out)/share/man" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "3.10";
|
||||
version = "3.11";
|
||||
in fetchzip {
|
||||
name = "inter-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ in fetchzip {
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "029fjpgdml8qx2cqn4rnh2xm3z4cnh74jlzjb8pbfm2azsnvi6r1";
|
||||
sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://rsms.me/inter/;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "victor-mono";
|
||||
version = "1.2.5";
|
||||
version = "1.2.7";
|
||||
in fetchFromGitHub rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -18,7 +18,7 @@ in fetchFromGitHub rec {
|
||||
# Both methods produce the same file, but this way
|
||||
# we can safely reason about what version it is.
|
||||
postFetch = ''
|
||||
tar xvf $downloadedFile --strip-components=2 ${name}/public/VictorMonoAll.zip
|
||||
tar xvf $downloadedFile --strip-components=2 ${pname}-${version}/public/VictorMonoAll.zip
|
||||
|
||||
mkdir -p $out/share/fonts/{true,open}type/${pname}
|
||||
|
||||
@ -26,7 +26,7 @@ in fetchFromGitHub rec {
|
||||
unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
sha256 = "0dj5h45qk6abggj6mgm19sb0a7q0v4x41f2zds1ab79yd22gbjns";
|
||||
sha256 = "0x4ydp11ry94wkkspnmy1xpzqq3m45xg60z1hq4ll9gmlccaknj0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free programming font with cursive italics and ligatures";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, vala_0_44
|
||||
, vala
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, libcanberra
|
||||
@ -23,6 +23,7 @@
|
||||
, zeitgeist
|
||||
, glib-networking
|
||||
, elementary-icon-theme
|
||||
, fetchpatch
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
vala_0_44 # https://github.com/elementary/files/issues/1081
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
@ -76,7 +77,14 @@ stdenv.mkDerivation rec {
|
||||
zeitgeist
|
||||
];
|
||||
|
||||
patches = [ ./hardcode-gsettings.patch ];
|
||||
patches = [
|
||||
./hardcode-gsettings.patch
|
||||
# Fixes https://github.com/elementary/files/issues/1081
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/files/commit/76b5cc95466733c2c100a99127ecd4fbd4d2a5ec.patch";
|
||||
sha256 = "0dn8a9l7i2rdgia1rsc50332fsw0yrbfvpb5z8ba4iiki3lxy2nn";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
|
||||
@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
|
||||
# In theory this could use GCC + Clang rather than just Clang,
|
||||
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
|
||||
name = "openshadinglanguage-${version}";
|
||||
version = "1.10.6";
|
||||
version = "1.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "Release-1.10.6";
|
||||
sha256 = "1g8g853iq56knlvn1hdsck78by3843vyly9wji5ip41r6i2s0zla";
|
||||
rev = "Release-1.10.7";
|
||||
sha256 = "15grach34grp8x65sq8xzs2s6nfzjhn4blpfnaicw46jdi4c2w59";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchgit, jdk, gmp, readline, openssl, unixODBC, zlib
|
||||
{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
|
||||
, libarchive, db, pcre, libedit, libossp_uuid, libXpm
|
||||
, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
|
||||
, git, cacert, cmake, libyaml
|
||||
, libSM, libXt, freetype, pkgconfig, fontconfig
|
||||
, cmake, libyaml, Security
|
||||
, libjpeg, libX11, libXext, libXft, libXinerama
|
||||
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
|
||||
, extraPacks ? []
|
||||
@ -18,58 +18,35 @@ stdenv.mkDerivation {
|
||||
pname = "swi-prolog";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/SWI-Prolog/swipl-devel";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SWI-Prolog";
|
||||
repo = "swipl-devel";
|
||||
rev = "V${version}";
|
||||
sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [ cacert git cmake gmp readline openssl
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [ gmp readline openssl
|
||||
libarchive libyaml db pcre libedit libossp_uuid
|
||||
zlib pkgconfig ]
|
||||
zlib ]
|
||||
++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
|
||||
++ extraLibraries
|
||||
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
|
||||
++ stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-world"
|
||||
"--enable-gmp"
|
||||
"--enable-shared"
|
||||
];
|
||||
cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mkdir build
|
||||
cd build
|
||||
${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out ..
|
||||
cd ../
|
||||
make
|
||||
make install
|
||||
make clean
|
||||
mkdir -p $out/lib/swipl/pack
|
||||
''
|
||||
+ builtins.concatStringsSep "\n"
|
||||
postInstall = builtins.concatStringsSep "\n"
|
||||
( builtins.map (packInstall "$out") extraPacks
|
||||
);
|
||||
|
||||
# For macOS: still not fixed in upstream: "abort trap 6" when called
|
||||
# through symlink, so wrap binary.
|
||||
# We reinvent wrapProgram here but omit argv0 pass in order to not
|
||||
# break PAKCS package build. This is also safe for SWI-Prolog, since
|
||||
# there is no wrapping environment and hence no need to spoof $0
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
local prog="$out/bin/swipl"
|
||||
local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
|
||||
mv $prog $hidden
|
||||
makeWrapper $hidden $prog
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.swi-prolog.org/;
|
||||
homepage = "https://www.swi-prolog.org";
|
||||
description = "A Prolog compiler and interpreter";
|
||||
license = "LGPL";
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin;
|
||||
maintainers = [ stdenv.lib.maintainers.meditans ];
|
||||
|
||||
@ -11,11 +11,16 @@ let params = {
|
||||
rev = "0.1";
|
||||
sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7";
|
||||
};
|
||||
"8.9" = {
|
||||
version = "0.1";
|
||||
rev = "a69551a49543b22a7d4e6a2484356b56bd05068e";
|
||||
"8.9" = rec {
|
||||
version = "0.2";
|
||||
rev = version;
|
||||
sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
|
||||
};
|
||||
"8.10" = rec {
|
||||
version = "0.3";
|
||||
rev = version;
|
||||
sha256 = "0pzs5nsakh4l8ffwgn4ryxbnxdv2x0r1i7bc598ij621haxdirrr";
|
||||
};
|
||||
};
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
@ -31,7 +36,10 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
|
||||
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib ])
|
||||
++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10")
|
||||
coq.ocamlPackages.camlp5
|
||||
;
|
||||
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmysofa";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoene";
|
||||
repo = "libmysofa";
|
||||
rev = "v${version}";
|
||||
sha256 = "0si0z7cfw6xcs3dkrb4zini55xpxwfp27yl8lbx39gx2pf8v2jls";
|
||||
sha256 = "1gas6fp0xy57wwdvsdfq1yq2hg4zl2c074b260y7hh92z96pj22j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.24.3"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
|
||||
pname = "grpc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "14svfy7lvz8lf6b7zg1fbypj2n46n9gq0ldgnv85jm0ikv72cgv6";
|
||||
sha256 = "19g3fihds9rih2ciypkwi4jahjaymyqnjhd9id397fgj1qkw4w69";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfsm";
|
||||
version = "0.1pre1869_${builtins.substring 0 7 src.rev}";
|
||||
version = "0.1pre1905_${builtins.substring 0 8 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "katef";
|
||||
repo = "libfsm";
|
||||
rev = "f70c3c5778a79eeecb52f9fd35c7cbc241db0ed6";
|
||||
sha256 = "1hgv272jdv6dwnsdjajyky537z84q0cwzspw9br46qj51h8gkwvx";
|
||||
repo = pname;
|
||||
rev = "bd5937fad42b26a86bac1fe3ec49eff73581bd1d";
|
||||
sha256 = "1q3grbmvjnnvc2sshswbd40cc2j2hnwibmljcqx9jqgda0wd6pgv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -22,12 +22,16 @@ stdenv.mkDerivation rec {
|
||||
# if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all
|
||||
# cases.) it's unclear exactly what should be done if we want those flags,
|
||||
# but the defaults work fine.
|
||||
buildPhase = "PREFIX=$out bmake -r install";
|
||||
buildPhase = "PREFIX=$out bmake -r -j$NIX_BUILD_CORES";
|
||||
installPhase = ''
|
||||
PREFIX=$out bmake -r install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# fix up multi-output install. we also have to fix the pkgconfig libdir
|
||||
# file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in
|
||||
# our case; libdir should really be set to the $lib output.
|
||||
installPhase = ''
|
||||
postInstall = ''
|
||||
mkdir -p $lib $dev/lib
|
||||
|
||||
mv $out/lib $lib/lib
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librsync";
|
||||
version = "2.1.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librsync";
|
||||
repo = "librsync";
|
||||
rev = "v${version}";
|
||||
sha256 = "03ncx7a2zd93b3jaq7b62nwn8qcwmf04jfvljnpxj5wsxl2agkp7";
|
||||
sha256 = "08wdlxsa9zg2pyasz1lwg70d5psi4amv81v4yxwffx67ndzb9yp5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.6";
|
||||
version = "0.7.7";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = version;
|
||||
sha256 = "0rrf7i2zs2kbz6k2sj1mg30i05h2msl1q9h95dp5brq2k0w94rna";
|
||||
sha256 = "0f6r5j5d4fbzx9ihbbwrqylayw90qac8kapkhmfcvsh7f8whr623";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libstrophe";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strophe";
|
||||
repo = "libstrophe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1milna92h8wzxax8ll362zvb70091nmfks5lmd105vk0478zraca";
|
||||
sha256 = "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ automake autoconf openssl expat libtool check ];
|
||||
nativeBuildInputs = [ automake autoconf pkgconfig libtool check ];
|
||||
buildInputs = [ openssl expat ];
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
||||
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
|
||||
minimal dependencies and is configurable for various environments. It
|
||||
runs well on both Linux, Unix, and Windows based platforms.
|
||||
'';
|
||||
homepage = http://strophe.im/libstrophe/;
|
||||
license = with stdenv.lib.licenses; [gpl3 mit];
|
||||
homepage = "http://strophe.im/libstrophe/";
|
||||
license = with stdenv.lib.licenses; [ gpl3 mit ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [devhell flosse];
|
||||
maintainers = with stdenv.lib.maintainers; [ devhell flosse ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
|
||||
, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget
|
||||
, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin
|
||||
|
||||
# Enable CUDA support
|
||||
, cudaSupport ? false, cudatoolkit ? null
|
||||
|
||||
# Enable the Sun Grid Engine bindings
|
||||
, enableSGE ? false
|
||||
@ -8,9 +11,15 @@
|
||||
, enablePrefix ? false
|
||||
}:
|
||||
|
||||
assert !cudaSupport || cudatoolkit != null;
|
||||
|
||||
let
|
||||
version = "4.0.2";
|
||||
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
paths = [ cudatoolkit.out cudatoolkit.lib ];
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openmpi";
|
||||
inherit version;
|
||||
@ -33,15 +42,20 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = with stdenv; [ gfortran zlib ]
|
||||
++ lib.optionals isLinux [ libnl numactl ]
|
||||
++ lib.optionals cudaSupport [ cudatoolkit ]
|
||||
++ [ libevent hwloc ]
|
||||
++ lib.optional (isLinux || isFreeBSD) rdma-core;
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
configureFlags = with stdenv; [ "--disable-mca-dso" ]
|
||||
configureFlags = with stdenv; lib.optional (!cudaSupport) "--disable-mca-dso"
|
||||
++ lib.optional isLinux "--with-libnl=${libnl.dev}"
|
||||
++ lib.optional enableSGE "--with-sge"
|
||||
++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default"
|
||||
# TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build
|
||||
# https://github.com/openucx/ucx
|
||||
# https://www.open-mpi.org/faq/?category=buildcuda
|
||||
++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ]
|
||||
;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -69,6 +83,10 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
inherit cudaSupport cudatoolkit;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.open-mpi.org/;
|
||||
description = "Open source MPI-3 implementation";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "11lkihykwkq0sbmijqxmn52lg6mcn6gkcpj1c7fhzm0hm1b9p9dn";
|
||||
sha256 = "0hqf0z38gk4id8d6vcms66mh3gllh2xib5mr11069sh9ak6b3mmp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "packr";
|
||||
version = "2.6.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gobuffalo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "11bd0s3hyzvhcg1q0iahv2w9f0w1k57jfxgswhz7dyndxvvr2b8i";
|
||||
sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9";
|
||||
};
|
||||
|
||||
subPackages = [ "packr" "v2/packr2" ];
|
||||
|
||||
@ -24,6 +24,10 @@ in stdenv.mkDerivation {
|
||||
|
||||
MKLROOT = optionalString mklSupport mkl;
|
||||
|
||||
preConfigure = ''
|
||||
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
|
||||
'';
|
||||
|
||||
enableParallelBuilding=true;
|
||||
buildFlags = [ "magma" "magma_sparse" ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Logbook";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0mvsig6sk4dywpw5naah1npf6h621qzhg0sd427j5znr06a2ksqs";
|
||||
sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "colored";
|
||||
version = "1.3.93";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0xbhq9nd9xz3b6w0c4q33jfgnv8jid023v2fyhi7hsrz1scym5l2";
|
||||
sha256 = "0wlsg7z406q31r5fpwkqfpyfpigazbmq9qm856wfbn861k2773zf";
|
||||
};
|
||||
|
||||
# No proper test suite
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cupy";
|
||||
version = "6.3.0";
|
||||
version = "6.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1q38riv63110ch170c1pyhq5jfbg8y0qmcdsqn8vb9sb79amvg93";
|
||||
sha256 = "126waa1jiynq00glr1hq86sgwwmakq009crfsn8qqgrj4c4clw6a";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-extensions";
|
||||
version = "2.1.9";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "08vggm6wrn5cbf8brfprif0rjrkqz06wddsw0ir1skkk8q2sp1b2";
|
||||
sha256 = "19bln9z25dmz1waqcxivlwg20dlm033c7f4z3h3mkhzkbk928y71";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-JWT-Extended";
|
||||
version = "3.23.0";
|
||||
version = "3.24.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "05nf94dp80i68gs61pf67qj1y6i56jgdxmibqmns5wz6z33fi7wj";
|
||||
sha256 = "1znqjp780nrp94hjcrcx0945izzl3zsrqkmdac44d2fmlnbdp2by";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.23.1";
|
||||
version = "1.24.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c2f5306153dee33bc04212802c898cf79539917e31cf07516f31c2943bea2160";
|
||||
sha256 = "5efc92721a364e049ad3a174d5b20a21009fae9db04b3e5020ed0b534d9c022f";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,18 +1,10 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, darwin
|
||||
{ stdenv, buildPythonPackage, darwin, grpc
|
||||
, six, protobuf, enum34, futures, isPy27, pkgconfig
|
||||
, cython}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
inherit (grpc) src version;
|
||||
pname = "grpcio";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython pkgconfig ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
||||
@ -15,10 +15,10 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imageio";
|
||||
version = "2.5.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2";
|
||||
sha256 = "1bk7pijmrspdfj9nnlbnw1yiww9w1kyjvlpzy9s5hj6zp4qv4kpl";
|
||||
inherit pname version;
|
||||
};
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Keras";
|
||||
version = "2.2.5";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fb448b95643a708d25d2394183a2f3a84eefb55fb64917152a46826990113ea";
|
||||
sha256 = "0m5kj6jd1jkxv3npr2s6bczp5m592iryl9ysl5gbil0wszqyrmm0";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lark-parser";
|
||||
version = "0.7.5";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lark-parser";
|
||||
repo = "lark";
|
||||
rev = version;
|
||||
sha256 = "1k9s62ddv6pghzp1yak2ld6sk92zm4sz1xqp8zkzyh3xqdsmfa0f";
|
||||
sha256 = "1b0dvvqqasir8dfpqj4jch7wxxk43csbv0wa80fiqsdlymxxj2dj";
|
||||
};
|
||||
|
||||
# tests of Nearley support require js2py
|
||||
|
||||
76
pkgs/development/python-modules/notebook/2.nix
Normal file
76
pkgs/development/python-modules/notebook/2.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, nose_warnings_filters
|
||||
, glibcLocales
|
||||
, isPy3k
|
||||
, mock
|
||||
, jinja2
|
||||
, tornado
|
||||
, ipython_genutils
|
||||
, traitlets
|
||||
, jupyter_core
|
||||
, jupyter_client
|
||||
, nbformat
|
||||
, nbconvert
|
||||
, ipykernel
|
||||
, terminado
|
||||
, requests
|
||||
, send2trash
|
||||
, pexpect
|
||||
, prometheus_client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "notebook";
|
||||
version = "5.7.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.utf8";
|
||||
|
||||
checkInputs = [ nose glibcLocales ]
|
||||
++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
|
||||
jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
|
||||
prometheus_client
|
||||
];
|
||||
|
||||
# disable warning_filters
|
||||
preCheck = lib.optionalString (!isPy3k) ''
|
||||
echo "" > setup.cfg
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Remove selenium tests
|
||||
rm -rf notebook/tests/selenium
|
||||
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
mkdir tmp
|
||||
HOME=tmp nosetests -v ${if (stdenv.isDarwin) then ''
|
||||
--exclude test_delete \
|
||||
--exclude test_checkpoints_follow_file
|
||||
''
|
||||
else ""}
|
||||
'';
|
||||
|
||||
# Some of the tests use localhost networking.
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
|
||||
homepage = https://jupyter.org/;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
@ -10,14 +10,14 @@
|
||||
buildPythonPackage rec {
|
||||
|
||||
pname = "peewee";
|
||||
version = "3.11.1";
|
||||
version = "3.11.2";
|
||||
|
||||
# pypi release does not provide tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "coleifer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0q84r9x99h9a3kqs3i12bgk8rz5my8vpjngg8yaqd2kzsb6gynp8";
|
||||
sha256 = "097cafqgk46bf0innwm7xnmsfs6z37hv3alyvrfz6d0iy4scshm5";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "1.6.11";
|
||||
version = "1.6.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "034170w0qh20qkfaha2rpnccm31f7snhb4r9cd079v4v2x2swybk";
|
||||
sha256 = "13q83yba01hzm9mlk5y1klqirxdmsm2yx1yll5zdik9fd8hg0rf6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyGithub";
|
||||
version = "1.43.8";
|
||||
version = "1.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyGithub";
|
||||
repo = "PyGithub";
|
||||
rev = "v${version}";
|
||||
sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw";
|
||||
sha256 = "067iyarllgdp40bzjxskzrixvmz350yj1qf8wvbddka504bcbh9r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.3.15";
|
||||
version = "0.3.21";
|
||||
pname = "pyaxmlparser";
|
||||
|
||||
# the PyPI tarball doesn't ship tests.
|
||||
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
owner = "appknox";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0p4x21rg8h7alrg2zk6rbgc3fj77fiyky4zzvziz2bp5jpx1pvzp";
|
||||
sha256 = "1bphd2vl9akk78yqvvxcz36wmr47hp3nh6xyrdc8w1avy1aby1ij";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@ -1,18 +1,101 @@
|
||||
{ stdenv, fetchurl, buildPythonPackage, pythonOlder,
|
||||
cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
|
||||
fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
|
||||
{ stdenv, fetchurl, fetchgit, buildPythonPackage, python, pythonOlder,
|
||||
cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null,
|
||||
mklSupport ? false, mkl ? null,
|
||||
openMPISupport ? false, openmpi ? null,
|
||||
buildNamedTensor ? false,
|
||||
buildBinaries ? false,
|
||||
cudaArchList ? null,
|
||||
fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl,
|
||||
linkFarm, symlinkJoin,
|
||||
|
||||
# ninja (https://ninja-build.org) must be available to run C++ extensions tests,
|
||||
ninja,
|
||||
|
||||
# dependencies for torch.utils.tensorboard
|
||||
tensorboardSupport ? true, pillow, six, future, tensorflow-tensorboard,
|
||||
|
||||
utillinux, which, isPy3k }:
|
||||
|
||||
assert cudnn == null || cudatoolkit != null;
|
||||
assert !openMPISupport || openmpi != null;
|
||||
assert !tensorboardSupport || tensorflow-tensorboard != null;
|
||||
|
||||
# assert that everything needed for cuda is present and that the correct cuda versions are used
|
||||
assert !cudaSupport || cudatoolkit != null;
|
||||
assert cudnn == null || cudatoolkit != null;
|
||||
assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
|
||||
in majorIs == "9" || majorIs == "10");
|
||||
|
||||
let
|
||||
hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs;
|
||||
matchesCudatoolkit = hasDependency cudatoolkit;
|
||||
matchesMkl = hasDependency mkl;
|
||||
in
|
||||
# confirm that cudatoolkits are sync'd across dependencies
|
||||
assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi;
|
||||
assert !cudaSupport || matchesCudatoolkit magma;
|
||||
|
||||
# confirm that mkl is sync'd across dependencies
|
||||
assert !mklSupport || mkl != null;
|
||||
assert !(mklSupport && cudaSupport) || matchesMkl magma;
|
||||
assert !mklSupport || (numpy.blasImplementation == "mkl" && numpy.blas == mkl);
|
||||
|
||||
let
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
paths = [ cudatoolkit.out cudatoolkit.lib ];
|
||||
# nccl is here purely for semantic grouping it could be moved to nativeBuildInputs
|
||||
paths = [ cudatoolkit.out cudatoolkit.lib nccl.dev nccl.out ];
|
||||
};
|
||||
|
||||
# Give an explicit list of supported architectures for the build, See:
|
||||
# - pytorch bug report: https://github.com/pytorch/pytorch/issues/23573
|
||||
# - pytorch-1.2.0 build on nixpks: https://github.com/NixOS/nixpkgs/pull/65041
|
||||
#
|
||||
# This list was selected by omitting the TORCH_CUDA_ARCH_LIST parameter,
|
||||
# observing the fallback option (which selected all architectures known
|
||||
# from cudatoolkit_10_0, pytorch-1.2, and python-3.6), and doing a binary
|
||||
# searching to find offending architectures.
|
||||
#
|
||||
# NOTE: Because of sandboxing, this derivation can't auto-detect the hardware's
|
||||
# cuda architecture, so there is also now a problem around new architectures
|
||||
# not being supported until explicitly added to this derivation.
|
||||
#
|
||||
# FIXME: CMake is throwing the following warning on python-1.2:
|
||||
#
|
||||
# ```
|
||||
# CMake Warning at cmake/public/utils.cmake:172 (message):
|
||||
# In the future we will require one to explicitly pass TORCH_CUDA_ARCH_LIST
|
||||
# to cmake instead of implicitly setting it as an env variable. This will
|
||||
# become a FATAL_ERROR in future version of pytorch.
|
||||
# ```
|
||||
# If this is causing problems for your build, this derivation may have to strip
|
||||
# away the standard `buildPythonPackage` and use the
|
||||
# [*Adjust Build Options*](https://github.com/pytorch/pytorch/tree/v1.2.0#adjust-build-options-optional)
|
||||
# instructions. This will also add more flexibility around configurations
|
||||
# (allowing FBGEMM to be built in pytorch-1.1), and may future proof this
|
||||
# derivation.
|
||||
brokenArchs = [ "3.0" ]; # this variable is only used as documentation.
|
||||
cuda9ArchList = [
|
||||
"3.5"
|
||||
"5.0"
|
||||
"5.2"
|
||||
"6.0"
|
||||
"6.1"
|
||||
"7.0"
|
||||
"7.0+PTX" # I am getting a "undefined architecture compute_75" on cuda 9
|
||||
# which leads me to believe this is the final cuda-9-compatible architecture.
|
||||
];
|
||||
cuda10ArchList = cuda9ArchList ++ [
|
||||
"7.5"
|
||||
"7.5+PTX" # < most recent architecture as of cudatoolkit_10_0 and pytorch-1.2.0
|
||||
];
|
||||
final_cudaArchList =
|
||||
if !cudaSupport || cudaArchList != null
|
||||
then cudaArchList
|
||||
else
|
||||
if lib.versions.major cudatoolkit.version == "9"
|
||||
then cuda9ArchList
|
||||
else cuda10ArchList; # the assert above removes any ambiguity here.
|
||||
|
||||
# Normally libcuda.so.1 is provided at runtime by nvidia-x11 via
|
||||
# LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub
|
||||
# libcuda.so from cudatoolkit for running tests, so that we don’t have
|
||||
@ -25,28 +108,27 @@ let
|
||||
"LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
|
||||
|
||||
in buildPythonPackage rec {
|
||||
version = "1.0.0";
|
||||
version = "1.2.0";
|
||||
pname = "pytorch";
|
||||
disabled = !isPy3k;
|
||||
|
||||
outputs = [
|
||||
"out" # output standard python package
|
||||
"dev" # output libtorch only
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "pytorch";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm";
|
||||
sha256 = "1biyq2p48chakf2xw7hazzqmr5ps1nx475ql8vkmxjg5zaa071cz";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ # Skips two tests that are only meant to run on multi GPUs
|
||||
(fetchurl {
|
||||
url = "https://github.com/pytorch/pytorch/commit/bfa666eb0deebac21b03486e26642fd70d66e478.patch";
|
||||
sha256 = "1fgblcj02gjc0y62svwc5gnml879q3x2z7m69c9gax79dpr37s9i";
|
||||
})
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
preConfigure = lib.optionalString cudaSupport ''
|
||||
export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"
|
||||
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
|
||||
'' + lib.optionalString (cudaSupport && cudnn != null) ''
|
||||
export CUDNN_INCLUDE_DIR=${cudnn}/include
|
||||
@ -61,7 +143,6 @@ in buildPythonPackage rec {
|
||||
RP_NEW=$(join_by : ''${RP[@]:2})
|
||||
patchelf --set-rpath \$ORIGIN:''${RP_NEW} "$1"
|
||||
}
|
||||
|
||||
for f in $(find ''${out} -name 'libcaffe2*.so')
|
||||
do
|
||||
strip2 $f
|
||||
@ -74,38 +155,84 @@ in buildPythonPackage rec {
|
||||
PYTORCH_BUILD_VERSION = version;
|
||||
PYTORCH_BUILD_NUMBER = 0;
|
||||
|
||||
BUILD_NAMEDTENSOR = buildNamedTensor; # experimental feature
|
||||
USE_SYSTEM_NCCL=true; # don't build pytorch's third_party NCCL
|
||||
|
||||
# Suppress a weird warning in mkl-dnn, part of ideep in pytorch
|
||||
# (upstream seems to have fixed this in the wrong place?)
|
||||
# https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ];
|
||||
# https://github.com/pytorch/pytorch/issues/22346
|
||||
#
|
||||
# Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
|
||||
# https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (numpy.blas == mkl) [ "-Wno-error=array-bounds" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
utillinux
|
||||
which
|
||||
cmake
|
||||
utillinux
|
||||
which
|
||||
ninja
|
||||
] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
|
||||
|
||||
buildInputs = [
|
||||
numpy.blas
|
||||
] ++ lib.optionals cudaSupport [ cudnn ]
|
||||
numpy.blas
|
||||
] ++ lib.optionals cudaSupport [ cudnn magma nccl ]
|
||||
++ lib.optionals stdenv.isLinux [ numactl ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
click
|
||||
numpy
|
||||
pyyaml
|
||||
] ++ lib.optional (pythonOlder "3.5") typing;
|
||||
] ++ lib.optionals openMPISupport [ openmpi ]
|
||||
++ lib.optional (pythonOlder "3.5") typing
|
||||
++ lib.optionals tensorboardSupport [pillow six future tensorflow-tensorboard];
|
||||
|
||||
checkInputs = [ hypothesis ];
|
||||
checkPhase = ''
|
||||
${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions
|
||||
checkInputs = [ hypothesis ninja ];
|
||||
|
||||
doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing
|
||||
checkPhase = "${cudaStubEnv}python test/run_test.py"
|
||||
+ " --exclude utils" # utils requires git, which is not allowed in the check phase
|
||||
|
||||
# Other tests which have been disabled in previous nix derivations of pytorch.
|
||||
# --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions
|
||||
;
|
||||
postInstall = ''
|
||||
mkdir $dev
|
||||
cp -r $out/${python.sitePackages}/torch/lib $dev/lib
|
||||
cp -r $out/${python.sitePackages}/torch/include $dev/include
|
||||
'';
|
||||
|
||||
postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
for f in $(ls $dev/lib/*.dylib); do
|
||||
install_name_tool -id $dev/lib/$(basename $f) $f || true
|
||||
done
|
||||
|
||||
install_name_tool -change @rpath/libshm.dylib $dev/lib/libshm.dylib $dev/lib/libtorch_python.dylib
|
||||
install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libtorch_python.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libtorch_python.dylib
|
||||
|
||||
install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libtorch.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_observers.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_observers.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_module_test_dynamic.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_module_test_dynamic.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_detectron_ops.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_detectron_ops.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libshm.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libshm.dylib
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Open source, prototype-to-production deep learning platform";
|
||||
homepage = https://pytorch.org/;
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ teh thoughtpolice ];
|
||||
platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.0.28";
|
||||
version = "1.1.0";
|
||||
|
||||
# Pypi doesn't ship the tests, so we fetch directly from GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapbox";
|
||||
repo = "rasterio";
|
||||
rev = version;
|
||||
sha256 = "05rn2ijjv64a765gkpwcq3bb933gzp35zj4l9sk0agh19462myjx";
|
||||
sha256 = "0xa9jazsgsf7is4dbf2bbnfga8q8nmqy0qq4i7jj3riiccwlm6xw";
|
||||
};
|
||||
|
||||
checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shodan";
|
||||
version = "1.17.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1sh7a2dsal3kzcl4s9xbpl7hxhm9k55s5hiqdqqnafhvhnh0vmbz";
|
||||
sha256 = "1i4zrzamvgy3g117a2x66gyi7pzh27slc2w9pqysc0ldfcibi2wx";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "soco";
|
||||
version = "0.17";
|
||||
version = "0.18";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15zw6i5z5p8vsa3lp20rjizhv4lzz935r73im0xm6zsl71bsgvj8";
|
||||
sha256 = "0bf55mqnz3l3ii26dvx33d35fv7jn7p5kmfwnr0xbpj38sxvhfr4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ssdeep";
|
||||
version = "3.3";
|
||||
version = "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "255de1f034652b3ed21920221017e70e570b1644f9436fea120ae416175f4ef5";
|
||||
sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.ssdeep pytestrunner ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamllint";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04xarlbh59f9ah53jxrcpqpzladyfxaw6cb2g8clw9aid0qzi9kh";
|
||||
sha256 = "076hqf189ww95n9vcbkkn8an42nx79cy8pf2qnl251yjncsvnbfl";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
@ -4,15 +4,6 @@ buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.14.0";
|
||||
|
||||
# Something subtle in the go sum db is causing every download to
|
||||
# get a new sum (and thus breaking the hash). This disables the
|
||||
# fetching of the sum from the go sum database.
|
||||
modBuildPhase = ''
|
||||
runHook preBuild
|
||||
GONOSUMDB=* go mod download
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "instrumenta";
|
||||
repo = "conftest";
|
||||
|
||||
@ -6,12 +6,12 @@ let
|
||||
allSpecs = {
|
||||
x86_64-linux = {
|
||||
system = "linux64";
|
||||
sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv";
|
||||
sha256 = "155yilj9w8a6jbkx1axhhkizwdc12krl4xixn10j7n94bvny4w2y";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
system = "mac64";
|
||||
sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09";
|
||||
sha256 = "0dzy9ihhbhx4byr2kalwfbn6jbk1hinacdqi25lvhaprdbrh2igh";
|
||||
};
|
||||
};
|
||||
|
||||
@ -28,7 +28,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromedriver";
|
||||
version = "76.0.3809.68";
|
||||
version = "78.0.3904.70";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://sites.google.com/a/chromium.org/chromedriver;
|
||||
description = "A WebDriver server for running Selenium tests on Chrome";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
maintainers = [ maintainers.goibhniu maintainers.marsam ];
|
||||
platforms = attrNames allSpecs;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,6 +5,6 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "10.16.3";
|
||||
sha256 = "1gbblbmvx7a0wkgp3fs2pf5c1hymdpnfc7zqp1slg5hmfhyi5wbv";
|
||||
version = "10.17.0";
|
||||
sha256 = "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1";
|
||||
}
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postman";
|
||||
version = "7.6.0";
|
||||
version = "7.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "sha256:03y82ydkj46l7dn35y944gnghbrrhc75y3yxdyidbh8fl3xvmlfv";
|
||||
sha256 = "0qgw3mvds99ca1gy0zfxzi7n1yxv99xwqgzr9rkx5qm6bw9c1ppw";
|
||||
name = "${pname}.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cups-filters";
|
||||
version = "1.25.6";
|
||||
version = "1.25.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
|
||||
sha256 = "1pgjk7j2p8m17pwynqd86hxgvz9lyb09ivx18lv6inmygij0pm4j";
|
||||
sha256 = "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
@ -61,12 +61,12 @@ let
|
||||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2019-10-09";
|
||||
version = "2019-10-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "w0rp";
|
||||
repo = "ale";
|
||||
rev = "3fe2223a48465c58c48a5a6a30ecf13ab92f7b97";
|
||||
sha256 = "1nzh34n1kix1fzfz3vnk5pajajj10k449m6wn3458d5mpyp7lrsh";
|
||||
rev = "67d0ccc398ca7650bb2c774a94d098bee3049169";
|
||||
sha256 = "0n61iv8lv4kq2dzz36s2hv9srkn0qvxvyslyqgccz84cbcndmh9z";
|
||||
};
|
||||
};
|
||||
|
||||
@ -292,23 +292,23 @@ let
|
||||
|
||||
coc-eslint = buildVimPluginFrom2Nix {
|
||||
pname = "coc-eslint";
|
||||
version = "2019-09-10";
|
||||
version = "2019-10-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-eslint";
|
||||
rev = "943f22365e2b50e7372058c39e5b85d4d5254beb";
|
||||
sha256 = "1p9gn5y9sk7jl6j1nfxhqk1h1xs1lhq2cg5pbilwsb42q5dzr79s";
|
||||
rev = "a84833d95ab641f0576dec5bf0ffde845055188a";
|
||||
sha256 = "1r3sy5bmnl4hbsb6ln47ahxqqbcfycca0zn6b2qnqrb64ynb30y1";
|
||||
};
|
||||
};
|
||||
|
||||
coc-git = buildVimPluginFrom2Nix {
|
||||
pname = "coc-git";
|
||||
version = "2019-10-05";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-git";
|
||||
rev = "fea9b887936590e58f179d38e88005454e150673";
|
||||
sha256 = "19vhlhrzzijxkxn1c6azp8s2khdckxgp0vk4rdlhjhc6j14110p5";
|
||||
rev = "702c366bafd6d172427b7216936f209d58d818fc";
|
||||
sha256 = "0qc5gzyjg2pc328vf6jqycbgvq8qdczyd8g9dkigy6i81j4xd8za";
|
||||
};
|
||||
};
|
||||
|
||||
@ -325,12 +325,12 @@ let
|
||||
|
||||
coc-highlight = buildVimPluginFrom2Nix {
|
||||
pname = "coc-highlight";
|
||||
version = "2019-09-20";
|
||||
version = "2019-10-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-highlight";
|
||||
rev = "775dd5e0a2c8f6e3834e002ca855a305ca267422";
|
||||
sha256 = "0dmzpfvxj8kw6knnsbfjzx1d3n9i5rff9nw7j9pl1brmgk2r5r77";
|
||||
rev = "b4e82ebd5fe855d004dd481e2ecf2fa88faed284";
|
||||
sha256 = "06h64jq8cgj5hc19inidns046kkb76750179jsw7xv5zbp93ygap";
|
||||
};
|
||||
};
|
||||
|
||||
@ -391,12 +391,12 @@ let
|
||||
|
||||
coc-lists = buildVimPluginFrom2Nix {
|
||||
pname = "coc-lists";
|
||||
version = "2019-10-04";
|
||||
version = "2019-10-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-lists";
|
||||
rev = "3c117046b54130157006f8ddf048304507499260";
|
||||
sha256 = "1wv3ryih2f3hdcb78yy0r20wzlpqf4jv3j4mllb9vay0lcgyx90b";
|
||||
rev = "25cd38285df23766fa8c543c307f9ddf65120902";
|
||||
sha256 = "0smilk9mi6d4v1p03wqigvri8vk0k30fb8gqlqz5gpxdf3wwn90v";
|
||||
};
|
||||
};
|
||||
|
||||
@ -821,12 +821,12 @@ let
|
||||
|
||||
denite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "denite-nvim";
|
||||
version = "2019-10-04";
|
||||
version = "2019-10-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "denite.nvim";
|
||||
rev = "7e15b1ffed251ef68ec3796676fe37ee57c786ca";
|
||||
sha256 = "08c0m8jkdi21r2wxqqkar411ydvmfpwqdmnklpzzs4hznxfqxpf3";
|
||||
rev = "15ee41069c8f5978e47d7aa845f4e21c7708b998";
|
||||
sha256 = "1yxf336db3y10wngngwx7z8r8y0fvdhp3xkza5xjbfbq0mh600c6";
|
||||
};
|
||||
};
|
||||
|
||||
@ -945,12 +945,12 @@ let
|
||||
|
||||
deoplete-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "deoplete-nvim";
|
||||
version = "2019-10-07";
|
||||
version = "2019-10-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "deoplete.nvim";
|
||||
rev = "70a11ee67f3c4353e48aad69812c34b5c8489f07";
|
||||
sha256 = "1zwhsk30nq5p82px2z4gri8pxgkri26x488fi20pdkpabgg5dh8g";
|
||||
rev = "2a6236d9d73f2cbbde4b802787d37cb8cbca2b33";
|
||||
sha256 = "196kka23cidgbig86kvapzv58wqp5qgql8c0m1wkgig1v8gldssv";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1057,12 +1057,12 @@ let
|
||||
|
||||
falcon = buildVimPluginFrom2Nix {
|
||||
pname = "falcon";
|
||||
version = "2019-09-24";
|
||||
version = "2019-10-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenetikm";
|
||||
repo = "falcon";
|
||||
rev = "346587418bc7a1b39bdf65dce2a85a1058ed87b5";
|
||||
sha256 = "17qa5xhqjy43sg1nmm83z90dk8nfkd64n98ijx04kqprk6jp90rq";
|
||||
rev = "95ea5ae8b0f1766237438f28ecce56414ee6432a";
|
||||
sha256 = "1qn825py75cdh414h9gcdf41w7wv84y38m5h39p0w04qz4p585xc";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1355,12 +1355,12 @@ let
|
||||
|
||||
indentLine = buildVimPluginFrom2Nix {
|
||||
pname = "indentLine";
|
||||
version = "2019-02-22";
|
||||
version = "2019-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yggdroot";
|
||||
repo = "indentLine";
|
||||
rev = "47648734706fb2cd0e4d4350f12157d1e5f4c465";
|
||||
sha256 = "0739hdvdfa1lm209q4sl75jvmf2k03cvlka7wv1gwnfl00krvszs";
|
||||
rev = "9c6f8fe0b34adf3813a866bff16b031537cc346c";
|
||||
sha256 = "0r3jppigc6i562par0l36z7g5zyk2djvjvbl61vjzi0jk1d0gvjn";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1377,12 +1377,12 @@ let
|
||||
|
||||
iosvkem = buildVimPluginFrom2Nix {
|
||||
pname = "iosvkem";
|
||||
version = "2019-09-04";
|
||||
version = "2019-10-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neutaaaaan";
|
||||
repo = "iosvkem";
|
||||
rev = "f9e6b5e8a72c4b3c542074d881e694daa60c79df";
|
||||
sha256 = "1l9p8hxrv3rybbv9w3f74l4wngjyjw7jzylw38jbmsn7bgr1m336";
|
||||
rev = "088293c426c398b2655f01026cd146f536a703c7";
|
||||
sha256 = "1ib4p3r8qnlybfw53asn8xk0y9w5ppjpkn2c51bsx1v5an82jjbl";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1410,12 +1410,12 @@ let
|
||||
|
||||
jedi-vim = buildVimPluginFrom2Nix {
|
||||
pname = "jedi-vim";
|
||||
version = "2019-09-28";
|
||||
version = "2019-10-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "davidhalter";
|
||||
repo = "jedi-vim";
|
||||
rev = "b4b2f3ef54c02d6f8fb09cf1eb0f139d3a45bdb8";
|
||||
sha256 = "0947003kyy0hpymhnl13mgv2in3q5q26y3d1gqqx4hy63plcxi14";
|
||||
rev = "08f13af066fad3a60cf241b37ac1878b8cfafa46";
|
||||
sha256 = "0ghdbxmmw1s67vb4l4ap6n6dy69lpp8k1sln27abxhympi2fs2dg";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
@ -1554,12 +1554,12 @@ let
|
||||
|
||||
lightline-vim = buildVimPluginFrom2Nix {
|
||||
pname = "lightline-vim";
|
||||
version = "2019-09-09";
|
||||
version = "2019-10-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchyny";
|
||||
repo = "lightline.vim";
|
||||
rev = "c9ab296e856bed4e694180efb6ffb692cf18ed8f";
|
||||
sha256 = "1sw71fyihcyjb6vlwzw5wah6q1dz2mfcswm594wrdkjxm71i0c0d";
|
||||
rev = "d7fd8d7a7465194e8eb67ce759c9fe392035f939";
|
||||
sha256 = "0dg0m5ff1gwqn8l4il2yykgmi71vjyp1z9dwil9jn74xk1zhwszp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1774,12 +1774,12 @@ let
|
||||
|
||||
neomake = buildVimPluginFrom2Nix {
|
||||
pname = "neomake";
|
||||
version = "2019-10-14";
|
||||
version = "2019-10-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomake";
|
||||
repo = "neomake";
|
||||
rev = "0e03a4497ef01fd17b34232830285cb506701abd";
|
||||
sha256 = "1l9s9zhmdhf0s5ps2f9y2b5fgl8kvkfs69v97rgrd51h9m4mk0jb";
|
||||
rev = "75b50f8ab8dbf57c193cfe5f8ca4edd975ccd314";
|
||||
sha256 = "16c6zjqskfdcrdk08cxjpbc1kyixnbmzy7d4mz0xrkxh3bczqgff";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1884,12 +1884,12 @@ let
|
||||
|
||||
nerdtree = buildVimPluginFrom2Nix {
|
||||
pname = "nerdtree";
|
||||
version = "2019-10-14";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scrooloose";
|
||||
repo = "nerdtree";
|
||||
rev = "42455176896560bf8cf7fc8457232131231b358f";
|
||||
sha256 = "08nmzgr536yqv1rnlf6m5xj176wfamcd4zjp4pc4r9b955r874c0";
|
||||
rev = "fec3e57ad23e4c268d07181d6afb858925b647a1";
|
||||
sha256 = "1s5rmzl2rlqgxms5gi8gj6nnk18qqfsz6r40kk84cgqkf0ip13xv";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1959,6 +1959,17 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
nvim-terminal-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-terminal-lua";
|
||||
version = "2019-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "norcalli";
|
||||
repo = "nvim-terminal.lua";
|
||||
rev = "095f98aaa7265628a72cd2706350c091544b5602";
|
||||
sha256 = "09hass19v3wrqgxjcr3b59w462lp2nw533zwb1nnmiz99gx1znpx";
|
||||
};
|
||||
};
|
||||
|
||||
nvim-yarp = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-yarp";
|
||||
version = "2019-10-13";
|
||||
@ -1994,12 +2005,12 @@ let
|
||||
|
||||
open-browser-github-vim = buildVimPluginFrom2Nix {
|
||||
pname = "open-browser-github-vim";
|
||||
version = "2018-03-14";
|
||||
version = "2019-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tyru";
|
||||
repo = "open-browser-github.vim";
|
||||
rev = "6f63e9c8b9482858af12c2dc60f6df2854e57f28";
|
||||
sha256 = "06wvj6sqqzf52ng0k0p9g8wnlrljnia6h4d65681plqyxakbvi2w";
|
||||
rev = "b252c5cf717865b61945f5c7fad0fb950a947db8";
|
||||
sha256 = "1n562h3g7ri4ifcbfzjiz2yq0a5v9aad3di24xc3kriz4pwlkgbr";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2049,12 +2060,12 @@ let
|
||||
|
||||
plantuml-syntax = buildVimPluginFrom2Nix {
|
||||
pname = "plantuml-syntax";
|
||||
version = "2019-10-12";
|
||||
version = "2019-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aklt";
|
||||
repo = "plantuml-syntax";
|
||||
rev = "ea0d44c725b3bed5dc37ab88d62279c6066add06";
|
||||
sha256 = "1f5dljfqk69f77r94kxaz8pi35n7hc53h5gfcs3ba0jsjz19mpnv";
|
||||
rev = "08f69d9dfc314021eef8802f1acbce051bf7fda0";
|
||||
sha256 = "040ya0grhalylnaqrjgdlw0f7mfl87pz5y3f624gqq73pcf36skk";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2269,12 +2280,12 @@ let
|
||||
|
||||
rust-vim = buildVimPluginFrom2Nix {
|
||||
pname = "rust-vim";
|
||||
version = "2019-10-13";
|
||||
version = "2019-10-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust.vim";
|
||||
rev = "8293adcd9c5645379133bea4d77de30b1476528c";
|
||||
sha256 = "1cc1wq2lbsl7jxh3mal0yhj3z2fn1q60ip4666kshx5yryikhs3p";
|
||||
rev = "97fdc4e4975515d8e8a5a82380dd85628d59a005";
|
||||
sha256 = "1ggnl9h0jqb3zf8n8vpvlizxb3fikmghwpj8d3xq3ny54wfjgx78";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2456,12 +2467,12 @@ let
|
||||
|
||||
syntastic = buildVimPluginFrom2Nix {
|
||||
pname = "syntastic";
|
||||
version = "2019-10-02";
|
||||
version = "2019-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scrooloose";
|
||||
repo = "syntastic";
|
||||
rev = "3b3f4ee8abf81191d1eca4350448148b86e8a741";
|
||||
sha256 = "0spksh2pafp9lzx9mybnx3whm9jgjg3yh2lfi5f5kk6gypfnwc4y";
|
||||
rev = "eff1f1b67971f144165dd009cd895b241ec66a0c";
|
||||
sha256 = "040xp6cwv0jzr0kwzr00dcjw7sj1q549g451358qsi25bf29nmwg";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2500,12 +2511,12 @@ let
|
||||
|
||||
tagbar = buildVimPluginFrom2Nix {
|
||||
pname = "tagbar";
|
||||
version = "2017-12-17";
|
||||
version = "2019-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "majutsushi";
|
||||
repo = "tagbar";
|
||||
rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70";
|
||||
sha256 = "130rxvlkqzlqh09w6fpmq7x3b7s4s56qxly9m4jh6s2jrab1cxak";
|
||||
rev = "dcd5f446c34d453b86639f9ca77cad46ac12a32d";
|
||||
sha256 = "07fd8n9prldbmk3rr23bxsx7i275883ql31faksxrs0jgg8f4l4l";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2655,12 +2666,12 @@ let
|
||||
|
||||
ultisnips = buildVimPluginFrom2Nix {
|
||||
pname = "ultisnips";
|
||||
version = "2019-05-05";
|
||||
version = "2019-10-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SirVer";
|
||||
repo = "ultisnips";
|
||||
rev = "1a99766b73783bafb08cfa07d7e29e5387c55189";
|
||||
sha256 = "08vxvx6fabqg725jv7cbdickrxlcw45885jai0hhgclm4hfqvawx";
|
||||
rev = "8ff301c651d6df806c0f9305273a6c62a693bc48";
|
||||
sha256 = "0ckgwfchxxd5va9ils2d0518irlsjkc0pzncn357dfihh2mgg01s";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2721,12 +2732,12 @@ let
|
||||
|
||||
vim = buildVimPluginFrom2Nix {
|
||||
pname = "vim";
|
||||
version = "2019-10-06";
|
||||
version = "2019-10-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "vim";
|
||||
rev = "f6dd7c17f71d2b6a1fad1e84e6cb28861af0e978";
|
||||
sha256 = "1407gl1rki5nj7rwiab61j579cih6shkgl02z4cmrvyb0dcq0vq8";
|
||||
rev = "c8c0a9325407c487fd702eca39d987d67123c98b";
|
||||
sha256 = "054q6lk91x7dghvvzb51j7923bdy317iya5msv9as76nwzdrk5dp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2952,12 +2963,12 @@ let
|
||||
|
||||
vim-airline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-airline";
|
||||
version = "2019-10-11";
|
||||
version = "2019-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-airline";
|
||||
repo = "vim-airline";
|
||||
rev = "297ca3d00406064004be5f2a9923fe8c2406e6e9";
|
||||
sha256 = "1fmd0rjgrhsngpml885lybzibrpsszcc80iwm6qvydddhcp35jdi";
|
||||
rev = "3736132370580e1fad22c081cedf4eb80a5ef6d8";
|
||||
sha256 = "0n47p0anlszzhh7crl1a2x2yiw7hpk7b1sjaf8803dx1p88baqfv";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3282,12 +3293,12 @@ let
|
||||
|
||||
vim-dirvish = buildVimPluginFrom2Nix {
|
||||
pname = "vim-dirvish";
|
||||
version = "2019-08-27";
|
||||
version = "2019-10-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "justinmk";
|
||||
repo = "vim-dirvish";
|
||||
rev = "e8a213d9d0a21f03fc03319fa7560521b6cd6928";
|
||||
sha256 = "1vhjlpjjg5bdfcalf10z9gjnrnc98yf5r3ink9dhljj5vnx23zaw";
|
||||
rev = "79ffe5c6cf0a56d693659b6b98e92a82daf105f4";
|
||||
sha256 = "1s1rqc7ai5a7al4sqavsng7pa3hx8fxgdkq8ww119bwfx5p43v4z";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3513,12 +3524,12 @@ let
|
||||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2019-10-11";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "06e34204af04643d96d30132de6ba9066368de15";
|
||||
sha256 = "1322pr6zv2yv1y9gvwb8d7an4iyvi4yxbbivy1y8hl9pcy8ni989";
|
||||
rev = "b09c5d2523f9964add241a04862c2f8bbd7d428f";
|
||||
sha256 = "0x6j4z85z23wk1j7ni1558iyssiimixv26rhbsp9n26a4g8mm042";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3557,12 +3568,12 @@ let
|
||||
|
||||
vim-gitgutter = buildVimPluginFrom2Nix {
|
||||
pname = "vim-gitgutter";
|
||||
version = "2019-10-01";
|
||||
version = "2019-10-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "airblade";
|
||||
repo = "vim-gitgutter";
|
||||
rev = "1725c13add66c6981d9406f109dcd64dff5fbf59";
|
||||
sha256 = "0xv1w9csl63kl7pm0inkzfjas1q477cpxqxyxa3x1wbmmar6sn46";
|
||||
rev = "5c73edb3c2fd8794661d7c7ac72eed1fc9d36761";
|
||||
sha256 = "0k93phv42195i3gdm4dwz5l5vni7mpqhpj7d4n0znn21kgwwca38";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3590,12 +3601,12 @@ let
|
||||
|
||||
vim-go = buildVimPluginFrom2Nix {
|
||||
pname = "vim-go";
|
||||
version = "2019-10-13";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "vim-go";
|
||||
rev = "17c53d38f17b0978323868ac12573f33a6fb8100";
|
||||
sha256 = "1fal9w1xkwbsidj9rskxkl7406n92rwghas6vw5nx3v95pn8lb7k";
|
||||
rev = "2f7a00e9f2ac4ec3c49bfe6234ccd290bfb782ac";
|
||||
sha256 = "0b1j44gphfmpi13h9rxd0fn2z5wiwvg2mfihj8i0ij7265l1wq3q";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3667,12 +3678,12 @@ let
|
||||
|
||||
vim-haskellConcealPlus = buildVimPluginFrom2Nix {
|
||||
pname = "vim-haskellConcealPlus";
|
||||
version = "2018-12-26";
|
||||
version = "2019-10-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "enomsg";
|
||||
repo = "vim-haskellConcealPlus";
|
||||
rev = "1d64dd2cdd1e99689e3d79e7ada151213acd5450";
|
||||
sha256 = "0jsfg941qdpibzcg0ypf0nvabmv1bpwgzgzda7hjy1jcai4yrw1g";
|
||||
rev = "c76b73b17a5eaf4fd535b6bd1f533ea847fd20f7";
|
||||
sha256 = "01p9rjpp9g859axlq2mpj89dg3d7n40rmqx2x66aql87m8rzjmam";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3909,12 +3920,12 @@ let
|
||||
|
||||
vim-jsbeautify = buildVimPluginFrom2Nix {
|
||||
pname = "vim-jsbeautify";
|
||||
version = "2019-03-01";
|
||||
version = "2019-10-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "maksimr";
|
||||
repo = "vim-jsbeautify";
|
||||
rev = "aa96718ddc74bc20dd6b44a179eb0ee66443339f";
|
||||
sha256 = "1v7h7xdhkiifcjk1bqiw7nfz4bxbrbaqghmi31564xdgckqfqcqk";
|
||||
rev = "6003f9d420d56b91f5664ec5ed5a9a3a6d8df22b";
|
||||
sha256 = "06gxmqyxkw2mgdy6m7b248w0gzkwsjcpyihpnyf5cajb5aw4wk13";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
@ -3954,12 +3965,12 @@ let
|
||||
|
||||
vim-jsx-pretty = buildVimPluginFrom2Nix {
|
||||
pname = "vim-jsx-pretty";
|
||||
version = "2019-09-18";
|
||||
version = "2019-10-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaxMEllon";
|
||||
repo = "vim-jsx-pretty";
|
||||
rev = "89c30c0defe8ddb31bc0d3cfa5f22f3f6d8eb24f";
|
||||
sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir";
|
||||
rev = "8f8c9edba37310d17e59a625b177ec6a37c07035";
|
||||
sha256 = "1hk3003ypiw62vra8vdjx2gzrv23b642w1nhq0zvgmh6yv8l33nz";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4075,12 +4086,12 @@ let
|
||||
|
||||
vim-lsc = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsc";
|
||||
version = "2019-10-01";
|
||||
version = "2019-10-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "natebosch";
|
||||
repo = "vim-lsc";
|
||||
rev = "8d1691f9f191b7cfab3fe7c4606c0bb8dd7bd47d";
|
||||
sha256 = "016589m1g7fn0705fiikgg4ypbncg8i6mvw4wm58v80s2d84az6m";
|
||||
rev = "576c07a77570fee7b5e724516f9a3bb3de7d4a8a";
|
||||
sha256 = "1qnpjb5rciv2c6zklhfn1flj2r8dj72wmv2wdmslh7csdqf3fyki";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4295,12 +4306,12 @@ let
|
||||
|
||||
vim-pandoc = buildVimPluginFrom2Nix {
|
||||
pname = "vim-pandoc";
|
||||
version = "2019-08-26";
|
||||
version = "2019-10-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-pandoc";
|
||||
repo = "vim-pandoc";
|
||||
rev = "53f14ea43997e46c2c4686a1d89bcebfec1c8c50";
|
||||
sha256 = "1qcng9hszv4fcqhzdq7sfvdhl0x4zv91blk328n2jrqp831c0ds1";
|
||||
rev = "cbf8fef9803bcbb50b92ccf9ea050f821e98b478";
|
||||
sha256 = "03zvganc2f95iwddlghw991ygw0z9zqlnsxjh6akafm4s31b66pi";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4383,12 +4394,12 @@ let
|
||||
|
||||
vim-plug = buildVimPluginFrom2Nix {
|
||||
pname = "vim-plug";
|
||||
version = "2019-10-14";
|
||||
version = "2019-10-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "vim-plug";
|
||||
rev = "fcfd5b7e1f2ac9f90e933037cd2ef1d0ef2ff992";
|
||||
sha256 = "1j4jwy84pypick27gisw3z1gqa54zamlfhl2dpy4ixgqxgvrdf6k";
|
||||
rev = "eee50c55bf691bf6bf04c981c1d1cfed3ffc4588";
|
||||
sha256 = "12awz68lzckh4c2ffhp3gv45f123bsb9jghv5g8ypzrj3ch6im0c";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4405,12 +4416,12 @@ let
|
||||
|
||||
vim-polyglot = buildVimPluginFrom2Nix {
|
||||
pname = "vim-polyglot";
|
||||
version = "2019-09-27";
|
||||
version = "2019-10-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sheerun";
|
||||
repo = "vim-polyglot";
|
||||
rev = "f95026252c5a31242903a98c741887696dfbb11f";
|
||||
sha256 = "0lzzlrwcic3vbn6rk3vcakwg6fl6nkvhamxcind6jx43pr1ylwwv";
|
||||
rev = "31c55b85a03d96252bba14d64911cc78a20369a1";
|
||||
sha256 = "0f6kywmk7id6yglqf59qrfb1swrw3f7b7pxqj4zr0q6xmjq233n0";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4592,12 +4603,12 @@ let
|
||||
|
||||
vim-sensible = buildVimPluginFrom2Nix {
|
||||
pname = "vim-sensible";
|
||||
version = "2019-09-01";
|
||||
version = "2019-10-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-sensible";
|
||||
rev = "5dc6eb2d8026b4ce812a5a9c966d232b1f50c9c7";
|
||||
sha256 = "05mig86l1hi0q1y5sj7bp09i1lwbyn7v9xp3hd853fv7z026fza0";
|
||||
rev = "4a7159a30061b26aec9ac367823094e7fd0f6a5b";
|
||||
sha256 = "08qlxa22kfqv4r2vdl8gfzayxir4cw78p8acah6dq3svksk2b2ib";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4614,12 +4625,12 @@ let
|
||||
|
||||
vim-signify = buildVimPluginFrom2Nix {
|
||||
pname = "vim-signify";
|
||||
version = "2019-10-07";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhinz";
|
||||
repo = "vim-signify";
|
||||
rev = "80f64eace5694413f9dfd8e70e4a7018b56c42b6";
|
||||
sha256 = "1v8zhs240d4z87sryn14dn29i9a2aigwz197c5ag8l4zg4b466z0";
|
||||
rev = "ad755bb72953d02d01046b606962db727766d096";
|
||||
sha256 = "1l46ar2v1000l44dwbybzy60nqw76hiczdfh370n3sr5vpp4ynda";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4680,12 +4691,12 @@ let
|
||||
|
||||
vim-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "vim-snippets";
|
||||
version = "2019-10-12";
|
||||
version = "2019-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "honza";
|
||||
repo = "vim-snippets";
|
||||
rev = "5ee6d319bb895bb6672f253798263f53a93c2a06";
|
||||
sha256 = "1id8vghf09ahpv0kkvvg9v498i4xvv499z0b3ynjjqgpda44fh2i";
|
||||
rev = "9ccd2ac19010b80deb7bebe36d91c70bae26e259";
|
||||
sha256 = "18x8l420zj2lpa8fwg98gz4ffh02gm0shwvf3a6lp10a41gk4ymf";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4845,12 +4856,12 @@ let
|
||||
|
||||
vim-test = buildVimPluginFrom2Nix {
|
||||
pname = "vim-test";
|
||||
version = "2019-10-12";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "janko-m";
|
||||
repo = "vim-test";
|
||||
rev = "7e0269621f8e408a75a548171445a5612a7a2094";
|
||||
sha256 = "1w7b9dp6a3h2iqlxp12bfyq6q4hximagcgllq7j06h2wnp7jbkw2";
|
||||
rev = "18619b98d8fc16c6d23ccbefc5e9ce335c499d42";
|
||||
sha256 = "0aja7qfv3mcg7skagrd73xj9hncv35a9l554sjmm072wbi682p5l";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4900,12 +4911,12 @@ let
|
||||
|
||||
vim-textobj-user = buildVimPluginFrom2Nix {
|
||||
pname = "vim-textobj-user";
|
||||
version = "2018-11-19";
|
||||
version = "2019-10-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kana";
|
||||
repo = "vim-textobj-user";
|
||||
rev = "074ce2575543f790290b189860597a3dcac1f79d";
|
||||
sha256 = "15wnqkxjjksgn8a7d3lkbf8d97r4w159bajrcf1adpxw8hhli1vc";
|
||||
rev = "9861dc6829a0ce253e40b4d947a9432b58eb499b";
|
||||
sha256 = "1gyz6y5f9bf5hnmb54lqmddy3g9y7bc28k9mrqfr49cd9nziywa5";
|
||||
};
|
||||
};
|
||||
|
||||
@ -5230,12 +5241,12 @@ let
|
||||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2019-10-14";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "335dbe97ce6f3aae311396f9567d2457270589b1";
|
||||
sha256 = "1q8jjxab87lfa1sp6sxh7540i01nbbh9inh66zv5fshgga95vv0j";
|
||||
rev = "76c7c32f0b5e1cbedb5bc17d76ef7392cc88f8ba";
|
||||
sha256 = "1klv48nbp0v0ik9xizx0kzswiygdkgbv5mgh07ly5zbsfsvz2hg1";
|
||||
};
|
||||
};
|
||||
|
||||
@ -5373,24 +5384,24 @@ let
|
||||
|
||||
yats-vim = buildVimPluginFrom2Nix {
|
||||
pname = "yats-vim";
|
||||
version = "2019-10-03";
|
||||
version = "2019-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "HerringtonDarkholme";
|
||||
repo = "yats.vim";
|
||||
rev = "88edbffd4f1149d308340321f1d0bbe620b1b252";
|
||||
sha256 = "1s90kx5a2r1azc0chrq84c9pwaifndc4lzi5l7j8lrfq6saj8q1s";
|
||||
rev = "7ea1a4da5ab0d3ae73ea6af80b7252ae960e126f";
|
||||
sha256 = "0vhgmwycmscd7v10nzcb8q7wqx4g2lrc9jb6zgd9dnkd8dzhmz3h";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
|
||||
youcompleteme = buildVimPluginFrom2Nix {
|
||||
pname = "youcompleteme";
|
||||
version = "2019-10-01";
|
||||
version = "2019-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "valloric";
|
||||
repo = "youcompleteme";
|
||||
rev = "94cfacd11ff97643a32409671fed072e3b1412d6";
|
||||
sha256 = "0zrypbd8cwrcasg8pf7zxm7v64vq0jjqa3gwkywp76x9shxi6dk5";
|
||||
rev = "123f0c0794eb8e36b24649059090a2deeb34d1d5";
|
||||
sha256 = "1rb35m6x3i692ln15a42g7dnc7lpg6lvf6kfdl67ygsgigcwflff";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
|
||||
@ -299,6 +299,7 @@ neutaaaaan/iosvkem
|
||||
nixprime/cpsm
|
||||
NLKNguyen/papercolor-theme
|
||||
noc7c9/vim-iced-coffee-script
|
||||
norcalli/nvim-terminal.lua
|
||||
ntpeters/vim-better-whitespace
|
||||
numirias/semshi
|
||||
nvie/vim-flake8
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "riemann";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";
|
||||
sha256 = "1c31higrsmpkvl956rrw1hpwjyvypgrjzl6vky0gn55zgvisasn4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mosquitto";
|
||||
version = "1.6.6";
|
||||
version = "1.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = "mosquitto";
|
||||
rev = "v${version}";
|
||||
sha256 = "01a1vf0rgncmhk7v9vnj4gdx0j8jfiy95f2hr4iwqdch7jy5q367";
|
||||
sha256 = "1g9g9c95ypfa9dv53ga3hjqxrrlqmcf1lmpxgrifl2l34q4zzfln";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtprotoproxy";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexbers";
|
||||
repo = "mtprotoproxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "1i8v6w79ad3xn9dnn144q93vcs23cj0m7hj3x33i16hxz325zb9y";
|
||||
sha256 = "1j8bxwcq968h5sd58g03yc4zjqkhkjdn0f04vr826hhsdxy853r4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapPython ];
|
||||
|
||||
@ -2,17 +2,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgbouncer";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0w3y53kwnkcm9fmf28zbjvqk6ivfic5f2k3nflvca1i8iaj2z044";
|
||||
sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v";
|
||||
};
|
||||
|
||||
buildInputs = [ libevent openssl c-ares pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libevent openssl c-ares ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://pgbouncer.github.io;
|
||||
homepage = "https://pgbouncer.github.io";
|
||||
description = "Lightweight connection pooler for PostgreSQL";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postgis";
|
||||
version = "2.5.3";
|
||||
version = "3.0.0";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
|
||||
sha256 = "16jm9v9y25dhfwd4hvhnynj6k3ikjbr3z3dpn8py50gr82fjds3j";
|
||||
sha256 = "15557fbk0xkngihwhqsbdyz2ng49blisf5zydw81j0gabk6x4vy0";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2019-10-20";
|
||||
version = "2019-10-22";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "a7c740b1d7d0033c6de118439c7935962b2a5c2a";
|
||||
rev = "40df67bc3b9b51caa24df5d220487043040d1f9a";
|
||||
|
||||
src = fetchgit { inherit rev;
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
sha256 = "1kwmjizldfsvxppf8xmgqh0644gnfvcns4l9cjpcvd0nk616yg0f";
|
||||
sha256 = "0dlkfgnhlqymgr9289j15kpcig2k184j0md7bkxn7w8v7c02xbbc";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
||||
36
pkgs/tools/X11/x11spice/default.nix
Normal file
36
pkgs/tools/X11/x11spice/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig
|
||||
, xorg, gtk2, spice, spice-protocol
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x11spice";
|
||||
version = "2019-08-20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "spice";
|
||||
repo = "x11spice";
|
||||
rev = "51d2a8ba3813469264959bb3ba2fc6fe08097be6";
|
||||
sha256 = "0va5ix14vnqch59gq8wvrhw6q0w0n27sy70xx5kvfj2cl0h1xpg8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
buildInputs = [
|
||||
xorg.libxcb xorg.xcbutil xorg.utilmacros
|
||||
gtk2 spice spice-protocol
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lpthread";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = ''
|
||||
x11spice will enable a running X11 desktop to be available
|
||||
via a Spice server
|
||||
'';
|
||||
homepage = https://gitlab.freedesktop.org/spice/x11spice;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
};
|
||||
}
|
||||
@ -4,17 +4,17 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
version = "1.1.0";
|
||||
version = "1.3.4";
|
||||
|
||||
# switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
|
||||
pulumiArchPackage = {
|
||||
x86_64-linux = {
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
|
||||
sha256 = "1r498pxsjdj9mhdzh9vh4nw8fcjxfga44xlg43b0yakkgrp7c224";
|
||||
sha256 = "1scs2msmg6ba91ri9al3299xnq8gq63clbqq1n03karf6ys2jnvi";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
|
||||
sha256 = "02nr5yxn5aqgbwrnl4shgd6rh4n4v8giqki4qkbgx74xf3bbwihg";
|
||||
sha256 = "0k3hfrcwa5sgg8mgmxp2xfykrshyp4bv77d3y8758zm7xqmmjg69";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -15,10 +15,10 @@ let
|
||||
# The command
|
||||
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
|
||||
# can help with finding new Python scripts.
|
||||
version = "6.5";
|
||||
version = "7.0";
|
||||
name="${baseName}-${version}";
|
||||
url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
|
||||
sha256 = "17vdrw71ys1n5g9pdmzipmr706bslq0gbxxjhacxnrgsz8r4rl6a";
|
||||
sha256 = "0ynh7wrgpnmwah9r2ll32dmicdivz13ijjxg2vj1qcaxgy0b5ivm";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -3,18 +3,19 @@
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20190725";
|
||||
version = "20191016";
|
||||
pname = "mbuffer";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
|
||||
sha256 = "1hjhyh3q0q22czq3s2wk5mcky1jrq9xw8fppw6r7cix1riq74m91";
|
||||
sha256 = "05xyvmbs2x5gbj2njgg7hsj3alb5dh96xhab0w0qkhb58x2i1hld";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.maier-komor.de/mbuffer.html;
|
||||
homepage = "http://www.maier-komor.de/mbuffer.html";
|
||||
description = "A tool for buffering data streams with a large set of unique features";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ tokudan ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgmetrics";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidloop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zjcchgpmp2a0ir8rzrfjpn4pcjiy4kawh2pbmszmqfzw1mkh762";
|
||||
sha256 = "17rr6rjdxg8gdljf65zkn3bl1kmnlp2gkhiq7slxslh8n9iz4wjs";
|
||||
};
|
||||
|
||||
modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb";
|
||||
|
||||
@ -2,24 +2,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pspg";
|
||||
version = "2.0.4";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = "pspg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1xiyshz56qpx3bv0mzx73rqr7wmyamyj8jbqdv05wjb72npkjmzl";
|
||||
sha256 = "0nfc1cv2l2v1rav5jj7jz5wyb2df5l3iwrvvpkvxxpv3qll8kcfv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gnugrep ncurses readline ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
|
||||
'';
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/okbob/pspg;
|
||||
homepage = "https://github.com/okbob/pspg";
|
||||
description = "Postgres Pager";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "q-text-as-data";
|
||||
version = "1.7.1";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "harelba";
|
||||
repo = "q";
|
||||
rev = version;
|
||||
sha256 = "021c2sd6qscz1ipwzzjf43pfd311dcay7yralksl25rs0r7h3li2";
|
||||
sha256 = "0p8rbfwwcqjyrix51v52zp9b03z4xg1fv2raf2ygqp9a4l27dca8";
|
||||
};
|
||||
|
||||
buildInputs = [ python2 ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.3.3";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = version;
|
||||
sha256 = "06z1l27rp3dpyphg3zqg0ww568a4g8iwz01vy4f7rl62asrbglsy";
|
||||
sha256 = "1g7rhgp405v7q9xx44k6jn3py4v73a9qjwhai6l459wdywdz1n3n";
|
||||
};
|
||||
|
||||
# test-utils coredumps so don't run those
|
||||
|
||||
@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://oss.oetiker.ch/smokeping;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.erictapen ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "0.13.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0hfzk4hpk35j070hhpsjjpxhcrrddi6f1z070iypajcw96qz6lli";
|
||||
sha256 = "0d92wwmvyk6sn3z61y1n9w4wydafra941s0cpbnkc7c9qkxiwwnb";
|
||||
};
|
||||
|
||||
modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w";
|
||||
modSha256 = "04hcg1n8f1wxz7n1k91nfspkd1ca7v5xf4hjj3wiw55vmykzcsm5";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple deb and rpm packager written in Go";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duo-unix";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
|
||||
sha256 = "11467kk8blg777vss0hsgz6k8f5m43p50zqs7yhx2sgbh9ygnn6y";
|
||||
sha256 = "097i2dsnbndpnyc4nx1j76qkx1bxwwlxnzmp1h3j4raghddgiq0g";
|
||||
};
|
||||
|
||||
buildInputs = [ pam openssl zlib ];
|
||||
|
||||
@ -12,6 +12,8 @@
|
||||
, nss
|
||||
, pam
|
||||
, systemd
|
||||
, autoreconfHook
|
||||
, gtk-doc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -33,6 +35,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
pkgconfig
|
||||
autoreconfHook # Drop with above patch
|
||||
gtk-doc # Drop with above patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amazon-ecs-cli";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
|
||||
sha256 = "0mj0y2hrl7yp8mfjgi68gvbravgwp5v58hhcclr49mdjnr4v6i9x";
|
||||
sha256 = "0dqnxzfdic3v10rr8k83zfbv7qc3yanajd81a0amzs778sqp7x9f";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -8541,8 +8541,11 @@ in
|
||||
|
||||
swift = callPackage ../development/compilers/swift { };
|
||||
|
||||
swiProlog = callPackage ../development/compilers/swi-prolog { };
|
||||
swiPrologWithGui = callPackage ../development/compilers/swi-prolog { withGui = true; };
|
||||
swiProlog = callPackage ../development/compilers/swi-prolog {
|
||||
openssl = openssl_1_0_2;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
swiPrologWithGui = swiProlog.override { withGui = true; };
|
||||
|
||||
tbb = callPackage ../development/libraries/tbb { };
|
||||
|
||||
@ -21635,6 +21638,8 @@ in
|
||||
|
||||
x11vnc = callPackage ../tools/X11/x11vnc { };
|
||||
|
||||
x11spice = callPackage ../tools/X11/x11spice { };
|
||||
|
||||
x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
|
||||
|
||||
x2goserver = callPackage ../applications/networking/remote/x2goserver { };
|
||||
@ -23666,7 +23671,9 @@ in
|
||||
# Since version 8 Eagle requires an Autodesk account and a subscription
|
||||
# in contrast to single payment for the charged editions.
|
||||
# This is the last version with the old model.
|
||||
eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { };
|
||||
eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
|
||||
eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
|
||||
|
||||
|
||||
@ -4015,7 +4015,8 @@ in {
|
||||
|
||||
nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { };
|
||||
|
||||
notebook = callPackage ../development/python-modules/notebook { };
|
||||
notebook = if isPy3k then callPackage ../development/python-modules/notebook { }
|
||||
else callPackage ../development/python-modules/notebook/2.nix { };
|
||||
|
||||
notify = callPackage ../development/python-modules/notify { };
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user