Merge remote-tracking branch 'upstream/master' into staging
This commit is contained in:
Tuomas Tynkkynen
commit
43ff1c8262
|
|
@ -385,11 +385,12 @@
|
|||
nand0p = "Fernando Jose Pando <nando@hex7.com>";
|
||||
Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
|
||||
nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
|
||||
nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
|
||||
nckx = "Tobias Geerinckx-Rice <github@tobias.gr>";
|
||||
ndowens = "Nathan Owens <ndowens04@gmail.com>";
|
||||
neeasade = "Nathan Isom <nathanisom27@gmail.com>";
|
||||
nequissimus = "Tim Steinbach <tim@nequissimus.com>";
|
||||
nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
|
||||
nh2 = "Niklas Hambüchen <mail@nh2.me>";
|
||||
nhooyr = "Anmol Sethi <anmol@aubble.com>";
|
||||
nickhu = "Nick Hu <me@nickhu.co.uk>";
|
||||
nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
|
||||
|
|
@ -409,6 +410,7 @@
|
|||
okasu = "Okasu <oka.sux@gmail.com>";
|
||||
olcai = "Erik Timan <dev@timan.info>";
|
||||
olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";
|
||||
olynch = "Owen Lynch <owen@olynch.me>";
|
||||
orbekk = "KJ Ørbekk <kjetil.orbekk@gmail.com>";
|
||||
orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
|
||||
orivej = "Orivej Desh <orivej@gmx.fr>";
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@
|
|||
./security/apparmor.nix
|
||||
./security/apparmor-suid.nix
|
||||
./security/audit.nix
|
||||
./security/auditd.nix
|
||||
./security/ca.nix
|
||||
./security/chromium-suid-sandbox.nix
|
||||
./security/dhparams.nix
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options.security.auditd.enable = mkEnableOption "the Linux Audit daemon";
|
||||
|
||||
config = mkIf config.security.auditd.enable {
|
||||
systemd.services.auditd = {
|
||||
description = "Linux Audit daemon";
|
||||
wantedBy = [ "basic.target" ];
|
||||
|
||||
unitConfig = {
|
||||
ConditionVirtualization = "!container";
|
||||
ConditionSecurity = [ "audit" ];
|
||||
};
|
||||
|
||||
path = [ pkgs.audit ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStartPre="${pkgs.coreutils}/bin/mkdir -p /var/log/audit";
|
||||
ExecStart = "${pkgs.audit}/bin/auditd -l -n -s nochange";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||
};
|
||||
|
||||
subtest "nixos-rebuild", sub {
|
||||
$machine->succeed("nixos-rebuild --help | grep SYNOPSIS");
|
||||
$machine->succeed("nixos-rebuild --help | grep 'NixOS module' ");
|
||||
};
|
||||
|
||||
# Sanity check for uid/gid assignment.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, pythonPackages, mopidy, mopidy-local-images }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "mopidy-iris-${version}";
|
||||
version = "3.0.3";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "Mopidy-Iris";
|
||||
sha256 = "1j8zrkvgs2f6jcqf1sn79afiirk5plfrkychlzcwqrxix293ngjr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mopidy
|
||||
mopidy-local-images
|
||||
pythonPackages.configobj
|
||||
pythonPackages.pylast
|
||||
pythonPackages.spotipy
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/jaedb/Iris";
|
||||
description = "A fully-functional Mopidy web client encompassing Spotify and many other backends";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.rvolosatovs ];
|
||||
};
|
||||
}
|
||||
|
|
@ -18,21 +18,21 @@ rec {
|
|||
|
||||
### Eclipse CPP
|
||||
|
||||
eclipse-cpp = eclipse-cpp-46; # always point to latest
|
||||
eclipse-cpp = eclipse-cpp-47; # always point to latest
|
||||
|
||||
eclipse-cpp-46 = buildEclipse {
|
||||
name = "eclipse-cpp-4.6.0";
|
||||
description = "Eclipse IDE for C/C++ Developers, Neon release";
|
||||
eclipse-cpp-47 = buildEclipse {
|
||||
name = "eclipse-cpp-4.7.0";
|
||||
description = "Eclipse IDE for C/C++ Developers, Oxygen release";
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
|
||||
sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz;
|
||||
sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
|
||||
sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz;
|
||||
sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a";
|
||||
}
|
||||
else throw "Unsupported system: ${stdenv.system}";
|
||||
};
|
||||
|
|
@ -56,21 +56,21 @@ rec {
|
|||
|
||||
### Eclipse Modeling
|
||||
|
||||
eclipse-modeling = eclipse-modeling-46; # always point to latest
|
||||
eclipse-modeling = eclipse-modeling-47; # always point to latest
|
||||
|
||||
eclipse-modeling-46 = buildEclipse {
|
||||
name = "eclipse-modeling-4.6";
|
||||
eclipse-modeling-47 = buildEclipse {
|
||||
name = "eclipse-modeling-4.7";
|
||||
description = "Eclipse Modeling Tools";
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz;
|
||||
sha1 = "3695fd049c4cca2d235f424557e19877795a8183";
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz;
|
||||
sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz;
|
||||
sha1 = "fa0694a0b44e8e9c2301417f84dba45cf9ac6e61";
|
||||
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz;
|
||||
sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "hugo-${version}";
|
||||
version = "0.25";
|
||||
version = "0.25.1";
|
||||
|
||||
goPackagePath = "github.com/gohugoio/hugo";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "v${version}";
|
||||
sha256 = "01p063nsyhavf13cva3sdqdcc7s42gi7iry4v857f1c2i402f0zk";
|
||||
sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, gdk_pixbuf
|
||||
, glib
|
||||
, gnome2
|
||||
, gtk2
|
||||
, gtk3
|
||||
, libX11
|
||||
, libxcb
|
||||
, libXScrnSaver
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
let
|
||||
|
||||
mirror = https://get.geo.opera.com/pub/opera/desktop;
|
||||
version = "45.0.2552.898";
|
||||
version = "46.0.2597.39";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ let
|
|||
gdk_pixbuf.out
|
||||
glib.out
|
||||
gnome2.GConf.out
|
||||
gtk2.out
|
||||
gtk3.out
|
||||
libX11.out
|
||||
libXScrnSaver.out
|
||||
libXcomposite.out
|
||||
|
|
@ -88,17 +88,18 @@ in stdenv.mkDerivation {
|
|||
name = "opera-${version}";
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
|
||||
sha256 = "1a7y13mgc8g7swdg0x2l9h6cmqw74h2wxizi3vmlgz2fj5zlkn0g";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
#if stdenv.system == "i686-linux" then
|
||||
# fetchurl {
|
||||
# url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
|
||||
# sha256 = "...";
|
||||
# }
|
||||
#else
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
|
||||
sha256 = "0rmagj0s1j3a6rpyrs29xnbngsq700rgaqkph108fbnj80hif1ia";
|
||||
sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia";
|
||||
}
|
||||
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
|
||||
else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)";
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
name = "irssi-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
|
||||
sha256 = "08nfm1pcf2b9npnp83175yi2vcwnhjdiwsq8whz7iky33hlhvijk";
|
||||
sha256 = "1a7f9g3hlccqlf9xj1csbxw4wgl6jfywg2xvkir6ww5viagkbzs8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchFromGitHub, gzip, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ndppd-${version}";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielAdolfsson";
|
||||
repo = "ndppd";
|
||||
rev = "${version}";
|
||||
sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces";
|
||||
homepage = "https://github.com/DanielAdolfsson/ndppd";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.fadenb ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pjsip-${version}";
|
||||
version = "2.5.5";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
|
||||
sha256 = "ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3";
|
||||
sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl libsamplerate alsaLib ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.14.30";
|
||||
version = "0.14.31";
|
||||
name = "syncthing-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "14f2v8i8ga9vii015vbx70k1vd85ac0ygykz2z614ii932g5lfdr";
|
||||
sha256 = "1zg9gj0g89swr8cxxrpl96adhqgxz40dwkm7n61q1vycd6hhl73d";
|
||||
};
|
||||
|
||||
buildInputs = [ go removeReferencesTo ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook
|
||||
# "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
|
||||
# "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
|
||||
# account. You'll need to generate (and please share :-) a new one if it breaks.
|
||||
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ removeReferencesTo go ];
|
||||
|
||||
preBuild = ''
|
||||
ln -s $(pwd) vendor/src/github.com/docker/containerd
|
||||
ln -s $(pwd) vendor/src/github.com/containerd/containerd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute, bridge-utils, devicemapper, systemd
|
||||
, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
|
||||
, procps
|
||||
}:
|
||||
|
||||
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
|
||||
# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits
|
||||
|
||||
with lib;
|
||||
|
||||
rec {
|
||||
|
|
@ -23,7 +20,7 @@ rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "docker";
|
||||
repo = "docker-ce";
|
||||
rev = "v${version}";
|
||||
sha256 = sha256;
|
||||
};
|
||||
|
|
@ -68,7 +65,7 @@ rec {
|
|||
|
||||
buildInputs = [
|
||||
makeWrapper removeReferencesTo pkgconfig go-md2man go
|
||||
sqlite devicemapper btrfs-progs systemd
|
||||
sqlite devicemapper btrfs-progs systemd libtool
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
|
|
@ -78,26 +75,43 @@ rec {
|
|||
++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
|
||||
++ optional (devicemapper == null) "exclude_graphdriver_devicemapper";
|
||||
|
||||
# systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
|
||||
postPatch = ''
|
||||
substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd
|
||||
substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
patchShebangs .
|
||||
# build engine
|
||||
cd ./components/engine
|
||||
export AUTO_GOPATH=1
|
||||
export DOCKER_GITCOMMIT="${rev}"
|
||||
./hack/make.sh dynbinary
|
||||
cd -
|
||||
|
||||
# build cli
|
||||
cd ./components/cli
|
||||
# Mimic AUTO_GOPATH
|
||||
mkdir -p .gopath/src/github.com/docker/
|
||||
ln -sf $PWD .gopath/src/github.com/docker/cli
|
||||
export GOPATH="$PWD/.gopath:$GOPATH"
|
||||
export GITCOMMIT="${rev}"
|
||||
export VERSION="${version}"
|
||||
source ./scripts/build/.variables
|
||||
export CGO_ENABLED=1
|
||||
go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker
|
||||
cd -
|
||||
'';
|
||||
|
||||
# systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
|
||||
patchPhase = ''
|
||||
patchShebangs .
|
||||
substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd
|
||||
substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
|
||||
substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" ""
|
||||
'';
|
||||
|
||||
outputs = ["out" "man"];
|
||||
|
||||
extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker
|
||||
install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
|
||||
install -Dm755 ./components/cli/docker $out/libexec/docker/docker
|
||||
install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
|
||||
makeWrapper $out/libexec/docker/docker $out/bin/docker \
|
||||
--prefix PATH : "$out/libexec/docker:$extraPath"
|
||||
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
|
||||
|
|
@ -111,18 +125,28 @@ rec {
|
|||
ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
|
||||
|
||||
# systemd
|
||||
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
|
||||
install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
|
||||
|
||||
# completion
|
||||
install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker
|
||||
install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
|
||||
install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
|
||||
# completion (cli)
|
||||
install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker
|
||||
install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
|
||||
install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
|
||||
|
||||
# Include contributed man pages (cli)
|
||||
# Generate man pages from cobra commands
|
||||
echo "Generate man pages from cobra"
|
||||
cd ./components/cli
|
||||
mkdir -p ./man/man1
|
||||
go build -o /tmp/gen-manpages github.com/docker/cli/man
|
||||
/tmp/gen-manpages --root . --target ./man/man1
|
||||
|
||||
# Generate legacy pages from markdown
|
||||
echo "Generate legacy manpages"
|
||||
./man/md2man-all.sh -q
|
||||
|
||||
# Include contributed man pages
|
||||
man/md2man-all.sh -q
|
||||
manRoot="$man/share/man"
|
||||
mkdir -p "$manRoot"
|
||||
for manDir in man/man?; do
|
||||
for manDir in ./man/man?; do
|
||||
manBase="$(basename "$manDir")" # "man1"
|
||||
for manFile in "$manDir"/*; do
|
||||
manName="$(basename "$manFile")" # "docker-build.1"
|
||||
|
|
@ -140,31 +164,19 @@ rec {
|
|||
homepage = http://www.docker.com/;
|
||||
description = "An open source project to pack, ship and run any application as a lightweight container";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline tailhook ];
|
||||
maintainers = with maintainers; [ offline tailhook vdemeester ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
docker_17_03 = dockerGen rec {
|
||||
version = "17.03.2-ce";
|
||||
rev = "f5ec1e2"; # git commit
|
||||
sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96";
|
||||
runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe";
|
||||
runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m";
|
||||
containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc";
|
||||
containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6";
|
||||
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
|
||||
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
|
||||
};
|
||||
|
||||
docker_17_05 = dockerGen rec {
|
||||
version = "17.05.0-ce";
|
||||
rev = "90d35abf7b3535c1c319c872900fbd76374e521c"; # git commit
|
||||
sha256 = "1m4fcawjj14qws57813wjxjwgnrfxgxnnzlj61csklp0s9dhg7df";
|
||||
runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228";
|
||||
runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl";
|
||||
containerdRev = "9048e5e50717ea4497b757314bad98ea3763c145";
|
||||
containerdSha256 = "1r9xhvzzh7md08nqb0rbp5d1rdr7jylb3da954d0267i0kh2iksa";
|
||||
docker_17_06 = dockerGen rec {
|
||||
version = "17.06.0-ce";
|
||||
rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit
|
||||
sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm";
|
||||
runcRev = "992a5be178a62e026f4069f443c6164912adbf09";
|
||||
runcSha256 = "0ylkbn5rprw5cgxazvrwj7balikpfm8vlybwdbfpwnsqk3gc6p8k";
|
||||
containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a";
|
||||
containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552";
|
||||
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
|
||||
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,4 +27,3 @@ buildGoPackage rec {
|
|||
platforms = docker.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unifont-${version}";
|
||||
version = "10.0.02";
|
||||
version = "10.0.04";
|
||||
|
||||
ttf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${name}/${name}.ttf";
|
||||
sha256 = "1g7iaw2vx7yq8d3z625p6ainkn35wpfsimbl75lyj3d8206fhx0z";
|
||||
sha256 = "0qp9zf8cx86syr8wl2z8yxlr5r83n156744ylzc0cg3rlmkx6r22";
|
||||
};
|
||||
|
||||
pcf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
|
||||
sha256 = "1l2cnkshpsg3mw5ps1ghzqm2a1nr7jfdn2bxqyvw7d0l5xyxvg3d";
|
||||
sha256 = "1mj2np6j4jdbfnl0i3zlpg95ic9zq8bhvz8wf3pxkc85zmnk6w62";
|
||||
};
|
||||
|
||||
buildInputs = [ mkfontscale mkfontdir ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation ( rec {
|
||||
name = "ponyc-${version}";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = "ponyc";
|
||||
rev = version;
|
||||
sha256 = "0zzr3mmjp7010d3jfly6lbwaib546praml97kgj92yixahnwz533";
|
||||
sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif";
|
||||
};
|
||||
|
||||
buildInputs = [ llvm makeWrapper which ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{stdenv, fetchFromGitHub, ponyc }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pony-stable-unstable-2017-03-30";
|
||||
name = "pony-stable-unstable-2017-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jemc";
|
||||
owner = "ponylang";
|
||||
repo = "pony-stable";
|
||||
rev = "39890c7f11f79009630de6b551bd076868f7f5a2";
|
||||
sha256 = "1w15dg4l03zzncpllwww8jhsj7z1wgvhf89n7agr9f1w9m2zpskc";
|
||||
rev = "b2ea566b02ec40480f888652b04eaa5f191a241e";
|
||||
sha256 = "1bixkxccsrnyip3yp42r14rbhk832pvzwbkh6ash4ip2isxa6b19";
|
||||
};
|
||||
|
||||
buildInputs = [ ponyc ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{stdenv, fetchgit, coq, coqPackages}:
|
||||
|
||||
let revision = "04785ee692036e7ba9f4c4e380b1995128a97bf8"; in
|
||||
let revision = "ee436635a34873c79f49c3d2d507194216f6e8e9"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "coq-QuickChick-${coq.coq-version}-${version}";
|
||||
version = "20170422-${builtins.substring 0 7 revision}";
|
||||
version = "20170710-${builtins.substring 0 7 revision}";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://github.com/QuickChick/QuickChick.git;
|
||||
rev = revision;
|
||||
sha256 = "1x5idk9d9r5mj1w54676a5j92wr1id7c9dmknkpmnh78rgrqzy5j";
|
||||
sha256 = "0sq14j1kl4m4plyxj2dbkfwa6iqipmf9w7mxxxcbsm718m0xf1gr";
|
||||
};
|
||||
|
||||
buildInputs = [ coq.ocaml coq.camlp5 ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,134 @@
|
|||
From 5b40a32e35fe446cda20ed34c756a010856f39ce Mon Sep 17 00:00:00 2001
|
||||
From: Theo Giannakopoulos <theo.giannakopoulos@baesystems.com>
|
||||
Date: Wed, 5 Apr 2017 15:48:55 -0400
|
||||
Subject: [PATCH] changes to work with Coq 8.6
|
||||
|
||||
---
|
||||
theories/Autosubst_Derive.v | 12 ++++++++++++
|
||||
theories/Autosubst_MMap.v | 3 ++-
|
||||
2 files changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/theories/Autosubst_Derive.v b/theories/Autosubst_Derive.v
|
||||
index 61995de..cf87f67 100644
|
||||
--- a/theories/Autosubst_Derive.v
|
||||
+++ b/theories/Autosubst_Derive.v
|
||||
@@ -18,6 +18,7 @@ Hint Extern 0 (Ids _) => derive_Ids : derive.
|
||||
|
||||
Ltac derive_Rename :=
|
||||
match goal with [ |- Rename ?term ] =>
|
||||
+ let inst := fresh "inst" in
|
||||
hnf; fix inst 2; change _ with (Rename term) in inst;
|
||||
intros xi s; change (annot term s); destruct s;
|
||||
match goal with
|
||||
@@ -66,6 +67,7 @@ Ltac has_var s :=
|
||||
Ltac derive_Subst :=
|
||||
match goal with [ |- Subst ?term ] =>
|
||||
require_instance (Rename term);
|
||||
+ let inst := fresh "inst" in
|
||||
hnf; fix inst 2; change _ with (Subst term) in inst;
|
||||
intros sigma s; change (annot term s); destruct s;
|
||||
match goal with
|
||||
@@ -107,6 +109,7 @@ Hint Extern 0 (Subst _) => derive_Subst : derive.
|
||||
Ltac derive_HSubst :=
|
||||
match goal with [ |- HSubst ?inner ?outer ] =>
|
||||
require_instance (Subst inner);
|
||||
+ let inst := fresh "inst" in
|
||||
hnf; fix inst 2; change _ with (HSubst inner outer) in inst;
|
||||
intros sigma s; change (annot outer s); destruct s;
|
||||
match goal with
|
||||
@@ -327,6 +330,7 @@ Ltac derive_SubstLemmas :=
|
||||
assert (up_upren_n :
|
||||
forall xi n, upn n (ren xi) = ren (iterate upren n xi)) by
|
||||
(apply up_upren_n_internal, up_upren);
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 2; intros xi s; destruct s; try reflexivity; simpl; f_equal;
|
||||
try apply mmap_ext; intros; rewrite ?up_upren, ?up_upren_n; apply ih);
|
||||
|
||||
@@ -337,6 +341,7 @@ Ltac derive_SubstLemmas :=
|
||||
(apply up_id_internal; reflexivity);
|
||||
assert (up_id_n : forall n, upn n ids = ids) by
|
||||
(apply up_id_n_internal, up_id);
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 1; intros s; destruct s; simpl; f_equal; try reflexivity;
|
||||
rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros; apply ih);
|
||||
|
||||
@@ -344,6 +349,7 @@ Ltac derive_SubstLemmas :=
|
||||
|
||||
assert (ren_subst_comp :
|
||||
forall xi sigma (s : term), (rename xi s).[sigma] = s.[xi >>> sigma]) by(
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 3; intros xi sigma s; destruct s; try reflexivity; simpl; f_equal;
|
||||
rewrite ?up_comp_ren_subst, ?up_comp_ren_subst_n, ?mmap_comp;
|
||||
try apply mmap_ext; intros; apply ih);
|
||||
@@ -357,6 +363,7 @@ Ltac derive_SubstLemmas :=
|
||||
assert (up_comp_subst_ren_n :
|
||||
forall sigma xi n, upn n (sigma >>> rename xi) = upn n sigma >>> rename (iterate upren n xi))
|
||||
by (apply up_comp_subst_ren_n_internal; apply up_comp_subst_ren);
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 3; intros sigma xi s; destruct s; try reflexivity; simpl;
|
||||
f_equal; rewrite ?up_comp_subst_ren, ?up_comp_subst_ren_n, ?mmap_comp;
|
||||
try (rewrite hcomp_ren_internal; [|apply rename_subst]);
|
||||
@@ -368,6 +375,7 @@ Ltac derive_SubstLemmas :=
|
||||
by (apply up_comp_internal; [reflexivity|apply ren_subst_comp|apply subst_ren_comp]);
|
||||
assert (up_comp_n : forall sigma tau n, upn n (sigma >> tau) = upn n sigma >> upn n tau)
|
||||
by (apply up_comp_n_internal; apply up_comp);
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
|
||||
rewrite ?up_comp, ?up_comp_n, ?mmap_comp, ?hcomp_dist_internal;
|
||||
try apply mmap_ext; intros; apply ih);
|
||||
@@ -382,6 +390,7 @@ Ltac derive_HSubstLemmas :=
|
||||
let ids := constr:(ids : var -> inner) in
|
||||
|
||||
assert (hsubst_id : forall (s : outer), s.|[ids] = s) by (
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 1; intros s; destruct s; try reflexivity; simpl; f_equal;
|
||||
rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros;
|
||||
(apply subst_id || apply ih)
|
||||
@@ -390,6 +399,7 @@ Ltac derive_HSubstLemmas :=
|
||||
assert (hsubst_comp : forall (theta eta : var -> inner) (s : outer),
|
||||
s.|[theta].|[eta] = s.|[theta >> eta])
|
||||
by (
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
|
||||
rewrite <- ?up_comp, <- ?up_comp_n, ?mmap_comp; try apply mmap_ext; intros;
|
||||
(apply subst_comp || apply ih)
|
||||
@@ -405,6 +415,7 @@ Ltac derive_SubstHSubstComp :=
|
||||
assert (ren_hsubst_comp : forall xi (theta : var -> inner) (s : outer),
|
||||
rename xi s.|[theta] = (rename xi s).|[theta]
|
||||
) by (
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 3; intros xi theta s; destruct s; try reflexivity; simpl; f_equal;
|
||||
rewrite ?mmap_comp; try apply mmap_ext; intros; simpl; apply ih
|
||||
);
|
||||
@@ -421,6 +432,7 @@ Ltac derive_SubstHSubstComp :=
|
||||
apply up_hcomp_n_internal; apply up_hcomp
|
||||
);
|
||||
|
||||
+ let ih := fresh "ih" in
|
||||
fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
|
||||
rewrite ?up_hcomp, ?up_hcomp_n, ?hcomp_lift_n_internal, ?mmap_comp;
|
||||
try apply mmap_ext; intros; apply ih
|
||||
diff --git a/theories/Autosubst_MMap.v b/theories/Autosubst_MMap.v
|
||||
index f8387e7..7af7902 100644
|
||||
--- a/theories/Autosubst_MMap.v
|
||||
+++ b/theories/Autosubst_MMap.v
|
||||
@@ -23,7 +23,7 @@ Arguments mmap {A B _} f !s /.
|
||||
Class MMapExt (A B : Type) `{MMap A B} :=
|
||||
mmap_ext : forall f g,
|
||||
(forall t, f t = g t) -> forall s, mmap f s = mmap g s.
|
||||
-Arguments mmap_ext {A B _ _ f g} H s.
|
||||
+Arguments mmap_ext {A B H' _ f g} H s : rename.
|
||||
|
||||
Class MMapLemmas (A B : Type) `{MMap A B} := {
|
||||
mmap_id x : mmap id x = x;
|
||||
@@ -123,6 +123,7 @@ Tactic Notation "msimpl" "in" "*" := (in_all msimplH); msimpl.
|
||||
|
||||
Ltac derive_MMap :=
|
||||
hnf; match goal with [ |- (?A -> ?A) -> ?B -> ?B ] =>
|
||||
+ let map := fresh "map" in
|
||||
intros f; fix map 1; intros xs; change (annot B xs); destruct xs;
|
||||
match goal with
|
||||
| [ |- annot _ ?ys ] =>
|
||||
--
|
||||
2.13.2
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchgit, coq, mathcomp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "coq-autosubst-${coq.coq-version}-${version}";
|
||||
version = "5b40a32e";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://github.com/uds-psl/autosubst.git;
|
||||
rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
|
||||
sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mathcomp ];
|
||||
|
||||
patches = [./0001-changes-to-work-with-Coq-8.6.patch];
|
||||
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.ps.uni-saarland.de/autosubst/;
|
||||
description = "Automation for de Bruijn syntax and substitution in Coq";
|
||||
maintainers = with maintainers; [ jwiegley ];
|
||||
platforms = coq.meta.platforms;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "coq-paco-${coq.coq-version}-${version}";
|
||||
version = "1.2.7";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://plv.mpi-sws.org/paco/paco-${version}.zip";
|
||||
sha256 = "010fs74c0cmb9sz5dmrgzg4pmb2mgwia4gm0g9l7j2fq5xxcschb";
|
||||
sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy";
|
||||
};
|
||||
|
||||
buildInputs = [ coq.ocaml coq.camlp5 unzip ];
|
||||
|
|
|
|||
|
|
@ -198,6 +198,8 @@ self: super: {
|
|||
'';
|
||||
})) pkgs.libcxx;
|
||||
|
||||
inline-java = addBuildDepend super.inline-java pkgs.jdk;
|
||||
|
||||
# tests don't compile for some odd reason
|
||||
jwt = dontCheck super.jwt;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
{ stdenv, fetchurl, hostPlatform }:
|
||||
{ stdenv, lib, fetchurl, hostPlatform }:
|
||||
rec {
|
||||
|
||||
luajit =
|
||||
# Compatibility problems with lightuserdata pointers; see:
|
||||
# https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101
|
||||
if hostPlatform.is64bit && (/*hostPlatform.isArm ||*/ hostPlatform.isSunOS)
|
||||
# FIXME: fix the aarch64 build
|
||||
then luajit_2_0
|
||||
else luajit_2_1;
|
||||
luajit = luajit_2_1;
|
||||
|
||||
luajit_2_0 = generic {
|
||||
version = "2.0.5";
|
||||
isStable = true;
|
||||
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
|
||||
} // {
|
||||
# 64-bit ARM isn't supported upstream
|
||||
meta = meta // {
|
||||
platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
|
||||
};
|
||||
};
|
||||
|
||||
luajit_2_1 = generic {
|
||||
|
|
@ -22,6 +21,14 @@ rec {
|
|||
};
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "High-performance JIT compiler for Lua 5.1";
|
||||
homepage = http://luajit.org;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
|
||||
};
|
||||
|
||||
generic =
|
||||
{ version, sha256 ? null, isStable
|
||||
, name ? "luajit-${version}"
|
||||
|
|
@ -33,7 +40,7 @@ rec {
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit name version src;
|
||||
inherit name version src meta;
|
||||
|
||||
luaversion = "5.1";
|
||||
|
||||
|
|
@ -61,13 +68,5 @@ rec {
|
|||
''
|
||||
ln -s "$out"/bin/luajit-* "$out"/bin/luajit
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "High-performance JIT compiler for Lua 5.1";
|
||||
homepage = http://luajit.org;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -325,17 +325,17 @@ let
|
|||
|
||||
in {
|
||||
php56 = generic {
|
||||
version = "5.6.30";
|
||||
sha256 = "01krq8r9xglq59x376zlg261yikckq179jmhnlcg3gqxza9w41d1";
|
||||
version = "5.6.31";
|
||||
sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg";
|
||||
};
|
||||
|
||||
php70 = generic {
|
||||
version = "7.0.19";
|
||||
sha256 = "0nbxgx5fkj1bcach97a3169kwic7jbd4b435n7v25v1aq2pw0fhg";
|
||||
version = "7.0.21";
|
||||
sha256 = "07r3qqyyvf16k4xk5b2070fwilggmph5937drjm8cvyyjb1k789b";
|
||||
};
|
||||
|
||||
php71 = generic {
|
||||
version = "7.1.5";
|
||||
sha256 = "15w60nrickdi0rlsy5yw6aa1j42m6z2chv90f7fbgn0v9xwa9si8";
|
||||
version = "7.1.7";
|
||||
sha256 = "1y0z5n0kyd15wzmn1lprjgaysbg0z428q9cjbx4dqf3zk296g6q7";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, boost, openssl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "asio-1.10.6";
|
||||
name = "asio-1.10.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/asio/${name}.tar.bz2";
|
||||
sha256 = "0phr6zq8z78dwhhzs3h27q32mcv1ffg2gyq880rw3xmilx01rmz0";
|
||||
sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ boost ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libargon2-${version}";
|
||||
version = "20161029";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "P-H-C";
|
||||
repo = "phc-winner-argon2";
|
||||
rev = "${version}";
|
||||
sha256 = "021g8wi4g67ywm8zf3yncqwrmfz7ypgm1ih9wcmnxip5n75rymh5";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \
|
||||
--replace @UPSTREAM_VER@ "${version}" \
|
||||
--replace @HOST_MULTIARCH@ "" \
|
||||
--replace 'prefix=/usr' "prefix=$out"
|
||||
|
||||
make install PREFIX=$out
|
||||
ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015";
|
||||
longDescription = ''
|
||||
A password-hashing function created by by Alex Biryukov, Daniel Dinu, and
|
||||
Dmitry Khovratovich. Argon2 was declared the winner of the Password
|
||||
Hashing Competition (PHC). There were 24 submissions and 9 finalists.
|
||||
Catena, Lyra2, Makwa and yescrypt were given special recognition. The PHC
|
||||
recommends using Argon2 rather than legacy algorithms.
|
||||
'';
|
||||
homepage = https://www.argon2.com/;
|
||||
license = with licenses; [ asl20 cc0 ];
|
||||
maintainers = with maintainers; [ taeer olynch ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -27,11 +27,11 @@ in
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libwebp-${version}";
|
||||
version = "0.4.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
|
||||
sha256 = "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg";
|
||||
sha256 = "0h1brwkyxc7lb8lc53aacdks5vc1y9hzngqi41gg7y6l56912a69";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } :
|
||||
{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } :
|
||||
|
||||
{ name, version ? "113.33.03", buildInputs ? [],
|
||||
hash ? "",
|
||||
|
|
@ -14,7 +14,7 @@ buildOcaml (args // {
|
|||
|
||||
hasSharedObjects = true;
|
||||
|
||||
buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs;
|
||||
buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs;
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}:
|
||||
{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opam }:
|
||||
|
||||
buildOcaml rec {
|
||||
name = "js-build-tools";
|
||||
|
|
@ -13,7 +13,7 @@ buildOcaml rec {
|
|||
|
||||
hasSharedObjects = true;
|
||||
|
||||
buildInputs = [ ocaml_oasis_46 opam ];
|
||||
buildInputs = [ ocaml_oasis opam ];
|
||||
|
||||
dontAddPrefix = true;
|
||||
configurePhase = "./configure --prefix $prefix";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }:
|
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||
then throw "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
|
||||
version = "0.7";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchFromGitHub, ocaml, findlib }:
|
||||
|
||||
let version = "1.1"; in
|
||||
let version = "1.2"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-result-${version}";
|
||||
name = "ocaml${ocaml.version}-result-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "result";
|
||||
rev = "${version}";
|
||||
sha256 = "05y07rxdbkaxsc8cy458y00gq05i8gp35hhwg1b757mam21ccxxz";
|
||||
sha256 = "1jwzpcmxwgkfsbjz9zl59v12hf1vv4r9kiifancn9p8gm206g3g0";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }:
|
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.01"
|
||||
then throw "topkg is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-topkg-${version}";
|
||||
version = "0.8.1";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
{ stdenv,
|
||||
cmake,
|
||||
elfutils,
|
||||
extra-cmake-modules,
|
||||
fetchFromGitHub,
|
||||
kconfigwidgets,
|
||||
ki18n,
|
||||
kitemmodels,
|
||||
kitemviews,
|
||||
libelf,
|
||||
qtbase,
|
||||
threadweaver,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hotspot-${version}";
|
||||
version = "1.0.0"; # don't forget to bump `rev` below when you change this
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDAB";
|
||||
repo = "hotspot";
|
||||
# TODO: For some reason, `fetchSubmodules` doesn't work when using `rev = "v${version}";`,
|
||||
# so using an explicit commit instead. See #15559
|
||||
rev = "352687bf620529e9887616651f123f922cb421a4";
|
||||
sha256 = "09ly15yafpk31p3w7h2xixf1xdmx803w9fyb2aq7mhmc7pcxqjsx";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
elfutils
|
||||
extra-cmake-modules
|
||||
kconfigwidgets
|
||||
ki18n
|
||||
kitemmodels
|
||||
kitemviews
|
||||
libelf
|
||||
qtbase
|
||||
threadweaver
|
||||
];
|
||||
|
||||
# hotspot checks for the presence of third party libraries'
|
||||
# git directory to give a nice warning when you forgot to clone
|
||||
# submodules; but Nix clones them and removes .git (for reproducibility).
|
||||
# So we need to fake their existence here.
|
||||
postPatch = ''
|
||||
mkdir -p 3rdparty/perfparser/.git
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A GUI for Linux perf";
|
||||
longDescription = ''
|
||||
hotspot is a GUI replacement for `perf report`.
|
||||
It takes a perf.data file, parses and evaluates its contents and
|
||||
then displays the result in a graphical way.
|
||||
'';
|
||||
homepage = "https://github.com/KDAB/hotspot";
|
||||
license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ nh2 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, buildGoPackage, go, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "linuxkit-${version}";
|
||||
version = "2017-07-08";
|
||||
rev = "8ca19a84d5281b1b15c7a48c21e5786943b47f1c";
|
||||
|
||||
goPackagePath = "github.com/linuxkit/linuxkit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxkit";
|
||||
repo = "linuxkit";
|
||||
inherit rev;
|
||||
sha256 = "150y7hnjhi81iik7np27y5466ldaackq72mpi7vmybbl7vr1wgw4";
|
||||
};
|
||||
|
||||
subPackages = [ "src/cmd/linuxkit" ];
|
||||
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A toolkit for building secure, portable and lean operating systems for containers";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = https://github.com/linuxkit/linuxkit;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildGoPackage, go, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "moby-${version}";
|
||||
version = "2017-07-06";
|
||||
rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40";
|
||||
|
||||
goPackagePath = "github.com/moby/tool";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "tool";
|
||||
inherit rev;
|
||||
sha256 = "0xhasm69g5gwihcm8g7rff9nkx7iffvd642bknky6j3w133gs5lp";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Assembly tool for the Moby project, an open framework to assemble specialized container systems without reinventing the wheel";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = https://mobyproject.org;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4
|
||||
, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-oasis-0.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz;
|
||||
sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k";
|
||||
};
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ ocaml_data_notation ];
|
||||
|
||||
configurePhase = "ocaml setup.ml -configure --prefix $out";
|
||||
buildPhase = "ocaml setup.ml -build";
|
||||
installPhase = "ocaml setup.ml -install";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://oasis.forge.ocamlcore.org/;
|
||||
description = "Configure, build and install system for OCaml projects";
|
||||
license = licenses.lgpl21;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
maintainers = with maintainers; [
|
||||
vbgl z77z
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,14 +3,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.7";
|
||||
version = "0.4.10";
|
||||
name = "ocaml-oasis-${version}";
|
||||
|
||||
# You must manually update the url, not just the version. OCamlforge keys off
|
||||
# the number after download.php, not the filename.
|
||||
src = fetchurl {
|
||||
url = "http://forge.ocamlcore.org/frs/download.php/1635/oasis-${version}.tar.gz";
|
||||
sha256 = "13crvqiy0hhlnm4qfyxq2jjvs11ldxf15c4g9q91k1x3wj04pg2l";
|
||||
url = https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz;
|
||||
sha256 = "13ah03pbcvrjv5lmx971hvkm9rvbvimska5wmjfvgvd20ca0gn8w";
|
||||
};
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
|
|
|||
|
|
@ -32,15 +32,15 @@ in rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
|
||||
sha256 = "0ygiaayi2mv6jl450d03i4x2gd2bg3mwk3s2pxas87g8sbzzg3a8";
|
||||
sha256 = "0g6cwjyqwc660w33453aklh3hpc0b8rrb88dryn23ah6wannvagg";
|
||||
inherit (stable) mono gecko32 gecko64;
|
||||
};
|
||||
|
||||
staging = fetchFromGitHub rec {
|
||||
inherit (unstable) version;
|
||||
sha256 = "1i7lzr8w9w9hfa5djclp5n19plfgff6p1yhrs94a62jspf6c10sw";
|
||||
sha256 = "0crv7hl39as0pjbi8ldws611izccdnss4hca4pgbz5cc80bki9gw";
|
||||
owner = "wine-compholio";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gtk-engine-bluecurve-1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2";
|
||||
sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
buildInputs = [ gtk2 ];
|
||||
|
||||
meta = {
|
||||
description = "Original Bluecurve engine from Red Hat's artwork package";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.gnidorah ];
|
||||
};
|
||||
}
|
||||
|
|
@ -169,22 +169,22 @@ rec {
|
|||
};
|
||||
|
||||
Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Supertab-2016-11-27";
|
||||
name = "Supertab-2017-06-20";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/ervandew/supertab";
|
||||
rev = "cdaa5c27c5a7f8b08a43d0b2e65929512299e33a";
|
||||
sha256 = "0hym28chljfglqdrxajbh92r35cppxl5wyxdrgqwpa0am9d2xdvg";
|
||||
rev = "22aac5c2cb6a8ebe906bf1495eb727717390e62e";
|
||||
sha256 = "1m70rx9ba2aqydfr9yxsrff61qyzmnda24qkgn666ypnsai7cfbn";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Syntastic-2017-05-30";
|
||||
name = "Syntastic-2017-07-07";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/syntastic";
|
||||
rev = "159900a1a2d3db2c4d3757f1085f377c6e59ac02";
|
||||
sha256 = "1bq3di4kr855sma0qp6gyrrphy23hy2mn9ws5knnzicxmq5fixqb";
|
||||
rev = "e1161a723a353db99780f9a9351340df7abbb106";
|
||||
sha256 = "00gvx33yz199n7lynli0fb8cf58lb5cs0jxrqggjjy261xv2lcq1";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -202,11 +202,11 @@ rec {
|
|||
};
|
||||
|
||||
Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Tagbar-2017-06-05";
|
||||
name = "Tagbar-2017-06-15";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/majutsushi/tagbar";
|
||||
rev = "87a1263f5d8b3623bee5e6036254480e668b5f74";
|
||||
sha256 = "1s6727vwrcikv9dmkl6s1c2r2r107p733j8sjjxshl68bi62ms8z";
|
||||
rev = "f5792732de16b8a2cc202f920e363eb413d7241d";
|
||||
sha256 = "188xdmrp2g7bfzg95pv1qa2l17sqwy1g2p4syj7546fksddmwgms";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -224,22 +224,22 @@ rec {
|
|||
};
|
||||
|
||||
The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "The_NERD_tree-2017-06-05";
|
||||
name = "The_NERD_tree-2017-06-30";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/nerdtree";
|
||||
rev = "a9ab90198be0581fe961125bba3f282a666ef7ff";
|
||||
sha256 = "0qf2xjr2hyz08xalgv6yjr5rrrcxgv76sshr7d62sygg6qfsnbgw";
|
||||
rev = "2e43ad074bb3b7fafc77b9eea5098047d6fe6e90";
|
||||
sha256 = "1mbj0qcjmrc4n0p9i96rm29qpi5j1shp69iv5kcv8sxiqgfrlqlm";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "UltiSnips-2017-01-20";
|
||||
name = "UltiSnips-2017-06-30";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/SirVer/ultisnips";
|
||||
rev = "5352d98f212e273b3e8b1d84efdbe2d6a6d557e9";
|
||||
sha256 = "0d27823qnfd9qcj2a2x77slsw725jfa9s40ilw4qp9ab03bma1ci";
|
||||
rev = "423f264e753cec260b4f14455126e6db7ba429af";
|
||||
sha256 = "19g3k0nqzizv39rxwgkca9n2gsd19z2wwsmicr0zcgnf50nhkznh";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -408,11 +408,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-autoformat-2017-06-02";
|
||||
name = "vim-autoformat-2017-06-26";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Chiel92/vim-autoformat";
|
||||
rev = "41d1c14de27f76f400c51d45b1617319266d9f4a";
|
||||
sha256 = "0myhs5fjq9lr0ag49scdhchsifhc7djmyrx88nhsing33l4nbjzk";
|
||||
rev = "ad189cdde5a50699a1d6b2b4b669e73942e47710";
|
||||
sha256 = "0jk1qigvz2xkpr13ii0pg0nszrnzwn51gckxjvgaqwbsz967ccsj";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -441,11 +441,11 @@ rec {
|
|||
};
|
||||
|
||||
deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "deoplete-nvim-2017-06-06";
|
||||
name = "deoplete-nvim-2017-07-05";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Shougo/deoplete.nvim";
|
||||
rev = "8bd63b7e4f9bb3cf2040724dd71cff195564166a";
|
||||
sha256 = "1jf6l5li7m4m2ijfndqgm95mpw9c188vfbsggnzp2ivcxc7bd8bv";
|
||||
rev = "376b0c9bbdd30e51a253319ff63762165f30d41a";
|
||||
sha256 = "0r6bwwsl9r40nv02hca1h00wgakmrjqzamz3whf7xnb0vx9p29n9";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -474,11 +474,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-closetag-2017-05-13";
|
||||
name = "vim-closetag-2017-07-04";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/alvan/vim-closetag";
|
||||
rev = "52a0747c9e1a52b1aedcace4801657d63462718f";
|
||||
sha256 = "0499cmyq7hs9b5rcnw1xd2w56xyw73qw9v5iqx3c7nsjka46ffys";
|
||||
rev = "e15684e10eb456399fc496467cc9ece1e18a7ec8";
|
||||
sha256 = "1rs1dlnn5syxny3qrgggyz8rc6anr8gkhkn19i72nmrvcbb40w0k";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -496,11 +496,11 @@ rec {
|
|||
};
|
||||
|
||||
clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "clighter8-2017-06-10";
|
||||
name = "clighter8-2017-07-08";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/bbchung/clighter8";
|
||||
rev = "c83091b35c0d09cee0d6850c91824f72a0d8c513";
|
||||
sha256 = "105a4c753n57svyz8abs5w0v2747pyfly7dzjyh6i5yraaq2g7bx";
|
||||
rev = "83ebf9e3961fcf1a4ccc557ab5f8c55cb813bc3b";
|
||||
sha256 = "0rv16fbg0ga5csk9p2zczh100i55j1h70s0rcvdbgzfmbbmgsda7";
|
||||
};
|
||||
dependencies = [];
|
||||
preFixup = ''
|
||||
|
|
@ -510,11 +510,11 @@ rec {
|
|||
};
|
||||
|
||||
neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neomake-2017-06-10";
|
||||
name = "neomake-2017-07-07";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/benekastah/neomake";
|
||||
rev = "cc916f35fa3d131b2d6529d0e47bde141d99b7c3";
|
||||
sha256 = "00kz9ny3z4j6nhgzxarj8d072k6sf4qiwgfj4ckmllq5fyb2ik4l";
|
||||
rev = "79c7dba684e3b179d7416d84fc86fac38f8190fe";
|
||||
sha256 = "039b76n7d2nbbzrd83y4j8g103dvnrmk1pa84is5r5qv33hdpc0x";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -554,11 +554,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-tmux-navigator-2017-06-01";
|
||||
name = "vim-tmux-navigator-2017-06-20";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/christoomey/vim-tmux-navigator";
|
||||
rev = "b93e176b7150942d9f0556347d1c8f6d0b690124";
|
||||
sha256 = "1xjvx4svv1kdqmv114ghx7cfrb5kmbljlwac8bsw36rq3kyknwrn";
|
||||
rev = "3e83ddc509c66ac86b0c2961613076f74f34a2b6";
|
||||
sha256 = "0zp81qkaahcl85s60cphqh7rsw3hpvnlr98p5lwzp5dsbxxh0iby";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -576,11 +576,11 @@ rec {
|
|||
};
|
||||
|
||||
ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "ctrlp-vim-2017-06-04";
|
||||
name = "ctrlp-vim-2017-07-04";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ctrlpvim/ctrlp.vim";
|
||||
rev = "019f20a6f280b875b3812ea4d03a4cf1647cd0d9";
|
||||
sha256 = "1zyl140ykjc1g7kc306f03q7xcxjzx757hphdgcb63ksql2k1f33";
|
||||
rev = "b9b334b7ee07f03bbbc46193bb544124bd430148";
|
||||
sha256 = "1pzhffbbmw45x6izdhyi7zp6wy2x2r93g6jz03fdj0qmja0wk1b4";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -642,11 +642,11 @@ rec {
|
|||
};
|
||||
|
||||
neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neco-ghc-2017-04-30";
|
||||
name = "neco-ghc-2017-06-17";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/eagletmt/neco-ghc";
|
||||
rev = "aeb84b9ef05d1c5b0c835365ddcd424930fb0cd2";
|
||||
sha256 = "1yhdrjqw5chq7jgk397swh4axpv6m4aqracyqmx4bb65pzqbwdxl";
|
||||
rev = "ea515ae60a0523539fe75680f07aa2a588de9a99";
|
||||
sha256 = "1pj5a5v3x8vnkck60kc25ph9b5xx0d8ipa4f4llxpc0q8d2xzk6w";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -697,11 +697,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-localvimrc-2017-03-30";
|
||||
name = "vim-localvimrc-2017-07-06";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/embear/vim-localvimrc";
|
||||
rev = "f2c576cda5a4dfd7a1030564c602dd6ab8589732";
|
||||
sha256 = "10wvglf8dygai0094bwwcilffms0m3y36h2sb46iaqw8yz00d78b";
|
||||
rev = "48c01c214ea0312e8045aaa1a28b30850e98a194";
|
||||
sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -719,11 +719,11 @@ rec {
|
|||
};
|
||||
|
||||
ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "ensime-vim-2017-04-06";
|
||||
name = "ensime-vim-2017-07-06";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ensime/ensime-vim";
|
||||
rev = "4fd7886b169388e07261c525826c0e453094e446";
|
||||
sha256 = "194qwj3glw3l9yxvd26vn10kl06v1sykqx2cznskqa3vj3z8jb01";
|
||||
rev = "a8a2f024283af8e0b69165960ba59d850d1b80a4";
|
||||
sha256 = "0vn7iv05jil7j1k4wgnnb9b1b4yqlxjkqmmz8a71291qg17bs5c8";
|
||||
};
|
||||
dependencies = ["vimproc" "vimshell" "self" "forms"];
|
||||
pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
|
||||
|
|
@ -741,11 +741,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-go-2017-06-10";
|
||||
name = "vim-go-2017-07-06";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/fatih/vim-go";
|
||||
rev = "7b93bae4b08091c4d6243dafc2e040a84ea91d1d";
|
||||
sha256 = "0hrzgxlkqvlh45pvli2aqnzx58vyjhmcz6rr28cm7x8b0wf20r00";
|
||||
rev = "f08fcab5c51bee18174340405b773a950446e9f5";
|
||||
sha256 = "1hsfaca9mhp7829b6kl7bmrwm03kjjhz9grmjzgr7v3arlpcv9sa";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -774,11 +774,11 @@ rec {
|
|||
};
|
||||
|
||||
psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "psc-ide-vim-2017-06-10";
|
||||
name = "psc-ide-vim-2017-07-05";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/frigoeu/psc-ide-vim";
|
||||
rev = "f5fc6aadf805ec0186efc63cbf294f251c1b2056";
|
||||
sha256 = "0syrvkbbrcxmss07sppgsg43j241fm6yqj8ii54fm51vss02qxp8";
|
||||
rev = "22813d6222766d773e77fadf36ee5eed4162ece4";
|
||||
sha256 = "0261nkzj7412f55l6yxsr9xh2ynvnm5zb6ciasj809ynqapqvx2i";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -829,11 +829,11 @@ rec {
|
|||
};
|
||||
|
||||
calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "calendar-vim-2017-05-28";
|
||||
name = "calendar-vim-2017-07-02";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/itchyny/calendar.vim";
|
||||
rev = "12c06ba87f32002b3c9f34fe881bcbaf3ab1721b";
|
||||
sha256 = "02ss39227c8jfn95hqwwpgn1rvrgwib8h5h0j9rvl6x491jj98wg";
|
||||
rev = "1b4bff01dbcf81e9415c4181e702762f2c4f5638";
|
||||
sha256 = "0lsyy7xn460sawpki2svc29b2dm7n6vi0r22jm4djk7n5y9y4xj4";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -917,22 +917,22 @@ rec {
|
|||
};
|
||||
|
||||
auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "auto-pairs-2017-03-22";
|
||||
name = "auto-pairs-2017-07-03";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/jiangmiao/auto-pairs";
|
||||
rev = "20ec5b043f82ffa11a079f545438e6544ef112ed";
|
||||
sha256 = "14pypb2kfrylhn73gx964hls040zaqnpl1am6f0yi01h524xz0xf";
|
||||
rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda";
|
||||
sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-nerdtree-tabs-2017-02-22";
|
||||
name = "vim-nerdtree-tabs-2017-07-04";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/jistr/vim-nerdtree-tabs";
|
||||
rev = "01ae3cdc7018fa33f140cce3e7cdf210c04ffbab";
|
||||
sha256 = "01z2xp95sqi5mxhdxm8q0zkx83rn16qbv884rj2irmbl1k8fhv62";
|
||||
rev = "47bbe5afc26f701f08d31b2bbdb660f117367ded";
|
||||
sha256 = "0a1gqdvmpa4gylnb7sxs6zr89i60fl16p477200x18hgh2zd2v02";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -972,11 +972,11 @@ rec {
|
|||
};
|
||||
|
||||
fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "fzf-vim-2017-06-10";
|
||||
name = "fzf-vim-2017-07-01";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/junegunn/fzf.vim";
|
||||
rev = "cf60e546476f73514a326416916b6a98f88d8abd";
|
||||
sha256 = "11cls65zfv9gzz8qmg44q0i03hmwhqb8i53lb42vdz2bzicdasv3";
|
||||
rev = "55f6bc83677235a7f6ffc35496ecae2e2a764417";
|
||||
sha256 = "0yir125q9cgpk5b07ns9rg0s8f65g7jfka1jq9ir02w47090kgnb";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1049,11 +1049,11 @@ rec {
|
|||
};
|
||||
|
||||
vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vimtex-2017-06-09";
|
||||
name = "vimtex-2017-07-06";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/lervag/vimtex";
|
||||
rev = "0ae4e776cb78ce0c18635fecd6f518e3f40e5f80";
|
||||
sha256 = "1iz87nr89wamxpg4whfqdfhp6qmfff6jjp58sjzh5q32lzzmi48s";
|
||||
rev = "b31b49f0dca7c7acff9b7256315c3dc3bcedac98";
|
||||
sha256 = "1qbhypswa2pa61ksyqp987q9413wvwkhj0avcbvli2n3hn8scz5f";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1118,12 +1118,23 @@ rec {
|
|||
|
||||
};
|
||||
|
||||
Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Jenkinsfile-vim-syntax-2017-05-16";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/martinda/Jenkinsfile-vim-syntax";
|
||||
rev = "d3ad4bc4888740c524bfa2f8b3192cfb23ddec3f";
|
||||
sha256 = "1sw1rwxspa94aak9gq6i1z47cqhkm2nbbj8xlkzbk3c04mqljksf";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-startify-2017-06-05";
|
||||
name = "vim-startify-2017-06-15";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mhinz/vim-startify";
|
||||
rev = "53c53b24440d14d7886484ad662549fc78550c40";
|
||||
sha256 = "1w3kxvydnd7rh2fp3ra677dw11rsnmnm9bav92j3dkkb5afhmj3v";
|
||||
rev = "7f910ed4367de96310fedc98d5a12b97173a405f";
|
||||
sha256 = "1l5q8mqqp6gzmxqm5i0lx6lbm181vmkcg8w24ypa77vnid0ihd93";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1174,11 +1185,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-indent-guides-2016-04-17";
|
||||
name = "vim-indent-guides-2017-07-03";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/nathanaelkane/vim-indent-guides";
|
||||
rev = "018298ead9d3aa9cd3b4ae222f81022a33978b09";
|
||||
sha256 = "0zyrs9r3vza2kqhqir6qpkygy6yljpn877bvycspv89ljzczmwrs";
|
||||
rev = "b40687195c01caf40f62d20093296590b48e3a75";
|
||||
sha256 = "17hc3bdb707lkg0kyac2czjjijdrzarnh6sr78s9rqpwrj3fj4i4";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1240,11 +1251,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-watchdogs-2017-05-08";
|
||||
name = "vim-watchdogs-2017-06-23";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/osyo-manga/vim-watchdogs";
|
||||
rev = "fcf1b1bacba95ac9739adb3851c3595136c96d0e";
|
||||
sha256 = "11qldi4p34x8y974ajvv88pw2wjxsrlpx03n846nyhqridgpfsj9";
|
||||
rev = "22a08dcd33223ddbe95c977ca72e77d62d2c75d9";
|
||||
sha256 = "0d3i39cz5kpps2gxlbz2l73bz0rs67lhh6qrpzl3a2p014hixbyi";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1262,11 +1273,11 @@ rec {
|
|||
};
|
||||
|
||||
python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "python-mode-2017-06-09";
|
||||
name = "python-mode-2017-07-04";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/python-mode/python-mode";
|
||||
rev = "4c426b98c2f9094f44bdbe02f43e44badfa61724";
|
||||
sha256 = "0lpd5k2j22r5wx5x5wh97mdsfyspfxf23kh241l7zbfm573r4jy0";
|
||||
rev = "d2dead6ce9d900b26dbf1a06c52969f4194eda64";
|
||||
sha256 = "1iq26a2l9maapz3433pwywmqla4wf7jass7s7bh32h10m2fh88a0";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1295,22 +1306,22 @@ rec {
|
|||
};
|
||||
|
||||
vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-grammarous-2017-05-07";
|
||||
name = "vim-grammarous-2017-07-02";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/rhysd/vim-grammarous";
|
||||
rev = "607fc41ebd8dcd1fb00eecde52a3c9e4fbab3c64";
|
||||
sha256 = "0pv9747lkmhwxcdrhbnd28rh6rsslzrf9yqlznhjxqa6z9in81ca";
|
||||
rev = "d117cd139b58319d8ac94f2fd36ee548b6ea1e88";
|
||||
sha256 = "0a5a65j9a3s54z9asjmfbqsvawx014bq772jqgpsxww53lap3s5x";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-puppet-2017-04-06";
|
||||
name = "vim-puppet-2017-07-02";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/rodjek/vim-puppet";
|
||||
rev = "cce0312adcaa15c462aba89057565520c1928685";
|
||||
sha256 = "1cmgmrn534ycw0jc1m8fsrw7qjis2529bvb1jiv5jqqdyff3bw2f";
|
||||
rev = "cb1863af2ba4de9fb1c1d952d82692502348fb92";
|
||||
sha256 = "0a3q6f8jplxbvpjaz9vnh589al64vg567nc00xabp46vcm83nk4x";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1328,33 +1339,33 @@ rec {
|
|||
};
|
||||
|
||||
neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neoformat-2017-06-09";
|
||||
name = "neoformat-2017-07-06";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sbdchd/neoformat";
|
||||
rev = "a52b155f6cc2f401afb04f865b2198d47b393ddd";
|
||||
sha256 = "1a0j1k3bm9mp9d622m4kh5n9r2q4330kd0n3n9n60kmy3bnpa5w1";
|
||||
rev = "0a4904771ee0df76f01146bdcbac5dde4f5a61af";
|
||||
sha256 = "09i4ngih8cd3613mhsz0bbpwppbwsx723k7xx9ha6ybnfrmhx1ra";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "deoplete-rust-2017-05-30";
|
||||
name = "deoplete-rust-2017-06-28";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sebastianmarkow/deoplete-rust";
|
||||
rev = "5447ee448d3d63cda4681e6309b1c18c493e1cd1";
|
||||
sha256 = "1dr95vnp11zzia7vnwdhhrmkslnak77nps4zr447f34lxk185v5d";
|
||||
rev = "505735576e29d30fee5074a9a49fdeb989c632b2";
|
||||
sha256 = "0nqvk7f7asbfcfiv2lw3hinsaln648xc8k5jd630q0p4gyyxqpdm";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-polyglot-2017-05-17";
|
||||
name = "vim-polyglot-2017-06-12";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sheerun/vim-polyglot";
|
||||
rev = "d5b9c4ae84aaa98bdfbf15cba90eeafa5aded091";
|
||||
sha256 = "17crapp8l2d77cpw6ac4a2y3q7ipi11in2jz2169m78y643gbz42";
|
||||
rev = "8eab5f5403afc1c33a7593459a27f7ff625fa60b";
|
||||
sha256 = "0q2xfmqk5iad6gv8zzlpcv48xpv7lwr6mswc7mdllzkgaqilz75g";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1372,44 +1383,44 @@ rec {
|
|||
};
|
||||
|
||||
neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neocomplete-vim-2017-05-27";
|
||||
name = "neocomplete-vim-2017-06-24";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/shougo/neocomplete.vim";
|
||||
rev = "4fd73faa262f5e3063422d9fc244c65f1b758cf3";
|
||||
sha256 = "0hl5incxkxb491vnf3j2hndv4x31ic6dgj7wqka1bfqjcl53wjfl";
|
||||
rev = "186881fc40d9b774766a81189af17826d27406c2";
|
||||
sha256 = "0x9fmvliwxm49q8970byaqrnrffcxjf29z0y7xsfi56sv277lpl5";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neosnippet-snippets-2017-06-11";
|
||||
name = "neosnippet-snippets-2017-07-05";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/shougo/neosnippet-snippets";
|
||||
rev = "0507e9c200a904a21fa5d15ee66a1ea9fe07bb01";
|
||||
sha256 = "1rc67yqfhzqxq15sl258kdwgk8r55w470s0vcd1ax2h8yd4s7sc7";
|
||||
rev = "b89c544264912b064c79da2a90fc5d4e69d621b2";
|
||||
sha256 = "1cqgagzxl559mf06kkggdm90g27is0x80qqrrha09ng16hf6qf7a";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neosnippet-vim-2017-06-11";
|
||||
name = "neosnippet-vim-2017-06-24";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/shougo/neosnippet.vim";
|
||||
rev = "6f87e27d4e20ea8b71821df06f71818716a13cf3";
|
||||
sha256 = "0wfbicqblz91w5rzndy8zirzf819abmjv1az8yd26q1bbh3j0jpb";
|
||||
rev = "867149c56651f0958bfde1f56e203f90afba134d";
|
||||
sha256 = "19cwpans16ahmmnjfqxz5x3zw89qn93c9sc80sscw76i4ih4skml";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "unite-vim-2017-05-27";
|
||||
name = "unite-vim-2017-07-01";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/shougo/unite.vim";
|
||||
rev = "ada33d888934d8a9e60aa8ff828b651aaedb6457";
|
||||
sha256 = "0f4vnp3avpy7ns5ndr29ibff9d8hazji95y6m5idvziswywzpwsy";
|
||||
rev = "ad15f96365b5cb43a45d0ca779df6a497f954f15";
|
||||
sha256 = "0pigwfwyas4zdzrazk08p9bnbmi51np4gb0mf5dy434glw9rrvjz";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1522,11 +1533,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-dispatch-2017-06-06";
|
||||
name = "vim-dispatch-2017-06-23";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/tpope/vim-dispatch";
|
||||
rev = "1beee74e5ae75c46fd3f1255cce2543769102dc0";
|
||||
sha256 = "0jvcxr22i3yqcfvshl97939kki9ng9mvmf79qph3y9x2h0fhzikm";
|
||||
rev = "ca10dc106a5a3684573a3841560b167f4b86fde1";
|
||||
sha256 = "1ad98k08i5zcyggjxcxygr4j513fg43di99gqg1jbi8xvyhgha69";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1577,22 +1588,22 @@ rec {
|
|||
};
|
||||
|
||||
vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-haskellconceal-2014-10-28";
|
||||
name = "vim-haskellconceal-2017-06-15";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/twinside/vim-haskellconceal";
|
||||
rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9";
|
||||
sha256 = "1a1v0m3qj0gian3mp5xynf2ghscr3xaid37b0wi38bb4f2qrigqy";
|
||||
rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
|
||||
sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "youcompleteme-2017-06-05";
|
||||
name = "youcompleteme-2017-07-07";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/valloric/youcompleteme";
|
||||
rev = "b20809332c3298cb954cff20006cb52955b54b2d";
|
||||
sha256 = "19a9lyc2xx1qp39dgyyi74bnslh6vhdi4y55b61li07b5qa4sh20";
|
||||
rev = "d299f9eb708ec83713f904dbb49c4260b6b22240";
|
||||
sha256 = "0g2spq5c9sps0zql8pg0xbnxbcqn0aacy96jd1ixxh6dg9gijkp0";
|
||||
};
|
||||
dependencies = [];
|
||||
buildPhase = ''
|
||||
|
|
@ -1614,11 +1625,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-airline-themes-2017-05-24";
|
||||
name = "vim-airline-themes-2017-06-24";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/vim-airline/vim-airline-themes";
|
||||
rev = "43fe3927b884dcf722f9109e39801db110186dab";
|
||||
sha256 = "1rl4im3pllkfvc5z3shmwblzvp4s3lri3clzpirzqmywa027d0p8";
|
||||
rev = "7865fd8ba435edd01ff7b59de06a9be73e01950d";
|
||||
sha256 = "0fd4s8y6w5flbrikislcvj2a0jb77rd6gwg207qskxfqncxsbswn";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -1768,22 +1779,22 @@ rec {
|
|||
};
|
||||
|
||||
vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-wakatime-2017-06-08";
|
||||
name = "vim-wakatime-2017-07-03";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/wakatime/vim-wakatime";
|
||||
rev = "a96180dd0e694e9a5dadfb65e4c3465a9184840f";
|
||||
sha256 = "0wf108myrfjslf56xqiwsl2mkaqz7qn5k7ggvcfwmhp91lzl5aan";
|
||||
rev = "0c5368cf01f4d452a05eb5e5569e6fe78dca2657";
|
||||
sha256 = "025d0gz0fs3jb062jp7js11b8vb20zyxa32llqsjkyy4gr8kv53b";
|
||||
};
|
||||
dependencies = [];
|
||||
buildInputs = [ python ];
|
||||
};
|
||||
|
||||
command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "command-t-2017-06-08";
|
||||
name = "command-t-2017-06-23";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/wincent/command-t";
|
||||
rev = "3f0d21a06d9b936bcd79970c1b2301b05dd297bc";
|
||||
sha256 = "15wil973sqfgvix9li15qk49kv9l3rn8zqis2cl71k6xh1xvd9ff";
|
||||
rev = "29f2606a9665058a98b56f2d8062ba614a3f246e";
|
||||
sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn";
|
||||
};
|
||||
dependencies = [];
|
||||
buildInputs = [ perl ruby git ];
|
||||
|
|
@ -1816,6 +1827,17 @@ rec {
|
|||
|
||||
};
|
||||
|
||||
nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "nim-vim-2016-05-19";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/zah/nim.vim";
|
||||
rev = "dcf25798f4a3f75e9538f9915959061edbff97cf";
|
||||
sha256 = "1jaiqkspfz2a4ny130dl0h6x9752flpcwwy0kscrqmlqf5fqiyvm";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "deoplete-go-2017-05-26";
|
||||
src = fetchgit {
|
||||
|
|
@ -1824,7 +1846,7 @@ rec {
|
|||
sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq";
|
||||
};
|
||||
dependencies = [];
|
||||
buildInputs = [ python3 ];
|
||||
buildInputs = [ python3 ];
|
||||
buildPhase = ''
|
||||
pushd ./rplugin/python3/deoplete/ujson
|
||||
python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
|
||||
|
|
@ -2218,11 +2240,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-addon-syntax-checker-2013-07-12";
|
||||
name = "vim-addon-syntax-checker-2017-06-26";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
|
||||
rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77";
|
||||
sha256 = "0gcvb922w4jsi203ygbnij9xhmgc6knj9b3ivw3m0fv5ckk4iw5f";
|
||||
rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344";
|
||||
sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9";
|
||||
};
|
||||
dependencies = ["vim-addon-mw-utils" "tlib"];
|
||||
|
||||
|
|
@ -2251,11 +2273,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-airline-2017-05-08";
|
||||
name = "vim-airline-2017-07-07";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/vim-airline/vim-airline";
|
||||
rev = "466198adc015a9d81e975374d8e206dcf3efd173";
|
||||
sha256 = "1dq47y24dc84dkpgv44jh5n2q5jqm5xvriql81441lbwldyq99ld";
|
||||
rev = "e03afa1733c6296774ca95ef981bd8fd39bb1151";
|
||||
sha256 = "0n8l4al4hicnz1xyhcbyb6iw3fxrjslmxk18zanyqcamhfj94vy3";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -2317,11 +2339,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-latex-live-preview-2016-03-16";
|
||||
name = "vim-latex-live-preview-2017-06-22";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/xuhdev/vim-latex-live-preview";
|
||||
rev = "99501642c1dd3f703ac6301ae13469f4990b7a06";
|
||||
sha256 = "0dkm3v1jqi8aq0jfpa6fdwgbfbwidc32ci1y9vhqb1prs15qrqfl";
|
||||
rev = "becc9d4f1a774e6deb7a96015200de35f1bec1a3";
|
||||
sha256 = "0mqvzk94byiccm7v8kdk0hcbz05k9l69kv3ljg8djbvj5q6zzi2m";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -2339,11 +2361,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-signature-2016-11-20";
|
||||
name = "vim-signature-2017-06-20";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/kshenoy/vim-signature";
|
||||
rev = "7e13913188809c45e14988270213744d1c3bb485";
|
||||
sha256 = "0lcmv8fxj50r1r51379sxdy0ra3s0i1cgyqi4wp2zmpz06c1c2nx";
|
||||
rev = "c6decc68d644a66a34345ea09677469d6e482e1f";
|
||||
sha256 = "1iflyvskimq74hzb6l8mzjv3rh0i15bw9jv5x6arns86q3201l23";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -2361,11 +2383,11 @@ rec {
|
|||
};
|
||||
|
||||
vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-snippets-2017-06-09";
|
||||
name = "vim-snippets-2017-07-07";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/honza/vim-snippets";
|
||||
rev = "d21f43c210ac7b04ec1bcda39f10b03a934a9ae8";
|
||||
sha256 = "1vv7kpin3aqzz47937b5w5q2hcr9gldz0x39i6z3wa3q4x2sg366";
|
||||
rev = "0817950a4fb8ccd48ec38a2b65cf046b597eecb3";
|
||||
sha256 = "0hxd96zl5gjkx5d381yzyrbahwbz3r9dljzn2cxbdbjsb7im6aks";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -2401,14 +2423,15 @@ rec {
|
|||
sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vinegar-2017-05-23";
|
||||
name = "vinegar-2017-06-27";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-vinegar";
|
||||
rev = "9abe956acc14444c0fda75eb98c8e31cf81b4c26";
|
||||
sha256 = "16a85lk20v50krl899w0i9zl6gp7478f4pd6mqz8519d76vbmy99";
|
||||
rev = "c795cb739347cbddeeb288c3c35da9f140a513c9";
|
||||
sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
|
|
@ -2424,4 +2447,5 @@ rec {
|
|||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@
|
|||
"github:luochen1990/rainbow"
|
||||
"github:lyokha/vim-xkbswitch"
|
||||
"github:machakann/vim-highlightedyank"
|
||||
"github:martinda/Jenkinsfile-vim-syntax"
|
||||
"github:mhinz/vim-startify"
|
||||
"github:michaeljsmith/vim-indent-object"
|
||||
"github:mileszs/ack.vim"
|
||||
|
|
@ -101,6 +102,7 @@
|
|||
"github:rhysd/vim-grammarous"
|
||||
"github:rodjek/vim-puppet"
|
||||
"github:rust-lang/rust.vim"
|
||||
"github:sebastianmarkow/deoplete-rust"
|
||||
"github:sbdchd/neoformat"
|
||||
"github:sheerun/vim-polyglot"
|
||||
"github:shougo/neco-vim"
|
||||
|
|
@ -142,6 +144,7 @@
|
|||
"github:wincent/command-t"
|
||||
"github:xolox/vim-easytags"
|
||||
"github:xolox/vim-misc"
|
||||
"github:zah/nim.vim"
|
||||
"github:zchee/deoplete-jedi"
|
||||
"github:zchee/deoplete-go"
|
||||
"goyo"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, osx_private_sdk, stdenv }:
|
||||
{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, CommonCrypto, stdenv }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libsecurity_cdsa_utilities
|
||||
|
|
@ -19,7 +19,7 @@ appleDerivation {
|
|||
for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do
|
||||
substituteInPlace ''$file --replace \
|
||||
'/usr/local/include/CommonCrypto/CommonCryptorSPI.h' \
|
||||
'${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/CommonCrypto/CommonCryptorSPI.h'
|
||||
'${CommonCrypto}/include/CommonCrypto/CommonCryptorSPI.h'
|
||||
done
|
||||
|
||||
substituteInPlace lib/opensshWrap.cpp --replace RSA_DSA_Keys.h RSA_DSA_keys.h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd, osx_private_sdk }:
|
||||
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libsecurity_cdsa_plugin
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
|
||||
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }:
|
||||
appleDerivation {
|
||||
__propagatedImpureHostDeps = [
|
||||
"/System/Library/Frameworks/Security.framework/Security"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, osx_private_sdk, perl }:
|
||||
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, perl }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libsecurity_cdsa_utilities
|
||||
|
|
@ -12,4 +12,4 @@ appleDerivation {
|
|||
preBuild = ''
|
||||
perl lib/generator.pl lib lib/generator.cfg lib lib || exit 1
|
||||
'';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4, osx_private_sdk }:
|
||||
{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4 }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libsecurity_utilities
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ Security, appleDerivation, apple_sdk, cppcheck, libsecurity_cdsa_utilities, libsecurity_utilities, m4, osx_private_sdk }:
|
||||
{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libsecurity_utilities
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
|
||||
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libsecurity_utilities
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain, osx_private_sdk }:
|
||||
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain }:
|
||||
appleDerivation {
|
||||
patchPhase = ''
|
||||
substituteInPlace lib/pkcsoids.h --replace '#error' '#warning'
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, osx_private_sdk, sqlite, stdenv }:
|
||||
{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libauto
|
||||
|
|
@ -16,7 +16,7 @@ appleDerivation {
|
|||
substituteInPlace lib/ccaudit.cpp --replace '<bsm/libbsm.h>' '"bsm/libbsm.h"'
|
||||
substituteInPlace lib/powerwatch.h --replace \
|
||||
'<IOKit/pwr_mgt/IOPMLibPrivate.h>' \
|
||||
'"${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h"'
|
||||
'"${IOKit}/Library/Frameworks/IOKit.framework/Headers/pwr_mgt/IOPMLibPrivate.h"'
|
||||
|
||||
cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib
|
||||
cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
|
||||
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities }:
|
||||
appleDerivation {
|
||||
buildInputs = [
|
||||
libsecurity_cdsa_utilities
|
||||
|
|
@ -20,4 +20,4 @@ appleDerivation {
|
|||
postInstall = ''
|
||||
ln -s ''$out/include/securityd ''$out/include/securityd_client
|
||||
'';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, appleDerivation, dyld, osx_private_sdk }:
|
||||
{ stdenv, appleDerivation }:
|
||||
|
||||
appleDerivation {
|
||||
buildPhase = ":";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
version = "4.12";
|
||||
revision = "b";
|
||||
sha256 = "117n42sw2g40p68plr7b77mq18vibqjv0i4130f1bj6gk0sqn5i6";
|
||||
revision = "d";
|
||||
sha256 = "1glhqk6py8wkv291fh57r4z5hbiymzkhr8cqrh3r97yni2zs6lj4";
|
||||
in
|
||||
|
||||
import ./generic.nix (args // {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "net-tools-1.60_p20120127084908";
|
||||
name = "net-tools-1.60_p20161110235919";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gentoo/distfiles/${name}.tar.xz";
|
||||
sha256 = "408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94";
|
||||
sha256 = "1kbgwkys45kb5wqhchi1kf0sfw93c1cl0hgyw7yhacxzdfxjmdfr";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
|
|
@ -13,7 +13,15 @@ stdenv.mkDerivation rec {
|
|||
cp ${./config.h} config.h
|
||||
'';
|
||||
|
||||
makeFlags = "BASEDIR=$(out) mandir=/share/man";
|
||||
makeFlags = [
|
||||
"BASEDIR=$(out)"
|
||||
"mandir=/share/man"
|
||||
"HAVE_ARP_TOOLS=1"
|
||||
"HAVE_PLIP_TOOLS=1"
|
||||
"HAVE_SERIAL_TOOLS=1"
|
||||
"HAVE_HOSTNAME_TOOLS=1"
|
||||
"HAVE_HOSTNAME_SYMLINKS=1"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://net-tools.sourceforge.net/;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown,
|
|||
which isn't valid on NixOS (and a compatibility link on most other modern
|
||||
distros anyway).
|
||||
|
||||
-- nckx <tobias.geerinckx.rice@gmail.com>
|
||||
-- nckx <github@tobias.gr>
|
||||
--- a/include/pathnames.h
|
||||
+++ b/include/pathnames.h
|
||||
@@ -53,7 +53,7 @@
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
|
|||
let
|
||||
name = "wireguard-${version}";
|
||||
|
||||
version = "0.0.20170629";
|
||||
version = "0.0.20170706";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
|
||||
sha256 = "51c44624f20eaff96780845214f85491c0c7330598633cd180bb2a6547e5d2b2";
|
||||
sha256 = "0cvc2iv1836l6f0c3v3kqn3zqrr80i123f1cz5kilhk5c91vjqsp";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
|
|||
description = "Caching validating DNS resolver, from .cz domain registry";
|
||||
homepage = https://knot-resolver.cz;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
# Platforms using negative pointers for stack won't work ATM due to LuaJIT impl.
|
||||
platforms = filter (p: p != "aarch64-linux") platforms.unix;
|
||||
maintainers = [ maintainers.vcunat /* upstream developer */ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ let
|
|||
};
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
name = "matrix-synapse-${version}";
|
||||
version = "0.21.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mxgpfyh7265kh379hsb53lni43xcq9nffanbxwrg8hp8c79pcg3";
|
||||
sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7";
|
||||
};
|
||||
|
||||
patches = [ ./matrix-synapse.patch ];
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
rm -r {cache,pagecache,tmp,data}/
|
||||
mv doc/ $doc/
|
||||
mkdir -p $doc/share/doc
|
||||
mv doc/ $doc/share/doc/shaarli
|
||||
mkdir $out/
|
||||
cp -R ./* $out
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
|
|||
''; # exposes $WALLABAG_DATA
|
||||
|
||||
installPhase = ''
|
||||
mv docs $doc/
|
||||
mkdir -p $doc/share/doc
|
||||
mv docs $doc/share/doc/wallabag
|
||||
mkdir $out/
|
||||
cp -R * $out/
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "0.3.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-zsh-completions";
|
||||
name = "nix-zsh-completions-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spwhitt";
|
||||
repo = "nix-zsh-completions";
|
||||
rev = "0.3";
|
||||
sha256 = "1vwkd4nppjrvy6xb0vx4z73awrhaah1433dp6h4ghi3cdrrjn7ri";
|
||||
rev = "${version}";
|
||||
sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unionfs-fuse-${version}";
|
||||
version = "1.0";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpodgorny";
|
||||
repo = "unionfs-fuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g2hd6yi6v8iqzmgncg1zi9a7ixy9hsh51rzf6jnmzi79543dihf";
|
||||
sha256 = "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
|
@ -34,10 +34,11 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "FUSE UnionFS implementation";
|
||||
homepage = http://podgorny.cz/moin/UnionFsFuse;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
homepage = https://github.com/rpodgorny/unionfs-fuse;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ with stdenv.lib;
|
|||
buildPythonApplication rec {
|
||||
|
||||
name = "youtube-dl-${version}";
|
||||
version = "2017.06.18";
|
||||
version = "2017.07.09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
|
||||
sha256 = "16az9rwr71hvs2z2xagnk71xqs7si0nb8rkn63r7pfv4rb134ggm";
|
||||
sha256 = "0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
|
||||
{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jnettop-0.13.0";
|
||||
|
|
@ -10,7 +10,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ autoconf libpcap ncurses pkgconfig glib ];
|
||||
|
||||
patches = [ ./no-dns-resolution.patch ];
|
||||
patches = [
|
||||
./no-dns-resolution.patch
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.net/data/main/j/jnettop/0.13.0-1/debian/patches/0001-Use-64-bit-integers-for-byte-totals-support-bigger-u.patch";
|
||||
sha256 = "1b0alc12sj8pzcb66f8xslbqlbsvq28kz34v6jfhbb1q25hyr7jg";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = '' autoconf '';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, pkgconfig
|
||||
{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo
|
||||
, libevent, readline, net_snmp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -16,13 +16,17 @@ stdenv.mkDerivation rec {
|
|||
"--with-snmp"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig removeReferencesTo ];
|
||||
buildInputs = [ libevent readline net_snmp ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
|
||||
preFixup = ''
|
||||
find $out -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments";
|
||||
homepage = "https://vincentbernat.github.io/lldpd/";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, python3Packages }:
|
||||
{ stdenv, fetchurl, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
baseName = "mitmproxy";
|
||||
|
|
@ -12,6 +12,15 @@ python3Packages.buildPythonPackage rec {
|
|||
sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Bump pyopenssl dependency
|
||||
# https://github.com/mitmproxy/mitmproxy/pull/2252
|
||||
(fetchurl {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/mitmproxy/mitmproxy/pull/2252.patch";
|
||||
sha256 = "0s3a6lf0wjnxi1r70qlhh0siaxhk5j2cysnv4xfkji3f2v7hhri4";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
blinker click certifi construct cryptography
|
||||
cssutils editorconfig h2 html2text hyperframe
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnix-0.7";
|
||||
name = "disnix-0.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/svanderburg/disnix/files/842828/disnix-0.7.tar.gz;
|
||||
sha256 = "120iaqpj7zcy94dpizzdxjwf8qb2rfrx5394jghmhc6jy88vdp71";
|
||||
url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.1/disnix-0.7.1.tar.gz;
|
||||
sha256 = "0wxik73bk3hh4xjjj8jcgrwv1722m7cqgpiiwjsgxs346jvhrv2s";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnixos-0.6";
|
||||
name = "disnixos-0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/svanderburg/disnixos/files/842874/disnixos-0.6.tar.gz;
|
||||
sha256 = "0pgqsk8qndn614z02jq3vbxzpx6fmgsm6pr1g0iqz55pzwamw9j7";
|
||||
url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.6.1/disnixos-0.6.1.tar.gz;
|
||||
sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa";
|
||||
};
|
||||
|
||||
buildInputs = [ socat pkgconfig dysnomia disnix getopt ];
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ let
|
|||
in
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pinentry-0.9.7";
|
||||
name = "pinentry-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/pinentry/${name}.tar.bz2";
|
||||
sha256 = "1cp7wjqr6nx31mdclr61s2h84ijqjl0ph99kgj4vyawpjj1j1633";
|
||||
sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn";
|
||||
};
|
||||
|
||||
buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ];
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ perlPackages.buildPerlPackage rec {
|
|||
mkdir -p "$bin/bin"
|
||||
ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats"
|
||||
|
||||
mkdir -p "$doc/share/"
|
||||
mkdir -p "$doc/share/doc"
|
||||
mv README.md docs/
|
||||
mv docs "$doc/share/awstats"
|
||||
mv docs "$doc/share/doc/awstats"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
|
|||
mv man"/"*.$i $man/share/man/man$i
|
||||
done
|
||||
|
||||
mkdir -p $doc/share/socklog/html
|
||||
mv doc"/"*.html $doc/share/socklog/html/
|
||||
mkdir -p $doc/share/doc/socklog/html
|
||||
mv doc/*.html $doc/share/doc/socklog/html/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1346,7 +1346,7 @@ with pkgs;
|
|||
|
||||
unifdef = callPackage ../development/tools/misc/unifdef { };
|
||||
|
||||
"unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
|
||||
unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
|
||||
|
||||
usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
|
||||
usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { };
|
||||
|
|
@ -2430,6 +2430,8 @@ with pkgs;
|
|||
|
||||
host = bind.host;
|
||||
|
||||
hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { };
|
||||
|
||||
hping = callPackage ../tools/networking/hping { };
|
||||
|
||||
htpdate = callPackage ../tools/networking/htpdate { };
|
||||
|
|
@ -3257,6 +3259,8 @@ with pkgs;
|
|||
|
||||
ndjbdns = callPackage ../tools/networking/ndjbdns { };
|
||||
|
||||
ndppd = callPackage ../applications/networking/ndppd { };
|
||||
|
||||
neofetch = callPackage ../tools/misc/neofetch { };
|
||||
|
||||
nerdfonts = callPackage ../data/fonts/nerdfonts { };
|
||||
|
|
@ -6954,6 +6958,8 @@ with pkgs;
|
|||
|
||||
libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
|
||||
|
||||
linuxkit = callPackage ../development/tools/misc/linuxkit { };
|
||||
|
||||
lit = callPackage ../development/tools/misc/lit { };
|
||||
|
||||
lsof = callPackage ../development/tools/misc/lsof { };
|
||||
|
|
@ -6979,6 +6985,8 @@ with pkgs;
|
|||
|
||||
mk = callPackage ../development/tools/build-managers/mk { };
|
||||
|
||||
moby = callPackage ../development/tools/misc/moby { };
|
||||
|
||||
msgpack-tools = callPackage ../development/tools/msgpack-tools { };
|
||||
|
||||
msitools = callPackage ../development/tools/misc/msitools { };
|
||||
|
|
@ -11889,6 +11897,8 @@ with pkgs;
|
|||
|
||||
libaio = callPackage ../os-specific/linux/libaio { };
|
||||
|
||||
libargon2 = callPackage ../development/libraries/libargon2 { };
|
||||
|
||||
libatasmart = callPackage ../os-specific/linux/libatasmart { };
|
||||
|
||||
libcgroup = callPackage ../os-specific/linux/libcgroup { };
|
||||
|
|
@ -13679,11 +13689,10 @@ with pkgs;
|
|||
};
|
||||
|
||||
inherit (callPackage ../applications/virtualization/docker { })
|
||||
docker_17_03
|
||||
docker_17_05;
|
||||
docker_17_06;
|
||||
|
||||
docker = docker_17_03;
|
||||
docker-edge = docker_17_05;
|
||||
docker = docker_17_06;
|
||||
docker-edge = docker_17_06;
|
||||
|
||||
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
|
||||
|
||||
|
|
@ -15129,6 +15138,8 @@ with pkgs;
|
|||
|
||||
mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { };
|
||||
|
||||
mopidy-iris = callPackage ../applications/audio/mopidy-iris { };
|
||||
|
||||
motif = callPackage ../development/libraries/motif { };
|
||||
|
||||
mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {};
|
||||
|
|
@ -17693,6 +17704,8 @@ with pkgs;
|
|||
|
||||
gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
|
||||
|
||||
gtk-engine-bluecurve = callPackage ../misc/themes/gtk2/gtk-engine-bluecurve { };
|
||||
|
||||
gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
|
||||
|
||||
gnome_themes_standard = gnome3.gnome_themes_standard;
|
||||
|
|
@ -18000,12 +18013,14 @@ with pkgs;
|
|||
};
|
||||
coqPackages = coqPackages_8_5;
|
||||
|
||||
autosubst = callPackage ../development/coq-modules/autosubst {};
|
||||
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
|
||||
coquelicot = callPackage ../development/coq-modules/coquelicot {};
|
||||
dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
|
||||
flocq = callPackage ../development/coq-modules/flocq {};
|
||||
interval = callPackage ../development/coq-modules/interval {};
|
||||
mathcomp = callPackage ../development/coq-modules/mathcomp { };
|
||||
paco = callPackage ../development/coq-modules/paco {};
|
||||
math-classes = callPackage ../development/coq-modules/math-classes { };
|
||||
ssreflect = callPackage ../development/coq-modules/ssreflect { };
|
||||
QuickChick = callPackage ../development/coq-modules/QuickChick {};
|
||||
|
|
@ -18017,12 +18032,15 @@ with pkgs;
|
|||
coq = callPackage ../applications/science/logic/coq {};
|
||||
coqPackages = coqPackages_8_6;
|
||||
|
||||
autosubst = callPackage ../development/coq-modules/autosubst {};
|
||||
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
|
||||
coquelicot = callPackage ../development/coq-modules/coquelicot {};
|
||||
dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
|
||||
flocq = callPackage ../development/coq-modules/flocq {};
|
||||
heq = callPackage ../development/coq-modules/heq {};
|
||||
interval = callPackage ../development/coq-modules/interval {};
|
||||
mathcomp = callPackage ../development/coq-modules/mathcomp { };
|
||||
paco = callPackage ../development/coq-modules/paco {};
|
||||
ssreflect = callPackage ../development/coq-modules/ssreflect { };
|
||||
QuickChick = callPackage ../development/coq-modules/QuickChick {};
|
||||
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
|
||||
|
|
|
|||
|
|
@ -397,7 +397,6 @@ let
|
|||
ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
|
||||
|
||||
ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
|
||||
ocaml_oasis_46 = callPackage ../development/tools/ocaml/oasis/0.4.6.nix { };
|
||||
|
||||
ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };
|
||||
|
||||
|
|
|
|||
|
|
@ -25208,9 +25208,9 @@ in {
|
|||
stevedore
|
||||
virtualenv
|
||||
virtualenv-clone
|
||||
] ++ optional isPy26 argparse;
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do
|
||||
substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which"
|
||||
|
||||
|
|
@ -25241,7 +25241,7 @@ in {
|
|||
|
||||
# WARNING: Don't indent the lines below because that would break EOF
|
||||
cat > "$wrapper" << EOF
|
||||
export PATH="$PATH:\$PATH"
|
||||
export PATH="${python}/bin:\$PATH"
|
||||
export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)"
|
||||
source "$wrapped"
|
||||
EOF
|
||||
|
|
|
|||
Loading…
Reference in New Issue