::
diff --git a/git-send-email.perl b/git-send-email.perl
+index 8eb63b5a2f..74a61d8213 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
-@@ -944,8 +944,7 @@ if (defined $reply_to) {
+@@ -956,8 +956,7 @@ sub expand_one_alias {
}
-
+
if (!defined $smtp_server) {
- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
index 216c0e56b44..721f2aa099c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
@@ -1,94 +1,23 @@
+diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
+index e1d917fd27..e90f8e1414 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
-@@ -15,87 +15,11 @@
- fi
- export TEXTDOMAINDIR
-
--# First decide what scheme to use...
--GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
--if test -n "$GIT_GETTEXT_POISON"
--then
-- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
--elif test -n "@@USE_GETTEXT_SCHEME@@"
--then
-- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
--elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
--then
-- : no probing necessary
+@@ -26,7 +26,7 @@ then
+ elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+ then
+ : no probing necessary
-elif type gettext.sh >/dev/null 2>&1
--then
-- # GNU libintl's gettext.sh
-- GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
--elif test "$(gettext -h 2>&1)" = "-h"
--then
-- # gettext binary exists but no gettext.sh. likely to be a gettext
-- # binary on a Solaris or something that is not GNU libintl and
-- # lack eval_gettext.
-- GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
--fi
--export GIT_INTERNAL_GETTEXT_SH_SCHEME
--
--# ... and then follow that decision.
--case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
--gnu)
-- # Use libintl's gettext.sh, or fall back to English if we can't.
++elif type @gettext@/bin/gettext.sh >/dev/null 2>&1
+ then
+ # GNU libintl's gettext.sh
+ GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
+@@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME
+ case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
+ gnu)
+ # Use libintl's gettext.sh, or fall back to English if we can't.
- . gettext.sh
-- ;;
--gettext_without_eval_gettext)
-- # Solaris has a gettext(1) but no eval_gettext(1)
-- eval_gettext () {
-- gettext "$1" | (
-- export PATH $(git sh-i18n--envsubst --variables "$1");
-- git sh-i18n--envsubst "$1"
-- )
-- }
--
-- eval_ngettext () {
-- ngettext "$1" "$2" "$3" | (
-- export PATH $(git sh-i18n--envsubst --variables "$2");
-- git sh-i18n--envsubst "$2"
-- )
-- }
-- ;;
--poison)
-- # Emit garbage so that tests that incorrectly rely on translatable
-- # strings will fail.
-- gettext () {
-- printf "%s" "# GETTEXT POISON #"
-- }
--
-- eval_gettext () {
-- printf "%s" "# GETTEXT POISON #"
-- }
--
-- eval_ngettext () {
-- printf "%s" "# GETTEXT POISON #"
-- }
-- ;;
--*)
-- gettext () {
-- printf "%s" "$1"
-- }
--
-- eval_gettext () {
-- printf "%s" "$1" | (
-- export PATH $(git sh-i18n--envsubst --variables "$1");
-- git sh-i18n--envsubst "$1"
-- )
-- }
-+# GNU gettext
-+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
-+export PATH=@gettext@/bin:$PATH
-
-- eval_ngettext () {
-- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
-- export PATH $(git sh-i18n--envsubst --variables "$2");
-- git sh-i18n--envsubst "$2"
-- )
-- }
-- ;;
--esac
-+. @gettext@/bin/gettext.sh
-
- # Git-specific wrapper functions
- gettextln () {
++ . @gettext@/bin/gettext.sh
++ export PATH=@gettext@/bin:$PATH
+ ;;
+ gettext_without_eval_gettext)
+ # Solaris has a gettext(1) but no eval_gettext(1)
diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
index 8c68fb9f186..4b73d11744b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
@@ -1,12 +1,13 @@
diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 8665b0a9b6..8bb892b1af 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
-@@ -923,7 +923,7 @@
+@@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED"
then
GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
error "Cannot run git from $GIT_TEST_INSTALLED."
-- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
+- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH
+ PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
else # normal case, use ../bin-wrappers only unless $with_dashes:
- git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
+ if test -n "$no_bin_wrappers"
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
index addb1dbc5e0..71cdc694ac3 100644
--- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
@@ -1,18 +1,18 @@
diff --git a/connect.c b/connect.c
-index c3a014c5b..fbca3262b 100644
+index 4813f005ab..b3f12f3268 100644
--- a/connect.c
+++ b/connect.c
-@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
-
+@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
+
ssh = getenv("GIT_SSH");
if (!ssh)
- ssh = "ssh";
+ ssh = "@ssh@";
variant = determine_ssh_variant(ssh, 0);
}
-
+
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
-index 480a6b30d..781720424 100644
+index 480a6b30d0..7817204241 100644
--- a/git-gui/lib/remote_add.tcl
+++ b/git-gui/lib/remote_add.tcl
@@ -139,7 +139,7 @@ method _add {} {
diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh
new file mode 100755
index 00000000000..05944014743
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/update.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts jq
+
+set -eu -o pipefail
+
+oldVersion="$(nix-instantiate --eval -E "with import ./. {}; git.version or (builtins.parseDrvName git.name).version" | tr -d '"')"
+latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')"
+
+if [ ! "${oldVersion}" = "${latestTag}" ]; then
+ update-source-version git "${latestTag}"
+ nixpkgs="$(git rev-parse --show-toplevel)"
+ default_nix="$nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix"
+ nix-build -A git
+ git add "${default_nix}"
+ git commit -m "git: ${oldVersion} -> ${latestTag}"
+else
+ echo "git is already up-to-date"
+fi
diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
index 044800fe73a..036f8b4114e 100644
--- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = http://josefsson.org/git2cl/;
+ homepage = https://savannah.nongnu.org/projects/git2cl;
description = "Convert git logs to GNU style ChangeLog files";
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix
index 6979a47cdfc..6ecf81779f2 100644
--- a/pkgs/applications/version-management/git-and-tools/gita/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix
@@ -1,15 +1,19 @@
-{ lib, python3Packages }:
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pyyaml
+}:
-python3Packages.buildPythonApplication rec {
- version = "0.7.3";
+buildPythonApplication rec {
+ version = "0.9.2";
pname = "gita";
- src = python3Packages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
- sha256 = "0ccqjf288513im7cvafiw4ypbp9s3z0avyzd4jzr13m38jrsss3r";
+ sha256 = "1aycqq4crsa57ghpv7xc497rf4y8x43fcfd0v9prd2kn6h1793r0";
};
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = [
pyyaml
];
diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 698de486b5b..57af13f597a 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -4,14 +4,13 @@ with pkgs.lib;
stdenv.mkDerivation rec {
pname = "gitflow";
- version = "1.11.0";
- name = "${pname}-${version}";
+ version = "1.12.2";
src = fetchFromGitHub {
owner = "petervanderdoes";
repo = pname;
rev = version;
- sha256 = "0zk53g0wd5n1zlhkwlfp124i6agx8kl0cwvy0dia3jh1p51vsc1q";
+ sha256 = "0smwlc1wa4ndvspc9x6f4jwnzr58achysrhhip402j98d7di8hw5";
};
buildInputs = [ pkgs.makeWrapper ];
@@ -37,6 +36,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.bsd2;
platforms = platforms.all;
- maintainers = with maintainers; [ offline jgeerds ];
+ maintainers = with maintainers; [ offline ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
new file mode 100644
index 00000000000..1de631e8b6a
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -0,0 +1,30 @@
+{callPackage, stdenv, fetchFromGitHub, ...}:
+
+stdenv.mkDerivation rec {
+ pname = "gitstatus";
+ version = "unstable-2019-05-06";
+
+ src = fetchFromGitHub {
+ owner = "romkatv";
+ repo = "gitstatus";
+ rev = "9c791f93c23c04dadfab8b4309a863b62a6ee424";
+ sha256 = "0jbdrgl62x6j920h72n2q6304fb6gdgnmllpv4aa76m13b9qhgq6";
+ };
+
+ buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
+ patchPhase = ''
+ sed -i "s|local daemon.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh
+ '';
+ installPhase = ''
+ install -Dm755 gitstatusd $out/bin/gitstatusd
+ install -Dm444 gitstatus.plugin.zsh $out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "10x faster implementation of `git status` command";
+ homepage = https://github.com/romkatv/gitstatus;
+ license = [ licenses.gpl3 ];
+
+ maintainers = [ maintainers.mmlb ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
new file mode 100644
index 00000000000..22f35e22fb5
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -0,0 +1,19 @@
+{fetchFromGitHub, libgit2, ...}:
+
+libgit2.overrideAttrs (oldAttrs: rec {
+ cmakeFlags = oldAttrs.cmakeFlags ++ [
+ "-DUSE_BUNDLED_ZLIB=ON"
+ "-DUSE_ICONV=OFF"
+ "-DBUILD_CLAR=OFF"
+ "-DUSE_SSH=OFF"
+ "-DUSE_HTTPS=OFF"
+ "-DBUILD_SHARED_LIBS=OFF"
+ "-DUSE_EXT_HTTP_PARSER=OFF"
+ ];
+ src = fetchFromGitHub {
+ owner = "romkatv";
+ repo = "libgit2";
+ rev = "aab6c56e6766fa752bef00c745067d875925fc89";
+ sha256 = "1yqqhpi5xi6s86411sixw4yq5c6n2v8pdh447c8b7q5lfc089lvl";
+ };
+})
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index a98dd5bc586..afd90ba4969 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
@@ -1,35 +1,25 @@
-{ stdenv, git, gzip, perlPackages, fetchFromGitHub
+{ stdenv, buildEnv, git, fetchFromGitHub
, gitwebTheme ? false }:
let
- gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
gitwebThemeSrc = fetchFromGitHub {
owner = "kogakure";
repo = "gitweb-theme";
rev = "049b88e664a359f8ec25dc6f531b7e2aa60dd1a2";
- sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p";
+ extraPostFetch = ''
+ mkdir -p "$TMPDIR/gitwebTheme"
+ mv "$out"/* "$TMPDIR/gitwebTheme/"
+ mkdir "$out/static"
+ mv "$TMPDIR/gitwebTheme"/* "$out/static/"
+ '';
+ sha256 = "17hypq6jvhy6zhh26lp3nyi52npfd5wy5752k6sq0shk4na2acqi";
};
-in stdenv.mkDerivation {
+in buildEnv {
name = "gitweb-${stdenv.lib.getVersion git}";
- src = git.gitweb;
-
- installPhase = ''
- mkdir $out
- mv * $out
-
- # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
- # gitweb.cgi, need to patch so that it's found
- sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
- $out/gitweb.cgi
- # Give access to CGI.pm and friends (was removed from perl core in 5.22)
- for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do
- sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
- "$out/gitweb.cgi"
- done
-
- ${stdenv.lib.optionalString gitwebTheme "cp ${gitwebThemeSrc}/* $out/static"}
- '';
+ ignoreCollisions = true;
+ paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}"
+ ++ [ "${git}/share/gitweb" ];
meta = git.meta // {
maintainers = with stdenv.lib.maintainers; [ gnidorah ];
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 32c163c45c4..e6b746233fe 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
+{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }:
let
version = "0.3.1";
in
buildGoPackage {
- name = "grv-${version}";
+ pname = "grv";
+ inherit version;
- buildInputs = [ ncurses readline curl libgit2_0_27 ];
+ buildInputs = [ ncurses readline curl libgit2 ];
nativeBuildInputs = [ pkgconfig ];
goPackagePath = "github.com/rgburke/grv";
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 8ae600ed360..f1950923415 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux, git, glibcLocales }:
+{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }:
buildGoPackage rec {
pname = "hub";
- version = "2.9.0";
+ version = "2.12.3";
goPackagePath = "github.com/github/hub";
@@ -13,12 +13,11 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "0yxpr606xx23l8823hjqj16cvjjrwb28c7z08ml1pkfvaf7w4n81";
+ sha256 = "13l4nc3k6vl9x1x0153mwi351j3z266wx0fp7xw2851avrgkk9zg";
};
- nativeBuildInputs = [ groff ronn utillinux glibcLocales ];
- buildInputs = [ ruby ] ++
- stdenv.lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ groff utillinux ];
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
postPatch = ''
patchShebangs .
@@ -30,7 +29,8 @@ buildGoPackage rec {
install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub"
install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish"
- PATH=$PATH:${git}/bin LC_ALL=en_US.utf-8 make man-pages
+ LC_ALL=C.UTF8 \
+ make man-pages
cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
'';
@@ -38,7 +38,7 @@ buildGoPackage rec {
description = "Command-line wrapper for git that makes you better at GitHub";
license = licenses.mit;
homepage = https://hub.github.com/;
- maintainers = with maintainers; [ the-kenny ];
+ maintainers = with maintainers; [ the-kenny globin ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index daec9ce9d2a..a1ef489b007 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -1,27 +1,32 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
- name = "lab-${version}";
- version = "0.14.0";
-
- goPackagePath = "github.com/zaquestion/lab";
-
- subPackages = [ "." ];
+buildGoModule rec {
+ pname = "lab";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
- sha256 = "0dqahzm721kpps4i33qgk78y982n8gj5afpk73qyzbraf5y3cw92";
+ sha256 = "0f1gi4mlcxjvz2sgh0hzzsqxg5gfvq2ay7xjd0y1kz3pp8kxja7i";
};
- goDeps = ./deps.nix;
+ subPackages = [ "." ];
+
+ modSha256 = "0bw47dd1b46ywsian2b957a4ipm77ncidipzri9ra39paqlv7abb";
+
+ postInstall = ''
+ mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"
+ export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c
+ $out/bin/lab completion bash > $out/share/bash-completion/completions/lab
+ $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab
+ '';
meta = with stdenv.lib; {
description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
homepage = https://zaquestion.github.io/lab;
- license = licenses.unlicense;
- maintainers = [ maintainers.marsam ];
+ license = licenses.cc0;
+ maintainers = with maintainers; [ marsam dtzWill ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/lab/deps.nix b/pkgs/applications/version-management/git-and-tools/lab/deps.nix
deleted file mode 100644
index 03959300b43..00000000000
--- a/pkgs/applications/version-management/git-and-tools/lab/deps.nix
+++ /dev/null
@@ -1,327 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/avast/retry-go";
- fetch = {
- type = "git";
- url = "https://github.com/avast/retry-go";
- rev = "5469272a8171235352a56af37e5f7facf814423f";
- sha256 = "0ql8x5c99sh1f4vdd5614zd0bi4z8z19228vm4xkvii11bsj8dx6";
- };
- }
- {
- goPackagePath = "github.com/cpuguy83/go-md2man";
- fetch = {
- type = "git";
- url = "https://github.com/cpuguy83/go-md2man";
- rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1";
- sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "346938d642f2ec3594ed81d874461961cd0faa76";
- sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/gdamore/encoding";
- fetch = {
- type = "git";
- url = "https://github.com/gdamore/encoding";
- rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
- sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
- };
- }
- {
- goPackagePath = "github.com/gdamore/tcell";
- fetch = {
- type = "git";
- url = "https://github.com/gdamore/tcell";
- rev = "2f258105ca8ce35819115b49f5ac58197241653e";
- sha256 = "1sji4fjd7i70lc6l19zhz718xld96k0h1sb1as1mmrx0iv858xaz";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
- sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
- };
- }
- {
- goPackagePath = "github.com/google/go-querystring";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-querystring";
- rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
- sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
- sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/lucasb-eyer/go-colorful";
- fetch = {
- type = "git";
- url = "https://github.com/lucasb-eyer/go-colorful";
- rev = "231272389856c976b7500c4fffcc52ddf06ff4eb";
- sha256 = "161n224v46mln3swzv0009ffj9fxg2n814l9vqs3zh9dq1dmj0jn";
- };
- }
- {
- goPackagePath = "github.com/lunixbochs/vtclean";
- fetch = {
- type = "git";
- url = "https://github.com/lunixbochs/vtclean";
- rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41";
- sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6";
- sha256 = "04ccjc9nd1wffvw24ixyfw3v5g48zq7pbq1wz1zg9cyqyxy14qgr";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
- sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/mapstructure";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/mapstructure";
- rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
- sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8";
- sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "792786c7400a136282c1664665ae0a8db921c6c2";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/rivo/tview";
- fetch = {
- type = "git";
- url = "https://github.com/rivo/tview";
- rev = "f855bee0205c35e6a055b86cc341effea0f446ce";
- sha256 = "0jn9r3gzvm3gr72rb7zz2g8794nnl56l8flqfav00pfk0qiqp8xw";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
- sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
- };
- }
- {
- goPackagePath = "github.com/spf13/afero";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/afero";
- rev = "63644898a8da0bc22138abf860edaf5277b6102e";
- sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
- };
- }
- {
- goPackagePath = "github.com/spf13/cast";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cast";
- rev = "8965335b8c7107321228e3e3702cab9832751bac";
- sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "615425954c3b0d9485a7027d4d451fdcdfdee84e";
- sha256 = "01zsislgc72j86a1zq7xs7xj3lvxjjviz4lgn4144jzgppwanpk6";
- };
- }
- {
- goPackagePath = "github.com/spf13/jwalterweatherman";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/jwalterweatherman";
- rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
- sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
- sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
- };
- }
- {
- goPackagePath = "github.com/spf13/viper";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/viper";
- rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
- sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
- sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
- };
- }
- {
- goPackagePath = "github.com/tcnksm/go-gitconfig";
- fetch = {
- type = "git";
- url = "https://github.com/tcnksm/go-gitconfig";
- rev = "d154598bacbf4501c095a309753c5d4af66caa81";
- sha256 = "0sz7h383h7ngrqkk35ic37kfvhlk07g4kanps8bnapwczrcm2am9";
- };
- }
- {
- goPackagePath = "github.com/xanzy/go-gitlab";
- fetch = {
- type = "git";
- url = "https://github.com/xanzy/go-gitlab";
- rev = "8d21e61ce4a9b9c7fe645e48672872e9fdb71138";
- sha256 = "1lac57ard1vrd16ri8gfyd0ck8d7xg7zbcjlz90223jp0vc3l8nv";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "e73bf333ef8920dbb52ad18d4bd38ad9d9bc76d7";
- sha256 = "1amcpva20vff8v0lww655icaaf7388ns8xhm859whn4w4v0vanyg";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "f4c29de78a2a91c00474a2e689954305c350adf9";
- sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x";
- };
- }
- {
- goPackagePath = "golang.org/x/oauth2";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/oauth2";
- rev = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f";
- sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "79b0c6888797020a994db17c8510466c72fe75d9";
- sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "b1f26356af11148e710935ed1ac8a7f5702c7612";
- sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
-]
\ No newline at end of file
diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
deleted file mode 100644
index 331b020d8ca..00000000000
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, python3Packages }:
-with python3Packages; buildPythonApplication rec {
- pname = "pre_commit";
- version = "1.11.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w";
- };
-
- propagatedBuildInputs = [
- aspy-yaml
- cached-property
- cfgv
- identify
- nodeenv
- six
- toml
- virtualenv
- ];
-
- # Tests fail due to a missing windll dependency
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "A framework for managing and maintaining multi-language pre-commit hooks";
- homepage = https://pre-commit.com/;
- license = licenses.mit;
- maintainers = with maintainers; [ borisbabic ];
- };
-}
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 0074d44391e..74fad30b8a9 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase }:
-stdenv.mkDerivation rec {
- name = "qgit-2.8";
+mkDerivation rec {
+ pname = "qgit";
+ version = "2.9";
src = fetchFromGitHub {
owner = "tibirna";
repo = "qgit";
- rev = name;
- sha256 = "01l6mz2f333x3zbfr68mizwpsh6sdsnadcavpasidiych1m5ry8f";
+ rev = "${pname}-${version}";
+ sha256 = "0n4dq9gffm9yd7n5p5qcdfgrmg2kwnfd51hfx10adgj9ibxlnc3z";
};
buildInputs = [ qtbase ];
nativeBuildInputs = [ cmake ];
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
license = licenses.gpl2;
- homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
+ homepage = https://github.com/tibirna/qgit;
description = "Graphical front-end to Git";
maintainers = with maintainers; [ peterhoeg markuskowa ];
inherit (qtbase.meta) platforms;
diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
index 7b36a142d15..6866418f3e3 100644
--- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "subgit-3.2.4";
+ name = "subgit-3.3.7";
meta = {
description = "A tool for a smooth, stress-free SVN to Git migration";
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://subgit.com/download/${name}.zip";
- sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw";
+ sha256 = "1cpssmvp961kw8s3b9s9bv9jmsm1gk3napggw5810c4rnnihjvrn";
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 0ee188cc19d..3c7784e8506 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
let
- version = "1.0.13";
+ version = "1.0.16";
in
stdenv.mkDerivation {
- name = "svn-all-fast-export-${version}";
+ pname = "svn-all-fast-export";
+ inherit version;
src = fetchFromGitHub {
owner = "svn-all-fast-export";
repo = "svn2git";
rev = version;
- sha256 = "0f1qj0c4cdq46mz54wcy17g7rq1fy2q0bq3sswhr7r5a2s433x4f";
+ sha256 = "1xs3gngjkna458liaqjsc8ryld03mdmvycnkzwsgyzfxsgjx1i3l";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index d00fdd0c29e..821ecf3e3d8 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -4,7 +4,8 @@ let
version = "2.4.0";
in
stdenv.mkDerivation {
- name = "svn2git-${version}";
+ pname = "svn2git";
+ inherit version;
src = fetchurl {
url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index a407f6e7ab1..59354598d00 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -5,12 +5,11 @@
stdenv.mkDerivation rec {
pname = "tig";
version = "2.4.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd";
};
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://jonas.github.io/tig/;
description = "Text-mode interface for git";
- maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ];
+ maintainers = with maintainers; [ bjornfor domenkozar qknight globin ];
license = licenses.gpl2;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index c183bbde7e6..0da0cfa02b6 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, git, perl }:
stdenv.mkDerivation rec {
- name = "topgit-0.9";
+ pname = "topgit";
+ version = "0.19.12";
- src = fetchurl {
- url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz";
- sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94";
+ src = fetchFromGitHub {
+ owner = "mackyle";
+ repo = "topgit";
+ rev = "${pname}-${version}";
+ sha256 = "1wvf8hmwwl7a2fr17cfs3pbxjccdsjw9ngzivxlgja0gvfz4hjd5";
};
- configurePhase = "makeFlags=prefix=$out";
+ makeFlags = [ "prefix=${placeholder "out"}" ];
+
+ nativeBuildInputs = [ perl git ];
postInstall = ''
- mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/"
- mv README "$out/share/doc/${name}/"
- mv contrib/tg-completion.bash "$out/etc/bash_completion.d/"
+ install -Dm644 README -t"$out/share/doc/${pname}-${version}/"
+ install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/"
'';
- meta = {
- homepage = https://github.com/greenrd/topgit;
+ meta = with stdenv.lib; {
description = "TopGit manages large amount of interdependent topic branches";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ marcweber ];
+ homepage = "https://github.com/mackyle/topgit";
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ marcweber ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 35e9c17438f..3b8affb57ed 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, git, makeWrapper, openssl }:
+{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:
stdenv.mkDerivation rec {
- name = "transcrypt-${version}";
+ pname = "transcrypt";
version = "1.1.0";
src = fetchFromGitHub {
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
};
- buildInputs = [ git makeWrapper openssl ];
+ buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ];
+
+ patches = [ ./helper-scripts_depspathprefix.patch ];
installPhase = ''
install -m 755 -D transcrypt $out/bin/transcrypt
@@ -20,7 +22,13 @@ stdenv.mkDerivation rec {
install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt
wrapProgram $out/bin/transcrypt \
- --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl ]}"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}"
+
+ cat > $out/bin/transcrypt-depspathprefix << EOF
+ #!${stdenv.shell}
+ echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:"
+ EOF
+ chmod +x $out/bin/transcrypt-depspathprefix
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
new file mode 100644
index 00000000000..925aadab3dd
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
@@ -0,0 +1,37 @@
+diff --git a/transcrypt b/transcrypt
+index a0b562d..7888f5d 100755
+--- a/transcrypt
++++ b/transcrypt
+@@ -278,6 +278,7 @@ save_helper_scripts() {
+
+ cat <<-'EOF' > "${GIT_DIR}/crypt/clean"
+ #!/usr/bin/env bash
++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
+ filename=$1
+ # ignore empty files
+ if [[ -s $filename ]]; then
+@@ -300,6 +301,7 @@ save_helper_scripts() {
+
+ cat <<-'EOF' > "${GIT_DIR}/crypt/smudge"
+ #!/usr/bin/env bash
++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
+ tempfile=$(mktemp 2> /dev/null || mktemp -t tmp)
+ trap 'rm -f "$tempfile"' EXIT
+ cipher=$(git config --get --local transcrypt.cipher)
+@@ -309,6 +311,7 @@ save_helper_scripts() {
+
+ cat <<-'EOF' > "${GIT_DIR}/crypt/textconv"
+ #!/usr/bin/env bash
++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
+ filename=$1
+ # ignore empty files
+ if [[ -s $filename ]]; then
+@@ -351,7 +354,7 @@ save_configuration() {
+ git config merge.renormalize 'true'
+
+ # add a git alias for listing encrypted files
+- git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
++ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
+ }
+
+ # display the current configuration settings
diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix
index fd999dc17d4..ec03c5bed5b 100644
--- a/pkgs/applications/version-management/git-crecord/default.nix
+++ b/pkgs/applications/version-management/git-crecord/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "git-crecord-${version}";
+ pname = "git-crecord";
version = "20161216.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 3cde046a2ad..e3190667259 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "git-lfs-${version}";
+ pname = "git-lfs";
version = "1.5.6";
rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 67c07072d41..d9b5e170497 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "git-lfs-${version}";
- version = "2.5.2";
+ pname = "git-lfs";
+ version = "2.7.2";
goPackagePath = "github.com/git-lfs/git-lfs";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
- sha256 = "1y9l35j59d422v9hsbi117anm5d0177nspiy9r2zbjz3ygd9a4ck";
+ sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc";
};
preBuild = ''
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index b629c8fe910..b26548ebe99 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "git-repo-${version}";
- version = "1.13.2";
+ pname = "git-repo";
+ version = "1.13.5.1";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "0ll1yzwgpayps7c05j8kf1m4zvww7crmlyy7xa0w5g2krbjvjzvi";
+ sha256 = "13rp0fq76a6qlw60pnipkgfng25i0ygyk66y30jv7hy8ip4aa92n";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 101770da888..ecc054df47e 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, pythonPackages} :
+{ stdenv, fetchFromGitHub, pythonPackages} :
pythonPackages.buildPythonApplication rec {
- name = "git-review-${version}";
- version = "1.27.0";
+ pname = "git-review";
+ version = "1.28.0";
# Manually set version because prb wants to get it from the git
# upstream repository (and we are installing from tarball instead)
PBR_VERSION = "${version}";
- postPatch = ''
- sed -i -e '/argparse/d' requirements.txt
- '';
-
- src = fetchurl rec {
- url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
- sha256 = "0smdkps9avnj58izyfc5m0amq8nafgs9iqlyaf7ncrlvypia1f3q";
+ src = fetchFromGitHub rec {
+ owner = "openstack-infra";
+ repo = pname;
+ rev = version;
+ sha256 = "1hgw1dkl94m3idv4izc7wf2j7al2c7nnsqywy7g53nzkv9pfv47s";
};
propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index 9c5ab20d364..7a92679583b 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -2,7 +2,6 @@
buildGoPackage rec {
pname = "git-sizer";
- name = "${pname}-${version}";
version = "1.0.0";
goPackagePath = "github.com/github/git-sizer";
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 36631449096..00f344597bb 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,19 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, bash, gzip, openssh
+, git, bash, gzip, openssh, pam
, sqliteSupport ? true
+, pamSupport ? true
}:
with stdenv.lib;
buildGoPackage rec {
- name = "gitea-${version}";
- version = "1.7.1";
+ pname = "gitea";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "1r13l7h4146729lwif45bkzn36sgg6an0qbhgvj8w3zp035c00k3";
+ sha256 = "1i7h6scycwzil87fcx1a19w5pl0986g5ax7y030w0wgmrq3zj53a";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
@@ -31,13 +32,18 @@ buildGoPackage rec {
substituteInPlace modules/setting/setting.go --subst-var data
'';
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ]
+ ++ optional pamSupport pam;
- buildFlags = optional sqliteSupport "-tags sqlite";
- buildFlagsArray = ''
- -ldflags=
- -X=main.Version=${version}
- ${optionalString sqliteSupport "-X=main.Tags=sqlite"}
+ preBuild = let
+ tags = optional pamSupport "pam"
+ ++ optional sqliteSupport "sqlite";
+ tagsString = concatStringsSep " " tags;
+ in ''
+ export buildFlagsArray=(
+ -tags="${tagsString}"
+ -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
+ )
'';
outputs = [ "bin" "out" "data" ];
@@ -58,6 +64,6 @@ buildGoPackage rec {
description = "Git with a cup of tea";
homepage = https://gitea.io;
license = licenses.mit;
- maintainers = [ maintainers.disassembler ];
+ maintainers = with maintainers; [ disassembler kolaente ];
};
}
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 664ef62be54..fa93ff41a4a 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,8 +1,9 @@
{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
-, libXfixes, atk, gtk3, libXrender, pango, gnome2, cairo, freetype, fontconfig
+, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
-, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
-, dpkg, makeDesktopItem, openssl
+, nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
+, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid
+, e2fsprogs, krb5
}:
with stdenv.lib;
@@ -11,12 +12,12 @@ let
curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
in
stdenv.mkDerivation rec {
- name = "gitkraken-${version}";
- version = "4.2.1";
+ pname = "gitkraken";
+ version = "6.1.4";
src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
- sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg";
+ sha256 = "10m6pwdwdxj6x64bc7mrvlvwkgqrd5prh9xx7xhvbz55q6gx4vdr";
};
libPath = makeLibraryPath [
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
cups
alsaLib
expat
- gdk_pixbuf
+ gdk-pixbuf
dbus
libXdamage
libXrandr
@@ -50,9 +51,12 @@ stdenv.mkDerivation rec {
libXfixes
libXrender
gtk3
- gnome2.GConf
libgnome-keyring
openssl
+ at-spi2-atk
+ libuuid
+ e2fsprogs
+ krb5
];
desktopItem = makeDesktopItem {
@@ -65,8 +69,8 @@ stdenv.mkDerivation rec {
comment = "Graphical Git client from Axosoft";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ dpkg ];
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+ buildInputs = [ dpkg gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ];
unpackCmd = ''
mkdir out
@@ -78,13 +82,12 @@ stdenv.mkDerivation rec {
pushd usr
pushd share
substituteInPlace applications/gitkraken.desktop \
- --replace /usr/share/gitkraken $out/bin \
- --replace Icon=app Icon=gitkraken
- mv pixmaps/app.png pixmaps/gitkraken.png
+ --replace /usr/share/gitkraken $out/bin
popd
rm -rf bin/gitkraken share/lintian
cp -av share bin $out/
popd
+
ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
'';
@@ -103,6 +106,6 @@ stdenv.mkDerivation rec {
description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
license = licenses.unfree;
platforms = platforms.linux;
- maintainers = with maintainers; [ xnwdd ];
+ maintainers = with maintainers; [ xnwdd evanjs ];
};
}
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 3298bc16751..d20236e9f5b 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,32 +1,32 @@
{
"ce": {
- "version": "11.7.5",
- "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn",
- "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb",
+ "version": "12.1.6",
+ "repo_hash": "0zyqxzyb1m8qa94iiyqf5ivqxrg60y378r94fsixy17fbh4y7sa6",
+ "deb_hash": "14bwcmwar44pjnjr6fdn2h9y92vyfva0kb76d4pz8pqc9pfm2hmg",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.1.6-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
- "rev": "v11.7.5",
+ "rev": "v12.1.6",
"passthru": {
- "GITALY_SERVER_VERSION": "1.12.2",
- "GITLAB_PAGES_VERSION": "1.3.1",
- "GITLAB_SHELL_VERSION": "8.4.4",
- "GITLAB_WORKHORSE_VERSION": "8.0.2"
+ "GITALY_SERVER_VERSION": "1.53.2",
+ "GITLAB_PAGES_VERSION": "1.7.1",
+ "GITLAB_SHELL_VERSION": "9.3.0",
+ "GITLAB_WORKHORSE_VERSION": "8.7.0"
}
},
"ee": {
- "version": "11.7.5",
- "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm",
- "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb",
+ "version": "12.1.6",
+ "repo_hash": "1lxci1hwcccgw567c5733yl95xsxr4gnw41m48igdw9y8p6g7zbc",
+ "deb_hash": "0yjilhf4bjhl1a596x6n4cvjklfbrwhymslhx977nfjazfb5slx3",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.1.6-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
- "rev": "v11.7.5-ee",
+ "rev": "v12.1.6-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "1.12.2",
- "GITLAB_PAGES_VERSION": "1.3.1",
- "GITLAB_SHELL_VERSION": "8.4.4",
- "GITLAB_WORKHORSE_VERSION": "8.0.2"
+ "GITALY_SERVER_VERSION": "1.53.2",
+ "GITLAB_PAGES_VERSION": "1.7.1",
+ "GITLAB_SHELL_VERSION": "9.3.0",
+ "GITLAB_WORKHORSE_VERSION": "8.7.0"
}
}
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 2ffe1141b5a..20f0937274e 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,14 +1,29 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
-, ruby, tzdata, git, procps, nettools
+, ruby, tzdata, git, nettools, nixosTests
, gitlabEnterprise ? false
}:
let
- rubyEnv = bundlerEnv {
+ rubyEnv = bundlerEnv rec {
name = "gitlab-env-${version}";
inherit ruby;
gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}";
- groups = [ "default" "unicorn" "ed25519" "metrics" ];
+ gemset =
+ let x = import (gemdir + "/gemset.nix");
+ in x // {
+ # grpc expects the AR environment variable to contain `ar rpc`. See the
+ # discussion in nixpkgs #63056.
+ grpc = x.grpc // {
+ patches = [ ./fix-grpc-ar.patch ];
+ dontBuild = false;
+ };
+ };
+ groups = [
+ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test"
+ ];
+ # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a
+ # `console` executable.
+ ignoreCollisions = true;
};
flavour = if gitlabEnterprise then "ee" else "ce";
@@ -35,7 +50,7 @@ stdenv.mkDerivation rec {
src = sources.gitlab;
buildInputs = [
- rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools
+ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools
];
patches = [ ./remove-hardcoded-locations.patch ];
@@ -49,9 +64,6 @@ stdenv.mkDerivation rec {
rm config/initializers/gitlab_shell_secret_token.rb
- substituteInPlace app/controllers/admin/background_jobs_controller.rb \
- --replace "ps -U" "${procps}/bin/ps -U"
-
sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb
'';
@@ -64,6 +76,7 @@ stdenv.mkDerivation rec {
# Work around unpacking deb containing binary with suid bit
tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu
tar -xf gitlab-deb-data.tar
+ rm gitlab-deb-data.tar
mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
rm -rf opt # only directory in data.tar.gz
@@ -95,6 +108,9 @@ stdenv.mkDerivation rec {
GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION;
GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION;
+ tests = {
+ nixos-test-passes = nixosTests.gitlab;
+ };
};
meta = with lib; {
diff --git a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch
new file mode 100644
index 00000000000..9b95e668e04
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch
@@ -0,0 +1,10 @@
+--- a/src/ruby/ext/grpc/extconf.rb
++++ b/src/ruby/ext/grpc/extconf.rb
+@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
+ if ENV['AR'].nil? || ENV['AR'].size == 0
+ ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs'
+ end
++ENV['AR'] = ENV['AR'] + ' rcs'
+ if ENV['CC'].nil? || ENV['CC'].size == 0
+ ENV['CC'] = RbConfig::CONFIG['CC']
+ end
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 81f1864099f..1a6eb99b678 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -1,30 +1,41 @@
source 'https://rubygems.org'
# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
-gem 'bundler', '>= 1.16.5'
+gem 'bundler', '>= 1.17.3'
-gem 'rugged', '~> 0.27'
+gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 6.1', require: 'linguist'
-gem 'gitlab-markup', '~> 1.6.5'
-gem 'gitaly-proto', '~> 1.3.0'
-gem 'activesupport', '~> 5.0.2'
+gem 'gitlab-markup', '~> 1.7.0'
+gem 'activesupport', '~> 5.1.7'
+gem 'gitaly-proto', '~> 1.36.0'
gem 'rdoc', '~> 4.2'
-gem 'gitlab-gollum-lib', '~> 4.2', require: false
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
-gem 'grpc', '~> 1.15.0'
-gem 'sentry-raven', '~> 2.7.2', require: false
+gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
+gem 'grpc', '~> 1.19.0'
+gem 'sentry-raven', '~> 2.9.0', require: false
gem 'faraday', '~> 0.12'
+gem 'rbtrace', require: false
+
+# Labkit provides observability functionality
+gem 'gitlab-labkit', '~> 0.3.0'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 8.9.0'
-gem 'google-protobuf', '~> 3.6'
+gem 'google-protobuf', '~> 3.7.1'
group :development, :test do
- gem 'rubocop', '~> 0.50', require: false
+ gem 'rubocop', '~> 0.69', require: false
gem 'rspec', require: false
gem 'rspec-parameterized', require: false
gem 'timecop', require: false
gem 'factory_bot', require: false
+ gem 'pry', '~> 0.12.2', require: false
+
+ # gitlab-shell spec gems
+ gem 'listen', '~> 0.5.0'
+ gem 'simplecov', '~> 0.9.0', require: false
+ gem 'vcr', '~> 4.0.0'
+ gem 'webmock', '~> 3.4.0'
end
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 59f8ad69f22..0a86273f7cb 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -2,7 +2,20 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
- activesupport (5.0.7)
+ actionpack (5.1.7)
+ actionview (= 5.1.7)
+ activesupport (= 5.1.7)
+ rack (~> 2.0)
+ rack-test (>= 0.6.3)
+ rails-dom-testing (~> 2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ actionview (5.1.7)
+ activesupport (= 5.1.7)
+ builder (~> 3.1)
+ erubi (~> 1.4)
+ rails-dom-testing (~> 2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
+ activesupport (5.1.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -10,35 +23,41 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
+ addressable (2.6.0)
+ public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
- binding_of_caller (0.8.0)
- debug_inspector (>= 0.0.1)
+ binding_ninja (0.2.3)
+ builder (3.2.3)
charlock_holmes (0.7.6)
coderay (1.1.2)
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
- concurrent-ruby (1.1.3)
+ concurrent-ruby (1.1.5)
+ crack (0.4.3)
+ safe_yaml (~> 1.0.0)
crass (1.0.4)
- debug_inspector (0.0.3)
diff-lcs (1.3)
+ docile (1.1.5)
equalizer (0.0.11)
+ erubi (1.8.0)
escape_utils (1.2.1)
- factory_bot (4.11.1)
- activesupport (>= 3.0.0)
- faraday (0.15.3)
+ factory_bot (5.0.2)
+ activesupport (>= 4.2.0)
+ faraday (0.15.4)
multipart-post (>= 1.2, < 3)
+ ffi (1.10.0)
gemojione (3.3.0)
json
- gitaly-proto (1.3.0)
+ gitaly-proto (1.36.0)
grpc (~> 1.0)
- github-linguist (6.2.0)
+ github-linguist (6.4.1)
charlock_holmes (~> 0.7.6)
escape_utils (~> 1.2.0)
mime-types (>= 1.19)
rugged (>= 0.25.1)
github-markup (1.7.0)
- gitlab-gollum-lib (4.2.7.5)
+ gitlab-gollum-lib (4.2.7.7)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
@@ -46,7 +65,7 @@ GEM
rouge (~> 3.1)
sanitize (~> 4.6.4)
stringex (~> 2.6)
- gitlab-gollum-rugged_adapter (0.4.4.1)
+ gitlab-gollum-rugged_adapter (0.4.4.2)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-grit (2.8.2)
@@ -54,118 +73,172 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
- gitlab-markup (1.6.5)
+ gitlab-labkit (0.3.0)
+ actionpack (~> 5)
+ activesupport (~> 5)
+ grpc (~> 1.19.0)
+ jaeger-client (~> 0.10)
+ opentracing (~> 0.4)
+ gitlab-markup (1.7.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
- google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.2)
+ google-protobuf (3.7.1)
+ googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
- grpc (1.15.0)
+ grpc (1.19.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
- i18n (1.1.1)
+ hashdiff (0.3.9)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
- json (2.1.0)
+ jaeger-client (0.10.0)
+ opentracing (~> 0.3)
+ thrift
+ jaro_winkler (1.5.2)
+ json (2.2.0)
licensee (8.9.2)
rugged (~> 0.24)
+ listen (0.5.3)
+ loofah (2.2.3)
+ crass (~> 1.0.2)
+ nokogiri (>= 1.5.9)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
+ method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
- mime-types-data (3.2018.0812)
- mini_portile2 (2.3.0)
+ mime-types-data (3.2019.0331)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
+ msgpack (1.2.10)
+ multi_json (1.13.1)
multipart-post (2.0.0)
- nokogiri (1.8.5)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.3)
+ mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
- parallel (1.12.1)
- parser (2.5.3.0)
+ opentracing (0.5.0)
+ optimist (3.0.0)
+ parallel (1.17.0)
+ parser (2.6.3.0)
ast (~> 2.4.0)
posix-spawn (0.3.13)
- powerpack (0.1.2)
proc_to_ast (0.1.0)
coderay
parser
unparser
procto (0.0.3)
+ pry (0.12.2)
+ coderay (~> 1.1.0)
+ method_source (~> 0.9.0)
+ public_suffix (3.0.3)
+ rack (2.0.7)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rails-dom-testing (2.0.3)
+ activesupport (>= 4.2.0)
+ nokogiri (>= 1.6)
+ rails-html-sanitizer (1.0.4)
+ loofah (~> 2.2, >= 2.2.2)
rainbow (3.0.0)
+ rbtrace (0.4.11)
+ ffi (>= 1.0.6)
+ msgpack (>= 0.4.3)
+ optimist (>= 3.0.0)
rdoc (4.3.0)
- rouge (3.3.0)
- rspec (3.7.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-core (3.7.1)
- rspec-support (~> 3.7.0)
- rspec-expectations (3.7.0)
+ rouge (3.5.1)
+ rspec (3.8.0)
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-core (3.8.0)
+ rspec-support (~> 3.8.0)
+ rspec-expectations (3.8.3)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-mocks (3.7.0)
+ rspec-support (~> 3.8.0)
+ rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-parameterized (0.4.0)
- binding_of_caller
+ rspec-support (~> 3.8.0)
+ rspec-parameterized (0.4.2)
+ binding_ninja (>= 0.2.3)
parser
proc_to_ast
rspec (>= 2.13, < 4)
unparser
- rspec-support (3.7.1)
- rubocop (0.54.0)
+ rspec-support (3.8.0)
+ rubocop (0.69.0)
+ jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
- parser (>= 2.5)
- powerpack (~> 0.1)
+ parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (~> 1.0, >= 1.0.1)
+ unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.0)
- rugged (0.27.5)
+ rugged (0.28.1)
+ safe_yaml (1.0.5)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
- sentry-raven (2.7.2)
+ sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
- stringex (2.8.4)
+ simplecov (0.9.2)
+ docile (~> 1.1.0)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.9.0)
+ simplecov-html (0.9.0)
+ stringex (2.8.5)
thread_safe (0.3.6)
+ thrift (0.11.0.0)
timecop (0.9.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- unicode-display_width (1.4.0)
- unparser (0.2.8)
+ unicode-display_width (1.6.0)
+ unparser (0.4.5)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
diff-lcs (~> 1.3)
equalizer (~> 0.0.9)
- parser (>= 2.3.1.2, < 2.6)
+ parser (~> 2.6.3)
procto (~> 0.0.2)
+ vcr (4.0.0)
+ webmock (3.4.2)
+ addressable (>= 2.3.6)
+ crack (>= 0.3.2)
+ hashdiff
PLATFORMS
ruby
DEPENDENCIES
- activesupport (~> 5.0.2)
- bundler (>= 1.16.5)
+ activesupport (~> 5.1.7)
+ bundler (>= 1.17.3)
factory_bot
faraday (~> 0.12)
- gitaly-proto (~> 1.3.0)
+ gitaly-proto (~> 1.36.0)
github-linguist (~> 6.1)
- gitlab-gollum-lib (~> 4.2)
- gitlab-gollum-rugged_adapter (~> 0.4.4)
- gitlab-markup (~> 1.6.5)
- google-protobuf (~> 3.6)
- grpc (~> 1.15.0)
+ gitlab-gollum-lib (~> 4.2.7.7)
+ gitlab-gollum-rugged_adapter (~> 0.4.4.2)
+ gitlab-labkit (~> 0.3.0)
+ gitlab-markup (~> 1.7.0)
+ google-protobuf (~> 3.7.1)
+ grpc (~> 1.19.0)
licensee (~> 8.9.0)
+ listen (~> 0.5.0)
+ pry (~> 0.12.2)
+ rbtrace
rdoc (~> 4.2)
rspec
rspec-parameterized
- rubocop (~> 0.50)
- rugged (~> 0.27)
- sentry-raven (~> 2.7.2)
+ rubocop (~> 0.69)
+ rugged (~> 0.28)
+ sentry-raven (~> 2.9.0)
+ simplecov (~> 0.9.0)
timecop
+ vcr (~> 4.0.0)
+ webmock (~> 3.4.0)
BUNDLED WITH
- 1.17.1
+ 1.17.3
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 349b75f1934..873d9f39090 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -1,20 +1,30 @@
-{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv }:
+{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv, pkgconfig, libgit2 }:
let
- rubyEnv = bundlerEnv {
+ rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
gemdir = ./.;
+ gemset =
+ let x = import (gemdir + "/gemset.nix");
+ in x // {
+ # grpc expects the AR environment variable to contain `ar rpc`. See the
+ # discussion in nixpkgs #63056.
+ grpc = x.grpc // {
+ patches = [ ../fix-grpc-ar.patch ];
+ dontBuild = false;
+ };
+ };
};
in buildGoPackage rec {
- version = "1.12.2";
- name = "gitaly-${version}";
+ version = "1.53.2";
+ pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy";
+ sha256 = "0x4dhqaxx6n5jlcvf69rglxiz11037ghgcnskks6qnlcbkd85j3d";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -23,11 +33,21 @@ in buildGoPackage rec {
inherit rubyEnv;
};
- buildInputs = [ rubyEnv.wrappedRuby ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ rubyEnv.wrappedRuby libgit2 ];
+ goDeps = ./deps.nix;
+ preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor";
postInstall = ''
mkdir -p $ruby
- cp -rv $src/ruby/{bin,lib} $ruby
+ cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby
+
+ # gitlab-shell will try to read its config relative to the source
+ # code by default which doesn't work in nixos because it's a
+ # read-only filesystem
+ substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \
+ "File.join(ROOT_PATH, 'config.yml')" \
+ "'/run/gitlab/shell-config.yml'"
'';
outputs = [ "bin" "out" "ruby" ];
@@ -35,7 +55,7 @@ in buildGoPackage rec {
meta = with stdenv.lib; {
homepage = http://www.gitlab.com/;
platforms = platforms.unix;
- maintainers = with maintainers; [ roblabla ];
+ maintainers = with maintainers; [ roblabla globin fpletz ];
license = licenses.mit;
};
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
new file mode 100644
index 00000000000..5522185783d
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -0,0 +1,669 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/gocloud";
+ rev = "v0.26.0";
+ sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.1";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cf";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "v1.0.0";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+ };
+ }
+ {
+ goPackagePath = "github.com/certifi/gocertifi";
+ fetch = {
+ type = "git";
+ url = "https://github.com/certifi/gocertifi";
+ rev = "ee1a9a0726d2";
+ sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4";
+ };
+ }
+ {
+ goPackagePath = "github.com/client9/misspell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/client9/misspell";
+ rev = "v0.3.4";
+ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+ };
+ }
+ {
+ goPackagePath = "github.com/cloudflare/tableflip";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cloudflare/tableflip";
+ rev = "8392f1641731";
+ sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8";
+ };
+ }
+ {
+ goPackagePath = "github.com/codahale/hdrhistogram";
+ fetch = {
+ type = "git";
+ url = "https://github.com/codahale/hdrhistogram";
+ rev = "3a0bb77429bd";
+ sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/getsentry/raven-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getsentry/raven-go";
+ rev = "v0.1.2";
+ sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.8.0";
+ sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.3.0";
+ sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-stack/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-stack/stack";
+ rev = "v1.8.0";
+ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "v1.1.1";
+ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/lint";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/lint";
+ rev = "06c8688daad7";
+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/mock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/mock";
+ rev = "v1.1.1";
+ sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.3.1";
+ sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "v1.1.1";
+ sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+ rev = "v1.0.0";
+ sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+ rev = "v1.2.0";
+ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+ };
+ }
+ {
+ goPackagePath = "github.com/hpcloud/tail";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hpcloud/tail";
+ rev = "v1.0.0";
+ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+ };
+ }
+ {
+ goPackagePath = "github.com/json-iterator/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/json-iterator/go";
+ rev = "v1.1.6";
+ sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/kelseyhightower/envconfig";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kelseyhightower/envconfig";
+ rev = "v1.3.0";
+ sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
+ };
+ }
+ {
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "v1.0.0";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.1";
+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/libgit2/git2go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/libgit2/git2go";
+ rev = "ecaeb7a21d47";
+ sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr";
+ };
+ }
+ {
+ goPackagePath = "github.com/lightstep/lightstep-tracer-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lightstep/lightstep-tracer-go";
+ rev = "v0.15.6";
+ sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "v1.0.1";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/concurrent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/concurrent";
+ rev = "bacd9c7ef1dd";
+ sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/reflect2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/reflect2";
+ rev = "v1.0.1";
+ sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/ginkgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/ginkgo";
+ rev = "v1.7.0";
+ sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/gomega";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/gomega";
+ rev = "v1.4.3";
+ sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+ };
+ }
+ {
+ goPackagePath = "github.com/opentracing/opentracing-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opentracing/opentracing-go";
+ rev = "v1.0.2";
+ sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+ };
+ }
+ {
+ goPackagePath = "github.com/philhofer/fwd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/philhofer/fwd";
+ rev = "v1.0.0";
+ sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.0";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "v1.0.0";
+ sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "fd36f4220a90";
+ sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "v0.4.1";
+ sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "v0.0.2";
+ sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.2.0";
+ sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ };
+ }
+ {
+ goPackagePath = "github.com/tinylib/msgp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tinylib/msgp";
+ rev = "v1.1.0";
+ sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff";
+ };
+ }
+ {
+ goPackagePath = "github.com/uber-go/atomic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/atomic";
+ rev = "v1.3.2";
+ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+ };
+ }
+ {
+ goPackagePath = "github.com/uber/jaeger-client-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber/jaeger-client-go";
+ rev = "v2.15.0";
+ sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj";
+ };
+ }
+ {
+ goPackagePath = "github.com/uber/jaeger-lib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber/jaeger-lib";
+ rev = "v1.5.0";
+ sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
+ };
+ }
+ {
+ goPackagePath = "gitlab.com/gitlab-org/gitaly-proto";
+ fetch = {
+ type = "git";
+ url = "https://gitlab.com/gitlab-org/gitaly-proto.git";
+ rev = "v1.36.0";
+ sha256 = "0xma8ys3lf1bdhlkmcis31xs1h1dshcr5796wwfwnzijwk6422m3";
+ };
+ }
+ {
+ goPackagePath = "gitlab.com/gitlab-org/labkit";
+ fetch = {
+ type = "git";
+ url = "https://gitlab.com/gitlab-org/labkit.git";
+ rev = "0c3fc7cdd57c";
+ sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/atomic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/atomic";
+ rev = "v1.3.2";
+ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/lint";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/lint";
+ rev = "06c8688daad7";
+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "d28f0bde5980";
+ sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "d2e6202438be";
+ sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "37e7f081c4d4";
+ sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "d0b11bdaac8a";
+ sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "6cd1fcedba52";
+ sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "v1.1.0";
+ sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/genproto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-genproto";
+ rev = "bd91e49a0898";
+ sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/grpc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc/grpc-go";
+ rev = "v1.16.0";
+ sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/DataDog/dd-trace-go.v1";
+ rev = "v1.7.0";
+ sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "20d25e280405";
+ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/tomb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/tomb.v1";
+ rev = "dd632973f1e7";
+ sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "88497007e858";
+ sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc";
+ };
+ }
+]
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index c06be7891ff..fd1af22dd78 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -7,14 +7,38 @@
};
version = "0.0.7";
};
- activesupport = {
- dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ actionpack = {
+ dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5";
+ sha256 = "0zyi3dc50ii2msdkawaf11y4xw645ig57ha2jfnr8lpr8s1nlh52";
type = "gem";
};
- version = "5.0.7";
+ version = "5.1.7";
+ };
+ actionview = {
+ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0i2j580njb767yhf0k5ih3qqg38ybiah80ai8dsr6kjjw35aj747";
+ type = "gem";
+ };
+ version = "5.1.7";
+ };
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0znhiy90hdlx66jqhaycin4qrphrymsw68c36a1an7g481zvfv91";
+ type = "gem";
+ };
+ version = "5.1.7";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -25,6 +49,17 @@
};
version = "0.2.0";
};
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+ type = "gem";
+ };
+ version = "2.6.0";
+ };
ast = {
source = {
remotes = ["https://rubygems.org"];
@@ -33,14 +68,25 @@
};
version = "2.4.0";
};
- binding_of_caller = {
- dependencies = ["debug_inspector"];
+ binding_ninja = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g";
+ sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
type = "gem";
};
- version = "0.8.0";
+ version = "0.2.3";
+ };
+ builder = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+ type = "gem";
+ };
+ version = "3.2.3";
};
charlock_holmes = {
source = {
@@ -68,12 +114,23 @@
version = "0.1.5";
};
concurrent-ruby = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18q9skp5pfq4jwbxzmw8q2rn4cpw6mf4561i2hsjcl1nxdag2jvb";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.5";
+ };
+ crack = {
+ dependencies = ["safe_yaml"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+ type = "gem";
+ };
+ version = "0.4.3";
};
crass = {
source = {
@@ -83,14 +140,6 @@
};
version = "1.0.4";
};
- debug_inspector = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0";
- type = "gem";
- };
- version = "0.0.3";
- };
diff-lcs = {
source = {
remotes = ["https://rubygems.org"];
@@ -99,6 +148,14 @@
};
version = "1.3";
};
+ docile = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+ type = "gem";
+ };
+ version = "1.1.5";
+ };
equalizer = {
source = {
remotes = ["https://rubygems.org"];
@@ -107,6 +164,16 @@
};
version = "0.0.11";
};
+ erubi = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
escape_utils = {
source = {
remotes = ["https://rubygems.org"];
@@ -117,21 +184,33 @@
};
factory_bot = {
dependencies = ["activesupport"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13q1b7imb591068plg4ashgsqgzarvfjz6xxn3jk6klzikz5zhg1";
+ sha256 = "02ijqa3g6lb8l8mvi40z1zgh9bb3gr08p2r2ym159ghhfbcrmbwk";
type = "gem";
};
- version = "4.11.1";
+ version = "5.0.2";
};
faraday = {
dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52";
+ sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
type = "gem";
};
- version = "0.15.3";
+ version = "0.15.4";
+ };
+ ffi = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ type = "gem";
+ };
+ version = "1.10.0";
};
gemojione = {
dependencies = ["json"];
@@ -144,21 +223,25 @@
};
gitaly-proto = {
dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680";
+ sha256 = "11bkrf2z5ppp55cipawdpinrva42x12grp2gl1dp1jdb35crqick";
type = "gem";
};
- version = "1.3.0";
+ version = "1.36.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fs0i5xxsl91hnfa17ipk8cwxrg84kjg9mzxvxkd4ykldfdp353y";
+ sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf";
type = "gem";
};
- version = "6.2.0";
+ version = "6.4.1";
};
github-markup = {
source = {
@@ -170,21 +253,25 @@
};
gitlab-gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
+ sha256 = "13m26b32iznp0lbq984dijx7n4ckg99zckwp80gv1knq8n0bpfbf";
type = "gem";
};
- version = "4.2.7.5";
+ version = "4.2.7.7";
};
gitlab-gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
+ sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4";
type = "gem";
};
- version = "0.4.4.1";
+ version = "0.4.4.2";
};
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
@@ -195,13 +282,26 @@
};
version = "2.8.2";
};
- gitlab-markup = {
+ gitlab-labkit = {
+ dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
+ sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1";
type = "gem";
};
- version = "1.6.5";
+ version = "0.3.0";
+ };
+ gitlab-markup = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
+ type = "gem";
+ };
+ version = "1.7.0";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
@@ -213,39 +313,57 @@
version = "1.0.1";
};
google-protobuf = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
+ sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
type = "gem";
};
- version = "3.6.1";
+ version = "3.7.1";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
+ sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.4";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
+ sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
type = "gem";
};
- version = "1.15.0";
+ version = "1.19.0";
+ };
+ hashdiff = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
+ type = "gem";
+ };
+ version = "0.3.9";
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "1.1.1";
+ version = "1.6.0";
};
ice_nine = {
source = {
@@ -255,13 +373,36 @@
};
version = "0.11.2";
};
- json = {
+ jaeger-client = {
+ dependencies = ["opentracing" "thrift"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
type = "gem";
};
- version = "2.1.0";
+ version = "0.10.0";
+ };
+ jaro_winkler = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
+ json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+ type = "gem";
+ };
+ version = "2.2.0";
};
licensee = {
dependencies = ["rugged"];
@@ -272,6 +413,25 @@
};
version = "8.9.2";
};
+ listen = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl";
+ type = "gem";
+ };
+ version = "0.5.3";
+ };
+ loofah = {
+ dependencies = ["crass" "nokogiri"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
+ type = "gem";
+ };
+ version = "2.2.3";
+ };
memoizable = {
dependencies = ["thread_safe"];
source = {
@@ -281,6 +441,14 @@
};
version = "0.4.2";
};
+ method_source = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+ type = "gem";
+ };
+ version = "0.9.2";
+ };
mime-types = {
dependencies = ["mime-types-data"];
source = {
@@ -291,20 +459,22 @@
version = "3.2.2";
};
mime-types-data = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
- version = "3.2018.0812";
+ version = "3.2019.0331";
};
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
source = {
@@ -314,6 +484,24 @@
};
version = "5.11.3";
};
+ msgpack = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch";
+ type = "gem";
+ };
+ version = "1.2.10";
+ };
+ multi_json = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+ type = "gem";
+ };
+ version = "1.13.1";
+ };
multipart-post = {
source = {
remotes = ["https://rubygems.org"];
@@ -324,12 +512,14 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+ sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
- version = "1.8.5";
+ version = "1.10.3";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -340,22 +530,44 @@
};
version = "1.5.0";
};
- parallel = {
+ opentracing = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+ sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy";
type = "gem";
};
- version = "1.12.1";
+ version = "0.5.0";
+ };
+ optimist = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
+ parallel = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
+ type = "gem";
+ };
+ version = "1.17.0";
};
parser = {
dependencies = ["ast"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
+ sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
type = "gem";
};
- version = "2.5.3.0";
+ version = "2.6.3.0";
};
posix-spawn = {
source = {
@@ -365,14 +577,6 @@
};
version = "0.3.13";
};
- powerpack = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
- type = "gem";
- };
- version = "0.1.2";
- };
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
source = {
@@ -390,6 +594,66 @@
};
version = "0.0.3";
};
+ pry = {
+ dependencies = ["coderay" "method_source"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
+ type = "gem";
+ };
+ version = "0.12.2";
+ };
+ public_suffix = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ type = "gem";
+ };
+ version = "3.0.3";
+ };
+ rack = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
+ type = "gem";
+ };
+ version = "2.0.7";
+ };
+ rack-test = {
+ dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ rails-dom-testing = {
+ dependencies = ["activesupport" "nokogiri"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
+ type = "gem";
+ };
+ version = "2.0.3";
+ };
+ rails-html-sanitizer = {
+ dependencies = ["loofah"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
rainbow = {
source = {
remotes = ["https://rubygems.org"];
@@ -398,6 +662,15 @@
};
version = "3.0.0";
};
+ rbtrace = {
+ dependencies = ["ffi" "msgpack" "optimist"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
+ type = "gem";
+ };
+ version = "0.4.11";
+ };
rdoc = {
source = {
remotes = ["https://rubygems.org"];
@@ -407,74 +680,90 @@
version = "4.3.0";
};
rouge = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
+ sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
type = "gem";
};
- version = "3.3.0";
+ version = "3.5.1";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01";
+ sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.0";
};
rspec-core = {
dependencies = ["rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj";
+ sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy";
+ sha256 = "1c4gs5ybf7km0qshdm92p38zvg32n1j2kr5fgs2icacz7xf2y6fy";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.3";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3";
+ sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.0";
};
rspec-parameterized = {
- dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"];
+ dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0";
+ sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
type = "gem";
};
- version = "0.4.0";
+ version = "0.4.2";
};
rspec-support = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1";
+ sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.0";
};
rubocop = {
- dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is";
+ sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i";
type = "gem";
};
- version = "0.54.0";
+ version = "0.69.0";
};
ruby-progressbar = {
source = {
@@ -485,12 +774,24 @@
version = "1.10.0";
};
rugged = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
+ sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem";
};
- version = "0.27.5";
+ version = "0.28.1";
+ };
+ safe_yaml = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
+ type = "gem";
+ };
+ version = "1.0.5";
};
sanitize = {
dependencies = ["crass" "nokogiri" "nokogumbo"];
@@ -503,20 +804,41 @@
};
sentry-raven = {
dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4";
+ sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem";
};
- version = "2.7.2";
+ version = "2.9.0";
+ };
+ simplecov = {
+ dependencies = ["docile" "multi_json" "simplecov-html"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12";
+ type = "gem";
+ };
+ version = "0.9.2";
+ };
+ simplecov-html = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc";
+ type = "gem";
+ };
+ version = "0.9.0";
};
stringex = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
+ sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys";
type = "gem";
};
- version = "2.8.4";
+ version = "2.8.5";
};
thread_safe = {
source = {
@@ -526,6 +848,16 @@
};
version = "0.3.6";
};
+ thrift = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+ type = "gem";
+ };
+ version = "0.11.0.0";
+ };
timecop = {
source = {
remotes = ["https://rubygems.org"];
@@ -544,20 +876,41 @@
version = "1.2.5";
};
unicode-display_width = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
+ sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
type = "gem";
};
- version = "1.4.0";
+ version = "1.6.0";
};
unparser = {
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rh1649846ac17av30x0b0v9l45v0x1j2y1i8m1a7xdd0v4sld0z";
+ sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c";
type = "gem";
};
- version = "0.2.8";
+ version = "0.4.5";
+ };
+ vcr = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ webmock = {
+ dependencies = ["addressable" "crack" "hashdiff"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib";
+ type = "gem";
+ };
+ version = "3.4.2";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 895e1e13bec..cd4784b36c8 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
- version = "8.4.4";
- name = "gitlab-shell-${version}";
+ version = "9.3.0";
+ pname = "gitlab-shell";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq";
+ sha256 = "1r000h4sgplx7giqvqs5iy0zh3drf6qa1iiq0mxlk3h9fshs1348";
};
buildInputs = [ ruby bundler go ];
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
patches = [ ./remove-hardcoded-locations.patch ];
installPhase = ''
+ export GOCACHE="$TMPDIR/go-cache"
+
ruby bin/compile
mkdir -p $out/
cp -R . $out/
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index 7819c863a35..d8337ebb9ea 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -1,16 +1,16 @@
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
-index 435cb29..078c1df 100644
+index f951fe6..b422fe3 100644
--- a/go/internal/config/config.go
+++ b/go/internal/config/config.go
-@@ -2,7 +2,6 @@ package config
-
+@@ -3,7 +3,6 @@ package config
import (
"io/ioutil"
+ "net/url"
- "os"
"path"
+ "strings"
- yaml "gopkg.in/yaml.v2"
-@@ -26,16 +25,13 @@ type Config struct {
+@@ -30,16 +29,13 @@ type Config struct {
}
func New() (*Config, error) {
@@ -28,12 +28,25 @@ index 435cb29..078c1df 100644
+ return newFromFile("/run/gitlab/shell-config.yml")
}
- func newFromFile(filename string) (*Config, error) {
+ func (c *Config) FeatureEnabled(featureName string) bool {
+diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
+index 0600a18..c46f2d7 100644
+--- a/lib/gitlab_keys.rb
++++ b/lib/gitlab_keys.rb
+@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
+ attr_accessor :auth_file, :key
+
+ def self.command(whatever)
+- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
++ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
+ end
+
+ def self.command_key(key_id)
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
-index 57c70f5..700569b 100644
+index 2cb76a8..f59ad5e 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
-@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
+@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
args = [executable, gitaly_address, json_args]
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
@@ -43,16 +56,16 @@ index 57c70f5..700569b 100644
end
def api
-diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
-index 0600a18..6814f0a 100644
---- a/lib/gitlab_keys.rb
-+++ b/lib/gitlab_keys.rb
-@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
- attr_accessor :auth_file, :key
-
- def self.command(whatever)
-- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
-+ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
- end
-
- def self.command_key(key_id)
+diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go
+index 2cb76a8..f59ad5e 100644
+--- a/go/internal/command/fallback/fallback.go
++++ b/go/internal/command/fallback/fallback.go
+@@ -21,7 +21,7 @@
+ )
+
+ func (c *Command) Execute() error {
+- rubyCmd := filepath.Join(c.RootDir, "bin", RubyProgram)
++ rubyCmd := filepath.Join("/run/current-system/sw/bin", RubyProgram)
+
+ // Ensure rubyArgs[0] is the full path to gitlab-shell-ruby
+ rubyArgs := append([]string{rubyCmd}, c.Args[1:]...)
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index ad3b11f3b2c..12f354bc2fb 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchFromGitLab, git, go }:
stdenv.mkDerivation rec {
- name = "gitlab-workhorse-${version}";
+ pname = "gitlab-workhorse";
- version = "8.0.2";
+ version = "8.7.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690";
+ sha256 = "1zlngc498hnzbxwdjn3ymr0xwrnfgnzzhn9lyf37yfbjl8x28n3z";
};
buildInputs = [ git go ];
- makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ];
+ makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" "GOCACHE=$(TMPDIR)/go-cache" ];
meta = with stdenv.lib; {
homepage = http://www.gitlab.com/;
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index f59e61208ac..8bffc2a973d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -1,7 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '5.0.7.1'
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails', '5.2.3'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -12,19 +11,19 @@ gem 'responders', '~> 2.0'
gem 'sprockets', '~> 3.7.0'
# Default values for AR models
-gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
+gem 'default_value_for', '~> 3.2.0'
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'pg', '~> 1.1', group: :postgres
-gem 'rugged', '~> 0.27'
-gem 'grape-path-helpers', '~> 1.0'
+gem 'rugged', '~> 0.28'
+gem 'grape-path-helpers', '~> 1.1'
gem 'faraday', '~> 0.12'
# Authentication libraries
-gem 'devise', '~> 4.4'
+gem 'devise', '~> 4.6'
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8'
@@ -42,11 +41,14 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'rack-oauth2', '~> 1.2.1'
+gem 'omniauth_openid_connect', '~> 0.3.1'
+gem "omniauth-ultraauth", '~> 0.0.2'
+gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'rack-oauth2', '~> 1.9.3'
gem 'jwt', '~> 2.1.0'
# Spam and anti-bot protection
-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
# Two-factor authentication
@@ -58,6 +60,8 @@ gem 'u2f', '~> 0.2.1'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.6'
gem 'rubyzip', '~> 1.2.2', require: 'zip'
+# GitLab Pages letsencrypt support
+gem 'acme-client', '~> 2.0.2'
# Browser detection
gem 'browser', '~> 2.5'
@@ -68,7 +72,7 @@ gem 'gpgme', '~> 2.0.18'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
@@ -79,6 +83,8 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
# GraphQL API
gem 'graphql', '~> 1.8.0'
gem 'graphiql-rails', '~> 1.4.10'
+gem 'apollo_upload_server', '~> 2.0.0.beta3'
+gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -94,13 +100,15 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
-gem 'fog-aws', '~> 2.0.1'
-gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 1.7.1'
-gem 'fog-local', '~> 0.3'
-gem 'fog-openstack', '~> 0.1'
+gem 'fog-aws', '~> 3.5'
+# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
+# Also see config/initializers/fog_core_patch.rb.
+gem 'fog-core', '= 2.1.0'
+gem 'fog-google', '~> 1.8'
+gem 'fog-local', '~> 0.6'
+gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.2.0'
+gem 'fog-aliyun', '~> 0.3'
# for Google storage
gem 'google-api-client', '~> 0.23'
@@ -113,22 +121,22 @@ gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.6.5'
+gem 'deckar01-task_list', '2.2.0'
+gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
-gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.8'
-gem 'asciidoctor-plantuml', '0.0.8'
-gem 'rouge', '~> 3.1'
-gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.5'
+gem 'asciidoctor', '~> 2.0.10'
+gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
+gem 'asciidoctor-plantuml', '0.0.9'
+gem 'rouge', '~> 3.5'
+gem 'truncato', '~> 0.7.11'
+gem 'bootstrap_form', '~> 4.2.0'
+gem 'nokogiri', '~> 1.10.3'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -138,38 +146,36 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0'
# Application server
-# The 2.0.6 version of rack requires monkeypatch to be present in
-# `config.ru`. This can be removed once a new update for Rack
-# is available that contains https://github.com/rack/rack/pull/1201.
-gem 'rack', '2.0.6'
+gem 'rack', '~> 2.0.7'
group :unicorn do
- gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn', '~> 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
group :puma do
gem 'puma', '~> 3.12', require: false
gem 'puma_worker_killer', require: false
+ gem 'rack-timeout', require: false
end
# State machine
gem 'state_machines-activerecord', '~> 0.5.1'
# Issue tags
-gem 'acts-as-taggable-on', '~> 5.0'
+gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
-gem 'sidekiq', '~> 5.2.1'
-gem 'sidekiq-cron', '~> 0.6.0'
+gem 'sidekiq', '~> 5.2.7'
+gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.6.0'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
-gem 'rufus-scheduler', '~> 3.4'
+gem 'fugit', '~> 1.2.1'
# HTTP requests
-gem 'httparty', '~> 0.13.3'
+gem 'httparty', '~> 0.16.4'
# Colored output to console
gem 'rainbow', '~> 3.0'
@@ -185,10 +191,10 @@ gem 're2', '~> 1.1.1'
# Misc
-gem 'version_sorter', '~> 2.1.0'
+gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 3.1'
# User agent parsing
gem 'device_detector'
@@ -206,7 +212,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
gem 'hipchat', '~> 1.5.0'
-# JIRA integration
+# Jira integration
gem 'jira-ruby', '~> 1.4'
# Flowdock integration
@@ -225,7 +231,7 @@ gem 'asana', '~> 0.8.1'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 4.0.0'
+gem 'kubeclient', '~> 4.2.2'
# Sanitize user input
gem 'sanitize', '~> 4.6'
@@ -259,25 +265,25 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
-gem 'sass-rails', '~> 5.0.6'
-gem 'sass', '~> 3.5'
+gem 'sassc-rails', '~> 2.1.0'
gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.5.2'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
-gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3'
-gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0'
# Sentry integration
-gem 'sentry-raven', '~> 2.7'
+gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.9.7'
+# LabKit: Tracing and Correlation
+gem 'gitlab-labkit', '~> 0.3.0'
+
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 5.1'
@@ -285,7 +291,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.2.2', require: false, group: :development
-gem 'batch-loader', '~> 1.2.2'
+gem 'batch-loader', '~> 1.4.0'
# Perf bar
gem 'peek', '~> 1.0.1'
@@ -295,13 +301,16 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
+# Memory benchmarks
+gem 'derailed_benchmarks', require: false
+
# Metrics
group :metrics do
gem 'method_source', '~> 0.8', require: false
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~> 0.9.4'
+ gem 'prometheus-client-mmap', '~> 0.9.8'
gem 'raindrops', '~> 0.18'
end
@@ -309,7 +318,7 @@ group :development do
gem 'foreman', '~> 0.84.0'
gem 'brakeman', '~> 4.2', require: false
- gem 'letter_opener_web', '~> 1.3.0'
+ gem 'letter_opener_web', '~> 1.3.4'
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
# Better errors handler
@@ -321,7 +330,7 @@ group :development do
end
group :development, :test do
- gem 'bootsnap', '~> 1.3'
+ gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -331,8 +340,8 @@ group :development, :test do
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.7.0'
- gem 'rspec-retry', '~> 0.4.5'
+ gem 'rspec-rails', '~> 3.8.0'
+ gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
@@ -343,22 +352,24 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.10'
- gem 'capybara', '~> 2.16.1'
- gem 'capybara-screenshot', '~> 1.0.18'
- gem 'selenium-webdriver', '~> 3.12'
+ gem 'capybara', '~> 3.22.0'
+ gem 'capybara-screenshot', '~> 1.0.22'
+ gem 'selenium-webdriver', '~> 3.141'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 2.4', require: false
+ gem 'gitlab-styles', '~> 2.7', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.54.0'
+ gem 'rubocop', '~> 0.69.0'
+ gem 'rubocop-performance', '~> 1.1.0'
gem 'rubocop-rspec', '~> 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false
- gem 'haml_lint', '~> 0.28.0', require: false
- gem 'simplecov', '~> 0.14.0', require: false
+ gem 'haml_lint', '~> 0.31.0', require: false
+ gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
+ gem 'mdl', '~> 0.5.0', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -375,10 +386,10 @@ group :development, :test do
end
group :test do
- gem 'shoulda-matchers', '~> 3.1.2', require: false
+ gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
+ gem 'webmock', '~> 3.5.1'
gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.1'
@@ -395,6 +406,9 @@ gem 'html2text'
gem 'ruby-prof', '~> 0.17.0'
gem 'rbtrace', '~> 0.4', require: false
+gem 'memory_profiler', '~> 0.9', require: false
+gem 'benchmark-memory', '~> 0.1', require: false
+gem 'activerecord-explain-analyze', '~> 0.1', require: false
# OAuth
gem 'oauth2', '~> 1.4'
@@ -407,8 +421,8 @@ gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6'
# SSH host key support
-gem 'net-ssh', '~> 5.0'
-gem 'sshkey', '~> 1.9.0'
+gem 'net-ssh', '~> 5.2'
+gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -417,10 +431,11 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
-gem 'grpc', '~> 1.15.0'
+gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly'
-gem 'google-protobuf', '~> 3.6'
+gem 'grpc', '~> 1.19.0'
+
+gem 'google-protobuf', '~> 3.7.1'
gem 'toml-rb', '~> 1.0.0', require: false
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index 77b4360cf41..60939ae918c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -4,47 +4,56 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actioncable (5.0.7.1)
- actionpack (= 5.0.7.1)
- nio4r (>= 1.2, < 3.0)
- websocket-driver (~> 0.6.1)
- actionmailer (5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
+ acme-client (2.0.2)
+ faraday (~> 0.9, >= 0.9.1)
+ actioncable (5.2.3)
+ actionpack (= 5.2.3)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ actionmailer (5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.7.1)
- actionview (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionpack (5.2.3)
+ actionview (= 5.2.3)
+ activesupport (= 5.2.3)
rack (~> 2.0)
- rack-test (~> 0.6.3)
+ rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionview (5.2.3)
+ activesupport (= 5.2.3)
builder (~> 3.1)
- erubis (~> 2.7.0)
+ erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.7.1)
- activesupport (= 5.0.7.1)
+ activejob (5.2.3)
+ activesupport (= 5.2.3)
globalid (>= 0.3.6)
- activemodel (5.0.7.1)
- activesupport (= 5.0.7.1)
- activerecord (5.0.7.1)
- activemodel (= 5.0.7.1)
- activesupport (= 5.0.7.1)
- arel (~> 7.0)
+ activemodel (5.2.3)
+ activesupport (= 5.2.3)
+ activerecord (5.2.3)
+ activemodel (= 5.2.3)
+ activesupport (= 5.2.3)
+ arel (>= 9.0)
+ activerecord-explain-analyze (0.1.0)
+ activerecord (>= 4)
+ pg
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
- activesupport (5.0.7.1)
+ activestorage (5.2.3)
+ actionpack (= 5.2.3)
+ activerecord (= 5.2.3)
+ marcel (~> 0.3.1)
+ activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (5.0.0)
- activerecord (>= 4.2.8)
+ acts-as-taggable-on (6.0.0)
+ activerecord (~> 5.0)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
@@ -52,20 +61,25 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
akismet (2.0.0)
- arel (7.1.4)
+ apollo_upload_server (2.0.0.beta.3)
+ graphql (>= 1.8)
+ rails (>= 4.2)
+ arel (9.0.0)
asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
- asciidoctor (1.5.8)
- asciidoctor-plantuml (0.0.8)
- asciidoctor (~> 1.5)
+ asciidoctor (2.0.10)
+ asciidoctor-include-ext (0.3.1)
+ asciidoctor (>= 1.5.6, < 3.0.0)
+ asciidoctor-plantuml (0.0.9)
+ asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.0)
atomic (1.1.99)
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
- attr_required (1.0.0)
+ attr_required (1.0.1)
awesome_print (1.8.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
@@ -73,21 +87,25 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
babosa (1.0.2)
base32 (0.3.2)
- batch-loader (1.2.2)
+ batch-loader (1.4.0)
bcrypt (3.1.12)
bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0)
+ benchmark-memory (0.1.2)
+ memory_profiler (~> 0.9)
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindata (2.4.3)
- binding_ninja (0.2.2)
+ binding_ninja (0.2.3)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.2)
+ bootsnap (1.4.1)
msgpack (~> 1.0)
- bootstrap_form (2.7.0)
+ bootstrap_form (4.2.0)
+ actionpack (>= 5.0)
+ activemodel (>= 5.0)
brakeman (4.2.1)
browser (2.5.3)
builder (3.2.3)
@@ -98,13 +116,14 @@ GEM
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.1.0)
- capybara (2.16.1)
+ capybara (3.22.0)
addressable
mini_mime (>= 0.1.3)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- xpath (~> 2.0)
+ nokogiri (~> 1.8)
+ rack (>= 1.6.0)
+ rack-test (>= 0.6.3)
+ regexp_parser (~> 1.5)
+ xpath (~> 3.2)
capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4)
launchy
@@ -113,6 +132,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
+ character_set (1.1.2)
charlock_holmes (0.7.6)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
@@ -129,9 +149,9 @@ GEM
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
- concurrent-ruby (1.1.3)
- concurrent-ruby-ext (1.1.3)
- concurrent-ruby (= 1.1.3)
+ concurrent-ruby (1.1.5)
+ concurrent-ruby-ext (1.1.5)
+ concurrent-ruby (= 1.1.5)
connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@@ -143,14 +163,24 @@ GEM
database_cleaner (1.7.0)
debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8)
- deckar01-task_list (2.0.0)
+ deckar01-task_list (2.2.0)
html-pipeline
declarative (0.0.10)
declarative-option (0.1.0)
+ default_value_for (3.2.0)
+ activerecord (>= 3.2.0, < 6.0)
+ derailed_benchmarks (1.3.5)
+ benchmark-ips (~> 2)
+ get_process_mem (~> 0)
+ heapy (~> 0)
+ memory_profiler (~> 0)
+ rack (>= 1)
+ rake (> 10, < 13)
+ thor (~> 0.19)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.0.0)
- devise (4.4.3)
+ devise (4.6.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
@@ -166,7 +196,7 @@ GEM
diffy (3.1.0)
discordrb-webhooks-blackst0ne (3.3.0)
rest-client (~> 2.0)
- docile (1.1.5)
+ docile (1.3.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.2)
@@ -182,15 +212,16 @@ GEM
mail (~> 2.7)
encryptor (3.0.0)
equalizer (0.0.11)
- erubi (1.7.1)
- erubis (2.7.0)
+ erubi (1.8.0)
escape_utils (1.2.1)
- et-orbi (1.0.3)
+ et-orbi (1.2.1)
tzinfo
eventmachine (1.2.7)
excon (0.62.0)
execjs (2.6.0)
expression_parser (0.9.0)
+ extended-markdown-filter (0.6.0)
+ html-pipeline (~> 2.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
@@ -206,7 +237,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
- ffi (1.9.25)
+ ffi (1.10.0)
flipper (0.13.0)
flipper-active_record (0.13.0)
activerecord (>= 3.2, < 6)
@@ -217,32 +248,33 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
- fog-aliyun (0.2.0)
- fog-core (~> 1.27)
- fog-json (~> 1.0)
+ fog-aliyun (0.3.3)
+ fog-core
+ fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
- fog-aws (2.0.1)
- fog-core (~> 1.38)
- fog-json (~> 1.0)
+ fog-aws (3.5.2)
+ fog-core (~> 2.1)
+ fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
- fog-core (1.45.0)
+ fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
- fog-google (1.7.1)
- fog-core
- fog-json
- fog-xml
+ mime-types
+ fog-google (1.8.2)
+ fog-core (<= 2.1.0)
+ fog-json (~> 1.2)
+ fog-xml (~> 0.1.0)
google-api-client (~> 0.23.0)
- fog-json (1.0.2)
- fog-core (~> 1.0)
+ fog-json (1.2.0)
+ fog-core
multi_json (~> 1.10)
- fog-local (0.3.1)
- fog-core (~> 1.27)
- fog-openstack (0.1.21)
- fog-core (>= 1.40)
+ fog-local (0.6.0)
+ fog-core (>= 1.27, < 3.0)
+ fog-openstack (1.0.8)
+ fog-core (~> 2.1)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-rackspace (0.1.1)
@@ -253,17 +285,21 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
- font-awesome-rails (4.7.0.1)
- railties (>= 3.2, < 5.1)
+ font-awesome-rails (4.7.0.4)
+ railties (>= 3.2, < 6.0)
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
+ fugit (1.2.1)
+ et-orbi (~> 1.1, >= 1.1.8)
+ raabro (~> 1.1)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
+ gemoji (3.0.1)
gemojione (3.3.0)
json
- get_process_mem (0.2.0)
+ get_process_mem (0.2.3)
gettext (3.2.9)
locale (>= 2.0.5)
text (>= 1.3.0)
@@ -274,24 +310,29 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.5.0)
+ gitaly-proto (1.37.0)
grpc (~> 1.0)
github-markup (1.7.0)
- gitlab-default_value_for (3.1.1)
- activerecord (>= 3.2.0, < 6.0)
- gitlab-markup (1.6.5)
+ gitlab-labkit (0.3.0)
+ actionpack (~> 5)
+ activesupport (~> 5)
+ grpc (~> 1.19.0)
+ jaeger-client (~> 0.10)
+ opentracing (~> 0.4)
+ gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5)
- gitlab-styles (2.4.1)
- rubocop (~> 0.54.0)
+ gitlab-styles (2.7.0)
+ rubocop (~> 0.69.0)
rubocop-gitlab-security (~> 0.1.0)
+ rubocop-performance (~> 1.1.0)
rubocop-rspec (~> 1.19)
- gitlab_omniauth-ldap (2.0.4)
+ gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (0.4.1)
+ globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.0)
actionpack (>= 3.0)
@@ -304,8 +345,8 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.2)
+ google-protobuf (3.7.1)
+ googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
@@ -326,8 +367,8 @@ GEM
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
- grape-path-helpers (1.0.6)
- activesupport (>= 4, < 5.1)
+ grape-path-helpers (1.1.0)
+ activesupport
grape (~> 1.0)
rake (~> 12)
grape_logging (1.7.0)
@@ -336,13 +377,21 @@ GEM
railties
sprockets-rails
graphql (1.8.1)
- grpc (1.15.0)
+ graphql-docs (1.6.0)
+ commonmarker (~> 0.16)
+ escape_utils (~> 1.2)
+ extended-markdown-filter (~> 0.4)
+ gemoji (~> 3.0)
+ graphql (~> 1.6)
+ html-pipeline (~> 2.8)
+ sass (~> 3.4)
+ grpc (1.19.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
haml (5.0.4)
temple (>= 0.8.0)
tilt
- haml_lint (0.28.0)
+ haml_lint (0.31.0)
haml (>= 4.0, < 5.1)
rainbow
rake (>= 10, < 13)
@@ -353,12 +402,13 @@ GEM
thor
tilt
hangouts-chat (0.0.5)
- hashdiff (0.3.4)
+ hashdiff (0.3.8)
hashie (3.5.7)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
health_check (2.6.0)
rails (>= 4.0)
+ heapy (0.1.4)
hipchat (1.5.2)
httparty
mimemagic
@@ -377,11 +427,11 @@ GEM
domain_name (~> 0.5)
http-form_data (2.1.1)
http_parser.rb (0.6.0)
- httparty (0.13.7)
- json (~> 1.8)
+ httparty (0.16.4)
+ mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.2.0)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@@ -389,13 +439,18 @@ GEM
cause
json
ipaddress (0.8.3)
+ jaeger-client (0.10.0)
+ opentracing (~> 0.3)
+ thrift
+ jaro_winkler (1.5.2)
jira-ruby (1.4.1)
activesupport
multipart-post
oauth (~> 0.5, >= 0.5.0)
- jquery-atwho-rails (1.3.2)
- js_regex (2.2.1)
- regexp_parser (>= 0.4.11, <= 0.5.0)
+ js_regex (3.1.1)
+ character_set (~> 1.1)
+ regexp_parser (~> 1.1)
+ regexp_property_values (~> 0.3)
json (1.8.6)
json-jwt (1.9.4)
activesupport
@@ -416,18 +471,19 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
- kgio (2.10.0)
+ kgio (2.11.2)
knapsack (1.17.0)
rake
- kubeclient (4.0.0)
+ kramdown (1.17.0)
+ kubeclient (4.2.2)
http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
launchy (2.4.3)
addressable (~> 2.3)
- letter_opener (1.4.1)
+ letter_opener (1.7.0)
launchy (~> 2.2)
- letter_opener_web (1.3.0)
+ letter_opener_web (1.3.4)
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
@@ -452,19 +508,29 @@ GEM
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_room (0.9.1)
+ marcel (0.3.3)
+ mimemagic (~> 0.3.2)
+ mdl (0.5.0)
+ kramdown (~> 1.12, >= 1.12.0)
+ mixlib-cli (~> 1.7, >= 1.7.0)
+ mixlib-config (~> 2.2, >= 2.2.1)
memoist (0.16.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
+ memory_profiler (0.9.13)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
- mime-types-data (3.2018.0812)
+ mime-types-data (3.2019.0331)
mimemagic (0.3.2)
mini_magick (4.8.0)
mini_mime (1.0.1)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
- msgpack (1.2.4)
+ mixlib-cli (1.7.0)
+ mixlib-config (2.2.18)
+ tomlrb
+ msgpack (1.2.10)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -474,11 +540,11 @@ GEM
mysql2 (0.4.10)
nakayoshi_fork (0.0.4)
net-ldap (0.16.0)
- net-ssh (5.0.1)
+ net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.3.1)
- nokogiri (1.8.5)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.3)
+ mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
numerizer (0.1.1)
@@ -532,6 +598,9 @@ GEM
omniauth (~> 1.9)
omniauth-oauth2-generic (0.2.2)
omniauth-oauth2 (~> 1.0)
+ omniauth-salesforce (1.0.5)
+ omniauth (~> 1.0)
+ omniauth-oauth2 (~> 1.0)
omniauth-saml (1.10.0)
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.7)
@@ -540,16 +609,34 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
+ omniauth-ultraauth (0.0.2)
+ omniauth_openid_connect (~> 0.3.0)
omniauth_crowd (2.2.3)
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
+ omniauth_openid_connect (0.3.1)
+ addressable (~> 2.5)
+ omniauth (~> 1.3)
+ openid_connect (~> 1.1)
+ openid_connect (1.1.6)
+ activemodel
+ attr_required (>= 1.0.0)
+ json-jwt (>= 1.5.0)
+ rack-oauth2 (>= 1.6.1)
+ swd (>= 1.0.0)
+ tzinfo
+ validate_email
+ validate_url
+ webfinger (>= 1.0.1)
+ opentracing (0.5.0)
+ optimist (3.0.0)
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (1.0.0)
- parallel (1.12.1)
- parser (2.5.3.0)
+ parallel (1.17.0)
+ parser (2.6.3.0)
ast (~> 2.4.0)
parslet (1.8.2)
peek (1.0.1)
@@ -575,10 +662,9 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (0.18.4)
+ pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
- powerpack (0.1.1)
premailer (1.10.4)
addressable
css_parser (>= 1.4.10)
@@ -591,7 +677,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.9.4)
+ prometheus-client-mmap (0.9.8)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
@@ -600,48 +686,49 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
- public_suffix (3.0.3)
+ public_suffix (3.1.0)
puma (3.12.0)
puma_worker_killer (0.1.0)
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
- rack (2.0.6)
+ raabro (1.1.6)
+ rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
rack
rack-cors (1.0.2)
- rack-oauth2 (1.2.3)
- activesupport (>= 2.3)
- attr_required (>= 0.0.5)
- httpclient (>= 2.4)
- multi_json (>= 1.3.6)
- rack (>= 1.1)
- rack-protection (2.0.4)
+ rack-oauth2 (1.9.3)
+ activesupport
+ attr_required
+ httpclient
+ json-jwt (>= 1.9.0)
+ rack
+ rack-protection (2.0.5)
rack
rack-proxy (0.6.0)
rack
- rack-test (0.6.3)
- rack (>= 1.0)
- rails (5.0.7.1)
- actioncable (= 5.0.7.1)
- actionmailer (= 5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
- activemodel (= 5.0.7.1)
- activerecord (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rack-timeout (0.5.1)
+ rails (5.2.3)
+ actioncable (= 5.2.3)
+ actionmailer (= 5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
+ activemodel (= 5.2.3)
+ activerecord (= 5.2.3)
+ activestorage (= 5.2.3)
+ activesupport (= 5.2.3)
bundler (>= 1.3.0)
- railties (= 5.0.7.1)
+ railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
actionview (~> 5.x, >= 5.0.1)
activesupport (~> 5.x)
- rails-deprecated_sanitizer (1.0.3)
- activesupport (>= 4.2.0.alpha)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
@@ -650,30 +737,29 @@ GEM
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
- railties (5.0.7.1)
- actionpack (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ railties (5.2.3)
+ actionpack (= 5.2.3)
+ activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
+ thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
- raindrops (0.18.0)
+ raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
- rbtrace (0.4.10)
+ rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
- trollop (>= 1.16.2)
+ optimist (>= 3.0.0)
rdoc (6.0.4)
re2 (1.1.1)
- recaptcha (3.0.0)
+ recaptcha (4.13.1)
json
recursive-open-struct (1.1.0)
- redcarpet (3.4.0)
redis (3.3.5)
redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
@@ -693,7 +779,8 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.6.0)
redis (>= 2.2, < 5)
- regexp_parser (0.5.0)
+ regexp_parser (1.5.1)
+ regexp_property_values (0.3.4)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -709,41 +796,41 @@ GEM
retriable (3.1.2)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.3.0)
+ rouge (3.5.1)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2)
- rspec (3.7.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-core (3.7.1)
- rspec-support (~> 3.7.0)
- rspec-expectations (3.7.0)
+ rspec (3.8.0)
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-core (3.8.2)
+ rspec-support (~> 3.8.0)
+ rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-mocks (3.7.0)
+ rspec-support (~> 3.8.0)
+ rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-parameterized (0.4.1)
- binding_ninja (>= 0.2.1)
+ rspec-support (~> 3.8.0)
+ rspec-parameterized (0.4.2)
+ binding_ninja (>= 0.2.3)
parser
proc_to_ast
rspec (>= 2.13, < 4)
unparser
- rspec-rails (3.7.2)
+ rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-support (~> 3.7.0)
- rspec-retry (0.4.5)
- rspec-core
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-support (~> 3.8.0)
+ rspec-retry (0.6.1)
+ rspec-core (> 3.3)
rspec-set (0.1.3)
- rspec-support (3.7.1)
+ rspec-support (3.8.2)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.5)
@@ -751,15 +838,17 @@ GEM
pg
rails
sqlite3
- rubocop (0.54.0)
+ rubocop (0.69.0)
+ jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
- parser (>= 2.5)
- powerpack (~> 0.1)
+ parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (~> 1.0, >= 1.0.1)
+ unicode-display_width (>= 1.4.0, < 1.7)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
+ rubocop-performance (1.1.0)
+ rubocop (>= 0.67.0)
rubocop-rspec (1.22.2)
rubocop (>= 0.52.1)
ruby-enum (0.7.2)
@@ -767,17 +856,15 @@ GEM
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.17.0)
- ruby-progressbar (1.9.0)
+ ruby-progressbar (1.10.0)
ruby-saml (1.7.2)
nokogiri (>= 1.5.10)
- ruby_parser (3.11.0)
+ ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
- rufus-scheduler (3.4.0)
- et-orbi (~> 1.0)
- rugged (0.27.5)
+ rugged (0.28.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@@ -788,12 +875,15 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
- sass-rails (5.0.6)
- railties (>= 4.0.0, < 6)
- sass (~> 3.1)
- sprockets (>= 2.8, < 4.0)
- sprockets-rails (>= 2.0, < 4.0)
- tilt (>= 1.1, < 3)
+ sassc (2.0.1)
+ ffi (~> 1.9)
+ rake
+ sassc-rails (2.1.0)
+ railties (>= 4.0.0)
+ sassc (>= 2.0)
+ sprockets (> 3.0)
+ sprockets-rails
+ tilt
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
@@ -803,25 +893,24 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
- select2-rails (3.5.9.3)
- thor (~> 0.14)
- selenium-webdriver (3.12.0)
+ selenium-webdriver (3.141.0)
childprocess (~> 0.5)
- rubyzip (~> 1.2)
- sentry-raven (2.7.4)
+ rubyzip (~> 1.2, >= 1.2.2)
+ sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
- sexp_processor (4.11.0)
+ sexp_processor (4.12.0)
sham_rack (1.3.6)
rack
- shoulda-matchers (3.1.2)
- activesupport (>= 4.0.0)
- sidekiq (5.2.3)
+ shoulda-matchers (4.0.1)
+ activesupport (>= 4.2.0)
+ sidekiq (5.2.7)
connection_pool (~> 2.2, >= 2.2.2)
+ rack (>= 1.5.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
- sidekiq-cron (0.6.0)
- rufus-scheduler (>= 3.3.0)
+ sidekiq-cron (1.0.4)
+ fugit (~> 1.1)
sidekiq (>= 4.2.1)
signet (0.11.0)
addressable (~> 2.3)
@@ -829,11 +918,11 @@ GEM
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simple_po_parser (1.1.2)
- simplecov (0.14.1)
- docile (~> 1.1.0)
+ simplecov (0.16.1)
+ docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
- simplecov-html (0.10.0)
+ simplecov-html (0.10.2)
slack-notifier (1.5.1)
spring (2.0.2)
activesupport (>= 4.2)
@@ -847,7 +936,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
- sshkey (1.9.0)
+ sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
state_machines-activemodel (0.5.1)
@@ -856,6 +945,10 @@ GEM
state_machines-activerecord (0.5.1)
activerecord (>= 4.1, < 6.0)
state_machines-activemodel (>= 0.5.0)
+ swd (1.1.2)
+ activesupport (>= 3)
+ attr_required (>= 0.0.5)
+ httpclient (>= 2.4)
sys-filesystem (1.1.6)
ffi
sysexits (1.2.0)
@@ -868,6 +961,7 @@ GEM
rack (>= 1, < 3)
thor (0.19.4)
thread_safe (0.3.6)
+ thrift (0.11.0.0)
tilt (2.0.8)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
@@ -875,10 +969,10 @@ GEM
parslet (~> 1.8.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
- trollop (2.1.3)
- truncato (0.7.10)
+ tomlrb (1.2.8)
+ truncato (0.7.11)
htmlentities (~> 4.3.1)
- nokogiri (~> 1.8.0, >= 1.7.0)
+ nokogiri (>= 1.7.0, <= 2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
u2f (0.2.1)
@@ -889,26 +983,32 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
- unicode-display_width (1.3.2)
- unicorn (5.1.0)
+ unicode-display_width (1.6.0)
+ unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.10.0)
- unparser (0.4.2)
+ unparser (0.4.5)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
diff-lcs (~> 1.3)
equalizer (~> 0.0.9)
- parser (>= 2.3.1.2, < 2.6)
+ parser (~> 2.6.3)
procto (~> 0.0.2)
+ validate_email (0.1.6)
+ activemodel (>= 3.0)
+ mail (>= 2.2.5)
+ validate_url (1.0.8)
+ activemodel (>= 3.0.0)
+ public_suffix
validates_hostname (1.0.6)
activerecord (>= 3.0)
activesupport (>= 3.0)
- version_sorter (2.1.0)
+ version_sorter (2.2.4)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
@@ -917,13 +1017,16 @@ GEM
vmstat (2.3.0)
warden (1.2.7)
rack (>= 1.0)
- webmock (2.3.2)
+ webfinger (1.1.0)
+ activesupport
+ httpclient (>= 2.4)
+ webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
webpack-rails (0.9.11)
railties (>= 3.2.0)
- websocket-driver (0.6.5)
+ websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wikicloth (0.8.1)
@@ -932,8 +1035,8 @@ GEM
rinku
with_env (1.1.0)
xml-simple (1.1.5)
- xpath (2.1.0)
- nokogiri (~> 1.3)
+ xpath (3.2.0)
+ nokogiri (~> 1.8)
PLATFORMS
ruby
@@ -941,30 +1044,35 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
+ acme-client (~> 2.0.2)
+ activerecord-explain-analyze (~> 0.1)
activerecord_sane_schema_dumper (= 1.0)
- acts-as-taggable-on (~> 5.0)
+ acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
+ apollo_upload_server (~> 2.0.0.beta3)
asana (~> 0.8.1)
- asciidoctor (~> 1.5.8)
- asciidoctor-plantuml (= 0.0.8)
+ asciidoctor (~> 2.0.10)
+ asciidoctor-include-ext (~> 0.3.1)
+ asciidoctor-plantuml (= 0.0.9)
attr_encrypted (~> 3.1.0)
awesome_print
babosa (~> 1.0.2)
base32 (~> 0.3.0)
- batch-loader (~> 1.2.2)
+ batch-loader (~> 1.4.0)
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
+ benchmark-memory (~> 0.1)
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
- bootsnap (~> 1.3)
- bootstrap_form (~> 2.7.0)
+ bootsnap (~> 1.4)
+ bootstrap_form (~> 4.2.0)
brakeman (~> 4.2)
browser (~> 2.5)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
- capybara (~> 2.16.1)
- capybara-screenshot (~> 1.0.18)
+ capybara (~> 3.22.0)
+ capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
@@ -974,9 +1082,11 @@ DEPENDENCIES
connection_pool (~> 2.0)
creole (~> 0.5.0)
database_cleaner (~> 1.7.0)
- deckar01-task_list (= 2.0.0)
+ deckar01-task_list (= 2.2.0)
+ default_value_for (~> 3.2.0)
+ derailed_benchmarks
device_detector
- devise (~> 4.4)
+ devise (~> 4.6)
devise-two-factor (~> 3.0.0)
diffy (~> 3.1.0)
discordrb-webhooks-blackst0ne (~> 3.3)
@@ -994,39 +1104,41 @@ DEPENDENCIES
flipper-active_record (~> 0.13.0)
flipper-active_support_cache_store (~> 0.13.0)
flowdock (~> 0.7)
- fog-aliyun (~> 0.2.0)
- fog-aws (~> 2.0.1)
- fog-core (~> 1.44)
- fog-google (~> 1.7.1)
- fog-local (~> 0.3)
- fog-openstack (~> 0.1)
+ fog-aliyun (~> 0.3)
+ fog-aws (~> 3.5)
+ fog-core (= 2.1.0)
+ fog-google (~> 1.8)
+ fog-local (~> 0.6)
+ fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
foreman (~> 0.84.0)
+ fugit (~> 1.2.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.5.0)
+ gitaly-proto (~> 1.37.0)
github-markup (~> 1.7.0)
- gitlab-default_value_for (~> 3.1.1)
- gitlab-markup (~> 1.6.5)
+ gitlab-labkit (~> 0.3.0)
+ gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0)
- gitlab-styles (~> 2.4)
- gitlab_omniauth-ldap (~> 2.0.4)
+ gitlab-styles (~> 2.7)
+ gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
- google-protobuf (~> 3.6)
+ google-protobuf (~> 3.7.1)
gpgme (~> 2.0.18)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
- grape-path-helpers (~> 1.0)
+ grape-path-helpers (~> 1.1)
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
- grpc (~> 1.15.0)
- haml_lint (~> 0.28.0)
+ graphql-docs (~> 1.6.0)
+ grpc (~> 1.19.0)
+ haml_lint (~> 0.31.0)
hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
@@ -1034,23 +1146,24 @@ DEPENDENCIES
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
- httparty (~> 0.13.3)
+ httparty (~> 0.16.4)
icalendar
influxdb (~> 0.2)
jira-ruby (~> 1.4)
- jquery-atwho-rails (~> 1.3.2)
- js_regex (~> 2.2.1)
+ js_regex (~> 3.1)
json-schema (~> 2.8.0)
jwt (~> 2.1.0)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kubeclient (~> 4.0.0)
- letter_opener_web (~> 1.3.0)
+ kubeclient (~> 4.2.2)
+ letter_opener_web (~> 1.3.4)
license_finder (~> 5.4)
licensee (~> 8.9)
lograge (~> 0.5)
loofah (~> 2.2)
mail_room (~> 0.9.1)
+ mdl (~> 0.5.0)
+ memory_profiler (~> 0.9)
method_source (~> 0.8)
mimemagic (~> 0.3.2)
mini_magick
@@ -1058,8 +1171,8 @@ DEPENDENCIES
mysql2 (~> 0.4.10)
nakayoshi_fork (~> 0.0.4)
net-ldap
- net-ssh (~> 5.0)
- nokogiri (~> 1.8.5)
+ net-ssh (~> 5.2)
+ nokogiri (~> 1.10.3)
oauth2 (~> 1.4)
octokit (~> 4.9)
omniauth (~> 1.8)
@@ -1073,10 +1186,13 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 0.6.0)
omniauth-kerberos (~> 0.3.0)
omniauth-oauth2-generic (~> 0.2.2)
+ omniauth-salesforce (~> 1.0.5)
omniauth-saml (~> 1.10)
omniauth-shibboleth (~> 1.3.0)
omniauth-twitter (~> 1.4)
+ omniauth-ultraauth (~> 0.0.2)
omniauth_crowd (~> 2.2.0)
+ omniauth_openid_connect (~> 0.3.1)
org-ruby (~> 0.9.12)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
@@ -1084,21 +1200,21 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- pg (~> 0.18.2)
+ pg (~> 1.1)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.9.4)
+ prometheus-client-mmap (~> 0.9.8)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
- rack (= 2.0.6)
+ rack (~> 2.0.7)
rack-attack (~> 4.4.1)
rack-cors (~> 1.0.0)
- rack-oauth2 (~> 1.2.1)
+ rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0)
- rails (= 5.0.7.1)
+ rack-timeout
+ rails (= 5.2.3)
rails-controller-testing
- rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
rainbow (~> 3.0)
raindrops (~> 0.18)
@@ -1106,50 +1222,47 @@ DEPENDENCIES
rbtrace (~> 0.4)
rdoc (~> 6.0)
re2 (~> 1.1.1)
- recaptcha (~> 3.0)
- redcarpet (~> 3.4)
+ recaptcha (~> 4.11)
redis (~> 3.2)
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
request_store (~> 1.3)
responders (~> 2.0)
- rouge (~> 3.1)
+ rouge (~> 3.5)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
- rspec-rails (~> 3.7.0)
- rspec-retry (~> 0.4.5)
+ rspec-rails (~> 3.8.0)
+ rspec-retry (~> 0.6.1)
rspec-set (~> 0.1.3)
rspec_junit_formatter
rspec_profiling (~> 0.0.5)
- rubocop (~> 0.54.0)
+ rubocop (~> 0.69.0)
+ rubocop-performance (~> 1.1.0)
rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.17.0)
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)
- rufus-scheduler (~> 3.4)
- rugged (~> 0.27)
+ rugged (~> 0.28)
sanitize (~> 4.6)
- sass (~> 3.5)
- sass-rails (~> 5.0.6)
+ sassc-rails (~> 2.1.0)
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
- select2-rails (~> 3.5.9)
- selenium-webdriver (~> 3.12)
- sentry-raven (~> 2.7)
+ selenium-webdriver (~> 3.141)
+ sentry-raven (~> 2.9)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
- shoulda-matchers (~> 3.1.2)
- sidekiq (~> 5.2.1)
- sidekiq-cron (~> 0.6.0)
+ shoulda-matchers (~> 4.0.1)
+ sidekiq (~> 5.2.7)
+ sidekiq-cron (~> 1.0)
simple_po_parser (~> 1.1.2)
- simplecov (~> 0.14.0)
+ simplecov (~> 0.16.1)
slack-notifier (~> 1.5.1)
spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
- sshkey (~> 1.9.0)
+ sshkey (~> 2.0)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
@@ -1157,17 +1270,17 @@ DEPENDENCIES
thin (~> 1.7.0)
timecop (~> 0.8.0)
toml-rb (~> 1.0.0)
- truncato (~> 0.7.9)
+ truncato (~> 0.7.11)
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4)
- unicorn (~> 5.1.0)
+ unicorn (~> 5.4.1)
unicorn-worker-killer (~> 0.4.4)
validates_hostname (~> 1.0.6)
- version_sorter (~> 2.1.0)
+ version_sorter (~> 2.2.4)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
- webmock (~> 2.3.2)
+ webmock (~> 3.5.1)
webpack-rails (~> 0.9.10)
wikicloth (= 0.8.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index 10b8c3f25ea..8da7a3262c1 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -15,68 +15,104 @@
};
version = "4.1.2";
};
- actioncable = {
- dependencies = ["actionpack" "nio4r" "websocket-driver"];
+ acme-client = {
+ dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb";
+ sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp";
type = "gem";
};
- version = "5.0.7.1";
+ version = "2.0.2";
+ };
+ actioncable = {
+ dependencies = ["actionpack" "nio4r" "websocket-driver"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
+ type = "gem";
+ };
+ version = "5.2.3";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm";
+ sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw";
+ sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
actionview = {
- dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1";
+ sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
activejob = {
dependencies = ["activesupport" "globalid"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv";
+ sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
activemodel = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c";
+ sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c";
+ sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
+ };
+ activerecord-explain-analyze = {
+ dependencies = ["activerecord" "pg"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx";
+ type = "gem";
+ };
+ version = "0.1.0";
};
activerecord_sane_schema_dumper = {
dependencies = ["rails"];
@@ -87,23 +123,38 @@
};
version = "1.0";
};
- activesupport = {
- dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ activestorage = {
+ dependencies = ["actionpack" "activerecord" "marcel"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb";
+ sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
+ };
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
+ type = "gem";
+ };
+ version = "5.2.3";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
+ sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
type = "gem";
};
- version = "5.0.0";
+ version = "6.0.0";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -139,13 +190,26 @@
};
version = "2.0.0";
};
- arel = {
+ apollo_upload_server = {
+ dependencies = ["graphql" "rails"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l757dkkaxk5fq3368l79jpyzq9a9driricjamhiwhwvh0h7xcyx";
+ sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na";
type = "gem";
};
- version = "7.1.4";
+ version = "2.0.0.beta.3";
+ };
+ arel = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
+ type = "gem";
+ };
+ version = "9.0.0";
};
asana = {
dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
@@ -157,21 +221,36 @@
version = "0.8.1";
};
asciidoctor = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qld3a1pbcjvs8lbxp95iz83bfmg5scmnf8q3rklinmdmhzakslx";
+ sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
type = "gem";
};
- version = "1.5.8";
+ version = "2.0.10";
+ };
+ asciidoctor-include-ext = {
+ dependencies = ["asciidoctor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d";
+ type = "gem";
+ };
+ version = "0.3.1";
};
asciidoctor-plantuml = {
dependencies = ["asciidoctor"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna";
+ sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb";
type = "gem";
};
- version = "0.0.8";
+ version = "0.0.9";
};
ast = {
source = {
@@ -199,12 +278,14 @@
version = "3.1.0";
};
attr_required = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
+ sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
awesome_print = {
source = {
@@ -240,12 +321,14 @@
version = "0.3.2";
};
batch-loader = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pwr2hk9x1qx9i2xpkpjwkdjsmm4kamz5f25wizsaw37zb64apjc";
+ sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi";
type = "gem";
};
- version = "1.2.2";
+ version = "1.4.0";
};
bcrypt = {
source = {
@@ -271,6 +354,17 @@
};
version = "2.3.0";
};
+ benchmark-memory = {
+ dependencies = ["memory_profiler"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
better_errors = {
dependencies = ["coderay" "erubi" "rack"];
source = {
@@ -289,12 +383,14 @@
version = "2.4.3";
};
binding_ninja = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19dk26qyx433ffa6y48511apc2iw71zw4jnlqxhy0wix9dlxr2ri";
+ sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
type = "gem";
};
- version = "0.2.2";
+ version = "0.2.3";
};
binding_of_caller = {
dependencies = ["debug_inspector"];
@@ -309,18 +405,21 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
+ sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
type = "gem";
};
- version = "1.3.2";
+ version = "1.4.1";
};
bootstrap_form = {
+ dependencies = ["actionpack" "activemodel"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw";
+ sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
type = "gem";
};
- version = "2.7.0";
+ version = "4.2.0";
};
brakeman = {
source = {
@@ -373,13 +472,15 @@
version = "9.1.0";
};
capybara = {
- dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
+ dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf";
+ sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch";
type = "gem";
};
- version = "2.16.1";
+ version = "3.22.0";
};
capybara-screenshot = {
dependencies = ["capybara" "launchy"];
@@ -407,6 +508,14 @@
};
version = "0.1";
};
+ character_set = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
@@ -493,21 +602,25 @@
version = "0.1.5";
};
concurrent-ruby = {
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18q9skp5pfq4jwbxzmw8q2rn4cpw6mf4561i2hsjcl1nxdag2jvb";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.5";
};
concurrent-ruby-ext = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "mysql" "postgres"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h7k4wnvbxv7vzb53kaqxbbyhp3m98g2rgymr6n1l9v0jlzcr1i8";
+ sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.5";
};
connection_pool = {
source = {
@@ -587,10 +700,10 @@
dependencies = ["html-pipeline"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j";
+ sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
type = "gem";
};
- version = "2.0.0";
+ version = "2.2.0";
};
declarative = {
source = {
@@ -608,6 +721,28 @@
};
version = "0.1.0";
};
+ default_value_for = {
+ dependencies = ["activerecord"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla";
+ type = "gem";
+ };
+ version = "3.2.0";
+ };
+ derailed_benchmarks = {
+ dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8";
+ type = "gem";
+ };
+ version = "1.3.5";
+ };
descendants_tracker = {
dependencies = ["thread_safe"];
source = {
@@ -627,12 +762,14 @@
};
devise = {
dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xmxfhym0yxwb0zwmmzhdiykbpyqqm3id02g7rf3vcgbc1lqvdnj";
+ sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf";
type = "gem";
};
- version = "4.4.3";
+ version = "4.6.2";
};
devise-two-factor = {
dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
@@ -669,12 +806,14 @@
version = "3.3.0";
};
docile = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+ sha256 = "04d2izkna3ahfn6fwq4xrcafa715d3bbqczxm16fq40fqy87xn17";
type = "gem";
};
- version = "1.1.5";
+ version = "1.3.1";
};
domain_name = {
dependencies = ["unf"];
@@ -745,20 +884,14 @@
version = "0.0.11";
};
erubi = {
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bws86na9k565raiz0kk61yy5pxxp0fmwyzpibdwjkq0xzx8q6q1";
+ sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
type = "gem";
};
- version = "1.7.1";
- };
- erubis = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
- type = "gem";
- };
- version = "2.7.0";
+ version = "1.8.0";
};
escape_utils = {
source = {
@@ -770,12 +903,14 @@
};
et-orbi = {
dependencies = ["tzinfo"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi";
+ sha256 = "1swgjb3h2hs5xflb68837l0vd32masbz9c66b1963mxlnnxf5gsg";
type = "gem";
};
- version = "1.0.3";
+ version = "1.2.1";
};
eventmachine = {
source = {
@@ -809,6 +944,17 @@
};
version = "0.9.0";
};
+ extended-markdown-filter = {
+ dependencies = ["html-pipeline"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
factory_bot = {
dependencies = ["activesupport"];
source = {
@@ -881,10 +1027,10 @@
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
type = "gem";
};
- version = "1.9.25";
+ version = "1.10.0";
};
flipper = {
source = {
@@ -925,64 +1071,66 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
+ sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
type = "gem";
};
- version = "0.2.0";
+ version = "0.3.3";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
+ sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4";
type = "gem";
};
- version = "2.0.1";
+ version = "3.5.2";
};
fog-core = {
- dependencies = ["builder" "excon" "formatador"];
+ dependencies = ["builder" "excon" "formatador" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
+ sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
type = "gem";
};
- version = "1.45.0";
+ version = "2.1.0";
};
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
+ sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
type = "gem";
};
- version = "1.7.1";
+ version = "1.8.2";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+ sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
type = "gem";
};
- version = "1.0.2";
+ version = "1.2.0";
};
fog-local = {
dependencies = ["fog-core"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
+ sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
type = "gem";
};
- version = "0.3.1";
+ version = "0.6.0";
};
fog-openstack = {
dependencies = ["fog-core" "fog-json" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
+ sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
type = "gem";
};
- version = "0.1.21";
+ version = "1.0.8";
};
fog-rackspace = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1004,12 +1152,14 @@
};
font-awesome-rails = {
dependencies = ["railties"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qc07vj7qyllrj7lr7wl89l5ir0gj104rc7sds2jynzmrqsamnlw";
+ sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj";
type = "gem";
};
- version = "4.7.0.1";
+ version = "4.7.0.4";
};
foreman = {
dependencies = ["thor"];
@@ -1028,6 +1178,17 @@
};
version = "0.2.5";
};
+ fugit = {
+ dependencies = ["et-orbi" "raabro"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x5h31hl75x0p5s36hinywg18ijlxjhnlb5p02aqcjjkx777rcav";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
source = {
@@ -1037,6 +1198,16 @@
};
version = "2.2.0";
};
+ gemoji = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0";
+ type = "gem";
+ };
+ version = "3.0.1";
+ };
gemojione = {
dependencies = ["json"];
source = {
@@ -1047,12 +1218,14 @@
version = "3.3.0";
};
get_process_mem = {
+ groups = ["default" "development" "puma" "test" "unicorn"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29";
+ sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g";
type = "gem";
};
- version = "0.2.0";
+ version = "0.2.3";
};
gettext = {
dependencies = ["locale" "text"];
@@ -1083,12 +1256,14 @@
};
gitaly-proto = {
dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0";
+ sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j";
type = "gem";
};
- version = "1.5.0";
+ version = "1.37.0";
};
github-markup = {
source = {
@@ -1098,22 +1273,26 @@
};
version = "1.7.0";
};
- gitlab-default_value_for = {
- dependencies = ["activerecord"];
+ gitlab-labkit = {
+ dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qqjf7nxmwxnkdlrgbnby8wjckaj2s5yna96avgb7fwm0h90f1sn";
+ sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1";
type = "gem";
};
- version = "3.1.1";
+ version = "0.3.0";
};
gitlab-markup = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
+ sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem";
};
- version = "1.6.5";
+ version = "1.7.0";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@@ -1127,31 +1306,35 @@
version = "0.4.0";
};
gitlab-styles = {
- dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
+ sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y";
type = "gem";
};
- version = "2.4.1";
+ version = "2.7.0";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
+ sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
type = "gem";
};
- version = "2.0.4";
+ version = "2.1.1";
};
globalid = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
+ sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
type = "gem";
};
- version = "0.4.1";
+ version = "0.4.2";
};
gon = {
dependencies = ["actionpack" "multi_json" "request_store"];
@@ -1172,21 +1355,25 @@
version = "0.23.4";
};
google-protobuf = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
+ sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
type = "gem";
};
- version = "3.6.1";
+ version = "3.7.1";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
+ sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.4";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -1226,12 +1413,14 @@
};
grape-path-helpers = {
dependencies = ["activesupport" "grape" "rake"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw";
+ sha256 = "16l6lrv4h4ls0lrpj35pc00431q2rx6r9n47337qyvprxs3v0a01";
type = "gem";
};
- version = "1.0.6";
+ version = "1.1.0";
};
grape_logging = {
dependencies = ["grape"];
@@ -1259,14 +1448,27 @@
};
version = "1.8.1";
};
- grpc = {
- dependencies = ["google-protobuf" "googleapis-common-protos-types"];
+ graphql-docs = {
+ dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
+ sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d";
type = "gem";
};
- version = "1.15.0";
+ version = "1.6.0";
+ };
+ grpc = {
+ dependencies = ["google-protobuf" "googleapis-common-protos-types"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
+ type = "gem";
+ };
+ version = "1.19.0";
};
haml = {
dependencies = ["temple" "tilt"];
@@ -1279,12 +1481,14 @@
};
haml_lint = {
dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "125aj0j84nx5gqm42hfx5d8486higlra423ahgfpsdjwbp399rwv";
+ sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1";
type = "gem";
};
- version = "0.28.0";
+ version = "0.31.0";
};
hamlit = {
dependencies = ["temple" "thor" "tilt"];
@@ -1306,10 +1510,10 @@
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
type = "gem";
};
- version = "0.3.4";
+ version = "0.3.8";
};
hashie = {
source = {
@@ -1337,8 +1541,20 @@
};
version = "2.6.0";
};
+ heapy = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
hipchat = {
dependencies = ["httparty" "mimemagic"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
@@ -1407,13 +1623,15 @@
version = "0.6.0";
};
httparty = {
- dependencies = ["json" "multi_xml"];
+ dependencies = ["mime-types" "multi_xml"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
+ sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
type = "gem";
};
- version = "0.13.7";
+ version = "0.16.4";
};
httpclient = {
source = {
@@ -1425,12 +1643,14 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "1.2.0";
+ version = "1.6.0";
};
icalendar = {
source = {
@@ -1465,6 +1685,25 @@
};
version = "0.8.3";
};
+ jaeger-client = {
+ dependencies = ["opentracing" "thrift"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+ type = "gem";
+ };
+ version = "0.10.0";
+ };
+ jaro_winkler = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
jira-ruby = {
dependencies = ["activesupport" "multipart-post" "oauth"];
source = {
@@ -1474,22 +1713,14 @@
};
version = "1.4.1";
};
- jquery-atwho-rails = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
- type = "gem";
- };
- version = "1.3.2";
- };
js_regex = {
- dependencies = ["regexp_parser"];
+ dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
+ sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
type = "gem";
};
- version = "2.2.1";
+ version = "3.1.1";
};
json = {
source = {
@@ -1563,10 +1794,10 @@
kgio = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
+ sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
type = "gem";
};
- version = "2.10.0";
+ version = "2.11.2";
};
knapsack = {
dependencies = ["rake"];
@@ -1577,14 +1808,24 @@
};
version = "1.17.0";
};
+ kramdown = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+ type = "gem";
+ };
+ version = "1.17.0";
+ };
kubeclient = {
dependencies = ["http" "recursive-open-struct" "rest-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg";
+ sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
type = "gem";
};
- version = "4.0.0";
+ version = "4.2.2";
};
launchy = {
dependencies = ["addressable"];
@@ -1597,21 +1838,25 @@
};
letter_opener = {
dependencies = ["launchy"];
+ groups = ["default" "development"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21";
+ sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9";
type = "gem";
};
- version = "1.4.1";
+ version = "1.7.0";
};
letter_opener_web = {
dependencies = ["actionmailer" "letter_opener" "railties"];
+ groups = ["development"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv";
+ sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb";
type = "gem";
};
- version = "1.3.0";
+ version = "1.3.4";
};
license_finder = {
dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
@@ -1674,6 +1919,28 @@
};
version = "0.9.1";
};
+ marcel = {
+ dependencies = ["mimemagic"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
+ type = "gem";
+ };
+ version = "0.3.3";
+ };
+ mdl = {
+ dependencies = ["kramdown" "mixlib-cli" "mixlib-config"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
memoist = {
source = {
remotes = ["https://rubygems.org"];
@@ -1691,6 +1958,16 @@
};
version = "0.4.2";
};
+ memory_profiler = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz";
+ type = "gem";
+ };
+ version = "0.9.13";
+ };
method_source = {
source = {
remotes = ["https://rubygems.org"];
@@ -1709,12 +1986,14 @@
version = "3.2.2";
};
mime-types-data = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
- version = "3.2018.0812";
+ version = "3.2019.0331";
};
mimemagic = {
source = {
@@ -1743,10 +2022,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
source = {
@@ -1756,13 +2035,36 @@
};
version = "5.11.3";
};
- msgpack = {
+ mixlib-cli = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+ sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
type = "gem";
};
- version = "1.2.4";
+ version = "1.7.0";
+ };
+ mixlib-config = {
+ dependencies = ["tomlrb"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb";
+ type = "gem";
+ };
+ version = "2.2.18";
+ };
+ msgpack = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch";
+ type = "gem";
+ };
+ version = "1.2.10";
};
multi_json = {
source = {
@@ -1830,12 +2132,14 @@
version = "0.16.0";
};
net-ssh = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w";
+ sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
type = "gem";
};
- version = "5.0.1";
+ version = "5.2.0";
};
netrc = {
source = {
@@ -1855,12 +2159,14 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+ sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
- version = "1.8.5";
+ version = "1.10.3";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -2031,6 +2337,17 @@
};
version = "0.2.2";
};
+ omniauth-salesforce = {
+ dependencies = ["omniauth" "omniauth-oauth2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sr7xmffx6dbsrvnh6spka5ljyzf69iac754xw5r1736py41qhpj";
+ type = "gem";
+ };
+ version = "1.0.5";
+ };
omniauth-saml = {
dependencies = ["omniauth" "ruby-saml"];
source = {
@@ -2058,6 +2375,17 @@
};
version = "1.4.0";
};
+ omniauth-ultraauth = {
+ dependencies = ["omniauth_openid_connect"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8";
+ type = "gem";
+ };
+ version = "0.0.2";
+ };
omniauth_crowd = {
dependencies = ["activesupport" "nokogiri" "omniauth"];
source = {
@@ -2067,6 +2395,46 @@
};
version = "2.2.3";
};
+ omniauth_openid_connect = {
+ dependencies = ["addressable" "omniauth" "openid_connect"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
+ openid_connect = {
+ dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd";
+ type = "gem";
+ };
+ version = "1.1.6";
+ };
+ opentracing = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
+ optimist = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
org-ruby = {
dependencies = ["rubypants"];
source = {
@@ -2093,21 +2461,25 @@
version = "1.0.0";
};
parallel = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+ sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
type = "gem";
};
- version = "1.12.1";
+ version = "1.17.0";
};
parser = {
dependencies = ["ast"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
+ sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
type = "gem";
};
- version = "2.5.3.0";
+ version = "2.6.3.0";
};
parslet = {
source = {
@@ -2172,12 +2544,14 @@
version = "1.2.0";
};
pg = {
+ groups = ["development" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
+ sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem";
};
- version = "0.18.4";
+ version = "1.1.4";
};
po_to_json = {
dependencies = ["json"];
@@ -2188,14 +2562,6 @@
};
version = "1.0.1";
};
- powerpack = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
- type = "gem";
- };
- version = "0.1.1";
- };
premailer = {
dependencies = ["addressable" "css_parser" "htmlentities"];
source = {
@@ -2232,12 +2598,14 @@
version = "0.0.3";
};
prometheus-client-mmap = {
+ groups = ["metrics"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10";
+ sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd";
type = "gem";
};
- version = "0.9.4";
+ version = "0.9.8";
};
pry = {
dependencies = ["coderay" "method_source"];
@@ -2267,12 +2635,14 @@
version = "0.3.6";
};
public_suffix = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.0";
};
puma = {
source = {
@@ -2299,13 +2669,23 @@
};
version = "0.0.3.3";
};
- rack = {
+ raabro = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
+ sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
type = "gem";
};
- version = "2.0.6";
+ version = "1.1.6";
+ };
+ rack = {
+ groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
+ type = "gem";
+ };
+ version = "2.0.7";
};
rack-accept = {
dependencies = ["rack"];
@@ -2334,22 +2714,24 @@
version = "1.0.2";
};
rack-oauth2 = {
- dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
+ dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";
+ sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
type = "gem";
};
- version = "1.2.3";
+ version = "1.9.3";
};
rack-protection = {
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq";
+ sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
type = "gem";
};
- version = "2.0.4";
+ version = "2.0.5";
};
rack-proxy = {
dependencies = ["rack"];
@@ -2362,21 +2744,35 @@
};
rack-test = {
dependencies = ["rack"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+ sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
type = "gem";
};
- version = "0.6.3";
+ version = "1.1.0";
+ };
+ rack-timeout = {
+ groups = ["puma"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a";
+ type = "gem";
+ };
+ version = "0.5.1";
};
rails = {
- dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w";
+ sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@@ -2387,15 +2783,6 @@
};
version = "1.0.2";
};
- rails-deprecated_sanitizer = {
- dependencies = ["activesupport"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
- type = "gem";
- };
- version = "1.0.3";
- };
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
source = {
@@ -2425,12 +2812,14 @@
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr";
+ sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
rainbow = {
source = {
@@ -2443,10 +2832,10 @@
raindrops = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
+ sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
type = "gem";
};
- version = "0.18.0";
+ version = "0.19.0";
};
rake = {
source = {
@@ -2483,13 +2872,13 @@
version = "0.3.6";
};
rbtrace = {
- dependencies = ["ffi" "msgpack" "trollop"];
+ dependencies = ["ffi" "msgpack" "optimist"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
type = "gem";
};
- version = "0.4.10";
+ version = "0.4.11";
};
rdoc = {
source = {
@@ -2509,12 +2898,14 @@
};
recaptcha = {
dependencies = ["json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
+ sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
type = "gem";
};
- version = "3.0.0";
+ version = "4.13.1";
};
recursive-open-struct = {
source = {
@@ -2524,14 +2915,6 @@
};
version = "1.1.0";
};
- redcarpet = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
- type = "gem";
- };
- version = "3.4.0";
- };
RedCloth = {
source = {
remotes = ["https://rubygems.org"];
@@ -2603,12 +2986,22 @@
version = "1.6.0";
};
regexp_parser = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
+ sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d";
type = "gem";
};
- version = "0.5.0";
+ version = "1.5.1";
+ };
+ regexp_property_values = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
+ type = "gem";
+ };
+ version = "0.3.4";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
@@ -2670,12 +3063,14 @@
version = "2.1.2";
};
rouge = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
+ sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
type = "gem";
};
- version = "3.3.0";
+ version = "3.5.1";
};
rqrcode = {
dependencies = ["chunky_png"];
@@ -2697,66 +3092,80 @@
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01";
+ sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.0";
};
rspec-core = {
dependencies = ["rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj";
+ sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.2";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy";
+ sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.4";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3";
+ sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.1";
};
rspec-parameterized = {
dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "159yw3mb4dab5kr18a97miyyi7dqmyrfjp3aw6r6j9i4xkc4xk3a";
+ sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
type = "gem";
};
- version = "0.4.1";
+ version = "0.4.2";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx";
+ sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1";
type = "gem";
};
- version = "3.7.2";
+ version = "3.8.2";
};
rspec-retry = {
dependencies = ["rspec-core"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6";
+ sha256 = "1nnqcg2yd3nn187zbvh4cgx8xsvdk56lz1985qy7232v7i8yidw6";
type = "gem";
};
- version = "0.4.5";
+ version = "0.6.1";
};
rspec-set = {
source = {
@@ -2767,12 +3176,14 @@
version = "0.1.3";
};
rspec-support = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1";
+ sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.2";
};
rspec_junit_formatter = {
dependencies = ["rspec-core"];
@@ -2793,13 +3204,15 @@
version = "0.0.5";
};
rubocop = {
- dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is";
+ sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i";
type = "gem";
};
- version = "0.54.0";
+ version = "0.69.0";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
@@ -2810,6 +3223,17 @@
};
version = "0.1.1";
};
+ rubocop-performance = {
+ dependencies = ["rubocop"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0azzgj62w24wa4hza1qn7i9b9crxdh907kydlzcvhismx41h3lzk";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
rubocop-rspec = {
dependencies = ["rubocop"];
source = {
@@ -2846,12 +3270,14 @@
version = "0.17.0";
};
ruby-progressbar = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
+ sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
type = "gem";
};
- version = "1.9.0";
+ version = "1.10.0";
};
ruby-saml = {
dependencies = ["nokogiri"];
@@ -2864,12 +3290,14 @@
};
ruby_parser = {
dependencies = ["sexp_processor"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mysmdyxhvyn6dhshfxyw762f9asr3kxw45idvw1bh6np31kk4j1";
+ sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7";
type = "gem";
};
- version = "3.11.0";
+ version = "3.13.1";
};
rubyntlm = {
source = {
@@ -2895,22 +3323,15 @@
};
version = "1.2.2";
};
- rufus-scheduler = {
- dependencies = ["et-orbi"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8";
- type = "gem";
- };
- version = "3.4.0";
- };
rugged = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
+ sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem";
};
- version = "0.27.5";
+ version = "0.28.1";
};
safe_yaml = {
source = {
@@ -2947,14 +3368,27 @@
};
version = "4.0.0";
};
- sass-rails = {
- dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
+ sassc = {
+ dependencies = ["ffi" "rake"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb";
+ sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4";
type = "gem";
};
- version = "5.0.6";
+ version = "2.0.1";
+ };
+ sassc-rails = {
+ dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn";
+ type = "gem";
+ };
+ version = "2.1.0";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@@ -2983,32 +3417,27 @@
};
version = "2.3.7";
};
- select2-rails = {
- dependencies = ["thor"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
- type = "gem";
- };
- version = "3.5.9.3";
- };
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz";
+ sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
type = "gem";
};
- version = "3.12.0";
+ version = "3.141.0";
};
sentry-raven = {
dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
+ sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem";
};
- version = "2.7.4";
+ version = "2.9.0";
};
settingslogic = {
source = {
@@ -3019,12 +3448,14 @@
version = "2.0.9";
};
sexp_processor = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vnmphfrd86694x5k7rxddbhbvv5rqbglsc34kfryy4jqhbzz42c";
+ sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7";
type = "gem";
};
- version = "4.11.0";
+ version = "4.12.0";
};
sham_rack = {
dependencies = ["rack"];
@@ -3037,30 +3468,34 @@
};
shoulda-matchers = {
dependencies = ["activesupport"];
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zvv94pqk5b5my3w1shdz7h34xf2ldhg5k4qfdpbwi2iy0j9zw2a";
+ sha256 = "1s6a2i39lsqq8rrkk2pddqcb10bsihxy3v5gpnc2gk8xakj1brdq";
type = "gem";
};
- version = "3.1.2";
+ version = "4.0.1";
};
sidekiq = {
- dependencies = ["connection_pool" "rack-protection" "redis"];
+ dependencies = ["connection_pool" "rack" "rack-protection" "redis"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26";
+ sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq";
type = "gem";
};
- version = "5.2.3";
+ version = "5.2.7";
};
sidekiq-cron = {
- dependencies = ["rufus-scheduler" "sidekiq"];
+ dependencies = ["fugit" "sidekiq"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj";
+ sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
type = "gem";
};
- version = "0.6.0";
+ version = "1.0.4";
};
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
@@ -3081,20 +3516,24 @@
};
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww";
+ sha256 = "1sfyfgf7zrp2n42v7rswkqgk3bbwk1bnsphm24y7laxv3f8z0947";
type = "gem";
};
- version = "0.14.1";
+ version = "0.16.1";
};
simplecov-html = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
+ sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
type = "gem";
};
- version = "0.10.0";
+ version = "0.10.2";
};
slack-notifier = {
source = {
@@ -3151,10 +3590,10 @@
sshkey = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+ sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
type = "gem";
};
- version = "1.9.0";
+ version = "2.0.0";
};
stackprof = {
source = {
@@ -3190,6 +3629,17 @@
};
version = "0.5.1";
};
+ swd = {
+ dependencies = ["activesupport" "attr_required" "httpclient"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1s2vjb6f13za7p1iycl2p73d3p202xa6xny9fjrp8ynwsqix7lyd";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
sys-filesystem = {
dependencies = ["ffi"];
source = {
@@ -3256,6 +3706,14 @@
};
version = "0.3.6";
};
+ thrift = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+ type = "gem";
+ };
+ version = "0.11.0.0";
+ };
tilt = {
source = {
remotes = ["https://rubygems.org"];
@@ -3298,22 +3756,24 @@
};
version = "1.0.0";
};
- trollop = {
+ tomlrb = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
+ sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv";
type = "gem";
};
- version = "2.1.3";
+ version = "1.2.8";
};
truncato = {
dependencies = ["htmlentities" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
+ sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
type = "gem";
};
- version = "0.7.10";
+ version = "0.7.11";
};
tzinfo = {
dependencies = ["thread_safe"];
@@ -3367,21 +3827,23 @@
version = "0.0.7.5";
};
unicode-display_width = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+ sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
type = "gem";
};
- version = "1.3.2";
+ version = "1.6.0";
};
unicorn = {
dependencies = ["kgio" "raindrops"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
+ sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
type = "gem";
};
- version = "5.1.0";
+ version = "5.4.1";
};
unicorn-worker-killer = {
dependencies = ["get_process_mem" "unicorn"];
@@ -3402,12 +3864,36 @@
};
unparser = {
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w662glqi7hwmfvx0smxckxgc7kw5bsqhqz0pyvalbyv1gc0gs2x";
+ sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c";
type = "gem";
};
- version = "0.4.2";
+ version = "0.4.5";
+ };
+ validate_email = {
+ dependencies = ["activemodel" "mail"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx";
+ type = "gem";
+ };
+ version = "0.1.6";
+ };
+ validate_url = {
+ dependencies = ["activemodel" "public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi";
+ type = "gem";
+ };
+ version = "1.0.8";
};
validates_hostname = {
dependencies = ["activerecord" "activesupport"];
@@ -3421,10 +3907,10 @@
version_sorter = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
+ sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.4";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@@ -3452,14 +3938,25 @@
};
version = "1.2.7";
};
+ webfinger = {
+ dependencies = ["activesupport" "httpclient"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
+ sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
type = "gem";
};
- version = "2.3.2";
+ version = "3.5.1";
};
webpack-rails = {
dependencies = ["railties"];
@@ -3472,12 +3969,14 @@
};
websocket-driver = {
dependencies = ["websocket-extensions"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1943442yllhldh9dbp374x2q39cxa49xrm28nb78b7mfbv3y195l";
+ sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn";
type = "gem";
};
- version = "0.6.5";
+ version = "0.7.0";
};
websocket-extensions = {
source = {
@@ -3514,11 +4013,13 @@
};
xpath = {
dependencies = ["nokogiri"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw";
+ sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd";
type = "gem";
};
- version = "2.1.0";
+ version = "3.2.0";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index f01944a0e87..62ee2990dfa 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -1,7 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '5.0.7.1'
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails', '5.2.3'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -12,19 +11,19 @@ gem 'responders', '~> 2.0'
gem 'sprockets', '~> 3.7.0'
# Default values for AR models
-gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
+gem 'default_value_for', '~> 3.2.0'
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'pg', '~> 1.1', group: :postgres
-gem 'rugged', '~> 0.27'
-gem 'grape-path-helpers', '~> 1.0'
+gem 'rugged', '~> 0.28'
+gem 'grape-path-helpers', '~> 1.1'
gem 'faraday', '~> 0.12'
# Authentication libraries
-gem 'devise', '~> 4.4'
+gem 'devise', '~> 4.6'
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8'
@@ -42,14 +41,17 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'rack-oauth2', '~> 1.2.1'
+gem 'omniauth_openid_connect', '~> 0.3.1'
+gem "omniauth-ultraauth", '~> 0.0.2'
+gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'rack-oauth2', '~> 1.9.3'
gem 'jwt', '~> 2.1.0'
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
# Spam and anti-bot protection
-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
# Two-factor authentication
@@ -61,6 +63,8 @@ gem 'u2f', '~> 0.2.1'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.6'
gem 'rubyzip', '~> 1.2.2', require: 'zip'
+# GitLab Pages letsencrypt support
+gem 'acme-client', '~> 2.0.2'
# Browser detection
gem 'browser', '~> 2.5'
@@ -71,7 +75,7 @@ gem 'gpgme', '~> 2.0.18'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
@@ -82,6 +86,8 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
# GraphQL API
gem 'graphql', '~> 1.8.0'
gem 'graphiql-rails', '~> 1.4.10'
+gem 'apollo_upload_server', '~> 2.0.0.beta3'
+gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -97,13 +103,15 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
-gem 'fog-aws', '~> 2.0.1'
-gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 1.7.1'
-gem 'fog-local', '~> 0.3'
-gem 'fog-openstack', '~> 0.1'
+gem 'fog-aws', '~> 3.5'
+# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
+# Also see config/initializers/fog_core_patch.rb.
+gem 'fog-core', '= 2.1.0'
+gem 'fog-google', '~> 1.8'
+gem 'fog-local', '~> 0.6'
+gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.2.0'
+gem 'fog-aliyun', '~> 0.3'
# for Google storage
gem 'google-api-client', '~> 0.23'
@@ -116,29 +124,29 @@ gem 'seed-fu', '~> 2.3.7'
# Search
gem 'elasticsearch-model', '~> 0.1.9'
-gem 'elasticsearch-rails', '~> 0.1.9'
+gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '5.0.3'
gem 'aws-sdk'
gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.6.5'
+gem 'deckar01-task_list', '2.2.0'
+gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
-gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.8'
-gem 'asciidoctor-plantuml', '0.0.8'
-gem 'rouge', '~> 3.1'
-gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.5'
+gem 'asciidoctor', '~> 2.0.10'
+gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
+gem 'asciidoctor-plantuml', '0.0.9'
+gem 'rouge', '~> 3.5'
+gem 'truncato', '~> 0.7.11'
+gem 'bootstrap_form', '~> 4.2.0'
+gem 'nokogiri', '~> 1.10.3'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -148,38 +156,36 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0'
# Application server
-# The 2.0.6 version of rack requires monkeypatch to be present in
-# `config.ru`. This can be removed once a new update for Rack
-# is available that contains https://github.com/rack/rack/pull/1201.
-gem 'rack', '2.0.6'
+gem 'rack', '~> 2.0.7'
group :unicorn do
- gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn', '~> 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
group :puma do
gem 'puma', '~> 3.12', require: false
gem 'puma_worker_killer', require: false
+ gem 'rack-timeout', require: false
end
# State machine
gem 'state_machines-activerecord', '~> 0.5.1'
# Issue tags
-gem 'acts-as-taggable-on', '~> 5.0'
+gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
-gem 'sidekiq', '~> 5.2.1'
-gem 'sidekiq-cron', '~> 0.6.0'
+gem 'sidekiq', '~> 5.2.7'
+gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.6.0'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
-gem 'rufus-scheduler', '~> 3.4'
+gem 'fugit', '~> 1.2.1'
# HTTP requests
-gem 'httparty', '~> 0.13.3'
+gem 'httparty', '~> 0.16.4'
# Colored output to console
gem 'rainbow', '~> 3.0'
@@ -195,10 +201,10 @@ gem 're2', '~> 1.1.1'
# Misc
-gem 'version_sorter', '~> 2.1.0'
+gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 3.1'
# User agent parsing
gem 'device_detector'
@@ -216,7 +222,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
gem 'hipchat', '~> 1.5.0'
-# JIRA integration
+# Jira integration
gem 'jira-ruby', '~> 1.4'
# Flowdock integration
@@ -235,7 +241,7 @@ gem 'asana', '~> 0.8.1'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 4.0.0'
+gem 'kubeclient', '~> 4.2.2'
# Sanitize user input
gem 'sanitize', '~> 4.6'
@@ -269,27 +275,27 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
-gem 'sass-rails', '~> 5.0.6'
-gem 'sass', '~> 3.5'
+gem 'sassc-rails', '~> 2.1.0'
gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.5.2'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
-gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3'
-gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0'
gem "gitlab-license", "~> 1.0"
# Sentry integration
-gem 'sentry-raven', '~> 2.7'
+gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.9.7'
+# LabKit: Tracing and Correlation
+gem 'gitlab-labkit', '~> 0.3.0'
+
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 5.1'
@@ -297,7 +303,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.2.2', require: false, group: :development
-gem 'batch-loader', '~> 1.2.2'
+gem 'batch-loader', '~> 1.4.0'
# Perf bar
gem 'peek', '~> 1.0.1'
@@ -307,13 +313,19 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
+# Snowplow events tracking
+gem 'snowplow-tracker', '~> 0.6.1'
+
+# Memory benchmarks
+gem 'derailed_benchmarks', require: false
+
# Metrics
group :metrics do
gem 'method_source', '~> 0.8', require: false
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~> 0.9.4'
+ gem 'prometheus-client-mmap', '~> 0.9.8'
gem 'raindrops', '~> 0.18'
end
@@ -321,7 +333,7 @@ group :development do
gem 'foreman', '~> 0.84.0'
gem 'brakeman', '~> 4.2', require: false
- gem 'letter_opener_web', '~> 1.3.0'
+ gem 'letter_opener_web', '~> 1.3.4'
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
# Better errors handler
@@ -333,7 +345,7 @@ group :development do
end
group :development, :test do
- gem 'bootsnap', '~> 1.3'
+ gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -343,8 +355,8 @@ group :development, :test do
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.7.0'
- gem 'rspec-retry', '~> 0.4.5'
+ gem 'rspec-rails', '~> 3.8.0'
+ gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
@@ -355,22 +367,24 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.10'
- gem 'capybara', '~> 2.16.1'
- gem 'capybara-screenshot', '~> 1.0.18'
- gem 'selenium-webdriver', '~> 3.12'
+ gem 'capybara', '~> 3.22.0'
+ gem 'capybara-screenshot', '~> 1.0.22'
+ gem 'selenium-webdriver', '~> 3.141'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 2.4', require: false
+ gem 'gitlab-styles', '~> 2.7', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.54.0'
+ gem 'rubocop', '~> 0.69.0'
+ gem 'rubocop-performance', '~> 1.1.0'
gem 'rubocop-rspec', '~> 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false
- gem 'haml_lint', '~> 0.28.0', require: false
- gem 'simplecov', '~> 0.14.0', require: false
+ gem 'haml_lint', '~> 0.31.0', require: false
+ gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
+ gem 'mdl', '~> 0.5.0', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -387,10 +401,10 @@ group :development, :test do
end
group :test do
- gem 'shoulda-matchers', '~> 3.1.2', require: false
+ gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
+ gem 'webmock', '~> 3.5.1'
gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.1'
@@ -407,6 +421,9 @@ gem 'html2text'
gem 'ruby-prof', '~> 0.17.0'
gem 'rbtrace', '~> 0.4', require: false
+gem 'memory_profiler', '~> 0.9', require: false
+gem 'benchmark-memory', '~> 0.1', require: false
+gem 'activerecord-explain-analyze', '~> 0.1', require: false
# OAuth
gem 'oauth2', '~> 1.4'
@@ -422,8 +439,8 @@ gem 'sys-filesystem', '~> 1.1.6'
gem 'net-ntp'
# SSH host key support
-gem 'net-ssh', '~> 5.0'
-gem 'sshkey', '~> 1.9.0'
+gem 'net-ssh', '~> 5.2'
+gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -432,10 +449,11 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
-gem 'grpc', '~> 1.15.0'
+gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly'
-gem 'google-protobuf', '~> 3.6'
+gem 'grpc', '~> 1.19.0'
+
+gem 'google-protobuf', '~> 3.7.1'
gem 'toml-rb', '~> 1.0.0', require: false
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 8d07afb59bf..0a6d7fe1370 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -4,47 +4,56 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actioncable (5.0.7.1)
- actionpack (= 5.0.7.1)
- nio4r (>= 1.2, < 3.0)
- websocket-driver (~> 0.6.1)
- actionmailer (5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
+ acme-client (2.0.2)
+ faraday (~> 0.9, >= 0.9.1)
+ actioncable (5.2.3)
+ actionpack (= 5.2.3)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ actionmailer (5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.7.1)
- actionview (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionpack (5.2.3)
+ actionview (= 5.2.3)
+ activesupport (= 5.2.3)
rack (~> 2.0)
- rack-test (~> 0.6.3)
+ rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionview (5.2.3)
+ activesupport (= 5.2.3)
builder (~> 3.1)
- erubis (~> 2.7.0)
+ erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.7.1)
- activesupport (= 5.0.7.1)
+ activejob (5.2.3)
+ activesupport (= 5.2.3)
globalid (>= 0.3.6)
- activemodel (5.0.7.1)
- activesupport (= 5.0.7.1)
- activerecord (5.0.7.1)
- activemodel (= 5.0.7.1)
- activesupport (= 5.0.7.1)
- arel (~> 7.0)
+ activemodel (5.2.3)
+ activesupport (= 5.2.3)
+ activerecord (5.2.3)
+ activemodel (= 5.2.3)
+ activesupport (= 5.2.3)
+ arel (>= 9.0)
+ activerecord-explain-analyze (0.1.0)
+ activerecord (>= 4)
+ pg
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
- activesupport (5.0.7.1)
+ activestorage (5.2.3)
+ actionpack (= 5.2.3)
+ activerecord (= 5.2.3)
+ marcel (~> 0.3.1)
+ activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (5.0.0)
- activerecord (>= 4.2.8)
+ acts-as-taggable-on (6.0.0)
+ activerecord (~> 5.0)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
@@ -52,20 +61,25 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
akismet (2.0.0)
- arel (7.1.4)
+ apollo_upload_server (2.0.0.beta.3)
+ graphql (>= 1.8)
+ rails (>= 4.2)
+ arel (9.0.0)
asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
- asciidoctor (1.5.8)
- asciidoctor-plantuml (0.0.8)
- asciidoctor (~> 1.5)
+ asciidoctor (2.0.10)
+ asciidoctor-include-ext (0.3.1)
+ asciidoctor (>= 1.5.6, < 3.0.0)
+ asciidoctor-plantuml (0.0.9)
+ asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.0)
atomic (1.1.99)
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
- attr_required (1.0.0)
+ attr_required (1.0.1)
awesome_print (1.8.0)
aws-sdk (2.9.32)
aws-sdk-resources (= 2.9.32)
@@ -81,21 +95,25 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
babosa (1.0.2)
base32 (0.3.2)
- batch-loader (1.2.2)
+ batch-loader (1.4.0)
bcrypt (3.1.12)
bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0)
+ benchmark-memory (0.1.2)
+ memory_profiler (~> 0.9)
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindata (2.4.3)
- binding_ninja (0.2.2)
+ binding_ninja (0.2.3)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.2)
+ bootsnap (1.4.1)
msgpack (~> 1.0)
- bootstrap_form (2.7.0)
+ bootstrap_form (4.2.0)
+ actionpack (>= 5.0)
+ activemodel (>= 5.0)
brakeman (4.2.1)
browser (2.5.3)
builder (3.2.3)
@@ -106,13 +124,14 @@ GEM
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.1.0)
- capybara (2.16.1)
+ capybara (3.22.0)
addressable
mini_mime (>= 0.1.3)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- xpath (~> 2.0)
+ nokogiri (~> 1.8)
+ rack (>= 1.6.0)
+ rack-test (>= 0.6.3)
+ regexp_parser (~> 1.5)
+ xpath (~> 3.2)
capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4)
launchy
@@ -121,6 +140,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
+ character_set (1.1.2)
charlock_holmes (0.7.6)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
@@ -137,10 +157,11 @@ GEM
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
- concurrent-ruby (1.1.3)
- concurrent-ruby-ext (1.1.3)
- concurrent-ruby (= 1.1.3)
+ concurrent-ruby (1.1.5)
+ concurrent-ruby-ext (1.1.5)
+ concurrent-ruby (= 1.1.5)
connection_pool (2.2.2)
+ contracts (0.11.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
@@ -151,14 +172,24 @@ GEM
database_cleaner (1.7.0)
debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8)
- deckar01-task_list (2.0.0)
+ deckar01-task_list (2.2.0)
html-pipeline
declarative (0.0.10)
declarative-option (0.1.0)
+ default_value_for (3.2.0)
+ activerecord (>= 3.2.0, < 6.0)
+ derailed_benchmarks (1.3.5)
+ benchmark-ips (~> 2)
+ get_process_mem (~> 0)
+ heapy (~> 0)
+ memory_profiler (~> 0)
+ rack (>= 1)
+ rake (> 10, < 13)
+ thor (~> 0.19)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.0.0)
- devise (4.4.3)
+ devise (4.6.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
@@ -174,7 +205,7 @@ GEM
diffy (3.1.0)
discordrb-webhooks-blackst0ne (3.3.0)
rest-client (~> 2.0)
- docile (1.1.5)
+ docile (1.3.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.2)
@@ -203,15 +234,16 @@ GEM
mail (~> 2.7)
encryptor (3.0.0)
equalizer (0.0.11)
- erubi (1.7.1)
- erubis (2.7.0)
+ erubi (1.8.0)
escape_utils (1.2.1)
- et-orbi (1.0.3)
+ et-orbi (1.2.1)
tzinfo
eventmachine (1.2.7)
excon (0.62.0)
execjs (2.6.0)
expression_parser (0.9.0)
+ extended-markdown-filter (0.6.0)
+ html-pipeline (~> 2.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
@@ -230,7 +262,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
- ffi (1.9.25)
+ ffi (1.10.0)
flipper (0.13.0)
flipper-active_record (0.13.0)
activerecord (>= 3.2, < 6)
@@ -241,32 +273,33 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
- fog-aliyun (0.2.0)
- fog-core (~> 1.27)
- fog-json (~> 1.0)
+ fog-aliyun (0.3.3)
+ fog-core
+ fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
- fog-aws (2.0.1)
- fog-core (~> 1.38)
- fog-json (~> 1.0)
+ fog-aws (3.5.2)
+ fog-core (~> 2.1)
+ fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
- fog-core (1.45.0)
+ fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
- fog-google (1.7.1)
- fog-core
- fog-json
- fog-xml
+ mime-types
+ fog-google (1.8.2)
+ fog-core (<= 2.1.0)
+ fog-json (~> 1.2)
+ fog-xml (~> 0.1.0)
google-api-client (~> 0.23.0)
- fog-json (1.0.2)
- fog-core (~> 1.0)
+ fog-json (1.2.0)
+ fog-core
multi_json (~> 1.10)
- fog-local (0.3.1)
- fog-core (~> 1.27)
- fog-openstack (0.1.21)
- fog-core (>= 1.40)
+ fog-local (0.6.0)
+ fog-core (>= 1.27, < 3.0)
+ fog-openstack (1.0.8)
+ fog-core (~> 2.1)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-rackspace (0.1.1)
@@ -277,17 +310,21 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
- font-awesome-rails (4.7.0.1)
- railties (>= 3.2, < 5.1)
+ font-awesome-rails (4.7.0.4)
+ railties (>= 3.2, < 6.0)
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
+ fugit (1.2.1)
+ et-orbi (~> 1.1, >= 1.1.8)
+ raabro (~> 1.1)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
+ gemoji (3.0.1)
gemojione (3.3.0)
json
- get_process_mem (0.2.0)
+ get_process_mem (0.2.3)
gettext (3.2.9)
locale (>= 2.0.5)
text (>= 1.3.0)
@@ -298,25 +335,30 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.5.0)
+ gitaly-proto (1.37.0)
grpc (~> 1.0)
github-markup (1.7.0)
- gitlab-default_value_for (3.1.1)
- activerecord (>= 3.2.0, < 6.0)
+ gitlab-labkit (0.3.0)
+ actionpack (~> 5)
+ activesupport (~> 5)
+ grpc (~> 1.19.0)
+ jaeger-client (~> 0.10)
+ opentracing (~> 0.4)
gitlab-license (1.0.0)
- gitlab-markup (1.6.5)
+ gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5)
- gitlab-styles (2.4.1)
- rubocop (~> 0.54.0)
+ gitlab-styles (2.7.0)
+ rubocop (~> 0.69.0)
rubocop-gitlab-security (~> 0.1.0)
+ rubocop-performance (~> 1.1.0)
rubocop-rspec (~> 1.19)
- gitlab_omniauth-ldap (2.0.4)
+ gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (0.4.1)
+ globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.0)
actionpack (>= 3.0)
@@ -329,8 +371,8 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.2)
+ google-protobuf (3.7.1)
+ googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
@@ -351,8 +393,8 @@ GEM
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
- grape-path-helpers (1.0.6)
- activesupport (>= 4, < 5.1)
+ grape-path-helpers (1.1.0)
+ activesupport
grape (~> 1.0)
rake (~> 12)
grape_logging (1.7.0)
@@ -361,7 +403,15 @@ GEM
railties
sprockets-rails
graphql (1.8.1)
- grpc (1.15.0)
+ graphql-docs (1.6.0)
+ commonmarker (~> 0.16)
+ escape_utils (~> 1.2)
+ extended-markdown-filter (~> 0.4)
+ gemoji (~> 3.0)
+ graphql (~> 1.6)
+ html-pipeline (~> 2.8)
+ sass (~> 3.4)
+ grpc (1.19.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
gssapi (1.2.0)
@@ -369,7 +419,7 @@ GEM
haml (5.0.4)
temple (>= 0.8.0)
tilt
- haml_lint (0.28.0)
+ haml_lint (0.31.0)
haml (>= 4.0, < 5.1)
rainbow
rake (>= 10, < 13)
@@ -380,12 +430,13 @@ GEM
thor
tilt
hangouts-chat (0.0.5)
- hashdiff (0.3.4)
+ hashdiff (0.3.8)
hashie (3.5.7)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
health_check (2.6.0)
rails (>= 4.0)
+ heapy (0.1.4)
hipchat (1.5.2)
httparty
mimemagic
@@ -404,11 +455,11 @@ GEM
domain_name (~> 0.5)
http-form_data (2.1.1)
http_parser.rb (0.6.0)
- httparty (0.13.7)
- json (~> 1.8)
+ httparty (0.16.4)
+ mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.2.0)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@@ -416,14 +467,19 @@ GEM
cause
json
ipaddress (0.8.3)
+ jaeger-client (0.10.0)
+ opentracing (~> 0.3)
+ thrift
+ jaro_winkler (1.5.2)
jira-ruby (1.4.1)
activesupport
multipart-post
oauth (~> 0.5, >= 0.5.0)
jmespath (1.3.1)
- jquery-atwho-rails (1.3.2)
- js_regex (2.2.1)
- regexp_parser (>= 0.4.11, <= 0.5.0)
+ js_regex (3.1.1)
+ character_set (~> 1.1)
+ regexp_parser (~> 1.1)
+ regexp_property_values (~> 0.3)
json (1.8.6)
json-jwt (1.9.4)
activesupport
@@ -444,18 +500,19 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
- kgio (2.10.0)
+ kgio (2.11.2)
knapsack (1.17.0)
rake
- kubeclient (4.0.0)
+ kramdown (1.17.0)
+ kubeclient (4.2.2)
http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
launchy (2.4.3)
addressable (~> 2.3)
- letter_opener (1.4.1)
+ letter_opener (1.7.0)
launchy (~> 2.2)
- letter_opener_web (1.3.0)
+ letter_opener_web (1.3.4)
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
@@ -480,19 +537,29 @@ GEM
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_room (0.9.1)
+ marcel (0.3.3)
+ mimemagic (~> 0.3.2)
+ mdl (0.5.0)
+ kramdown (~> 1.12, >= 1.12.0)
+ mixlib-cli (~> 1.7, >= 1.7.0)
+ mixlib-config (~> 2.2, >= 2.2.1)
memoist (0.16.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
+ memory_profiler (0.9.13)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
- mime-types-data (3.2018.0812)
+ mime-types-data (3.2019.0331)
mimemagic (0.3.2)
mini_magick (4.8.0)
mini_mime (1.0.1)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
- msgpack (1.2.4)
+ mixlib-cli (1.7.0)
+ mixlib-config (2.2.18)
+ tomlrb
+ msgpack (1.2.10)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -504,11 +571,11 @@ GEM
net-dns (0.9.0)
net-ldap (0.16.0)
net-ntp (2.1.3)
- net-ssh (5.0.1)
+ net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.3.1)
- nokogiri (1.8.5)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.3)
+ mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
numerizer (0.1.1)
@@ -562,6 +629,9 @@ GEM
omniauth (~> 1.9)
omniauth-oauth2-generic (0.2.2)
omniauth-oauth2 (~> 1.0)
+ omniauth-salesforce (1.0.5)
+ omniauth (~> 1.0)
+ omniauth-oauth2 (~> 1.0)
omniauth-saml (1.10.0)
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.7)
@@ -570,16 +640,34 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
+ omniauth-ultraauth (0.0.2)
+ omniauth_openid_connect (~> 0.3.0)
omniauth_crowd (2.2.3)
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
+ omniauth_openid_connect (0.3.1)
+ addressable (~> 2.5)
+ omniauth (~> 1.3)
+ openid_connect (~> 1.1)
+ openid_connect (1.1.6)
+ activemodel
+ attr_required (>= 1.0.0)
+ json-jwt (>= 1.5.0)
+ rack-oauth2 (>= 1.6.1)
+ swd (>= 1.0.0)
+ tzinfo
+ validate_email
+ validate_url
+ webfinger (>= 1.0.1)
+ opentracing (0.5.0)
+ optimist (3.0.0)
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (1.0.0)
- parallel (1.12.1)
- parser (2.5.3.0)
+ parallel (1.17.0)
+ parser (2.6.3.0)
ast (~> 2.4.0)
parslet (1.8.2)
peek (1.0.1)
@@ -605,10 +693,9 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (0.18.4)
+ pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
- powerpack (0.1.1)
premailer (1.10.4)
addressable
css_parser (>= 1.4.10)
@@ -621,7 +708,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.9.4)
+ prometheus-client-mmap (0.9.8)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
@@ -630,48 +717,49 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
- public_suffix (3.0.3)
+ public_suffix (3.1.0)
puma (3.12.0)
puma_worker_killer (0.1.0)
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
- rack (2.0.6)
+ raabro (1.1.6)
+ rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
rack
rack-cors (1.0.2)
- rack-oauth2 (1.2.3)
- activesupport (>= 2.3)
- attr_required (>= 0.0.5)
- httpclient (>= 2.4)
- multi_json (>= 1.3.6)
- rack (>= 1.1)
- rack-protection (2.0.4)
+ rack-oauth2 (1.9.3)
+ activesupport
+ attr_required
+ httpclient
+ json-jwt (>= 1.9.0)
+ rack
+ rack-protection (2.0.5)
rack
rack-proxy (0.6.0)
rack
- rack-test (0.6.3)
- rack (>= 1.0)
- rails (5.0.7.1)
- actioncable (= 5.0.7.1)
- actionmailer (= 5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
- activemodel (= 5.0.7.1)
- activerecord (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rack-timeout (0.5.1)
+ rails (5.2.3)
+ actioncable (= 5.2.3)
+ actionmailer (= 5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
+ activemodel (= 5.2.3)
+ activerecord (= 5.2.3)
+ activestorage (= 5.2.3)
+ activesupport (= 5.2.3)
bundler (>= 1.3.0)
- railties (= 5.0.7.1)
+ railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
actionview (~> 5.x, >= 5.0.1)
activesupport (~> 5.x)
- rails-deprecated_sanitizer (1.0.3)
- activesupport (>= 4.2.0.alpha)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
@@ -680,30 +768,29 @@ GEM
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
- railties (5.0.7.1)
- actionpack (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ railties (5.2.3)
+ actionpack (= 5.2.3)
+ activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
+ thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
- raindrops (0.18.0)
+ raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
- rbtrace (0.4.10)
+ rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
- trollop (>= 1.16.2)
+ optimist (>= 3.0.0)
rdoc (6.0.4)
re2 (1.1.1)
- recaptcha (3.0.0)
+ recaptcha (4.13.1)
json
recursive-open-struct (1.1.0)
- redcarpet (3.4.0)
redis (3.3.5)
redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
@@ -723,7 +810,8 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.6.0)
redis (>= 2.2, < 5)
- regexp_parser (0.5.0)
+ regexp_parser (1.5.1)
+ regexp_property_values (0.3.4)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -739,41 +827,41 @@ GEM
retriable (3.1.2)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.3.0)
+ rouge (3.5.1)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2)
- rspec (3.7.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-core (3.7.1)
- rspec-support (~> 3.7.0)
- rspec-expectations (3.7.0)
+ rspec (3.8.0)
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-core (3.8.2)
+ rspec-support (~> 3.8.0)
+ rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-mocks (3.7.0)
+ rspec-support (~> 3.8.0)
+ rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-parameterized (0.4.1)
- binding_ninja (>= 0.2.1)
+ rspec-support (~> 3.8.0)
+ rspec-parameterized (0.4.2)
+ binding_ninja (>= 0.2.3)
parser
proc_to_ast
rspec (>= 2.13, < 4)
unparser
- rspec-rails (3.7.2)
+ rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-support (~> 3.7.0)
- rspec-retry (0.4.5)
- rspec-core
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-support (~> 3.8.0)
+ rspec-retry (0.6.1)
+ rspec-core (> 3.3)
rspec-set (0.1.3)
- rspec-support (3.7.1)
+ rspec-support (3.8.2)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.5)
@@ -781,15 +869,17 @@ GEM
pg
rails
sqlite3
- rubocop (0.54.0)
+ rubocop (0.69.0)
+ jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
- parser (>= 2.5)
- powerpack (~> 0.1)
+ parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (~> 1.0, >= 1.0.1)
+ unicode-display_width (>= 1.4.0, < 1.7)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
+ rubocop-performance (1.1.0)
+ rubocop (>= 0.67.0)
rubocop-rspec (1.22.2)
rubocop (>= 0.52.1)
ruby-enum (0.7.2)
@@ -797,17 +887,15 @@ GEM
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.17.0)
- ruby-progressbar (1.9.0)
+ ruby-progressbar (1.10.0)
ruby-saml (1.7.2)
nokogiri (>= 1.5.10)
- ruby_parser (3.11.0)
+ ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
- rufus-scheduler (3.4.0)
- et-orbi (~> 1.0)
- rugged (0.27.5)
+ rugged (0.28.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@@ -818,12 +906,15 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
- sass-rails (5.0.6)
- railties (>= 4.0.0, < 6)
- sass (~> 3.1)
- sprockets (>= 2.8, < 4.0)
- sprockets-rails (>= 2.0, < 4.0)
- tilt (>= 1.1, < 3)
+ sassc (2.0.1)
+ ffi (~> 1.9)
+ rake
+ sassc-rails (2.1.0)
+ railties (>= 4.0.0)
+ sassc (>= 2.0)
+ sprockets (> 3.0)
+ sprockets-rails
+ tilt
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
@@ -833,25 +924,24 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
- select2-rails (3.5.9.3)
- thor (~> 0.14)
- selenium-webdriver (3.12.0)
+ selenium-webdriver (3.141.0)
childprocess (~> 0.5)
- rubyzip (~> 1.2)
- sentry-raven (2.7.4)
+ rubyzip (~> 1.2, >= 1.2.2)
+ sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
- sexp_processor (4.11.0)
+ sexp_processor (4.12.0)
sham_rack (1.3.6)
rack
- shoulda-matchers (3.1.2)
- activesupport (>= 4.0.0)
- sidekiq (5.2.3)
+ shoulda-matchers (4.0.1)
+ activesupport (>= 4.2.0)
+ sidekiq (5.2.7)
connection_pool (~> 2.2, >= 2.2.2)
+ rack (>= 1.5.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
- sidekiq-cron (0.6.0)
- rufus-scheduler (>= 3.3.0)
+ sidekiq-cron (1.0.4)
+ fugit (~> 1.1)
sidekiq (>= 4.2.1)
signet (0.11.0)
addressable (~> 2.3)
@@ -859,12 +949,14 @@ GEM
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simple_po_parser (1.1.2)
- simplecov (0.14.1)
- docile (~> 1.1.0)
+ simplecov (0.16.1)
+ docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
- simplecov-html (0.10.0)
+ simplecov-html (0.10.2)
slack-notifier (1.5.1)
+ snowplow-tracker (0.6.1)
+ contracts (~> 0.7, <= 0.11)
spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
@@ -877,7 +969,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
- sshkey (1.9.0)
+ sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
state_machines-activemodel (0.5.1)
@@ -886,10 +978,14 @@ GEM
state_machines-activerecord (0.5.1)
activerecord (>= 4.1, < 6.0)
state_machines-activemodel (>= 0.5.0)
+ swd (1.1.2)
+ activesupport (>= 3)
+ attr_required (>= 0.0.5)
+ httpclient (>= 2.4)
sys-filesystem (1.1.6)
ffi
sysexits (1.2.0)
- temple (0.8.0)
+ temple (0.8.1)
test-prof (0.2.5)
text (1.3.1)
thin (1.7.2)
@@ -898,17 +994,18 @@ GEM
rack (>= 1, < 3)
thor (0.19.4)
thread_safe (0.3.6)
- tilt (2.0.8)
+ thrift (0.11.0.0)
+ tilt (2.0.9)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
toml (0.2.0)
parslet (~> 1.8.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
- trollop (2.1.3)
- truncato (0.7.10)
+ tomlrb (1.2.8)
+ truncato (0.7.11)
htmlentities (~> 4.3.1)
- nokogiri (~> 1.8.0, >= 1.7.0)
+ nokogiri (>= 1.7.0, <= 2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
u2f (0.2.1)
@@ -919,26 +1016,32 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
- unicode-display_width (1.3.2)
- unicorn (5.1.0)
+ unicode-display_width (1.6.0)
+ unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.10.0)
- unparser (0.4.2)
+ unparser (0.4.5)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
diff-lcs (~> 1.3)
equalizer (~> 0.0.9)
- parser (>= 2.3.1.2, < 2.6)
+ parser (~> 2.6.3)
procto (~> 0.0.2)
+ validate_email (0.1.6)
+ activemodel (>= 3.0)
+ mail (>= 2.2.5)
+ validate_url (1.0.8)
+ activemodel (>= 3.0.0)
+ public_suffix
validates_hostname (1.0.6)
activerecord (>= 3.0)
activesupport (>= 3.0)
- version_sorter (2.1.0)
+ version_sorter (2.2.4)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
@@ -947,13 +1050,16 @@ GEM
vmstat (2.3.0)
warden (1.2.7)
rack (>= 1.0)
- webmock (2.3.2)
+ webfinger (1.1.0)
+ activesupport
+ httpclient (>= 2.4)
+ webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
webpack-rails (0.9.11)
railties (>= 3.2.0)
- websocket-driver (0.6.5)
+ websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wikicloth (0.8.1)
@@ -962,8 +1068,8 @@ GEM
rinku
with_env (1.1.0)
xml-simple (1.1.5)
- xpath (2.1.0)
- nokogiri (~> 1.3)
+ xpath (3.2.0)
+ nokogiri (~> 1.8)
PLATFORMS
ruby
@@ -971,31 +1077,36 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
+ acme-client (~> 2.0.2)
+ activerecord-explain-analyze (~> 0.1)
activerecord_sane_schema_dumper (= 1.0)
- acts-as-taggable-on (~> 5.0)
+ acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
+ apollo_upload_server (~> 2.0.0.beta3)
asana (~> 0.8.1)
- asciidoctor (~> 1.5.8)
- asciidoctor-plantuml (= 0.0.8)
+ asciidoctor (~> 2.0.10)
+ asciidoctor-include-ext (~> 0.3.1)
+ asciidoctor-plantuml (= 0.0.9)
attr_encrypted (~> 3.1.0)
awesome_print
aws-sdk
babosa (~> 1.0.2)
base32 (~> 0.3.0)
- batch-loader (~> 1.2.2)
+ batch-loader (~> 1.4.0)
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
+ benchmark-memory (~> 0.1)
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
- bootsnap (~> 1.3)
- bootstrap_form (~> 2.7.0)
+ bootsnap (~> 1.4)
+ bootstrap_form (~> 4.2.0)
brakeman (~> 4.2)
browser (~> 2.5)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
- capybara (~> 2.16.1)
- capybara-screenshot (~> 1.0.18)
+ capybara (~> 3.22.0)
+ capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
@@ -1005,9 +1116,11 @@ DEPENDENCIES
connection_pool (~> 2.0)
creole (~> 0.5.0)
database_cleaner (~> 1.7.0)
- deckar01-task_list (= 2.0.0)
+ deckar01-task_list (= 2.2.0)
+ default_value_for (~> 3.2.0)
+ derailed_benchmarks
device_detector
- devise (~> 4.4)
+ devise (~> 4.6)
devise-two-factor (~> 3.0.0)
diffy (~> 3.1.0)
discordrb-webhooks-blackst0ne (~> 3.3)
@@ -1029,41 +1142,43 @@ DEPENDENCIES
flipper-active_record (~> 0.13.0)
flipper-active_support_cache_store (~> 0.13.0)
flowdock (~> 0.7)
- fog-aliyun (~> 0.2.0)
- fog-aws (~> 2.0.1)
- fog-core (~> 1.44)
- fog-google (~> 1.7.1)
- fog-local (~> 0.3)
- fog-openstack (~> 0.1)
+ fog-aliyun (~> 0.3)
+ fog-aws (~> 3.5)
+ fog-core (= 2.1.0)
+ fog-google (~> 1.8)
+ fog-local (~> 0.6)
+ fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
foreman (~> 0.84.0)
+ fugit (~> 1.2.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.5.0)
+ gitaly-proto (~> 1.37.0)
github-markup (~> 1.7.0)
- gitlab-default_value_for (~> 3.1.1)
+ gitlab-labkit (~> 0.3.0)
gitlab-license (~> 1.0)
- gitlab-markup (~> 1.6.5)
+ gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0)
- gitlab-styles (~> 2.4)
- gitlab_omniauth-ldap (~> 2.0.4)
+ gitlab-styles (~> 2.7)
+ gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
- google-protobuf (~> 3.6)
+ google-protobuf (~> 3.7.1)
gpgme (~> 2.0.18)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
- grape-path-helpers (~> 1.0)
+ grape-path-helpers (~> 1.1)
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
- grpc (~> 1.15.0)
+ graphql-docs (~> 1.6.0)
+ grpc (~> 1.19.0)
gssapi
- haml_lint (~> 0.28.0)
+ haml_lint (~> 0.31.0)
hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
@@ -1071,23 +1186,24 @@ DEPENDENCIES
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
- httparty (~> 0.13.3)
+ httparty (~> 0.16.4)
icalendar
influxdb (~> 0.2)
jira-ruby (~> 1.4)
- jquery-atwho-rails (~> 1.3.2)
- js_regex (~> 2.2.1)
+ js_regex (~> 3.1)
json-schema (~> 2.8.0)
jwt (~> 2.1.0)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kubeclient (~> 4.0.0)
- letter_opener_web (~> 1.3.0)
+ kubeclient (~> 4.2.2)
+ letter_opener_web (~> 1.3.4)
license_finder (~> 5.4)
licensee (~> 8.9)
lograge (~> 0.5)
loofah (~> 2.2)
mail_room (~> 0.9.1)
+ mdl (~> 0.5.0)
+ memory_profiler (~> 0.9)
method_source (~> 0.8)
mimemagic (~> 0.3.2)
mini_magick
@@ -1097,8 +1213,8 @@ DEPENDENCIES
net-dns (~> 0.9.0)
net-ldap
net-ntp
- net-ssh (~> 5.0)
- nokogiri (~> 1.8.5)
+ net-ssh (~> 5.2)
+ nokogiri (~> 1.10.3)
oauth2 (~> 1.4)
octokit (~> 4.9)
omniauth (~> 1.8)
@@ -1112,10 +1228,13 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 0.6.0)
omniauth-kerberos (~> 0.3.0)
omniauth-oauth2-generic (~> 0.2.2)
+ omniauth-salesforce (~> 1.0.5)
omniauth-saml (~> 1.10)
omniauth-shibboleth (~> 1.3.0)
omniauth-twitter (~> 1.4)
+ omniauth-ultraauth (~> 0.0.2)
omniauth_crowd (~> 2.2.0)
+ omniauth_openid_connect (~> 0.3.1)
org-ruby (~> 0.9.12)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
@@ -1123,21 +1242,21 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- pg (~> 0.18.2)
+ pg (~> 1.1)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.9.4)
+ prometheus-client-mmap (~> 0.9.8)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
- rack (= 2.0.6)
+ rack (~> 2.0.7)
rack-attack (~> 4.4.1)
rack-cors (~> 1.0.0)
- rack-oauth2 (~> 1.2.1)
+ rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0)
- rails (= 5.0.7.1)
+ rack-timeout
+ rails (= 5.2.3)
rails-controller-testing
- rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
rainbow (~> 3.0)
raindrops (~> 0.18)
@@ -1145,50 +1264,48 @@ DEPENDENCIES
rbtrace (~> 0.4)
rdoc (~> 6.0)
re2 (~> 1.1.1)
- recaptcha (~> 3.0)
- redcarpet (~> 3.4)
+ recaptcha (~> 4.11)
redis (~> 3.2)
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
request_store (~> 1.3)
responders (~> 2.0)
- rouge (~> 3.1)
+ rouge (~> 3.5)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
- rspec-rails (~> 3.7.0)
- rspec-retry (~> 0.4.5)
+ rspec-rails (~> 3.8.0)
+ rspec-retry (~> 0.6.1)
rspec-set (~> 0.1.3)
rspec_junit_formatter
rspec_profiling (~> 0.0.5)
- rubocop (~> 0.54.0)
+ rubocop (~> 0.69.0)
+ rubocop-performance (~> 1.1.0)
rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.17.0)
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)
- rufus-scheduler (~> 3.4)
- rugged (~> 0.27)
+ rugged (~> 0.28)
sanitize (~> 4.6)
- sass (~> 3.5)
- sass-rails (~> 5.0.6)
+ sassc-rails (~> 2.1.0)
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
- select2-rails (~> 3.5.9)
- selenium-webdriver (~> 3.12)
- sentry-raven (~> 2.7)
+ selenium-webdriver (~> 3.141)
+ sentry-raven (~> 2.9)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
- shoulda-matchers (~> 3.1.2)
- sidekiq (~> 5.2.1)
- sidekiq-cron (~> 0.6.0)
+ shoulda-matchers (~> 4.0.1)
+ sidekiq (~> 5.2.7)
+ sidekiq-cron (~> 1.0)
simple_po_parser (~> 1.1.2)
- simplecov (~> 0.14.0)
+ simplecov (~> 0.16.1)
slack-notifier (~> 1.5.1)
+ snowplow-tracker (~> 0.6.1)
spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
- sshkey (~> 1.9.0)
+ sshkey (~> 2.0)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
@@ -1196,17 +1313,17 @@ DEPENDENCIES
thin (~> 1.7.0)
timecop (~> 0.8.0)
toml-rb (~> 1.0.0)
- truncato (~> 0.7.9)
+ truncato (~> 0.7.11)
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4)
- unicorn (~> 5.1.0)
+ unicorn (~> 5.4.1)
unicorn-worker-killer (~> 0.4.4)
validates_hostname (~> 1.0.6)
- version_sorter (~> 2.1.0)
+ version_sorter (~> 2.2.4)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
- webmock (~> 2.3.2)
+ webmock (~> 3.5.1)
webpack-rails (~> 0.9.10)
wikicloth (= 0.8.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index 03f885f2f9e..8050743ab25 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -15,68 +15,104 @@
};
version = "4.1.2";
};
- actioncable = {
- dependencies = ["actionpack" "nio4r" "websocket-driver"];
+ acme-client = {
+ dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb";
+ sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp";
type = "gem";
};
- version = "5.0.7.1";
+ version = "2.0.2";
+ };
+ actioncable = {
+ dependencies = ["actionpack" "nio4r" "websocket-driver"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
+ type = "gem";
+ };
+ version = "5.2.3";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm";
+ sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw";
+ sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
actionview = {
- dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1";
+ sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
activejob = {
dependencies = ["activesupport" "globalid"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv";
+ sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
activemodel = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c";
+ sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c";
+ sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
+ };
+ activerecord-explain-analyze = {
+ dependencies = ["activerecord" "pg"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx";
+ type = "gem";
+ };
+ version = "0.1.0";
};
activerecord_sane_schema_dumper = {
dependencies = ["rails"];
@@ -87,23 +123,38 @@
};
version = "1.0";
};
- activesupport = {
- dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ activestorage = {
+ dependencies = ["actionpack" "activerecord" "marcel"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb";
+ sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
+ };
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
+ type = "gem";
+ };
+ version = "5.2.3";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
+ sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
type = "gem";
};
- version = "5.0.0";
+ version = "6.0.0";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -139,13 +190,26 @@
};
version = "2.0.0";
};
- arel = {
+ apollo_upload_server = {
+ dependencies = ["graphql" "rails"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l757dkkaxk5fq3368l79jpyzq9a9driricjamhiwhwvh0h7xcyx";
+ sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na";
type = "gem";
};
- version = "7.1.4";
+ version = "2.0.0.beta.3";
+ };
+ arel = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
+ type = "gem";
+ };
+ version = "9.0.0";
};
asana = {
dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
@@ -157,21 +221,36 @@
version = "0.8.1";
};
asciidoctor = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qld3a1pbcjvs8lbxp95iz83bfmg5scmnf8q3rklinmdmhzakslx";
+ sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
type = "gem";
};
- version = "1.5.8";
+ version = "2.0.10";
+ };
+ asciidoctor-include-ext = {
+ dependencies = ["asciidoctor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d";
+ type = "gem";
+ };
+ version = "0.3.1";
};
asciidoctor-plantuml = {
dependencies = ["asciidoctor"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna";
+ sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb";
type = "gem";
};
- version = "0.0.8";
+ version = "0.0.9";
};
ast = {
source = {
@@ -199,12 +278,14 @@
version = "3.1.0";
};
attr_required = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
+ sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
awesome_print = {
source = {
@@ -275,12 +356,14 @@
version = "0.3.2";
};
batch-loader = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pwr2hk9x1qx9i2xpkpjwkdjsmm4kamz5f25wizsaw37zb64apjc";
+ sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi";
type = "gem";
};
- version = "1.2.2";
+ version = "1.4.0";
};
bcrypt = {
source = {
@@ -306,6 +389,17 @@
};
version = "2.3.0";
};
+ benchmark-memory = {
+ dependencies = ["memory_profiler"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
better_errors = {
dependencies = ["coderay" "erubi" "rack"];
source = {
@@ -324,12 +418,14 @@
version = "2.4.3";
};
binding_ninja = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19dk26qyx433ffa6y48511apc2iw71zw4jnlqxhy0wix9dlxr2ri";
+ sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
type = "gem";
};
- version = "0.2.2";
+ version = "0.2.3";
};
binding_of_caller = {
dependencies = ["debug_inspector"];
@@ -344,18 +440,21 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
+ sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
type = "gem";
};
- version = "1.3.2";
+ version = "1.4.1";
};
bootstrap_form = {
+ dependencies = ["actionpack" "activemodel"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw";
+ sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
type = "gem";
};
- version = "2.7.0";
+ version = "4.2.0";
};
brakeman = {
source = {
@@ -408,13 +507,15 @@
version = "9.1.0";
};
capybara = {
- dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
+ dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf";
+ sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch";
type = "gem";
};
- version = "2.16.1";
+ version = "3.22.0";
};
capybara-screenshot = {
dependencies = ["capybara" "launchy"];
@@ -442,6 +543,14 @@
};
version = "0.1";
};
+ character_set = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
@@ -528,21 +637,25 @@
version = "0.1.5";
};
concurrent-ruby = {
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18q9skp5pfq4jwbxzmw8q2rn4cpw6mf4561i2hsjcl1nxdag2jvb";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.5";
};
concurrent-ruby-ext = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "mysql" "postgres"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h7k4wnvbxv7vzb53kaqxbbyhp3m98g2rgymr6n1l9v0jlzcr1i8";
+ sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.5";
};
connection_pool = {
source = {
@@ -552,6 +665,16 @@
};
version = "2.2.2";
};
+ contracts = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz";
+ type = "gem";
+ };
+ version = "0.11.0";
+ };
crack = {
dependencies = ["safe_yaml"];
source = {
@@ -622,10 +745,10 @@
dependencies = ["html-pipeline"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j";
+ sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
type = "gem";
};
- version = "2.0.0";
+ version = "2.2.0";
};
declarative = {
source = {
@@ -643,6 +766,28 @@
};
version = "0.1.0";
};
+ default_value_for = {
+ dependencies = ["activerecord"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla";
+ type = "gem";
+ };
+ version = "3.2.0";
+ };
+ derailed_benchmarks = {
+ dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8";
+ type = "gem";
+ };
+ version = "1.3.5";
+ };
descendants_tracker = {
dependencies = ["thread_safe"];
source = {
@@ -662,12 +807,14 @@
};
devise = {
dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xmxfhym0yxwb0zwmmzhdiykbpyqqm3id02g7rf3vcgbc1lqvdnj";
+ sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf";
type = "gem";
};
- version = "4.4.3";
+ version = "4.6.2";
};
devise-two-factor = {
dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
@@ -704,12 +851,14 @@
version = "3.3.0";
};
docile = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+ sha256 = "04d2izkna3ahfn6fwq4xrcafa715d3bbqczxm16fq40fqy87xn17";
type = "gem";
};
- version = "1.1.5";
+ version = "1.3.1";
};
domain_name = {
dependencies = ["unf"];
@@ -824,20 +973,14 @@
version = "0.0.11";
};
erubi = {
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bws86na9k565raiz0kk61yy5pxxp0fmwyzpibdwjkq0xzx8q6q1";
+ sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
type = "gem";
};
- version = "1.7.1";
- };
- erubis = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
- type = "gem";
- };
- version = "2.7.0";
+ version = "1.8.0";
};
escape_utils = {
source = {
@@ -849,12 +992,14 @@
};
et-orbi = {
dependencies = ["tzinfo"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi";
+ sha256 = "1swgjb3h2hs5xflb68837l0vd32masbz9c66b1963mxlnnxf5gsg";
type = "gem";
};
- version = "1.0.3";
+ version = "1.2.1";
};
eventmachine = {
source = {
@@ -888,6 +1033,17 @@
};
version = "0.9.0";
};
+ extended-markdown-filter = {
+ dependencies = ["html-pipeline"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
factory_bot = {
dependencies = ["activesupport"];
source = {
@@ -969,10 +1125,10 @@
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
type = "gem";
};
- version = "1.9.25";
+ version = "1.10.0";
};
flipper = {
source = {
@@ -1013,64 +1169,66 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
+ sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
type = "gem";
};
- version = "0.2.0";
+ version = "0.3.3";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
+ sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4";
type = "gem";
};
- version = "2.0.1";
+ version = "3.5.2";
};
fog-core = {
- dependencies = ["builder" "excon" "formatador"];
+ dependencies = ["builder" "excon" "formatador" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
+ sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
type = "gem";
};
- version = "1.45.0";
+ version = "2.1.0";
};
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
+ sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
type = "gem";
};
- version = "1.7.1";
+ version = "1.8.2";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+ sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
type = "gem";
};
- version = "1.0.2";
+ version = "1.2.0";
};
fog-local = {
dependencies = ["fog-core"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
+ sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
type = "gem";
};
- version = "0.3.1";
+ version = "0.6.0";
};
fog-openstack = {
dependencies = ["fog-core" "fog-json" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
+ sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
type = "gem";
};
- version = "0.1.21";
+ version = "1.0.8";
};
fog-rackspace = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1092,12 +1250,14 @@
};
font-awesome-rails = {
dependencies = ["railties"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qc07vj7qyllrj7lr7wl89l5ir0gj104rc7sds2jynzmrqsamnlw";
+ sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj";
type = "gem";
};
- version = "4.7.0.1";
+ version = "4.7.0.4";
};
foreman = {
dependencies = ["thor"];
@@ -1116,6 +1276,17 @@
};
version = "0.2.5";
};
+ fugit = {
+ dependencies = ["et-orbi" "raabro"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x5h31hl75x0p5s36hinywg18ijlxjhnlb5p02aqcjjkx777rcav";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
source = {
@@ -1125,6 +1296,16 @@
};
version = "2.2.0";
};
+ gemoji = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0";
+ type = "gem";
+ };
+ version = "3.0.1";
+ };
gemojione = {
dependencies = ["json"];
source = {
@@ -1135,12 +1316,14 @@
version = "3.3.0";
};
get_process_mem = {
+ groups = ["default" "development" "puma" "test" "unicorn"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29";
+ sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g";
type = "gem";
};
- version = "0.2.0";
+ version = "0.2.3";
};
gettext = {
dependencies = ["locale" "text"];
@@ -1171,12 +1354,14 @@
};
gitaly-proto = {
dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0";
+ sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j";
type = "gem";
};
- version = "1.5.0";
+ version = "1.37.0";
};
github-markup = {
source = {
@@ -1186,14 +1371,16 @@
};
version = "1.7.0";
};
- gitlab-default_value_for = {
- dependencies = ["activerecord"];
+ gitlab-labkit = {
+ dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qqjf7nxmwxnkdlrgbnby8wjckaj2s5yna96avgb7fwm0h90f1sn";
+ sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1";
type = "gem";
};
- version = "3.1.1";
+ version = "0.3.0";
};
gitlab-license = {
source = {
@@ -1204,12 +1391,14 @@
version = "1.0.0";
};
gitlab-markup = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
+ sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem";
};
- version = "1.6.5";
+ version = "1.7.0";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@@ -1223,31 +1412,35 @@
version = "0.4.0";
};
gitlab-styles = {
- dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
+ sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y";
type = "gem";
};
- version = "2.4.1";
+ version = "2.7.0";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
+ sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
type = "gem";
};
- version = "2.0.4";
+ version = "2.1.1";
};
globalid = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
+ sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
type = "gem";
};
- version = "0.4.1";
+ version = "0.4.2";
};
gon = {
dependencies = ["actionpack" "multi_json" "request_store"];
@@ -1268,21 +1461,25 @@
version = "0.23.4";
};
google-protobuf = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
+ sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
type = "gem";
};
- version = "3.6.1";
+ version = "3.7.1";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
+ sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.4";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -1322,12 +1519,14 @@
};
grape-path-helpers = {
dependencies = ["activesupport" "grape" "rake"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw";
+ sha256 = "16l6lrv4h4ls0lrpj35pc00431q2rx6r9n47337qyvprxs3v0a01";
type = "gem";
};
- version = "1.0.6";
+ version = "1.1.0";
};
grape_logging = {
dependencies = ["grape"];
@@ -1355,14 +1554,27 @@
};
version = "1.8.1";
};
- grpc = {
- dependencies = ["google-protobuf" "googleapis-common-protos-types"];
+ graphql-docs = {
+ dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
+ sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d";
type = "gem";
};
- version = "1.15.0";
+ version = "1.6.0";
+ };
+ grpc = {
+ dependencies = ["google-protobuf" "googleapis-common-protos-types"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
+ type = "gem";
+ };
+ version = "1.19.0";
};
gssapi = {
dependencies = ["ffi"];
@@ -1384,12 +1596,14 @@
};
haml_lint = {
dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "125aj0j84nx5gqm42hfx5d8486higlra423ahgfpsdjwbp399rwv";
+ sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1";
type = "gem";
};
- version = "0.28.0";
+ version = "0.31.0";
};
hamlit = {
dependencies = ["temple" "thor" "tilt"];
@@ -1411,10 +1625,10 @@
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
type = "gem";
};
- version = "0.3.4";
+ version = "0.3.8";
};
hashie = {
source = {
@@ -1442,8 +1656,20 @@
};
version = "2.6.0";
};
+ heapy = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
hipchat = {
dependencies = ["httparty" "mimemagic"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
@@ -1512,13 +1738,15 @@
version = "0.6.0";
};
httparty = {
- dependencies = ["json" "multi_xml"];
+ dependencies = ["mime-types" "multi_xml"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
+ sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
type = "gem";
};
- version = "0.13.7";
+ version = "0.16.4";
};
httpclient = {
source = {
@@ -1530,12 +1758,14 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "1.2.0";
+ version = "1.6.0";
};
icalendar = {
source = {
@@ -1570,6 +1800,25 @@
};
version = "0.8.3";
};
+ jaeger-client = {
+ dependencies = ["opentracing" "thrift"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+ type = "gem";
+ };
+ version = "0.10.0";
+ };
+ jaro_winkler = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
jira-ruby = {
dependencies = ["activesupport" "multipart-post" "oauth"];
source = {
@@ -1587,22 +1836,14 @@
};
version = "1.3.1";
};
- jquery-atwho-rails = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
- type = "gem";
- };
- version = "1.3.2";
- };
js_regex = {
- dependencies = ["regexp_parser"];
+ dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
+ sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
type = "gem";
};
- version = "2.2.1";
+ version = "3.1.1";
};
json = {
source = {
@@ -1676,10 +1917,10 @@
kgio = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
+ sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
type = "gem";
};
- version = "2.10.0";
+ version = "2.11.2";
};
knapsack = {
dependencies = ["rake"];
@@ -1690,14 +1931,24 @@
};
version = "1.17.0";
};
+ kramdown = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+ type = "gem";
+ };
+ version = "1.17.0";
+ };
kubeclient = {
dependencies = ["http" "recursive-open-struct" "rest-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg";
+ sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
type = "gem";
};
- version = "4.0.0";
+ version = "4.2.2";
};
launchy = {
dependencies = ["addressable"];
@@ -1710,21 +1961,25 @@
};
letter_opener = {
dependencies = ["launchy"];
+ groups = ["default" "development"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21";
+ sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9";
type = "gem";
};
- version = "1.4.1";
+ version = "1.7.0";
};
letter_opener_web = {
dependencies = ["actionmailer" "letter_opener" "railties"];
+ groups = ["development"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv";
+ sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb";
type = "gem";
};
- version = "1.3.0";
+ version = "1.3.4";
};
license_finder = {
dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
@@ -1787,6 +2042,28 @@
};
version = "0.9.1";
};
+ marcel = {
+ dependencies = ["mimemagic"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
+ type = "gem";
+ };
+ version = "0.3.3";
+ };
+ mdl = {
+ dependencies = ["kramdown" "mixlib-cli" "mixlib-config"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
memoist = {
source = {
remotes = ["https://rubygems.org"];
@@ -1804,6 +2081,16 @@
};
version = "0.4.2";
};
+ memory_profiler = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz";
+ type = "gem";
+ };
+ version = "0.9.13";
+ };
method_source = {
source = {
remotes = ["https://rubygems.org"];
@@ -1822,12 +2109,14 @@
version = "3.2.2";
};
mime-types-data = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
- version = "3.2018.0812";
+ version = "3.2019.0331";
};
mimemagic = {
source = {
@@ -1856,10 +2145,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
source = {
@@ -1869,13 +2158,36 @@
};
version = "5.11.3";
};
- msgpack = {
+ mixlib-cli = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+ sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
type = "gem";
};
- version = "1.2.4";
+ version = "1.7.0";
+ };
+ mixlib-config = {
+ dependencies = ["tomlrb"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb";
+ type = "gem";
+ };
+ version = "2.2.18";
+ };
+ msgpack = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch";
+ type = "gem";
+ };
+ version = "1.2.10";
};
multi_json = {
source = {
@@ -1959,12 +2271,14 @@
version = "2.1.3";
};
net-ssh = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w";
+ sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
type = "gem";
};
- version = "5.0.1";
+ version = "5.2.0";
};
netrc = {
source = {
@@ -1984,12 +2298,14 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+ sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
- version = "1.8.5";
+ version = "1.10.3";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -2160,6 +2476,17 @@
};
version = "0.2.2";
};
+ omniauth-salesforce = {
+ dependencies = ["omniauth" "omniauth-oauth2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sr7xmffx6dbsrvnh6spka5ljyzf69iac754xw5r1736py41qhpj";
+ type = "gem";
+ };
+ version = "1.0.5";
+ };
omniauth-saml = {
dependencies = ["omniauth" "ruby-saml"];
source = {
@@ -2187,6 +2514,17 @@
};
version = "1.4.0";
};
+ omniauth-ultraauth = {
+ dependencies = ["omniauth_openid_connect"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8";
+ type = "gem";
+ };
+ version = "0.0.2";
+ };
omniauth_crowd = {
dependencies = ["activesupport" "nokogiri" "omniauth"];
source = {
@@ -2196,6 +2534,46 @@
};
version = "2.2.3";
};
+ omniauth_openid_connect = {
+ dependencies = ["addressable" "omniauth" "openid_connect"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
+ openid_connect = {
+ dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd";
+ type = "gem";
+ };
+ version = "1.1.6";
+ };
+ opentracing = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
+ optimist = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
org-ruby = {
dependencies = ["rubypants"];
source = {
@@ -2222,21 +2600,25 @@
version = "1.0.0";
};
parallel = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+ sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
type = "gem";
};
- version = "1.12.1";
+ version = "1.17.0";
};
parser = {
dependencies = ["ast"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
+ sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
type = "gem";
};
- version = "2.5.3.0";
+ version = "2.6.3.0";
};
parslet = {
source = {
@@ -2301,12 +2683,14 @@
version = "1.2.0";
};
pg = {
+ groups = ["development" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
+ sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem";
};
- version = "0.18.4";
+ version = "1.1.4";
};
po_to_json = {
dependencies = ["json"];
@@ -2317,14 +2701,6 @@
};
version = "1.0.1";
};
- powerpack = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
- type = "gem";
- };
- version = "0.1.1";
- };
premailer = {
dependencies = ["addressable" "css_parser" "htmlentities"];
source = {
@@ -2361,12 +2737,14 @@
version = "0.0.3";
};
prometheus-client-mmap = {
+ groups = ["metrics"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10";
+ sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd";
type = "gem";
};
- version = "0.9.4";
+ version = "0.9.8";
};
pry = {
dependencies = ["coderay" "method_source"];
@@ -2396,12 +2774,14 @@
version = "0.3.6";
};
public_suffix = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.0";
};
puma = {
source = {
@@ -2428,13 +2808,23 @@
};
version = "0.0.3.3";
};
- rack = {
+ raabro = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
+ sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
type = "gem";
};
- version = "2.0.6";
+ version = "1.1.6";
+ };
+ rack = {
+ groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
+ type = "gem";
+ };
+ version = "2.0.7";
};
rack-accept = {
dependencies = ["rack"];
@@ -2463,22 +2853,24 @@
version = "1.0.2";
};
rack-oauth2 = {
- dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
+ dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";
+ sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
type = "gem";
};
- version = "1.2.3";
+ version = "1.9.3";
};
rack-protection = {
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq";
+ sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
type = "gem";
};
- version = "2.0.4";
+ version = "2.0.5";
};
rack-proxy = {
dependencies = ["rack"];
@@ -2491,21 +2883,35 @@
};
rack-test = {
dependencies = ["rack"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+ sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
type = "gem";
};
- version = "0.6.3";
+ version = "1.1.0";
+ };
+ rack-timeout = {
+ groups = ["puma"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a";
+ type = "gem";
+ };
+ version = "0.5.1";
};
rails = {
- dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w";
+ sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@@ -2516,15 +2922,6 @@
};
version = "1.0.2";
};
- rails-deprecated_sanitizer = {
- dependencies = ["activesupport"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
- type = "gem";
- };
- version = "1.0.3";
- };
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
source = {
@@ -2554,12 +2951,14 @@
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr";
+ sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.2.3";
};
rainbow = {
source = {
@@ -2572,10 +2971,10 @@
raindrops = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
+ sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
type = "gem";
};
- version = "0.18.0";
+ version = "0.19.0";
};
rake = {
source = {
@@ -2612,13 +3011,13 @@
version = "0.3.6";
};
rbtrace = {
- dependencies = ["ffi" "msgpack" "trollop"];
+ dependencies = ["ffi" "msgpack" "optimist"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
type = "gem";
};
- version = "0.4.10";
+ version = "0.4.11";
};
rdoc = {
source = {
@@ -2638,12 +3037,14 @@
};
recaptcha = {
dependencies = ["json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
+ sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
type = "gem";
};
- version = "3.0.0";
+ version = "4.13.1";
};
recursive-open-struct = {
source = {
@@ -2653,14 +3054,6 @@
};
version = "1.1.0";
};
- redcarpet = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
- type = "gem";
- };
- version = "3.4.0";
- };
RedCloth = {
source = {
remotes = ["https://rubygems.org"];
@@ -2732,12 +3125,22 @@
version = "1.6.0";
};
regexp_parser = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
+ sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d";
type = "gem";
};
- version = "0.5.0";
+ version = "1.5.1";
+ };
+ regexp_property_values = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
+ type = "gem";
+ };
+ version = "0.3.4";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
@@ -2799,12 +3202,14 @@
version = "2.1.2";
};
rouge = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
+ sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
type = "gem";
};
- version = "3.3.0";
+ version = "3.5.1";
};
rqrcode = {
dependencies = ["chunky_png"];
@@ -2826,66 +3231,80 @@
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01";
+ sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.0";
};
rspec-core = {
dependencies = ["rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj";
+ sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.2";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy";
+ sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.4";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3";
+ sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni";
type = "gem";
};
- version = "3.7.0";
+ version = "3.8.1";
};
rspec-parameterized = {
dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "159yw3mb4dab5kr18a97miyyi7dqmyrfjp3aw6r6j9i4xkc4xk3a";
+ sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
type = "gem";
};
- version = "0.4.1";
+ version = "0.4.2";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx";
+ sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1";
type = "gem";
};
- version = "3.7.2";
+ version = "3.8.2";
};
rspec-retry = {
dependencies = ["rspec-core"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6";
+ sha256 = "1nnqcg2yd3nn187zbvh4cgx8xsvdk56lz1985qy7232v7i8yidw6";
type = "gem";
};
- version = "0.4.5";
+ version = "0.6.1";
};
rspec-set = {
source = {
@@ -2896,12 +3315,14 @@
version = "0.1.3";
};
rspec-support = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1";
+ sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.2";
};
rspec_junit_formatter = {
dependencies = ["rspec-core"];
@@ -2922,13 +3343,15 @@
version = "0.0.5";
};
rubocop = {
- dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is";
+ sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i";
type = "gem";
};
- version = "0.54.0";
+ version = "0.69.0";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
@@ -2939,6 +3362,17 @@
};
version = "0.1.1";
};
+ rubocop-performance = {
+ dependencies = ["rubocop"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0azzgj62w24wa4hza1qn7i9b9crxdh907kydlzcvhismx41h3lzk";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
rubocop-rspec = {
dependencies = ["rubocop"];
source = {
@@ -2975,12 +3409,14 @@
version = "0.17.0";
};
ruby-progressbar = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
+ sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
type = "gem";
};
- version = "1.9.0";
+ version = "1.10.0";
};
ruby-saml = {
dependencies = ["nokogiri"];
@@ -2993,12 +3429,14 @@
};
ruby_parser = {
dependencies = ["sexp_processor"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mysmdyxhvyn6dhshfxyw762f9asr3kxw45idvw1bh6np31kk4j1";
+ sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7";
type = "gem";
};
- version = "3.11.0";
+ version = "3.13.1";
};
rubyntlm = {
source = {
@@ -3024,22 +3462,15 @@
};
version = "1.2.2";
};
- rufus-scheduler = {
- dependencies = ["et-orbi"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8";
- type = "gem";
- };
- version = "3.4.0";
- };
rugged = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
+ sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem";
};
- version = "0.27.5";
+ version = "0.28.1";
};
safe_yaml = {
source = {
@@ -3076,14 +3507,27 @@
};
version = "4.0.0";
};
- sass-rails = {
- dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
+ sassc = {
+ dependencies = ["ffi" "rake"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb";
+ sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4";
type = "gem";
};
- version = "5.0.6";
+ version = "2.0.1";
+ };
+ sassc-rails = {
+ dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn";
+ type = "gem";
+ };
+ version = "2.1.0";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@@ -3112,32 +3556,27 @@
};
version = "2.3.7";
};
- select2-rails = {
- dependencies = ["thor"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
- type = "gem";
- };
- version = "3.5.9.3";
- };
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz";
+ sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
type = "gem";
};
- version = "3.12.0";
+ version = "3.141.0";
};
sentry-raven = {
dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
+ sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem";
};
- version = "2.7.4";
+ version = "2.9.0";
};
settingslogic = {
source = {
@@ -3148,12 +3587,14 @@
version = "2.0.9";
};
sexp_processor = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vnmphfrd86694x5k7rxddbhbvv5rqbglsc34kfryy4jqhbzz42c";
+ sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7";
type = "gem";
};
- version = "4.11.0";
+ version = "4.12.0";
};
sham_rack = {
dependencies = ["rack"];
@@ -3166,30 +3607,34 @@
};
shoulda-matchers = {
dependencies = ["activesupport"];
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zvv94pqk5b5my3w1shdz7h34xf2ldhg5k4qfdpbwi2iy0j9zw2a";
+ sha256 = "1s6a2i39lsqq8rrkk2pddqcb10bsihxy3v5gpnc2gk8xakj1brdq";
type = "gem";
};
- version = "3.1.2";
+ version = "4.0.1";
};
sidekiq = {
- dependencies = ["connection_pool" "rack-protection" "redis"];
+ dependencies = ["connection_pool" "rack" "rack-protection" "redis"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26";
+ sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq";
type = "gem";
};
- version = "5.2.3";
+ version = "5.2.7";
};
sidekiq-cron = {
- dependencies = ["rufus-scheduler" "sidekiq"];
+ dependencies = ["fugit" "sidekiq"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj";
+ sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
type = "gem";
};
- version = "0.6.0";
+ version = "1.0.4";
};
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
@@ -3210,20 +3655,24 @@
};
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
+ groups = ["development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww";
+ sha256 = "1sfyfgf7zrp2n42v7rswkqgk3bbwk1bnsphm24y7laxv3f8z0947";
type = "gem";
};
- version = "0.14.1";
+ version = "0.16.1";
};
simplecov-html = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
+ sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
type = "gem";
};
- version = "0.10.0";
+ version = "0.10.2";
};
slack-notifier = {
source = {
@@ -3233,6 +3682,17 @@
};
version = "1.5.1";
};
+ snowplow-tracker = {
+ dependencies = ["contracts"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w";
+ type = "gem";
+ };
+ version = "0.6.1";
+ };
spring = {
dependencies = ["activesupport"];
source = {
@@ -3280,10 +3740,10 @@
sshkey = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+ sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
type = "gem";
};
- version = "1.9.0";
+ version = "2.0.0";
};
stackprof = {
source = {
@@ -3319,6 +3779,17 @@
};
version = "0.5.1";
};
+ swd = {
+ dependencies = ["activesupport" "attr_required" "httpclient"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1s2vjb6f13za7p1iycl2p73d3p202xa6xny9fjrp8ynwsqix7lyd";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
sys-filesystem = {
dependencies = ["ffi"];
source = {
@@ -3337,12 +3808,14 @@
version = "1.2.0";
};
temple = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq";
+ sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09";
type = "gem";
};
- version = "0.8.0";
+ version = "0.8.1";
};
test-prof = {
source = {
@@ -3385,13 +3858,23 @@
};
version = "0.3.6";
};
- tilt = {
+ thrift = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
type = "gem";
};
- version = "2.0.8";
+ version = "0.11.0.0";
+ };
+ tilt = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+ type = "gem";
+ };
+ version = "2.0.9";
};
timecop = {
source = {
@@ -3427,22 +3910,24 @@
};
version = "1.0.0";
};
- trollop = {
+ tomlrb = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
+ sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv";
type = "gem";
};
- version = "2.1.3";
+ version = "1.2.8";
};
truncato = {
dependencies = ["htmlentities" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
+ sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
type = "gem";
};
- version = "0.7.10";
+ version = "0.7.11";
};
tzinfo = {
dependencies = ["thread_safe"];
@@ -3496,21 +3981,23 @@
version = "0.0.7.5";
};
unicode-display_width = {
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+ sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
type = "gem";
};
- version = "1.3.2";
+ version = "1.6.0";
};
unicorn = {
dependencies = ["kgio" "raindrops"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
+ sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
type = "gem";
};
- version = "5.1.0";
+ version = "5.4.1";
};
unicorn-worker-killer = {
dependencies = ["get_process_mem" "unicorn"];
@@ -3531,12 +4018,36 @@
};
unparser = {
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w662glqi7hwmfvx0smxckxgc7kw5bsqhqz0pyvalbyv1gc0gs2x";
+ sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c";
type = "gem";
};
- version = "0.4.2";
+ version = "0.4.5";
+ };
+ validate_email = {
+ dependencies = ["activemodel" "mail"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx";
+ type = "gem";
+ };
+ version = "0.1.6";
+ };
+ validate_url = {
+ dependencies = ["activemodel" "public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi";
+ type = "gem";
+ };
+ version = "1.0.8";
};
validates_hostname = {
dependencies = ["activerecord" "activesupport"];
@@ -3550,10 +4061,10 @@
version_sorter = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
+ sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.4";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@@ -3581,14 +4092,25 @@
};
version = "1.2.7";
};
+ webfinger = {
+ dependencies = ["activesupport" "httpclient"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
+ sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
type = "gem";
};
- version = "2.3.2";
+ version = "3.5.1";
};
webpack-rails = {
dependencies = ["railties"];
@@ -3601,12 +4123,14 @@
};
websocket-driver = {
dependencies = ["websocket-extensions"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1943442yllhldh9dbp374x2q39cxa49xrm28nb78b7mfbv3y195l";
+ sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn";
type = "gem";
};
- version = "0.6.5";
+ version = "0.7.0";
};
websocket-extensions = {
source = {
@@ -3643,11 +4167,13 @@
};
xpath = {
dependencies = ["nokogiri"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw";
+ sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd";
type = "gem";
};
- version = "2.1.0";
+ version = "3.2.0";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 26dc3d39eb1..650bd73aa84 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log
+#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix
import click
import click_log
@@ -9,6 +9,7 @@ import logging
import subprocess
import json
import pathlib
+from distutils.version import LooseVersion
from typing import Iterable
import requests
@@ -18,6 +19,7 @@ logger = logging.getLogger(__name__)
class GitLabRepo:
+ version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?")
def __init__(self, owner: str, repo: str):
self.owner = owner
self.repo = repo
@@ -31,8 +33,13 @@ class GitLabRepo:
r = requests.get(self.url + "/tags?format=atom", stream=True)
tree = ElementTree.fromstring(r.content)
- return sorted((e.text for e in tree.findall(
- '{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')), reverse=True)
+ versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')]
+ # filter out versions not matching version_regex
+ versions = list(filter(self.version_regex.match, versions))
+
+ # sort, but ignore v and -ee for sorting comparisons
+ versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True)
+ return versions
def get_git_hash(self, rev: str):
out = subprocess.check_output(['nix-prefetch-git', self.url, rev])
@@ -187,13 +194,21 @@ def update_gitaly():
data = _get_data_json()
gitaly_server_version = data['ce']['passthru']['GITALY_SERVER_VERSION']
r = GitLabRepo('gitlab-org', 'gitaly')
- rubyenv_dir = pathlib.Path(__file__).parent / 'gitaly'
+ gitaly_dir = pathlib.Path(__file__).parent / 'gitaly'
for fn in ['Gemfile.lock', 'Gemfile']:
- with open(rubyenv_dir / fn, 'w') as f:
+ with open(gitaly_dir / fn, 'w') as f:
f.write(r.get_file(f"ruby/{fn}", f"v{gitaly_server_version}"))
- subprocess.check_output(['bundix'], cwd=rubyenv_dir)
+ for fn in ['go.mod', 'go.sum']:
+ with open(gitaly_dir / fn, 'w') as f:
+ f.write(r.get_file(fn, f"v{gitaly_server_version}"))
+
+ subprocess.check_output(['bundix'], cwd=gitaly_dir)
+ subprocess.check_output(['vgo2nix'], cwd=gitaly_dir)
+
+ for fn in ['go.mod', 'go.sum']:
+ os.unlink(gitaly_dir / fn)
# currently broken, as `gitaly.meta.position` returns
# pkgs/development/go-modules/generic/default.nix
# so update-source-version doesn't know where to update hashes
@@ -202,7 +217,6 @@ def update_gitaly():
click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}")
-
@cli.command('update-gitlab-shell')
def update_gitlab_shell():
"""Update gitlab-shell"""
diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix
index d062c32d018..c08e441b05a 100644
--- a/pkgs/applications/version-management/gitless/default.nix
+++ b/pkgs/applications/version-management/gitless/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
doCheck = false;
meta = with stdenv.lib; {
- homepage = http://gitless.com/;
+ homepage = https://gitless.com/;
description = "A version control system built on top of Git";
license = licenses.gpl2;
platforms = platforms.all;
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 78dd9dd49df..7c157191ab9 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, git, nettools, perl }:
stdenv.mkDerivation rec {
- name = "gitolite-${version}";
+ pname = "gitolite";
version = "3.6.11";
src = fetchFromGitHub {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Finely-grained git repository hosting";
- homepage = http://gitolite.com/gitolite/index.html;
+ homepage = https://gitolite.com/gitolite/index.html;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ];
diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix
index 64b6e2107f6..5d29c8fcb6c 100644
--- a/pkgs/applications/version-management/gitstats/default.nix
+++ b/pkgs/applications/version-management/gitstats/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
stdenv.mkDerivation rec {
- name = "gitstats-${version}";
+ pname = "gitstats";
version = "2016-01-08";
# upstream does not make releases
src = fetchzip {
url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip";
sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59";
- name = name + "-src";
+ name = "${pname}-${version}" + "-src";
};
buildInputs = [ perl python ];
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 56e41136896..c2153ebea89 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,19 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, bash, gzip, openssh
+, git, bash, gzip, openssh, pam
, sqliteSupport ? true
+, pamSupport ? true
}:
with stdenv.lib;
buildGoPackage rec {
- name = "gogs-${version}";
- version = "0.11.66";
+ pname = "gogs";
+ version = "0.11.86";
src = fetchFromGitHub {
owner = "gogs";
repo = "gogs";
rev = "v${version}";
- sha256 = "1b9ilk4xlsllsj5pzmxwsz4a1zvgd06a8mi9ni9hbvmfl3w8xf28";
+ sha256 = "0l8mwy0cyy3cdxqinf8ydb35kf7c8pj09xrhpr7rr7lldnvczabw";
};
patches = [ ./static-root-path.patch ];
@@ -23,9 +24,14 @@ buildGoPackage rec {
substituteInPlace pkg/setting/setting.go --subst-var data
'';
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ]
+ ++ optional pamSupport pam;
- buildFlags = optionalString sqliteSupport "-tags sqlite";
+ buildFlags = "-tags";
+
+ buildFlagsArray =
+ ( optional sqliteSupport "sqlite"
+ ++ optional pamSupport "pam");
outputs = [ "bin" "out" "data" ];
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index c52a2049a11..0a24cfbb3a0 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
version = "0.49";
- name = "gource-${version}";
+ pname = "gource";
src = fetchurl {
- url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
+ url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://gource.io/;
+ homepage = https://gource.io/;
description = "A Software version control visualization tool";
license = licenses.gpl3Plus;
longDescription = ''
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 33d2eb89ad0..0aa8afa9361 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -2,7 +2,8 @@
let version = "1.0-mtn-head"; in
stdenv.mkDerivation rec {
- name = "guitone-${version}";
+ pname = "guitone";
+ inherit version;
#src = fetchurl {
# url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz";
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 6456dd75b52..168827c3548 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,25 +1,26 @@
{ stdenv, fetchurl, itstool, python3, intltool, wrapGAppsHook
, libxml2, gobject-introspection, gtk3, gtksourceview, gnome3
-, dbus, xvfb_run
+, gsettings-desktop-schemas, dbus, xvfb_run
}:
python3.pkgs.buildPythonApplication rec {
pname = "meld";
- version = "3.20.0";
+ version = "3.20.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b";
+ sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55";
};
nativeBuildInputs = [
intltool itstool libxml2 gobject-introspection wrapGAppsHook
];
buildInputs = [
- gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
+ gtk3 gtksourceview gsettings-desktop-schemas gnome3.adwaita-icon-theme
+ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
];
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
- checkInputs = [ xvfb_run python3.pkgs.pytest dbus ];
+ checkInputs = [ xvfb_run python3.pkgs.pytest dbus gtksourceview gtk3 ];
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 67baa98d21e..ee0ab375666 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,20 +1,23 @@
{ stdenv, fetchurl, python2Packages, makeWrapper, unzip
, guiSupport ? false, tk ? null
-, ApplicationServices }:
+, ApplicationServices
+, mercurialSrc ? fetchurl rec {
+ meta.name = "mercurial-${meta.version}";
+ meta.version = "4.9.1";
+ url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
+ sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
+ }
+}:
let
- # if you bump version, update pkgs.tortoisehg too or ping maintainer
- version = "4.8.2";
- name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
-in python2Packages.buildPythonApplication {
- inherit name;
- format = "other";
- src = fetchurl {
- url = "https://mercurial-scm.org/release/${name}.tar.gz";
- sha256 = "1cpx8nf6vcqz92kx6b5c4900pcay8zb89gvy8y33prh5rywjq83c";
- };
+in python2Packages.buildPythonApplication {
+
+ inherit (mercurialSrc.meta) name version;
+ src = mercurialSrc;
+
+ format = "other";
inherit python; # pass it so that the same version can be used in hg2git
@@ -55,7 +58,7 @@ in python2Packages.buildPythonApplication {
'';
meta = {
- inherit version;
+ inherit (mercurialSrc.meta) version;
description = "A fast, lightweight SCM system for very large distributed projects";
homepage = https://www.mercurial-scm.org;
downloadPage = https://www.mercurial-scm.org/release/;
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 3c052a26cde..bee1c82e11b 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -9,12 +9,12 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
}; in
stdenv.mkDerivation rec {
version = "1.0.2";
- name = "monotone-viz-${version}";
+ pname = "monotone-viz";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
src = fetchurl {
- url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
+ url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
};
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 010d4d2f86a..7081e1a0899 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -11,7 +11,8 @@ in
assert perlVersion != "";
stdenv.mkDerivation rec {
- name = "monotone-${version}";
+ pname = "monotone";
+ inherit version;
src = fetchurl {
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
openssl gmp bzip2 ];
postInstall = ''
- mkdir -p $out/share/${name}
- cp -rv contrib/ $out/share/${name}/contrib
+ mkdir -p $out/share/${pname}-${version}
+ cp -rv contrib/ $out/share/${pname}-${version}/contrib
mkdir -p $out/${perl.libPrefix}/${perlVersion}
cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
'';
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 8150203814d..23278e9e748 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, perl }:
stdenv.mkDerivation rec {
- name = "mr-${version}";
+ pname = "mr";
version = "1.20180726";
src = fetchgit {
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index 18fb672226f..8b2b15a0078 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -2,14 +2,14 @@
with python2Packages;
buildPythonApplication rec {
- name = "${pname}-${version}";
version = "0.3.1";
pname = "nbstripout";
# Mercurial should be added as a build input but because it's a Python
# application, it would mess up the Python environment. Thus, don't add it
# here, instead add it to PATH when running unit tests
- buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ];
+ checkInputs = [ pytest pytest-flake8 pytest-cram git ];
+ nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ ipython nbformat ];
# PyPI source is currently missing tests. Thus, use GitHub instead.
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
index 8fb1095dc58..db9afdc0a74 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "nitpick";
version = "1.1";
- name = "${pname}-${version}";
format = "other";
disabled = !isPy27;
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix
index f82b80067bf..0020c8c2189 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/pkgs/applications/version-management/p4v/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, makeWrapper }:
+{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }:
stdenv.mkDerivation rec {
- name = "p4v-${version}";
+ pname = "p4v";
version = "2017.3.1601999";
src = fetchurl {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
dontBuild = true;
- nativeBuildInputs = [makeWrapper];
+ nativeBuildInputs = [ wrapQtAppsHook ];
ldLibraryPath = lib.makeLibraryPath [
stdenv.cc.cc.lib
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
openssl
];
+ dontWrapQtApps = true;
installPhase = ''
mkdir $out
cp -r bin $out
@@ -31,10 +32,9 @@ stdenv.mkDerivation rec {
for f in $out/bin/*.bin ; do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
- wrapProgram $f \
+ wrapQtApp $f \
--suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
- --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \
- --suffix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix}
+ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
done
'';
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index b97123926eb..180664d3386 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }:
+{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
name = "pijul-${version}";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchurl {
url = "https://pijul.org/releases/${name}.tar.gz";
- sha256 = "e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5";
+ sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig clang ];
postInstall = ''
mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
@@ -20,12 +18,14 @@ buildRustPackage rec {
$out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish
'';
- buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin
- (with darwin.apple_sdk.frameworks; [ Security ]);
+ LIBCLANG_PATH = libclang + "/lib";
+
+ buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin
+ (with darwin.apple_sdk.frameworks; [ CoreServices Security ]);
doCheck = false;
- cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz";
+ cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k";
meta = with stdenv.lib; {
description = "A distributed version control system";
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index e799d5fac43..60486e20116 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:
stdenv.mkDerivation rec {
- name = "rapidsvn-${version}";
+ pname = "rapidsvn";
version = "0.12.1";
src = fetchurl {
- url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz";
+ url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz";
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
};
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index df1739aea57..862b9eacd62 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ed }:
+{ stdenv, fetchurl, fetchpatch, ed }:
stdenv.mkDerivation rec {
name = "rcs-5.9.4";
@@ -10,10 +10,51 @@ stdenv.mkDerivation rec {
buildInputs = [ ed ];
+ patches = stdenv.lib.optionals stdenv.isDarwin [
+ # This failure appears unrelated to the subject of the test. This
+ # test seems to rely on a bash bug where `test $x -nt $y` ignores
+ # subsecond values in timetamps. This bug has been fixed in Bash
+ # 5, and seemingly doesn't affect Darwin.
+ ./disable-t810.patch
+
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch";
+ extraPrefix = "";
+ sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3";
+ })
+
+ # Expected to appear in the next release
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch";
+ sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx";
+ })
+ ];
+
doCheck = true;
+ checkFlags = [ "VERBOSE=1" ];
+
+ checkPhase = ''
+ # If neither LOGNAME or USER are set, rcs will default to
+ # getlogin(), which is unreliable on macOS. It will often return
+ # things like `_spotlight`, or `_mbsetupuser`. macOS sets both
+ # environment variables in user sessions, so this is unlikely to
+ # affect regular usage.
+
+ export LOGNAME=$(id -un)
+
+ print_logs_and_fail() {
+ grep -nH -e . -r tests/*.d/{out,err}
+ return 1
+ }
+
+ make $checkFlags check || print_logs_and_fail
+ '';
+
NIX_CFLAGS_COMPILE = [ "-std=c99" ];
+ hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format";
+
meta = {
homepage = https://www.gnu.org/software/rcs/;
description = "Revision control system";
@@ -27,6 +68,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ eelco ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/pkgs/applications/version-management/rcs/disable-t810.patch
new file mode 100644
index 00000000000..745f1868a36
--- /dev/null
+++ b/pkgs/applications/version-management/rcs/disable-t810.patch
@@ -0,0 +1,10 @@
+--- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900
++++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900
+@@ -1372,7 +1372,6 @@
+ t803 \
+ t804 \
+ t805 \
+- t810 \
+ t900 \
+ t999
+
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile
index 3fd176007ab..343c7b3a547 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0"
-gem "rails", "5.2.2"
+gem "rails", "5.2.3"
gem "rouge", "~> 3.3.0"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0.1"
@@ -14,6 +14,7 @@ gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
gem "i18n", "~> 0.7.0"
+gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -33,7 +34,7 @@ end
platforms :mri, :mingw, :x64_mingw do
# Optional gem for exporting the gantt to a PNG file, not supported with jruby
group :rmagick do
- gem "rmagick", ">= 2.14.0"
+ gem "rmagick", "~> 2.16.0"
end
# Optional Markdown support, not for JRuby
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
index 8c569ddb322..671d2bb4ac1 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.2.2)
- actionpack (= 5.2.2)
+ actioncable (5.2.3)
+ actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailer (5.2.2)
- actionpack (= 5.2.2)
- actionview (= 5.2.2)
- activejob (= 5.2.2)
+ actionmailer (5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.2.2)
- actionview (= 5.2.2)
- activesupport (= 5.2.2)
+ actionpack (5.2.3)
+ actionview (= 5.2.3)
+ activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@@ -21,26 +21,26 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
- actionview (5.2.2)
- activesupport (= 5.2.2)
+ actionview (5.2.3)
+ activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.2)
- activesupport (= 5.2.2)
+ activejob (5.2.3)
+ activesupport (= 5.2.3)
globalid (>= 0.3.6)
- activemodel (5.2.2)
- activesupport (= 5.2.2)
- activerecord (5.2.2)
- activemodel (= 5.2.2)
- activesupport (= 5.2.2)
+ activemodel (5.2.3)
+ activesupport (= 5.2.3)
+ activerecord (5.2.3)
+ activemodel (= 5.2.3)
+ activesupport (= 5.2.3)
arel (>= 9.0)
- activestorage (5.2.2)
- actionpack (= 5.2.2)
- activerecord (= 5.2.2)
+ activestorage (5.2.3)
+ actionpack (= 5.2.3)
+ activerecord (= 5.2.3)
marcel (~> 0.3.1)
- activesupport (5.2.2)
+ activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -56,21 +56,20 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
- childprocess (0.9.0)
- ffi (~> 1.0, >= 1.0.11)
- concurrent-ruby (1.1.4)
+ childprocess (1.0.1)
+ rake (< 13.0)
+ concurrent-ruby (1.1.5)
crass (1.0.4)
- css_parser (1.6.0)
+ css_parser (1.7.0)
addressable
- csv (3.0.4)
+ csv (3.0.9)
docile (1.1.5)
erubi (1.8.0)
- ffi (1.10.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
htmlentities (4.3.4)
i18n (0.7.0)
- json (2.1.0)
+ json (2.2.0)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
@@ -89,38 +88,38 @@ GEM
mysql2 (0.5.2)
net-ldap (0.16.1)
nio4r (2.3.1)
- nokogiri (1.10.1)
+ nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
pg (1.1.4)
- public_suffix (3.0.3)
- puma (3.12.0)
- rack (2.0.6)
+ public_suffix (3.1.0)
+ puma (3.12.1)
+ rack (2.0.7)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (5.2.2)
- actioncable (= 5.2.2)
- actionmailer (= 5.2.2)
- actionpack (= 5.2.2)
- actionview (= 5.2.2)
- activejob (= 5.2.2)
- activemodel (= 5.2.2)
- activerecord (= 5.2.2)
- activestorage (= 5.2.2)
- activesupport (= 5.2.2)
+ rails (5.2.3)
+ actioncable (= 5.2.3)
+ actionmailer (= 5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
+ activemodel (= 5.2.3)
+ activerecord (= 5.2.3)
+ activestorage (= 5.2.3)
+ activesupport (= 5.2.3)
bundler (>= 1.3.0)
- railties (= 5.2.2)
+ railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (5.2.2)
- actionpack (= 5.2.2)
- activesupport (= 5.2.2)
+ railties (5.2.3)
+ actionpack (= 5.2.3)
+ activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@@ -132,17 +131,17 @@ GEM
redcarpet (3.4.0)
request_store (1.0.5)
rmagick (2.16.0)
- roadie (3.4.0)
+ roadie (3.5.0)
css_parser (~> 1.4)
- nokogiri (~> 1.5)
+ nokogiri (~> 1.8)
roadie-rails (1.3.0)
railties (>= 3.0, < 5.3)
roadie (~> 3.1)
rouge (3.3.0)
ruby-openid (2.3.0)
- rubyzip (1.2.2)
- selenium-webdriver (3.141.0)
- childprocess (~> 0.5)
+ rubyzip (1.2.3)
+ selenium-webdriver (3.142.3)
+ childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
simplecov (0.14.1)
docile (~> 1.1.0)
@@ -160,12 +159,12 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- websocket-driver (0.7.0)
+ websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.3)
+ websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.18)
+ yard (0.9.19)
PLATFORMS
ruby
@@ -186,12 +185,12 @@ DEPENDENCIES
pg (~> 1.1.4)
puma (~> 3.7)
rack-openid
- rails (= 5.2.2)
+ rails (= 5.2.3)
rails-dom-testing
rbpdf (~> 1.19.6)
redcarpet (~> 3.4.0)
request_store (= 1.0.5)
- rmagick (>= 2.14.0)
+ rmagick (~> 2.16.0)
roadie-rails (~> 1.3.0)
rouge (~> 3.3.0)
ruby-openid (~> 2.3.0)
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
index ba9f96f5a30..a3ba418a146 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "4.0.1";
+ version = "4.0.4";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -11,11 +11,12 @@ let
};
in
stdenv.mkDerivation rec {
- name = "redmine-${version}";
+ pname = "redmine";
+ inherit version;
src = fetchurl {
- url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "1zzn9rkh7x1h9f2shcc8qhb693hp0hpah0z53i6gfgg5p8k5hns1";
+ url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
+ sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
@@ -37,7 +38,7 @@ in
meta = with stdenv.lib; {
homepage = http://www.redmine.org/;
platforms = platforms.linux;
- maintainers = [ maintainers.garbas maintainers.aanderse ];
+ maintainers = [ maintainers.aanderse ];
license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix
index ce21a58b556..34e459111f8 100644
--- a/pkgs/applications/version-management/redmine/4.x/gemset.nix
+++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix
@@ -3,28 +3,28 @@
dependencies = ["actionpack" "nio4r" "websocket-driver"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x";
+ sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n";
+ sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws";
+ sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@@ -39,55 +39,55 @@
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z";
+ sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir";
+ sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
activemodel = {
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi";
+ sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y";
+ sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31";
+ sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz";
+ sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
addressable = {
dependencies = ["public_suffix"];
@@ -124,21 +124,21 @@
version = "2.18.0";
};
childprocess = {
- dependencies = ["ffi"];
+ dependencies = ["rake"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
+ sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz";
type = "gem";
};
- version = "0.9.0";
+ version = "1.0.1";
};
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.1.4";
+ version = "1.1.5";
};
crass = {
source = {
@@ -152,18 +152,18 @@
dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
+ sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
type = "gem";
};
- version = "1.6.0";
+ version = "1.7.0";
};
csv = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33";
+ sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b";
type = "gem";
};
- version = "3.0.4";
+ version = "3.0.9";
};
docile = {
source = {
@@ -181,14 +181,6 @@
};
version = "1.8.0";
};
- ffi = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
- type = "gem";
- };
- version = "1.10.0";
- };
globalid = {
dependencies = ["activesupport"];
source = {
@@ -217,10 +209,10 @@
json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@@ -334,10 +326,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
+ sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
- version = "1.10.1";
+ version = "1.10.3";
};
pg = {
source = {
@@ -350,26 +342,26 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.0";
};
puma = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
+ sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3";
type = "gem";
};
- version = "3.12.0";
+ version = "3.12.1";
};
rack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem";
};
- version = "2.0.6";
+ version = "2.0.7";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@@ -393,10 +385,10 @@
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr";
+ sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -420,10 +412,10 @@
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l";
+ sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.3";
};
rake = {
source = {
@@ -478,10 +470,10 @@
dependencies = ["css_parser" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l3s80394yijvz0fsvfkw0azsi9yxsdkxd8lpas0bd7wlndjvmxx";
+ sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d";
type = "gem";
};
- version = "3.4.0";
+ version = "3.5.0";
};
roadie-rails = {
dependencies = ["railties" "roadie"];
@@ -511,19 +503,19 @@
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+ sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
- version = "1.2.2";
+ version = "1.2.3";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
+ sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy";
type = "gem";
};
- version = "3.141.0";
+ version = "3.142.3";
};
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
@@ -589,18 +581,18 @@
dependencies = ["websocket-extensions"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn";
+ sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
type = "gem";
};
- version = "0.7.0";
+ version = "0.7.1";
};
websocket-extensions = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270";
+ sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
type = "gem";
};
- version = "0.1.3";
+ version = "0.1.4";
};
xpath = {
dependencies = ["nokogiri"];
@@ -614,9 +606,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
+ sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
type = "gem";
};
- version = "0.9.18";
+ version = "0.9.19";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile
index 8f457449e7e..5a0283e20ed 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/pkgs/applications/version-management/redmine/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0", "< 2.0.0"
-gem "rails", "4.2.11"
+gem "rails", "4.2.11.1"
gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
if RUBY_VERSION < "2.1"
gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
@@ -21,6 +21,7 @@ gem "mail", "~> 2.6.4"
gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
gem "i18n", "~> 0.7.0"
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
+gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
# Request at least rails-html-sanitizer 1.0.3 because of security advisories
gem "rails-html-sanitizer", ">= 1.0.3"
@@ -43,7 +44,7 @@ end
platforms :mri, :mingw, :x64_mingw do
# Optional gem for exporting the gantt to a PNG file, not supported with jruby
group :rmagick do
- gem "rmagick", ">= 2.14.0"
+ gem "rmagick", "~> 2.16.0"
end
# Optional Markdown support, not for JRuby
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 8bc8a03e790..21296d343b4 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.11)
- actionpack (= 4.2.11)
- actionview (= 4.2.11)
- activejob (= 4.2.11)
+ actionmailer (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.11)
- actionview (= 4.2.11)
- activesupport (= 4.2.11)
+ actionpack (4.2.11.1)
+ actionview (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-xml_parser (1.0.2)
actionpack (>= 4.0.0, < 5)
- actionview (4.2.11)
- activesupport (= 4.2.11)
+ actionview (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.11)
- activesupport (= 4.2.11)
+ activejob (4.2.11.1)
+ activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
- activemodel (4.2.11)
- activesupport (= 4.2.11)
+ activemodel (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
- activerecord (4.2.11)
- activemodel (= 4.2.11)
- activesupport (= 4.2.11)
+ activerecord (4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
arel (~> 6.0)
- activesupport (4.2.11)
+ activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@ -51,13 +51,13 @@ GEM
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
- concurrent-ruby (1.1.4)
+ concurrent-ruby (1.1.5)
crass (1.0.4)
- css_parser (1.6.0)
+ css_parser (1.7.0)
addressable
docile (1.1.5)
erubis (2.7.0)
- ffi (1.10.0)
+ ffi (1.11.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
htmlentities (4.3.4)
@@ -73,7 +73,7 @@ GEM
metaclass (0.0.4)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
- mime-types-data (3.2018.0812)
+ mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
@@ -88,23 +88,23 @@ GEM
pg (0.18.4)
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
- public_suffix (3.0.3)
+ public_suffix (3.1.0)
rack (1.6.11)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.11)
- actionmailer (= 4.2.11)
- actionpack (= 4.2.11)
- actionview (= 4.2.11)
- activejob (= 4.2.11)
- activemodel (= 4.2.11)
- activerecord (= 4.2.11)
- activesupport (= 4.2.11)
+ rails (4.2.11.1)
+ actionmailer (= 4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activerecord (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.11)
+ railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -114,13 +114,13 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (4.2.11)
- actionpack (= 4.2.11)
- activesupport (= 4.2.11)
+ railties (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
- rbpdf (1.19.7)
+ rbpdf (1.19.8)
htmlentities
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
@@ -135,7 +135,7 @@ GEM
railties (>= 3.0, < 5.1)
roadie (~> 3.1)
ruby-openid (2.3.0)
- rubyzip (1.2.2)
+ rubyzip (1.2.3)
selenium-webdriver (2.53.4)
childprocess (~> 0.5)
rubyzip (~> 1.0)
@@ -161,7 +161,7 @@ GEM
websocket (1.2.8)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.18)
+ yard (0.9.19)
PLATFORMS
ruby
@@ -184,14 +184,14 @@ DEPENDENCIES
pg (~> 0.18.1)
protected_attributes
rack-openid
- rails (= 4.2.11)
+ rails (= 4.2.11.1)
rails-dom-testing
rails-html-sanitizer (>= 1.0.3)
rbpdf (~> 1.19.6)
rdoc (~> 4.3)
redcarpet (~> 3.4.0)
request_store (= 1.0.5)
- rmagick (>= 2.14.0)
+ rmagick (~> 2.16.0)
roadie (~> 3.2.1)
roadie-rails (~> 1.1.1)
ruby-openid (~> 2.3.0)
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 02ae5da0f3f..0b1f64b58a1 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "3.4.8";
+ version = "3.4.11";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -11,11 +11,12 @@ let
};
in
stdenv.mkDerivation rec {
- name = "redmine-${version}";
+ pname = "redmine";
+ inherit version;
src = fetchurl {
- url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "1d8bj3hx2nlyvsqbx7zbslb4dgwgyxidj4jzh4n2ki0i7vgw0x5m";
+ url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
+ sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
@@ -37,7 +38,7 @@ in
meta = with stdenv.lib; {
homepage = http://www.redmine.org/;
platforms = platforms.linux;
- maintainers = [ maintainers.garbas maintainers.aanderse ];
+ maintainers = [ maintainers.aanderse ];
license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index 0a231c99579..4ef4bd40427 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -3,19 +3,19 @@
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zkklsh7ymhvdm5p9fr5ycd39d5caassag8yq0dga9cbk7fps74m";
+ sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13xkil3y7gjj0m4ky14asi4m08x69wwv63wfn0h95wli4x8h8w7r";
+ sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
actionpack-xml_parser = {
dependencies = ["actionpack"];
@@ -30,46 +30,46 @@
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09vwq0xgxxhssxxh8fa7l2pv6a56smw3v6gvb9l1mycmf8vprd4b";
+ sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12yqs22f4lz20nw6djsrkhii3p3nfpd51nw0lhvnczx0q8kl0nyk";
+ sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activemodel = {
dependencies = ["activesupport" "builder"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11aqvabf5c1pgb404f5bqp1i7mxkyhzmwk6y8zm5w6rf4nq095mq";
+ sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sw0m19cnasbr4cabvc302hjddc3s6fja3fr0gbj9h2n8b3633i5";
+ sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activesupport = {
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4";
+ sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -125,10 +125,10 @@
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.1.4";
+ version = "1.1.5";
};
crass = {
source = {
@@ -142,10 +142,10 @@
dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
+ sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
type = "gem";
};
- version = "1.6.0";
+ version = "1.7.0";
};
docile = {
source = {
@@ -166,10 +166,10 @@
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.1";
};
globalid = {
dependencies = ["activesupport"];
@@ -243,10 +243,10 @@
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
- version = "3.2018.0812";
+ version = "3.2019.0331";
};
mimemagic = {
source = {
@@ -342,10 +342,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.0";
};
rack = {
source = {
@@ -377,10 +377,10 @@
dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rhp1l5klw8alqnzji2p4w01x7ygsfnzc7mf87ncr2jlizmgy4nx";
+ sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
rails-deprecated_sanitizer = {
dependencies = ["activesupport"];
@@ -413,10 +413,10 @@
dependencies = ["actionpack" "activesupport" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09x32zkxs0vfi4y0bjrqd61821kx2azwhdxvk2ygqj4yvxfh11i1";
+ sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
rake = {
source = {
@@ -430,10 +430,10 @@
dependencies = ["htmlentities" "rbpdf-font"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i00mmc028p7hnpwlx9r6zdwwz589kd9ns6qpxmgl6f620n1fvs2";
+ sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195";
type = "gem";
};
- version = "1.19.7";
+ version = "1.19.8";
};
rbpdf-font = {
source = {
@@ -504,10 +504,10 @@
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+ sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
- version = "1.2.2";
+ version = "1.2.3";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip" "websocket"];
@@ -607,9 +607,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
+ sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
type = "gem";
};
- version = "0.9.18";
+ version = "0.9.19";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 75368bd8846..7d655bfc5d3 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -4,13 +4,13 @@
rustPlatform.buildRustPackage rec {
name = "sit-${version}";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "sit-fyi";
repo = "sit";
rev = "v${version}";
- sha256 = "10ycs6vc7mfzxnxrki09xn974pcwh196h1pfnsds98x6r87hxkpn";
+ sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf";
};
buildInputs = [ cmake libzip gnupg ] ++
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
export HOME=$(mktemp -d)
'';
- cargoSha256 = "023anmnprxbsvqww1b1bdyfhbhjh1ah2kc67cdihvdvi4lqdmbia";
+ cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528";
meta = with stdenv.lib; {
description = "Serverless Information Tracker";
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 153c6d78a7b..343d88554d6 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -1,63 +1,90 @@
-{ stdenv, fetchurl, lib, makeWrapper
-, substituteAll
+{ stdenv
+, fetchurl
+, makeDesktopItem
, jre
-, gtk2, glib
+, gtk3
+, glib
+, gnome3
+, wrapGAppsHook
+, hicolor-icon-theme
, libXtst
, which
}:
stdenv.mkDerivation rec {
- name = "smartgithg-${version}";
- version = "18.2.4";
+ pname = "smartgithg";
+ version = "19.1.1";
src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
- sha256 = "0ch6vcvndn1fpx05ym9yp2ssfw2af6ac0pw8ssvjkc676zc0jr73";
+ sha256 = "0i0dvyy9d63f4hk8czlyk83ai0ywhqp7wbdkq3s87l7irwgs42jy";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ wrapGAppsHook ];
- buildInputs = [ jre ];
+ buildInputs = [ jre gnome3.adwaita-icon-theme hicolor-icon-theme gtk3 ];
- buildCommand = let
- pkg_path = "$out/${name}";
- bin_path = "$out/bin";
- install_freedesktop_items = substituteAll {
- inherit (stdenv) shell;
- src = ./install_freedesktop_items.sh;
- };
- runtime_paths = lib.makeBinPath [
- jre
- #git mercurial subversion # the paths are requested in configuration
- which
- ];
- runtime_lib_paths = lib.makeLibraryPath [
- gtk2 glib
- libXtst
- ];
- in ''
- tar xvzf $src
- mkdir -pv $out
- mkdir -pv ${pkg_path}
- # unpacking should have produced a dir named 'smartgit'
- cp -a smartgit/* ${pkg_path}
- # prevent using packaged jre
- rm -r ${pkg_path}/jre
- mkdir -pv ${bin_path}
- jre=${jre.home}
- makeWrapper ${pkg_path}/bin/smartgit.sh ${bin_path}/smartgit \
- --prefix PATH : ${runtime_paths} \
- --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \
+ preFixup = with stdenv.lib; ''
+ gappsWrapperArgs+=( \
+ --prefix PATH : ${makeBinPath [ jre which ]} \
+ --prefix LD_LIBRARY_PATH : ${makeLibraryPath [
+ gtk3
+ glib
+ libXtst
+ ]} \
--prefix JRE_HOME : ${jre} \
--prefix JAVA_HOME : ${jre} \
- --prefix SMARTGITHG_JAVA_HOME : ${jre}
- sed -i '/ --login/d' ${pkg_path}/bin/smartgit.sh
- patchShebangs $out
- cp ${bin_path}/smartgit ${bin_path}/smartgithg
-
- ${install_freedesktop_items} "${pkg_path}/bin" "$out"
+ --prefix SMARTGITHG_JAVA_HOME : ${jre} \
+ ) \
'';
+ installPhase = ''
+ runHook preInstall
+
+ sed -i '/ --login/d' bin/smartgit.sh
+ mkdir -pv $out/{bin,share/applications,share/icons/hicolor/scalable/apps/}
+ cp -av ./{dictionaries,lib} $out/
+ cp -av bin/smartgit.sh $out/bin/smartgit
+ ln -sfv $out/bin/smartgit $out/bin/smartgithg
+
+ cp -av $desktopItem/share/applications/* $out/share/applications/
+ for icon_size in 32 48 64 128 256; do
+ path=$icon_size'x'$icon_size
+ icon=bin/smartgit-$icon_size.png
+ mkdir -p $out/share/icons/hicolor/$path/apps
+ cp $icon $out/share/icons/hicolor/$path/apps/smartgit.png
+ done
+
+ cp -av bin/smartgit.svg $out/share/icons/hicolor/scalable/apps/
+
+ runHook postInstall
+ '';
+
+ desktopItem = with stdenv.lib; makeDesktopItem rec {
+ name = "smartgit";
+ exec = "smartgit";
+ comment = meta.description;
+ icon = "smartgit";
+ desktopName = "SmartGit";
+ categories = concatStringsSep ";" [
+ "Application"
+ "Development"
+ "RevisionControl"
+ ];
+ mimeType = concatStringsSep ";" [
+ "x-scheme-handler/git"
+ "x-scheme-handler/smartgit"
+ "x-scheme-handler/sourcetree"
+ ];
+ startupNotify = "true";
+ extraEntries = ''
+ Keywords=git
+ StartupWMClass=${name}
+ Version=1.0
+ Encoding=UTF-8
+ '';
+ };
+
meta = with stdenv.lib; {
description = "GUI for Git, Mercurial, Subversion";
homepage = http://www.syntevo.com/smartgit/;
diff --git a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
deleted file mode 100755
index 2ff14dcf099..00000000000
--- a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@shell@
-
-inBinDir=$1
-out=$2
-
-cat $inBinDir/add-menuitem.sh | \
-sed -re 's#xdg-icon-resource[ ]+install[ ]+--size[ ]+([0-9]+)[ ]+("[^"]+")[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/icons/hicolor/\1x\1/apps \&\& cp \2 '${out}'/share/icons/hicolor/\1x\1/apps/\3\.png #' | \
-sed -re 's#xdg-desktop-menu[ ]+install[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/applications \&\& cp \1 '${out}'/share/applications/#' | \
-sed -re 's#Exec="[^"]+"#Exec=smartgit#' |
-sed -re 's#SMARTGIT_BIN=.*#'SMARTGIT_BIN=${inBinDir}'#' \
-| bash
diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix
new file mode 100644
index 00000000000..e554afe4a92
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/builds.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, buildGoModule
+, srht, redis, celery, pyyaml, markdown }:
+
+let
+ version = "0.45.13";
+
+ buildWorker = src: buildGoModule {
+ inherit src version;
+ pname = "builds-sr-ht-worker";
+ goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker";
+
+ modSha256 = "1jm259ncw8dgqp0fqbjn30c4y3v3vwqj41gfh99jx30bwlmpgfax";
+ };
+in buildPythonPackage rec {
+ inherit version;
+ pname = "buildsrht";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/builds.sr.ht";
+ rev = version;
+ sha256 = "002pcj2a98gbmv77a10449w1q6iqhqjz4fim8hm4qm7vn6bwp0hz";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ redis
+ celery
+ pyyaml
+ markdown
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ postInstall = ''
+ mkdir -p $out/lib
+ mkdir -p $out/bin/builds.sr.ht
+
+ cp -r images $out/lib
+ cp contrib/submit_image_build $out/bin/builds.sr.ht
+ cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/builds.sr.ht;
+ description = "Continuous integration service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
new file mode 100644
index 00000000000..ca054c5cfde
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -0,0 +1,80 @@
+{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage
+, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
+, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
+, sassc, nodejs-11_x
+, writeText }:
+
+buildPythonPackage rec {
+ pname = "srht";
+ version = "0.52.13";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/core.sr.ht";
+ rev = version;
+ sha256 = "0i7gd2rkq4y4lffxsgb3mql9ddmk3vqckan29w266imrqs6p8c0z";
+ };
+
+ node_modules = fetchNodeModules {
+ src = "${src}/srht";
+ nodejs = nodejs-11_x;
+ sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
+ };
+
+ patches = [
+ ./disable-npm-install.patch
+ ];
+
+ nativeBuildInputs = [
+ sassc
+ nodejs-11_x
+ ];
+
+ propagatedBuildInputs = [
+ pgpy
+ flask
+ bleach
+ misaka
+ humanize
+ markdown
+ psycopg2
+ pygments
+ requests
+ sqlalchemy
+ flask_login
+ beautifulsoup4
+ sqlalchemy-utils
+
+ # Unofficial runtime dependencies?
+ celery
+ alembic
+ ];
+
+ PKGVER = version;
+
+ preBuild = ''
+ cp -r ${node_modules} srht/node_modules
+ '';
+
+ # No actual? tests but seems like it needs this anyway
+ preCheck = let
+ config = writeText "config.ini" ''
+ [webhooks]
+ private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
+
+ [meta.sr.ht]
+ origin=http://meta.sr.ht.local
+ '';
+ in ''
+ # Validation needs config option(s)
+ # webhooks <- ( private-key )
+ # meta.sr.ht <- ( origin )
+ cp ${config} config.ini
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/srht;
+ description = "Core modules for sr.ht";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
new file mode 100644
index 00000000000..00a3cf27111
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -0,0 +1,39 @@
+{ python37, openssl
+, callPackage }:
+
+# To expose the *srht modules, they have to be a python module so we use `buildPythonModule`
+# Then we expose them through all-packages.nix as an application through `toPythonApplication`
+# https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781
+
+let
+ fetchNodeModules = callPackage ../../networking/instant-messengers/rambox/fetchNodeModules.nix { };
+
+ python = python37.override {
+ packageOverrides = self: super: {
+ srht = self.callPackage ./core.nix { inherit fetchNodeModules; };
+
+ buildsrht = self.callPackage ./builds.nix { };
+ dispatchsrht = self.callPackage ./dispatch.nix { };
+ gitsrht = self.callPackage ./git.nix { };
+ hgsrht = self.callPackage ./hg.nix { };
+ listssrht = self.callPackage ./lists.nix { };
+ mansrht = self.callPackage ./man.nix { };
+ metasrht = self.callPackage ./meta.nix { };
+ pastesrht = self.callPackage ./paste.nix { };
+ todosrht = self.callPackage ./todo.nix { };
+
+ scmsrht = self.callPackage ./scm.nix { };
+ };
+ };
+in with python.pkgs; {
+ inherit python;
+ buildsrht = toPythonApplication buildsrht;
+ dispatchsrht = toPythonApplication dispatchsrht;
+ gitsrht = toPythonApplication gitsrht;
+ hgsrht = toPythonApplication hgsrht;
+ listssrht = toPythonApplication listssrht;
+ mansrht = toPythonApplication mansrht;
+ metasrht = toPythonApplication metasrht;
+ pastesrht = toPythonApplication pastesrht;
+ todosrht = toPythonApplication todosrht;
+}
diff --git a/pkgs/applications/version-management/sourcehut/disable-npm-install.patch b/pkgs/applications/version-management/sourcehut/disable-npm-install.patch
new file mode 100644
index 00000000000..3a8d1c82b34
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/disable-npm-install.patch
@@ -0,0 +1,14 @@
+diff --git a/setup.py b/setup.py
+index d63bac8..e1d0c35 100755
+--- a/setup.py
++++ b/setup.py
+@@ -5,9 +5,6 @@ import glob
+ import os
+ import sys
+
+-if subprocess.call(["npm", "i"], cwd="srht") != 0:
+- sys.exit(1)
+-
+ ver = os.environ.get("PKGVER") or subprocess.run(['git', 'describe', '--tags'],
+ stdout=subprocess.PIPE).stdout.decode().strip()
+
diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix
new file mode 100644
index 00000000000..c77fc902277
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/dispatch.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, srht, pyyaml, PyGithub, cryptography }:
+
+buildPythonPackage rec {
+ pname = "dispatchsrht";
+ version = "0.11.0";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht";
+ rev = version;
+ sha256 = "1kahl2gy5a5li79djwkzkglkw2s7pl4d29bzqp8c53r0xvx4sqkz";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ pyyaml
+ PyGithub
+ cryptography
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht;
+ description = "Task dispatcher and service integration tool for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix
new file mode 100644
index 00000000000..996663761a7
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/git.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, buildGoModule
+, srht, pygit2, scmsrht }:
+
+let
+ version = "0.32.3";
+
+ buildDispatcher = src: buildGoModule {
+ inherit src version;
+ pname = "git-sr-ht-dispatcher";
+ goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch";
+
+ modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1";
+ };
+in buildPythonPackage rec {
+ inherit version;
+ pname = "gitsrht";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/git.sr.ht";
+ rev = version;
+ sha256 = "0grycmblhm9dnhcf1kcmn6bclgb9znahk2026dan58m9j9pja5vw";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ pygit2
+ scmsrht
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ # TODO: Remove redundant mkdir?
+ postInstall = ''
+ mkdir -p $out/bin
+ cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/git.sr.ht;
+ description = "Git repository hosting service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix
new file mode 100644
index 00000000000..93817648468
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/hg.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchhg, buildPythonPackage
+, python
+, srht, hglib, scmsrht, unidiff }:
+
+buildPythonPackage rec {
+ pname = "hgsrht";
+ version = "0.13.0";
+
+ src = fetchhg {
+ url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht";
+ rev = version;
+ sha256 = "0qkknvja0pyk69fvzqafj3x8hi5miw22nmksvifbrjcqph8jknqg";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ hglib
+ scmsrht
+ unidiff
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/hg.sr.ht;
+ description = "Mercurial repository hosting service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix
new file mode 100644
index 00000000000..ac36a219a91
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/lists.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, srht, asyncpg, unidiff, aiosmtpd, emailthreads }:
+
+buildPythonPackage rec {
+ pname = "listssrht";
+ version = "0.36.3";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/lists.sr.ht";
+ rev = version;
+ sha256 = "1q2z2pjwz4zifsrkxab9b9jh1vzayjqych1cx3i4859f1swl2gwa";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ asyncpg
+ unidiff
+ aiosmtpd
+ emailthreads
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/lists.sr.ht;
+ description = "Mailing list service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix
new file mode 100644
index 00000000000..a0198cb52cf
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/man.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, srht, pygit2 }:
+
+buildPythonPackage rec {
+ pname = "mansrht";
+ version = "0.12.4";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/man.sr.ht";
+ rev = version;
+ sha256 = "1csnw71yh5zw7l17xmmxyskwiqbls0ynbbjrg45y5k1i3622mhiy";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ pygit2
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/man.sr.ht;
+ description = "Wiki service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix
new file mode 100644
index 00000000000..af3685c472c
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/meta.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache
+, sshpubkeys, weasyprint, prometheus_client }:
+
+buildPythonPackage rec {
+ pname = "metasrht";
+ version = "0.34.3";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/meta.sr.ht";
+ rev = version;
+ sha256 = "1yj3npw1vlqawzj6q1mh6qryx009dg5prja9fn6rasfmxjn2gr7v";
+ };
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ pgpy
+ srht
+ redis
+ bcrypt
+ qrcode
+ stripe
+ zxcvbn
+ alembic
+ pystache
+ sshpubkeys
+ weasyprint
+ prometheus_client
+ ];
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/meta.sr.ht;
+ description = "Account management service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix
new file mode 100644
index 00000000000..47153d9f204
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/paste.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, srht, pyyaml }:
+
+buildPythonPackage rec {
+ pname = "pastesrht";
+ version = "0.5.1";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/paste.sr.ht";
+ rev = version;
+ sha256 = "0bzw03hcwi1pw16kliqjsr7kphqq3qw0pbpdjqkcs7jdr0a59vny";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ pyyaml
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/paste.sr.ht;
+ description = "Ad-hoc text file hosting service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix
new file mode 100644
index 00000000000..ef6ed3a744b
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/scm.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchgit, buildPythonPackage
+, srht, redis, pyyaml, buildsrht
+, writeText }:
+
+buildPythonPackage rec {
+ pname = "scmsrht";
+ version = "0.13.3";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/scm.sr.ht";
+ rev = version;
+ sha256 = "0bapddgfqrs27y6prd6kwpz6jdlr33zdqr6ci6ixi584a7z8z7d6";
+ };
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ redis
+ pyyaml
+ buildsrht
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ '';
+
+ # No actual? tests but seems like it needs this anyway
+ preCheck = let
+ config = writeText "config.ini" ''
+ [webhooks]
+ private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
+
+ [builds.sr.ht]
+ origin=http://builds.sr.ht.local
+ oauth-client-id=
+
+ [meta.sr.ht]
+ origin=http://meta.sr.ht.local
+ '';
+ in ''
+ # Validation needs config option(s)
+ # webhooks <- ( private-key )
+ # meta.sr.ht <- ( origin )
+ # builds.sr.ht <- ( origin, oauth-client-id )
+ cp ${config} config.ini
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://git.sr.ht/~sircmpwn/git.sr.ht;
+ description = "Shared support code for sr.ht source control services.";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix
new file mode 100644
index 00000000000..6b67478aa67
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/todo.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchgit, buildPythonPackage
+, python
+, srht, redis, alembic, pystache }:
+
+buildPythonPackage rec {
+ pname = "todosrht";
+ version = "0.46.8";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~sircmpwn/todo.sr.ht";
+ rev = version;
+ sha256 = "17nqqy81535jnkidjiqv8v2301w5wzbbvx4czib69aagw1l85gnn";
+ };
+
+ patches = [
+ ./use-srht-path.patch
+ ];
+
+ nativeBuildInputs = srht.nativeBuildInputs;
+
+ propagatedBuildInputs = [
+ srht
+ redis
+ alembic
+ pystache
+ ];
+
+ preBuild = ''
+ export PKGVER=${version}
+ export SRHT_PATH=${srht}/${python.sitePackages}/srht
+ '';
+
+ # Tests require a network connection
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht;
+ description = "Ticket tracking service for the sr.ht network";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ eadwu ];
+ };
+}
diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh
new file mode 100755
index 00000000000..fdc0639c4c6
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/update.sh
@@ -0,0 +1,54 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p git mercurial common-updater-scripts
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+root=../../../..
+
+default() {
+ (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
+}
+
+version() {
+ (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.version" | tr -d '"')
+}
+
+src_url() {
+ (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.src.drvAttrs.url" | tr -d '"')
+}
+
+get_latest_version() {
+ src="$(src_url "$1")"
+ tmp=$(mktemp -d)
+
+ if [ "$1" = "hgsrht" ]; then
+ hg clone "$src" "$tmp" &> /dev/null
+ printf "%s" "$(cd "$tmp" && hg log --limit 1 --template '{latesttag}')"
+ else
+ git clone "$src" "$tmp"
+ printf "%s" "$(cd "$tmp" && git describe $(git rev-list --tags --max-count=1))"
+ fi
+}
+
+update_version() {
+ default_nix="$(default "$1")"
+ version_old="$(version "$1")"
+ version="$(get_latest_version "$1")"
+
+ (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version")
+
+ git add "$default_nix"
+ git commit -m "$1: $version_old -> $version"
+}
+
+services=( "srht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "listssrht" "mansrht" "metasrht"
+ "pastesrht" "todosrht" "scmsrht" )
+
+# Whether or not a specific service is requested
+if [ -n "$1" ]; then
+ version="$(get_latest_version "$1")"
+ (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version")
+else
+ for service in "${services[@]}"; do
+ update_version "$service"
+ done
+fi
diff --git a/pkgs/applications/version-management/sourcehut/use-srht-path.patch b/pkgs/applications/version-management/sourcehut/use-srht-path.patch
new file mode 100644
index 00000000000..43b494bf9d2
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/use-srht-path.patch
@@ -0,0 +1,43 @@
+diff --git a/setup.py b/setup.py
+index e6ecfb6..89fa92a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -5,28 +5,16 @@ import os
+ import site
+ import sys
+
+-if hasattr(site, 'getsitepackages'):
+- pkg_dirs = site.getsitepackages()
+- if site.getusersitepackages():
+- pkg_dirs.append(site.getusersitepackages())
+- for pkg_dir in pkg_dirs:
+- srht_path = os.path.join(pkg_dir, "srht")
+- if os.path.isdir(srht_path):
+- break
+- else:
+- raise Exception("Can't find core srht module in your site packages "
+- "directories. Please install it first.")
+-else:
+- srht_path = os.getenv("SRHT_PATH")
+- if not srht_path:
+- raise Exception("You're running inside a virtual environment. "
+- "Due to virtualenv limitations, you need to set the "
+- "$SRHT_PATH environment variable to the path of the "
+- "core srht module.")
+- elif not os.path.isdir(srht_path):
+- raise Exception(
+- "The $SRHT_PATH environment variable points to an invalid "
+- "directory: {}".format(srht_path))
++srht_path = os.getenv("SRHT_PATH")
++if not srht_path:
++ raise Exception("You're running inside a virtual environment. "
++ "Due to virtualenv limitations, you need to set the "
++ "$SRHT_PATH environment variable to the path of the "
++ "core srht module.")
++elif not os.path.isdir(srht_path):
++ raise Exception(
++ "The $SRHT_PATH environment variable points to an invalid "
++ "directory: {}".format(srht_path))
+
+ subp = subprocess.run(["make", "SRHT_PATH=" + srht_path])
+ if subp.returncode != 0:
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 1054a2c06cf..a3fcd209efc 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,21 +1,22 @@
{ stdenv, fetchurl, python, rcs, git, makeWrapper }:
stdenv.mkDerivation rec {
- name = "src-${version}";
- version = "1.22";
+ pname = "src";
+ version = "1.26";
src = fetchurl {
- url = "http://www.catb.org/~esr/src/${name}.tar.gz";
- sha256 = "0xvfg3aikr2jh09vjvxsha7day5br88chvirncr59ad40da1fils";
+ url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
+ sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
};
- buildInputs = [ python rcs git makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ python rcs git ];
preConfigure = ''
patchShebangs .
'';
- makeFlags = [ "prefix=$(out)" ];
+ makeFlags = [ "prefix=${placeholder "out"}" ];
postInstall = ''
wrapProgram $out/bin/src \
@@ -32,8 +33,9 @@ stdenv.mkDerivation rec {
will seem familiar to Subversion/Git/hg users, and no binary blobs
anywhere.
'';
- homepage = http://www.catb.org/esr/src/;
- license = licenses.bsd3;
+ homepage = "http://www.catb.org/esr/src/";
+ changelog = "https://gitlab.com/esr/src/raw/${version}/NEWS";
+ license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ calvertvl AndersonTorres ];
};
diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
index 8753d4f6f57..693af89d978 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.9.5_beta";
- name = "srcml-${version}";
+ pname = "srcml";
src = fetchurl {
url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz";
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix
new file mode 100644
index 00000000000..c095aa49eaf
--- /dev/null
+++ b/pkgs/applications/version-management/sublime-merge/common.nix
@@ -0,0 +1,117 @@
+{ buildVersion, sha256, dev ? false }:
+
+{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
+, pkexecPath ? "/run/wrappers/bin/pkexec"
+, writeScript, common-updater-scripts, curl, gnugrep, coreutils
+}:
+
+let
+ pname = "sublime-merge";
+ packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}";
+ binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ];
+ primaryBinary = "sublime_merge";
+ primaryBinaryAliases = [ "smerge" ];
+ downloadUrl = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz";
+ versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}";
+ versionFile = builtins.toString ./default.nix;
+ archSha256 = sha256;
+ arch = "x64";
+
+ libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
+ redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ];
+in let
+ binaryPackage = stdenv.mkDerivation {
+ pname = "${pname}-bin";
+ version = buildVersion;
+
+ src = fetchurl {
+ url = downloadUrl;
+ sha256 = archSha256;
+ };
+
+ dontStrip = true;
+ dontPatchELF = true;
+ buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ for binary in ${ builtins.concatStringsSep " " binaries }; do
+ patchelf \
+ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
+ $binary
+ done
+
+ # Rewrite pkexec argument. Note that we cannot delete bytes in binary.
+ sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp -r * $out/
+
+ runHook postInstall
+ '';
+
+ dontWrapGApps = true; # non-standard location, need to wrap the executables manually
+
+ postFixup = ''
+ wrapProgram $out/${primaryBinary} \
+ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
+ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
+ "''${gappsWrapperArgs[@]}"
+ '';
+ };
+in stdenv.mkDerivation (rec {
+ inherit pname;
+ version = buildVersion;
+
+ phases = [ "installPhase" ];
+
+ ${primaryBinary} = binaryPackage;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p "$out/bin"
+ makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+ '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + ''
+ mkdir -p "$out/share/applications"
+ substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+ for directory in ''$${primaryBinary}/Icon/*; do
+ size=$(basename $directory)
+ mkdir -p "$out/share/icons/hicolor/$size/apps"
+ ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
+ done
+ '';
+
+ passthru.updateScript = writeScript "${pname}-update-script" ''
+ #!${stdenv.shell}
+ set -o errexit
+ PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
+
+ latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=Version: Build )([0-9]+)')
+
+ for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do
+ # The script will not perform an update when the version attribute is up to date from previous platform run
+ # We need to clear it before each run
+ update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform
+ update-source-version ${packageAttribute}.${primaryBinary} $latestVersion --file=${versionFile} --version-key=buildVersion --system=$platform
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Git client from the makers of Sublime Text";
+ homepage = https://www.sublimemerge.com;
+ maintainers = with maintainers; [ zookatron ];
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ };
+})
diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix
new file mode 100644
index 00000000000..2734028866e
--- /dev/null
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -0,0 +1,16 @@
+{ callPackage }:
+
+let
+ common = opts: callPackage (import ./common.nix opts);
+in {
+ sublime-merge = common {
+ buildVersion = "1116";
+ sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6";
+ } {};
+
+ sublime-merge-dev = common {
+ buildVersion = "1115";
+ sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl";
+ dev = true;
+ } {};
+}
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 64e8e5d2d25..dffe3fadd74 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -19,10 +19,10 @@ let
common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec {
inherit version;
- name = "subversion-${version}";
+ pname = "subversion";
src = fetchurl {
- url = "mirror://apache/subversion/${name}.tar.bz2";
+ url = "mirror://apache/subversion/${pname}-${version}.tar.bz2";
inherit sha256;
};
@@ -38,9 +38,10 @@ let
patches = [ ./apr-1.patch ];
- # SVN build seems broken on gcc5:
- # https://gcc.gnu.org/gcc-5/porting_to.html
- CPPFLAGS = "-P";
+ # We are hitting the following issue even with APR 1.6.x
+ # -> https://issues.apache.org/jira/browse/SVN-4813
+ # "-P" CPPFLAG is needed to build Python bindings and subversionClient
+ CPPFLAGS = [ "-P" ];
configureFlags = [
(stdenv.lib.withFeature bdbSupport "berkeley-db")
@@ -97,7 +98,7 @@ let
meta = with stdenv.lib; {
description = "A version control system intended to be a compelling replacement for CVS in the open source community";
license = licenses.asl20;
- homepage = http://subversion.apache.org/;
+ homepage = "http://subversion.apache.org/";
maintainers = with maintainers; [ eelco lovek323 ];
platforms = platforms.linux ++ platforms.darwin;
};
@@ -110,25 +111,20 @@ let
});
in {
- subversion18 = common {
- version = "1.8.19";
- sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n";
- };
-
subversion19 = common {
- version = "1.9.9";
- sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd";
+ version = "1.9.12";
+ sha256 = "15z33gdnfiqblm5515020wfdwnp2837r3hnparava6m2fgyiafiw";
};
subversion_1_10 = common {
- version = "1.10.3";
- sha256 = "1z6r3n91a4znsh68rl3jisfr7k4faymhbpalmmvsmvsap34al3cz";
+ version = "1.10.6";
+ sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q";
extraBuildInputs = [ lz4 utf8proc ];
};
- subversion_1_11 = common {
- version = "1.11.1";
- sha256 = "1fv0psjxx5nxb4zmddyrma2bnv1bfff4p8ii6j8fqwjdr982gzcy";
+ subversion = common {
+ version = "1.12.2";
+ sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v";
extraBuildInputs = [ lz4 utf8proc ];
};
}
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index dc458eba167..a6cdf2e4373 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -1,13 +1,30 @@
-{lib, fetchurl, mercurial, python2Packages}:
+{ lib, fetchurl, python2Packages
+, mercurial
+}@args:
+let
+ tortoisehgSrc = fetchurl rec {
+ meta.name = "tortoisehg-${meta.version}";
+ meta.version = "5.0.2";
+ url = "https://bitbucket.org/tortoisehg/targz/downloads/${meta.name}.tar.gz";
+ sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz";
+ };
-python2Packages.buildPythonApplication rec {
- name = "tortoisehg-${version}";
- version = "4.8.2";
+ mercurial =
+ if args.mercurial.meta.version == tortoisehgSrc.meta.version
+ then args.mercurial
+ else args.mercurial.override {
+ mercurialSrc = fetchurl rec {
+ meta.name = "mercurial-${meta.version}";
+ meta.version = tortoisehgSrc.meta.version;
+ url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
+ sha256 = "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19";
+ };
+ };
- src = fetchurl {
- url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
- sha256 = "02av8k241rn7b68g4kl22s7jqmlq545caah1a5rvbgy41y7zzjvh";
- };
+in python2Packages.buildPythonApplication rec {
+
+ inherit (tortoisehgSrc.meta) name version;
+ src = tortoisehgSrc;
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
@@ -28,9 +45,11 @@ python2Packages.buildPythonApplication rec {
$out/bin/thg version
'';
+ passthru.mercurial = mercurial;
+
meta = {
description = "Qt based graphical tool for working with Mercurial";
- homepage = http://tortoisehg.bitbucket.org/;
+ homepage = https://tortoisehg.bitbucket.io/;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ danbst ];
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index c2bf0a4183c..2ad6b6f2f62 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchhg, autoconf, sqlite }:
stdenv.mkDerivation rec {
- name = "vcprompt-${version}";
+ pname = "vcprompt";
version = "1.2.1";
src = fetchhg {
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index a90eb531fe5..577f2f01416 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.20170915"; # date of commit we're pulling
- name = "vcsh-${version}";
+ pname = "vcsh";
src = fetchFromGitHub {
owner = "RichiH";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Version Control System for $HOME";
homepage = https://github.com/RichiH/vcsh;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ garbas ttuegel ];
+ maintainers = with maintainers; [ ttuegel ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 6baeb5279c2..aed5cb807dc 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -2,7 +2,8 @@
let version = "1.12.0"; in
stdenv.mkDerivation {
- name = "yadm-${version}";
+ pname = "yadm";
+ inherit version;
src = fetchFromGitHub {
owner = "TheLocehiliosan";
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index a613ad1c584..2734035b6de 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -21,11 +21,11 @@ assert portaudioSupport -> (portaudio != null);
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "aegisub-${version}";
+ pname = "aegisub";
version = "3.2.2";
src = fetchurl {
- url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
+ url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
};
@@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "bindnow" "relro" ];
+ # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
+ CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
+
# this is fixed upstream though not yet in an officially released version,
# should be fine remove on next release (if one ever happens)
NIX_LDFLAGS = [
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 5fcab43c86b..c28d900dd9f 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, cmake, pkgconfig
, zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi
-, makeWrapper, libXext, libGLU, qttools, qtbase
+, makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook
, alsaLib
, withX265 ? true, x265
, withX264 ? true, x264
@@ -24,12 +24,12 @@ assert default != "qt5" -> default == "cli";
assert !withQT -> default != "qt5";
stdenv.mkDerivation rec {
- name = "avidemux-${version}";
- version = "2.7.1";
+ pname = "avidemux";
+ version = "2.7.4";
src = fetchurl {
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
- sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w";
+ sha256 = "1acdb3m37vdzzbm8mwyibcn8msi7birb5v30qfi7jli5r00src3x";
};
patches = [
@@ -37,7 +37,9 @@ stdenv.mkDerivation rec {
./bootstrap_logging.patch
];
- nativeBuildInputs = [ yasm cmake pkgconfig ];
+ nativeBuildInputs =
+ [ yasm cmake pkgconfig ]
+ ++ lib.optional withQT wrapQtAppsHook;
buildInputs = [
zlib gettext libvdpau libva libXv sqlite fribidi fontconfig
freetype alsaLib libXext libGLU makeWrapper
@@ -55,7 +57,10 @@ stdenv.mkDerivation rec {
buildCommand = let
qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}";
- wrapProgram = f: "wrapProgram ${f} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
+ wrapWith = makeWrapper: filename:
+ "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
+ wrapQtApp = wrapWith "wrapQtApp";
+ wrapProgram = wrapWith "wrapProgram";
in ''
unpackPhase
cd "$sourceRoot"
@@ -74,8 +79,8 @@ stdenv.mkDerivation rec {
${wrapProgram "$out/bin/avidemux3_cli"}
${stdenv.lib.optionalString withQT ''
- ${wrapProgram "$out/bin/avidemux3_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
- ${wrapProgram "$out/bin/avidemux3_jobs_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+ ${wrapQtApp "$out/bin/avidemux3_qt5"}
+ ${wrapQtApp "$out/bin/avidemux3_jobs_qt5"}
''}
ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux"
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index a76608bdd90..3d598086329 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -8,7 +8,7 @@ let
in
stdenv.mkDerivation rec {
- name = "avxsynth-${version}";
+ pname = "avxsynth";
version = "2015-04-07";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix
index d98b3979660..64b9613363c 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/pkgs/applications/video/bino3d/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }:
stdenv.mkDerivation rec {
- name = "bino-${version}";
+ pname = "bino";
version = "1.6.7";
src = fetchurl {
- url = "https://bino3d.org/releases/${name}.tar.xz";
+ url = "https://bino3d.org/releases/${pname}-${version}.tar.xz";
sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k";
};
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index ad095ddbea5..1cba1d0e949 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons,
+{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
enca, pkgconfig, fetchpatch }:
@@ -8,7 +8,7 @@ fetchpatch {
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
}; in
stdenv.mkDerivation rec {
- name = "bombono-${version}";
+ pname = "bombono";
version = "1.2.4";
src = fetchFromGitHub {
owner = "muravjov";
@@ -18,20 +18,20 @@ stdenv.mkDerivation rec {
};
patches = map fetchPatchFromAur [
- {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
- {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
- {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
- {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
- {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
- {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
- {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
- {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
+ {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
+ {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
+ {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
+ {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
+ {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
+ {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
+ {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
+ {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
];
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
buildInputs = [
- gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools
+ gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
libxmlxx ffmpeg enca
];
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index bbac1014034..9ff65483f26 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -30,7 +30,7 @@ assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null;
stdenv.mkDerivation rec {
- name = "bomi-${version}";
+ pname = "bomi";
version = "0.9.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index ea8cb5aa3ff..0f1b185ed22 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.2.3.alpha";
- name = "byzanz-${version}";
+ pname = "byzanz";
src = fetchgit {
url = git://github.com/GNOME/byzanz;
diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix
new file mode 100644
index 00000000000..91c47516521
--- /dev/null
+++ b/pkgs/applications/video/ccextractor/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake
+, glew, glfw3, leptonica, libiconv, tesseract3, zlib }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ pname = "ccextractor";
+ version = "0.88";
+
+ src = fetchFromGitHub {
+ owner = "CCExtractor";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1sya45hvv4d46bk7541yimmafgvgyhkpsvwfz9kv6pm4yi1lz6nb";
+ };
+
+ sourceRoot = "source/src";
+
+ nativeBuildInputs = [ pkgconfig cmake ];
+
+ buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+
+ meta = {
+ homepage = "https://www.ccextractor.org";
+ description = "Tool that produces subtitles from closed caption data in videos";
+ longDescription = ''
+ A tool that analyzes video files and produces independent subtitle files from
+ closed captions data. CCExtractor is portable, small, and very fast.
+ It works on Linux, Windows, and OSX.
+ '';
+ platforms = platforms.unix;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ titanous ];
+ };
+}
diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix
new file mode 100644
index 00000000000..d1a9b64d711
--- /dev/null
+++ b/pkgs/applications/video/celluloid/default.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, python3
+, gettext
+, pkgconfig
+, desktop-file-utils
+, wrapGAppsHook
+, appstream-glib
+, epoxy
+, glib
+, gtk3
+, mpv
+}:
+
+stdenv.mkDerivation rec {
+ pname = "celluloid";
+ version = "0.17";
+
+ src = fetchFromGitHub {
+ owner = "celluloid-player";
+ repo = "celluloid";
+ rev = "v${version}";
+ sha256 = "0pnxjv6n2q6igxdr8wzbahcj7vccw4nfjdk8fjdnaivf2lyrpv2d";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ python3
+ appstream-glib
+ gettext
+ pkgconfig
+ desktop-file-utils
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ epoxy
+ glib
+ gtk3
+ mpv
+ ];
+
+ postPatch = ''
+ patchShebangs meson-post-install.py src/generate-authors.py
+ sed -i '/gtk-update-icon-cache/s/^/#/' meson-post-install.py
+ '';
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Simple GTK+ frontend for the mpv video player";
+ longDescription = ''
+ GNOME MPV interacts with mpv via the client API exported by libmpv,
+ allowing access to mpv's powerful playback capabilities through an
+ easy-to-use user interface.
+ '';
+ homepage = "https://github.com/celluloid-player/celluloid";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix
new file mode 100644
index 00000000000..53d257dd9d0
--- /dev/null
+++ b/pkgs/applications/video/clickshare-csc1/default.nix
@@ -0,0 +1,124 @@
+{ lib
+, stdenv
+, fetchurl
+, alsaLib
+, autoPatchelfHook
+, binutils-unwrapped
+, gnutar
+, libav_0_8
+, libnotify
+, libresample
+, libusb1
+, qt4
+, rpmextract
+, unzip
+, xorg
+, usersGroup ? "clickshare" # for udev access rules
+}:
+
+
+# This fetches the latest firmware version that
+# contains a linux-compatible client binary.
+# Barco no longer supports linux, so updates are unlikely:
+# https://www.barco.com/de/support/clickshare-csc-1/knowledge-base/KB1191
+
+
+stdenv.mkDerivation rec {
+ pname = "clickshare-csc1";
+ version = "01.07.00.033";
+ src = fetchurl {
+ name = "clickshare-csc1-${version}.zip";
+ url = https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033;
+ sha256 = "0h4jqidqvk4xkaky5bizi7ilz4qzl2mh68401j21y3djnzx09br3";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ binutils-unwrapped
+ gnutar
+ rpmextract
+ unzip
+ ];
+ buildInputs = [
+ alsaLib
+ libav_0_8
+ libnotify
+ libresample
+ libusb1
+ qt4
+ xorg.libX11
+ xorg.libXdamage
+ xorg.libXfixes
+ xorg.libXinerama
+ xorg.libXtst
+ ];
+ sourceRoot = ".";
+
+ # The source consists of nested archives.
+ # We extract them archive by archive.
+ # If the filename contains version numbers,
+ # we use a wildcard and check that there
+ # is actually only one file matching.
+ postUnpack =
+ let
+ rpmArch =
+ if stdenv.hostPlatform.isx86_32 then "i386" else
+ if stdenv.hostPlatform.isx86_64 then "x86_64" else
+ throw "unsupported system: ${stdenv.hostPlatform.system}";
+ in
+ ''
+ ls clickshare_baseunit_*.*_all.signed_release.ipk | wc --lines | xargs test 1 =
+ tar --verbose --extract --one-top-level=dir1 < clickshare_baseunit_*.*_all.signed_release.ipk
+ mkdir dir2
+ ( cd dir2 ; ar xv ../dir1/firmware.ipk )
+ tar --verbose --gzip --extract --one-top-level=dir3 --exclude='dev/*' < dir2/data.tar.gz
+ ls dir3/clickshare/clickshare-*-*.${rpmArch}.rpm | wc --lines | xargs test 1 =
+ mkdir dir4
+ cd dir4
+ rpmextract ../dir3/clickshare/clickshare-*-*.${rpmArch}.rpm
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir --verbose --parents $out
+ mv --verbose --target-directory=. usr/*
+ rmdir --verbose usr
+ cp --verbose --recursive --target-directory=$out *
+ runHook postInstall
+ '';
+
+ # Default udev rule restricts access to the
+ # clickshare USB dongle to the `wheel` group.
+ # We replace it with the group
+ # stated in the package arguments.
+ # Also, we patch executable and icon paths in .desktop files.
+ preFixup = ''
+ substituteInPlace \
+ $out/lib/udev/rules.d/99-clickshare.rules \
+ --replace wheel ${usersGroup}
+ substituteInPlace \
+ $out/share/applications/clickshare.desktop \
+ --replace Exec= Exec=$out/bin/ \
+ --replace =/usr =$out
+ substituteInPlace \
+ $out/etc/xdg/autostart/clickshare-launcher.desktop \
+ --replace =/usr =$out
+ '';
+
+ meta = {
+ homepage = https://www.barco.com/de/support/clickshare-csc-1/drivers;
+ downloadPage = https://www.barco.com/de/Support/software/R33050020;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ license = lib.licenses.unfree;
+ maintainers = [ lib.maintainers.yarny ];
+ description = "Linux driver/client for Barco ClickShare CSC-1";
+ longDescription = ''
+ Barco ClickShare is a wireless presentation system
+ where a USB dongle transmits to a base station
+ that is connected with a beamer.
+ The USB dongle requires proprietary software that
+ captures the screen and sends it to the dongle.
+ This package provides the necessary software for Linux.
+ '';
+ };
+}
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 3937244f25b..1872750deb0 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4, qmake4Hook }:
+{ stdenv, fetchurl, makeDesktopItem, ffmpeg
+, qmake, qttools, mkDerivation
+, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
+}:
-stdenv.mkDerivation rec {
- name = "clipgrab-${version}";
- version = "3.7.2";
+mkDerivation rec {
+ pname = "clipgrab";
+ version = "3.8.4";
src = fetchurl {
- sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc";
+ sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
- url = "https://download.clipgrab.org/${name}.tar.gz";
+ url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};
- buildInputs = [ ffmpeg qt4 ];
- nativeBuildInputs = [ qmake4Hook ];
+ buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
+ nativeBuildInputs = [ qmake qttools ];
postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
substituteInPlace converter_ffmpeg.cpp \
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 48c5032f2da..d614523f534 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
-, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
+, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
let
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
@@ -15,8 +15,18 @@ in buildPythonApplication rec {
sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
};
+ # Temporary fix
+ # See https://github.com/NixOS/nixpkgs/issues/61578
+ # and https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
nativeBuildInputs = [
gettext wrapGAppsHook
+
+ # Temporary fix
+ # See https://github.com/NixOS/nixpkgs/issues/61578
+ # and https://github.com/NixOS/nixpkgs/issues/56943
+ gobject-introspection
];
buildInputs = [
@@ -24,7 +34,7 @@ in buildPythonApplication rec {
];
propagatedBuildInputs = [
- gtk3 pygobject3 gdk_pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
+ gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
];
postPatch = ''
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
index 6281c788401..a032ef654aa 100644
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ b/pkgs/applications/video/dvb-apps/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ perl ];
- configurePhase = "true"; # skip configure
+ dontConfigure = true; # skip configure
installPhase = "make prefix=$out install";
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index a329321b70c..61894bd22f8 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
+{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:
let
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
wrapper = writeScript "dvd-slideshow.sh" ''
- #!${stdenv.shell}
+ #!${runtimeShell}
# wrapper script for dvd-slideshow programs
export PATH=${binPath}:$PATH
@@ -28,11 +28,11 @@ let
'';
in stdenv.mkDerivation rec {
- name = "dvd-slideshow-${version}";
+ pname = "dvd-slideshow";
version = "0.8.4-2";
src = fetchurl {
- url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz";
+ url = "mirror://sourceforge/dvd-slideshow/files/${pname}-${version}.tar.gz";
sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
};
diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix
index 4712dfac757..54be20d5faf 100644
--- a/pkgs/applications/video/dvdbackup/default.nix
+++ b/pkgs/applications/video/dvdbackup/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.4.2";
- name = "dvdbackup-${version}";
+ pname = "dvdbackup";
src = fetchurl {
- url = "mirror://sourceforge/dvdbackup/${name}.tar.xz";
+ url = "mirror://sourceforge/dvdbackup/${pname}-${version}.tar.xz";
sha256 = "1rl3h7waqja8blmbpmwy01q9fgr5r0c32b8dy3pbf59bp3xmd37g";
};
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index f73c5277d05..495501e0c18 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -13,13 +13,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "dvdstyler-${version}";
+ pname = "dvdstyler";
srcName = "DVDStyler-${version}";
- version = "3.0.4";
+ version = "3.1.2";
src = fetchurl {
url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
- sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi";
+ sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4";
};
nativeBuildInputs =
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index fd8cc8d8630..3e26b4d68c2 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -2,7 +2,7 @@
, libnotify, libpulseaudio, mplayer, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "gnome-mplayer-${version}";
+ pname = "gnome-mplayer";
version = "1.0.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix
deleted file mode 100644
index 75a299d46c7..00000000000
--- a/pkgs/applications/video/gnome-mpv/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python3
-, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook
-, appstream-glib, epoxy, glib, gtk3, mpv
-}:
-
-stdenv.mkDerivation rec {
- name = "gnome-mpv-${version}";
- version = "0.13";
-
- src = fetchFromGitHub {
- owner = "gnome-mpv";
- repo = "gnome-mpv";
- rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata
- # rev = "v${version}";
- sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4";
- };
-
- nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
- buildInputs = [ epoxy glib gtk3 mpv ];
-
- enableParallelBuilding = true;
-
- postPatch = ''
- patchShebangs meson_post_install.py
- patchShebangs src/generate_authors.py
- sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
- '';
-
- doCheck = true;
-
- meta = with stdenv.lib; {
- description = "Simple GTK+ frontend for the mpv video player";
- longDescription = ''
- GNOME MPV interacts with mpv via the client API exported by libmpv,
- allowing access to mpv's powerful playback capabilities through an
- easy-to-use user interface.
- '';
- homepage = https://github.com/gnome-mpv/gnome-mpv;
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 7a8b66d2d28..f81f394ed0b 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgconfig, zlib }:
stdenv.mkDerivation rec {
- version = "0.7.1";
- name = "gpac-${version}";
+ version = "0.8.0";
+ pname = "gpac";
src = fetchFromGitHub {
owner = "gpac";
repo = "gpac";
rev = "v${version}";
- sha256 = "197c5968p5bzvk0ga347fwgkqh4j1v3z65wlx65c5m9gwfxz2k2q";
+ sha256 = "1w1dyrn6900yi8ngchfzy5hvxr6yc60blvdq8y8mczimmmq8khb5";
};
# this is the bare minimum configuration, as I'm only interested in MP4Box
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 07474c5e52c..aa2407134f3 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -3,7 +3,7 @@
# Derivation patches HandBrake to use Nix closure dependencies.
#
-{ stdenv, lib, fetchurl, callPackage,
+{ stdenv, lib, fetchurl,
# Main build tools
python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
# Processing, video codecs, containers
@@ -11,7 +11,7 @@
# Codecs, audio
libopus, lame, libvorbis, a52dec, speex, libsamplerate,
# Text processing
- libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2,
+ libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz,
# Optical media
libdvdread, libdvdnav, libdvdcss, libbluray,
useGtk ? true, wrapGAppsHook ? null,
@@ -29,12 +29,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.2.0";
- name = "handbrake-${version}";
+ pname = "handbrake";
+ version = "1.2.2";
src = fetchurl {
url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
- sha256 = "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi";
+ sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z";
};
nativeBuildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ffmpeg-full libogg libtheora x264 x265 libvpx
libopus lame libvorbis a52dec speex libsamplerate
- libiconv fribidi fontconfig freetype libass jansson libxml2
+ libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
libdvdread libdvdnav libdvdcss libbluray
] ++ lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 1e8883eae7f..037331cad9e 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -7,10 +7,10 @@
stdenv.mkDerivation rec {
version = "3.0.3";
- name = "k9copy-${version}";
+ pname = "k9copy";
src = fetchurl {
- url = "mirror://sourceforge/k9copy-reloaded/${name}.tar.gz";
+ url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz";
sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
};
@@ -56,5 +56,8 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ flosse ];
platforms = stdenv.lib.platforms.unix;
+ # TODO: The software is deprecated and the build is broken, see:
+ # https://github.com/NixOS/nixpkgs/pull/63260#issuecomment-503506487
+ broken = true;
};
}
diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index bc6cd015b86..7dc350da647 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, gnome2, librsvg, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "key-mon-${version}";
+ pname = "key-mon";
version = "1.17";
namePrefix = "";
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz";
sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q";
};
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 44313f9499f..33ff1821640 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
majorMinorVersion = "0.12";
patchVersion = "0b";
version = "${majorMinorVersion}.${patchVersion}";
- name = "kmplayer-${version}";
+ pname = "kmplayer";
src = fetchurl {
url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2";
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 05105b64af7..73bcdadbc59 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
+{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
, pkgconfig, cmake, gnumake, yasm, python2Packages
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook
@@ -13,12 +13,12 @@
, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt
, lzo, libcdio, libmodplug, libass, libbluray
-, sqlite, mysql, nasm, gnutls, libva, libdrm, wayland
+, sqlite, mysql, nasm, gnutls, libva, libdrm
, curl, bzip2, zip, unzip, glxinfo, xdpyinfo
, libcec, libcec_platform, dcadec, libuuid
, libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
-, libplist, p11-kit, zlib
+, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
, dbusSupport ? true, dbus ? null
, joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null
@@ -28,6 +28,8 @@
, udevSupport ? true, udev ? null
, usbSupport ? false, libusb ? null
, vdpauSupport ? true, libvdpau ? null
+, useWayland ? false, wayland ? null, wayland-protocols ? null
+, waylandpp ? null, libxkbcommon ? null
}:
assert dbusSupport -> dbus != null;
@@ -38,25 +40,38 @@ assert sambaSupport -> samba != null;
assert udevSupport -> udev != null;
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
assert vdpauSupport -> libvdpau != null;
-
-# TODO for Kodi 18.0
-# - cmake is no longer in project/cmake
-# - maybe we can remove auto{conf,make} and libtool from inputs
-# - check if dbus support PR has been merged and add dbus as a buildInput
-# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches)
+assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
let
- kodiReleaseDate = "20171115";
- kodiVersion = "17.6";
- rel = "Krypton";
+ kodiReleaseDate = "20190627";
+ kodiVersion = "18.3";
+ rel = "Leia";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "1pwmmbry7dajwdpmc1mdygjvxna4kl38h32d71g10yf3mdm5wmz3";
+ sha256 = "18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld";
};
+ cmakeProto = fetchurl {
+ url = "https://raw.githubusercontent.com/pramsey/libght/ca9b1121c352ea10170636e170040e1af015bad1/cmake/modules/CheckPrototypeExists.cmake";
+ sha256 = "1zai82gm5x55n3xvdv7mns3ja6a2k81x9zz0nk42j6s2yb0fkjxh";
+ };
+
+ cmakeProtoPatch = ''
+ # get rid of windows headers as they will otherwise be found first
+ rm -rf msvc
+
+ cp ${cmakeProto} cmake/${cmakeProto.name}
+ # we need to enable support for C++ for check_prototype_exists to do its thing
+ substituteInPlace CMakeLists.txt --replace 'LANGUAGES C' 'LANGUAGES C CXX'
+ if [ -f cmake/CheckHeadersSTDC.cmake ]; then
+ sed -i cmake/CheckHeadersSTDC.cmake \
+ -e '7iinclude(CheckPrototypeExists)'
+ fi
+ '';
+
kodiDependency = { name, version, rev, sha256, ... } @attrs:
let
attrs' = builtins.removeAttrs attrs ["name" "version" "rev" "sha256"];
@@ -72,9 +87,9 @@ let
ffmpeg = kodiDependency rec {
name = "FFmpeg";
- version = "3.1.11";
- rev = "${version}-${rel}-17.5"; # TODO: change 17.5 back to ${kodiVersion}
- sha256 = "0nc4sb6v1g3l11v9h5l9n44a8r40186rcbp2xg5c7vg6wcpjid13";
+ version = "4.0.3";
+ rev = "${version}-${rel}-18.2";
+ sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy";
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';
@@ -83,37 +98,53 @@ let
nativeBuildInputs = [ cmake nasm pkgconfig ];
};
- # we should be able to build these externally and have kodi reference them as buildInputs.
- # Doesn't work ATM though so we just use them for the src
-
- libdvdcss = kodiDependency {
+ # We can build these externally but FindLibDvd.cmake forces us to build it
+ # them, so we currently just use them for the src.
+ libdvdcss = kodiDependency rec {
name = "libdvdcss";
- version = "20160215";
- rev = "2f12236bc1c92f73c21e973363f79eb300de603f";
- sha256 = "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd";
- buildInputs = [ libdvdread ];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ version = "1.4.2";
+ rev = "${version}-${rel}-Beta-5";
+ sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
+ buildInputs = [ linuxHeaders ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ postPatch = ''
+ rm -rf msvc
+
+ substituteInPlace config.h.cm \
+ --replace '#cmakedefine O_BINARY "''${O_BINARY}"' '#define O_BINARY 0'
+ '';
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=1"
+ "-DHAVE_LINUX_DVD_STRUCT=1"
+ ];
};
- libdvdnav = kodiDependency {
+ libdvdnav = kodiDependency rec {
name = "libdvdnav";
- version = "20170217";
- rev = "981488f7f27554b103cca10c1fbeba027396c94a";
- sha256 = "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8";
- buildInputs = [ libdvdread ];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ version = "6.0.0";
+ rev = "${version}-${rel}-Alpha-3";
+ sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
+ buildInputs = [ libdvdcss libdvdread ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ postPatch = cmakeProtoPatch;
+ postInstall = ''
+ mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so
+ '';
};
- libdvdread = kodiDependency {
+ libdvdread = kodiDependency rec {
name = "libdvdread";
- version = "20160221";
- rev = "17d99db97e7b8f23077b342369d3c22a6250affd";
- sha256 = "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl";
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ version = "6.0.0";
+ rev = "${version}-${rel}-Alpha-3";
+ sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
+ buildInputs = [ libdvdcss ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ configureFlags = [ "--with-libdvdcss" ];
+ postPatch = cmakeProtoPatch;
};
in stdenv.mkDerivation rec {
- name = "kodi-${kodiVersion}";
+ name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}";
src = kodi_src;
@@ -126,7 +157,7 @@ in stdenv.mkDerivation rec {
libX11 xorgproto libXt libXmu libXext
libXinerama libXrandr libXtst libXfixes
alsaLib libGLU_combined glew fontconfig freetype ftgl
- libjpeg jasper libpng libtiff wayland
+ libjpeg jasper libpng libtiff
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
@@ -136,7 +167,7 @@ in stdenv.mkDerivation rec {
libgcrypt libgpgerror libunistring
libcrossguid cwiid libplist
bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp
- ffmpeg
+ ffmpeg flatbuffers fmt fstrcmp rapidjson
# libdvdcss libdvdnav libdvdread
]
++ lib.optional dbusSupport dbus
@@ -147,7 +178,12 @@ in stdenv.mkDerivation rec {
++ lib.optional sambaSupport samba
++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb
- ++ lib.optional vdpauSupport libvdpau;
+ ++ lib.optional vdpauSupport libvdpau
+ ++ lib.optional useWayland [
+ wayland waylandpp
+ # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
+ libxkbcommon.dev
+ ];
nativeBuildInputs = [
cmake
@@ -155,8 +191,8 @@ in stdenv.mkDerivation rec {
makeWrapper
which
pkgconfig gnumake
- autoconf automake libtool # still needed for some components. Check if that is the case with 18.0
- ];
+ autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
+ ] ++ lib.optional useWayland [ wayland-protocols ];
cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}"
@@ -167,6 +203,9 @@ in stdenv.mkDerivation rec {
"-DENABLE_INTERNAL_CROSSGUID=OFF"
"-DENABLE_OPTICAL=ON"
"-DLIRC_DEVICE=/run/lirc/lircd"
+ ] ++ lib.optional useWayland [
+ "-DCORE_PLATFORM_NAME=wayland"
+ "-DWAYLAND_RENDER_SYSTEM=gl"
];
enableParallelBuilding = true;
@@ -176,14 +215,10 @@ in stdenv.mkDerivation rec {
doCheck = false;
postPatch = ''
- substituteInPlace xbmc/linux/LinuxTimezone.cpp \
+ substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
'';
- preConfigure = ''
- cd project/cmake
- '';
-
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
@@ -209,6 +244,6 @@ in stdenv.mkDerivation rec {
homepage = https://kodi.tv/;
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg ];
+ maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ];
};
}
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 196852933a9..1cb51078069 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,13 +1,15 @@
-{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
-, cmake, kodiPlain, libcec_platform, tinyxml
+{ stdenv, callPackage, fetchFromGitHub
+, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
-, python2Packages }:
+, python2Packages, expat, glib, nspr, nss, openssl
+, libssh, libarchive, lzma, bzip2, lz4, lzo }:
with stdenv.lib;
let self = rec {
pluginDir = "/share/kodi/addons";
+ rel = "Leia";
kodi = kodiPlain;
@@ -54,8 +56,10 @@ let self = rec {
dontStrip = true;
+ extraRuntimeDependencies = [ ];
+
installPhase = ''
- ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
+ ${if sourceDir == null then "" else "cd $src/$sourceDir"}
d=$out${pluginDir}/${namespace}
mkdir -p $d
sauce="."
@@ -64,7 +68,8 @@ let self = rec {
'';
} // args));
- mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args:
+ mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [],
+ extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args:
toKodiPlugin (stdenv.mkDerivation (rec {
name = "kodi-plugin-${plugin}-${version}";
@@ -73,6 +78,8 @@ let self = rec {
buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
++ extraBuildInputs;
+ inherit extraRuntimeDependencies;
+
# disables check ensuring install prefix is that of kodi
cmakeFlags = [
"-DOVERRIDE_PATHS=1"
@@ -84,6 +91,7 @@ let self = rec {
installPhase = let n = namespace; in ''
make install
ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}
+ ${extraInstallPhase}
'';
} // args));
@@ -212,14 +220,14 @@ let self = rec {
joystick = mkKodiABIPlugin rec {
namespace = "peripheral.joystick";
- version = "1.3.2";
+ version = "1.4.7";
plugin = namespace;
src = fetchFromGitHub {
- owner = "kodi-game";
+ owner = "xbmc";
repo = namespace;
- rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1";
- sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh";
+ rev = "v${version}";
+ sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap";
};
meta = {
@@ -282,14 +290,14 @@ let self = rec {
steam-controller = mkKodiABIPlugin rec {
namespace = "peripheral.steamcontroller";
- version = "0.9.0";
+ version = "0.10.0";
plugin = namespace;
src = fetchFromGitHub {
owner = "kodi-game";
repo = namespace;
- rev = "76f640fad4f68118f4fab6c4c3338d13daca7074";
- sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh";
+ rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de";
+ sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279";
};
extraBuildInputs = [ libusb ];
@@ -355,13 +363,13 @@ let self = rec {
plugin = "pvr-hts";
namespace = "pvr.hts";
- version = "3.4.16";
+ version = "4.4.14";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
- rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330";
- sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx";
+ rev = "${version}-${rel}";
+ sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr";
};
meta = {
@@ -377,13 +385,13 @@ let self = rec {
plugin = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
- version = "2.4.7";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
- rev = "60d89d16dd953d38947e8a6da2f8bb84a0f764ef";
- sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy";
+ rev = "${version}-${rel}";
+ sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6";
};
meta = {
@@ -401,13 +409,13 @@ let self = rec {
plugin = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
- version = "2.4.14";
+ version = "3.5.7";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
- rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8";
- sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz";
+ rev = "${version}-${rel}";
+ sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d";
};
meta = {
@@ -418,20 +426,20 @@ let self = rec {
license = licenses.gpl2Plus;
};
- extraBuildInputs = [ zlib ];
+ extraBuildInputs = [ zlib rapidxml ];
};
osmc-skin = mkKodiPlugin rec {
plugin = "osmc-skin";
namespace = "skin.osmc";
- version = "17.0.4";
+ version = "18.0.0";
src = fetchFromGitHub {
owner = "osmc";
repo = namespace;
- rev = "a9268937f49286bab9fb49de430b8aafd7a60a9e";
- sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v";
+ rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
+ sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
};
meta = {
@@ -470,4 +478,76 @@ let self = rec {
};
});
+ inputstream-adaptive = mkKodiABIPlugin rec {
+
+ plugin = "inputstream-adaptive";
+ namespace = "inputstream.adaptive";
+ version = "2.3.12";
+
+ src = fetchFromGitHub {
+ owner = "peak3d";
+ repo = "inputstream.adaptive";
+ rev = "${version}";
+ sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z";
+ };
+
+ extraBuildInputs = [ expat ];
+
+ extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
+
+ extraInstallPhase = let n = namespace; in ''
+ ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so
+ '';
+
+ meta = {
+ homepage = https://github.com/peak3d/inputstream.adaptive;
+ description = "Kodi inputstream addon for several manifest types";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ sephalon ];
+ };
+ };
+
+ vfs-sftp = mkKodiABIPlugin rec {
+ namespace = "vfs.sftp";
+ version = "1.0.1";
+ plugin = namespace;
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1l9igrl168s91c15v9klyaaz226ik3xlbzjk2f1346fvzmp87g9v";
+ };
+
+ meta = with stdenv.lib; {
+ description = "SFTP Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ openssl libssh zlib ];
+ };
+
+ vfs-libarchive = mkKodiABIPlugin rec {
+ namespace = "vfs.libarchive";
+ version = "1.0.5";
+ plugin = namespace;
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "0l1f1fijflr1ia30r0dcz1x2zn35c4lxy30az1cqxdf8nipza0b8";
+ };
+
+ meta = with stdenv.lib; {
+ description = "LibArchive Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
+ };
}; in self
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index d0dc9274a10..6a0b1cbdf73 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,7 +1,9 @@
{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }:
-buildEnv {
- name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}";
+let
+ drvName = builtins.parseDrvName kodi.name;
+in buildEnv {
+ name = "${drvName.name}-with-plugins-${drvName.version}";
paths = [ kodi ] ++ plugins;
pathsToLink = [ "/share" ];
@@ -14,7 +16,10 @@ buildEnv {
do
makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
--prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \
- --prefix KODI_HOME : $out/share/kodi
+ --prefix KODI_HOME : $out/share/kodi \
+ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
+ (stdenv.lib.concatMap
+ (plugin: plugin.extraRuntimeDependencies) plugins)}"
done
'';
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 4bfd9e79007..0dc97410f54 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
-, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio
}:
let
fullPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc
- gnome3.gtk
- gdk_pixbuf
+ gtk3
+ gdk-pixbuf
cairo
libjpeg_original
glib
@@ -20,15 +20,15 @@ let
lightworks = stdenv.mkDerivation rec {
version = "14.0.0";
- name = "lightworks-${version}";
-
+ pname = "lightworks";
+
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb";
sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033";
}
- else throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+ else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
buildInputs = [ dpkg makeWrapper ];
@@ -60,7 +60,7 @@ let
wrapProgram $out/lib/lightworks/ntcardvt \
--prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \
--set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf
-
+
cp -r usr/share $out/share
'';
diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
index 717853af745..0a422bb7f50 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.8";
- name = "linuxstopmotion-${version}";
+ pname = "linuxstopmotion";
src = fetchgit {
url = "git://git.code.sf.net/p/linuxstopmotion/code";
diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh
deleted file mode 100644
index 416d5c0f0b0..00000000000
--- a/pkgs/applications/video/makemkv/builder.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-source $stdenv/setup
-set -x
-
-lib=" \
- makemkv-oss-${ver}/out/libdriveio.so.0 \
- makemkv-oss-${ver}/out/libmakemkv.so.1 \
- makemkv-oss-${ver}/out/libmmbd.so.0 \
- "
-
-bin=" \
- makemkv-oss-${ver}/out/makemkv \
- makemkv-bin-${ver}/bin/amd64/makemkvcon \
- "
-
-tar xzf ${src_bin}
-tar xzf ${src_oss}
-
-(
- cd makemkv-oss-${ver}
- ./configure --prefix=$out
- make
-)
-
-chmod +x ${bin}
-
-libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file?
-
-for i in ${bin} ; do
- patchelf \
- --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath $libPath \
- ${i}
-done
-
-mkdir -p $out/bin
-mkdir -p $out/lib
-mkdir -p $out/share/MakeMKV
-cp ${lib} ${out}/lib
-cp ${bin} ${out}/bin
-cp makemkv-bin-${ver}/src/share/* $out/share/MakeMKV
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index cadd3c9fc68..f3d8b4ae569 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,34 +1,45 @@
-{ stdenv, fetchurl
-, openssl, qt5, libGLU_combined, zlib, pkgconfig, libav
+{ stdenv, mkDerivation, fetchurl, autoPatchelfHook
+, ffmpeg, openssl, qtbase, zlib, pkgconfig
}:
-stdenv.mkDerivation rec {
- name = "makemkv-${ver}";
- ver = "1.14.1";
- builder = ./builder.sh;
-
+let
+ version = "1.14.4";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
- "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"
- "http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz"
+ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
+ "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
- sha256 = "1n4gjb1531gkvnjzipw63v3zdxmrq5nai9nn6m2ix3lskksjrrhp";
+ sha256 = "0vmmvldmwmq9g202abblj6l15kb8z3b0c6mcc03f30s2yci6ij33";
};
-
src_oss = fetchurl {
urls = [
- "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"
- "http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz"
+ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
+ "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
- sha256 = "0ysb0nm11vp2ni838p5q3gqan5nrqbr7rz0h24j8p62827pib3pw";
+ sha256 = "0n1nlq17dxcbgk9xqf7nv6zykvh91yhsjqdhq55947wc11fxjqa0";
};
+in mkDerivation {
+ pname = "makemkv";
+ inherit version;
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [openssl qt5.qtbase libGLU_combined zlib libav];
+ srcs = [ src_bin src_oss ];
- libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt5.qtbase zlib ]
- + ":" + stdenv.cc.cc + "/lib64";
+ sourceRoot = "makemkv-oss-${version}";
+
+ nativeBuildInputs = [ autoPatchelfHook pkgconfig ];
+
+ buildInputs = [ ffmpeg openssl qtbase zlib ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon
+ install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.*
+ install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/*
+
+ runHook postInstall
+ '';
meta = with stdenv.lib; {
description = "Convert blu-ray and dvd to mkv";
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 4dd2e019d1d..c302ae1730f 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -13,7 +13,7 @@ with stdenv;
mkDerivation rec {
version = "0.6.1";
- name = "mapmap-${version}";
+ pname = "mapmap";
src = fetchFromGitHub {
owner = "mapmapteam";
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index 34efffc21d7..a5de209854b 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "13.2.1";
- name = "mediathekview-${version}";
+ pname = "mediathekview";
src = fetchurl {
url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
homepage = https://mediathekview.de/;
license = licenses.gpl3;
- maintainers = with maintainers; [ chaoflow moredread ];
+ maintainers = with maintainers; [ moredread ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 3b8dce90243..a9876da234f 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qtbase, qmake
+{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake
, qtdeclarative, qttools
# "Free" key generated by nckx . I no longer have a Google
@@ -6,7 +6,7 @@
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
stdenv.mkDerivation rec {
- name = "minitube-${version}";
+ pname = "minitube";
version = "2.9";
src = fetchFromGitHub {
@@ -17,17 +17,12 @@ stdenv.mkDerivation rec {
};
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ];
- nativeBuildInputs = [ makeWrapper qmake ];
+ nativeBuildInputs = [ wrapQtAppsHook qmake ];
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
enableParallelBuilding = true;
- postInstall = ''
- wrapProgram $out/bin/minitube \
- --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/qt-5.${stdenv.lib.versions.minor qtbase.version}/plugins"
- '';
-
meta = with stdenv.lib; {
description = "Stand-alone YouTube video player";
longDescription = ''
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index f9d4d4698fa..14db747d2ce 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, libjpeg }:
stdenv.mkDerivation rec {
- name = "mjpg-streamer-${version}";
- version = "2016-03-08";
+ pname = "mjpg-streamer";
+ version = "unstable-2019-05-24";
src = fetchFromGitHub {
owner = "jacksonliam";
repo = "mjpg-streamer";
- rev = "4060cb64e3557037fd404d10e1c1d076b672e9e8";
- sha256 = "0g7y832jsz4ylmq9qp2l4fq6bm8l6dhsbi60fr5jfqpx4l0pia8m";
+ rev = "501f6362c5afddcfb41055f97ae484252c85c912";
+ sha256 = "1cl159svfs1zzzrd3zgn4x7qy6751bvlnxfwf5hn5fmg4iszajw7";
};
prePatch = ''
@@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://sourceforge.net/projects/mjpg-streamer/;
+ homepage = "https://github.com/jacksonliam/mjpg-streamer";
description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
platforms = platforms.linux;
license = licenses.gpl2;
+ maintainers = with maintainers; [ gebner ];
};
}
diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/applications/video/mkclean/default.nix
new file mode 100644
index 00000000000..4a3cbc81b35
--- /dev/null
+++ b/pkgs/applications/video/mkclean/default.nix
@@ -0,0 +1,37 @@
+{ dos2unix, fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "mkclean";
+ version = "0.8.10";
+
+ hardeningDisable = [ "format" ];
+ nativeBuildInputs = [ dos2unix ];
+
+ src = fetchurl {
+ url = "mirror://sourceforge/matroska/${pname}-${version}.tar.bz2";
+ sha256 = "0zbpi4sm68zb20d53kbss93fv4aafhcmz7dsd0zdf01vj1r3wxwn";
+ };
+
+ configurePhase = ''
+ dos2unix ./mkclean/configure.compiled
+ ./mkclean/configure.compiled
+ '';
+
+ buildPhase = ''
+ make -C mkclean
+ '';
+
+ installPhase = ''
+ mkdir -p $out/{bin,lib}
+ mv release/gcc_linux_*/*.* $out/lib
+ mv release/gcc_linux_*/* $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed.";
+ homepage = "https://www.matroska.org";
+ license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ chrisaw ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 5b786b25501..42b40ade271 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -4,21 +4,22 @@
, withGUI ? true
, qtbase ? null
, qtmultimedia ? null
+ , wrapQtAppsHook ? null
}:
-assert withGUI -> qtbase != null && qtmultimedia != null;
+assert withGUI -> qtbase != null && qtmultimedia != null && wrapQtAppsHook != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "mkvtoolnix-${version}";
- version = "31.0.0";
+ pname = "mkvtoolnix";
+ version = "36.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "1fml374ivzzmac0ixhngj4bdxszcaw5yxdmacpn6ia7pdyvpf5lh";
+ sha256 = "114j9n2m6dkh7vqzyhcsjzzffadr0lzyjmh31cbl4mvvkg9j5z6r";
};
nativeBuildInputs = [
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
expat file xdg_utils boost libebml zlib fmt
libmatroska libogg libvorbis flac cmark
] ++ optional stdenv.isDarwin libiconv
- ++ optionals withGUI [ qtbase qtmultimedia ];
+ ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ];
preConfigure = "./autogen.sh; patchShebangs .";
buildPhase = "drake -j $NIX_BUILD_CORES";
@@ -49,6 +50,11 @@ stdenv.mkDerivation rec {
(enableFeature withGUI "qt")
];
+ dontWrapQtApps = true;
+ postFixup = optionalString withGUI ''
+ wrapQtApp $out/bin/mkvtoolnix-gui
+ '';
+
meta = with stdenv.lib; {
description = "Cross-platform tools for Matroska";
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index e3dcf6b3d3b..684390d3c5c 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -2,7 +2,7 @@
, ffmpeg, libjpeg, libmicrohttpd }:
stdenv.mkDerivation rec {
- name = "motion-${version}";
+ pname = "motion";
version = "4.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 81b48e25b96..efa495a45af 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }:
stdenv.mkDerivation rec {
- name = "mpc-qt-${version}";
+ pname = "mpc-qt";
version = "18.08";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 66fc1645e9a..bb0b92eee03 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,7 +1,7 @@
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
, freefont_ttf, freetype, libass, libpthreadstubs, mujs
-, lua, libuchardet, libiconv ? null, darwin
+, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
, waylandSupport ? stdenv.isLinux
, wayland ? null
@@ -95,7 +95,7 @@ let
luaEnv = lua.withPackages(ps: with ps; [ luasocket ]);
in stdenv.mkDerivation rec {
- name = "mpv-${version}";
+ pname = "mpv";
version = "0.29.1";
src = fetchFromGitHub {
@@ -166,6 +166,7 @@ in stdenv.mkDerivation rec {
++ optional xvSupport libXv
++ optional youtubeSupport youtube-dl
++ optional stdenv.isDarwin libiconv
+ ++ optional stdenv.isLinux nv-codec-headers
++ optionals cddaSupport [ libcdio libcdio-paranoia ]
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
@@ -217,7 +218,7 @@ in stdenv.mkDerivation rec {
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
homepage = https://mpv.io;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ];
+ maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ];
platforms = platforms.darwin ++ platforms.linux;
longDescription = ''
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 1be4fc252fd..d5c46491cf4 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -2,11 +2,11 @@
, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2
-, linuxHeaders
+, linuxHeaders, fetchpatch
}:
stdenv.mkDerivation rec {
- name = "mythtv-${version}";
+ pname = "mythtv";
version = "29.1";
src = fetchFromGitHub {
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";
};
+ patches = [
+ # Fixes build with exiv2 0.27.1.
+ (fetchpatch {
+ name = "004-exiv2.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946";
+ sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8";
+ })
+ ];
+
setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
buildInputs = [
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 090b4ec9ffe..4617d1d17dc 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -12,7 +12,7 @@ let
};
seexpr = stdenv.mkDerivation rec {
version = "1.0.1";
- name = "seexpr-${version}";
+ pname = "seexpr";
src = fetchurl {
url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
@@ -120,7 +120,7 @@ stdenv.mkDerivation {
Node-graph based, open-source compositing software. Similar in
functionalities to Adobe After Effects and Nuke by The Foundry.
'';
- homepage = https://natron.inria.fr/;
+ homepage = https://natron.fr/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ maintainers.puffnfresh ];
platforms = platforms.linux;
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 7211f9ff3d1..cdcdea3dd26 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -1,6 +1,6 @@
{ config, stdenv
+, mkDerivation
, fetchFromGitHub
-, fetchpatch
, cmake
, fdk_aac
, ffmpeg
@@ -11,6 +11,7 @@
, libXdmcp
, qtbase
, qtx11extras
+, qtsvg
, speex
, libv4l
, x264
@@ -34,24 +35,17 @@
let
optional = stdenv.lib.optional;
-in stdenv.mkDerivation rec {
- name = "obs-studio-${version}";
- version = "22.0.3";
+in mkDerivation rec {
+ pname = "obs-studio";
+ version = "23.2.1";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
- sha256 = "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i";
+ sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
};
- patches = [
- (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
- sha256 = "162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq";
- })
- ];
-
nativeBuildInputs = [ cmake
pkgconfig
];
@@ -67,6 +61,7 @@ in stdenv.mkDerivation rec {
libXdmcp
qtbase
qtx11extras
+ qtsvg
speex
x264
vlc
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 6d02233be32..52aa57bf198 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation rec {
- name = "obs-linuxbrowser-${version}";
- version = "0.6.0";
+ pname = "obs-linuxbrowser";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "bazukas";
repo = "obs-linuxbrowser";
rev = version;
- sha256 = "000ngkiwfjjl25v4hz6lh6mdkf119pnq0qv3jwdmmp6fpd0dxcgh";
+ sha256 = "1mi9pchy07ipnx1m2767n29d53v822yajcf6c3705dhz882z21zq";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
new file mode 100644
index 00000000000..efa06f4794e
--- /dev/null
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation,
+ qtbase, qtmultimedia, frei0r, opencolorio, hicolor-icon-theme, ffmpeg-full,
+ CoreFoundation }:
+
+mkDerivation rec {
+ pname = "olive-editor";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "olive-editor";
+ repo = "olive";
+ rev = version;
+ sha256 = "15q4qwf5rc3adssywl72jrhkpqk55ihpd5h5wf07baw0s47vv5kq";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ which
+ qmake
+ ];
+
+ buildInputs = [
+ ffmpeg-full
+ frei0r
+ opencolorio
+ qtbase
+ qtmultimedia
+ qtmultimedia.dev
+ hicolor-icon-theme
+ ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation;
+
+ meta = with stdenv.lib; {
+ description = "Professional open-source NLE video editor";
+ homepage = "https://www.olivevideoeditor.org/";
+ downloadPage = "https://www.olivevideoeditor.org/download.php";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.balsoft ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 6f113817058..0b1d9e95115 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, mkDerivationWith, fetchFromGitHub
, doxygen, python3Packages, libopenshot
, wrapGAppsHook, gtk3 }:
-python3Packages.buildPythonApplication rec {
- name = "openshot-qt-${version}";
- version = "2.4.3";
+mkDerivationWith python3Packages.buildPythonApplication rec {
+ pname = "openshot-qt";
+ version = "2.4.4";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "openshot-qt";
rev = "v${version}";
- sha256 = "1qdw1mli4y9qhrnllnkaf6ydgw5vfvdb90chs4i679k0x0jyb9a2";
+ sha256 = "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba";
};
nativeBuildInputs = [ doxygen wrapGAppsHook ];
@@ -19,12 +19,20 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ];
+ dontWrapGApps = true;
+ dontWrapQtApps = true;
preConfigure = ''
# tries to create caching directories during install
export HOME=$(mktemp -d)
'';
+ postFixup = ''
+ wrapProgram $out/bin/openshot-qt \
+ "''${gappsWrapperArgs[@]}" \
+ "''${qtWrapperArgs[@]}"
+ '';
+
doCheck = false;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index 9e275464f05..9bf21116455 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib
-, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib , libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }:
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libopenshot-audio-${version}";
- version = "0.1.7";
+ pname = "libopenshot-audio";
+ version = "0.1.8";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot-audio";
rev = "v${version}";
- sha256 = "08a8wbi28kwrdz4h0rs1b9vsr28ldfi8g75q54rj676y1vwg3qys";
+ sha256 = "1fvp6nmf30xzkmcznakh8dv5vn9d7nq051pqcqv638hsfppkmcrl";
};
nativeBuildInputs =
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index aab54e6d2ee..b7c8e6feeba 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -7,14 +7,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libopenshot-${version}";
- version = "0.2.2";
+ pname = "libopenshot";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
- sha256 = "1x4kv05pdq1pglb6y056aa7llc6iyibyhzg93k7zwj0q08cp5ixd";
+ sha256 = "0r1qmr8ar5n72603xkj9h065vbpznrqsq88kxxmn9n8djyyvk03k";
};
patchPhase = ''
diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
index 728f6387ffa..374ea08816f 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/pkgs/applications/video/peek/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook
+{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook
, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg
}:
stdenv.mkDerivation rec {
- name = "peek-${version}";
+ pname = "peek";
version = "1.3.1";
src = fetchFromGitHub {
owner = "phw";
- repo = "peek";
+ repo = pname;
rev = version;
sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb";
};
@@ -17,9 +17,21 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
'';
- nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];
+ nativeBuildInputs = [
+ cmake
+ gettext
+ pkgconfig
+ libxml2.bin
+ txt2man
+ vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433
+ wrapGAppsHook
+ ];
- buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ];
+ buildInputs = [
+ gsettings-desktop-schemas
+ gtk3
+ keybinder3
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 2cd4f19ca93..bef9537b806 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst_all_1, gtk3
, gobject-introspection, librsvg, gnome3, libnotify, gsound
-, meson, ninja
+, meson, ninja, gsettings-desktop-schemas
}:
let
@@ -12,7 +12,7 @@ let
# don't bother exposing the package to all of nixpkgs.
gst-transcoder = stdenv.mkDerivation rec {
version = "1.14.1";
- name = "gst-transcoder-${version}";
+ pname = "gst-transcoder";
src = fetchFromGitHub {
owner = "pitivi";
repo = "gst-transcoder";
@@ -48,8 +48,8 @@ in python3Packages.buildPythonApplication rec {
buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
- gnome3.defaultIconTheme
- gnome3.gsettings-desktop-schemas libnotify
+ gnome3.adwaita-icon-theme
+ gsettings-desktop-schemas libnotify
gst-transcoder
] ++ (with gst_all_1; [
gstreamer gst-editing-services
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index ceba62b6f60..a4f9d6222aa 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, makeDesktopItem, pkgconfig, cmake, python3
+{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3, mkDerivation
, libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras
, libvdpau, SDL2, mpv, libGL }:
let
@@ -9,57 +9,47 @@ let
# plex-media-player is updated, the versions for these files are changed,
# so the build IDs (and SHAs) below will need to be updated!
depSrcs = rec {
- webClientBuildId = "85-88b3ac67015f76";
- webClientDesktopBuildId = "3.77.2-7015f76";
- webClientTvBuildId = "3.78.0-88b3ac6";
+ webClientBuildId = "141-4af71961b12c68";
+ webClientDesktopBuildId = "3.104.2-1b12c68";
+ webClientTvBuildId = "4.3.0-4af7196";
webClient = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
- sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";
+ sha256 = "0fpkd1s49dbiqqlijxbillqd71a78p8y2sc23mwp0lvcmxrg265p";
};
webClientDesktopHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
- sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";
+ sha256 = "0sb0j44lwqz9zbm98nba4x6c1jxdzvs36ynwfg527avkxxna0f8f";
};
webClientDesktop = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
- sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";
+ sha256 = "0dxa0ka0igfsryzda4r5clwdl47ah78nmlmgj9d5pgsvyvzjp87z";
};
webClientTvHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
- sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";
+ sha256 = "086w1bavk2aqsyhv9zi5fynk31zf61sl91r6gjrdrz656wfk5bxa";
};
webClientTv = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
- sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";
+ sha256 = "12vbgsfnj0j2y5jd73dpi08hqsr9888sma41nvd4ydsd7qblm455";
};
};
-in stdenv.mkDerivation rec {
- name = "plex-media-player-${version}";
- version = "2.23.0.920";
- vsnHash = "5bc1a2e5";
+in mkDerivation rec {
+ pname = "plex-media-player";
+ version = "2.40.0.1007";
+ vsnHash = "5482132c";
src = fetchFromGitHub {
owner = "plexinc";
repo = "plex-media-player";
rev = "v${version}-${vsnHash}";
- sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";
+ sha256 = "0ibdh5g8x32iy74q97jfsmxd08wnyrzs3gfiwjfgc10vaa1qdhli";
};
nativeBuildInputs = [ pkgconfig cmake python3 ];
buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras
libvdpau SDL2 mpv libGL ];
- desktopItem = makeDesktopItem {
- name = "plex-media-player";
- exec = "plexmediaplayer";
- icon = "plex-media-player";
- comment = "View your media";
- desktopName = "Plex Media Player";
- genericName = "Media Player";
- categories = "AudioVideo;Video;Player;TV;";
- };
-
preConfigure = with depSrcs; ''
mkdir -p build/dependencies
ln -s ${webClient} build/dependencies/buildid-${webClientBuildId}.cmake
@@ -69,12 +59,6 @@ in stdenv.mkDerivation rec {
ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz
'';
- postInstall = ''
- mkdir -p $out/share/{applications,pixmaps}
- cp ${src}/resources/images/icon.png $out/share/pixmaps/plex-media-player.png
- cp ${desktopItem}/share/applications/* $out/share/applications
- '';
-
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index aba3b81fde8..f0c3776a433 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -3,11 +3,11 @@
let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]);
in stdenv.mkDerivation {
- name = "qarte-3.10.0+188";
+ name = "qarte-4.6.0";
src = fetchbzr {
- url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3;
- rev = "188";
- sha256 = "06xpkjgm5ci5gfkza9f44m8l4jj32gfmr65cqs4x0j2ihrc6b4r9";
+ url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4;
+ rev = "22";
+ sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn";
};
buildInputs = [ makeWrapper pythonEnv ];
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 2dd76b36d05..327a2034265 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
-, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre
+{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
+, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
, qwt, extra-cmake-modules }:
stdenv.mkDerivation rec {
pname = "qstopmotion";
- version = "2.4.0";
- name = "${pname}-${version}";
+ version = "2.4.1";
src = fetchurl {
- url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz";
- sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2";
+ url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz";
+ sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
};
- buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
+ buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
qwt qtquickcontrols qtimageformats qtxmlpatterns ];
nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index c3204cc9c0c..8f9e3131d8a 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }:
stdenv.mkDerivation rec {
- name = "libquvi-${version}";
+ pname = "libquvi";
version="0.9.4";
src = fetchurl {
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 603534be4c8..e54fc0eae4b 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig}:
stdenv.mkDerivation rec {
- name = "quvi-scripts-${version}";
+ pname = "quvi-scripts";
version="0.9.20131130";
src = fetchurl {
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 333f4e6ab4d..972e08bb61b 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
stdenv.mkDerivation rec {
- name = "quvi-${version}";
+ pname = "quvi";
version="0.9.5";
src = fetchurl {
diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix
index 8797ad8f953..e4d6e14d098 100644
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ b/pkgs/applications/video/recordmydesktop/default.nix
@@ -2,7 +2,7 @@
, libICE, libSM, libX11, libXext, libXfixes, libXdamage }:
stdenv.mkDerivation rec {
- name = "recordmydesktop-${version}";
+ pname = "recordmydesktop";
version = "0.3.8.1-svn${rev}";
rev = "602";
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index 984b623cee7..d59b02d4b0a 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -5,7 +5,7 @@ let
binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
in stdenv.mkDerivation rec {
- name = "gtk-recordmydesktop-${version}";
+ pname = "gtk-recordmydesktop";
version = "0.3.8-svn${recordmydesktop.rev}";
src = fetchsvn {
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
index 56080135151..0864edfcf38 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@@ -5,7 +5,7 @@ let
binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
in stdenv.mkDerivation rec {
- name = "qt-recordmydesktop-${version}";
+ pname = "qt-recordmydesktop";
version = "0.3.8-svn${recordmydesktop.rev}";
src = fetchsvn {
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix
index 6042f490dfa..1671c3f14d0 100644
--- a/pkgs/applications/video/screenkey/default.nix
+++ b/pkgs/applications/video/screenkey/default.nix
@@ -9,7 +9,7 @@
, libX11
, libXtst
, wrapGAppsHook
-, defaultIconTheme
+, gnome3
, hicolor-icon-theme
}:
buildPythonApplication rec {
@@ -39,7 +39,7 @@ buildPythonApplication rec {
];
buildInputs = [
- defaultIconTheme
+ gnome3.adwaita-icon-theme
hicolor-icon-theme
];
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index bbb11c49766..176c4be4946 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase
-, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols
-, qtgraphicaleffects, libmlt
-, qmake, makeWrapper, qttools }:
+{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation
+, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets
+, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }:
assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
-stdenv.mkDerivation rec {
- name = "shotcut-${version}";
- version = "18.12.23";
+mkDerivation rec {
+ pname = "shotcut";
+ version = "19.08.16";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
- sha256 = "1i6gkqvg31q7g5s3zgqzg4i5kyas7k4svclgbk459i5h1ar3v5vn";
+ sha256 = "0alnnfgimfs8fjddkcfx4pzyijwz5dgnqic5qazaza6f4kf60801";
};
enableParallelBuilding = true;
- nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
+ nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
SDL2 frei0r gettext mlt libmlt
qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
@@ -35,10 +34,15 @@ stdenv.mkDerivation rec {
sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
'';
+ qtWrapperArgs = [
+ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
+ "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}"
+ "--prefix PATH : ${mlt}/bin"
+ ];
+
postInstall = ''
mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/
- wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]} --prefix PATH : ${mlt}/bin
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index b456d8ee9a6..29ad928e27c 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
+{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja
}:
-stdenv.mkDerivation rec {
- name = "simplescreenrecorder-${version}";
+mkDerivation rec {
+ pname = "simplescreenrecorder";
version = "0.3.11";
src = fetchurl {
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 00c0d7b6dc2..495fc6f6745 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, qmake, qtscript }:
+{ lib, mkDerivation, fetchurl, qmake, qtscript }:
-stdenv.mkDerivation rec {
- name = "smplayer-19.1.0";
+mkDerivation rec {
+ name = "smplayer-19.5.0";
src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
- sha256 = "0q23nsmmdhj4kb90axaqrzv5pyj7szbwy8l3skl53yi8r4j3sj3s";
+ sha256 = "1xda9pbrc3dfbs71n5l8yszlcywz9456mwkv52vmn8lszhvjpjxm";
};
buildInputs = [ qtscript ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A complete front-end for MPlayer";
homepage = http://smplayer.sourceforge.net/;
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.linux;
+ license = lib.licenses.gpl3Plus;
+ platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index c5dcec38723..352569e5ab3 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, qmake, qtscript, qtwebkit }:
+{ lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }:
-stdenv.mkDerivation rec {
- version = "18.11.0";
- name = "smtube-${version}";
+mkDerivation rec {
+ version = "19.6.0";
+ pname = "smtube";
src = fetchurl {
- url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
- sha256 = "0rda7mdsr0awhra9yrmsdzp2c4s6xx5nax107d1fydnk084pygqp";
+ url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
+ sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";
};
makeFlags = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
buildInputs = [ qtscript qtwebkit ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Play and download Youtube videos";
homepage = http://smplayer.sourceforge.net/smtube.php;
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index dbf22aa9f8e..a5efddc9f1a 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
pythonPackages.buildPythonApplication rec {
- version = "0.14.2";
- name = "streamlink-${version}";
+ version = "1.1.1";
+ pname = "streamlink";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = "${version}";
- sha256 = "1njwfy1h8a9n5z6crrfnknlw4ys0bap2jam6ga6njgkd10aly9qr";
+ sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33";
};
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 3683973824a..03fc1f5399a 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
- desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme,
+ desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
}:
@@ -8,7 +8,8 @@ let
in
stdenv.mkDerivation rec {
- name = "subtitleeditor-${version}";
+ pname = "subtitleeditor";
+ inherit version;
src = fetchFromGitHub {
owner = "kitone";
@@ -28,8 +29,8 @@ stdenv.mkDerivation rec {
buildInputs = [
desktop-file-utils
enchant
- gnome3.gtk
- gnome3.gtkmm
+ gtk3
+ gtkmm3
gst_all_1.gstreamer
gst_all_1.gstreamermm
gst_all_1.gst-plugins-base
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
index 83ca41e201c..bc6561a0bbd 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -6,7 +6,8 @@ let
in
stdenv.mkDerivation {
- name = "tivodecode-${version}";
+ pname = "tivodecode";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz";
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index 0ad0b04e7e4..bcffb8585b3 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -1,78 +1,55 @@
{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
-, gettext, ncurses, systemd, perl
+, gettext, systemd, perl, lib
, enableSystemd ? true
, enableBidi ? true
-}:
-let
+}: stdenv.mkDerivation rec {
- version = "2.4.0";
+ pname = "vdr";
+ version = "2.4.1";
- name = "vdr-${version}";
-
- mkPlugin = name: stdenv.mkDerivation {
- name = "vdr-${name}-${version}";
- inherit (vdr) src;
- buildInputs = [ vdr ];
- preConfigure = "cd PLUGINS/src/${name}";
- installFlags = [ "DESTDIR=$(out)" ];
+ src = fetchurl {
+ url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2";
+ sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5";
};
- vdr = stdenv.mkDerivation {
+ enableParallelBuilding = true;
- inherit name;
+ postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
- src = fetchurl {
- url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2";
- sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk";
- };
+ buildInputs = [ fontconfig libjpeg libcap freetype perl ]
+ ++ lib.optional enableSystemd systemd
+ ++ lib.optional enableBidi fribidi;
- enableParallelBuilding = true;
+ buildFlags = [ "vdr" "i18n" ]
+ ++ lib.optional enableSystemd "SDNOTIFY=1"
+ ++ lib.optional enableBidi "BIDI=1";
- postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
+ nativeBuildInputs = [ perl ];
- buildInputs = [ fontconfig libjpeg libcap freetype ]
- ++ stdenv.lib.optional enableSystemd systemd
- ++ stdenv.lib.optional enableBidi fribidi;
+ # plugins uses the same build environment as vdr
+ propagatedNativeBuildInputs = [ pkgconfig gettext ];
- buildFlags = [ "vdr" "i18n" ]
- ++ stdenv.lib.optional enableSystemd "SDNOTIFY=1"
- ++ stdenv.lib.optional enableBidi "BIDI=1";
+ installFlags = [
+ "DESTDIR=$(out)"
+ "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix
+ ];
- nativeBuildInputs = [ perl ];
+ installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n"
+ "install-includes" ];
- # plugins uses the same build environment as vdr
- propagatedNativeBuildInputs = [ pkgconfig gettext ];
+ postInstall = ''
+ mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin
+ mkdir -p $out/share/vdr/conf
+ cp *.conf $out/share/vdr/conf
+ '';
- installFlags = [
- "DESTDIR=$(out)"
- "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix
- ];
-
- installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n"
- "install-includes" ];
-
- postInstall = ''
- mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin
- mkdir -p $out/share/vdr/conf
- cp *.conf $out/share/vdr/conf
- '';
-
- outputs = [ "out" "dev" "man" ];
-
- meta = with stdenv.lib; {
- homepage = http://www.tvdr.de/;
- description = "Video Disc Recorder";
- maintainers = [ maintainers.ck3d ];
- platforms = [ "i686-linux" "x86_64-linux" ];
- license = licenses.gpl2;
- };
+ outputs = [ "out" "dev" "man" ];
+ meta = with lib; {
+ homepage = http://www.tvdr.de/;
+ description = "Video Disc Recorder";
+ maintainers = [ maintainers.ck3d ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ license = licenses.gpl2;
};
-in vdr // {
- plugins = {
- skincurses = (mkPlugin "skincurses").overrideAttrs(
- oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; });
- } // (stdenv.lib.genAttrs [
- "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo"
- ] mkPlugin);
}
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 0e543390c4b..022f4382a49 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -1,7 +1,27 @@
-{ stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub
+{ stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
-, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }:
-{
+, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses
+, callPackage
+}: let
+ mkPlugin = name: stdenv.mkDerivation {
+ name = "vdr-${vdr.version}-${name}";
+ inherit (vdr) src;
+ buildInputs = [ vdr ];
+ preConfigure = "cd PLUGINS/src/${name}";
+ installFlags = [ "DESTDIR=$(out)" ];
+ };
+in {
+
+ xineliboutput = callPackage ./xineliboutput {};
+
+ skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: {
+ buildInputs = oldAttr.buildInputs ++ [ ncurses ];
+ });
+
+ inherit (stdenv.lib.genAttrs [
+ "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo"
+ ] mkPlugin);
+
femon = stdenv.mkDerivation rec {
name = "vdr-femon-2.4.0";
diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix
index 2272d1605fd..497ad7c77a0 100644
--- a/pkgs/applications/video/vdr/wrapper.nix
+++ b/pkgs/applications/video/vdr/wrapper.nix
@@ -1,5 +1,12 @@
-{ symlinkJoin, lib, makeWrapper, vdr, plugins ? [] }:
-symlinkJoin {
+{ symlinkJoin, lib, makeWrapper, vdr
+, plugins ? []
+}: let
+
+ makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l);
+
+ requiredXinePlugins = lib.flatten (map (p: p.passthru.requiredXinePlugins or []) plugins);
+
+in symlinkJoin {
name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}";
@@ -8,7 +15,9 @@ symlinkJoin {
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
- wrapProgram $out/bin/vdr --add-flags "-L $out/lib/vdr --localedir=$out/share/locale"
+ wrapProgram $out/bin/vdr \
+ --add-flags "-L $out/lib/vdr --localedir=$out/share/locale" \
+ --prefix XINE_PLUGIN_PATH ":" ${makeXinePluginPath requiredXinePlugins}
'';
meta = with vdr.meta; {
diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix
new file mode 100644
index 00000000000..98fcd2b5d40
--- /dev/null
+++ b/pkgs/applications/video/vdr/xineliboutput/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, lib, vdr
+, libav, libcap, libvdpau
+, xineLib, libjpeg, libextractor, mesa, libGLU
+, libX11, libXext, libXrender, libXrandr
+, makeWrapper
+}: let
+ name = "vdr-xineliboutput-2.1.0";
+
+ makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l);
+
+ self = stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${name}/${name}.tgz";
+ sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba";
+ };
+
+ # configure don't accept argument --prefix
+ dontAddPrefix = true;
+
+ postConfigure = ''
+ sed -i config.mak \
+ -e 's,XINEPLUGINDIR=/[^/]*/[^/]*/[^/]*/,XINEPLUGINDIR=/,'
+ '';
+
+ makeFlags = [ "DESTDIR=$(out)" ];
+
+ postFixup = ''
+ for f in $out/bin/*; do
+ wrapProgram $f \
+ --prefix XINE_PLUGIN_PATH ":" "${makeXinePluginPath [ "$out" xineLib ]}"
+ done
+ '';
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [
+ libav
+ libcap
+ libextractor
+ libjpeg
+ libGLU
+ libvdpau
+ libXext
+ libXrandr
+ libXrender
+ libX11
+ mesa
+ vdr
+ xineLib
+ ];
+
+ passthru.requiredXinePlugins = [ xineLib self ];
+
+ meta = with lib;{
+ homepage = "https://sourceforge.net/projects/xineliboutput/";
+ description = "Xine-lib based software output device for VDR";
+ maintainers = [ maintainers.ck3d ];
+ license = licenses.gpl2;
+ inherit (vdr.meta) platforms;
+ };
+ };
+in self
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index cd3999e38c0..a38076ca42b 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -9,23 +9,27 @@
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, onlyLibVLC ? false
-, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
+, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null, wrapQtAppsHook ? null
, jackSupport ? false
-, fetchpatch
, removeReferencesTo
+, chromecastSupport ? true, protobuf, libmicrodns
}:
+# chromecastSupport requires TCP port 8010 to be open for it to work.
+# If your firewall is enabled, make sure to have something like:
+# networking.firewall.allowedTCPPorts = [ 8010 ];
+
with stdenv.lib;
-assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
+assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);
stdenv.mkDerivation rec {
- name = "vlc-${version}";
- version = "3.0.6";
+ pname = "vlc";
+ version = "3.0.8";
src = fetchurl {
- url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
- sha256 = "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q";
+ url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
+ sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6";
};
# VLC uses a *ton* of libraries for various pieces of functionality, many of
@@ -42,9 +46,11 @@ stdenv.mkDerivation rec {
fluidsynth wayland wayland-protocols
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
- ++ optional jackSupport libjack2;
+ ++ optional jackSupport libjack2
+ ++ optionals chromecastSupport [ protobuf libmicrodns ];
- nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ];
+ nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]
+ ++ optionals withQt5 [ wrapQtAppsHook ];
enableParallelBuilding = true;
@@ -76,7 +82,12 @@ stdenv.mkDerivation rec {
# "--enable-foo" flags here
configureFlags = [
"--with-kde-solid=$out/share/apps/solid/actions"
- ] ++ optional onlyLibVLC "--disable-vlc";
+ ] ++ optional onlyLibVLC "--disable-vlc"
+ ++ optionals chromecastSupport [
+ "--enable-sout"
+ "--enable-chromecast"
+ "--enable-microdns"
+ ];
# Remove runtime dependencies on libraries
postConfigure = ''
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 67905033ba1..a38a9056c85 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchgit
-, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr
+{ stdenv, fetchFromGitHub, mkDerivation
+, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
, ffmpeg
}:
-stdenv.mkDerivation {
- name = "vokoscreen-2.5.0";
- src = fetchgit {
- url = "https://github.com/vkohaupt/vokoscreen.git";
- rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f";
- sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
+mkDerivation rec {
+
+ pname = "vokoscreen";
+ version = "2.5.8-beta";
+
+ src = fetchFromGitHub {
+ owner = "vkohaupt";
+ repo = "vokoscreen";
+ rev = version;
+ sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan";
};
nativeBuildInputs = [ pkgconfig qmake ];
@@ -16,6 +20,7 @@ stdenv.mkDerivation {
alsaLib
libv4l
qtbase
+ qtmultimedia
qttools
qtx11extras
libXrandr
@@ -35,14 +40,14 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Simple GUI screencast recorder, using ffmpeg";
- homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html;
+ homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
longDescription = ''
vokoscreen is an easy to use screencast creator to record
educational videos, live recordings of browser, installation,
videoconferences, etc.
'';
license = licenses.gpl2Plus;
- maintainers = [maintainers.league];
+ maintainers = [ maintainers.league ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
index 8f696f26301..afcee3f9715 100644
--- a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
+++ b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
@@ -1,20 +1,20 @@
diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
-index bbf2abf..187efad 100644
+index 3008e62..07485bd 100644
--- a/settings/QvkSettings.cpp
+++ b/settings/QvkSettings.cpp
-@@ -56,17 +56,8 @@ void QvkSettings::readAll()
- GIFPlayer = settings.value( "GIFplayer" ).toString();
+@@ -66,17 +66,8 @@ void QvkSettings::readAll()
Minimized = settings.value( "Minimized", 0 ).toUInt();
+ MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt();
Countdown = settings.value( "Countdown", 0 ).toUInt();
- QFile file;
- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
- {
-- vokoscreenWithLibs = true;
+- vokoscreenWithLibs = true;
- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
- }
- else
- {
-- vokoscreenWithLibs = false;
+- vokoscreenWithLibs = false;
- Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
- }
+ vokoscreenWithLibs = true;
@@ -22,10 +22,3 @@ index bbf2abf..187efad 100644
settings.endGroup();
settings.beginGroup( "Videooptions" );
-@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime()
- int QvkSettings::getShowKeyOnOff()
- {
- return showKeyOnOff;
--}
-\ No newline at end of file
-+}
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
index 2bf74da3d0f..3c4f607c6af 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "w_scan-${version}";
+ pname = "w_scan";
version = "20170107";
src = fetchurl {
- url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
+ url = "http://wirbel.htpc-forum.de/w_scan/${pname}-${version}.tar.bz2";
sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
};
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index 086190000ab..8258f858309 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -1,6 +1,6 @@
{
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype,
- gdk_pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
+ gdk-pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, stdenv, udev
}:
@@ -15,7 +15,7 @@
expat
fontconfig
freetype
- gdk_pixbuf
+ gdk-pixbuf
glib
gnome2.GConf
gnome2.gtk
@@ -38,7 +38,7 @@
udev
]);
in stdenv.mkDerivation rec {
- name = "webtorrent-desktop-${version}";
+ pname = "webtorrent-desktop";
version = "0.20.0";
src =
diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
new file mode 100644
index 00000000000..d52a4a6ab9b
--- /dev/null
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols
+, ffmpeg, x264, libpulseaudio
+}:
+
+stdenv.mkDerivation rec {
+ pname = "wf-recorder";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "ammen99";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1rl75r87ijja9mfyrwrsz8r4zvjnhm0103qmgyhq2phlrdpkks5d";
+ };
+
+ nativeBuildInputs = [ meson ninja pkgconfig ];
+ buildInputs = [ wayland wayland-protocols ffmpeg x264 libpulseaudio ];
+
+ meta = with stdenv.lib; {
+ description = "Utility program for screen recording of wlroots-based compositors";
+ homepage = https://github.com/ammen99/wf-recorder;
+ license = licenses.mit;
+ maintainers = with maintainers; [ CrazedProgrammer ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index 64fcf0ba04a..176d9a87aed 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
- name = "wxcam-${version}";
+ pname = "wxcam";
version = "1.1";
src = fetchurl {
- url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${pname}-${version}.tar.gz";
sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
};
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index f6f8016ec1d..db9a5ce7850 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -2,10 +2,10 @@
, libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}:
stdenv.mkDerivation rec {
- name = "xawtv-3.105";
+ name = "xawtv-3.106";
src = fetchurl {
url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
- sha256 = "03v4k0dychjz1kj890d9pc7v8jh084m01g71x1clmmvc6vc9kn1b";
+ sha256 = "174wd36rk0k23mgx9nlnpc398yd1f0wiv060963axg6sz0v4rksp";
};
preConfigure = ''
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
index ae048f1bdac..ba72763cdaf 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/pkgs/applications/video/xscast/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
stdenv.mkDerivation rec {
- name = "xscast-unstable-${version}";
+ pname = "xscast-unstable";
version = "2016-07-26";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 15d98dc9be5..6e61ef098f3 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -6,7 +6,7 @@ assert sdlSupport -> (SDL != null);
stdenv.mkDerivation rec {
- name = "8086tiny-${version}";
+ pname = "8086tiny";
version = "1.25";
src = fetchurl {
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index c858f4c4d6d..ecf6f1c5421 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, lib, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
+{ stdenv, lib, edk2, utillinux, nasm, iasl
+, csmSupport ? false, seabios ? null
+, secureBoot ? false
+}:
+
+assert csmSupport -> seabios != null;
let
@@ -12,60 +17,25 @@ let
throw "Unsupported architecture";
version = (builtins.parseDrvName edk2.name).version;
-
- src = edk2.src;
in
-stdenv.mkDerivation (edk2.setup projectDscPath {
+edk2.mkDerivation projectDscPath {
name = "OVMF-${version}";
- inherit src;
-
outputs = [ "out" "fd" ];
- # TODO: properly include openssl for secureBoot
- buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
+ buildInputs = [ utillinux nasm iasl ];
- hardeningDisable = [ "stackprotector" "pic" "fortify" ];
+ hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];
- unpackPhase = ''
- # $fd is overwritten during the build
- export OUTPUT_FD=$fd
+ buildFlags =
+ lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE"
+ ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ];
- for file in \
- "${src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg};
- do
- ln -sv "$file" .
- done
-
- ${if stdenv.isAarch64 then ''
- ln -sv ${src}/ArmPkg .
- ln -sv ${src}/ArmPlatformPkg .
- ln -sv ${src}/ArmVirtPkg .
- ln -sv ${src}/EmbeddedPkg .
- ln -sv ${src}/OvmfPkg .
- '' else if seabios != null then ''
- cp -r ${src}/OvmfPkg .
- chmod +w OvmfPkg/Csm/Csm16
- cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
- '' else ''
- ln -sv ${src}/OvmfPkg .
- ''}
-
- ${lib.optionalString secureBoot ''
- ln -sv ${src}/SecurityPkg .
- ln -sv ${src}/CryptoPkg .
- ''}
+ postPatch = lib.optionalString csmSupport ''
+ cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
'';
- buildPhase = if stdenv.isAarch64 then ''
- build -n $NIX_BUILD_CORES
- '' else if seabios == null then ''
- build -n $NIX_BUILD_CORES ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
- '' else ''
- build -n $NIX_BUILD_CORES -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
- '';
-
postFixup = if stdenv.isAarch64 then ''
mkdir -vp $fd/FV
mkdir -vp $fd/AAVMF
@@ -77,8 +47,8 @@ stdenv.mkDerivation (edk2.setup projectDscPath {
dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc
dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64
'' else ''
- mkdir -vp $OUTPUT_FD/FV
- mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV
+ mkdir -vp $fd/FV
+ mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV
'';
dontPatchELF = true;
@@ -89,4 +59,4 @@ stdenv.mkDerivation (edk2.setup projectDscPath {
license = stdenv.lib.licenses.bsd2;
platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
};
-})
+}
diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix
index e7cd5b7bde6..02fb256b38c 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/pkgs/applications/virtualization/aqemu/default.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "aqemu-${version}";
+ pname = "aqemu";
version = "0.9.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index f9d7128330f..72db4f1e5aa 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -18,11 +18,11 @@ assert curlSupport -> (curl != null);
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bochs-${version}";
+ pname = "bochs";
version = "2.6.9";
src = fetchurl {
- url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
};
diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
index 13060a50290..9cdaec1c698 100644
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/pkgs/applications/virtualization/cbfstool/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, iasl, flex, bison }:
stdenv.mkDerivation rec {
- name = "cbfstool-${version}";
+ pname = "cbfstool";
version = "4.9";
src = fetchurl {
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix
new file mode 100644
index 00000000000..c55eb342e06
--- /dev/null
+++ b/pkgs/applications/virtualization/charliecloud/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, python }:
+
+stdenv.mkDerivation rec {
+
+ version = "0.9.8";
+ pname = "charliecloud";
+
+ src = fetchFromGitHub {
+ owner = "hpc";
+ repo = "charliecloud";
+ rev = "v${version}";
+ sha256 = "1w1wy4sj9zqfysrpf04shhppcf5ap4rp7i3ja81sv2fm27k4m9nl";
+ };
+
+ buildInputs = [ python ];
+
+ preConfigure = ''
+ substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}'
+ patchShebangs test/
+ '';
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ "LIBEXEC_DIR=lib/charliecloud"
+ ];
+
+ postInstall = ''
+ mkdir -p $out/share/charliecloud
+ mv $out/lib/charliecloud/examples $out/share/charliecloud
+ mv $out/lib/charliecloud/test $out/share/charliecloud
+ '';
+
+ meta = {
+ description = "User-defined software stacks (UDSS) for high-performance computing (HPC) centers";
+ longDescription = ''
+ Charliecloud uses Linux user namespaces to run containers with no
+ privileged operations or daemons and minimal configuration changes on
+ center resources. This simple approach avoids most security risks
+ while maintaining access to the performance and functionality already
+ on offer.
+ '';
+ homepage = https://hpc.github.io/charliecloud;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = [ stdenv.lib.maintainers.bzizou ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+
+}
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 79dbddfab55..23084c6286a 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg";
};
- cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51";
+ cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
meta = with stdenv.lib; {
description = "A container debugging tool based on FUSE";
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
new file mode 100644
index 00000000000..0b523d7b88d
--- /dev/null
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, glib
+, glibc
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ project = "conmon";
+ name = "${project}-${version}";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "containers";
+ repo = project;
+ rev = "v${version}";
+ sha256 = "1sigcylya668f5jzkf1vgfsgqy26l3glh9a3g8lhd2468ax6wymk";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib systemd ] ++
+ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
+
+ installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/containers/conmon;
+ description = "An OCI container runtime monitor";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ vdemeester saschagrunert ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 94b21a77a70..b770c6ed0a5 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:
+{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:
with lib;
buildGoPackage rec {
- name = "containerd-${version}";
- version = "1.2.2";
+ pname = "containerd";
+ version = "1.2.6";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya";
+ sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
};
goPackagePath = "github.com/containerd/containerd";
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
new file mode 100644
index 00000000000..8070e1423fe
--- /dev/null
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -0,0 +1,69 @@
+{ flavor ? ""
+, ldflags ? ""
+, stdenv
+, btrfs-progs
+, buildGoPackage
+, fetchFromGitHub
+, glibc
+, gpgme
+, libapparmor
+, libassuan
+, libgpgerror
+, libseccomp
+, libselinux
+, lvm2
+, pkgconfig
+}:
+
+buildGoPackage rec {
+ project = "cri-o";
+ version = "1.15.0";
+ name = "${project}-${version}${flavor}";
+
+ goPackagePath = "github.com/${project}/${project}";
+
+ src = fetchFromGitHub {
+ owner = "cri-o";
+ repo = "cri-o";
+ rev = "v${version}";
+ sha256 = "08m84rlar25w6dwv76rab4vdlavacn7kb5ravzqnb8ngx68csbp3";
+ };
+
+ outputs = [ "bin" "out" ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror
+ libseccomp libselinux lvm2 ]
+ ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
+
+ makeFlags = ''BUILDTAGS="apparmor seccomp selinux
+ containers_image_ostree_stub"'';
+
+ buildPhase = ''
+ pushd go/src/${goPackagePath}
+
+ # Build pause
+ go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \
+ -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config
+
+ make -C pause
+
+ # Build the crio binary
+ go build -tags ${makeFlags} -o bin/crio -buildmode=pie \
+ -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio
+ '';
+ installPhase = ''
+ install -Dm755 bin/crio $bin/bin/crio${flavor}
+
+ mkdir -p $bin/libexec/crio
+ install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://cri-o.io;
+ description = ''Open Container Initiative-based implementation of the
+ Kubernetes Container Runtime Interface'';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ saschagrunert ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 4af9c32fed6..2d983d009f1 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -3,15 +3,15 @@
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
-, enum34, functools32,
+, enum34, functools32, paramiko
}:
buildPythonApplication rec {
- version = "1.23.1";
+ version = "1.24.1";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
- sha256 = "15jijx3md70b9xw8818xjm70nr9pc27p7v7is0yi6agf8scvvqkq";
+ sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5";
};
# lots of networking and other fails
@@ -20,7 +20,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
- docopt cached-property
+ docopt cached-property paramiko
] ++
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
stdenv.lib.optional (pythonOlder "3.2") functools32;
@@ -41,7 +41,6 @@ buildPythonApplication rec {
description = "Multi-container orchestration for Docker";
license = licenses.asl20;
maintainers = with maintainers; [
- jgeerds
];
};
}
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index e7c8a302c27..a1125f25e81 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -94,7 +94,9 @@ rec {
dontStrip = true;
- buildPhase = (optionalString (stdenv.isLinux) ''
+ buildPhase = ''
+ export GOCACHE="$TMPDIR/go-cache"
+ '' + (optionalString (stdenv.isLinux) ''
# build engine
cd ./components/engine
export AUTO_GOPATH=1
@@ -198,14 +200,26 @@ rec {
# Get revisions from
# https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
- docker_18_09 = dockerGen rec {
- version = "18.09.2";
- rev = "62479626f213818ba5b4565105a05277308587d5"; # git commit
- sha256 = "05kvpy1c4g661xfds6dfzb8r5q76ndblxjykfj06had18pv0xxd4";
- runcRev = "09c8266bf2fcf9519a651b04ae54c967b9ab86ec";
- runcSha256 = "08h45vs1f25byapqzy6x42r86m232z166v6z81gc2a3id8v0nzia";
- containerdRev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce";
- containerdSha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya";
+ docker_18_09 = makeOverridable dockerGen {
+ version = "18.09.8";
+ rev = "0dd43dd87fd530113bf44c9bba9ad8b20ce4637f";
+ sha256 = "07ljxdqylbfbq1939hqyaav966ga7ds5b38dn7af1h0aks86y2s3";
+ runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f";
+ runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
+ containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
+ containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
+ tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
+ tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
+ };
+
+ docker_19_03 = makeOverridable dockerGen {
+ version = "19.03.1";
+ rev = "74b1e89e8ac68948be88fe0aa1e2767ae28659fe";
+ sha256 = "1m7bq7la29d8piwiq5whzcyrm7g3lv497wnri0lh6gxi10nwv06h";
+ runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f";
+ runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
+ containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
+ containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};
diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix
index 0af9abc852e..ed4db853c38 100644
--- a/pkgs/applications/virtualization/docker/distribution.nix
+++ b/pkgs/applications/virtualization/docker/distribution.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "distribution-${version}";
+ pname = "distribution";
version = "2.6.2";
rev = "v${version}";
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index 8b7021f7dbb..3b2e1f45ae6 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, docker }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "docker-proxy-${rev}";
diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 946014e5cc9..351353ceb96 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, p7zip }:
stdenv.mkDerivation rec {
- name = "win-virtio-${version}";
+ pname = "win-virtio";
version = "0.1.141-1";
phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix
index 4499fff4dc8..6f35257b50f 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/pkgs/applications/virtualization/dynamips/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "dynamips";
- version = "0.2.19";
+ version = "0.2.21";
src = fetchFromGitHub {
owner = "GNS3";
repo = pname;
rev = "v${version}";
- sha256 = "0x63m37vjyp57900x09gfvw02cwg85b33918x7fjj9x37wgmi5qf";
+ sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index 711838b2944..691c74301e3 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "${pname}-${version}";
pname = "amazon-ecs-agent";
version = "1.18.0";
@@ -19,7 +18,7 @@ buildGoPackage rec {
description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
homepage = "https://github.com/aws/amazon-ecs-agent";
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ];
};
}
diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index e1696fc15a5..45ec7383fc8 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv }:
let
- version = "0.13.0";
+ version = "0.15.2";
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
fetchbin = name: sha256: fetchurl {
@@ -9,8 +9,8 @@ let
inherit sha256;
};
- firecracker-bin = fetchbin "firecracker" "1wdcy4vmnx216jnza7bz6czlqpsjrnpqfsb5d322ld4gzbylm718";
- jailer-bin = fetchbin "jailer" "0k0sc5138bh35ciim2l78ma9g5x18dw098f2ar5y31ybr8i4q60y";
+ firecracker-bin = fetchbin "firecracker" "11g0iz1krsm6gzhvf0fb4101c6qyk6bl8j3kjidbb52x9i4aqsxk";
+ jailer-bin = fetchbin "jailer" "0j1gc1cdsfsi82fkvvxla25791lcvk6vmp46i82f0ms9xm7xhswz";
in
stdenv.mkDerivation {
name = "firecracker-${version}";
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index d870e246616..318929eb225 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }:
+{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
+, buildPackages }:
stdenv.mkDerivation rec {
- name = "lkl-2018-08-22";
- rev = "5221c547af3d29582703f01049617a6bf9f6232a";
+ pname = "lkl";
+ version = "2019-06-20";
+ rev = "0a4ebeadad12b94db665b8daf30e44e949a02d90";
outputs = [ "dev" "lib" "out" ];
@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
inherit rev;
owner = "lkl";
repo = "linux";
- sha256 = "1k2plyx40xaphm8zsk2dd1lyv6dhsp7kj6hfmdgiamvl80bjajqy";
+ sha256 = "09y9ci3j0lp3z74h577ng2s9a4n4glqpqndyc9iy6wdqaj764gm6";
};
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
@@ -40,7 +42,12 @@ stdenv.mkDerivation rec {
# crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
hardeningDisable = [ "format" "fortify" ];
- makeFlags = "-C tools/lkl";
+ makeFlags = [
+ "-C tools/lkl"
+ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
+ "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ ];
enableParallelBuilding = true;
@@ -52,7 +59,7 @@ stdenv.mkDerivation rec {
overhead
'';
homepage = https://github.com/lkl/linux/;
- platforms = [ "x86_64-linux" "aarch64-linux" ]; # Darwin probably works too but I haven't tested it
+ platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];
};
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index ca8e4985016..0f53a5c4f14 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
-, libX11, freefont_ttf, nettle, libconfig
+, libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp
+, libXfixes, libbfd
}:
stdenv.mkDerivation rec {
- name = "looking-glass-client-${version}";
- version = "a12";
+ pname = "looking-glass-client";
+ version = "B1";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
- sha256 = "0r6bvl9q94039r6ff4f2bg8si95axx9w8bf1h1qr5730d2kv5yxq";
+ sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
- libX11 freefont_ttf nettle libconfig cmake
+ libX11 freefont_ttf nettle libconfig wayland libpthreadstubs
+ libXdmcp libXfixes libbfd cmake
];
enableParallelBuilding = true;
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://looking-glass.hostfission.com/;
license = licenses.gpl2Plus;
- maintainers = [ maintainers.pneumaticat ];
+ maintainers = [ maintainers.alexbakker ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/nvidia-docker/config.toml b/pkgs/applications/virtualization/nvidia-docker/config.toml
new file mode 100644
index 00000000000..bbd166995f3
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/config.toml
@@ -0,0 +1,13 @@
+disable-require = false
+#swarm-resource = "DOCKER_RESOURCE_GPU"
+
+[nvidia-container-cli]
+#root = "/run/nvidia/driver"
+#path = "/usr/bin/nvidia-container-cli"
+environment = []
+#debug = "/var/log/nvidia-container-runtime-hook.log"
+ldcache = "/tmp/ld.so.cache"
+load-kmods = true
+#no-cgroups = false
+#user = "root:video"
+ldconfig = "@@glibcbin@/bin/ldconfig"
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
new file mode 100644
index 00000000000..b58a5108eba
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper
+, buildGoPackage, runc, glibc }:
+
+with lib; let
+
+ glibc-ldconf = glibc.overrideAttrs (oldAttrs: {
+ # ldconfig needs help reading libraries that have been patchelf-ed, as the
+ # .dynstr section is no longer in the first LOAD segment. See also
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=23964 and
+ # https://github.com/NixOS/patchelf/issues/44
+ patches = oldAttrs.patches ++ [ (fetchpatch {
+ name = "ldconfig-patchelf.patch";
+ url = "https://sourceware.org/bugzilla/attachment.cgi?id=11444";
+ sha256 = "0nzzmq7pli37iyjrgcmvcy92piiwjybpw245ds7q43pbgdm7lc3s";
+ })];
+ });
+
+ libnvidia-container = callPackage ./libnvc.nix { };
+
+ nvidia-container-runtime = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "nvidia-container-runtime";
+ rev = "runtime-v2.0.0";
+ sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
+ };
+
+ nvidia-container-runtime-hook = buildGoPackage rec {
+ pname = "nvidia-container-runtime-hook";
+ version = "1.4.0";
+
+ goPackagePath = "nvidia-container-runtime-hook";
+
+ src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook";
+ };
+
+ nvidia-runc = runc.overrideAttrs (oldAttrs: rec {
+ name = "nvidia-runc";
+ version = "1.0.0-rc6";
+ src = fetchFromGitHub {
+ owner = "opencontainers";
+ repo = "runc";
+ rev = "v${version}";
+ sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
+ };
+ patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ];
+ });
+
+in stdenv.mkDerivation rec {
+ pname = "nvidia-docker";
+ version = "2.0.3";
+
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "nvidia-docker";
+ rev = "v${version}";
+ sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildPhase = ''
+ mkdir bin
+ cp nvidia-docker bin
+ cp ${libnvidia-container}/bin/nvidia-container-cli bin
+ cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin
+ cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime
+ '';
+
+ installPhase = ''
+ mkdir -p $out/{bin,etc}
+ cp -r bin $out
+ wrapProgram $out/bin/nvidia-container-cli \
+ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
+ cp ${./config.toml} $out/etc/config.toml
+ substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc-ldconf}
+ '';
+
+ meta = {
+ homepage = https://github.com/NVIDIA/nvidia-docker;
+ description = "NVIDIA container runtime for Docker";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
new file mode 100644
index 00000000000..043c1efade8
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
@@ -0,0 +1,130 @@
+diff --git a/src/ldcache.c b/src/ldcache.c
+index 38bab05..e1abc89 100644
+--- a/src/ldcache.c
++++ b/src/ldcache.c
+@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx)
+
+ int
+ ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[],
+- char *paths[], size_t size, ldcache_select_fn select, void *select_ctx)
++ char *paths[], size_t size, const char* version)
+ {
+ char path[PATH_MAX];
+- struct header_libc6 *h;
+- int override;
++ char dir[PATH_MAX];
++ char lib[PATH_MAX];
+
+- h = (struct header_libc6 *)ctx->ptr;
+ memset(paths, 0, size * sizeof(*paths));
+
+- for (uint32_t i = 0; i < h->nlibs; ++i) {
+- int32_t flags = h->libs[i].flags;
+- char *key = (char *)ctx->ptr + h->libs[i].key;
+- char *value = (char *)ctx->ptr + h->libs[i].value;
+-
+- if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch)
++ for (size_t j = 0; j < size; ++j) {
++ snprintf(dir, 100, "/run/opengl-driver%s/lib",
++ arch == LD_I386_LIB32 ? "-32" : "");
++ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100))
++ strcat(dir, "/vdpau");
++ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version);
++ if (path_resolve_full(ctx->err, path, "/", lib) < 0)
++ return (-1);
++ if (!file_exists(ctx->err, path))
+ continue;
+-
+- for (size_t j = 0; j < size; ++j) {
+- if (!str_has_prefix(key, libs[j]))
+- continue;
+- if (path_resolve(ctx->err, path, root, value) < 0)
+- return (-1);
+- if (paths[j] != NULL && str_equal(paths[j], path))
+- continue;
+- if ((override = select(ctx->err, select_ctx, root, paths[j], path)) < 0)
+- return (-1);
+- if (override) {
+- free(paths[j]);
+- paths[j] = xstrdup(ctx->err, path);
+- if (paths[j] == NULL)
+- return (-1);
+- }
+- break;
+- }
++ paths[j] = xstrdup(ctx->err, path);
++ if (paths[j] == NULL)
++ return (-1);
+ }
+ return (0);
+ }
+diff --git a/src/ldcache.h b/src/ldcache.h
+index 33d78dd..2b087db 100644
+--- a/src/ldcache.h
++++ b/src/ldcache.h
+@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *);
+ int ldcache_open(struct ldcache *);
+ int ldcache_close(struct ldcache *);
+ int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [],
+- char *[], size_t, ldcache_select_fn, void *);
++ char *[], size_t, const char*);
+
+ #endif /* HEADER_LDCACHE_H */
+diff --git a/src/nvc_info.c b/src/nvc_info.c
+index cc96542..3fe7612 100644
+--- a/src/nvc_info.c
++++ b/src/nvc_info.c
+@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
+ if (path_resolve_full(err, path, root, ldcache) < 0)
+ return (-1);
+ ldcache_init(&ld, err, path);
+- if (ldcache_open(&ld) < 0)
+- return (-1);
+
+ info->nlibs = size;
+ info->libs = array_new(err, size);
+ if (info->libs == NULL)
+ goto fail;
+ if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
+- info->libs, info->nlibs, select_libraries, info) < 0)
++ info->libs, info->nlibs, info->nvrm_version) < 0)
+ goto fail;
+
+ info->nlibs32 = size;
+@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
+ if (info->libs32 == NULL)
+ goto fail;
+ if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
+- info->libs32, info->nlibs32, select_libraries, info) < 0)
++ info->libs32, info->nlibs32, info->nvrm_version) < 0)
+ goto fail;
+ rv = 0;
+
+ fail:
+- if (ldcache_close(&ld) < 0)
+- return (-1);
+ return (rv);
+ }
+
+@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r
+ char path[PATH_MAX];
+ int rv = -1;
+
+- if ((env = secure_getenv("PATH")) == NULL) {
++ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) {
+ error_setx(err, "environment variable PATH not found");
+ return (-1);
+ }
+diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c
+index d41a24d..65b7878 100644
+--- a/src/nvc_ldcache.c
++++ b/src/nvc_ldcache.c
+@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
+ if (validate_args(ctx, cnt != NULL) < 0)
+ return (-1);
+
+- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
++ argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
+ if (*argv[0] == '@') {
+ /*
+ * We treat this path specially to be relative to the host filesystem.
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
new file mode 100644
index 00000000000..71c02ab4de5
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
@@ -0,0 +1,53 @@
+{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }:
+
+with lib; let
+
+ modp-ver = "396.51";
+
+ nvidia-modprobe = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "nvidia-modprobe";
+ rev = modp-ver;
+ sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk";
+ };
+
+in stdenv.mkDerivation rec {
+ pname = "libnvidia-container";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "libnvidia-container";
+ rev = "v${version}";
+ sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw";
+ };
+
+ # locations of nvidia-driver libraries are not resolved via ldconfig which
+ # doesn't get used on NixOS. Additional support binaries like nvidia-smi are
+ # not resolved via the environment PATH but via the derivation output path.
+ patches = [ ./libnvc-ldconfig-and-path-fixes.patch ];
+
+ makeFlags = [
+ "WITH_LIBELF=yes"
+ "prefix=$(out)"
+ ];
+
+ postPatch = ''
+ sed -i 's/^REVISION :=.*/REVISION = ${src.rev}/' mk/common.mk
+ sed -i 's/^COMPILER :=.*/COMPILER = $(CC)/' mk/common.mk
+
+ mkdir -p deps/src/nvidia-modprobe-${modp-ver}
+ cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
+ chmod -R u+w deps/src
+ touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp
+ '';
+
+ buildInputs = [ libelf libcap libseccomp ];
+
+ meta = {
+ homepage = https://github.com/NVIDIA/libnvidia-container;
+ description = "NVIDIA container runtime library";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index a43e1733f06..ee241abda7f 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,18 +1,18 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
- pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which,
+ pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which,
withX ? true }:
stdenv.mkDerivation rec {
- name = "open-vm-tools-${version}";
- version = "10.3.5";
+ pname = "open-vm-tools";
+ version = "10.3.10";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
- sha256 = "10x24gkqcg9lnfxghq92nr76h40s5v3xrv0ymi9c7aqrqry404z7";
+ sha256 = "0x2cyccnb4sycrw7r5mzby2d196f9jiph8vyqi0x8v8r2b4vi4yj";
};
sourceRoot = "${src.name}/open-vm-tools";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
- ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
+ ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
patches = [ ./recognize_nixos.patch ];
postPatch = ''
diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix
deleted file mode 100644
index 42907bc84ba..00000000000
--- a/pkgs/applications/virtualization/podman/conmon.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, glib }:
-
-with lib;
-
-stdenv.mkDerivation rec {
- name = "conmon-${version}";
- version = "unstable-2018-11-28";
- rev = "8fba206232c249a8fc4e2fac1469fb2fddbf5cf7";
-
- src = fetchFromGitHub {
- owner = "containers";
- repo = "conmon";
- sha256 = "07ar0dk9i072b14f6il51yqahxp5c4fkf5jzar8rxcpvymkdy8zq";
- inherit rev;
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- glib
- ];
-
- installPhase = ''
- install -D -m 555 bin/conmon $out/bin/conmon
- '';
-
- meta = {
- homepage = https://github.com/containers/conmon;
- description = "An OCI container runtime monitor";
- license = licenses.asl20;
- maintainers = with maintainers; [ vdemeester ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 7fc74de1d2e..ff768cb7878 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, pkgconfig
-, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp
+, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd
, go-md2man
}:
buildGoPackage rec {
- name = "podman-${version}";
- version = "1.0.0";
+ pname = "podman";
+ version = "1.5.1";
src = fetchFromGitHub {
- owner = "containers";
- repo = "libpod";
- rev = "v${version}";
- sha256 = "1py6vbmpm25j1gb51dn973pckvgjl9q63y9qyzszvc3q3wsxsqhw";
+ owner = "containers";
+ repo = "libpod";
+ rev = "v${version}";
+ sha256 = "1jg7fdshqz0x71339i0wndskb17x1k5rwpkjiwd463f96fnbfp4x";
};
goPackagePath = "github.com/containers/libpod";
@@ -22,9 +22,7 @@ buildGoPackage rec {
hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig go-md2man ];
- buildInputs = [
- btrfs-progs libseccomp gpgme lvm2
- ];
+ buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ];
buildPhase = ''
pushd $NIX_BUILD_TOP/go/src/${goPackagePath}
@@ -41,7 +39,7 @@ buildGoPackage rec {
homepage = https://podman.io/;
description = "A program for managing pods, containers and container images";
license = licenses.asl20;
- maintainers = with maintainers; [ vdemeester ];
+ maintainers = with maintainers; [ vdemeester saschagrunert ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
new file mode 100644
index 00000000000..03e47a57863
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
@@ -0,0 +1,44 @@
+commit cdc3e7eeafa9f683214d2c15d52ef384c3de6611
+Author: aszlig
+Date: Mon Mar 18 13:21:01 2019 +0100
+
+ 9pfs: Ignore O_NOATIME open flag
+
+ Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir,
+ which in turn causes errors when the Nix store is mounted in the guest
+ because the file owner of the store paths typically don't match the
+ owner of the QEMU process.
+
+ After submitting a patch to the overlayfs mailing list[1], it turns out
+ that my patch was incomplete[2] and needs a bit more rework.
+
+ So instead of using an incomplete kernel patch in nixpkgs, which affects
+ *all* users of overlayfs, not just NixOS VM tests, I decided that for
+ now it's better to patch QEMU instead.
+
+ The change here really only ignores the O_NOATIME flag so that the
+ behaviour is similar to what NFS does. From open(2):
+
+ This flag may not be effective on all filesystems. One example is NFS,
+ where the server maintains the access time.
+
+ This change is therefore only temporary until the final fix lands in the
+ stable kernel releases.
+
+ [1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html
+ [2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html
+
+ Signed-off-by: aszlig
+
+diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
+index 55821343e5..0b8425fe18 100644
+--- a/hw/9pfs/9p.c
++++ b/hw/9pfs/9p.c
+@@ -127,7 +127,6 @@ static int dotl_to_open_flags(int flags)
+ { P9_DOTL_LARGEFILE, O_LARGEFILE },
+ { P9_DOTL_DIRECTORY, O_DIRECTORY },
+ { P9_DOTL_NOFOLLOW, O_NOFOLLOW },
+- { P9_DOTL_NOATIME, O_NOATIME },
+ { P9_DOTL_SYNC, O_SYNC },
+ };
+
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 67a863b6fb7..d64baca2cc7 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
+{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib
, ncurses, perl, pixman, vde2, alsaLib, texinfo, flex
, bison, lzo, snappy, libaio, gnutls, nettle, curl
, makeWrapper
@@ -15,7 +15,7 @@
, usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen
, cephSupport ? false, ceph
-, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
+, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer
, smbdSupport ? false, samba
, hostCpuOnly ? false
@@ -35,7 +35,7 @@ let
in
stdenv.mkDerivation rec {
- version = "3.1.0";
+ version = "4.0.0";
name = "qemu-"
+ stdenv.lib.optionalString xenSupport "xen-"
+ stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"
@@ -44,12 +44,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
- sha256 = "08frr1fdjx8qcfh3fafn10kibdwbvkqqvfl7hpqbm7i9dg4f1zlq";
+ sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd";
};
+ nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
buildInputs =
- [ python2 zlib pkgconfig glib ncurses perl pixman
- vde2 texinfo flex bison makeWrapper lzo snappy
+ [ zlib glib ncurses perl pixman
+ vde2 texinfo makeWrapper lzo snappy
gnutls nettle curl
]
++ optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ]
@@ -65,7 +66,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ]
++ optionals cephSupport [ ceph ]
- ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
+ ++ optionals openGLSupport [ mesa epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ]
++ optionals smbdSupport [ samba ];
@@ -76,8 +77,13 @@ stdenv.mkDerivation rec {
patches = [
./no-etc-install.patch
./fix-qemu-ga.patch
+ ./9p-ignore-noatime.patch
+ (fetchpatch {
+ url = "https://git.qemu.org/?p=qemu.git;a=patch;h=d52680fc932efb8a2f334cc6993e705ed1e31e99";
+ name = "CVE-2019-12155.patch";
+ sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207";
+ })
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
- ++ optional pulseSupport ./fix-hda-recording.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch;
@@ -106,6 +112,7 @@ stdenv.mkDerivation rec {
[ "--audio-drv-list=${audio}"
"--sysconfdir=/etc"
"--localstatedir=/var"
+ "--enable-docs"
]
# disable sysctl check on darwin.
++ optional stdenv.isDarwin "--cpu=x86_64"
diff --git a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch
deleted file mode 100644
index b4e21f4f347..00000000000
--- a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/audio/paaudio.c b/audio/paaudio.c
-index fea6071..c1169d4 100644
---- a/audio/paaudio.c
-+++ b/audio/paaudio.c
-@@ -608,6 +608,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
- {
- int error;
- pa_sample_spec ss;
-+ pa_buffer_attr ba;
- struct audsettings obt_as = *as;
- PAVoiceIn *pa = (PAVoiceIn *) hw;
- paaudio *g = pa->g = drv_opaque;
-@@ -616,6 +617,12 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
- ss.channels = as->nchannels;
- ss.rate = as->freq;
-
-+ ba.fragsize = pa_frame_size (&ss) * g->conf.samples;
-+ ba.maxlength = 5 * ba.fragsize;
-+ ba.tlength = -1;
-+ ba.prebuf = -1;
-+ ba.minreq = -1;
-+
- obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness);
-
- pa->stream = qpa_simple_new (
-@@ -625,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
- g->conf.source,
- &ss,
- NULL, /* channel map */
-- NULL, /* buffering attributes */
-+ &ba, /* buffering attributes */
- &error
- );
- if (!pa->stream) {
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 47b4b3176dc..37c12ddbfeb 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,10 +1,25 @@
+From 98b3e5993bbdb0013b6cc1814e0ad9555290c3af Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 23 Apr 2019 21:31:45 -0500
+Subject: [PATCH] no install localstatedir
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 04a0d45050..5dc82d0eb7 100644
--- a/Makefile
+++ b/Makefile
-@@ -597,7 +597,7 @@
+@@ -786,7 +786,7 @@ endif
+ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
ifneq ($(TOOLS),)
- $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
+ $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
endif
+--
+2.21.GIT
+
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index 517a8e39a1e..0a139448cb3 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, rustPlatform, libseccomp }:
+{ lib, fetchFromGitHub, rustPlatform, libseccomp }:
rustPlatform.buildRustPackage rec {
name = "railcar-${version}";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
};
- cargoSha256 = "16f3ys0zzha8l5jdklmrqivl8hmrb9qgqgzcm3jn06v45hls9lan";
+ cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a";
buildInputs = [ libseccomp ];
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 8777f7cc2db..d8a2878e3f7 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
- name = "remotebox-${version}";
+ pname = "remotebox";
version = "2.6";
src = fetchurl {
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 777dc6fe930..fd0bd92faa6 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
+{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools,
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }:
let
@@ -13,8 +13,8 @@ let
in stdenv.mkDerivation rec {
version = "1.30.0";
- name = "rkt-${version}";
- BUILDDIR="build-${name}";
+ pname = "rkt";
+ BUILDDIR="build-${pname}-${version}";
src = fetchFromGitHub {
owner = "coreos";
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glibc.out glibc.static
- autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
+ autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd
makeWrapper
];
@@ -48,6 +48,7 @@ in stdenv.mkDerivation rec {
preBuild = ''
export BUILDDIR
+ export GOCACHE="$TMPDIR/go-cache"
'';
installPhase = ''
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index b89ef1dd7bf..6357f9fadff 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, go-md2man
+{ lib, fetchFromGitHub, buildGoPackage, go-md2man
, pkgconfig, libapparmor, apparmor-parser, libseccomp, which }:
with lib;
buildGoPackage rec {
- name = "runc-${version}";
- version = "1.0.0-rc6";
+ pname = "runc";
+ version = "1.0.0-rc8";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
- sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
+ sha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
};
goPackagePath = "github.com/opencontainers/runc";
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix
index 5aa73528e9d..32528627a3c 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/pkgs/applications/virtualization/seabios/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "seabios-${version}";
+ pname = "seabios";
version = "1.11.0";
src = fetchurl {
- url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
+ url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz";
sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
};
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index ab9416fd3d6..60825063cab 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,12 +1,10 @@
{stdenv
, removeReferencesTo
, lib
-, fetchgit
, fetchFromGitHub
, utillinux
, openssl
, coreutils
-, gawk
, go
, which
, makeWrapper
@@ -16,14 +14,14 @@
with lib;
buildGoPackage rec {
- name = "singularity-${version}";
- version = "3.0.1";
+ pname = "singularity";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "sylabs";
repo = "singularity";
rev = "v${version}";
- sha256 = "1wpsd0il2ipa2n5cnbj8dzs095jycdryq2rx62kikbq7ahzz4fsi";
+ sha256 = "14lhxwy21s7q081x7kbnvkjsbxgsg2f181qlzmlxcn6n7gfav3kj";
};
goPackagePath = "github.com/sylabs/singularity";
@@ -33,23 +31,22 @@ buildGoPackage rec {
nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ];
propagatedBuildInputs = [ coreutils squashfsTools ];
- postConfigure = ''
- find . -name vendor -type d -print0 | xargs -0 rm -rf
+ prePatch = ''
+ substituteInPlace internal/pkg/build/copy/copy.go \
+ --replace /bin/cp ${coreutils}/bin/cp
+ '';
+ postConfigure = ''
cd go/src/github.com/sylabs/singularity
patchShebangs .
- sed -i 's|defaultEnv := "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"|defaultEnv := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' src/cmd/singularity/cli/singularity.go
+ sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
./mconfig -V ${version} -p $bin --localstatedir=/var
- touch builddir/.dep-done
- touch builddir/vendors-done
# Don't install SUID binaries
sed -i 's/-m 4755/-m 755/g' builddir/Makefile
- # Point to base gopath
- sed -i "s|^cni_vendor_GOPATH :=.*\$|cni_vendor_GOPATH := $NIX_BUILD_TOP/go/src/github.com/containernetworking/plugins/plugins|" builddir/Makefile
'';
buildPhase = ''
@@ -59,6 +56,7 @@ buildGoPackage rec {
installPhase = ''
make -C builddir install LOCALSTATEDIR=$bin/var
chmod 755 $bin/libexec/singularity/bin/starter-suid
+ wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
'';
postFixup = ''
diff --git a/pkgs/applications/virtualization/singularity/deps.nix b/pkgs/applications/virtualization/singularity/deps.nix
index 526202e75ae..fe51488c706 100644
--- a/pkgs/applications/virtualization/singularity/deps.nix
+++ b/pkgs/applications/virtualization/singularity/deps.nix
@@ -1,669 +1 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/Microsoft/go-winio";
- fetch = {
- type = "git";
- url = "https://github.com/Microsoft/go-winio";
- rev = "7da180ee92d8bd8bb8c37fc560e673e6557c392f";
- sha256 = "19gjjhmzswhm11wzj38r5alxypmflmy0z42flhc3czhmmwv7b1av";
- };
- }
- {
- goPackagePath = "github.com/alexflint/go-filemutex";
- fetch = {
- type = "git";
- url = "https://github.com/alexflint/go-filemutex";
- rev = "d358565f3c3f5334209f1e80693e4f621650c489";
- sha256 = "19fzbm0x8821awsmqj9ig49dxxkd72p1yfqbijmdwwszvw2r0ggz";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
- sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
- };
- }
- {
- goPackagePath = "github.com/blang/semver";
- fetch = {
- type = "git";
- url = "https://github.com/blang/semver";
- rev = "2ee87856327ba09384cabd113bc6b5d174e9ec0f";
- sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
- };
- }
- {
- goPackagePath = "github.com/containerd/cgroups";
- fetch = {
- type = "git";
- url = "https://github.com/containerd/cgroups";
- rev = "5017d4e9a9cf2d4381db99eacd9baf84b95bfb14";
- sha256 = "02pvcmj91j3maa9j1v91m2z9kpa6p822h06r007b3pl7h0paiqnj";
- };
- }
- {
- goPackagePath = "github.com/containerd/continuity";
- fetch = {
- type = "git";
- url = "https://github.com/containerd/continuity";
- rev = "246e49050efdf45e8f17fbbcf1547ee376f9939e";
- sha256 = "1zc1f0yixf32lprp5r77z2j9xq7fk0hijq8xzl08j4zrk0fcy8aq";
- };
- }
- {
- goPackagePath = "github.com/containernetworking/cni";
- fetch = {
- type = "git";
- url = "https://github.com/containernetworking/cni";
- rev = "a7885cb6f8ab03fba07852ded351e4f5e7a112bf";
- sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
- };
- }
- {
- goPackagePath = "github.com/containernetworking/plugins";
- fetch = {
- type = "git";
- url = "https://github.com/containernetworking/plugins";
- rev = "2b8b1ac0af4568e928d96ccc5f47b075416eeabd";
- sha256 = "1yl9m8pwjmqxj3hf0w9s6rykszhcww54z07yjgxzabmqf2dhchxv";
- };
- }
- {
- goPackagePath = "github.com/containers/image";
- fetch = {
- type = "git";
- url = "https://github.com/containers/image";
- rev = "2e4f799f5eba49a2498d2793cfb2a4bc823ca3f6";
- sha256 = "0b9symgbkd2vgvp7mfpz1l03i2zivwbc5ycccwv78b1ikk9m6b75";
- };
- }
- {
- goPackagePath = "github.com/containers/storage";
- fetch = {
- type = "git";
- url = "https://github.com/containers/storage";
- rev = "88d80428f9b146f8f9fe7e2e8cc8688a5aae1a4e";
- sha256 = "13fagjisbg55dhgjd72h0hiy6jfg8ggkcnjl5haqj13c2gkf6sam";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-iptables";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-iptables";
- rev = "b5b1876b170881a8259f036445ee89c8669db386";
- sha256 = "1s1c04x47pk3168606x4vkg4avs8a7m407hpha8py1xni08cgb6m";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-systemd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-systemd";
- rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab";
- sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
- };
- }
- {
- goPackagePath = "github.com/cpuguy83/go-md2man";
- fetch = {
- type = "git";
- url = "https://github.com/cpuguy83/go-md2man";
- rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1";
- sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
- };
- }
- {
- goPackagePath = "github.com/d2g/dhcp4";
- fetch = {
- type = "git";
- url = "https://github.com/d2g/dhcp4";
- rev = "a1d1b6c41b1ce8a71a5121a9cee31809c4707d9c";
- sha256 = "191hzw6yqzkm042h6miyycq3g0zrhqjhhpl27f8vhwzp4wanasiz";
- };
- }
- {
- goPackagePath = "github.com/d2g/dhcp4client";
- fetch = {
- type = "git";
- url = "https://github.com/d2g/dhcp4client";
- rev = "e612998962035b93ba16cfd1ad2f3221985c1b8c";
- sha256 = "1612wh99fblc9ashmm6mjc9110fhal95z0mn9qn7av3px13yd9fs";
- };
- }
- {
- goPackagePath = "github.com/docker/distribution";
- fetch = {
- type = "git";
- url = "https://github.com/docker/distribution";
- rev = "749f6afb4572201e3c37325d0ffedb6f32be8950";
- sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd";
- };
- }
- {
- goPackagePath = "github.com/docker/docker";
- fetch = {
- type = "git";
- url = "https://github.com/docker/docker";
- rev = "da99009bbb1165d1ac5688b5c81d2f589d418341";
- sha256 = "02hhx7s8vm45rcl2mx9xamkncl2pb6qhsmz35mffbg4n6l5rn5x5";
- };
- }
- {
- goPackagePath = "github.com/docker/docker-credential-helpers";
- fetch = {
- type = "git";
- url = "https://github.com/docker/docker-credential-helpers";
- rev = "d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1";
- sha256 = "1ff829h5p1j6qiivjvnwyiybrff3dddv1ij71nz5whmgavdqgd49";
- };
- }
- {
- goPackagePath = "github.com/docker/go-connections";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-connections";
- rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d";
- sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
- };
- }
- {
- goPackagePath = "github.com/docker/go-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-metrics";
- rev = "399ea8c73916000c64c2c76e8da00ca82f8387ab";
- sha256 = "0najfy92fq05b330cnjk5b326yi7dnnmvzfk6g5lsa1fci78yzw4";
- };
- }
- {
- goPackagePath = "github.com/docker/go-units";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-units";
- rev = "47565b4f722fb6ceae66b95f853feed578a4a51c";
- sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
- };
- }
- {
- goPackagePath = "github.com/docker/libtrust";
- fetch = {
- type = "git";
- url = "https://github.com/docker/libtrust";
- rev = "aabc10ec26b754e797f9028f4589c5b7bd90dc20";
- sha256 = "1lwslbggzc2b0c4wxl5pn6i2nfgz5jz8f7s7vnid9mrlsk59h7s1";
- };
- }
- {
- goPackagePath = "github.com/ghodss/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
- sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
- };
- }
- {
- goPackagePath = "github.com/globalsign/mgo";
- fetch = {
- type = "git";
- url = "https://github.com/globalsign/mgo";
- rev = "113d3961e7311526535a1ef7042196563d442761";
- sha256 = "0m05ay993vv2jkc46bbdnq371s5jc0an2cycsj7p3b6lmv84jk9f";
- };
- }
- {
- goPackagePath = "github.com/godbus/dbus";
- fetch = {
- type = "git";
- url = "https://github.com/godbus/dbus";
- rev = "a389bdde4dd695d414e47b755e95e72b7826432c";
- sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "1adfc126b41513cc696b209667c8656ea7aac67c";
- sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
- sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
- };
- }
- {
- goPackagePath = "github.com/gorilla/context";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/context";
- rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
- sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
- };
- }
- {
- goPackagePath = "github.com/gorilla/mux";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/mux";
- rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
- sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
- sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/errwrap";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/errwrap";
- rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
- sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/go-multierror";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/go-multierror";
- rev = "b7773ae218740a7be65057fc60b366a49b538a44";
- sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/j-keck/arping";
- fetch = {
- type = "git";
- url = "https://github.com/j-keck/arping";
- rev = "2cf9dc699c5640a7e2c81403a44127bf28033600";
- sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c";
- };
- }
- {
- goPackagePath = "github.com/kubernetes-sigs/cri-o";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes-sigs/cri-o";
- rev = "8afc34092907d146906fcc31af112b2b46e7b5cd";
- sha256 = "0ghcjvk7grdcwb1936mnj56a7rla804glfknid9kmr3kgny3yi43";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c2353362d570a7bfa228149c62842019201cfb71";
- sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
- sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-shellwords";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-shellwords";
- rev = "02e3cf038dcea8290e44424da473dd12be796a8a";
- sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
- sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
- };
- }
- {
- goPackagePath = "github.com/mtrmac/gpgme";
- fetch = {
- type = "git";
- url = "https://github.com/mtrmac/gpgme";
- rev = "b2432428689ca58c2b8e8dea9449d3295cf96fc9";
- sha256 = "0hs9gfwf3cmnvmmxb485icwlv8h8xnny3p52bj7qwv251pvwsnaf";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/go-digest";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/go-digest";
- rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf";
- sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/image-spec";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/image-spec";
- rev = "e562b04403929d582d449ae5386ff79dd7961a11";
- sha256 = "0j24nk975di8hcv6ycn2p2hhw1xdiy4bpxamr6wn12k21kadlp7s";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/image-tools";
- fetch = {
- type = "git";
- url = "https://github.com/sylabs/image-tools";
- rev = "2814f498056809a9d5baaf76d1d82312180a5888";
- sha256 = "0q3ljb51df5hc58rhp5xni2gsy3gkxn47d9dwyfcffnq8kpf9d8a";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/runc";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/runc";
- rev = "baf6536d6259209c3edfa2b22237af82942d3dfa";
- sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/runtime-spec";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/runtime-spec";
- rev = "5806c35637336642129d03657419829569abc5aa";
- sha256 = "13vw1b3j9sx7d5fr3w3jdg137nnqcr50fqchq8z8nf6s18lkhj93";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/runtime-tools";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/runtime-tools";
- rev = "1c243a8a8eb44d491790798afc9b634c6f6a6380";
- sha256 = "1ll5wrbn84yb2l7k6hpwwj06wywib7ar4z1bhh1rc5h9xajng7jq";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/selinux";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/selinux";
- rev = "ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d";
- sha256 = "1n283j7rsim7gysm91x99c41d7vnsjsgfm4dy11fnzpkpzfiksq5";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194";
- sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
- };
- }
- {
- goPackagePath = "github.com/pquerna/ffjson";
- fetch = {
- type = "git";
- url = "https://github.com/pquerna/ffjson";
- rev = "d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac";
- sha256 = "069w276lch2hhkvz26wdla8d4s0cg842bhqmih4sa33dsinlgs8g";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "faf4ec335fe01ae5a6a0eaa34a5a9333bfbd1a30";
- sha256 = "08xgqgx7vc27zc30chgi09lwrnvxr338dn624xnw4ysfm9r6lxrz";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
- sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
- sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "7d6f385de8bea29190f15ba9931442a0eaef9af7";
- sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
- sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
- };
- }
- {
- goPackagePath = "github.com/safchain/ethtool";
- fetch = {
- type = "git";
- url = "https://github.com/safchain/ethtool";
- rev = "6e3f4faa84e1d8d48afec75ed064cf3611d3f8bf";
- sha256 = "15xjvny8bfhhjvvv654pimxxw5cd02q8skp1siwbfvrlw598j4lm";
- };
- }
- {
- goPackagePath = "github.com/satori/go.uuid";
- fetch = {
- type = "git";
- url = "https://github.com/satori/go.uuid";
- rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
- sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
- };
- }
- {
- goPackagePath = "github.com/seccomp/libseccomp-golang";
- fetch = {
- type = "git";
- url = "https://github.com/seccomp/libseccomp-golang";
- rev = "e3496e3a417d1dc9ecdceca5af2513271fed37a0";
- sha256 = "0z8v90nk22h8r5licav1a8cbn6k7bs47l0j1crw7bjl9hv1bmr71";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
- sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
- sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
- sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
- };
- }
- {
- goPackagePath = "github.com/sylabs/sif";
- fetch = {
- type = "git";
- url = "https://github.com/sylabs/sif";
- rev = "177b9338f1ab9123be5b6217740be1f0ce924206";
- sha256 = "1dwpml36n06hglp2km1wsfzdiw1yva6a0h00f1y2933m3i8r3k2w";
- };
- }
- {
- goPackagePath = "github.com/syndtr/gocapability";
- fetch = {
- type = "git";
- url = "https://github.com/syndtr/gocapability";
- rev = "33e07d32887e1e06b7c025f27ce52f62c7990bc0";
- sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i";
- };
- }
- {
- goPackagePath = "github.com/vishvananda/netlink";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netlink";
- rev = "a2ad57a690f3caf3015351d2d6e1c0b95c349752";
- sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0";
- };
- }
- {
- goPackagePath = "github.com/vishvananda/netns";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netns";
- rev = "be1fbeda19366dea804f00efff2dd73a1642fdcc";
- sha256 = "0j0xin37zp34ajmhsgfbxr8l7vrljf1lc6z3j3miidlmfwcl2s0m";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonpointer";
- rev = "4e3ac2762d5f479393488629ee9370b50873b3a6";
- sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonreference";
- rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b";
- sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonschema";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonschema";
- rev = "1d523034197ff1f222f6429836dd36a2457a1874";
- sha256 = "1z8c6x8sfh6d1ib2lm2jps7r139qip6h3zik3fxhy1yr1380qbzp";
- };
- }
- {
- goPackagePath = "go4.org";
- fetch = {
- type = "git";
- url = "https://github.com/go4org/go4";
- rev = "9599cf28b011184741f249bd9f9330756b506cbc";
- sha256 = "0hssb6jmpjxvdx2k1zx0l2dbwpx52zxcq5n2bhqivr670r4wdrkq";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://github.com/sylabs/golang-x-crypto";
- rev = "4bce89e8e9a9f84a4cf02b9842c3eaff2af0a856";
- sha256 = "11wi2zd055ym9m36ba007rdg4ghrwaiqxc77qyqc37ln7l7accr9";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196";
- sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7";
- sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp";
- };
- }
- {
- goPackagePath = "gopkg.in/cheggaaa/pb.v1";
- fetch = {
- type = "git";
- url = "https://github.com/cheggaaa/pb";
- rev = "2af8bbdea9e99e83b3ac400d8f6b6d1b8cbbf338";
- sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
-]
\ No newline at end of file
+[]
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 25c19cd79c7..39508412333 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.18.0";
- name = "tini-${version}";
+ pname = "tini";
src = fetchFromGitHub {
owner = "krallin";
diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix
index a8f11330725..224f77ed32d 100644
--- a/pkgs/applications/virtualization/tinyemu/default.nix
+++ b/pkgs/applications/virtualization/tinyemu/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, openssl, curl, SDL }:
stdenv.mkDerivation rec {
- name = "tinyemu-${version}";
+ pname = "tinyemu";
version = "2018-09-23";
src = fetchurl {
- url = "https://bellard.org/tinyemu/${name}.tar.gz";
+ url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz";
sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v";
};
buildInputs = [ openssl curl SDL ];
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 91934a3610b..42860966fe1 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,32 +1,39 @@
{ stdenv, fetchurl, python3Packages, intltool, file
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
, gobject-introspection, libvirt-glib, system-libvirt
-, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
+, gsettings-desktop-schemas, glib, libosinfo, gnome3
+, gtksourceview4
, spiceSupport ? true, spice-gtk ? null
, cpio, e2fsprogs, findutils, gzip
}:
with stdenv.lib;
+# TODO: remove after there's support for setupPyDistFlags
+let
+ setuppy = ../../../development/interpreters/python/run_setup.py;
+in
python3Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
- version = "2.1.0";
+ version = "2.2.1";
namePrefix = "";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
- sha256 = "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil";
+ sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g";
};
nativeBuildInputs = [
- wrapGAppsHook intltool file
+ intltool file
gobject-introspection # for setup hook populating GI_TYPELIB_PATH
];
- buildInputs =
- [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi
- gsettings-desktop-schemas libosinfo gtk3
- ] ++ optional spiceSupport spice-gtk;
+ buildInputs = [
+ wrapGAppsHook
+ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
+ gsettings-desktop-schemas libosinfo gtksourceview4
+ gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
+ ] ++ optional spiceSupport spice-gtk;
propagatedBuildInputs = with python3Packages;
[
@@ -42,8 +49,12 @@ python3Packages.buildPythonApplication rec {
${python3Packages.python.interpreter} setup.py configure --prefix=$out
'';
- postInstall = ''
- ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
+ # TODO: remove after there's support for setupPyDistFlags
+ buildPhase = ''
+ runHook preBuild
+ cp ${setuppy} nix_run_setup
+ ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel
+ runHook postBuild
'';
preFixup = ''
@@ -66,6 +77,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl2;
# exclude Darwin since libvirt-glib currently doesn't build there
platforms = platforms.linux;
- maintainers = with maintainers; [ qknight offline fpletz ];
+ maintainers = with maintainers; [ qknight offline fpletz globin ];
};
}
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index c1dbad94250..5a98e71c916 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,7 +5,7 @@
}:
mkDerivation rec {
- name = "virt-manager-qt-${version}";
+ pname = "virt-manager-qt";
version = "0.70.91";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 493307d0d07..382ebba3c57 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "virt-top-${version}";
+ pname = "virt-top";
version = "2017-11-18-unstable";
src = fetchgit {
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 746c45beccf..3d058903200 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
-, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl
-, libapparmor, gst_all_1
+{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook
+, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte
, spiceSupport ? true
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
}:
@@ -13,29 +11,27 @@ with stdenv.lib;
stdenv.mkDerivation rec {
baseName = "virt-viewer";
- version = "7.0";
+ version = "8.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
- sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7";
+ sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw";
};
- nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+ nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ];
buildInputs = [
- glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
- libvirt yajl gsettings-desktop-schemas libvirt-glib
- libcap_ng numactl libapparmor
- ] ++ optionals stdenv.isx86_64 [
- xen
+ glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte
] ++ optionals spiceSupport [
spice-gtk spice-protocol libcap gdbm
- gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
# Required for USB redirection PolicyKit rules file
propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
+ strictDeps = true;
+ enableParallelBuilding = true;
+
meta = {
description = "A viewer for remote virtual machines";
maintainers = [ maintainers.raskin ];
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix
index 8a339ac8322..7ea83b01559 100644
--- a/pkgs/applications/virtualization/virt-what/default.nix
+++ b/pkgs/applications/virtualization/virt-what/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "virt-what-${version}";
+ pname = "virt-what";
version = "1.19";
src = fetchurl {
- url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz";
+ url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk";
};
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 8222fb50a8f..6931e492e99 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
let version = "0.600.4"; in
stdenv.mkDerivation rec {
- name = "virtinst-${version}";
+ pname = "virtinst";
+ inherit version;
src = fetchurl {
url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz";
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 8304dd15597..20930b86537 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,11 +1,11 @@
-{ config, stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
-, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
-, libpng, glib, lvm2, libXrandr, libXinerama, libopus
-, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
+{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook
+, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
+, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
+, qttools, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus
, makeself, perl
-, javaBindings ? false, jdk ? null
-, pythonBindings ? false, python2 ? null
+, javaBindings ? true, jdk ? null # Almost doesn't affect closure size
+, pythonBindings ? false, python3 ? null
, extensionPack ? null, fakeroot ? null
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, enableHardening ? false
@@ -17,13 +17,15 @@
with stdenv.lib;
let
- python = python2;
+ python = python3;
buildType = "release";
- # Remember to change the extpackRev and version in extpack.nix as well.
- main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m";
- version = "5.2.22";
+ # Remember to change the extpackRev and version in extpack.nix and
+ # guest-additions/default.nix as well.
+ main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv";
+ version = "6.0.8";
in stdenv.mkDerivation {
- name = "virtualbox-${version}";
+ pname = "virtualbox";
+ inherit version;
src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
@@ -32,7 +34,11 @@ in stdenv.mkDerivation {
outputs = [ "out" "modsrc" ];
- nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ];
+ nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]
+ ++ optional (!headless) wrapQtAppsHook;
+
+ # Wrap manually because we just need to wrap one executable
+ dontWrapQtApps = true;
buildInputs =
[ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
@@ -41,8 +47,8 @@ in stdenv.mkDerivation {
++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
- ++ optionals (headless) [ libXrandr ]
- ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
+ ++ optionals (headless) [ libXrandr libGL ]
+ ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ];
hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
@@ -52,7 +58,7 @@ in stdenv.mkDerivation {
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
-e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \
${optionalString (!headless) ''
- -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \
+ -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \
''} -i configure
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
@@ -75,11 +81,6 @@ in stdenv.mkDerivation {
optional enableHardening ./hardened.patch
++ [
./qtx11extras.patch
- (fetchpatch {
- name = "010-qt-5.11.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/010-qt-5.11.patch?h=packages/virtualbox";
- sha256 = "0hjx99pg40wqyggnrpylrp5zngva4xrnk7r90i0ynrqc7n84g9pn";
- })
];
postPatch = ''
@@ -109,9 +110,9 @@ in stdenv.mkDerivation {
VBOX_JAVA_HOME := ${jdk}
''}
${optionalString (!headless) ''
- PATH_QT5_X11_EXTRAS_LIB := ${getLib qt5.qtx11extras}/lib
- PATH_QT5_X11_EXTRAS_INC := ${getDev qt5.qtx11extras}/include
- TOOL_QT5_LRC := ${getDev qt5.qttools}/bin/lrelease
+ PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib
+ PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include
+ TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease
''}
LOCAL_CONFIG
@@ -181,6 +182,10 @@ in stdenv.mkDerivation {
cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
'';
+ preFixup = optionalString (!headless) ''
+ wrapQtApp $out/bin/VirtualBox
+ '';
+
passthru = {
inherit version; # for guest additions
inherit extensionPack; # for inclusion in profile to prevent gc
@@ -191,6 +196,6 @@ in stdenv.mkDerivation {
license = licenses.gpl2;
homepage = https://www.virtualbox.org/;
maintainers = with maintainers; [ flokli sander ];
- platforms = [ "x86_64-linux" "i686-linux" ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index d2c513e899a..78c2538bbb0 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, lib}:
+{fetchurl, lib}:
with lib;
-let version = "5.2.22";
+let version = "6.0.8";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -10,7 +10,7 @@ fetchurl rec {
sha256 =
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
- let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef";
+ let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954";
in assert (builtins.stringLength value) == 64; value;
meta = {
@@ -18,6 +18,6 @@ fetchurl rec {
license = licenses.virtualbox-puel;
homepage = https://www.virtualbox.org/;
maintainers = with maintainers; [ flokli sander cdepillabout ];
- platforms = [ "x86_64-linux" "i686-linux" ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 259f2b268fe..5ff8a1650ba 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, xorg, dbus, virtualbox }:
+, zlib, xorg, dbus, virtualbox }:
let
version = virtualbox.version;
@@ -19,32 +19,23 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603";
+ sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
- patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];
-
- patches = [
- ./fix_kerndir.patch
- ./fix_kernincl.patch
- ];
+ # If you add a patch you probably need this.
+ #patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];
hardeningDisable = [ "pic" ];
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
nativeBuildInputs = [ patchelf makeWrapper ];
- buildInputs = [ cdrkit dbus ] ++ kernel.moduleBuildDependencies;
+ buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies;
- installPhase = ''
- mkdir -p $out
- cp -r install/* $out
- '';
-
- buildCommand = with xorg; ''
+ unpackPhase = ''
${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
chmod 755 ./VBoxLinuxAdditions.run
@@ -63,39 +54,30 @@ stdenv.mkDerivation {
''
else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")
}
+ '';
- cd ../
- patchPhase
- cd install/src
-
- # Build kernel modules
- export INSTALL_MOD_PATH=$out
+ doConfigure = false;
+ buildPhase = ''
+ # Build kernel modules.
+ cd src
find . -type f | xargs sed 's/depmod -a/true/' -i
-
cd vboxguest-${version}
-
+ # Run just make first. If we only did make install, we get symbol warnings during build.
make
-
cd ../..
# Change the interpreter for various binaries
- for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf
- do
- ${if stdenv.hostPlatform.system == "i686-linux" then ''
- patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $i
- ''
- else if stdenv.hostPlatform.system == "x86_64-linux" then ''
- patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $i
- ''
- else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")
- }
- patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i
+ for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf; do
+ patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} $i
+ patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc zlib
+ xorg.libX11 xorg.libXt xorg.libXext xorg.libXmu xorg.libXfixes xorg.libXrandr xorg.libXcursor ]} $i
done
for i in lib/VBoxOGL*.so
do
- patchelf --set-rpath ${lib.makeLibraryPath [ "$out" dbus libXcomposite libXdamage libXext libXfixes ]} $i
+ patchelf --set-rpath ${lib.makeLibraryPath [ "$out"
+ xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes ]} $i
done
# FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions
@@ -105,6 +87,13 @@ stdenv.mkDerivation {
# Remove references to /usr from various scripts and files
sed -i -e "s|/usr/bin|$out/bin|" other/vboxclient.desktop
sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
+ '';
+
+ installPhase = ''
+ # Install kernel modules.
+ cd src/vboxguest-${version}
+ make install INSTALL_MOD_PATH=$out
+ cd ../..
# Install binaries
install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf
@@ -118,11 +107,17 @@ stdenv.mkDerivation {
wrapProgram $out/bin/VBoxClient-all \
--prefix PATH : "${which}/bin"
- # Install OpenGL libraries
- mkdir -p $out/lib
- cp -v lib/VBoxOGL*.so $out/lib
- mkdir -p $out/lib/dri
- ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
+ # Don't install VBoxOGL for now
+ # It seems to be broken upstream too, and fixing it is far down the priority list:
+ # https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html
+ # Additionally, 3d support seems to rely on VBoxOGL.so being symlinked from
+ # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd
+ # either. (#18457)
+ ## Install OpenGL libraries
+ #mkdir -p $out/lib
+ #cp -v lib/VBoxOGL*.so $out/lib
+ #mkdir -p $out/lib/dri
+ #ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
# Install desktop file
mkdir -p $out/share/autostart
@@ -131,21 +126,18 @@ stdenv.mkDerivation {
# Install Xorg drivers
mkdir -p $out/lib/xorg/modules/{drivers,input}
install -m 644 other/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
+ '';
- # Install kernel modules
- cd src
+ # Stripping breaks these binaries for some reason.
+ dontStrip = true;
- for i in *
- do
- cd $i
- kernelVersion=$(cd ${kernel.dev}/lib/modules; ls)
- export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
- find . -type f | xargs sed -i -e "s|-o root||g" \
- -e "s|-g root||g"
- make install
- cd ..
+ # Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped.
+ postFixup = ''
+ for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do
+ origRpath=$(patchelf --print-rpath "$i")
+ patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i"
done
- ''; # */
+ '';
meta = {
description = "Guest additions for VirtualBox";
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
deleted file mode 100644
index 0be949f63c9..00000000000
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxsf/Makefile.include.header
-+++ b/vboxsf/Makefile.include.header
-@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
- endif # neq($(KERNELRELEASE),)
-
- # Kernel build folder
--KERN_DIR := /lib/modules/$(KERN_VER)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the headers of the Linux kernel to build against. \
- Specify KERN_VER= and run Make again)
-
-diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxguest/Makefile.include.header
-+++ b/vboxguest/Makefile.include.header
-@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
- endif # neq($(KERNELRELEASE),)
-
- # Kernel build folder
--KERN_DIR := /lib/modules/$(KERN_VER)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the headers of the Linux kernel to build against. \
- Specify KERN_VER= and run Make again)
-
-diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxvideo/Makefile.include.header
-+++ b/vboxvideo/Makefile.include.header
-@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
- endif # neq($(KERNELRELEASE),)
-
- # Kernel build folder
--KERN_DIR := /lib/modules/$(KERN_VER)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the headers of the Linux kernel to build against. \
- Specify KERN_VER= and run Make again)
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
deleted file mode 100644
index e59e2e98c1b..00000000000
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxvideo/Makefile.include.header
-+++ b/vboxvideo/Makefile.include.header
-@@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- Specify KERN_VER= and run Make again)
- endif
- # Kernel include folder
--KERN_INCL := $(KERN_DIR)/include
- # module install folder
- INSTALL_MOD_DIR ?= misc
- MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR)
diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
index 6ed74e3e23e..a3aa98b081d 100644
--- a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
+++ b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
@@ -2,30 +2,15 @@ diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk
index 71b96a3..73391f0 100644
--- a/kBuild/units/qt5.kmk
+++ b/kBuild/units/qt5.kmk
-@@ -1019,9 +1019,10 @@ else
+@@ -1054,9 +1054,9 @@ else
$(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
endif
else
- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
-+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \
-+ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL))
++ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(if $(filter X11Extras,$(module)),$(PATH_QT5_X11_EXTRAS_LIB),$(PATH_SDK_QT5_LIB))/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
endif
- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) )
+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras )
endif
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
-diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
-index 3295bfefe7..796370623c 100644
---- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
-+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
-@@ -916,9 +916,6 @@ endif
- # The Qt modules we're using.
- # (The include directory and lib/framework for each module will be added by the Qt unit.)
- VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport
--VirtualBox_QT_MODULES.linux += X11Extras
--VirtualBox_QT_MODULES.solaris += X11Extras
--VirtualBox_QT_MODULES.freebsd += X11Extras
- VirtualBox_QT_MODULES.darwin += MacExtras
- VirtualBox_QT_MODULES.win += WinExtras
- if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index 3d6efcfc844..464fe46b499 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,13 +1,12 @@
{ stdenv, fetchurl, glibc }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "vpcs";
version = "0.8";
src = fetchurl {
- name = "${name}.tar.bz2";
- url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz";
+ name = "${pname}-${version}.tar.bz2";
+ url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
};
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index 8e248061cd5..ea8a24e57a3 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
stdenv.mkDerivation rec {
- name = "x11docker-${version}";
- version = "5.4.1";
+ pname = "x11docker";
+ version = "6.0.0";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
- sha256 = "0fcdr8i3crf4cina41h030q2jf5zvafll97iff129dl3sb27jnvi";
+ sha256 = "1sfdxlh50hv8j3dj5bphihqdyf8s7ixm6ckrmvqgr2y3gak1y840";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ nx-libs xorg.xhost xorg.xinit ];
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 2a59cd1f061..8ad8edde8cc 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -43,6 +43,11 @@ let
sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa";
};
+ # Ported from
+ #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=e014dbe74e0484188164c61ff6843f8a04a8cb9d";
+ #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2";
+ qemuGlusterfs6Fix = ./qemu-gluster-6-compat.diff;
+
qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib
@@ -50,11 +55,11 @@ let
in
callPackage (import ./generic.nix (rec {
- version = "4.8.3";
+ version = "4.8.5";
src = fetchurl {
url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
- sha256 = "0vhkpyy5x7kc36hnav95fn194ngsmc3m2xcc78vccs00gdf6m8q9";
+ sha256 = "04xcf01jad1lpqnmjblzhnjzp0bss9fjd9awgcycjx679arbaxqz";
};
# Sources needed to build tools and firmwares.
@@ -67,6 +72,7 @@ callPackage (import ./generic.nix (rec {
};
patches = [
qemuMemfdBuildFix
+ qemuGlusterfs6Fix
];
buildInputs = qemuDeps;
meta.description = "Xen's fork of upstream Qemu";
@@ -155,13 +161,8 @@ callPackage (import ./generic.nix (rec {
++ optional (withInternalOVMF) "--enable-ovmf";
patches = with xsa; flatten [
- # XSA_231 to XSA-251 are fixed in 4.8.3 (verified with git log)
- XSA_252_49
# 253: 4.8 not affected
# 254: no patch supplied by xen project (Meltdown/Spectre)
- XSA_255_49_1
- XSA_255_49_2
- XSA_256_48
xenlockprofpatch
xenpmdpatch
];
@@ -176,10 +177,8 @@ callPackage (import ./generic.nix (rec {
-i tools/libxl/libxl_device.c
'';
- passthru = {
- qemu-system-i386 = if withInternalQemu
+ passthru.qemu-system-i386 = if withInternalQemu
then "lib/xen/bin/qemu-system-i386"
else throw "this xen has no qemu builtin";
- };
})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_05; } // args)
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 8dc2dffc6b6..8093d4752a0 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -121,8 +121,8 @@ stdenv.mkDerivation (rec {
patches = [ ./0000-fix-ipxe-src.patch
./0000-fix-install-python.patch
- ./acpica-utils-20180427.patch]
- ++ (config.patches or []);
+ ] ++ optional (versionOlder version "4.8.5") ./acpica-utils-20180427.patch
+ ++ (config.patches or []);
postPatch = ''
### Hacks
diff --git a/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff b/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff
new file mode 100644
index 00000000000..7ec6ad3aba6
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff
@@ -0,0 +1,95 @@
+diff --git a/block/gluster.c b/block/gluster.c
+index 01b479fbb9..29552e1186 100644
+--- a/block/gluster.c
++++ b/block/gluster.c
+@@ -15,6 +15,10 @@
+ #include "qemu/uri.h"
+ #include "qemu/error-report.h"
+
++#ifdef CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT
++# define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL)
++#endif
++
+ #define GLUSTER_OPT_FILENAME "filename"
+ #define GLUSTER_OPT_VOLUME "volume"
+ #define GLUSTER_OPT_PATH "path"
+@@ -613,7 +617,11 @@ static void qemu_gluster_complete_aio(void *opaque)
+ /*
+ * AIO callback routine called from GlusterFS thread.
+ */
+-static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg)
++static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret,
++#ifdef CONFIG_GLUSTERFS_IOCB_HAS_STAT
++ struct glfs_stat *pre, struct glfs_stat *post,
++#endif
++ void *arg)
+ {
+ GlusterAIOCB *acb = (GlusterAIOCB *)arg;
+
+diff --git a/configure b/configure
+index 4b808f9d17..89fb27fd0d 100755
+--- a/configure
++++ b/configure
+@@ -301,6 +301,8 @@ glusterfs=""
+ glusterfs_xlator_opt="no"
+ glusterfs_discard="no"
+ glusterfs_zerofill="no"
++glusterfs_ftruncate_has_stat="no"
++glusterfs_iocb_has_stat="no"
+ archipelago="no"
+ gtk=""
+ gtkabi=""
+@@ -3444,6 +3446,38 @@ if test "$glusterfs" != "no" ; then
+ if $pkg_config --atleast-version=6 glusterfs-api; then
+ glusterfs_zerofill="yes"
+ fi
++ cat > $TMPC << EOF
++#include
++
++int
++main(void)
++{
++ /* new glfs_ftruncate() passes two additional args */
++ return glfs_ftruncate(NULL, 0, NULL, NULL);
++}
++EOF
++ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then
++ glusterfs_ftruncate_has_stat="yes"
++ fi
++ cat > $TMPC << EOF
++#include
++
++/* new glfs_io_cbk() passes two additional glfs_stat structs */
++static void
++glusterfs_iocb(glfs_fd_t *fd, ssize_t ret, struct glfs_stat *prestat, struct glfs_stat *poststat, void *data)
++{}
++
++int
++main(void)
++{
++ glfs_io_cbk iocb = &glusterfs_iocb;
++ iocb(NULL, 0 , NULL, NULL, NULL);
++ return 0;
++}
++EOF
++ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then
++ glusterfs_iocb_has_stat="yes"
++ fi
+ else
+ if test "$glusterfs" = "yes" ; then
+ feature_not_found "GlusterFS backend support" \
+@@ -5415,6 +5449,14 @@ if test "$archipelago" = "yes" ; then
+ echo "ARCHIPELAGO_LIBS=$archipelago_libs" >> $config_host_mak
+ fi
+
++if test "$glusterfs_ftruncate_has_stat" = "yes" ; then
++ echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak
++fi
++
++if test "$glusterfs_iocb_has_stat" = "yes" ; then
++ echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak
++fi
++
+ if test "$libssh2" = "yes" ; then
+ echo "CONFIG_LIBSSH2=m" >> $config_host_mak
+ echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index 2a685c590fa..26b55b364f1 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }:
+{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }:
stdenv.mkDerivation rec {
- name = "xhyve-${version}";
- version = "1f1dbe305";
+ pname = "xhyve";
+ version = "20190124";
src = fetchurl {
- url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz";
- sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx";
+ url = "https://github.com/machyve/xhyve/archive/1dd9a5165848c7ed56dafc41932c553ea56a12af.tar.gz";
+ sha256 = "18zd74pd0azf43csbqb14srbyclfgx28dpgm8ygjmbcazbnipc1k";
};
- buildInputs = [ Hypervisor vmnet xpc libobjc ];
+ buildInputs = [ Hypervisor vmnet xpc libobjc zlib ];
# Don't use git to determine version
prePatch = ''
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 116180f5ec3..4b61fe3d7e6 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.2";
- name = "2bwm-${version}";
+ pname = "2bwm";
src = fetchFromGitHub {
owner = "venam";
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index 46a86da1d66..5fcbff26b15 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
- name = "afterstep-${version}";
+ pname = "afterstep";
version = "2.2.12";
sourceName = "AfterStep-${version}";
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 364771de80f..2551ea80550 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,14 +1,19 @@
-{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobject-introspection
, which, dbus, nettools, git, doxygen
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
, libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor
+, fontsConf
+, gtk3Support ? false, gtk3 ? null
}:
+# needed for beautiful.gtk to work
+assert gtk3Support -> gtk3 != null;
+
with luaPackages; stdenv.mkDerivation rec {
- name = "awesome-${version}";
+ pname = "awesome";
version = "4.3";
src = fetchFromGitHub {
@@ -27,32 +32,41 @@ with luaPackages; stdenv.mkDerivation rec {
xmlto docbook_xml_dtd_45
docbook_xsl findXMLCatalogs
asciidoctor
+ ldoc
];
+ outputs = [ "out" "doc" ];
+
+ FONTCONFIG_FILE = toString fontsConf;
+
propagatedUserEnvPkgs = [ hicolor-icon-theme ];
- buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection
+ buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection
git lgi libpthreadstubs libstartup_notification
libxdg_basedir lua nettools pango xcb-util-cursor
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
- xcbutilxrm ];
+ xcbutilxrm ]
+ ++ stdenv.lib.optional gtk3Support gtk3;
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
+ # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags
+ # below for how awesome finds the libraries it needs at runtime.
LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
- LUA_PATH = "?.lua;${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
+ LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
postInstall = ''
- wrapProgram $out/bin/awesome \
+ # Don't use wrapProgram or the wrapper will duplicate the --search
+ # arguments every restart
+ mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
+ makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LUA_PATH ';' "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \
- --prefix LUA_CPATH ';' "${lgi}/lib/lua/${lua.luaversion}/?.so"
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin"
diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
index 582f9cb61f8..40cebb572af 100644
--- a/pkgs/applications/window-managers/bevelbar/default.nix
+++ b/pkgs/applications/window-managers/bevelbar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
stdenv.mkDerivation rec {
- name = "bevelbar-${version}";
+ pname = "bevelbar";
version = "16.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 03652c749de..e863a382470 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "bspwm-${version}";
- version = "0.9.6";
+ pname = "bspwm";
+ version = "0.9.9";
src = fetchFromGitHub {
owner = "baskerville";
repo = "bspwm";
rev = version;
- sha256 = "1ywjhqxvggfdfd3cfki0vvlsli8lhqlziwfrj5vd57c6yisc2fyy";
+ sha256 = "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g";
};
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
index f55c55110a2..cf90b1fad63 100644
--- a/pkgs/applications/window-managers/btops/default.nix
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "btops-${version}";
+ pname = "btops";
version = "0.1.0";
goPackagePath = "github.com/cmschuetz/btops";
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
new file mode 100644
index 00000000000..be45d68dc5d
--- /dev/null
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja, pkgconfig, makeWrapper
+, wlroots, wayland, wayland-protocols, pixman, libxkbcommon
+, systemd, mesa, libX11
+, xwayland ? null
+}:
+
+stdenv.mkDerivation rec {
+ pname = "cage";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "Hjdskes";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1";
+ };
+
+ nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ];
+
+ buildInputs = [
+ wlroots wayland wayland-protocols pixman libxkbcommon
+ # TODO: Not specified but required:
+ systemd mesa libX11
+ ];
+
+ enableParallelBuilding = true;
+
+ mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ];
+
+ postFixup = stdenv.lib.optionalString (xwayland != null) ''
+ wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Wayland kiosk";
+ homepage = https://www.hjdskes.nl/projects/cage/;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 2c388c941e6..0941329bdbe 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -1,112 +1,64 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
+{ stdenv, lib, fetchFromGitHub, pkgconfig, uthash, asciidoc, docbook_xml_dtd_45
, docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja
, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
-, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
-, libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }:
+, dbus, libconfig, libdrm, libGL, pcre, libX11
+, libXinerama, libXext, xwininfo, libxdg_basedir }:
+stdenv.mkDerivation rec {
+ pname = "compton";
+ version = "7.2";
-let
- common = source: stdenv.mkDerivation (source // rec {
- name = "${source.pname}-${source.version}";
-
- nativeBuildInputs = (source.nativeBuildInputs or []) ++ [
- pkgconfig
- asciidoc
- docbook_xml_dtd_45
- docbook_xsl
- makeWrapper
- ];
-
- installFlags = [ "PREFIX=$(out)" ];
-
- postInstall = ''
- wrapProgram $out/bin/compton-trans \
- --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
- '';
-
- meta = with lib; {
- description = "A fork of XCompMgr, a sample compositing manager for X servers";
- longDescription = ''
- A fork of XCompMgr, which is a sample compositing manager for X
- servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
- extensions. It enables basic eye-candy effects. This fork adds
- additional features, such as additional effects, and a fork at a
- well-defined and proper place.
- '';
- license = licenses.mit;
- maintainers = with maintainers; [ ertes enzime twey ];
- platforms = platforms.linux;
- };
- });
-
- stableSource = rec {
- pname = "compton";
- version = "0.1_beta2.5";
-
- COMPTON_VERSION = version;
-
- buildInputs = [
- dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
- libXinerama libdrm pcre libxml2 libxslt libconfig libGL
- ];
-
- src = fetchFromGitHub {
- owner = "chjj";
- repo = "compton";
- rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
- sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
- };
-
- meta = {
- homepage = https://github.com/chjj/compton/;
- };
+ src = fetchFromGitHub {
+ owner = "yshui";
+ repo = "compton";
+ rev = "v${version}";
+ sha256 = "1vwa5f0nifc1913diqd6cp5k1dlfyc2ijxbcdj1s37ywpx6c63c3";
+ fetchSubmodules = true;
};
- gitSource = rec {
- pname = "compton-git";
- version = "5.1-rc2";
+ nativeBuildInputs = [
+ meson ninja
+ pkgconfig
+ uthash
+ asciidoc
+ docbook_xml_dtd_45
+ docbook_xsl
+ makeWrapper
+ ];
- COMPTON_VERSION = "v${version}";
+ buildInputs = [
+ dbus libX11 libXext
+ xorgproto
+ libXinerama libdrm pcre libxml2 libxslt libconfig libGL
+ libxcb xcbutilrenderutil xcbutilimage
+ pixman libev
+ libxdg_basedir
+ ];
- nativeBuildInputs = [ meson ninja ];
+ NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
- src = fetchFromGitHub {
- owner = "yshui";
- repo = "compton";
- rev = COMPTON_VERSION;
- sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08";
- };
+ mesonFlags = [
+ "-Dbuild_docs=true"
+ ];
- buildInputs = [
- dbus libX11 libXext
- xorgproto
- libXinerama libdrm pcre libxml2 libxslt libconfig libGL
- # Removed:
- # libXcomposite libXdamage libXrender libXrandr
+ installFlags = [ "PREFIX=$(out)" ];
- # New:
- libxcb xcbutilrenderutil xcbutilimage
- pixman libev
- libxdg_basedir
- ];
+ postInstall = ''
+ wrapProgram $out/bin/compton-trans \
+ --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
+ '';
- preBuild = ''
- git() { echo "v${version}"; }
- export -f git
+ meta = with lib; {
+ description = "A fork of XCompMgr, a sample compositing manager for X servers";
+ longDescription = ''
+ A fork of XCompMgr, which is a sample compositing manager for X
+ servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
+ extensions. It enables basic eye-candy effects. This fork adds
+ additional features, such as additional effects, and a fork at a
+ well-defined and proper place.
'';
-
- NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
-
- mesonFlags = [
- "-Dvsync_drm=true"
- "-Dnew_backends=true"
- "-Dbuild_docs=true"
- ];
-
- meta = {
- homepage = https://github.com/yshui/compton/;
- };
+ license = licenses.mit;
+ homepage = "https://github.com/yshui/compton";
+ maintainers = with maintainers; [ ertes enzime twey ];
+ platforms = platforms.linux;
};
-in {
- compton = common stableSource;
- compton-git = common gitSource;
}
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 2a8f1d67f6e..eac15ca7141 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
+{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg
, enableAlsaUtils ? true, alsaUtils, coreutils
, enableNetwork ? true, dnsutils, iproute, wirelesstools }:
@@ -9,19 +9,19 @@ in
rustPlatform.buildRustPackage rec {
name = "dwm-status-${version}";
- version = "1.6.0";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "Gerschtli";
repo = "dwm-status";
rev = version;
- sha256 = "02gvlxv6ylx4mdkf59crm2zyahiz1zd4cr5zz29dnhx7r7738i9a";
+ sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78";
};
nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
+ buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
- cargoSha256 = "1khknf1bjs80cc2n4jnpilf8cc15crykhhyvvff6q4ay40353gr6";
+ cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index 0c13691a36a..cf45dfa8640 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -3,10 +3,10 @@
}:
stdenv.mkDerivation rec {
- name = "fbpanel-${version}";
+ pname = "fbpanel";
version = "6.1";
src = fetchurl {
- url = "mirror://sourceforge/fbpanel/${name}.tbz2";
+ url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2";
sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
};
buildInputs =
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index c92b70153a7..404044fa3fa 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -7,11 +7,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "fluxbox-${version}";
+ pname = "fluxbox";
version = "1.3.7";
src = fetchurl {
- url = "mirror://sourceforge/fluxbox/${name}.tar.xz";
+ url = "mirror://sourceforge/fluxbox/${pname}-${version}.tar.xz";
sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
};
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 20a95f36cee..27657c10a7e 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -10,10 +10,9 @@ assert gestures -> libstroke != null;
stdenv.mkDerivation rec {
pname = "fvwm";
version = "2.6.8";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv";
};
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index d49c893ca14..ca64786475f 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }:
stdenv.mkDerivation rec {
- name = "herbstluftwm-0.7.1";
+ name = "herbstluftwm-0.7.2";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/${name}.tar.gz";
- sha256 = "0d47lbjxxqd8d96hby47bdhyn9mlih7h28712j1vckiz05ig63nw";
+ sha256 = "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz";
};
patchPhase = ''
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index 83fe3ef163a..c62edd6d71a 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -12,7 +12,7 @@ let
in
stdenv.mkDerivation rec {
- name = "i3blocks-gaps-${version}";
+ pname = "i3blocks-gaps";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 88bf7762dd8..2246d77173a 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -1,54 +1,19 @@
-{ fetchurl, stdenv, perl, makeWrapper
-, iproute, acpi, sysstat, xset, playerctl
-, cmus, openvpn, lm_sensors, alsaUtils
-, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
- "keyindicator" "load_average" "mediaplayer" "memory"
- "openvpn" "temperature" "volume" "wifi" ]
-}:
+{ fetchFromGitHub, stdenv, autoreconfHook }:
with stdenv.lib;
-let
- perlscripts = [ "battery" "cpu_usage" "keyindicator"
- "mediaplayer" "openvpn" "temperature" ];
- contains_any = l1: l2: 0 < length( intersectLists l1 l2 );
-
-in
stdenv.mkDerivation rec {
- name = "i3blocks-${version}";
- version = "1.4";
+ pname = "i3blocks";
+ version = "unstable-2019-02-07";
- src = fetchurl {
- url = "https://github.com/vivien/i3blocks/releases/download/${version}/${name}.tar.gz";
- sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536";
+ src = fetchFromGitHub {
+ owner = "vivien";
+ repo = "i3blocks";
+ rev = "ec050e79ad8489a6f8deb37d4c20ab10729c25c3";
+ sha256 = "1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b";
};
- buildFlags = "SYSCONFDIR=/etc all";
- installFlags = "PREFIX=\${out} VERSION=${version}";
-
- buildInputs = optional (contains_any scripts perlscripts) perl;
- nativeBuildInputs = [ makeWrapper ];
-
- postFixup = ''
- wrapProgram $out/libexec/i3blocks/bandwidth \
- --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
- wrapProgram $out/libexec/i3blocks/battery \
- --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
- wrapProgram $out/libexec/i3blocks/cpu_usage \
- --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
- wrapProgram $out/libexec/i3blocks/iface \
- --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
- wrapProgram $out/libexec/i3blocks/keyindicator \
- --prefix PATH : ${makeBinPath (optional (elem "keyindicator" scripts) xset)}
- wrapProgram $out/libexec/i3blocks/mediaplayer \
- --prefix PATH : ${makeBinPath (optionals (elem "mediaplayer" scripts) [playerctl cmus])}
- wrapProgram $out/libexec/i3blocks/openvpn \
- --prefix PATH : ${makeBinPath (optional (elem "openvpn" scripts) openvpn)}
- wrapProgram $out/libexec/i3blocks/temperature \
- --prefix PATH : ${makeBinPath (optional (elem "temperature" scripts) lm_sensors)}
- wrapProgram $out/libexec/i3blocks/volume \
- --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
- '';
+ nativeBuildInputs = [ autoreconfHook ];
meta = {
description = "A flexible scheduler for your i3bar blocks";
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 755d1cbf2df..31a96ba1788 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -4,12 +4,12 @@
, xorgserver, xvfb_run }:
stdenv.mkDerivation rec {
- name = "i3-${version}";
- version = "4.16.1";
+ pname = "i3";
+ version = "4.17";
src = fetchurl {
- url = "https://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "0xl56y196vxv001gvx35xwfr25zah8m3xwizp9ycdgdc0rfc4rdb";
+ url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
+ sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf";
};
nativeBuildInputs = [ which pkgconfig makeWrapper ];
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A tiling window manager";
homepage = "https://i3wm.org";
- maintainers = with maintainers; [ garbas modulistic fpletz ];
+ maintainers = with maintainers; [ modulistic fpletz globin ];
license = licenses.bsd3;
platforms = platforms.all;
diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix
index 7cdc8854951..9ce5486557a 100644
--- a/pkgs/applications/window-managers/i3/easyfocus.nix
+++ b/pkgs/applications/window-managers/i3/easyfocus.nix
@@ -2,15 +2,15 @@
, xorg , i3ipc-glib , glib
}:
-stdenv.mkDerivation rec {
- name = "i3easyfocus-${version}";
- version = "20180622";
+stdenv.mkDerivation {
+ pname = "i3easyfocus";
+ version = "20190411";
src = fetchFromGitHub {
owner = "cornerman";
repo = "i3-easyfocus";
- rev = "3631d5af612d58c3d027f59c86b185590bd78ae1";
- sha256 = "1wgknmmm7iz0wxsdh29gmx4arizva9101pzhnmac30bmixf3nzhr";
+ rev = "fffb468f7274f9d7c9b92867c8cb9314ec6cf81a";
+ sha256 = "1db23vzzmp0hnfss1fkd80za6d2pajx7hdwikw50pk95jq0w8wfm";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index f2dc023c81d..4d4ab6d96cc 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -3,12 +3,12 @@
i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}";
- version = "4.16.1";
+ version = "4.17";
releaseDate = "2019-01-27";
src = fetchurl {
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
- sha256 = "1jvyd8p8dfsidfy2yy7adydynzvaf72lx67x71r13hrk8w77hp0k";
+ sha256 = "1vd2xv91xrcr07s2dywq9rvidqqmbs41hlvhcvr1927gz200vgjg";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 54f23831706..33aac1cf4b6 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
- name = "i3ipc-glib-${version}";
+ pname = "i3ipc-glib";
version = "0.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix
new file mode 100644
index 00000000000..afa14b48451
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/layout-manager.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }:
+
+let
+ path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ];
+in
+
+stdenv.mkDerivation rec {
+ pname = "i3-layout-manager";
+ version = "unstable-2019-06-19";
+
+ src = fetchFromGitHub {
+ owner = "klaxalk";
+ repo = pname;
+ rev = "80ade872bfd70d9c6039024097ceb8c852a2816a";
+ sha256 = "02xhyd737qwni628mjzr9i5v2kga5cq4k8m77bxm1p6kkj84nlmg";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -D layout_manager.sh $out/bin/layout_manager
+ wrapProgram $out/bin/layout_manager \
+ --prefix PATH : "${path}"
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/klaxalk/i3-layout-manager;
+ description = "Saving, loading and managing layouts for i3wm.";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 8c775833c28..2fb6fb44833 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "2.12.c";
- name = "i3lock-color-${version}";
+ pname = "i3lock-color";
src = fetchFromGitHub {
owner = "PandorasFox";
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
- keyboard-layout
'';
homepage = https://github.com/PandorasFox/i3lock-color;
- maintainers = with maintainers; [ garbas malyn ];
+ maintainers = with maintainers; [ malyn ];
license = licenses.bsd3;
# Needs the SSE2 instruction set. See upstream issue
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index a0e46c108b7..f6d797c98e1 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text.";
homepage = https://github.com/meskarune/i3lock-fancy;
- maintainers = with maintainers; [ garbas ];
+ maintainers = with maintainers; [ ];
license = licenses.mit;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index d4bb3cdc1c2..3e976f8919f 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -1,18 +1,18 @@
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
- pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
+ xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
stdenv.mkDerivation rec {
- name = "i3lock-${version}";
- version = "2.10";
+ pname = "i3lock";
+ version = "2.12";
src = fetchurl {
- url = "https://i3wm.org/i3lock/${name}.tar.bz2";
- sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9";
+ url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2";
+ sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11
- libev cairo libxkbcommon libxkbfile ];
+ buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm
+ pam libX11 libev cairo libxkbcommon libxkbfile ];
makeFlags = "all";
installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
for every keystroke. After entering your password, the screen is unlocked again.
'';
homepage = https://i3wm.org/i3lock/;
- maintainers = with maintainers; [ garbas malyn domenkozar ];
+ maintainers = with maintainers; [ malyn domenkozar ];
license = licenses.bsd3;
platforms = platforms.all;
};
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index 1fed92764c1..20ea0dd03cc 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -3,19 +3,18 @@
python3Packages.buildPythonApplication rec {
# i3pystatus moved to rolling release:
# https://github.com/enkore/i3pystatus/issues/584
- version = "unstable-2018-04-11";
+ version = "unstable-2019-06-10";
pname = "i3pystatus";
- disabled = !python3Packages.isPy3k;
src = fetchFromGitHub
{
owner = "enkore";
repo = "i3pystatus";
- rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc";
- sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b";
+ rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
+ sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
};
- propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
+ propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
[ libpulseaudio ] ++ extraLibs;
libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
@@ -44,4 +43,3 @@ python3Packages.buildPythonApplication rec {
maintainers = [ maintainers.igsha ];
};
}
-
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 178d111d79a..60edf05892d 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -1,17 +1,17 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }:
rustPlatform.buildRustPackage rec {
- name = "i3status-rust-${version}";
- version = "0.9.0.2019-02-15";
+ pname = "i3status-rust";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "greshake";
- repo = "i3status-rust";
- rev = "2dc958995834b529a245c22c510b57d5c928c747";
- sha256 = "091a2pqgkiwnya2xv5rw5sj730hf6lvkp2kk5midsa3wz2dfbc2j";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0i1k884ha08w7r5q5z012q2w7hs333b3c18hkbrhamknpvy6c2i0";
};
- cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i";
+ cargoSha256 = "1w43k3ld9ra7blbn593mpi8qg5pgcglwqwddkrb55yxnpnkaxvzy";
nativeBuildInputs = [ pkgconfig ];
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
description = "Very resource-friendly and feature-rich replacement for i3status";
homepage = https://github.com/greshake/i3status-rust;
license = licenses.gpl3;
- maintainers = [ maintainers.backuitist ];
+ maintainers = with maintainers; [ backuitist globin ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 65180846c64..17b147da1b2 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A tiling window manager";
homepage = https://i3wm.org;
- maintainers = [ stdenv.lib.maintainers.garbas ];
+ maintainers = [ ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
index 39bd62cd5aa..5b1cdbe05f5 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "i3-wk-switch";
- version = "2017-08-21";
+ version = "2019-05-10";
- # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb
src = fetchFromGitHub {
owner = "tmfink";
repo = pname;
- rev = "484f840";
- sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb";
+ rev = "05a2d5d35e9841d2a26630f1866fc0a0e8e708eb";
+ sha256 = "0ln192abdqrrs7rdazp9acbji2y6pf68z2d1by4nf2q529dh24dc";
};
- propagatedBuildInputs = with python2Packages; [ i3-py ];
+ propagatedBuildInputs = with python3Packages; [ i3ipc ];
dontBuild = true;
doCheck = false;
@@ -23,7 +22,7 @@ python2Packages.buildPythonApplication rec {
'';
meta = with stdenv.lib; {
- description = "XMonad-like workspace switching for i3";
+ description = "XMonad-like workspace switching for i3 and sway";
maintainers = with maintainers; [ synthetica ];
platforms = platforms.linux;
license = licenses.mit;
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index 546589623cb..b0012c587f6 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -1,12 +1,18 @@
{ stdenv, fetchFromGitHub, rustPlatform,
xorg, python3, pkgconfig, cairo, libxkbcommon }:
-let
+
+rustPlatform.buildRustPackage rec {
pname = "wmfocus";
- version = "1.0.2";
-in
-rustPlatform.buildRustPackage {
- inherit pname version;
- name = "${pname}-${version}";
+ version = "1.1.2";
+
+ src = fetchFromGitHub {
+ owner = "svenstaro";
+ repo = pname;
+ rev = version;
+ sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs";
+ };
+
+ cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf";
nativeBuildInputs = [ python3 pkgconfig ];
buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
@@ -14,22 +20,10 @@ rustPlatform.buildRustPackage {
# For now, this is the only available featureset. This is also why the file is
# in the i3 folder, even though it might be useful for more than just i3
# users.
- cargoBuildFlags = ["--features i3"];
-
- src = fetchFromGitHub {
- owner = "svenstaro";
- repo = pname;
- rev = version;
- sha256 = "14yxg2jiqx7gng677sbmvv0a0msb9wpvp3qh8h3nkq0vi17ds668";
- };
-
- cargoSha256 = "0lwzw8gf970ybblaxxkwn3pxrncxp0hhvykffbzirs7fic4fnvsg";
+ cargoBuildFlags = [ "--features i3" ];
meta = with stdenv.lib; {
- description = ''
- Tool that allows you to rapidly choose a specific window directly
- without having to use the mouse or directional keyboard navigation.
- '';
+ description = "Visually focus windows by label";
maintainers = with maintainers; [ synthetica ];
platforms = platforms.linux;
license = licenses.mit;
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 8406736541c..71a4ec3549a 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, cmake, gettext
, libjpeg, libtiff, libungif, libpng, imlib, expat
-, freetype, fontconfig, pkgconfig, gdk_pixbuf
+, freetype, fontconfig, pkgconfig, gdk-pixbuf
, mkfontdir, libX11, libXft, libXext, libXinerama
, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
, libpthreadstubs, pcre }:
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "icewm-${version}";
+ pname = "icewm";
version = "1.4.2";
buildInputs =
[ cmake gettext libjpeg libtiff libungif libpng imlib expat
- freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
+ freetype fontconfig pkgconfig gdk-pixbuf mkfontdir libX11
libXft libXext libXinerama libXrandr libICE libSM libXpm
libXdmcp libxcb libpthreadstubs pcre ];
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 6a7c1436b09..3668b344be5 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -4,7 +4,7 @@
librsvg, freetype, fontconfig }:
stdenv.mkDerivation rec {
- name = "jwm-${version}";
+ pname = "jwm";
version = "1685";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index 3b764e7095b..7df2847669f 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
stdenv.mkDerivation rec {
- name = "jwm-settings-manager-${version}";
+ pname = "jwm-settings-manager";
version = "2018-10-19";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/leftwm/cargo-lock.patch b/pkgs/applications/window-managers/leftwm/cargo-lock.patch
new file mode 100644
index 00000000000..92588eb2fdb
--- /dev/null
+++ b/pkgs/applications/window-managers/leftwm/cargo-lock.patch
@@ -0,0 +1,1483 @@
+--- /dev/null 2019-05-17 17:44:26.875442706 +0200
++++ b/Cargo.lock 2019-05-17 18:30:29.490608288 +0200
+@@ -0,0 +1,1480 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "aho-corasick"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "anymap"
++version = "0.12.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "argon2rs"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "arrayvec"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "atty"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "backtrace"
++version = "0.3.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.28"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "blake2-rfc"
++version = "0.2.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "block-buffer"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "block-padding"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "byte-tools"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "byteorder"
++version = "1.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "bytes"
++version = "0.4.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "chrono"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cloudabi"
++version = "0.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "constant_time_eq"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "crossbeam-epoch"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "crossbeam-queue"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "deunicode"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "digest"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "dirs"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "either"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "env_logger"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "failure"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "failure_derive"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fake-simd"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fnv"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fuchsia-zircon"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-zircon-sys"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "futures"
++version = "0.1.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "generic-array"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "humantime"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "idna"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "iovec"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itertools"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "leftwm"
++version = "0.1.9"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "libc"
++version = "0.2.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "liquid"
++version = "0.18.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "liquid-compiler"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "liquid-error"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "liquid-interpreter"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "liquid-value"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "maplit"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memchr"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memoffset"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "mio"
++version = "0.6.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "mio-uds"
++version = "0.6.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "miow"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "net2"
++version = "0.2.33"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "nodrop"
++version = "0.1.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "num-integer"
++version = "0.1.39"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "num_cpus"
++version = "1.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "numtoa"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "opaque-debug"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "owning_ref"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pest"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pest_derive"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pest_generator"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pest_meta"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pkg-config"
++version = "0.3.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "proc-macro2"
++version = "0.4.30"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quick-error"
++version = "1.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "quote"
++version = "0.6.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rand_hc"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_isaac"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_jitter"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_os"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_pcg"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_xorshift"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.54"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "redox_termios"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_users"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex"
++version = "1.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ryu"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scoped_threadpool"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scopeguard"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.39"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "sha-1"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "slab"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "smallvec"
++version = "0.6.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "stable_deref_trait"
++version = "1.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "syn"
++version = "0.15.34"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "synstructure"
++version = "0.10.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "termcolor"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "termion"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "time"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio"
++version = "0.1.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-codec"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-current-thread"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-executor"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-fs"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-io"
++version = "0.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-reactor"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-sync"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-tcp"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-threadpool"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-timer"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-trace-core"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-udp"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-uds"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "typenum"
++version = "1.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ucd-trie"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ucd-util"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-segmentation"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-width"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "url"
++version = "1.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "utf8-ranges"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "uuid"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wincolor"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ws2_32-sys"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "x11-dl"
++version = "2.18.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "xdg"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
++"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
++"checksum backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "f92d5d536fa03dc3d93711d97bac1fae2eb59aba467ca4c6600c0119da614f51"
++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
++"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
++"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09"
++"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
++"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
++"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
++"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
++"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
++"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
++"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
++"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
++"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c"
++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
++"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
++"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
++"checksum futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "a2037ec1c6c1c4f79557762eab1f7eae1f64f6cb418ace90fae88f0942b60139"
++"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592"
++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
++"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
++"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
++"checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880"
++"checksum liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e1d91078b50038dba2539ec474656192a0c83b4802e999e5ee334bf198a8120c"
++"checksum liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6b581cfb0437adeb4628cceafed44441d0a4a5c858ab169ec932ba4b4fda815"
++"checksum liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76119f2171687b188d7b953627ae924ca0556499b0bd20099ee5f2dea8e8969b"
++"checksum liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc07e0e8d8b87a34579e42644ac63e290989d4e0539b79993979163bb43ea7b"
++"checksum liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21caa8903eae7cd9f5918d85d99a06e2a21528fcf6e3da33a7b319d03b81d87c"
++"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
++"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
++"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
++"checksum mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "049ba5ca2b63e837adeee724aa9e36b408ed593529dcc802aa96ca14bd329bdf"
++"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
++"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
++"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
++"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409"
++"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
++"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
++"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
++"checksum pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c"
++"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
++"checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646"
++"checksum pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d"
++"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252"
++"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
++"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58"
++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288"
++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd"
++"checksum serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "101b495b109a3e3ca8c4cbe44cf62391527cdfb6ba15821c5ce80bcd5ea23f9f"
++"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
++"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
++"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
++"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
++"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
++"checksum tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "94a1f9396aec29d31bb16c24d155cfa144d1af91c40740125db3131bdaf76da8"
++"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
++"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
++"checksum tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e"
++"checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af"
++"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
++"checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
++"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a"
++"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
++"checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2"
++"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
++"checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3"
++"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
++"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
++"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
++"checksum ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77"
++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
++"checksum x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)" = "940586acb859ea05c53971ac231685799a7ec1dee66ac0bccc0e6ad96e06b4e3"
++"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
new file mode 100644
index 00000000000..574e42cc848
--- /dev/null
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
+
+let
+ rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
+in
+
+rustPlatform.buildRustPackage rec {
+ pname = "leftwm";
+ version = "0.1.9";
+
+ src = fetchFromGitHub {
+ owner = "leftwm";
+ repo = "leftwm";
+ rev = "${version}";
+ sha256 = "0ji7m2npkdg27gm33b19rxr50km0gm1h9czi1f425vxq65mlkl4y";
+ };
+
+ buildInputs = [ makeWrapper libX11 libXinerama ];
+
+ postInstall = ''
+ wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
+ wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
+ wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
+ '';
+
+ cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6";
+
+ # https://github.com/leftwm/leftwm/pull/37
+ cargoPatches = [ ./cargo-lock.patch ];
+
+ meta = {
+ description = "Leftwm - A tiling window manager for the adventurer";
+ homepage = https://github.com/leftwm/leftwm;
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ mschneider ];
+ };
+}
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 635265b04ab..3c537d6c931 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, libmatchbox, pkgconfig}:
+{ stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }:
stdenv.mkDerivation rec {
- name = "matchbox-${version}";
+ pname = "matchbox";
version = "1.2";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libmatchbox ];
+ NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib";
src = fetchurl {
url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "X window manager for non-desktop embedded systems";
- homepage = http://matchbox-project.org/;
+ homepage = "https://www.yoctoproject.org/software-item/matchbox/";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix
new file mode 100644
index 00000000000..026ee2e1287
--- /dev/null
+++ b/pkgs/applications/window-managers/neocomp/default.nix
@@ -0,0 +1,85 @@
+{ stdenv
+, fetchFromGitHub
+, asciidoc
+, docbook_xml_dtd_45
+, docbook_xsl
+, freetype
+, judy
+, libGL
+, libconfig
+, libdrm
+, libxml2
+, libxslt
+, libXcomposite
+, libXdamage
+, libXext
+, libXinerama
+, libXrandr
+, libXrender
+, pcre
+, pkgconfig
+}:
+let
+ rev = "v0.6-17-g271e784";
+in
+stdenv.mkDerivation rec {
+ pname = "neocomp-unstable";
+ version = "2019-03-12";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "DelusionalLogic";
+ repo = "NeoComp";
+ sha256 = "1mp338vz1jm5pwf7pi5azx4hzykmvpkwzx1kw6a9anj272f32zpg";
+ };
+
+ buildInputs = [
+ asciidoc
+ docbook_xml_dtd_45
+ docbook_xsl
+ freetype
+ judy
+ libGL
+ libconfig
+ libdrm
+ libxml2
+ libxslt
+ libXcomposite
+ libXdamage
+ libXext
+ libXinerama
+ libXrandr
+ libXrender
+ pcre
+ pkgconfig
+ ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ "CFGDIR=${placeholder "out"}/etc/xdg/neocomp"
+ "ASTDIR=${placeholder "out"}/share/neocomp/assets"
+ "COMPTON_VERSION=git-${rev}-${version}"
+ ];
+
+ postPatch = ''
+ substituteInPlace src/compton.c --replace \
+ "assets_add_path(\"./assets/\");" \
+ "assets_add_path(\"$out/share/neocomp/assets/\");"
+ substituteInPlace src/assets/assets.c --replace \
+ "#define MAX_PATH_LENGTH 64" \
+ "#define MAX_PATH_LENGTH 128"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/DelusionalLogic/NeoComp;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ twey ];
+ platforms = platforms.linux;
+ description = "A fork of Compton, a compositor for X11";
+ longDescription = ''
+ NeoComp is a (hopefully) fast and (hopefully) simple compositor
+ for X11, focused on delivering frames from the window to the
+ framebuffer as quickly as possible.
+ '';
+ };
+}
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index 8c6926dd2c6..c8d526b6d28 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -3,7 +3,7 @@
, imlib2, pango, libstartup_notification, makeWrapper }:
stdenv.mkDerivation rec {
- name = "openbox-${version}";
+ pname = "openbox";
version = "3.6.1";
nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "http://openbox.org/dist/openbox/${name}.tar.gz";
+ url = "http://openbox.org/dist/openbox/${pname}-${version}.tar.gz";
sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb";
};
diff --git a/pkgs/applications/window-managers/orbment/bemenu.nix b/pkgs/applications/window-managers/orbment/bemenu.nix
deleted file mode 100644
index 065b81948c2..00000000000
--- a/pkgs/applications/window-managers/orbment/bemenu.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
-, pango, wayland, libxkbcommon }:
-
-stdenv.mkDerivation rec {
- name = "bemenu-2017-02-14";
-
- src = fetchFromGitHub {
- owner = "Cloudef";
- repo = "bemenu";
- rev = "d6261274cf0b3aa51ce8ea7418a79495b20ad558";
- sha256 = "08bc623y5yjbz7q83lhl6rb0xs6ji17z79c260bx0fgin8sfj5x8";
- };
-
- nativeBuildInputs = [ cmake pkgconfig ];
-
- buildInputs = [ pango wayland libxkbcommon ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "A dynamic menu library and client program inspired by dmenu";
- homepage = src.meta.homepage;
- license = with licenses; [ gpl3 lgpl3 ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
deleted file mode 100644
index 6bf6f44d423..00000000000
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage
-, wlc, dbus, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
-, libdrm, libX11
-, westonLite
-}:
-
-let
- bemenu = callPackage ./bemenu.nix {};
-in stdenv.mkDerivation rec {
- name = "orbment-${version}";
- version = "git-2016-08-13";
-
- src = fetchgit {
- url = "https://github.com/Cloudef/orbment";
- rev = "01dcfff9719e20261a6d8c761c0cc2f8fa0d0de5";
- sha256 = "04mv9nh847vijr01zrs47fzmnwfhdx09vi3ddv843mx10yx7lqdb";
- fetchSubmodules = true;
- };
-
- nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
-
- buildInputs = [
- wlc dbus wayland libxkbcommon pixman libinput udev zlib libpng libX11
- libdrm
- ];
-
- postFixup = ''
- wrapProgram $out/bin/orbment \
- --prefix PATH : "${stdenv.lib.makeBinPath [ bemenu westonLite ]}"
- '';
-
- enableParallelBuilding = true;
-
- meta = {
- description = "Modular Wayland compositor";
- homepage = src.url;
- license = lib.licenses.mit;
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index 00ff6252010..d449fc91c0d 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -7,7 +7,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "oroborus-${version}";
+ pname = "oroborus";
version = "2.0.20";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
index b2677218e85..38255dce722 100644
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ b/pkgs/applications/window-managers/pekwm/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
- name = "pekwm-${version}";
+ pname = "pekwm";
version = "0.1.17";
src = fetchurl {
- url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2";
+ url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2";
sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa";
};
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 0a1a095e0ce..11a69020ee6 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "ratpoison-${version}";
+ pname = "ratpoison";
version = "1.4.9";
src = fetchurl {
- url = "mirror://savannah/ratpoison/${name}.tar.xz";
+ url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz";
sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
};
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index 887a58b748d..f9bcb28e455 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, pkgconfig, which, autoreconfHook
-, rep-gtk, pango, gdk_pixbuf
+, rep-gtk, pango, gdk-pixbuf
, imlib, gettext, texinfo
, libXinerama, libXrandr, libXtst, libICE, libSM
, makeWrapper
@@ -10,7 +10,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
- name = "sawfish-${version}";
+ pname = "sawfish";
version = "1.12.90";
sourceName = "sawfish_${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ which
- rep-gtk pango gdk_pixbuf imlib gettext texinfo
+ rep-gtk pango gdk-pixbuf imlib gettext texinfo
libXinerama libXrandr libXtst libICE libSM
makeWrapper ];
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 81901be0e60..7233ff2410b 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- name = "spectrwm-${version}";
+ pname = "spectrwm";
version = "2.7.2";
src = fetchurl {
diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix
index 64fa600765b..f0f724d6cf0 100644
--- a/pkgs/applications/window-managers/stalonetray/default.nix
+++ b/pkgs/applications/window-managers/stalonetray/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, xorgproto }:
stdenv.mkDerivation rec {
- name = "stalonetray-${version}";
+ pname = "stalonetray";
version = "0.8.3";
src = fetchurl {
- url = "mirror://sourceforge/stalonetray/${name}.tar.bz2";
+ url = "mirror://sourceforge/stalonetray/${pname}-${version}.tar.bz2";
sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n";
};
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix
index bccb49ff4d5..a6f2961ed3f 100644
--- a/pkgs/applications/window-managers/stumpish/default.nix
+++ b/pkgs/applications/window-managers/stumpish/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, substituteAll, fetchurl, fetchFromGitHub, bash, gnused, ncurses, xorg, rlwrap }:
+{ stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }:
stdenv.mkDerivation rec {
pname = "stumpish";
version = "0.0.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "stumpwm";
diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix
deleted file mode 100644
index 155b26e0987..00000000000
--- a/pkgs/applications/window-managers/sway/beta.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchFromGitHub
-, meson, ninja
-, pkgconfig, scdoc
-, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
-, pango, cairo, libinput, libcap, pam, gdk_pixbuf
-, wlroots, wayland-protocols
-, buildDocs ? true
-}:
-
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- pname = "sway";
- version = "1.0-rc3";
-
- src = fetchFromGitHub {
- owner = "swaywm";
- repo = "sway";
- rev = version;
- sha256 = "1ixwc1bg725x68qr84s8a5i4rlzc4svc52jgdw1yl5bgr6l1k5zc";
- };
-
- postPatch = ''
- sed -iE "s/version: '1.0',/version: '${version}',/" meson.build
- '';
-
- nativeBuildInputs = [
- pkgconfig meson ninja
- ] ++ stdenv.lib.optional buildDocs scdoc;
-
- buildInputs = [
- wayland libxkbcommon pcre json_c dbus libevdev
- pango cairo libinput libcap pam gdk_pixbuf
- wlroots wayland-protocols
- ];
-
- enableParallelBuilding = true;
-
- mesonFlags = [
- "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
- "-Dtray=enabled"
- ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled";
-
- meta = with stdenv.lib; {
- description = "i3-compatible window manager for Wayland";
- homepage = https://swaywm.org;
- license = licenses.mit;
- platforms = platforms.linux;
- maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date.
- };
-}
diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix
new file mode 100644
index 00000000000..86301492c46
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/bg.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja, pkgconfig, scdoc
+, wayland, wayland-protocols, cairo, gdk-pixbuf
+}:
+
+stdenv.mkDerivation rec {
+ pname = "swaybg";
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "swaywm";
+ repo = "swaybg";
+ rev = version;
+ sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc";
+ };
+
+ nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+ buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];
+
+ mesonFlags = [
+ "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Wallpaper tool for Wayland compositors";
+ longDescription = ''
+ A wallpaper utility for Wayland compositors, that is compatible with any
+ Wayland compositor which implements the following Wayland protocols:
+ wlr-layer-shell, xdg-output, and xdg-shell.
+ '';
+ inherit (src.meta) homepage;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index fb30f0073bf..215a576a578 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,40 +1,51 @@
-{ stdenv, fetchFromGitHub
-, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
-, wayland, wlc, libxkbcommon, pcre, json_c, dbus
-, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs
-, libXdmcp
-, buildDocs ? true
+{ stdenv, fetchFromGitHub, makeWrapper
+, meson, ninja
+, pkgconfig, scdoc
+, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
+, pango, cairo, libinput, libcap, pam, gdk-pixbuf
+, wlroots, wayland-protocols, swaybg
}:
stdenv.mkDerivation rec {
- name = "sway-${version}";
- version = "0.15.2";
+ pname = "sway";
+ version = "1.2";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
- sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n";
+ sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd";
};
- nativeBuildInputs = [
- cmake pkgconfig
- ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ];
+ patches = [
+ ./sway-config-no-nix-store-references.patch
+ ./load-configuration-from-etc.patch
+ ];
+
+ nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ];
+
buildInputs = [
- wayland wlc libxkbcommon pcre json_c dbus
- pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs
- libXdmcp
+ wayland libxkbcommon pcre json_c dbus libevdev
+ pango cairo libinput libcap pam gdk-pixbuf
+ wlroots wayland-protocols
];
enableParallelBuilding = true;
- cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib";
+ mesonFlags = [
+ "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
+ "-Dtray=enabled" "-Dman-pages=enabled"
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
+ '';
meta = with stdenv.lib; {
- description = "i3-compatible window manager for Wayland";
+ description = "i3-compatible tiling Wayland compositor";
homepage = https://swaywm.org;
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
+ maintainers = with maintainers; [ primeos synthetica ];
};
}
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix
index 86af7fc629a..bc917e76f97 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/pkgs/applications/window-managers/sway/idle.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- name = "swayidle-${version}";
- version = "1.2";
+ pname = "swayidle";
+ version = "1.5";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swayidle";
rev = version;
- sha256 = "0b65flajwn2i6k2kdxxgw25w7ikzzmm595f4j5x1wac1rb0yah9w";
+ sha256 = "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n";
};
nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
diff --git a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch b/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch
new file mode 100644
index 00000000000..26a3d40d66c
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch
@@ -0,0 +1,42 @@
+From 26f9c65ef037892977a824f0d7d7111066856b53 Mon Sep 17 00:00:00 2001
+From: Michael Weiss
+Date: Sat, 27 Apr 2019 14:26:16 +0200
+Subject: [PATCH] Load configs from /etc but fallback to /nix/store
+
+This change will load all configuration files from /etc, to make it easy
+to override them, but fallback to /nix/store/.../etc/sway/config to make
+Sway work out-of-the-box with the default configuration on non NixOS
+systems.
+---
+ meson.build | 3 ++-
+ sway/config.c | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 02b5d606..c03a9c0f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -129,7 +129,8 @@ if scdoc.found()
+ endforeach
+ endif
+
+-add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
++add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
++add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
+
+ version = '"@0@"'.format(meson.project_version())
+ if git.found()
+diff --git a/sway/config.c b/sway/config.c
+index 4cd21bbc..dd855753 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -317,6 +317,7 @@ static char *get_config_path(void) {
+ "$XDG_CONFIG_HOME/i3/config",
+ SYSCONFDIR "/sway/config",
+ SYSCONFDIR "/i3/config",
++ NIX_SYSCONFDIR "/sway/config",
+ };
+
+ char *config_home = getenv("XDG_CONFIG_HOME");
+--
+2.19.2
diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix
index a275e411c6e..fe445a6b7ad 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/pkgs/applications/window-managers/sway/lock.nix
@@ -1,23 +1,27 @@
{ stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, scdoc
-, wayland, wayland-protocols, libxkbcommon, cairo, gdk_pixbuf, pam
+, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
}:
stdenv.mkDerivation rec {
- name = "swaylock-${version}";
- version = "1.3";
+ pname = "swaylock";
+ version = "1.4";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swaylock";
rev = version;
- sha256 = "093nv1y9wyg48rfxhd36qdljjry57v1vkzrlc38mkf6zvsq8j7wb";
+ sha256 = "1ii9ql1mxkk2z69dv6bg1x22nl3a46iww764wqjiv78x08xpk982";
};
- nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
- buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk_pixbuf pam ];
+ postPatch = ''
+ sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
+ '';
- mesonFlags = [ "-Dswaylock-version=${version}"
+ nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+ buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
+
+ mesonFlags = [
"-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
];
diff --git a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch
new file mode 100644
index 00000000000..009c1295943
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch
@@ -0,0 +1,21 @@
+diff --git a/config.in b/config.in
+--- a/config.in
++++ b/config.in
+@@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec
+
+ ### Output configuration
+ #
+-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
+-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
++# Default wallpaper
++#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill
+ #
+ # Example configuration:
+ #
+@@ -213,5 +213,3 @@ bar {
+ inactive_workspace #32323200 #32323200 #5c5c5c
+ }
+ }
+-
+-include @sysconfdir@/sway/config.d/*
+
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index 2e58928e34c..2404129b165 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "sxhkd-${version}";
- version = "0.6.0";
+ pname = "sxhkd";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "baskerville";
repo = "sxhkd";
rev = version;
- sha256 = "1cz4vkm7fqd51ly9qjkf5q76kdqdzfhaajgvrs4anz5dyzrdpw68";
+ sha256 = "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h";
};
buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
diff --git a/pkgs/applications/window-managers/tabbed/xft.patch b/pkgs/applications/window-managers/tabbed/xft.patch
deleted file mode 100644
index f4f1e82e705..00000000000
--- a/pkgs/applications/window-managers/tabbed/xft.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index b3da7f0..ce43686 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -1,7 +1,7 @@
- /* See LICENSE file for copyright and license details. */
-
- /* appearance */
--static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
-+static const char font[] = "monospace-9";
- static const char* normbgcolor = "#222222";
- static const char* normfgcolor = "#cccccc";
- static const char* selbgcolor = "#555555";
-diff --git a/config.mk b/config.mk
-index dd741e4..ed3a2e9 100644
---- a/config.mk
-+++ b/config.mk
-@@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man
-
- # includes and libs
- INCS = -I. -I/usr/include
--LIBS = -L/usr/lib -lc -lX11
-+LIBS = -L/usr/lib -lc -lXft -lX11
-
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
-diff --git a/tabbed.c b/tabbed.c
-index b15f9cb..6e50c41 100644
---- a/tabbed.c
-+++ b/tabbed.c
-@@ -15,6 +15,7 @@
- #include
- #include
- #include
-+#include
-
- #include "arg.h"
-
-@@ -64,17 +65,16 @@ typedef struct {
-
- typedef struct {
- int x, y, w, h;
-- unsigned long norm[ColLast];
-- unsigned long sel[ColLast];
-- unsigned long urg[ColLast];
-+ XftColor norm[ColLast];
-+ XftColor sel[ColLast];
-+ XftColor urg[ColLast];
- Drawable drawable;
- GC gc;
- struct {
- int ascent;
- int descent;
- int height;
-- XFontSet set;
-- XFontStruct *xfont;
-+ XftFont *xfont;
- } font;
- } DC; /* draw context */
-
-@@ -97,7 +97,7 @@ static void unmapnotify(const XEvent *e);
- static void destroynotify(const XEvent *e);
- static void die(const char *errstr, ...);
- static void drawbar(void);
--static void drawtext(const char *text, unsigned long col[ColLast]);
-+static void drawtext(const char *text, XftColor col[ColLast]);
- static void *ecalloc(size_t n, size_t size);
- static void *erealloc(void *o, size_t size);
- static void expose(const XEvent *e);
-@@ -107,7 +107,7 @@ static void focusonce(const Arg *arg);
- static void fullscreen(const Arg *arg);
- static char* getatom(int a);
- static int getclient(Window w);
--static unsigned long getcolor(const char *colstr);
-+static XftColor getcolor(const char *colstr);
- static int getfirsttab(void);
- static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void initfont(const char *fontstr);
-@@ -220,12 +220,6 @@ cleanup(void) {
- free(clients);
- clients = NULL;
-
-- if(dc.font.set) {
-- XFreeFontSet(dpy, dc.font.set);
-- } else {
-- XFreeFont(dpy, dc.font.xfont);
-- }
--
- XFreePixmap(dpy, dc.drawable);
- XFreeGC(dpy, dc.gc);
- XDestroyWindow(dpy, win);
-@@ -315,7 +309,7 @@ die(const char *errstr, ...) {
-
- void
- drawbar(void) {
-- unsigned long *col;
-+ XftColor *col;
- int c, cc, fc, width;
- char *name = NULL;
-
-@@ -368,12 +362,13 @@ drawbar(void) {
- }
-
- void
--drawtext(const char *text, unsigned long col[ColLast]) {
-+drawtext(const char *text, XftColor col[ColLast]) {
- int i, x, y, h, len, olen;
- char buf[256];
-+ XftDraw *d;
- XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-- XSetForeground(dpy, dc.gc, col[ColBG]);
-+ XSetForeground(dpy, dc.gc, col[ColBG].pixel);
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- if(!text)
- return;
-@@ -394,13 +389,12 @@ drawtext(const char *text, unsigned long col[ColLast]) {
- for(i = len; i && i > len - 3; buf[--i] = '.');
- }
-
-- XSetForeground(dpy, dc.gc, col[ColFG]);
-- if(dc.font.set) {
-- XmbDrawString(dpy, dc.drawable, dc.font.set,
-- dc.gc, x, y, buf, len);
-- } else {
-- XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-- }
-+ XSetForeground(dpy, dc.gc, col[ColFG].pixel);
-+
-+ d = XftDrawCreate(dpy, dc.drawable, DefaultVisual(dpy, screen), DefaultColormap(dpy,screen));
-+
-+ XftDrawStringUtf8(d, &col[ColFG], dc.font.xfont, x, y, (XftChar8 *) buf, len);
-+ XftDrawDestroy(d);
- }
-
- void *
-@@ -537,15 +531,14 @@ getclient(Window w) {
- return -1;
- }
-
--unsigned long
-+XftColor
- getcolor(const char *colstr) {
-- Colormap cmap = DefaultColormap(dpy, screen);
-- XColor color;
-+ XftColor color;
-
-- if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-+ if(!XftColorAllocName(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), colstr, &color))
- die("tabbed: cannot allocate color '%s'\n", colstr);
-
-- return color.pixel;
-+ return color;
- }
-
- int
-@@ -594,41 +587,11 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
-
- void
- initfont(const char *fontstr) {
-- char *def, **missing, **font_names;
-- int i, n;
-- XFontStruct **xfonts;
--
-- missing = NULL;
-- if(dc.font.set)
-- XFreeFontSet(dpy, dc.font.set);
--
-- dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-- if(missing) {
-- while(n--)
-- fprintf(stderr, "tabbed: missing fontset: %s\n", missing[n]);
-- XFreeStringList(missing);
-- }
--
-- if(dc.font.set) {
-- dc.font.ascent = dc.font.descent = 0;
-- n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-- for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-- dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
-- dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
-- xfonts++;
-- }
-- } else {
-- if(dc.font.xfont)
-- XFreeFont(dpy, dc.font.xfont);
-- dc.font.xfont = NULL;
-- if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-- && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) {
-- die("tabbed: cannot load font: '%s'\n", fontstr);
-- }
-+ if(!(dc.font.xfont = XftFontOpenName(dpy,screen,fontstr)) && !(dc.font.xfont = XftFontOpenName(dpy,screen,"fixed")))
-+ die("error, cannot load font: '%s'\n", fontstr);
-
-- dc.font.ascent = dc.font.xfont->ascent;
-- dc.font.descent = dc.font.xfont->descent;
-- }
-+ dc.font.ascent = dc.font.xfont->ascent;
-+ dc.font.descent = dc.font.xfont->descent;
- dc.font.height = dc.font.ascent + dc.font.descent;
- }
-
-@@ -1000,11 +963,9 @@ setup(void) {
- dc.drawable = XCreatePixmap(dpy, root, ww, wh,
- DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, 0);
-- if(!dc.font.set)
-- XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-
- win = XCreateSimpleWindow(dpy, root, wx, wy, ww, wh, 0,
-- dc.norm[ColFG], dc.norm[ColBG]);
-+ dc.norm[ColFG].pixel, dc.norm[ColBG].pixel);
- XMapRaised(dpy, win);
- XSelectInput(dpy, win, SubstructureNotifyMask|FocusChangeMask|
- ButtonPressMask|ExposureMask|KeyPressMask|PropertyChangeMask|
-@@ -1070,15 +1031,9 @@ spawn(const Arg *arg) {
-
- int
- textnw(const char *text, unsigned int len) {
-- XRectangle r;
--
-- if(dc.font.set) {
-- XmbTextExtents(dc.font.set, text, len, NULL, &r);
--
-- return r.width;
-- }
--
-- return XTextWidth(dc.font.xfont, text, len);
-+ XGlyphInfo ext;
-+ XftTextExtentsUtf8(dpy, dc.font.xfont, (XftChar8 *) text, len, &ext);
-+ return ext.xOff;
- }
-
- void
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 5aec0973a7c..5705ae8256c 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
+{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }:
stdenv.mkDerivation rec {
name = "trayer-1.1.8";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gdk_pixbuf gtk2 ];
+ buildInputs = [ gdk-pixbuf gtk2 ];
src = fetchFromGitHub {
owner = "sargon";
diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix
deleted file mode 100644
index f8cb6c26683..00000000000
--- a/pkgs/applications/window-managers/velox/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, newScope
-, libxkbcommon
-, wayland, pixman, fontconfig
-, stConf ? null, stPatches ? []
-}:
-
-let
- callPackage = newScope self;
- self = {
- swc = callPackage ./swc.nix {};
- wld = callPackage ./wld.nix {};
- dmenu-velox = callPackage ./dmenu.nix {};
- st-velox = callPackage ./st.nix {
- conf = stConf;
- patches = stPatches;
- };
- };
-in with self; stdenv.mkDerivation rec {
- name = "velox-${version}";
- version = "git-2017-07-04";
-
- src = fetchFromGitHub {
- owner = "michaelforney";
- repo = "velox";
- rev = "0b1d3d62861653d92d0a1056855a84fcef661bc0";
- sha256 = "0p5ra5p5w21wl696rmv0vdnl7jnri5iwnxfs6nl6miwydhq2dmci";
- };
-
- nativeBuildInputs = [ pkgconfig makeWrapper ];
-
- buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ];
-
- propagatedUserEnvPkgs = [ swc ];
-
- makeFlags = "PREFIX=$(out)";
- preBuild = ''
- substituteInPlace config.c \
- --replace /etc/velox.conf $out/etc/velox.conf
- '';
- installPhase = ''
- PREFIX=$out make install
- mkdir -p $out/etc
- cp velox.conf.sample $out/etc/velox.conf
- '';
- postFixup = ''
- wrapProgram $out/bin/velox \
- --prefix PATH : "${stdenv.lib.makeBinPath [ dmenu-velox st-velox ]}"
- '';
-
- enableParallelBuilding = false; # https://hydra.nixos.org/build/79799608
-
- meta = {
- description = "velox window manager";
- homepage = "https://github.com/michaelforney/velox";
- license = lib.licenses.mit;
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix
deleted file mode 100644
index 01360e5af0b..00000000000
--- a/pkgs/applications/window-managers/velox/dmenu.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{stdenv, fetchFromGitHub #, libX11, libXinerama, enableXft, libXft, zlib
-, swc, wld, wayland, libxkbcommon, pixman, fontconfig
-}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "dmenu-velox-${version}";
- version = "git-2017-04-07";
-
- src = fetchFromGitHub {
- owner = "michaelforney";
- repo = "dmenu";
- rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
- sha256 = "14j8jv0nlybinhzkgd6dplvng9zy8p292prlx39w0k4fm6x5nv6y";
- };
-
- buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
-
- postPatch = ''
- sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
- '';
-
- preConfigure = [
- ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
- ];
-
- enableParallelBuilding = true;
-
- meta = {
- description = "A generic, highly customizable, and efficient menu for the X Window System";
- homepage = https://tools.suckless.org/dmenu;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ ];
- platforms = with stdenv.lib.platforms; all;
- };
-}
diff --git a/pkgs/applications/window-managers/velox/st.nix b/pkgs/applications/window-managers/velox/st.nix
deleted file mode 100644
index 2d73df65046..00000000000
--- a/pkgs/applications/window-managers/velox/st.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, writeText
-, ncurses, wayland, wayland-protocols, wld, libxkbcommon, fontconfig, pixman
-, conf, patches }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "st-velox-${version}";
- version = "git-2016-12-22";
-
- src = fetchFromGitHub {
- owner = "michaelforney";
- repo = "st";
- rev = "b27f17da65f74b0a923952601873524e03b4d047";
- sha256 = "17aa4bz5g14jvqghk2c8mw77hb8786s07pv814rmlk7nnsavmp3i";
- };
-
- inherit patches;
-
- configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
- preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ncurses wayland wayland-protocols wld libxkbcommon fontconfig pixman ];
-
- NIX_LDFLAGS = "-lfontconfig";
-
- installPhase = ''
- TERMINFO=$out/share/terminfo make install PREFIX=$out
- '';
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = https://st.suckless.org/;
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- platforms = with platforms; linux;
- };
-}
diff --git a/pkgs/applications/window-managers/velox/swc.nix b/pkgs/applications/window-managers/velox/swc.nix
deleted file mode 100644
index a2f98b8b65e..00000000000
--- a/pkgs/applications/window-managers/velox/swc.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig
-, wld, wayland, wayland-protocols, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm
-}:
-
-stdenv.mkDerivation rec {
- name = "swc-${version}";
- version = "git-2017-06-28";
-
- src = fetchFromGitHub {
- owner = "michaelforney";
- repo = "swc";
- rev = "5b20050872f8ad29cfc97729f8af47b6b3df5393";
- sha256 = "1lxpm17v5d8png6ixc0zn0w00xgrhz2n5b8by9vx6800b18246z8";
- };
-
- nativeBuildInputs = [ pkgconfig ];
-
- buildInputs = [ wld wayland wayland-protocols fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ];
-
- prePatch = ''
- substituteInPlace launch/local.mk --replace 4755 755
- '';
-
- makeFlags = "PREFIX=$(out)";
- installPhase = "PREFIX=$out make install";
-
- enableParallelBuilding = true;
-
- meta = {
- description = "A library for making a simple Wayland compositor";
- homepage = src.meta.homepage;
- license = lib.licenses.mit;
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/applications/window-managers/velox/wld.nix b/pkgs/applications/window-managers/velox/wld.nix
deleted file mode 100644
index d85f8212ec4..00000000000
--- a/pkgs/applications/window-managers/velox/wld.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig
-, wayland, fontconfig, pixman, freetype, libdrm
-}:
-
-stdenv.mkDerivation rec {
- name = "wld-${version}";
- version = "git-2017-10-31";
-
- src = fetchFromGitHub {
- owner = "michaelforney";
- repo = "wld";
- rev = "b4e902bbecb678c45485b52c3aa183cbc932c595";
- sha256 = "0j2n776flnzyw3vhxl0r8h1c48wrihi4g6bs2z8j4hbw5pnwq1k6";
- };
-
- nativeBuildInputs = [ pkgconfig ];
-
- buildInputs = [ wayland fontconfig pixman freetype libdrm ];
-
- makeFlags = "PREFIX=$(out)";
- installPhase = "PREFIX=$out make install";
-
- enableParallelBuilding = true;
-
- meta = {
- description = "A primitive drawing library targeted at Wayland";
- homepage = src.meta.homepage;
- license = lib.licenses.mit;
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix
index 9dbd367a67f..955dfe9b44a 100644
--- a/pkgs/applications/window-managers/way-cooler/crates-io.nix
+++ b/pkgs/applications/window-managers/way-cooler/crates-io.nix
@@ -10,6 +10,7 @@ rec {
crates.aho_corasick."0.5.3" = deps: { features?(features_.aho_corasick."0.5.3" deps {}) }: buildRustCrate {
crateName = "aho-corasick";
version = "0.5.3";
+ description = "Fast multiple substring searching with finite state machines.";
authors = [ "Andrew Gallant " ];
sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn";
libName = "aho_corasick";
@@ -33,6 +34,7 @@ rec {
crates.bitflags."0.4.0" = deps: { features?(features_.bitflags."0.4.0" deps {}) }: buildRustCrate {
crateName = "bitflags";
version = "0.4.0";
+ description = "A macro to generate structures which behave like bitflags.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
features = mkFeatures (features."bitflags"."0.4.0" or {});
@@ -48,6 +50,7 @@ rec {
crates.bitflags."0.6.0" = deps: { features?(features_.bitflags."0.6.0" deps {}) }: buildRustCrate {
crateName = "bitflags";
version = "0.6.0";
+ description = "A macro to generate structures which behave like bitflags.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
};
@@ -62,6 +65,7 @@ rec {
crates.bitflags."0.7.0" = deps: { features?(features_.bitflags."0.7.0" deps {}) }: buildRustCrate {
crateName = "bitflags";
version = "0.7.0";
+ description = "A macro to generate structures which behave like bitflags.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
};
@@ -76,17 +80,18 @@ rec {
crates.bitflags."0.9.1" = deps: { features?(features_.bitflags."0.9.1" deps {}) }: buildRustCrate {
crateName = "bitflags";
version = "0.9.1";
+ description = "A macro to generate structures which behave like bitflags.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
features = mkFeatures (features."bitflags"."0.9.1" or {});
};
features_.bitflags."0.9.1" = deps: f: updateFeatures f (rec {
bitflags = fold recursiveUpdate {} [
- { "0.9.1".default = (f.bitflags."0.9.1".default or true); }
- { "0.9.1".example_generated =
- (f.bitflags."0.9.1".example_generated or false) ||
+ { "0.9.1"."example_generated" =
+ (f.bitflags."0.9.1"."example_generated" or false) ||
(f.bitflags."0.9.1".default or false) ||
(bitflags."0.9.1"."default" or false); }
+ { "0.9.1".default = (f.bitflags."0.9.1".default or true); }
];
}) [];
@@ -97,6 +102,7 @@ rec {
crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
crateName = "bitflags";
version = "1.0.4";
+ description = "A macro to generate structures which behave like bitflags.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
features = mkFeatures (features."bitflags"."1.0.4" or {});
@@ -112,6 +118,7 @@ rec {
crates.c_vec."1.2.1" = deps: { features?(features_.c_vec."1.2.1" deps {}) }: buildRustCrate {
crateName = "c_vec";
version = "1.2.1";
+ description = "Structures to wrap C arrays";
authors = [ "Guillaume Gomez " ];
sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
};
@@ -126,6 +133,7 @@ rec {
crates.cairo_rs."0.2.0" = deps: { features?(features_.cairo_rs."0.2.0" deps {}) }: buildRustCrate {
crateName = "cairo-rs";
version = "0.2.0";
+ description = "Rust bindings for the Cairo library";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "0bcbhbyips15b7la4r43p4x57jv1w2ll8iwg9lxwvzz5k6c7iwvd";
libName = "cairo";
@@ -148,25 +156,25 @@ rec {
features_.cairo_rs."0.2.0" = deps: f: updateFeatures f (rec {
c_vec."${deps.cairo_rs."0.2.0".c_vec}".default = true;
cairo_rs = fold recursiveUpdate {} [
- { "0.2.0".default = (f.cairo_rs."0.2.0".default or true); }
- { "0.2.0".glib =
- (f.cairo_rs."0.2.0".glib or false) ||
+ { "0.2.0"."glib" =
+ (f.cairo_rs."0.2.0"."glib" or false) ||
(f.cairo_rs."0.2.0".use_glib or false) ||
(cairo_rs."0.2.0"."use_glib" or false); }
- { "0.2.0".glib-sys =
- (f.cairo_rs."0.2.0".glib-sys or false) ||
+ { "0.2.0"."glib-sys" =
+ (f.cairo_rs."0.2.0"."glib-sys" or false) ||
(f.cairo_rs."0.2.0".use_glib or false) ||
(cairo_rs."0.2.0"."use_glib" or false); }
- { "0.2.0".gtk-rs-lgpl-docs =
- (f.cairo_rs."0.2.0".gtk-rs-lgpl-docs or false) ||
+ { "0.2.0"."gtk-rs-lgpl-docs" =
+ (f.cairo_rs."0.2.0"."gtk-rs-lgpl-docs" or false) ||
(f.cairo_rs."0.2.0".embed-lgpl-docs or false) ||
(cairo_rs."0.2.0"."embed-lgpl-docs" or false) ||
(f.cairo_rs."0.2.0".purge-lgpl-docs or false) ||
(cairo_rs."0.2.0"."purge-lgpl-docs" or false); }
- { "0.2.0".use_glib =
- (f.cairo_rs."0.2.0".use_glib or false) ||
+ { "0.2.0"."use_glib" =
+ (f.cairo_rs."0.2.0"."use_glib" or false) ||
(f.cairo_rs."0.2.0".default or false) ||
(cairo_rs."0.2.0"."default" or false); }
+ { "0.2.0".default = (f.cairo_rs."0.2.0".default or true); }
];
cairo_sys_rs = fold recursiveUpdate {} [
{ "${deps.cairo_rs."0.2.0".cairo_sys_rs}"."png" =
@@ -203,6 +211,7 @@ rec {
crates.cairo_sys_rs."0.4.0" = deps: { features?(features_.cairo_sys_rs."0.4.0" deps {}) }: buildRustCrate {
crateName = "cairo-sys-rs";
version = "0.4.0";
+ description = "FFI bindings to libcairo";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "062nxihlydci65pyy2ldn7djkc9sm7a5xvkl8pxrsxfxvfapm5br";
libName = "cairo_sys";
@@ -221,15 +230,15 @@ rec {
};
features_.cairo_sys_rs."0.4.0" = deps: f: updateFeatures f (rec {
cairo_sys_rs = fold recursiveUpdate {} [
- { "0.4.0".default = (f.cairo_sys_rs."0.4.0".default or true); }
- { "0.4.0".v1_12 =
- (f.cairo_sys_rs."0.4.0".v1_12 or false) ||
+ { "0.4.0"."v1_12" =
+ (f.cairo_sys_rs."0.4.0"."v1_12" or false) ||
(f.cairo_sys_rs."0.4.0".v1_14 or false) ||
(cairo_sys_rs."0.4.0"."v1_14" or false); }
- { "0.4.0".x11 =
- (f.cairo_sys_rs."0.4.0".x11 or false) ||
+ { "0.4.0"."x11" =
+ (f.cairo_sys_rs."0.4.0"."x11" or false) ||
(f.cairo_sys_rs."0.4.0".xlib or false) ||
(cairo_sys_rs."0.4.0"."xlib" or false); }
+ { "0.4.0".default = (f.cairo_sys_rs."0.4.0".default or true); }
];
libc."${deps.cairo_sys_rs."0.4.0".libc}".default = true;
pkg_config."${deps.cairo_sys_rs."0.4.0".pkg_config}".default = true;
@@ -247,6 +256,7 @@ rec {
crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
crateName = "cc";
version = "1.0.25";
+ description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
authors = [ "Alex Crichton " ];
sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0";
dependencies = mapFeatures features ([
@@ -255,11 +265,11 @@ rec {
};
features_.cc."1.0.25" = deps: f: updateFeatures f (rec {
cc = fold recursiveUpdate {} [
- { "1.0.25".default = (f.cc."1.0.25".default or true); }
- { "1.0.25".rayon =
- (f.cc."1.0.25".rayon or false) ||
+ { "1.0.25"."rayon" =
+ (f.cc."1.0.25"."rayon" or false) ||
(f.cc."1.0.25".parallel or false) ||
(cc."1.0.25"."parallel" or false); }
+ { "1.0.25".default = (f.cc."1.0.25".default or true); }
];
}) [];
@@ -270,6 +280,7 @@ rec {
crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
crateName = "cfg-if";
version = "0.1.6";
+ description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n";
authors = [ "Alex Crichton " ];
sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
};
@@ -284,6 +295,7 @@ rec {
crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate {
crateName = "cloudabi";
version = "0.0.3";
+ description = "Low level interface to CloudABI. Contains all syscalls and related types.";
authors = [ "Nuxi (https://nuxi.nl/) and contributors" ];
sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5";
libPath = "cloudabi.rs";
@@ -295,8 +307,8 @@ rec {
features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec {
bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true;
cloudabi = fold recursiveUpdate {} [
- { "0.0.3".bitflags =
- (f.cloudabi."0.0.3".bitflags or false) ||
+ { "0.0.3"."bitflags" =
+ (f.cloudabi."0.0.3"."bitflags" or false) ||
(f.cloudabi."0.0.3".default or false) ||
(cloudabi."0.0.3"."default" or false); }
{ "0.0.3".default = (f.cloudabi."0.0.3".default or true); }
@@ -312,6 +324,7 @@ rec {
crates.dbus."0.4.1" = deps: { features?(features_.dbus."0.4.1" deps {}) }: buildRustCrate {
crateName = "dbus";
version = "0.4.1";
+ description = "Bindings to D-Bus, which is a bus commonly used on Linux for inter-process communication.";
authors = [ "David Henningsson " ];
sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9";
build = "build.rs";
@@ -339,6 +352,7 @@ rec {
crates.dbus_macros."0.0.6" = deps: { features?(features_.dbus_macros."0.0.6" deps {}) }: buildRustCrate {
crateName = "dbus-macros";
version = "0.0.6";
+ description = "Convenient macros to use the dbus crate";
authors = [ "Antoni Boucher " ];
sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd";
dependencies = mapFeatures features ([
@@ -359,6 +373,7 @@ rec {
crates.dlib."0.3.1" = deps: { features?(features_.dlib."0.3.1" deps {}) }: buildRustCrate {
crateName = "dlib";
version = "0.3.1";
+ description = "Helper macros for handling manually loading optionnal system libraries.";
authors = [ "Victor Berger " ];
sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
dependencies = mapFeatures features ([
@@ -380,6 +395,7 @@ rec {
crates.dlib."0.4.1" = deps: { features?(features_.dlib."0.4.1" deps {}) }: buildRustCrate {
crateName = "dlib";
version = "0.4.1";
+ description = "Helper macros for handling manually loading optional system libraries.";
authors = [ "Victor Berger " ];
sha256 = "0h5xm6lanbl6v9y16g592bia33g7xb0n0fg98pvz6nsvg0layxlk";
dependencies = mapFeatures features ([
@@ -401,6 +417,7 @@ rec {
crates.dtoa."0.4.3" = deps: { features?(features_.dtoa."0.4.3" deps {}) }: buildRustCrate {
crateName = "dtoa";
version = "0.4.3";
+ description = "Fast functions for printing floating-point primitives to an io::Write";
authors = [ "David Tolnay " ];
sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
};
@@ -415,6 +432,7 @@ rec {
crates.dummy_rustwlc."0.7.1" = deps: { features?(features_.dummy_rustwlc."0.7.1" deps {}) }: buildRustCrate {
crateName = "dummy-rustwlc";
version = "0.7.1";
+ description = "A dummy version of the functions defined in rust-wlc, to be used in testing and for travis builds";
authors = [ "Snirk Immington " "Preston Carpenter " ];
sha256 = "13priwnxpjvmym6yh9v9x1230ca04cba7bzbnn21pbvqngis1y88";
dependencies = mapFeatures features ([
@@ -445,6 +463,7 @@ rec {
crates.env_logger."0.3.5" = deps: { features?(features_.env_logger."0.3.5" deps {}) }: buildRustCrate {
crateName = "env_logger";
version = "0.3.5";
+ description = "An logging implementation for `log` which is configured via an environment\nvariable.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw";
dependencies = mapFeatures features ([
@@ -455,11 +474,11 @@ rec {
};
features_.env_logger."0.3.5" = deps: f: updateFeatures f (rec {
env_logger = fold recursiveUpdate {} [
- { "0.3.5".default = (f.env_logger."0.3.5".default or true); }
- { "0.3.5".regex =
- (f.env_logger."0.3.5".regex or false) ||
+ { "0.3.5"."regex" =
+ (f.env_logger."0.3.5"."regex" or false) ||
(f.env_logger."0.3.5".default or false) ||
(env_logger."0.3.5"."default" or false); }
+ { "0.3.5".default = (f.env_logger."0.3.5".default or true); }
];
log."${deps.env_logger."0.3.5".log}".default = true;
regex."${deps.env_logger."0.3.5".regex}".default = true;
@@ -475,6 +494,7 @@ rec {
crates.fixedbitset."0.1.9" = deps: { features?(features_.fixedbitset."0.1.9" deps {}) }: buildRustCrate {
crateName = "fixedbitset";
version = "0.1.9";
+ description = "FixedBitSet is a simple bitset collection";
authors = [ "bluss" ];
sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1";
};
@@ -489,6 +509,7 @@ rec {
crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
crateName = "fuchsia-zircon";
version = "0.3.3";
+ description = "Rust bindings for the Zircon kernel";
authors = [ "Raph Levien " ];
sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
dependencies = mapFeatures features ([
@@ -512,6 +533,7 @@ rec {
crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
crateName = "fuchsia-zircon-sys";
version = "0.3.3";
+ description = "Low-level Rust bindings for the Zircon kernel";
authors = [ "Raph Levien " ];
sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
};
@@ -526,6 +548,7 @@ rec {
crates.gcc."0.3.55" = deps: { features?(features_.gcc."0.3.55" deps {}) }: buildRustCrate {
crateName = "gcc";
version = "0.3.55";
+ description = "**Deprecated** crate, renamed to `cc`\n\nA build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
authors = [ "Alex Crichton " ];
sha256 = "18qxv3hjdhp7pfcvbm2hvyicpgmk7xw8aii1l7fla8cxxbcrg2nz";
dependencies = mapFeatures features ([
@@ -534,11 +557,11 @@ rec {
};
features_.gcc."0.3.55" = deps: f: updateFeatures f (rec {
gcc = fold recursiveUpdate {} [
- { "0.3.55".default = (f.gcc."0.3.55".default or true); }
- { "0.3.55".rayon =
- (f.gcc."0.3.55".rayon or false) ||
+ { "0.3.55"."rayon" =
+ (f.gcc."0.3.55"."rayon" or false) ||
(f.gcc."0.3.55".parallel or false) ||
(gcc."0.3.55"."parallel" or false); }
+ { "0.3.55".default = (f.gcc."0.3.55".default or true); }
];
}) [];
@@ -549,6 +572,7 @@ rec {
crates.gdk_pixbuf."0.2.0" = deps: { features?(features_.gdk_pixbuf."0.2.0" deps {}) }: buildRustCrate {
crateName = "gdk-pixbuf";
version = "0.2.0";
+ description = "Rust bindings for the GdkPixbuf library";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y";
libName = "gdk_pixbuf";
@@ -567,25 +591,25 @@ rec {
};
features_.gdk_pixbuf."0.2.0" = deps: f: updateFeatures f (rec {
gdk_pixbuf = fold recursiveUpdate {} [
- { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); }
- { "0.2.0".gtk-rs-lgpl-docs =
- (f.gdk_pixbuf."0.2.0".gtk-rs-lgpl-docs or false) ||
+ { "0.2.0"."gtk-rs-lgpl-docs" =
+ (f.gdk_pixbuf."0.2.0"."gtk-rs-lgpl-docs" or false) ||
(f.gdk_pixbuf."0.2.0".embed-lgpl-docs or false) ||
(gdk_pixbuf."0.2.0"."embed-lgpl-docs" or false) ||
(f.gdk_pixbuf."0.2.0".purge-lgpl-docs or false) ||
(gdk_pixbuf."0.2.0"."purge-lgpl-docs" or false); }
- { "0.2.0".v2_28 =
- (f.gdk_pixbuf."0.2.0".v2_28 or false) ||
+ { "0.2.0"."v2_28" =
+ (f.gdk_pixbuf."0.2.0"."v2_28" or false) ||
(f.gdk_pixbuf."0.2.0".v2_30 or false) ||
(gdk_pixbuf."0.2.0"."v2_30" or false); }
- { "0.2.0".v2_30 =
- (f.gdk_pixbuf."0.2.0".v2_30 or false) ||
+ { "0.2.0"."v2_30" =
+ (f.gdk_pixbuf."0.2.0"."v2_30" or false) ||
(f.gdk_pixbuf."0.2.0".v2_32 or false) ||
(gdk_pixbuf."0.2.0"."v2_32" or false); }
- { "0.2.0".v2_32 =
- (f.gdk_pixbuf."0.2.0".v2_32 or false) ||
+ { "0.2.0"."v2_32" =
+ (f.gdk_pixbuf."0.2.0"."v2_32" or false) ||
(f.gdk_pixbuf."0.2.0".v2_36 or false) ||
(gdk_pixbuf."0.2.0"."v2_36" or false); }
+ { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); }
];
gdk_pixbuf_sys = fold recursiveUpdate {} [
{ "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" =
@@ -625,6 +649,7 @@ rec {
crates.gdk_pixbuf_sys."0.4.0" = deps: { features?(features_.gdk_pixbuf_sys."0.4.0" deps {}) }: buildRustCrate {
crateName = "gdk-pixbuf-sys";
version = "0.4.0";
+ description = "FFI bindings to libgdk_pixbuf-2.0";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "1r98zdqqik3hh1l10jmhhcjx59yk4m0bs9pc7hnkwp2p6gm968vp";
libName = "gdk_pixbuf_sys";
@@ -645,19 +670,19 @@ rec {
features_.gdk_pixbuf_sys."0.4.0" = deps: f: updateFeatures f (rec {
bitflags."${deps.gdk_pixbuf_sys."0.4.0".bitflags}".default = true;
gdk_pixbuf_sys = fold recursiveUpdate {} [
- { "0.4.0".default = (f.gdk_pixbuf_sys."0.4.0".default or true); }
- { "0.4.0".v2_28 =
- (f.gdk_pixbuf_sys."0.4.0".v2_28 or false) ||
+ { "0.4.0"."v2_28" =
+ (f.gdk_pixbuf_sys."0.4.0"."v2_28" or false) ||
(f.gdk_pixbuf_sys."0.4.0".v2_30 or false) ||
(gdk_pixbuf_sys."0.4.0"."v2_30" or false); }
- { "0.4.0".v2_30 =
- (f.gdk_pixbuf_sys."0.4.0".v2_30 or false) ||
+ { "0.4.0"."v2_30" =
+ (f.gdk_pixbuf_sys."0.4.0"."v2_30" or false) ||
(f.gdk_pixbuf_sys."0.4.0".v2_32 or false) ||
(gdk_pixbuf_sys."0.4.0"."v2_32" or false); }
- { "0.4.0".v2_32 =
- (f.gdk_pixbuf_sys."0.4.0".v2_32 or false) ||
+ { "0.4.0"."v2_32" =
+ (f.gdk_pixbuf_sys."0.4.0"."v2_32" or false) ||
(f.gdk_pixbuf_sys."0.4.0".v2_36 or false) ||
(gdk_pixbuf_sys."0.4.0"."v2_36" or false); }
+ { "0.4.0".default = (f.gdk_pixbuf_sys."0.4.0".default or true); }
];
gio_sys."${deps.gdk_pixbuf_sys."0.4.0".gio_sys}".default = true;
glib_sys."${deps.gdk_pixbuf_sys."0.4.0".glib_sys}".default = true;
@@ -680,6 +705,7 @@ rec {
crates.getopts."0.2.18" = deps: { features?(features_.getopts."0.2.18" deps {}) }: buildRustCrate {
crateName = "getopts";
version = "0.2.18";
+ description = "getopts-like option parsing.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "0c1m95wg8pkvdq4mwcd2v78r1lb6a5s3ljm7158dsl56mvzcwd5y";
dependencies = mapFeatures features ([
@@ -700,6 +726,7 @@ rec {
crates.gio_sys."0.4.0" = deps: { features?(features_.gio_sys."0.4.0" deps {}) }: buildRustCrate {
crateName = "gio-sys";
version = "0.4.0";
+ description = "FFI bindings to libgio-2.0";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "064lv6h3qfgjzc6pbbxgln24b2fq9gxzh78z6d7fwfa97azllv2l";
libName = "gio_sys";
@@ -719,39 +746,39 @@ rec {
features_.gio_sys."0.4.0" = deps: f: updateFeatures f (rec {
bitflags."${deps.gio_sys."0.4.0".bitflags}".default = true;
gio_sys = fold recursiveUpdate {} [
- { "0.4.0".default = (f.gio_sys."0.4.0".default or true); }
- { "0.4.0".v2_34 =
- (f.gio_sys."0.4.0".v2_34 or false) ||
+ { "0.4.0"."v2_34" =
+ (f.gio_sys."0.4.0"."v2_34" or false) ||
(f.gio_sys."0.4.0".v2_36 or false) ||
(gio_sys."0.4.0"."v2_36" or false); }
- { "0.4.0".v2_36 =
- (f.gio_sys."0.4.0".v2_36 or false) ||
+ { "0.4.0"."v2_36" =
+ (f.gio_sys."0.4.0"."v2_36" or false) ||
(f.gio_sys."0.4.0".v2_38 or false) ||
(gio_sys."0.4.0"."v2_38" or false); }
- { "0.4.0".v2_38 =
- (f.gio_sys."0.4.0".v2_38 or false) ||
+ { "0.4.0"."v2_38" =
+ (f.gio_sys."0.4.0"."v2_38" or false) ||
(f.gio_sys."0.4.0".v2_40 or false) ||
(gio_sys."0.4.0"."v2_40" or false); }
- { "0.4.0".v2_40 =
- (f.gio_sys."0.4.0".v2_40 or false) ||
+ { "0.4.0"."v2_40" =
+ (f.gio_sys."0.4.0"."v2_40" or false) ||
(f.gio_sys."0.4.0".v2_42 or false) ||
(gio_sys."0.4.0"."v2_42" or false); }
- { "0.4.0".v2_42 =
- (f.gio_sys."0.4.0".v2_42 or false) ||
+ { "0.4.0"."v2_42" =
+ (f.gio_sys."0.4.0"."v2_42" or false) ||
(f.gio_sys."0.4.0".v2_44 or false) ||
(gio_sys."0.4.0"."v2_44" or false); }
- { "0.4.0".v2_44 =
- (f.gio_sys."0.4.0".v2_44 or false) ||
+ { "0.4.0"."v2_44" =
+ (f.gio_sys."0.4.0"."v2_44" or false) ||
(f.gio_sys."0.4.0".v2_46 or false) ||
(gio_sys."0.4.0"."v2_46" or false); }
- { "0.4.0".v2_46 =
- (f.gio_sys."0.4.0".v2_46 or false) ||
+ { "0.4.0"."v2_46" =
+ (f.gio_sys."0.4.0"."v2_46" or false) ||
(f.gio_sys."0.4.0".v2_48 or false) ||
(gio_sys."0.4.0"."v2_48" or false); }
- { "0.4.0".v2_48 =
- (f.gio_sys."0.4.0".v2_48 or false) ||
+ { "0.4.0"."v2_48" =
+ (f.gio_sys."0.4.0"."v2_48" or false) ||
(f.gio_sys."0.4.0".v2_50 or false) ||
(gio_sys."0.4.0"."v2_50" or false); }
+ { "0.4.0".default = (f.gio_sys."0.4.0".default or true); }
];
glib_sys."${deps.gio_sys."0.4.0".glib_sys}".default = true;
gobject_sys."${deps.gio_sys."0.4.0".gobject_sys}".default = true;
@@ -772,6 +799,7 @@ rec {
crates.glib."0.3.1" = deps: { features?(features_.glib."0.3.1" deps {}) }: buildRustCrate {
crateName = "glib";
version = "0.3.1";
+ description = "Rust bindings for the GLib library";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "00s3n0pd8by1fk2l01mxmbnqq4ff6wadnkcf9jbjvr1l9bzgyqbl";
dependencies = mapFeatures features ([
@@ -786,31 +814,31 @@ rec {
features_.glib."0.3.1" = deps: f: updateFeatures f (rec {
bitflags."${deps.glib."0.3.1".bitflags}".default = true;
glib = fold recursiveUpdate {} [
- { "0.3.1".default = (f.glib."0.3.1".default or true); }
- { "0.3.1".v2_34 =
- (f.glib."0.3.1".v2_34 or false) ||
+ { "0.3.1"."v2_34" =
+ (f.glib."0.3.1"."v2_34" or false) ||
(f.glib."0.3.1".v2_38 or false) ||
(glib."0.3.1"."v2_38" or false); }
- { "0.3.1".v2_38 =
- (f.glib."0.3.1".v2_38 or false) ||
+ { "0.3.1"."v2_38" =
+ (f.glib."0.3.1"."v2_38" or false) ||
(f.glib."0.3.1".v2_40 or false) ||
(glib."0.3.1"."v2_40" or false); }
- { "0.3.1".v2_40 =
- (f.glib."0.3.1".v2_40 or false) ||
+ { "0.3.1"."v2_40" =
+ (f.glib."0.3.1"."v2_40" or false) ||
(f.glib."0.3.1".v2_44 or false) ||
(glib."0.3.1"."v2_44" or false); }
- { "0.3.1".v2_44 =
- (f.glib."0.3.1".v2_44 or false) ||
+ { "0.3.1"."v2_44" =
+ (f.glib."0.3.1"."v2_44" or false) ||
(f.glib."0.3.1".v2_46 or false) ||
(glib."0.3.1"."v2_46" or false); }
- { "0.3.1".v2_46 =
- (f.glib."0.3.1".v2_46 or false) ||
+ { "0.3.1"."v2_46" =
+ (f.glib."0.3.1"."v2_46" or false) ||
(f.glib."0.3.1".v2_48 or false) ||
(glib."0.3.1"."v2_48" or false); }
- { "0.3.1".v2_48 =
- (f.glib."0.3.1".v2_48 or false) ||
+ { "0.3.1"."v2_48" =
+ (f.glib."0.3.1"."v2_48" or false) ||
(f.glib."0.3.1".v2_50 or false) ||
(glib."0.3.1"."v2_50" or false); }
+ { "0.3.1".default = (f.glib."0.3.1".default or true); }
];
glib_sys = fold recursiveUpdate {} [
{ "${deps.glib."0.3.1".glib_sys}"."v2_34" =
@@ -879,6 +907,7 @@ rec {
crates.glib_sys."0.4.0" = deps: { features?(features_.glib_sys."0.4.0" deps {}) }: buildRustCrate {
crateName = "glib-sys";
version = "0.4.0";
+ description = "FFI bindings to libglib-2.0";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "153i1zmk824hdf8agkaqcgddlwpvgng71n7bdpaav5f4zzlfyp2w";
libName = "glib_sys";
@@ -896,35 +925,35 @@ rec {
features_.glib_sys."0.4.0" = deps: f: updateFeatures f (rec {
bitflags."${deps.glib_sys."0.4.0".bitflags}".default = true;
glib_sys = fold recursiveUpdate {} [
- { "0.4.0".default = (f.glib_sys."0.4.0".default or true); }
- { "0.4.0".v2_34 =
- (f.glib_sys."0.4.0".v2_34 or false) ||
+ { "0.4.0"."v2_34" =
+ (f.glib_sys."0.4.0"."v2_34" or false) ||
(f.glib_sys."0.4.0".v2_36 or false) ||
(glib_sys."0.4.0"."v2_36" or false); }
- { "0.4.0".v2_36 =
- (f.glib_sys."0.4.0".v2_36 or false) ||
+ { "0.4.0"."v2_36" =
+ (f.glib_sys."0.4.0"."v2_36" or false) ||
(f.glib_sys."0.4.0".v2_38 or false) ||
(glib_sys."0.4.0"."v2_38" or false); }
- { "0.4.0".v2_38 =
- (f.glib_sys."0.4.0".v2_38 or false) ||
+ { "0.4.0"."v2_38" =
+ (f.glib_sys."0.4.0"."v2_38" or false) ||
(f.glib_sys."0.4.0".v2_40 or false) ||
(glib_sys."0.4.0"."v2_40" or false); }
- { "0.4.0".v2_40 =
- (f.glib_sys."0.4.0".v2_40 or false) ||
+ { "0.4.0"."v2_40" =
+ (f.glib_sys."0.4.0"."v2_40" or false) ||
(f.glib_sys."0.4.0".v2_44 or false) ||
(glib_sys."0.4.0"."v2_44" or false); }
- { "0.4.0".v2_44 =
- (f.glib_sys."0.4.0".v2_44 or false) ||
+ { "0.4.0"."v2_44" =
+ (f.glib_sys."0.4.0"."v2_44" or false) ||
(f.glib_sys."0.4.0".v2_46 or false) ||
(glib_sys."0.4.0"."v2_46" or false); }
- { "0.4.0".v2_46 =
- (f.glib_sys."0.4.0".v2_46 or false) ||
+ { "0.4.0"."v2_46" =
+ (f.glib_sys."0.4.0"."v2_46" or false) ||
(f.glib_sys."0.4.0".v2_48 or false) ||
(glib_sys."0.4.0"."v2_48" or false); }
- { "0.4.0".v2_48 =
- (f.glib_sys."0.4.0".v2_48 or false) ||
+ { "0.4.0"."v2_48" =
+ (f.glib_sys."0.4.0"."v2_48" or false) ||
(f.glib_sys."0.4.0".v2_50 or false) ||
(glib_sys."0.4.0"."v2_50" or false); }
+ { "0.4.0".default = (f.glib_sys."0.4.0".default or true); }
];
libc."${deps.glib_sys."0.4.0".libc}".default = true;
pkg_config."${deps.glib_sys."0.4.0".pkg_config}".default = true;
@@ -941,6 +970,7 @@ rec {
crates.gobject_sys."0.4.0" = deps: { features?(features_.gobject_sys."0.4.0" deps {}) }: buildRustCrate {
crateName = "gobject-sys";
version = "0.4.0";
+ description = "FFI bindings to libgobject-2.0";
authors = [ "The Gtk-rs Project Developers" ];
sha256 = "00zmcbzqfhn9w01cphhf3hbq8ldd9ajba7x07z59vv1gdq6wjzli";
libName = "gobject_sys";
@@ -960,27 +990,27 @@ rec {
bitflags."${deps.gobject_sys."0.4.0".bitflags}".default = true;
glib_sys."${deps.gobject_sys."0.4.0".glib_sys}".default = true;
gobject_sys = fold recursiveUpdate {} [
- { "0.4.0".default = (f.gobject_sys."0.4.0".default or true); }
- { "0.4.0".v2_34 =
- (f.gobject_sys."0.4.0".v2_34 or false) ||
+ { "0.4.0"."v2_34" =
+ (f.gobject_sys."0.4.0"."v2_34" or false) ||
(f.gobject_sys."0.4.0".v2_36 or false) ||
(gobject_sys."0.4.0"."v2_36" or false); }
- { "0.4.0".v2_36 =
- (f.gobject_sys."0.4.0".v2_36 or false) ||
+ { "0.4.0"."v2_36" =
+ (f.gobject_sys."0.4.0"."v2_36" or false) ||
(f.gobject_sys."0.4.0".v2_38 or false) ||
(gobject_sys."0.4.0"."v2_38" or false); }
- { "0.4.0".v2_38 =
- (f.gobject_sys."0.4.0".v2_38 or false) ||
+ { "0.4.0"."v2_38" =
+ (f.gobject_sys."0.4.0"."v2_38" or false) ||
(f.gobject_sys."0.4.0".v2_42 or false) ||
(gobject_sys."0.4.0"."v2_42" or false); }
- { "0.4.0".v2_42 =
- (f.gobject_sys."0.4.0".v2_42 or false) ||
+ { "0.4.0"."v2_42" =
+ (f.gobject_sys."0.4.0"."v2_42" or false) ||
(f.gobject_sys."0.4.0".v2_44 or false) ||
(gobject_sys."0.4.0"."v2_44" or false); }
- { "0.4.0".v2_44 =
- (f.gobject_sys."0.4.0".v2_44 or false) ||
+ { "0.4.0"."v2_44" =
+ (f.gobject_sys."0.4.0"."v2_44" or false) ||
(f.gobject_sys."0.4.0".v2_46 or false) ||
(gobject_sys."0.4.0"."v2_46" or false); }
+ { "0.4.0".default = (f.gobject_sys."0.4.0".default or true); }
];
libc."${deps.gobject_sys."0.4.0".libc}".default = true;
pkg_config."${deps.gobject_sys."0.4.0".pkg_config}".default = true;
@@ -998,6 +1028,7 @@ rec {
crates.itoa."0.3.4" = deps: { features?(features_.itoa."0.3.4" deps {}) }: buildRustCrate {
crateName = "itoa";
version = "0.3.4";
+ description = "Fast functions for printing integer primitives to an io::Write";
authors = [ "David Tolnay " ];
sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
features = mkFeatures (features."itoa"."0.3.4" or {});
@@ -1013,6 +1044,7 @@ rec {
crates.json_macro."0.1.1" = deps: { features?(features_.json_macro."0.1.1" deps {}) }: buildRustCrate {
crateName = "json_macro";
version = "0.1.1";
+ description = "Pure json macro for rust_serialize. No need compiler features.";
authors = [ "Denis Kolodin " ];
sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy";
dependencies = mapFeatures features ([
@@ -1033,6 +1065,7 @@ rec {
crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate {
crateName = "kernel32-sys";
version = "0.2.2";
+ description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants.";
authors = [ "Peter Atashian " ];
sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
libName = "kernel32";
@@ -1061,6 +1094,7 @@ rec {
crates.lazy_static."0.2.11" = deps: { features?(features_.lazy_static."0.2.11" deps {}) }: buildRustCrate {
crateName = "lazy_static";
version = "0.2.11";
+ description = "A macro for declaring lazily evaluated statics in Rust.";
authors = [ "Marvin Löbel " ];
sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
dependencies = mapFeatures features ([
@@ -1069,19 +1103,19 @@ rec {
};
features_.lazy_static."0.2.11" = deps: f: updateFeatures f (rec {
lazy_static = fold recursiveUpdate {} [
- { "0.2.11".compiletest_rs =
- (f.lazy_static."0.2.11".compiletest_rs or false) ||
+ { "0.2.11"."compiletest_rs" =
+ (f.lazy_static."0.2.11"."compiletest_rs" or false) ||
(f.lazy_static."0.2.11".compiletest or false) ||
(lazy_static."0.2.11"."compiletest" or false); }
+ { "0.2.11"."nightly" =
+ (f.lazy_static."0.2.11"."nightly" or false) ||
+ (f.lazy_static."0.2.11".spin_no_std or false) ||
+ (lazy_static."0.2.11"."spin_no_std" or false); }
+ { "0.2.11"."spin" =
+ (f.lazy_static."0.2.11"."spin" or false) ||
+ (f.lazy_static."0.2.11".spin_no_std or false) ||
+ (lazy_static."0.2.11"."spin_no_std" or false); }
{ "0.2.11".default = (f.lazy_static."0.2.11".default or true); }
- { "0.2.11".nightly =
- (f.lazy_static."0.2.11".nightly or false) ||
- (f.lazy_static."0.2.11".spin_no_std or false) ||
- (lazy_static."0.2.11"."spin_no_std" or false); }
- { "0.2.11".spin =
- (f.lazy_static."0.2.11".spin or false) ||
- (f.lazy_static."0.2.11".spin_no_std or false) ||
- (lazy_static."0.2.11"."spin_no_std" or false); }
];
}) [];
@@ -1092,6 +1126,7 @@ rec {
crates.lazy_static."1.2.0" = deps: { features?(features_.lazy_static."1.2.0" deps {}) }: buildRustCrate {
crateName = "lazy_static";
version = "1.2.0";
+ description = "A macro for declaring lazily evaluated statics in Rust.";
authors = [ "Marvin Löbel " ];
sha256 = "07p3b30k2akyr6xw08ggd5qiz5nw3vd3agggj360fcc1njz7d0ss";
dependencies = mapFeatures features ([
@@ -1100,11 +1135,11 @@ rec {
};
features_.lazy_static."1.2.0" = deps: f: updateFeatures f (rec {
lazy_static = fold recursiveUpdate {} [
- { "1.2.0".default = (f.lazy_static."1.2.0".default or true); }
- { "1.2.0".spin =
- (f.lazy_static."1.2.0".spin or false) ||
+ { "1.2.0"."spin" =
+ (f.lazy_static."1.2.0"."spin" or false) ||
(f.lazy_static."1.2.0".spin_no_std or false) ||
(lazy_static."1.2.0"."spin_no_std" or false); }
+ { "1.2.0".default = (f.lazy_static."1.2.0".default or true); }
];
}) [];
@@ -1115,6 +1150,7 @@ rec {
crates.libc."0.2.44" = deps: { features?(features_.libc."0.2.44" deps {}) }: buildRustCrate {
crateName = "libc";
version = "0.2.44";
+ description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "17a7p0lcf3qwl1pcxffdflgnx8zr2659mgzzg4zi5fnv1mlj3q6z";
build = "build.rs";
@@ -1124,19 +1160,19 @@ rec {
};
features_.libc."0.2.44" = deps: f: updateFeatures f (rec {
libc = fold recursiveUpdate {} [
- { "0.2.44".align =
- (f.libc."0.2.44".align or false) ||
+ { "0.2.44"."align" =
+ (f.libc."0.2.44"."align" or false) ||
(f.libc."0.2.44".rustc-dep-of-std or false) ||
(libc."0.2.44"."rustc-dep-of-std" or false); }
- { "0.2.44".default = (f.libc."0.2.44".default or true); }
- { "0.2.44".rustc-std-workspace-core =
- (f.libc."0.2.44".rustc-std-workspace-core or false) ||
+ { "0.2.44"."rustc-std-workspace-core" =
+ (f.libc."0.2.44"."rustc-std-workspace-core" or false) ||
(f.libc."0.2.44".rustc-dep-of-std or false) ||
(libc."0.2.44"."rustc-dep-of-std" or false); }
- { "0.2.44".use_std =
- (f.libc."0.2.44".use_std or false) ||
+ { "0.2.44"."use_std" =
+ (f.libc."0.2.44"."use_std" or false) ||
(f.libc."0.2.44".default or false) ||
(libc."0.2.44"."default" or false); }
+ { "0.2.44".default = (f.libc."0.2.44".default or true); }
];
}) [];
@@ -1147,6 +1183,7 @@ rec {
crates.libloading."0.3.4" = deps: { features?(features_.libloading."0.3.4" deps {}) }: buildRustCrate {
crateName = "libloading";
version = "0.3.4";
+ description = "A safer binding to platform’s dynamic library loading utilities";
authors = [ "Simonas Kazlauskas " ];
sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
build = "build.rs";
@@ -1182,6 +1219,7 @@ rec {
crates.libloading."0.5.0" = deps: { features?(features_.libloading."0.5.0" deps {}) }: buildRustCrate {
crateName = "libloading";
version = "0.5.0";
+ description = "A safer binding to platform’s dynamic library loading utilities";
authors = [ "Simonas Kazlauskas " ];
sha256 = "11vzjaka1y979aril4ggwp33p35yz2isvx9m5w88r5sdcmq6iscn";
build = "build.rs";
@@ -1214,6 +1252,7 @@ rec {
crates.log."0.3.9" = deps: { features?(features_.log."0.3.9" deps {}) }: buildRustCrate {
crateName = "log";
version = "0.3.9";
+ description = "A lightweight logging facade for Rust\n";
authors = [ "The Rust Project Developers" ];
sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
dependencies = mapFeatures features ([
@@ -1276,11 +1315,11 @@ rec {
(log."0.3.9"."use_std" or false) ||
(f."log"."0.3.9"."use_std" or false); }
{ "${deps.log."0.3.9".log}".default = true; }
- { "0.3.9".default = (f.log."0.3.9".default or true); }
- { "0.3.9".use_std =
- (f.log."0.3.9".use_std or false) ||
+ { "0.3.9"."use_std" =
+ (f.log."0.3.9"."use_std" or false) ||
(f.log."0.3.9".default or false) ||
(log."0.3.9"."default" or false); }
+ { "0.3.9".default = (f.log."0.3.9".default or true); }
];
}) [
(features_.log."${deps."log"."0.3.9"."log"}" deps)
@@ -1293,6 +1332,7 @@ rec {
crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate {
crateName = "log";
version = "0.4.6";
+ description = "A lightweight logging facade for Rust\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr";
dependencies = mapFeatures features ([
@@ -1314,6 +1354,7 @@ rec {
crates.memchr."0.1.11" = deps: { features?(features_.memchr."0.1.11" deps {}) }: buildRustCrate {
crateName = "memchr";
version = "0.1.11";
+ description = "Safe interface to memchr.";
authors = [ "Andrew Gallant " "bluss" ];
sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8";
dependencies = mapFeatures features ([
@@ -1334,6 +1375,7 @@ rec {
crates.nix."0.6.0" = deps: { features?(features_.nix."0.6.0" deps {}) }: buildRustCrate {
crateName = "nix";
version = "0.6.0";
+ description = "Rust friendly bindings to *nix APIs";
authors = [ "Carl Lerche " ];
sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf";
build = "build.rs";
@@ -1374,6 +1416,7 @@ rec {
crates.nix."0.9.0" = deps: { features?(features_.nix."0.9.0" deps {}) }: buildRustCrate {
crateName = "nix";
version = "0.9.0";
+ description = "Rust friendly bindings to *nix APIs";
authors = [ "The nix-rust Project Developers" ];
sha256 = "00p63bphzwwn460rja5l2wcpgmv7ljf7illf6n95cppx63d180q0";
dependencies = mapFeatures features ([
@@ -1403,6 +1446,7 @@ rec {
crates.num_traits."0.1.43" = deps: { features?(features_.num_traits."0.1.43" deps {}) }: buildRustCrate {
crateName = "num-traits";
version = "0.1.43";
+ description = "Numeric traits for generic mathematics";
authors = [ "The Rust Project Developers" ];
sha256 = "1zdzx78vrcg3f39w94pqjs1mwxl1phyv7843hwgwkzggwcxhhf6s";
dependencies = mapFeatures features ([
@@ -1425,6 +1469,7 @@ rec {
crates.num_traits."0.2.6" = deps: { features?(features_.num_traits."0.2.6" deps {}) }: buildRustCrate {
crateName = "num-traits";
version = "0.2.6";
+ description = "Numeric traits for generic mathematics";
authors = [ "The Rust Project Developers" ];
sha256 = "1d20sil9n0wgznd1nycm3yjfj1mzyl41ambb7by1apxlyiil1azk";
build = "build.rs";
@@ -1432,11 +1477,11 @@ rec {
};
features_.num_traits."0.2.6" = deps: f: updateFeatures f (rec {
num_traits = fold recursiveUpdate {} [
- { "0.2.6".default = (f.num_traits."0.2.6".default or true); }
- { "0.2.6".std =
- (f.num_traits."0.2.6".std or false) ||
+ { "0.2.6"."std" =
+ (f.num_traits."0.2.6"."std" or false) ||
(f.num_traits."0.2.6".default or false) ||
(num_traits."0.2.6"."default" or false); }
+ { "0.2.6".default = (f.num_traits."0.2.6".default or true); }
];
}) [];
@@ -1447,6 +1492,7 @@ rec {
crates.ordermap."0.3.5" = deps: { features?(features_.ordermap."0.3.5" deps {}) }: buildRustCrate {
crateName = "ordermap";
version = "0.3.5";
+ description = "A hash table with consistent order and fast iteration.";
authors = [ "bluss" ];
sha256 = "0b6vxfyh627yqm6war3392g1hhi4dbn49ibx2qv6mv490jdhv7d3";
dependencies = mapFeatures features ([
@@ -1455,11 +1501,11 @@ rec {
};
features_.ordermap."0.3.5" = deps: f: updateFeatures f (rec {
ordermap = fold recursiveUpdate {} [
- { "0.3.5".default = (f.ordermap."0.3.5".default or true); }
- { "0.3.5".serde =
- (f.ordermap."0.3.5".serde or false) ||
+ { "0.3.5"."serde" =
+ (f.ordermap."0.3.5"."serde" or false) ||
(f.ordermap."0.3.5".serde-1 or false) ||
(ordermap."0.3.5"."serde-1" or false); }
+ { "0.3.5".default = (f.ordermap."0.3.5".default or true); }
];
}) [];
@@ -1470,6 +1516,7 @@ rec {
crates.petgraph."0.4.13" = deps: { features?(features_.petgraph."0.4.13" deps {}) }: buildRustCrate {
crateName = "petgraph";
version = "0.4.13";
+ description = "Graph data structure library. Provides graph types and graph algorithms.";
authors = [ "bluss" "mitchmindtree" ];
sha256 = "0a8k12b9vd0bndwqhafa853w186axdw05bv4kqjimyaz67428g1i";
dependencies = mapFeatures features ([
@@ -1482,43 +1529,43 @@ rec {
fixedbitset."${deps.petgraph."0.4.13".fixedbitset}".default = true;
ordermap."${deps.petgraph."0.4.13".ordermap}".default = true;
petgraph = fold recursiveUpdate {} [
- { "0.4.13".default = (f.petgraph."0.4.13".default or true); }
- { "0.4.13".generate =
- (f.petgraph."0.4.13".generate or false) ||
+ { "0.4.13"."generate" =
+ (f.petgraph."0.4.13"."generate" or false) ||
(f.petgraph."0.4.13".unstable or false) ||
(petgraph."0.4.13"."unstable" or false); }
- { "0.4.13".graphmap =
- (f.petgraph."0.4.13".graphmap or false) ||
+ { "0.4.13"."graphmap" =
+ (f.petgraph."0.4.13"."graphmap" or false) ||
(f.petgraph."0.4.13".all or false) ||
(petgraph."0.4.13"."all" or false) ||
(f.petgraph."0.4.13".default or false) ||
(petgraph."0.4.13"."default" or false); }
- { "0.4.13".ordermap =
- (f.petgraph."0.4.13".ordermap or false) ||
+ { "0.4.13"."ordermap" =
+ (f.petgraph."0.4.13"."ordermap" or false) ||
(f.petgraph."0.4.13".graphmap or false) ||
(petgraph."0.4.13"."graphmap" or false); }
- { "0.4.13".quickcheck =
- (f.petgraph."0.4.13".quickcheck or false) ||
+ { "0.4.13"."quickcheck" =
+ (f.petgraph."0.4.13"."quickcheck" or false) ||
(f.petgraph."0.4.13".all or false) ||
(petgraph."0.4.13"."all" or false); }
- { "0.4.13".serde =
- (f.petgraph."0.4.13".serde or false) ||
+ { "0.4.13"."serde" =
+ (f.petgraph."0.4.13"."serde" or false) ||
(f.petgraph."0.4.13".serde-1 or false) ||
(petgraph."0.4.13"."serde-1" or false); }
- { "0.4.13".serde_derive =
- (f.petgraph."0.4.13".serde_derive or false) ||
+ { "0.4.13"."serde_derive" =
+ (f.petgraph."0.4.13"."serde_derive" or false) ||
(f.petgraph."0.4.13".serde-1 or false) ||
(petgraph."0.4.13"."serde-1" or false); }
- { "0.4.13".stable_graph =
- (f.petgraph."0.4.13".stable_graph or false) ||
+ { "0.4.13"."stable_graph" =
+ (f.petgraph."0.4.13"."stable_graph" or false) ||
(f.petgraph."0.4.13".all or false) ||
(petgraph."0.4.13"."all" or false) ||
(f.petgraph."0.4.13".default or false) ||
(petgraph."0.4.13"."default" or false); }
- { "0.4.13".unstable =
- (f.petgraph."0.4.13".unstable or false) ||
+ { "0.4.13"."unstable" =
+ (f.petgraph."0.4.13"."unstable" or false) ||
(f.petgraph."0.4.13".all or false) ||
(petgraph."0.4.13"."all" or false); }
+ { "0.4.13".default = (f.petgraph."0.4.13".default or true); }
];
}) [
(features_.fixedbitset."${deps."petgraph"."0.4.13"."fixedbitset"}" deps)
@@ -1532,6 +1579,7 @@ rec {
crates.phf."0.7.23" = deps: { features?(features_.phf."0.7.23" deps {}) }: buildRustCrate {
crateName = "phf";
version = "0.7.23";
+ description = "Runtime support for perfect hash function data structures";
authors = [ "Steven Fackler " ];
sha256 = "0annmaf9mmm12g2cdwpip32p674pmsf6xpiwa27mz3glmz73y8aq";
libPath = "src/lib.rs";
@@ -1564,6 +1612,7 @@ rec {
crates.phf_codegen."0.7.23" = deps: { features?(features_.phf_codegen."0.7.23" deps {}) }: buildRustCrate {
crateName = "phf_codegen";
version = "0.7.23";
+ description = "Codegen library for PHF types";
authors = [ "Steven Fackler " ];
sha256 = "0k5ly0qykw56fxd19iy236wzghqdxq9zxnzcg8nm22cfzw4a35n0";
dependencies = mapFeatures features ([
@@ -1587,6 +1636,7 @@ rec {
crates.phf_generator."0.7.23" = deps: { features?(features_.phf_generator."0.7.23" deps {}) }: buildRustCrate {
crateName = "phf_generator";
version = "0.7.23";
+ description = "PHF generation logic";
authors = [ "Steven Fackler " ];
sha256 = "106cd0bx3jf7mf2gaa8nx62c1las1w95c5gwsd4yqm5lj2rj4mza";
dependencies = mapFeatures features ([
@@ -1610,6 +1660,7 @@ rec {
crates.phf_shared."0.7.23" = deps: { features?(features_.phf_shared."0.7.23" deps {}) }: buildRustCrate {
crateName = "phf_shared";
version = "0.7.23";
+ description = "Support code shared by PHF libraries";
authors = [ "Steven Fackler " ];
sha256 = "04gzsq9vg9j8cr39hpkddxb0yqjdknvcpnylw112rqamy7ml4fy1";
libPath = "src/lib.rs";
@@ -1632,6 +1683,7 @@ rec {
crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
crateName = "pkg-config";
version = "0.3.14";
+ description = "A library to run the pkg-config system tool at build time in order to be used in\nCargo build scripts.\n";
authors = [ "Alex Crichton " ];
sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
};
@@ -1646,6 +1698,7 @@ rec {
crates.rand."0.3.22" = deps: { features?(features_.rand."0.3.22" deps {}) }: buildRustCrate {
crateName = "rand";
version = "0.3.22";
+ description = "Random number generators and other randomness functionality.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0";
dependencies = mapFeatures features ([
@@ -1662,11 +1715,11 @@ rec {
libc."${deps.rand."0.3.22".libc}".default = true;
rand = fold recursiveUpdate {} [
{ "${deps.rand."0.3.22".rand}".default = true; }
- { "0.3.22".default = (f.rand."0.3.22".default or true); }
- { "0.3.22".i128_support =
- (f.rand."0.3.22".i128_support or false) ||
+ { "0.3.22"."i128_support" =
+ (f.rand."0.3.22"."i128_support" or false) ||
(f.rand."0.3.22".nightly or false) ||
(rand."0.3.22"."nightly" or false); }
+ { "0.3.22".default = (f.rand."0.3.22".default or true); }
];
}) [
(features_.libc."${deps."rand"."0.3.22"."libc"}" deps)
@@ -1681,6 +1734,7 @@ rec {
crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
crateName = "rand";
version = "0.4.3";
+ description = "Random number generators and other randomness functionality.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f";
dependencies = (if kernel == "fuchsia" then mapFeatures features ([
@@ -1698,19 +1752,19 @@ rec {
fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true;
libc."${deps.rand."0.4.3".libc}".default = true;
rand = fold recursiveUpdate {} [
- { "0.4.3".default = (f.rand."0.4.3".default or true); }
- { "0.4.3".i128_support =
- (f.rand."0.4.3".i128_support or false) ||
+ { "0.4.3"."i128_support" =
+ (f.rand."0.4.3"."i128_support" or false) ||
(f.rand."0.4.3".nightly or false) ||
(rand."0.4.3"."nightly" or false); }
- { "0.4.3".libc =
- (f.rand."0.4.3".libc or false) ||
+ { "0.4.3"."libc" =
+ (f.rand."0.4.3"."libc" or false) ||
(f.rand."0.4.3".std or false) ||
(rand."0.4.3"."std" or false); }
- { "0.4.3".std =
- (f.rand."0.4.3".std or false) ||
+ { "0.4.3"."std" =
+ (f.rand."0.4.3"."std" or false) ||
(f.rand."0.4.3".default or false) ||
(rand."0.4.3"."default" or false); }
+ { "0.4.3".default = (f.rand."0.4.3".default or true); }
];
winapi = fold recursiveUpdate {} [
{ "${deps.rand."0.4.3".winapi}"."minwindef" = true; }
@@ -1732,6 +1786,7 @@ rec {
crates.rand."0.5.5" = deps: { features?(features_.rand."0.5.5" deps {}) }: buildRustCrate {
crateName = "rand";
version = "0.5.5";
+ description = "Random number generators and other randomness functionality.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "0d7pnsh57qxhz1ghrzk113ddkn13kf2g758ffnbxq4nhwjfzhlc9";
dependencies = mapFeatures features ([
@@ -1758,43 +1813,43 @@ rec {
fuchsia_zircon."${deps.rand."0.5.5".fuchsia_zircon}".default = true;
libc."${deps.rand."0.5.5".libc}".default = true;
rand = fold recursiveUpdate {} [
- { "0.5.5".alloc =
- (f.rand."0.5.5".alloc or false) ||
+ { "0.5.5"."alloc" =
+ (f.rand."0.5.5"."alloc" or false) ||
(f.rand."0.5.5".std or false) ||
(rand."0.5.5"."std" or false); }
- { "0.5.5".cloudabi =
- (f.rand."0.5.5".cloudabi or false) ||
+ { "0.5.5"."cloudabi" =
+ (f.rand."0.5.5"."cloudabi" or false) ||
+ (f.rand."0.5.5".std or false) ||
+ (rand."0.5.5"."std" or false); }
+ { "0.5.5"."fuchsia-zircon" =
+ (f.rand."0.5.5"."fuchsia-zircon" or false) ||
+ (f.rand."0.5.5".std or false) ||
+ (rand."0.5.5"."std" or false); }
+ { "0.5.5"."i128_support" =
+ (f.rand."0.5.5"."i128_support" or false) ||
+ (f.rand."0.5.5".nightly or false) ||
+ (rand."0.5.5"."nightly" or false); }
+ { "0.5.5"."libc" =
+ (f.rand."0.5.5"."libc" or false) ||
+ (f.rand."0.5.5".std or false) ||
+ (rand."0.5.5"."std" or false); }
+ { "0.5.5"."serde" =
+ (f.rand."0.5.5"."serde" or false) ||
+ (f.rand."0.5.5".serde1 or false) ||
+ (rand."0.5.5"."serde1" or false); }
+ { "0.5.5"."serde_derive" =
+ (f.rand."0.5.5"."serde_derive" or false) ||
+ (f.rand."0.5.5".serde1 or false) ||
+ (rand."0.5.5"."serde1" or false); }
+ { "0.5.5"."std" =
+ (f.rand."0.5.5"."std" or false) ||
+ (f.rand."0.5.5".default or false) ||
+ (rand."0.5.5"."default" or false); }
+ { "0.5.5"."winapi" =
+ (f.rand."0.5.5"."winapi" or false) ||
(f.rand."0.5.5".std or false) ||
(rand."0.5.5"."std" or false); }
{ "0.5.5".default = (f.rand."0.5.5".default or true); }
- { "0.5.5".fuchsia-zircon =
- (f.rand."0.5.5".fuchsia-zircon or false) ||
- (f.rand."0.5.5".std or false) ||
- (rand."0.5.5"."std" or false); }
- { "0.5.5".i128_support =
- (f.rand."0.5.5".i128_support or false) ||
- (f.rand."0.5.5".nightly or false) ||
- (rand."0.5.5"."nightly" or false); }
- { "0.5.5".libc =
- (f.rand."0.5.5".libc or false) ||
- (f.rand."0.5.5".std or false) ||
- (rand."0.5.5"."std" or false); }
- { "0.5.5".serde =
- (f.rand."0.5.5".serde or false) ||
- (f.rand."0.5.5".serde1 or false) ||
- (rand."0.5.5"."serde1" or false); }
- { "0.5.5".serde_derive =
- (f.rand."0.5.5".serde_derive or false) ||
- (f.rand."0.5.5".serde1 or false) ||
- (rand."0.5.5"."serde1" or false); }
- { "0.5.5".std =
- (f.rand."0.5.5".std or false) ||
- (f.rand."0.5.5".default or false) ||
- (rand."0.5.5"."default" or false); }
- { "0.5.5".winapi =
- (f.rand."0.5.5".winapi or false) ||
- (f.rand."0.5.5".std or false) ||
- (rand."0.5.5"."std" or false); }
];
rand_core = fold recursiveUpdate {} [
{ "${deps.rand."0.5.5".rand_core}"."alloc" =
@@ -1833,6 +1888,7 @@ rec {
crates.rand_core."0.2.2" = deps: { features?(features_.rand_core."0.2.2" deps {}) }: buildRustCrate {
crateName = "rand_core";
version = "0.2.2";
+ description = "Core random number generator traits and tools for implementation.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1cxnaxmsirz2wxsajsjkd1wk6lqfqbcprqkha4bq3didznrl22sc";
dependencies = mapFeatures features ([
@@ -1868,6 +1924,7 @@ rec {
crates.rand_core."0.3.0" = deps: { features?(features_.rand_core."0.3.0" deps {}) }: buildRustCrate {
crateName = "rand_core";
version = "0.3.0";
+ description = "Core random number generator traits and tools for implementation.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "1vafw316apjys9va3j987s02djhqp7y21v671v3ix0p5j9bjq339";
dependencies = mapFeatures features ([
@@ -1876,23 +1933,23 @@ rec {
};
features_.rand_core."0.3.0" = deps: f: updateFeatures f (rec {
rand_core = fold recursiveUpdate {} [
- { "0.3.0".alloc =
- (f.rand_core."0.3.0".alloc or false) ||
+ { "0.3.0"."alloc" =
+ (f.rand_core."0.3.0"."alloc" or false) ||
(f.rand_core."0.3.0".std or false) ||
(rand_core."0.3.0"."std" or false); }
- { "0.3.0".default = (f.rand_core."0.3.0".default or true); }
- { "0.3.0".serde =
- (f.rand_core."0.3.0".serde or false) ||
+ { "0.3.0"."serde" =
+ (f.rand_core."0.3.0"."serde" or false) ||
(f.rand_core."0.3.0".serde1 or false) ||
(rand_core."0.3.0"."serde1" or false); }
- { "0.3.0".serde_derive =
- (f.rand_core."0.3.0".serde_derive or false) ||
+ { "0.3.0"."serde_derive" =
+ (f.rand_core."0.3.0"."serde_derive" or false) ||
(f.rand_core."0.3.0".serde1 or false) ||
(rand_core."0.3.0"."serde1" or false); }
- { "0.3.0".std =
- (f.rand_core."0.3.0".std or false) ||
+ { "0.3.0"."std" =
+ (f.rand_core."0.3.0"."std" or false) ||
(f.rand_core."0.3.0".default or false) ||
(rand_core."0.3.0"."default" or false); }
+ { "0.3.0".default = (f.rand_core."0.3.0".default or true); }
];
}) [];
@@ -1903,6 +1960,7 @@ rec {
crates.regex."0.1.80" = deps: { features?(features_.regex."0.1.80" deps {}) }: buildRustCrate {
crateName = "regex";
version = "0.1.80";
+ description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6";
dependencies = mapFeatures features ([
@@ -1918,11 +1976,11 @@ rec {
aho_corasick."${deps.regex."0.1.80".aho_corasick}".default = true;
memchr."${deps.regex."0.1.80".memchr}".default = true;
regex = fold recursiveUpdate {} [
- { "0.1.80".default = (f.regex."0.1.80".default or true); }
- { "0.1.80".simd =
- (f.regex."0.1.80".simd or false) ||
+ { "0.1.80"."simd" =
+ (f.regex."0.1.80"."simd" or false) ||
(f.regex."0.1.80".simd-accel or false) ||
(regex."0.1.80"."simd-accel" or false); }
+ { "0.1.80".default = (f.regex."0.1.80".default or true); }
];
regex_syntax."${deps.regex."0.1.80".regex_syntax}".default = true;
thread_local."${deps.regex."0.1.80".thread_local}".default = true;
@@ -1942,6 +2000,7 @@ rec {
crates.regex_syntax."0.3.9" = deps: { features?(features_.regex_syntax."0.3.9" deps {}) }: buildRustCrate {
crateName = "regex-syntax";
version = "0.3.9";
+ description = "A regular expression parser.";
authors = [ "The Rust Project Developers" ];
sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
};
@@ -1956,6 +2015,7 @@ rec {
crates.rlua."0.9.7" = deps: { features?(features_.rlua."0.9.7" deps {}) }: buildRustCrate {
crateName = "rlua";
version = "0.9.7";
+ description = "High level bindings to Lua 5.3";
authors = [ "kyren " ];
sha256 = "1671b5ga54aq49sqx69hvnjr732hf9jpqwswwxgpcqq8q05mfzgp";
dependencies = mapFeatures features ([
@@ -1971,15 +2031,15 @@ rec {
gcc."${deps.rlua."0.9.7".gcc}".default = true;
libc."${deps.rlua."0.9.7".libc}".default = true;
rlua = fold recursiveUpdate {} [
- { "0.9.7".builtin-lua =
- (f.rlua."0.9.7".builtin-lua or false) ||
+ { "0.9.7"."builtin-lua" =
+ (f.rlua."0.9.7"."builtin-lua" or false) ||
(f.rlua."0.9.7".default or false) ||
(rlua."0.9.7"."default" or false); }
- { "0.9.7".default = (f.rlua."0.9.7".default or true); }
- { "0.9.7".gcc =
- (f.rlua."0.9.7".gcc or false) ||
+ { "0.9.7"."gcc" =
+ (f.rlua."0.9.7"."gcc" or false) ||
(f.rlua."0.9.7".builtin-lua or false) ||
(rlua."0.9.7"."builtin-lua" or false); }
+ { "0.9.7".default = (f.rlua."0.9.7".default or true); }
];
}) [
(features_.libc."${deps."rlua"."0.9.7"."libc"}" deps)
@@ -1993,6 +2053,7 @@ rec {
crates.rustc_serialize."0.3.24" = deps: { features?(features_.rustc_serialize."0.3.24" deps {}) }: buildRustCrate {
crateName = "rustc-serialize";
version = "0.3.24";
+ description = "Generic serialization/deserialization support corresponding to the\n`derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes\nsupport for hex, base64, and json encoding and decoding.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
};
@@ -2007,6 +2068,7 @@ rec {
crates.rustc_version."0.1.7" = deps: { features?(features_.rustc_version."0.1.7" deps {}) }: buildRustCrate {
crateName = "rustc_version";
version = "0.1.7";
+ description = "A library for querying the version of a installed rustc compiler";
authors = [ "Marvin Löbel " ];
sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
dependencies = mapFeatures features ([
@@ -2027,6 +2089,7 @@ rec {
crates.rustwlc."0.7.0" = deps: { features?(features_.rustwlc."0.7.0" deps {}) }: buildRustCrate {
crateName = "rustwlc";
version = "0.7.0";
+ description = "wlc Wayland library bindings for Rust";
authors = [ "Snirk Immington " "Timidger " ];
sha256 = "0gqi9pdw74al33ja25h33q68vnfklj3gpjgkiqqbr3gflgli5h1i";
build = "build.rs";
@@ -2041,11 +2104,11 @@ rec {
bitflags."${deps.rustwlc."0.7.0".bitflags}".default = true;
libc."${deps.rustwlc."0.7.0".libc}".default = true;
rustwlc = fold recursiveUpdate {} [
- { "0.7.0".default = (f.rustwlc."0.7.0".default or true); }
- { "0.7.0".wayland-sys =
- (f.rustwlc."0.7.0".wayland-sys or false) ||
+ { "0.7.0"."wayland-sys" =
+ (f.rustwlc."0.7.0"."wayland-sys" or false) ||
(f.rustwlc."0.7.0".wlc-wayland or false) ||
(rustwlc."0.7.0"."wlc-wayland" or false); }
+ { "0.7.0".default = (f.rustwlc."0.7.0".default or true); }
];
wayland_sys = fold recursiveUpdate {} [
{ "${deps.rustwlc."0.7.0".wayland_sys}"."server" = true; }
@@ -2064,6 +2127,7 @@ rec {
crates.semver."0.1.20" = deps: { features?(features_.semver."0.1.20" deps {}) }: buildRustCrate {
crateName = "semver";
version = "0.1.20";
+ description = "Semantic version parsing and comparison.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
};
@@ -2078,6 +2142,7 @@ rec {
crates.serde."0.9.15" = deps: { features?(features_.serde."0.9.15" deps {}) }: buildRustCrate {
crateName = "serde";
version = "0.9.15";
+ description = "A generic serialization/deserialization framework";
authors = [ "Erick Tryzelaar " ];
sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
dependencies = mapFeatures features ([
@@ -2086,29 +2151,29 @@ rec {
};
features_.serde."0.9.15" = deps: f: updateFeatures f (rec {
serde = fold recursiveUpdate {} [
- { "0.9.15".alloc =
- (f.serde."0.9.15".alloc or false) ||
+ { "0.9.15"."alloc" =
+ (f.serde."0.9.15"."alloc" or false) ||
(f.serde."0.9.15".collections or false) ||
(serde."0.9.15"."collections" or false); }
- { "0.9.15".default = (f.serde."0.9.15".default or true); }
- { "0.9.15".serde_derive =
- (f.serde."0.9.15".serde_derive or false) ||
+ { "0.9.15"."serde_derive" =
+ (f.serde."0.9.15"."serde_derive" or false) ||
(f.serde."0.9.15".derive or false) ||
(serde."0.9.15"."derive" or false) ||
(f.serde."0.9.15".playground or false) ||
(serde."0.9.15"."playground" or false); }
- { "0.9.15".std =
- (f.serde."0.9.15".std or false) ||
+ { "0.9.15"."std" =
+ (f.serde."0.9.15"."std" or false) ||
(f.serde."0.9.15".default or false) ||
(serde."0.9.15"."default" or false) ||
(f.serde."0.9.15".unstable-testing or false) ||
(serde."0.9.15"."unstable-testing" or false); }
- { "0.9.15".unstable =
- (f.serde."0.9.15".unstable or false) ||
+ { "0.9.15"."unstable" =
+ (f.serde."0.9.15"."unstable" or false) ||
(f.serde."0.9.15".alloc or false) ||
(serde."0.9.15"."alloc" or false) ||
(f.serde."0.9.15".unstable-testing or false) ||
(serde."0.9.15"."unstable-testing" or false); }
+ { "0.9.15".default = (f.serde."0.9.15".default or true); }
];
}) [];
@@ -2119,6 +2184,7 @@ rec {
crates.serde_json."0.9.10" = deps: { features?(features_.serde_json."0.9.10" deps {}) }: buildRustCrate {
crateName = "serde_json";
version = "0.9.10";
+ description = "A JSON serialization file format";
authors = [ "Erick Tryzelaar " ];
sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
dependencies = mapFeatures features ([
@@ -2135,11 +2201,11 @@ rec {
num_traits."${deps.serde_json."0.9.10".num_traits}".default = true;
serde."${deps.serde_json."0.9.10".serde}".default = true;
serde_json = fold recursiveUpdate {} [
- { "0.9.10".default = (f.serde_json."0.9.10".default or true); }
- { "0.9.10".linked-hash-map =
- (f.serde_json."0.9.10".linked-hash-map or false) ||
+ { "0.9.10"."linked-hash-map" =
+ (f.serde_json."0.9.10"."linked-hash-map" or false) ||
(f.serde_json."0.9.10".preserve_order or false) ||
(serde_json."0.9.10"."preserve_order" or false); }
+ { "0.9.10".default = (f.serde_json."0.9.10".default or true); }
];
}) [
(features_.dtoa."${deps."serde_json"."0.9.10"."dtoa"}" deps)
@@ -2155,6 +2221,7 @@ rec {
crates.siphasher."0.2.3" = deps: { features?(features_.siphasher."0.2.3" deps {}) }: buildRustCrate {
crateName = "siphasher";
version = "0.2.3";
+ description = "SipHash functions from rust-core < 1.13";
authors = [ "Frank Denis " ];
sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
};
@@ -2169,6 +2236,7 @@ rec {
crates.target_build_utils."0.3.1" = deps: { features?(features_.target_build_utils."0.3.1" deps {}) }: buildRustCrate {
crateName = "target_build_utils";
version = "0.3.1";
+ description = "DEPRECATED: Use Cargo environment variables `CARGO_CFG_TARGET_*`";
authors = [ "Simonas Kazlauskas " ];
sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
build = "build.rs";
@@ -2187,11 +2255,11 @@ rec {
phf_codegen."${deps.target_build_utils."0.3.1".phf_codegen}".default = true;
serde_json."${deps.target_build_utils."0.3.1".serde_json}".default = true;
target_build_utils = fold recursiveUpdate {} [
- { "0.3.1".default = (f.target_build_utils."0.3.1".default or true); }
- { "0.3.1".serde_json =
- (f.target_build_utils."0.3.1".serde_json or false) ||
+ { "0.3.1"."serde_json" =
+ (f.target_build_utils."0.3.1"."serde_json" or false) ||
(f.target_build_utils."0.3.1".default or false) ||
(target_build_utils."0.3.1"."default" or false); }
+ { "0.3.1".default = (f.target_build_utils."0.3.1".default or true); }
];
}) [
(features_.phf."${deps."target_build_utils"."0.3.1"."phf"}" deps)
@@ -2206,6 +2274,7 @@ rec {
crates.thread_id."2.0.0" = deps: { features?(features_.thread_id."2.0.0" deps {}) }: buildRustCrate {
crateName = "thread-id";
version = "2.0.0";
+ description = "Get a unique thread ID";
authors = [ "Ruud van Asseldonk " ];
sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3";
dependencies = mapFeatures features ([
@@ -2229,6 +2298,7 @@ rec {
crates.thread_local."0.2.7" = deps: { features?(features_.thread_local."0.2.7" deps {}) }: buildRustCrate {
crateName = "thread_local";
version = "0.2.7";
+ description = "Per-object thread-local storage";
authors = [ "Amanieu d'Antras " ];
sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7";
dependencies = mapFeatures features ([
@@ -2249,6 +2319,7 @@ rec {
crates.token_store."0.1.2" = deps: { features?(features_.token_store."0.1.2" deps {}) }: buildRustCrate {
crateName = "token_store";
version = "0.1.2";
+ description = "A token-based store for arbitrary values";
authors = [ "Victor Berger " ];
sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq";
};
@@ -2263,6 +2334,7 @@ rec {
crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
crateName = "unicode-width";
version = "0.1.5";
+ description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n";
authors = [ "kwantam " ];
sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
features = mkFeatures (features."unicode_width"."0.1.5" or {});
@@ -2278,6 +2350,7 @@ rec {
crates.utf8_ranges."0.1.3" = deps: { features?(features_.utf8_ranges."0.1.3" deps {}) }: buildRustCrate {
crateName = "utf8-ranges";
version = "0.1.3";
+ description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges.";
authors = [ "Andrew Gallant " ];
sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
};
@@ -2292,6 +2365,7 @@ rec {
crates.uuid."0.3.1" = deps: { features?(features_.uuid."0.3.1" deps {}) }: buildRustCrate {
crateName = "uuid";
version = "0.3.1";
+ description = "A library to generate and parse UUIDs.\n";
authors = [ "The Rust Project Developers" ];
sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip";
dependencies = mapFeatures features ([
@@ -2304,15 +2378,15 @@ rec {
rand."${deps.uuid."0.3.1".rand}".default = true;
rustc_serialize."${deps.uuid."0.3.1".rustc_serialize}".default = true;
uuid = fold recursiveUpdate {} [
- { "0.3.1".default = (f.uuid."0.3.1".default or true); }
- { "0.3.1".rand =
- (f.uuid."0.3.1".rand or false) ||
+ { "0.3.1"."rand" =
+ (f.uuid."0.3.1"."rand" or false) ||
(f.uuid."0.3.1".v4 or false) ||
(uuid."0.3.1"."v4" or false); }
- { "0.3.1".sha1 =
- (f.uuid."0.3.1".sha1 or false) ||
+ { "0.3.1"."sha1" =
+ (f.uuid."0.3.1"."sha1" or false) ||
(f.uuid."0.3.1".v5 or false) ||
(uuid."0.3.1"."v5" or false); }
+ { "0.3.1".default = (f.uuid."0.3.1".default or true); }
];
}) [
(features_.rand."${deps."uuid"."0.3.1"."rand"}" deps)
@@ -2326,17 +2400,18 @@ rec {
crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate {
crateName = "void";
version = "1.0.2";
+ description = "The uninhabited void type for use in statically impossible cases.";
authors = [ "Jonathan Reem " ];
sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
features = mkFeatures (features."void"."1.0.2" or {});
};
features_.void."1.0.2" = deps: f: updateFeatures f (rec {
void = fold recursiveUpdate {} [
- { "1.0.2".default = (f.void."1.0.2".default or true); }
- { "1.0.2".std =
- (f.void."1.0.2".std or false) ||
+ { "1.0.2"."std" =
+ (f.void."1.0.2"."std" or false) ||
(f.void."1.0.2".default or false) ||
(void."1.0.2"."default" or false); }
+ { "1.0.2".default = (f.void."1.0.2".default or true); }
];
}) [];
@@ -2347,6 +2422,7 @@ rec {
crates.way_cooler."0.8.1" = deps: { features?(features_.way_cooler."0.8.1" deps {}) }: buildRustCrate {
crateName = "way-cooler";
version = "0.8.1";
+ description = "Customizeable Wayland compositor written in Rust";
authors = [ "Snirk Immington " "Timidger " ];
sha256 = "01cp5z0qf522d7cvsr9gfp7f4hkphmp38hv70dsf9lvcnp6p1qkc";
build = "build.rs";
@@ -2459,6 +2535,7 @@ rec {
crates.wayland_scanner."0.12.5" = deps: { features?(features_.wayland_scanner."0.12.5" deps {}) }: buildRustCrate {
crateName = "wayland-scanner";
version = "0.12.5";
+ description = "Wayland Scanner for generating rust APIs from XML wayland protocol files. Intented for use with wayland-sys. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
authors = [ "Victor Berger " ];
sha256 = "1s0fsc3pff0fxvzqsy8n018smwacih9ix8ww0yf969aa0vak15dz";
dependencies = mapFeatures features ([
@@ -2479,6 +2556,7 @@ rec {
crates.wayland_server."0.12.5" = deps: { features?(features_.wayland_server."0.12.5" deps {}) }: buildRustCrate {
crateName = "wayland-server";
version = "0.12.5";
+ description = "Bindings to the standard C implementation of the wayland protocol, server side.";
authors = [ "Victor Berger " ];
sha256 = "17g0m9afcmi24ylirw4l8i70s5849x7m4b5nxk9k13s5pkza68ag";
build = "build.rs";
@@ -2526,6 +2604,7 @@ rec {
crates.wayland_sys."0.6.0" = deps: { features?(features_.wayland_sys."0.6.0" deps {}) }: buildRustCrate {
crateName = "wayland-sys";
version = "0.6.0";
+ description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
authors = [ "Victor Berger " ];
sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl";
dependencies = mapFeatures features ([
@@ -2544,15 +2623,15 @@ rec {
];
libc."${deps.wayland_sys."0.6.0".libc}".default = true;
wayland_sys = fold recursiveUpdate {} [
- { "0.6.0".default = (f.wayland_sys."0.6.0".default or true); }
- { "0.6.0".lazy_static =
- (f.wayland_sys."0.6.0".lazy_static or false) ||
+ { "0.6.0"."lazy_static" =
+ (f.wayland_sys."0.6.0"."lazy_static" or false) ||
(f.wayland_sys."0.6.0".dlopen or false) ||
(wayland_sys."0.6.0"."dlopen" or false); }
- { "0.6.0".libc =
- (f.wayland_sys."0.6.0".libc or false) ||
+ { "0.6.0"."libc" =
+ (f.wayland_sys."0.6.0"."libc" or false) ||
(f.wayland_sys."0.6.0".server or false) ||
(wayland_sys."0.6.0"."server" or false); }
+ { "0.6.0".default = (f.wayland_sys."0.6.0".default or true); }
];
}) [
(features_.dlib."${deps."wayland_sys"."0.6.0"."dlib"}" deps)
@@ -2566,6 +2645,7 @@ rec {
crates.wayland_sys."0.9.10" = deps: { features?(features_.wayland_sys."0.9.10" deps {}) }: buildRustCrate {
crateName = "wayland-sys";
version = "0.9.10";
+ description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
authors = [ "Victor Berger " ];
sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8";
dependencies = mapFeatures features ([
@@ -2586,15 +2666,15 @@ rec {
lazy_static."${deps.wayland_sys."0.9.10".lazy_static}".default = true;
libc."${deps.wayland_sys."0.9.10".libc}".default = true;
wayland_sys = fold recursiveUpdate {} [
- { "0.9.10".default = (f.wayland_sys."0.9.10".default or true); }
- { "0.9.10".lazy_static =
- (f.wayland_sys."0.9.10".lazy_static or false) ||
+ { "0.9.10"."lazy_static" =
+ (f.wayland_sys."0.9.10"."lazy_static" or false) ||
(f.wayland_sys."0.9.10".dlopen or false) ||
(wayland_sys."0.9.10"."dlopen" or false); }
- { "0.9.10".libc =
- (f.wayland_sys."0.9.10".libc or false) ||
+ { "0.9.10"."libc" =
+ (f.wayland_sys."0.9.10"."libc" or false) ||
(f.wayland_sys."0.9.10".server or false) ||
(wayland_sys."0.9.10"."server" or false); }
+ { "0.9.10".default = (f.wayland_sys."0.9.10".default or true); }
];
}) [
(features_.dlib."${deps."wayland_sys"."0.9.10"."dlib"}" deps)
@@ -2609,6 +2689,7 @@ rec {
crates.wayland_sys."0.12.5" = deps: { features?(features_.wayland_sys."0.12.5" deps {}) }: buildRustCrate {
crateName = "wayland-sys";
version = "0.12.5";
+ description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
authors = [ "Victor Berger " ];
sha256 = "0mwk5vc7mibxka5w66vy2qj32b72d1srqvp36nr15xfl9lwf3dc4";
dependencies = mapFeatures features ([
@@ -2629,15 +2710,15 @@ rec {
lazy_static."${deps.wayland_sys."0.12.5".lazy_static}".default = true;
libc."${deps.wayland_sys."0.12.5".libc}".default = true;
wayland_sys = fold recursiveUpdate {} [
- { "0.12.5".default = (f.wayland_sys."0.12.5".default or true); }
- { "0.12.5".lazy_static =
- (f.wayland_sys."0.12.5".lazy_static or false) ||
+ { "0.12.5"."lazy_static" =
+ (f.wayland_sys."0.12.5"."lazy_static" or false) ||
(f.wayland_sys."0.12.5".dlopen or false) ||
(wayland_sys."0.12.5"."dlopen" or false); }
- { "0.12.5".libc =
- (f.wayland_sys."0.12.5".libc or false) ||
+ { "0.12.5"."libc" =
+ (f.wayland_sys."0.12.5"."libc" or false) ||
(f.wayland_sys."0.12.5".server or false) ||
(wayland_sys."0.12.5"."server" or false); }
+ { "0.12.5".default = (f.wayland_sys."0.12.5".default or true); }
];
}) [
(features_.dlib."${deps."wayland_sys"."0.12.5"."dlib"}" deps)
@@ -2652,6 +2733,7 @@ rec {
crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate {
crateName = "winapi";
version = "0.2.8";
+ description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings.";
authors = [ "Peter Atashian " ];
sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
};
@@ -2666,6 +2748,7 @@ rec {
crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
crateName = "winapi";
version = "0.3.6";
+ description = "Raw FFI bindings for all of Windows API.";
authors = [ "Peter Atashian " ];
sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4";
build = "build.rs";
@@ -2693,6 +2776,7 @@ rec {
crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate {
crateName = "winapi-build";
version = "0.1.1";
+ description = "Common code for build.rs in WinAPI -sys crates.";
authors = [ "Peter Atashian " ];
sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
libName = "build";
@@ -2708,6 +2792,7 @@ rec {
crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
crateName = "winapi-i686-pc-windows-gnu";
version = "0.4.0";
+ description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
authors = [ "Peter Atashian " ];
sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
build = "build.rs";
@@ -2723,6 +2808,7 @@ rec {
crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
crateName = "winapi-x86_64-pc-windows-gnu";
version = "0.4.0";
+ description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
authors = [ "Peter Atashian " ];
sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
build = "build.rs";
@@ -2738,6 +2824,7 @@ rec {
crates.xcb."0.8.2" = deps: { features?(features_.xcb."0.8.2" deps {}) }: buildRustCrate {
crateName = "xcb";
version = "0.8.2";
+ description = "Rust bindings and wrappers for XCB";
authors = [ "Remi Thebault " ];
sha256 = "06l8jms57wvz01vx82a3cwak9b9qwdkadvpmkk1zimy2qg7i7dkl";
build = "build.rs";
@@ -2755,41 +2842,40 @@ rec {
libc."${deps.xcb."0.8.2".libc}".default = true;
log."${deps.xcb."0.8.2".log}".default = true;
xcb = fold recursiveUpdate {} [
- { "0.8.2".composite =
- (f.xcb."0.8.2".composite or false) ||
+ { "0.8.2"."composite" =
+ (f.xcb."0.8.2"."composite" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".damage =
- (f.xcb."0.8.2".damage or false) ||
+ { "0.8.2"."damage" =
+ (f.xcb."0.8.2"."damage" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".default = (f.xcb."0.8.2".default or true); }
- { "0.8.2".dpms =
- (f.xcb."0.8.2".dpms or false) ||
+ { "0.8.2"."dpms" =
+ (f.xcb."0.8.2"."dpms" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".dri2 =
- (f.xcb."0.8.2".dri2 or false) ||
+ { "0.8.2"."dri2" =
+ (f.xcb."0.8.2"."dri2" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".dri3 =
- (f.xcb."0.8.2".dri3 or false) ||
+ { "0.8.2"."dri3" =
+ (f.xcb."0.8.2"."dri3" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".glx =
- (f.xcb."0.8.2".glx or false) ||
+ { "0.8.2"."glx" =
+ (f.xcb."0.8.2"."glx" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".randr =
- (f.xcb."0.8.2".randr or false) ||
+ { "0.8.2"."randr" =
+ (f.xcb."0.8.2"."randr" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".record =
- (f.xcb."0.8.2".record or false) ||
+ { "0.8.2"."record" =
+ (f.xcb."0.8.2"."record" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".render =
- (f.xcb."0.8.2".render or false) ||
+ { "0.8.2"."render" =
+ (f.xcb."0.8.2"."render" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false) ||
(f.xcb."0.8.2".present or false) ||
@@ -2798,44 +2884,44 @@ rec {
(xcb."0.8.2"."randr" or false) ||
(f.xcb."0.8.2".xfixes or false) ||
(xcb."0.8.2"."xfixes" or false); }
- { "0.8.2".res =
- (f.xcb."0.8.2".res or false) ||
+ { "0.8.2"."res" =
+ (f.xcb."0.8.2"."res" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".screensaver =
- (f.xcb."0.8.2".screensaver or false) ||
+ { "0.8.2"."screensaver" =
+ (f.xcb."0.8.2"."screensaver" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".shape =
- (f.xcb."0.8.2".shape or false) ||
+ { "0.8.2"."shape" =
+ (f.xcb."0.8.2"."shape" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false) ||
(f.xcb."0.8.2".xfixes or false) ||
(xcb."0.8.2"."xfixes" or false); }
- { "0.8.2".shm =
- (f.xcb."0.8.2".shm or false) ||
+ { "0.8.2"."shm" =
+ (f.xcb."0.8.2"."shm" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false) ||
(f.xcb."0.8.2".xv or false) ||
(xcb."0.8.2"."xv" or false); }
- { "0.8.2".sync =
- (f.xcb."0.8.2".sync or false) ||
+ { "0.8.2"."sync" =
+ (f.xcb."0.8.2"."sync" or false) ||
(f.xcb."0.8.2".present or false) ||
(xcb."0.8.2"."present" or false); }
- { "0.8.2".thread =
- (f.xcb."0.8.2".thread or false) ||
+ { "0.8.2"."thread" =
+ (f.xcb."0.8.2"."thread" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xevie =
- (f.xcb."0.8.2".xevie or false) ||
+ { "0.8.2"."xevie" =
+ (f.xcb."0.8.2"."xevie" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xf86dri =
- (f.xcb."0.8.2".xf86dri or false) ||
+ { "0.8.2"."xf86dri" =
+ (f.xcb."0.8.2"."xf86dri" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xfixes =
- (f.xcb."0.8.2".xfixes or false) ||
+ { "0.8.2"."xfixes" =
+ (f.xcb."0.8.2"."xfixes" or false) ||
(f.xcb."0.8.2".composite or false) ||
(xcb."0.8.2"."composite" or false) ||
(f.xcb."0.8.2".damage or false) ||
@@ -2846,40 +2932,41 @@ rec {
(xcb."0.8.2"."present" or false) ||
(f.xcb."0.8.2".xinput or false) ||
(xcb."0.8.2"."xinput" or false); }
- { "0.8.2".xinerama =
- (f.xcb."0.8.2".xinerama or false) ||
+ { "0.8.2"."xinerama" =
+ (f.xcb."0.8.2"."xinerama" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xkb =
- (f.xcb."0.8.2".xkb or false) ||
+ { "0.8.2"."xkb" =
+ (f.xcb."0.8.2"."xkb" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xlib_xcb =
- (f.xcb."0.8.2".xlib_xcb or false) ||
+ { "0.8.2"."xlib_xcb" =
+ (f.xcb."0.8.2"."xlib_xcb" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xprint =
- (f.xcb."0.8.2".xprint or false) ||
+ { "0.8.2"."xprint" =
+ (f.xcb."0.8.2"."xprint" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xselinux =
- (f.xcb."0.8.2".xselinux or false) ||
+ { "0.8.2"."xselinux" =
+ (f.xcb."0.8.2"."xselinux" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xtest =
- (f.xcb."0.8.2".xtest or false) ||
+ { "0.8.2"."xtest" =
+ (f.xcb."0.8.2"."xtest" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
- { "0.8.2".xv =
- (f.xcb."0.8.2".xv or false) ||
+ { "0.8.2"."xv" =
+ (f.xcb."0.8.2"."xv" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false) ||
(f.xcb."0.8.2".xvmc or false) ||
(xcb."0.8.2"."xvmc" or false); }
- { "0.8.2".xvmc =
- (f.xcb."0.8.2".xvmc or false) ||
+ { "0.8.2"."xvmc" =
+ (f.xcb."0.8.2"."xvmc" or false) ||
(f.xcb."0.8.2".debug_all or false) ||
(xcb."0.8.2"."debug_all" or false); }
+ { "0.8.2".default = (f.xcb."0.8.2".default or true); }
];
}) [
(features_.libc."${deps."xcb"."0.8.2"."libc"}" deps)
@@ -2894,6 +2981,7 @@ rec {
crates.xml_rs."0.7.0" = deps: { features?(features_.xml_rs."0.7.0" deps {}) }: buildRustCrate {
crateName = "xml-rs";
version = "0.7.0";
+ description = "An XML library in pure Rust";
authors = [ "Vladimir Matveev " ];
sha256 = "12rynhqjgkg2hzy9x1d1232p9d9jm40bc3by5yzjv8gx089mflyb";
libPath = "src/lib.rs";
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index 8f35cb620ca..9ebb0b5ffcf 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -1,8 +1,10 @@
{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
-, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
+, wayland, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk-pixbuf
}:
let
+ wlc = callPackage ./wlc.nix {};
+
# refer to
# https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh
# for version numbers
@@ -22,7 +24,7 @@ let
way-cooler = ((way_cooler_ { builtin-lua = true; }).override {
crateOverrides = defaultCrateOverrides // {
- way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; };
+ way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; };
};}).overrideAttrs (oldAttrs: rec {
postBuild = ''
mkdir -p $out/etc
@@ -105,7 +107,7 @@ in symlinkJoin rec {
homepage = http://way-cooler.org/;
license = with licenses; [ mit ];
maintainers = [ maintainers.miltador ];
- broken = stdenv.hostPlatform.isAarch64; # fails to build wc-bg (on aarch64)
platforms = platforms.all;
+ broken = true;
};
}
diff --git a/pkgs/applications/window-managers/way-cooler/wlc.nix b/pkgs/applications/window-managers/way-cooler/wlc.nix
new file mode 100644
index 00000000000..03d0b3023f7
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/wlc.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL
+, libX11, dbus, wayland-protocols, libdrm, mesa
+, libpthreadstubs, libXdmcp, libXext, libXfixes
+, withOptionalPackages ? true, zlib, valgrind, doxygen
+}:
+
+stdenv.mkDerivation rec {
+ pname = "wlc";
+ version = "0.0.11";
+
+ src = fetchFromGitHub {
+ owner = "Cloudef";
+ repo = "wlc";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "1qnak907gjd35hq4b0rrhgb7kz5iwnirh8yk372yzxpgk7dq0gz9";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [
+ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL
+ libX11 libXfixes dbus wayland-protocols
+ libpthreadstubs libXdmcp libXext libdrm mesa ]
+ ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
+
+ doCheck = true;
+ checkTarget = "test";
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A library for making a simple Wayland compositor";
+ homepage = https://github.com/Cloudef/wlc;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
+ };
+}
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index b9d16db5792..99416fcf778 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,47 +1,52 @@
-{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb
-, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
+{ stdenv, fetchurl, meson, ninja, pkgconfig
+, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
+, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
+, colord, lcms2
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols
# beware of null defaults, as the parameters *are* supplied by callPackage by default
}:
+with stdenv.lib;
stdenv.mkDerivation rec {
- name = "weston-${version}";
- version = "5.0.0";
+ pname = "weston";
+ version = "6.0.1";
src = fetchurl {
- url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm";
+ url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
+ sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [
- wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
- mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva
+ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
+ mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
libwebp wayland-protocols
+ colord lcms2
];
- configureFlags = [
- "--enable-x11-compositor"
- "--enable-drm-compositor"
- "--enable-wayland-compositor"
- "--enable-headless-compositor"
- "--enable-fbdev-compositor"
- "--enable-screen-sharing"
- "--enable-clients"
- "--enable-weston-launch"
- "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
- ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
- ++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder"
- ++ stdenv.lib.optionals (xwayland != null) [
- "--enable-xwayland"
- "--with-xserver-path=${xwayland.out}/bin/Xwayland"
- ];
+ mesonFlags= [
+ "-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}"
+ "-Dbackend-rdp=${boolToString (freerdp != null)}"
+ "-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
+ "-Dremoting=false" # TODO
+ "-Dimage-webp=${boolToString (libwebp != null)}"
+ "-Dsimple-dmabuf-drm=" # Disables all drivers
+ "-Ddemo-clients=false"
+ "-Dsimple-clients="
+ "-Dtest-junit-xml=false"
+ # TODO:
+ #"--enable-clients"
+ #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
+ ] ++ optionals (xwayland != null) [
+ "-Dxwayland-path=${xwayland.out}/bin/Xwayland"
+ ];
- meta = with stdenv.lib; {
+ meta = {
description = "Reference implementation of a Wayland compositor";
homepage = https://wayland.freedesktop.org/;
license = licenses.mit;
platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
};
}
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
index caf97c6510d..d0a1de7f600 100644
--- a/pkgs/applications/window-managers/windowlab/default.nix
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -3,7 +3,8 @@
let version = "1.40"; in
stdenv.mkDerivation {
- name = "windowlab-${version}";
+ pname = "windowlab";
+ inherit version;
src = fetchurl {
url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar";
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index d83c4493acc..8ad63999289 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -3,7 +3,7 @@
, imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }:
stdenv.mkDerivation rec {
- name = "windowmaker-${version}";
+ pname = "windowmaker";
version = "0.95.8";
srcName = "WindowMaker-${version}";
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix
new file mode 100644
index 00000000000..ad611f8dabe
--- /dev/null
+++ b/pkgs/applications/window-managers/wmfs/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, gnumake,
+ libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
+stdenv.mkDerivation rec {
+ pname = "wmfs";
+
+ version = "201902";
+
+ src = fetchFromGitHub {
+ owner = "xorg62";
+ repo = "wmfs";
+ sha256 = "sha256:1m7dsmmlhq2qipim659cp9aqlriz1cwrrgspl8baa5pncln0gd5c";
+ rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2";
+ };
+
+ nativeBuildInputs = [
+ gnumake
+ ];
+
+ buildInputs = [
+ imlib2
+ libX11
+ libXinerama
+ libXrandr
+ libXpm
+ libXft
+ ];
+
+ preConfigure = "substituteInPlace configure --replace '-lxft' '-lXft'";
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ "XDG_CONFIG_DIR=${placeholder "out"}/etc/xdg"
+ "MANPREFIX=${placeholder "out"}/share/man"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Window manager from scratch";
+ license = licenses.bsd2;
+ maintainers = [ maintainers.balsoft ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index 5a8b68df364..e0f2243827c 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
rev = "2823";
version = "hg-2012-12-09";
- name = "wmii-${version}";
+ pname = "wmii";
src = fetchurl {
url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip;
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index 8a680e1f763..60d3e61fdf9 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl";
};
- cargoSha256 = "0z92ml84b5652zgwzn08a8vvxksaa54jql66sfpdz1mvjwhgdmvn";
+ cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libXinerama libX11 ];
diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix
index bc7a5174e26..f5c9f12a23f 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/pkgs/applications/window-managers/xmonad/wrapper.nix
@@ -8,8 +8,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
- mkdir -p $out/bin $out/share
- ln -s ${xmonadEnv}/share/man $out/share/man
+ install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index 6fc1797dd25..f7867882d22 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
+{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig
, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
, configFile ? null, lib
, rev, sha256, version, patches ? []
}:
stdenv.mkDerivation {
- name = "yabar-${version}";
+ pname = "yabar";
+ inherit version;
src = fetchFromGitHub {
inherit rev sha256;
@@ -20,7 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl
+ cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl
alsaLib wirelesstools asciidoc libxslt makeWrapper
];
diff --git a/pkgs/build-support/add-opengl-runpath/default.nix b/pkgs/build-support/add-opengl-runpath/default.nix
new file mode 100644
index 00000000000..5cab0937e07
--- /dev/null
+++ b/pkgs/build-support/add-opengl-runpath/default.nix
@@ -0,0 +1,12 @@
+{ lib, stdenv }:
+
+stdenv.mkDerivation {
+ name = "add-opengl-runpath";
+
+ driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
+
+ buildCommand = ''
+ mkdir -p $out/nix-support
+ substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
+ '';
+}
diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh
new file mode 100644
index 00000000000..e556e7ead2a
--- /dev/null
+++ b/pkgs/build-support/add-opengl-runpath/setup-hook.sh
@@ -0,0 +1,29 @@
+# Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
+# This is needed to not rely on LD_LIBRARY_PATH which does not work with setuid
+# executables. Fixes https://github.com/NixOS/nixpkgs/issues/22760. It must be run
+# in postFixup because RUNPATH stripping in fixup would undo it. Note that patchelf
+# actually sets RUNPATH not RPATH, which applies only to dependencies of the binary
+# it set on (including for dlopen), so the RUNPATH must indeed be set on these
+# libraries and would not work if set only on executables.
+addOpenGLRunpath() {
+ local forceRpath=
+
+ while [ $# -gt 0 ]; do
+ case "$1" in
+ --) shift; break;;
+ --force-rpath) shift; forceRpath=1;;
+ --*)
+ echo "addOpenGLRunpath: ERROR: Invalid command line" \
+ "argument: $1" >&2
+ return 1;;
+ *) break;;
+ esac
+ done
+
+ for file in "$@"; do
+ if ! isELF "$file"; then continue; fi
+ local origRpath="$(patchelf --print-rpath "$file")"
+ patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file"
+ done
+}
+
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
new file mode 100644
index 00000000000..1f84403c10f
--- /dev/null
+++ b/pkgs/build-support/appimage/default.nix
@@ -0,0 +1,194 @@
+{ stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
+
+rec {
+ # Both extraction functions could be unified, but then
+ # it would depend on libmagic to correctly identify ISO 9660s
+
+ extractType1 = { name, src }: stdenv.mkDerivation {
+ name = "${name}-extracted";
+ inherit src;
+
+ nativeBuildInputs = [ libarchive ];
+ buildCommand = ''
+ mkdir $out
+ bsdtar -x -C $out -f $src
+ '';
+ };
+
+ extractType2 = { name, src }: stdenv.mkDerivation {
+ name = "${name}-extracted";
+ inherit src;
+
+ nativeBuildInputs = [ patchelf ];
+ buildCommand = ''
+ install $src ./appimage
+ patchelf \
+ --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
+ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
+ ./appimage
+
+ ./appimage --appimage-extract
+
+ cp -rv squashfs-root $out
+ '';
+ };
+
+ wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
+ inherit name;
+
+ targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
+
+ runScript = writeScript "run" ''
+ #!${stdenv.shell}
+
+ export APPDIR=${src}
+ export APPIMAGE_SILENT_INSTALL=1
+ cd $APPDIR
+ exec ./AppRun "$@"
+ '';
+ } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
+
+ wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
+ inherit name extraPkgs;
+ src = extractType1 { inherit name src; };
+ });
+
+ wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
+ inherit name extraPkgs;
+ src = extractType2 { inherit name src; };
+ });
+
+ defaultFhsEnvArgs = {
+ name = "appimage-env";
+
+ # Most of the packages were taken from the Steam chroot
+ targetPkgs = pkgs: with pkgs; [
+ gtk3
+ bashInteractive
+ gnome3.zenity
+ python2
+ xorg.xrandr
+ which
+ perl
+ xdg_utils
+ iana-etc
+ krb5
+ ];
+
+ # list of libraries expected in an appimage environment:
+ # https://github.com/AppImage/pkg2appimage/blob/master/excludelist
+ multiPkgs = pkgs: with pkgs; [
+ desktop-file-utils
+ xorg.libXcomposite
+ xorg.libXtst
+ xorg.libXrandr
+ xorg.libXext
+ xorg.libX11
+ xorg.libXfixes
+ libGL
+
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-ugly
+ libdrm
+ xorg.xkeyboardconfig
+ xorg.libpciaccess
+
+ glib
+ gtk2
+ bzip2
+ zlib
+ gdk-pixbuf
+
+ xorg.libXinerama
+ xorg.libXdamage
+ xorg.libXcursor
+ xorg.libXrender
+ xorg.libXScrnSaver
+ xorg.libXxf86vm
+ xorg.libXi
+ xorg.libSM
+ xorg.libICE
+ gnome2.GConf
+ freetype
+ (curl.override { gnutlsSupport = true; sslSupport = false; })
+ nspr
+ nss
+ fontconfig
+ cairo
+ pango
+ expat
+ dbus
+ cups
+ libcap
+ SDL2
+ libusb1
+ udev
+ dbus-glib
+ libav
+ atk
+ at-spi2-atk
+ libudev0-shim
+ networkmanager098
+
+ xorg.libXt
+ xorg.libXmu
+ xorg.libxcb
+ xorg.xcbutil
+ xorg.xcbutilwm
+ xorg.xcbutilimage
+ xorg.xcbutilkeysyms
+ xorg.xcbutilrenderutil
+ libGLU
+ libuuid
+ libogg
+ libvorbis
+ SDL
+ SDL2_image
+ glew110
+ openssl
+ libidn
+ tbb
+ wayland
+ mesa
+ libxkbcommon
+
+ flac
+ freeglut
+ libjpeg
+ libpng12
+ libsamplerate
+ libmikmod
+ libtheora
+ libtiff
+ pixman
+ speex
+ SDL_image
+ SDL_ttf
+ SDL_mixer
+ SDL2_ttf
+ SDL2_mixer
+ gstreamer
+ gst-plugins-base
+ libappindicator-gtk2
+ libcaca
+ libcanberra
+ libgcrypt
+ libvpx
+ librsvg
+ xorg.libXft
+ libvdpau
+ alsaLib
+
+ harfbuzz
+ e2fsprogs
+ libgpgerror
+ keyutils.lib
+ libjack2
+ fribidi
+
+ # libraries not on the upstream include list, but nevertheless expected
+ # by at least one appimage
+ libtool.lib # for Synfigstudio
+ ];
+ };
+}
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 142f5255caa..e1ec09bc95a 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -53,6 +53,7 @@ let
/**/ if libc == null then null
else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*"
else if targetPlatform.libc == "bionic" then "/system/bin/linker"
+ else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so"
else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2"
else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2"
# ARM with a wildcard, which can be "" or "-armhf".
@@ -186,10 +187,12 @@ stdenv.mkDerivation {
}.${targetPlatform.parsed.cpu.name}
else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
else if targetPlatform.isSparc then "sparc"
+ else if targetPlatform.isMsp430 then "msp430"
else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha"
- else throw "unknown emulation for platform: " + targetPlatform.config;
- in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
+ else throw "unknown emulation for platform: ${targetPlatform.config}";
+ in if targetPlatform.useLLVM or false then ""
+ else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
strictDeps = true;
depsTargetTargetPropagated = extraPackages;
@@ -327,6 +330,7 @@ stdenv.mkDerivation {
{ description =
stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
+ " (wrapper script)";
+ priority = 10;
} // optionalAttrs useMacosReexportHack {
platforms = stdenv.lib.platforms.darwin;
};
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index f39f4e65e45..d4318b715ba 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, bazel, cacert, enableNixHacks ? true }:
+{ stdenv
+, bazel
+, cacert
+, lib
+}:
-args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
+args@{ name, bazelFlags ? [], bazelBuildFlags ? [], bazelFetchFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
let
fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" ];
@@ -8,11 +12,11 @@ let
fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ];
in stdenv.mkDerivation (fBuildAttrs // {
- inherit name bazelFlags bazelTarget;
+ inherit name bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget;
deps = stdenv.mkDerivation (fFetchAttrs // {
name = "${name}-deps";
- inherit bazelFlags bazelTarget;
+ inherit bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget;
nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ];
@@ -34,8 +38,19 @@ in stdenv.mkDerivation (fBuildAttrs // {
# https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124
#
# On macOS Bazel will use the system installed Xcode or CLT toolchain instead of the one in the PATH unless we pass BAZEL_USE_CPP_ONLY_TOOLCHAIN
- #
- BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
+
+ # We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
+ # https://github.com/bazelbuild/bazel/issues/6502
+ BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
+ USER=homeless-shelter \
+ bazel \
+ --output_base="$bazelOut" \
+ --output_user_root="$bazelUserRoot" \
+ fetch \
+ --loading_phase_threads=1 \
+ $bazelFlags \
+ $bazelFetchFlags \
+ $bazelTarget
runHook postBuild
'';
@@ -46,19 +61,30 @@ in stdenv.mkDerivation (fBuildAttrs // {
# Remove all built in external workspaces, Bazel will recreate them when building
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
- rm -rf $bazelOut/external/{local_*,\@local_*}
+ rm -rf $bazelOut/external/{local_*,\@local_*.marker}
- # Patching markers to make them deterministic
- sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker
+ # Clear markers
+ find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \;
# Remove all vcs files
rm -rf $(find $bazelOut/external -type d -name .git)
rm -rf $(find $bazelOut/external -type d -name .svn)
rm -rf $(find $bazelOut/external -type d -name .hg)
+ # Removing top-level symlinks along with their markers.
+ # This is needed because they sometimes point to temporary paths (?).
+ # For example, in Tensorflow-gpu build:
+ # platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms
+ find $bazelOut/external -maxdepth 1 -type l | while read symlink; do
+ name="$(basename "$symlink")"
+ rm "$symlink" "$bazelOut/external/@$name.marker"
+ done
+
# Patching symlinks to remove build directory reference
find $bazelOut/external -type l | while read symlink; do
- ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink"
+ new_target="$(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,")"
+ rm "$symlink"
+ ln -sf "$new_target" "$symlink"
done
cp -r $bazelOut/external $out
@@ -67,12 +93,14 @@ in stdenv.mkDerivation (fBuildAttrs // {
'';
dontFixup = true;
+ allowedRequisites = [];
+
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = fetchAttrs.sha256;
});
- nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (if enableNixHacks then (bazel.override { enableNixHacks = true; }) else bazel) ];
+ nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ];
preHook = fBuildAttrs.preHook or "" + ''
export bazelOut="$NIX_BUILD_TOP/output"
@@ -81,8 +109,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
'';
preConfigure = ''
- mkdir -p $bazelOut/external
- cp -r $deps/* $bazelOut/external
+ mkdir -p "$bazelOut"
+ cp -r $deps $bazelOut/external
chmod -R +w $bazelOut
find $bazelOut -type l | while read symlink; do
ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
@@ -92,6 +120,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
buildPhase = fBuildAttrs.buildPhase or ''
runHook preBuild
+ '' + lib.optionalString stdenv.isDarwin ''
# Bazel sandboxes the execution of the tools it invokes, so even though we are
# calling the correct nix wrappers, the values of the environment variables
# the wrappers are expecting will not be set. So instead of relying on the
@@ -114,6 +143,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
linkopts+=( "--linkopt=$flag" )
host_linkopts+=( "--host_linkopt=$flag" )
done
+ '' + ''
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
USER=homeless-shelter \
@@ -122,11 +152,14 @@ in stdenv.mkDerivation (fBuildAttrs // {
--output_user_root="$bazelUserRoot" \
build \
-j $NIX_BUILD_CORES \
+ '' + lib.optionalString stdenv.isDarwin ''
"''${copts[@]}" \
"''${host_copts[@]}" \
"''${linkopts[@]}" \
"''${host_linkopts[@]}" \
+ '' + ''
$bazelFlags \
+ $bazelBuildFlags \
$bazelTarget
runHook postBuild
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
index 0e9e36bc301..dcb2e97aa93 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
@@ -7,28 +7,43 @@
#include
#include
+#include
+#include
+#include
+#include
+#include
+
#define fail(s, err) g_error("%s: %s: %s", __func__, s, g_strerror(err))
#define fail_if(expr) \
if (expr) \
fail(#expr, errno);
-#include
+const gchar *bind_blacklist[] = {"bin", "etc", "host", "real-host", "usr", "lib", "lib64", "lib32", "sbin", NULL};
-#include
-#include
-#include
-#include
+int pivot_root(const char *new_root, const char *put_old) {
+ return syscall(SYS_pivot_root, new_root, put_old);
+}
-const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", "lib", "lib64", "lib32", "sbin", NULL};
+void mount_tmpfs(const gchar *target) {
+ fail_if(mount("none", target, "tmpfs", 0, NULL));
+}
void bind_mount(const gchar *source, const gchar *target) {
fail_if(g_mkdir(target, 0755));
- fail_if(mount(source, target, "bind", MS_BIND | MS_REC, NULL));
+ fail_if(mount(source, target, NULL, MS_BIND | MS_REC, NULL));
}
-void bind_mount_host(const gchar *host, const gchar *guest) {
+const gchar *create_tmpdir() {
+ gchar *prefix =
+ g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL);
+ fail_if(!g_mkdtemp_full(prefix, 0755));
+ return prefix;
+}
+
+void pivot_host(const gchar *guest) {
g_autofree gchar *point = g_build_filename(guest, "host", NULL);
- bind_mount(host, point);
+ fail_if(g_mkdir(point, 0755));
+ fail_if(pivot_root(guest, point));
}
void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) {
@@ -40,19 +55,22 @@ void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) {
}
void bind(const gchar *host, const gchar *guest) {
+ mount_tmpfs(guest);
+ pivot_host(guest);
+
+ g_autofree gchar *host_dir = g_build_filename("/host", host, NULL);
+
g_autoptr(GError) err = NULL;
- g_autoptr(GDir) dir = g_dir_open(host, 0, &err);
+ g_autoptr(GDir) dir = g_dir_open(host_dir, 0, &err);
if (err != NULL)
fail("g_dir_open", errno);
const gchar *item;
- while (item = g_dir_read_name(dir))
+ while ((item = g_dir_read_name(dir)))
if (!g_strv_contains(bind_blacklist, item))
- bind_mount_item(host, guest, item);
-
- bind_mount_host(host, guest);
+ bind_mount_item(host_dir, "/", item);
}
void spit(const char *path, char *fmt, ...) {
@@ -68,11 +86,6 @@ void spit(const char *path, char *fmt, ...) {
fclose(f);
}
-int nftw_remove(const char *path, const struct stat *sb, int type,
- struct FTW *ftw) {
- return remove(path);
-}
-
int main(gint argc, gchar **argv) {
const gchar *self = *argv++;
@@ -81,15 +94,7 @@ int main(gint argc, gchar **argv) {
return 1;
}
- if (g_getenv("NIX_CHROOTENV"))
- g_warning("chrootenv doesn't stack!");
- else
- g_setenv("NIX_CHROOTENV", "", TRUE);
-
- g_autofree gchar *prefix =
- g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL);
-
- fail_if(!g_mkdtemp_full(prefix, 0755));
+ g_autofree const gchar *prefix = create_tmpdir();
pid_t cpid = fork();
@@ -115,9 +120,24 @@ int main(gint argc, gchar **argv) {
spit("/proc/self/uid_map", "%d %d 1", uid, uid);
spit("/proc/self/gid_map", "%d %d 1", gid, gid);
- bind("/", prefix);
+ // If there is a /host directory, assume this is nested chrootenv and use it as host instead.
+ gboolean nested_host = g_file_test("/host", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
+ g_autofree const gchar *host = nested_host ? "/host" : "/";
+
+ bind(host, prefix);
+
+ // Replace /host by an actual (inner) /host.
+ if (nested_host) {
+ fail_if(g_mkdir("/real-host", 0755));
+ fail_if(mount("/host/host", "/real-host", NULL, MS_BIND | MS_REC, NULL));
+ // For some reason umount("/host") returns EBUSY even immediately after
+ // pivot_root. We detach it at least to keep `/proc/mounts` from blowing
+ // up in nested cases.
+ fail_if(umount2("/host", MNT_DETACH));
+ fail_if(mount("/real-host", "/host", NULL, MS_MOVE, NULL));
+ fail_if(rmdir("/real-host"));
+ }
- fail_if(chroot(prefix));
fail_if(chdir("/"));
fail_if(execvp(*argv, argv));
}
@@ -126,8 +146,7 @@ int main(gint argc, gchar **argv) {
int status;
fail_if(waitpid(cpid, &status, 0) != cpid);
- fail_if(nftw(prefix, nftw_remove, getdtablesize(),
- FTW_DEPTH | FTW_MOUNT | FTW_PHYS));
+ fail_if(rmdir(prefix));
if (WIFEXITED(status))
return WEXITSTATUS(status);
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 23568f51b23..295b17eec67 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -36,12 +36,14 @@ let
# base packages of the chroot
# these match the host's architecture, glibc_multi is used for multilib
- # builds.
+ # builds. glibcLocales must be before glibc or glibc_multi as otherwiese
+ # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available.
basePkgs = with pkgs;
- [ (if isMultiBuild then glibc_multi else glibc)
+ [ glibcLocales
+ (if isMultiBuild then glibc_multi else glibc)
(toString gcc.cc.lib) bashInteractive coreutils less shadow su
gawk diffutils findutils gnused gnugrep
- gnutar gzip bzip2 xz glibcLocales
+ gnutar gzip bzip2 xz
];
baseMultiPkgs = with pkgsi686Linux;
[ (toString gcc.cc.lib)
@@ -50,8 +52,8 @@ let
etcProfile = writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ '
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
- export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
- export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
+ export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32:$LD_LIBRARY_PATH"
+ export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
export TZDIR='/etc/zoneinfo'
# Force compilers and other tools to look in default search paths
@@ -196,4 +198,5 @@ in stdenv.mkDerivation {
${if isMultiBuild then extraBuildCommandsMulti else ""}
'';
preferLocalBuild = true;
+ allowSubstitutes = false;
}
diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
index 738dbb56708..a1030e3b34f 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/pkgs/build-support/build-pecl.nix
@@ -1,22 +1,23 @@
-{ stdenv, php, autoreconfHook, fetchurl }:
+{ stdenv, php, autoreconfHook, fetchurl, re2c }:
-{ name
+{ pname
+, version
, buildInputs ? []
, nativeBuildInputs ? []
, makeFlags ? []
, src ? fetchurl {
- url = "http://pecl.php.net/get/${name}.tgz";
+ url = "http://pecl.php.net/get/${pname}-${version}.tgz";
inherit (args) sha256;
}
, ...
}@args:
stdenv.mkDerivation (args // {
- name = "php-${name}";
+ name = "php-${pname}-${version}";
inherit src;
- nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
+ nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
buildInputs = [ php ] ++ buildInputs;
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 678f5a3fe9e..b699d762d29 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -26,6 +26,13 @@ sub isInPathsToLink {
return 0;
}
+# Similar to `lib.isStorePath`
+sub isStorePath {
+ my $path = shift;
+ my $storePath = "@storeDir@";
+
+ return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath;
+}
# For each activated package, determine what symlinks to create.
@@ -84,6 +91,11 @@ sub checkCollision {
sub findFiles {
my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
+ # The store path must not be a file
+ if (-f $target && isStorePath $target) {
+ die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
+ }
+
# Urgh, hacky...
return if
$relName eq "/propagated-build-inputs" ||
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 41a1e67ef42..7f2427777f9 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -2,7 +2,7 @@
# a fork of the buildEnv in the Nix distribution. Most changes should
# eventually be merged back into the Nix distribution.
-{ buildPackages, runCommand, lib }:
+{ buildPackages, runCommand, lib, substituteAll }:
lib.makeOverridable
({ name
@@ -43,6 +43,13 @@ lib.makeOverridable
, meta ? {}
}:
+let
+ builder = substituteAll {
+ src = ./builder.pl;
+ inherit (builtins) storeDir;
+ };
+in
+
runCommand name
rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
@@ -63,10 +70,11 @@ runCommand name
priority = drv.meta.priority or 5;
}) paths);
preferLocalBuild = true;
+ allowSubstitutes = false;
# XXX: The size is somewhat arbitrary
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
}
''
- ${buildPackages.perl}/bin/perl -w ${./builder.pl}
+ ${buildPackages.perl}/bin/perl -w ${builder}
eval "$postBuild"
'')
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 9762894607a..1358b167f6e 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -6,6 +6,7 @@
var_templates_list=(
NIX+CFLAGS_COMPILE
+ NIX+CFLAGS_COMPILE_BEFORE
NIX+CFLAGS_LINK
NIX+CXXSTDLIB_COMPILE
NIX+CXXSTDLIB_LINK
@@ -43,5 +44,9 @@ if [ -e @out@/nix-support/cc-ldflags ]; then
NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
fi
+if [ -e @out@/nix-support/cc-cflags-before ]; then
+ NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE="$(< @out@/nix-support/cc-cflags-before) $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE"
+fi
+
# That way forked processes will not extend these environment variables again.
export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 8003fe1d8f3..bb789010008 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -135,7 +135,7 @@ source @out@/nix-support/add-hardening.sh
# Add the flags for the C compiler proper.
extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE)
-extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"})
+extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE)
if [ "$dontLink" != 1 ]; then
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 176df51cbd9..cf2d38cd997 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -45,9 +45,9 @@ let
# The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
coreutils_bin = if nativeTools then "" else getBin coreutils;
- default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) then
+ default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"
- else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) then
+ else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then
"-isystem ${libcxx}/include/c++/v1"
else "";
@@ -63,6 +63,25 @@ let
then import ../expand-response-params { inherit (buildPackages) stdenv; }
else "";
+ # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
+ isGccArchSupported = arch:
+ if cc.isGNU or false then
+ { skylake = versionAtLeast ccVersion "6.0";
+ skylake-avx512 = versionAtLeast ccVersion "6.0";
+ cannonlake = versionAtLeast ccVersion "8.0";
+ icelake-client = versionAtLeast ccVersion "8.0";
+ icelake-server = versionAtLeast ccVersion "8.0";
+ knm = versionAtLeast ccVersion "8.0";
+ }.${arch} or true
+ else if cc.isClang or false then
+ { cannonlake = versionAtLeast ccVersion "5.0";
+ icelake-client = versionAtLeast ccVersion "7.0";
+ icelake-server = versionAtLeast ccVersion "7.0";
+ knm = versionAtLeast ccVersion "7.0";
+ }.${arch} or true
+ else
+ false;
+
in
# Ensure bintools matches
@@ -279,19 +298,56 @@ stdenv.mkDerivation {
export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}"
''
+ # Machine flags. These are necessary to support
+
+ # TODO: We should make a way to support miscellaneous machine
+ # flags and other gcc flags as well.
+
+ # Always add -march based on cpu in triple. Sometimes there is a
+ # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
+ # that case.
+ + optionalString ((targetPlatform ? platform.gcc.arch) &&
+ isGccArchSupported targetPlatform.platform.gcc.arch) ''
+ echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before
+ ''
+
+ # -mcpu is not very useful. You should use mtune and march
+ # instead. It’s provided here for backwards compatibility.
+ + optionalString (targetPlatform ? platform.gcc.cpu) ''
+ echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
+ ''
+
+ # -mfloat-abi only matters on arm32 but we set it here
+ # unconditionally just in case. If the abi specifically sets hard
+ # vs. soft floats we use it here.
+ + optionalString (targetPlatform ? platform.gcc.float-abi) ''
+ echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
+ ''
+ + optionalString (targetPlatform ? platform.gcc.fpu) ''
+ echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
+ ''
+ + optionalString (targetPlatform ? platform.gcc.mode) ''
+ echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before
+ ''
+ + optionalString (targetPlatform ? platform.gcc.tune &&
+ isGccArchSupported targetPlatform.platform.gcc.tune) ''
+ echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before
+ ''
+
+ # TODO: categorize these and figure out a better place for them
+ optionalString hostPlatform.isCygwin ''
hardening_unsupported_flags+=" pic"
- ''
-
- + optionalString targetPlatform.isMinGW ''
+ '' + optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector"
- ''
-
- + optionalString targetPlatform.isAvr ''
+ '' + optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic"
+ '' + optionalString (targetPlatform.libc == "newlib") ''
+ hardening_unsupported_flags+=" stackprotector fortify pie pic"
+ '' + optionalString targetPlatform.isNetBSD ''
+ hardening_unsupported_flags+=" stackprotector fortify"
''
- + optionalString (targetPlatform.libc == "newlib") ''
+ + optionalString targetPlatform.isWasm ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
''
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 28060de7411..211b5063291 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -70,12 +70,12 @@ ccWrapper_addCVars () {
local role_post role_pre
getHostRoleEnvHook
- if [[ -d "$1/include" ]]; then
- export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
+ if [ -d "$1/include" ]; then
+ export NIX_${role_pre}CFLAGS_COMPILE+=" -isystem $1/include"
fi
- if [[ -d "$1/Library/Frameworks" ]]; then
- export NIX_${role_pre}CFLAGS_COMPILE+=" -F$1/Library/Frameworks"
+ if [ -d "$1/Library/Frameworks" ]; then
+ export NIX_${role_pre}CFLAGS_COMPILE+=" -iframework $1/Library/Frameworks"
fi
}
diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
index 28f2802a5bc..6b3ff6fd62b 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@@ -4,7 +4,7 @@
# "nix-store --load-db" and "nix-store --register-validity
# --hash-given".
-{ stdenv, coreutils, jq, buildPackages }:
+{ stdenv, buildPackages }:
{ rootPaths }:
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
exportReferencesGraph.closure = rootPaths;
+ preferLocalBuild = true;
+
PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin";
builder = builtins.toFile "builder"
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ef17a3f4e58..83e21c8945d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1,37 +1,41 @@
{
- symlinkJoin,
+ cacert,
+ callPackage,
+ closureInfo,
coreutils,
docker,
e2fsprogs,
findutils,
go,
- jshon,
jq,
+ jshon,
lib,
- pkgs,
- pigz,
+ moreutils,
nix,
- runCommand,
+ pigz,
+ referencesByPopularity,
rsync,
+ runCommand,
+ runtimeShell,
shadow,
+ skopeo,
stdenv,
storeDir ? builtins.storeDir,
+ substituteAll,
+ symlinkJoin,
utillinux,
vmTools,
writeReferencesToFile,
- referencesByPopularity,
writeScript,
writeText,
- closureInfo,
- substituteAll
}:
# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
rec {
- examples = import ./examples.nix {
- inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb;
+ examples = callPackage ./examples.nix {
+ inherit buildImage pullImage shadowSetup buildImageWithNixDb;
};
pullImage = let
@@ -44,24 +48,29 @@ rec {
, sha256
, os ? "linux"
, arch ? "amd64"
+
+ # This is used to set name to the pulled image
+ , finalImageName ? imageName
# This used to set a tag to the pulled image
, finalImageTag ? "latest"
- , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
+
+ , name ? fixName "docker-image-${finalImageName}-${finalImageTag}.tar"
}:
runCommand name {
- inherit imageName imageDigest;
+ inherit imageDigest;
+ imageName = finalImageName;
imageTag = finalImageTag;
- impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
+ impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
outputHashMode = "flat";
outputHashAlgo = "sha256";
outputHash = sha256;
- nativeBuildInputs = lib.singleton (pkgs.skopeo);
- SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt";
+ nativeBuildInputs = lib.singleton skopeo;
+ SSL_CERT_FILE = "${cacert.out}/etc/ssl/certs/ca-bundle.crt";
sourceURL = "docker://${imageName}@${imageDigest}";
- destNameTag = "${imageName}:${finalImageTag}";
+ destNameTag = "${finalImageName}:${finalImageTag}";
} ''
skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag"
'';
@@ -69,13 +78,14 @@ rec {
# We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
# And we cannot untar it, because then we cannot preserve permissions ecc.
tarsum = runCommand "tarsum" {
- buildInputs = [ go ];
+ nativeBuildInputs = [ go ];
} ''
mkdir tarsum
cd tarsum
cp ${./tarsum.go} tarsum.go
export GOPATH=$(pwd)
+ export GOCACHE="$TMPDIR/go-cache"
mkdir -p src/github.com/docker/docker/pkg
ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
go build
@@ -119,7 +129,7 @@ rec {
export PATH=${shadow}/bin:$PATH
mkdir -p /etc/pam.d
if [[ ! -f /etc/passwd ]]; then
- echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd
+ echo "root:x:0:0::/root:${runtimeShell}" > /etc/passwd
echo "root:!x:::::::" > /etc/shadow
fi
if [[ ! -f /etc/group ]]; then
@@ -150,7 +160,8 @@ rec {
postMount ? "",
postUmount ? ""
}:
- vmTools.runInLinuxVM (
+ let
+ result = vmTools.runInLinuxVM (
runCommand name {
preVM = vmTools.createEmptyImage {
size = diskSize;
@@ -158,10 +169,8 @@ rec {
};
inherit fromImage fromImageName fromImageTag;
- buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
+ nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ];
} ''
- rm -rf $out
-
mkdir disk
mkfs /dev/${vmTools.hd}
mount /dev/${vmTools.hd} disk
@@ -198,7 +207,7 @@ rec {
# Unpack all of the parent layers into the image.
lowerdir=""
extractionID=0
- for layerTar in $(cat layer-list); do
+ for layerTar in $(tac layer-list); do
echo "Unpacking layer $layerTar"
extractionID=$((extractionID + 1))
@@ -209,7 +218,7 @@ rec {
find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
# Get the next lower directory and continue the loop.
- lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer
+ lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir
done
mkdir work
@@ -244,6 +253,12 @@ rec {
${postUmount}
'');
+ in
+ runCommand name {} ''
+ mkdir -p $out
+ cd ${result}
+ cp layer.tar json VERSION $out
+ '';
exportImage = { name ? fromImage.name, fromImage, fromImageName ? null, fromImageTag ? null, diskSize ? 1024 }:
runWithOverlay {
@@ -261,7 +276,7 @@ rec {
# things like `ls` or `echo` will be missing.
shellScript = name: text:
writeScript name ''
- #!${stdenv.shell}
+ #!${runtimeShell}
set -e
export PATH=${coreutils}/bin:/bin
${text}
@@ -276,20 +291,22 @@ rec {
# Files to add to the layer.
closure,
configJson,
- # Docker has a 42-layer maximum, we pick 24 to ensure there is plenty
- # of room for extension
- maxLayers ? 24
+ # Docker has a 125-layer maximum, we pick 100 to ensure there is
+ # plenty of room for extension.
+ # https://github.com/moby/moby/blob/b3e9f7b13b0f0c414fa6253e1f17a86b2cff68b5/layer/layer_store.go#L23-L26
+ maxLayers ? 100
}:
let
storePathToLayer = substituteAll
- { inherit (stdenv) shell;
+ { shell = runtimeShell;
+ isExecutable = true;
src = ./store-path-to-layer.sh;
};
in
runCommand "${name}-granular-docker-layers" {
inherit maxLayers;
paths = referencesByPopularity closure;
- buildInputs = [ jshon rsync tarsum ];
+ nativeBuildInputs = [ jshon rsync tarsum ];
enableParallelBuilding = true;
}
''
@@ -327,7 +344,7 @@ rec {
uid ? 0, gid ? 0,
}:
runCommand "${name}-customisation-layer" {
- buildInputs = [ jshon rsync tarsum ];
+ nativeBuildInputs = [ jshon rsync tarsum ];
inherit extraCommands;
}
''
@@ -341,7 +358,7 @@ rec {
# Tar up the layer and throw it into 'layer.tar'.
echo "Packing layer..."
mkdir $out
- tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
+ tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
# Compute a checksum of the tarball.
echo "Computing layer checksum..."
@@ -372,7 +389,7 @@ rec {
}:
runCommand "docker-layer-${name}" {
inherit baseJson contents extraCommands;
- buildInputs = [ jshon rsync tarsum ];
+ nativeBuildInputs = [ jshon rsync tarsum ];
}
''
mkdir layer
@@ -482,7 +499,7 @@ rec {
(cd layer; ${extraCommandsScript})
echo "Packing layer..."
- mkdir $out
+ mkdir -p $out
tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
# Compute the tar checksum and add it to the output json.
@@ -527,7 +544,7 @@ rec {
os = "linux";
});
impure = runCommand "${baseName}-standard-dynamic-date.json"
- { buildInputs = [ jq ]; }
+ { nativeBuildInputs = [ jq ]; }
''
jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
'';
@@ -548,7 +565,7 @@ rec {
inherit uid gid extraCommands;
};
result = runCommand "docker-image-${baseName}.tar.gz" {
- buildInputs = [ jshon pigz coreutils findutils jq ];
+ nativeBuildInputs = [ jshon pigz coreutils findutils jq ];
# Image name and tag must be lowercase
imageName = lib.toLower name;
baseJson = configJson;
@@ -577,9 +594,9 @@ rec {
layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1)
ln -s "$layer" "./image/$layerID"
- manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerID/layer.tar\"] + .")
- imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${configJson})\"}] + .")
- imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerID/layer.tar\"]")
+ imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${configJson})\"}]")
+ imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]")
done
imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
echo "$imageJson" > "image/$imageJsonChecksum.json"
@@ -645,7 +662,7 @@ rec {
os = "linux";
});
impure = runCommand "${baseName}-config.json"
- { buildInputs = [ jq ]; }
+ { nativeBuildInputs = [ jq ]; }
''
jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
'';
@@ -663,7 +680,7 @@ rec {
extraCommands;
};
result = runCommand "docker-image-${baseName}.tar.gz" {
- buildInputs = [ jshon pigz coreutils findutils jq ];
+ nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ];
# Image name and tag must be lowercase
imageName = lib.toLower name;
imageTag = if tag == null then "" else lib.toLower tag;
@@ -771,23 +788,24 @@ rec {
# Use the temp folder we've been working on to create a new image.
mv temp image/$layerID
- # Add the new layer ID to the beginning of the layer list
+ # Add the new layer ID to the end of the layer list
(
+ cat layer-list
# originally this used `sed -i "1i$layerID" layer-list`, but
# would fail if layer-list was completely empty.
echo "$layerID/layer.tar"
- cat layer-list
- ) | ${pkgs.moreutils}/bin/sponge layer-list
+ ) | sponge layer-list
# Create image json and image manifest
imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
- for layerTar in $(tac ./layer-list); do
+ for layerTar in $(cat ./layer-list); do
layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
- imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
- imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
- manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .")
+ imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${baseJson})\"}]")
+ # diff_ids order is from the bottom-most to top-most layer
+ imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]")
+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerTar\"]")
done
imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index d78e35c5662..29eea33a7e1 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -87,9 +87,10 @@ rec {
# 4. example of pulling an image. could be used as a base for other images
nixFromDockerHub = pullImage {
imageName = "nixos/nix";
- imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
- sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
- finalImageTag = "1.11";
+ imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357";
+ sha256 = "07q9y9r7fsd18sy95ybrvclpkhlal12d30ybnf089hq7v1hgxbi7";
+ finalImageTag = "2.2.1";
+ finalImageName = "nix";
};
# 5. example of multiple contents, emacs and vi happily coexisting
@@ -186,4 +187,51 @@ rec {
runAsRoot = "touch /example-file";
fromImage = bash;
};
+
+ # 13. example of 3 layers images This image is used to verify the
+ # order of layers is correct.
+ # It allows to validate
+ # - the layer of parent are below
+ # - the order of parent layer is preserved at image build time
+ # (this is why there are 3 images)
+ layersOrder = let
+ l1 = pkgs.dockerTools.buildImage {
+ name = "l1";
+ tag = "latest";
+ extraCommands = ''
+ mkdir -p tmp
+ echo layer1 > tmp/layer1
+ echo layer1 > tmp/layer2
+ echo layer1 > tmp/layer3
+ '';
+ };
+ l2 = pkgs.dockerTools.buildImage {
+ name = "l2";
+ fromImage = l1;
+ tag = "latest";
+ extraCommands = ''
+ mkdir -p tmp
+ echo layer2 > tmp/layer2
+ echo layer2 > tmp/layer3
+ '';
+ };
+ in pkgs.dockerTools.buildImage {
+ name = "l3";
+ fromImage = l2;
+ tag = "latest";
+ contents = [ pkgs.coreutils ];
+ extraCommands = ''
+ mkdir -p tmp
+ echo layer3 > tmp/layer3
+ '';
+ };
+
+ # 14. Create another layered image, for comparing layers with image 10.
+ another-layered-image = pkgs.dockerTools.buildLayeredImage {
+ name = "another-layered-image";
+ tag = "latest";
+ config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+ contents = [ pkgs.hello ];
+ };
+
}
diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/pkgs/build-support/docker/nix-prefetch-docker
new file mode 100755
index 00000000000..839dc87487a
--- /dev/null
+++ b/pkgs/build-support/docker/nix-prefetch-docker
@@ -0,0 +1,173 @@
+#! /usr/bin/env bash
+
+set -e -o pipefail
+
+os=
+arch=
+imageName=
+imageTag=
+imageDigest=
+finalImageName=
+finalImageTag=
+hashType=$NIX_HASH_ALGO
+hashFormat=$hashFormat
+format=nix
+
+usage(){
+ echo >&2 "syntax: nix-prefetch-docker [options] [IMAGE_NAME [IMAGE_TAG|IMAGE_DIGEST]]
+
+Options:
+ --os os OS to fetch image for
+ --arch linux Arch to fetch image for
+ --image-name name Name of the image to fetch
+ --image-tag tag Image tag
+ --image-digest digest Image digest
+ --final-image-name name Desired name of the image
+ --final-image-tag tag Desired image tag
+ --json Output result in json format instead of nix
+ --quiet Only print the final result
+"
+ exit 1
+}
+
+get_image_digest(){
+ local imageName=$1
+ local imageTag=$2
+
+ if test -z "$imageTag"; then
+ imageTag="latest"
+ fi
+
+ skopeo inspect "docker://$imageName:$imageTag" | jq '.Digest' -r
+}
+
+get_name() {
+ local imageName=$1
+ local imageTag=$2
+
+ echo "docker-image-$(echo "$imageName:$imageTag" | tr '/:' '-').tar"
+}
+
+argi=0
+argfun=""
+for arg; do
+ if test -z "$argfun"; then
+ case $arg in
+ --os) argfun=set_os;;
+ --arch) argfun=set_arch;;
+ --image-name) argfun=set_imageName;;
+ --image-tag) argfun=set_imageTag;;
+ --image-digest) argfun=set_imageDigest;;
+ --final-image-name) argfun=set_finalImageName;;
+ --final-image-tag) argfun=set_finalImageTag;;
+ --quiet) QUIET=true;;
+ --json) format=json;;
+ --help) usage; exit;;
+ *)
+ : $((++argi))
+ case $argi in
+ 1) imageName=$arg;;
+ 2) [[ $arg == *"sha256"* ]] && imageDigest=$arg || imageTag=$arg;;
+ *) exit 1;;
+ esac
+ ;;
+ esac
+ else
+ case $argfun in
+ set_*)
+ var=${argfun#set_}
+ eval $var=$arg
+ ;;
+ esac
+ argfun=""
+ fi
+done
+
+if test -z "$imageName"; then
+ usage
+fi
+
+if test -z "$os"; then
+ os=linux
+fi
+
+if test -z "$arch"; then
+ arch=amd64
+fi
+
+if test -z "$hashType"; then
+ hashType=sha256
+fi
+
+if test -z "$hashFormat"; then
+ hashFormat=base32
+fi
+
+if test -z "$finalImageName"; then
+ finalImageName="$imageName"
+fi
+
+if test -z "$finalImageTag"; then
+ if test -z "$imageTag"; then
+ finalImageTag="latest"
+ else
+ finalImageTag="$imageTag"
+ fi
+fi
+
+if test -z "$imageDigest"; then
+ imageDigest=$(get_image_digest $imageName $imageTag)
+fi
+
+sourceUrl="docker://$imageName@$imageDigest"
+
+tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/skopeo-copy-tmp-XXXXXXXX")"
+trap "rm -rf \"$tmpPath\"" EXIT
+
+tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)"
+
+if test -z "$QUIET"; then
+ skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag"
+else
+ skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null
+fi
+
+# Compute the hash.
+imageHash=$(nix-hash --flat --type $hashType --base32 "$tmpFile")
+
+# Add the downloaded file to Nix store.
+finalPath=$(nix-store --add-fixed "$hashType" "$tmpFile")
+
+if test -z "$QUIET"; then
+ echo "-> ImageName: $imageName"
+ echo "-> ImageDigest: $imageDigest"
+ echo "-> FinalImageName: $finalImageName"
+ echo "-> FinalImageTag: $finalImageTag"
+ echo "-> ImagePath: $finalPath"
+ echo "-> ImageHash: $imageHash"
+fi
+
+if [ "$format" == "nix" ]; then
+cat <"$siteStart" < "$errfile" || (
- status="$?"
- cat "$errfile" >&2
- exit "$status"
- )
+exit_handlers=()
+
+run_exit_handlers() {
+ exit_status=$?
+ for handler in "${exit_handlers[@]}"; do
+ eval "$handler $exit_status"
+ done
+}
+
+trap run_exit_handlers EXIT
+
+quiet_exit_handler() {
+ exec 2>&3 3>&-
+ if [ $1 -ne 0 ]; then
+ cat "$errfile" >&2
fi
+ rm -f "$errfile"
+}
+
+quiet_mode() {
+ errfile="$(mktemp "${TMPDIR:-/tmp}/git-checkout-err-XXXXXXXX")"
+ exit_handlers+=(quiet_exit_handler)
+ exec 3>&2 2>"$errfile"
}
json_escape() {
@@ -362,6 +372,14 @@ EOF
fi
}
+remove_tmpPath() {
+ rm -rf "$tmpPath"
+}
+
+if test -n "$QUIET"; then
+ quiet_mode
+fi
+
if test -z "$branchName"; then
branchName=fetchgit
fi
@@ -390,8 +408,7 @@ else
if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
- # shellcheck disable=SC2064
- trap "rm -rf \"$tmpPath\"" EXIT
+ exit_handlers+=(remove_tmpPath)
tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
mkdir -p "$tmpFile"
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 89d72f512f7..2fb32b2324f 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -5,6 +5,10 @@
# stripLen acts as the -p parameter when applying a patch.
{ lib, fetchurl, buildPackages }:
+let
+ # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154
+ patchutils = buildPackages.patchutils_0_3_3;
+in
{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args:
fetchurl ({
@@ -14,10 +18,10 @@ fetchurl ({
echo "error: Fetched patch file '$out' is empty!" 1>&2
exit 1
fi
- "${buildPackages.patchutils}/bin/lsdiff" "$out" \
+ "${patchutils}/bin/lsdiff" "$out" \
| sort -u | sed -e 's/[*?]/\\&/g' \
| xargs -I{} \
- "${buildPackages.patchutils}/bin/filterdiff" \
+ "${patchutils}/bin/filterdiff" \
--include={} \
--strip=${toString stripLen} \
${lib.optionalString (extraPrefix != null) ''
@@ -32,7 +36,7 @@ fetchurl ({
cat "$out" 1>&2
exit 1
fi
- ${buildPackages.patchutils}/bin/filterdiff \
+ ${patchutils}/bin/filterdiff \
-p1 \
${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
@@ -46,7 +50,7 @@ fetchurl ({
exit 1
fi
'' + lib.optionalString revert ''
- ${buildPackages.patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
+ ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
mv "$tmpfile" "$out"
'' + (args.postFetch or "");
meta.broken = excludes != [] && includes != [];
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index f9bc8b602f4..74fdc320835 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -118,7 +118,6 @@ if test -n "$showURLs"; then
exit 0
fi
-
if test -n "$preferHashedMirrors"; then
tryHashedMirrors
fi
@@ -128,6 +127,16 @@ set -o noglob
success=
for url in $urls; do
+ if [ -z "$postFetch" ]; then
+ case "$url" in
+ https://github.com/*/archive/*)
+ echo "warning: archives from GitHub revisions should use fetchFromGitHub"
+ ;;
+ https://gitlab.com/*/-/archive/*)
+ echo "warning: archives from GitLab revisions should use fetchFromGitLab"
+ ;;
+ esac
+ fi
tryDownload "$url"
if test -n "$success"; then finish; fi
done
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 3ce90cbeab3..6300587a7d1 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -49,8 +49,11 @@ in
# first element of `urls').
name ? ""
- # Different ways of specifying the hash.
-, outputHash ? ""
+, # SRI hash.
+ hash ? ""
+
+, # Legacy ways of specifying the hash.
+ outputHash ? ""
, outputHashAlgo ? ""
, md5 ? ""
, sha1 ? ""
@@ -103,7 +106,8 @@ let
else throw "fetchurl requires either `url` or `urls` to be set";
hash_ =
- if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512"
+ if hash != "" then { outputHashAlgo = null; outputHash = hash; }
+ else if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512"
else if (outputHash != "" && outputHashAlgo != "") then { inherit outputHashAlgo outputHash; }
else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; }
else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; }
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 404c744eea2..1ca1e45f2fb 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -19,8 +19,11 @@ rec {
https://kent.dl.sourceforge.net/sourceforge/
];
- # SourceForge.jp.
- sourceforgejp = [
+ # OSDN (formerly SourceForge.jp).
+ osdn = [
+ https://osdn.dl.osdn.jp/
+ https://osdn.mirror.constant.com/
+ https://mirrors.gigenet.com/OSDN/
https://osdn.dl.sourceforge.jp/
https://jaist.dl.sourceforge.jp/
];
@@ -166,6 +169,20 @@ rec {
http://backpan.perl.org/ # for old releases
];
+ # CentOS.
+ centos = [
+ http://mirror.centos.org/centos/
+ # For old releases
+ http://vault.centos.org/
+ https://archive.kernel.org/centos-vault/
+ http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/
+ http://mirrors.aliyun.com/centos-vault/
+ https://mirror.chpc.utah.edu/pub/vault.centos.org/
+ https://mirror.its.sfu.ca/mirror/CentOS-vault/
+ https://mirror.math.princeton.edu/pub/centos-vault/
+ https://mirrors.tripadvisor.com/centos-vault/
+ ];
+
# Debian.
debian = [
http://httpredir.debian.org/debian/
@@ -265,13 +282,14 @@ rec {
# Apache mirrors (see http://www.apache.org/mirrors/).
apache = [
+ https://www-eu.apache.org/dist/
+ https://www-us.apache.org/dist/
http://www.eu.apache.org/dist/
- http://wwwftp.ciril.fr/pub/apache/
ftp://ftp.fu-berlin.de/unix/www/apache/
http://ftp.tudelft.nl/apache/
http://mirror.cc.columbia.edu/pub/software/apache/
- http://www.apache.org/dist/
- http://archive.apache.org/dist/ # fallback for old releases
+ https://www.apache.org/dist/
+ https://archive.apache.org/dist/ # fallback for old releases
ftp://ftp.funet.fi/pub/mirrors/apache.org/
http://apache.cs.uu.nl/
http://apache.cs.utah.edu/
@@ -308,6 +326,8 @@ rec {
hackage = [
http://hackage.haskell.org/package/
http://hdiff.luite.com/packages/archive/package/
+ http://hackage.fpcomplete.com/package/
+ http://objects-us-east-1.dream.io/hackage-mirror/package/
];
# Roy marples mirrors
@@ -379,7 +399,7 @@ rec {
# Steam Runtime mirrors
steamrt = [
http://repo.steampowered.com/steamrt/
- https://abbradar.net/steamrt/
+ https://public.abbradar.moe/steamrt/
];
# Python PyPI mirrors
@@ -404,9 +424,10 @@ rec {
# Alsa Project
alsa = [
- ftp://ftp.alsa-project.org/pub/
- http://alsa.cybermirror.org/
- http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/
- http://alsa.mirror.fr/
+ https://www.alsa-project.org/files/pub/
+ ftp://ftp.alsa-project.org/pub/
+ http://alsa.cybermirror.org/
+ http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/
+ http://alsa.mirror.fr/
];
}
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index f1b9b9290d4..c61df8ceb00 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -5,7 +5,7 @@
# (e.g. due to minor changes in the compression algorithm, or changes
# in timestamps).
-{ lib, fetchurl, unzip }:
+{ fetchurl, unzip }:
{ # Optionally move the contents of the unpacked tree up one level.
stripRoot ? true
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 22761af158a..7a5642e565d 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -12,11 +12,20 @@
# `contents = {object = ...; symlink = /init;}' is a typical
# argument.
-{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools
+{ stdenv, perl, cpio, contents, ubootTools
+, name ? "initrd"
+, compressor ? "gzip -9n"
+, prepend ? []
+, lib
}:
+let
+ # !!! Move this into a public lib function, it is probably useful for others
+ toValidStoreName = x: with builtins;
+ lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x));
+
+in stdenv.mkDerivation rec {
+ inherit name;
-stdenv.mkDerivation rec {
- name = "initrd";
builder = ./make-initrd.sh;
makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage";
@@ -33,8 +42,12 @@ stdenv.mkDerivation rec {
# Note: we don't use closureInfo yet, as that won't build with nix-1.x.
# See #36268.
exportReferencesGraph =
- map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
+ lib.zipListsWith
+ (x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object])
+ contents
+ (lib.range 0 (lib.length contents - 1));
pathsFromGraph = ./paths-from-graph.pl;
inherit compressor prepend;
}
+
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index ba1e6c57e12..8e8da00b02a 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -91,6 +91,20 @@ int open64(const char * path, int flags, ...)
return open64_real(rewrite(path, buf), flags, mode);
}
+int openat(int dirfd, const char * path, int flags, ...)
+{
+ int (*openat_real) (int, const char *, int, mode_t) = dlsym(RTLD_NEXT, "openat");
+ mode_t mode = 0;
+ if (flags & O_CREAT) {
+ va_list ap;
+ va_start(ap, flags);
+ mode = va_arg(ap, mode_t);
+ va_end(ap);
+ }
+ char buf[PATH_MAX];
+ return openat_real(dirfd, rewrite(path, buf), flags, mode);
+}
+
FILE * fopen(const char * path, const char * mode)
{
FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen");
@@ -146,6 +160,19 @@ int posix_spawn(pid_t * pid, const char * path,
return posix_spawn_real(pid, rewrite(path, buf), file_actions, attrp, argv, envp);
}
+int posix_spawnp(pid_t * pid, const char * file,
+ const posix_spawn_file_actions_t * file_actions,
+ const posix_spawnattr_t * attrp,
+ char * const argv[], char * const envp[])
+{
+ int (*posix_spawnp_real) (pid_t *, const char *,
+ const posix_spawn_file_actions_t *,
+ const posix_spawnattr_t *,
+ char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "posix_spawnp");
+ char buf[PATH_MAX];
+ return posix_spawnp_real(pid, rewrite(file, buf), file_actions, attrp, argv, envp);
+}
+
int execv(const char *path, char *const argv[])
{
int (*execv_real) (const char *path, char *const argv[]) = dlsym(RTLD_NEXT, "execv");
diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix
index a98b4affacb..a70dc0390cb 100644
--- a/pkgs/build-support/mkshell/default.nix
+++ b/pkgs/build-support/mkshell/default.nix
@@ -11,13 +11,8 @@
...
}@attrs:
let
- mergeInputs = name:
- let
- op = item: sum: sum ++ item."${name}" or [];
- nul = [];
- list = [attrs] ++ inputsFrom;
- in
- lib.foldr op nul list;
+ mergeInputs = name: lib.concatLists (lib.catAttrs name
+ ([attrs] ++ inputsFrom));
rest = builtins.removeAttrs attrs [
"inputsFrom"
@@ -25,6 +20,7 @@ let
"nativeBuildInputs"
"propagatedBuildInputs"
"propagatedNativeBuildInputs"
+ "shellHook"
];
in
@@ -37,6 +33,9 @@ stdenv.mkDerivation ({
propagatedBuildInputs = mergeInputs "propagatedBuildInputs";
propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs";
+ shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook"
+ (lib.reverseList inputsFrom ++ [attrs]));
+
nobuildPhase = ''
echo
echo "This derivation is not meant to be built, aborting";
diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix
index 48297e583af..3c5cbe2b492 100644
--- a/pkgs/build-support/nix-prefetch-github/default.nix
+++ b/pkgs/build-support/nix-prefetch-github/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-prefetch-github";
- version = "1.3";
+ version = "2.3";
src = fetchFromGitHub {
owner = "seppeljordan";
repo = "nix-prefetch-github";
- rev = "${version}";
- sha256 = "1rinbv1q4q8m27ih6l81w1lsmwn6cz7q3iyjiycklywpi8684dh6";
+ rev = "v${version}";
+ sha256 = "0b2hgfyxhlqq6lyi5cr98dz6if5kl6b3kq67f2lzfkalydywl1dh";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -19,7 +19,6 @@ python3.pkgs.buildPythonApplication rec {
click
effect
jinja2
- requests
];
meta = with stdenv.lib; {
description = "Prefetch sources from github";
diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh
index 02eac664d43..7da32203218 100644
--- a/pkgs/build-support/nuke-references/builder.sh
+++ b/pkgs/build-support/nuke-references/builder.sh
@@ -7,7 +7,7 @@ cat > $out/bin/nuke-refs < "\$i.tmp"
+ cat "\$i" | $perl/bin/perl -pe "s|\Q$NIX_STORE\E/\$excludes[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "\$i.tmp"
if test -x "\$i"; then chmod +x "\$i.tmp"; fi
mv "\$i.tmp" "\$i"
fi
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index 4d6ed76aca0..a0aac144796 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, dune, opaline }:
+{ stdenv, ocaml, findlib, dune, opaline }:
{ pname, version, buildInputs ? [], ... }@args:
diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
new file mode 100644
index 00000000000..74977486f2f
--- /dev/null
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -0,0 +1,46 @@
+{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
+
+{ pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
+ minimumOCamlVersion ? null,
+ createFindlibDestdir ? true,
+ dontStrip ? true,
+ ...
+}@args:
+
+if args ? minimumOCamlVersion &&
+ ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
+then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation (args // {
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+
+ buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis ] ++ buildInputs;
+
+ inherit createFindlibDestdir;
+ inherit dontStrip;
+
+ buildPhase = ''
+ runHook preBuild
+ oasis setup
+ ocaml setup.ml -configure
+ ocaml setup.ml -build
+ runHook postBuild
+ '';
+
+ checkPhase = ''
+ runHook preCheck
+ ocaml setup.ml -test
+ runHook postCheck
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out
+ sed -i s+/usr/local+$out+g setup.ml
+ sed -i s+/usr/local+$out+g setup.data
+ prefix=$OCAMLFIND_DESTDIR ocaml setup.ml -install
+ runHook postInstall
+ '';
+
+})
diff --git a/pkgs/build-support/references-by-popularity/closure-graph.py b/pkgs/build-support/references-by-popularity/closure-graph.py
index d67a5dfcf14..579f3b041fa 100644
--- a/pkgs/build-support/references-by-popularity/closure-graph.py
+++ b/pkgs/build-support/references-by-popularity/closure-graph.py
@@ -117,6 +117,17 @@ import unittest
from pprint import pprint
from collections import defaultdict
+
+def debug(msg, *args, **kwargs):
+ if False:
+ print(
+ "DEBUG: {}".format(
+ msg.format(*args, **kwargs)
+ ),
+ file=sys.stderr
+ )
+
+
# Find paths in the original dataset which are never referenced by
# any other paths
def find_roots(closures):
@@ -327,10 +338,23 @@ class TestMakeLookup(unittest.TestCase):
# /nix/store/tux: {}
# }
# }
+subgraphs_cache = {}
def make_graph_segment_from_root(root, lookup):
+ global subgraphs_cache
children = {}
for ref in lookup[root]:
- children[ref] = make_graph_segment_from_root(ref, lookup)
+ # make_graph_segment_from_root is a pure function, and will
+ # always return the same result based on a given input. Thus,
+ # cache computation.
+ #
+ # Python's assignment will use a pointer, preventing memory
+ # bloat for large graphs.
+ if ref not in subgraphs_cache:
+ debug("Subgraph Cache miss on {}".format(ref))
+ subgraphs_cache[ref] = make_graph_segment_from_root(ref, lookup)
+ else:
+ debug("Subgraph Cache hit on {}".format(ref))
+ children[ref] = subgraphs_cache[ref]
return children
class TestMakeGraphSegmentFromRoot(unittest.TestCase):
@@ -381,12 +405,27 @@ class TestMakeGraphSegmentFromRoot(unittest.TestCase):
# /nix/store/baz: 4
# /nix/store/tux: 6
# ]
+popularity_cache = {}
def graph_popularity_contest(full_graph):
+ global popularity_cache
popularity = defaultdict(int)
for path, subgraph in full_graph.items():
popularity[path] += 1
- subcontest = graph_popularity_contest(subgraph)
+ # graph_popularity_contest is a pure function, and will
+ # always return the same result based on a given input. Thus,
+ # cache computation.
+ #
+ # Python's assignment will use a pointer, preventing memory
+ # bloat for large graphs.
+ if path not in popularity_cache:
+ debug("Popularity Cache miss on {}", path)
+ popularity_cache[path] = graph_popularity_contest(subgraph)
+ else:
+ debug("Popularity Cache hit on {}", path)
+
+ subcontest = popularity_cache[path]
for subpath, subpopularity in subcontest.items():
+ debug("Calculating popularity for {}", subpath)
popularity[subpath] += subpopularity + 1
return popularity
@@ -474,6 +513,7 @@ def main():
filename = sys.argv[1]
key = sys.argv[2]
+ debug("Loading from {}", filename)
with open(filename) as f:
data = json.load(f)
@@ -497,14 +537,21 @@ def main():
# ]
graph = data[key]
+ debug("Finding roots from {}", key)
roots = find_roots(graph);
+ debug("Making lookup for {}", key)
lookup = make_lookup(graph)
full_graph = {}
for root in roots:
+ debug("Making full graph for {}", root)
full_graph[root] = make_graph_segment_from_root(root, lookup)
- ordered = order_by_popularity(graph_popularity_contest(full_graph))
+ debug("Running contest")
+ contest = graph_popularity_contest(full_graph)
+ debug("Ordering by popularity")
+ ordered = order_by_popularity(contest)
+ debug("Checking for missing paths")
missing = []
for path in all_paths(graph):
if path not in ordered:
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index 5ab24132290..2d24d5bd704 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (
mkdir -p $out/bin
cat >> $out/bin/${w.name} <" ];
- sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7";
- libName = "advapi32";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "aho-corasick";
- version = "0.6.3";
- authors = [ "Andrew Gallant " ];
- sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k";
- libName = "aho_corasick";
- crateBin = [ { name = "aho-corasick-dot"; } ];
- inherit dependencies buildDependencies features;
- };
- atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "atty";
- version = "0.2.3";
- authors = [ "softprops " ];
- sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f";
- inherit dependencies buildDependencies features;
- };
- backtrace_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "backtrace";
- version = "0.3.3";
- authors = [ "Alex Crichton " "The Rust Project Developers" ];
- sha256 = "0invfdxkj85v8zyrjs3amfxjdk2a36x8irq7wq7kny6q49hh8y0z";
- inherit dependencies buildDependencies features;
- };
- backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "backtrace-sys";
- version = "0.1.16";
- authors = [ "Alex Crichton " ];
- sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "bitflags";
- version = "0.7.0";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
- inherit dependencies buildDependencies features;
- };
- bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "bitflags";
- version = "0.9.1";
- authors = [ "The Rust Project Developers" ];
- sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
- inherit dependencies buildDependencies features;
- };
- cargo_0_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "cargo";
- version = "0.22.0";
- authors = [ "Yehuda Katz " "Carl Lerche " "Alex Crichton " ];
- sha256 = "1a47jzkxydsrcyybdqv7wd6a2f258c8bb8rb2jv5n4apxz5qhycl";
- libPath = "src/cargo/lib.rs";
- crateBin = [ { name = "cargo"; } ];
- inherit dependencies buildDependencies features;
- };
- cargo_vendor_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "cargo-vendor";
- version = "0.1.13";
- authors = [ "Alex Crichton " ];
- src = ./.;
- inherit dependencies buildDependencies features;
- };
- cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "cc";
- version = "1.0.3";
- authors = [ "Alex Crichton " ];
- sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr";
- inherit dependencies buildDependencies features;
- };
- cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "cfg-if";
- version = "0.1.2";
- authors = [ "Alex Crichton " ];
- sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
- inherit dependencies buildDependencies features;
- };
- cmake_0_1_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "cmake";
- version = "0.1.26";
- authors = [ "Alex Crichton " ];
- sha256 = "0qi1vb1fzlngxr4mzklg58jjmvwj08059pjvh0yh1azzj2mcmgx6";
- inherit dependencies buildDependencies features;
- };
- core_foundation_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "core-foundation";
- version = "0.4.4";
- authors = [ "The Servo Project Developers" ];
- sha256 = "1vn9cdbihjnqrlznrbvw0yggz5grb4wqll5xq080w28xxhnayyhx";
- inherit dependencies buildDependencies features;
- };
- core_foundation_sys_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "core-foundation-sys";
- version = "0.4.4";
- authors = [ "The Servo Project Developers" ];
- sha256 = "022i015jzjmv85vr25l9caxz211649d8rnbcsmr0gh9k4ygm7pqk";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- crates_io_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "crates-io";
- version = "0.11.0";
- authors = [ "Alex Crichton " ];
- sha256 = "1xxhbka89bk1kkhl8nsnlp9ih64fzv904dyb7jyws7lizcvq77wm";
- libPath = "lib.rs";
- libName = "crates_io";
- inherit dependencies buildDependencies features;
- };
- crossbeam_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "crossbeam";
- version = "0.2.10";
- authors = [ "Aaron Turon " ];
- sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq";
- inherit dependencies buildDependencies features;
- };
- curl_0_4_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "curl";
- version = "0.4.8";
- authors = [ "Carl Lerche " "Alex Crichton " ];
- sha256 = "0pxg1bpplm1bp8b8gzlvs4pmd36m02gjhskvwrd161hh9pslczv5";
- inherit dependencies buildDependencies features;
- };
- curl_sys_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "curl-sys";
- version = "0.3.15";
- authors = [ "Carl Lerche " "Alex Crichton " ];
- sha256 = "0x2ysxhpwg1a7srf74v4qcy516jzf0kjg87hsl6cfnasxplz5x1g";
- libPath = "lib.rs";
- libName = "curl_sys";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "dbghelp-sys";
- version = "0.2.0";
- authors = [ "Peter Atashian " ];
- sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq";
- libName = "dbghelp";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- docopt_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "docopt";
- version = "0.8.1";
- authors = [ "Andrew Gallant " ];
- sha256 = "0kmqy534qgcc2hh81nd248jmnvdjb5y4wclddd7y2jjm27rzibss";
- crateBin = [ { name = "docopt-wordlist"; path = "src/wordlist.rs"; } ];
- inherit dependencies buildDependencies features;
- };
- dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "dtoa";
- version = "0.4.2";
- authors = [ "David Tolnay " ];
- sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
- inherit dependencies buildDependencies features;
- };
- env_logger_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "env_logger";
- version = "0.4.3";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0nrx04p4xa86d5kc7aq4fwvipbqji9cmgy449h47nc9f1chafhgg";
- inherit dependencies buildDependencies features;
- };
- error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "error-chain";
- version = "0.11.0";
- authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ];
- sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7";
- inherit dependencies buildDependencies features;
- };
- filetime_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "filetime";
- version = "0.1.14";
- authors = [ "Alex Crichton " ];
- sha256 = "0i6dvc3ba7vl1iccc91k7c9bv9j5md98mbvlmfy0kicikx0ffn08";
- inherit dependencies buildDependencies features;
- };
- flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "flate2";
- version = "0.2.20";
- authors = [ "Alex Crichton " ];
- sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl";
- inherit dependencies buildDependencies features;
- };
- fnv_1_0_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "fnv";
- version = "1.0.5";
- authors = [ "Alex Crichton " ];
- sha256 = "164832m16b3hdm3jfrda03ps3ayi5qb855irpm9sqpnw1awpy2a2";
- libPath = "lib.rs";
- inherit dependencies buildDependencies features;
- };
- foreign_types_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "foreign-types";
- version = "0.2.0";
- authors = [ "Steven Fackler " ];
- sha256 = "1sznwg2py4xi7hyrx0gg1sirlwgh87wsanvjx3zb475g6c4139jh";
- inherit dependencies buildDependencies features;
- };
- fs2_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "fs2";
- version = "0.4.2";
- authors = [ "Dan Burkert " ];
- sha256 = "034s52pmqvrkafmmlnklysqx6gl08rl63ycngbav9hs0mrq22qvf";
- inherit dependencies buildDependencies features;
- };
- fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "fuchsia-zircon";
- version = "0.2.1";
- authors = [ "Raph Levien " ];
- sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb";
- inherit dependencies buildDependencies features;
- };
- fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "fuchsia-zircon-sys";
- version = "0.2.0";
- authors = [ "Raph Levien " ];
- sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w";
- inherit dependencies buildDependencies features;
- };
- git2_0_6_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "git2";
- version = "0.6.8";
- authors = [ "Alex Crichton " ];
- sha256 = "1si82zg35a1az91wa2zjwlkmbd4pdia8wf87j6hz4bs8l55y8fd9";
- inherit dependencies buildDependencies features;
- };
- git2_curl_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "git2-curl";
- version = "0.7.0";
- authors = [ "Alex Crichton " ];
- sha256 = "1k36py61r3g7xz79ms02c1zb9x5c60g4wnjg2ffwz2j7kqzw9cc8";
- inherit dependencies buildDependencies features;
- };
- glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "glob";
- version = "0.2.11";
- authors = [ "The Rust Project Developers" ];
- sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
- inherit dependencies buildDependencies features;
- };
- globset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "globset";
- version = "0.2.1";
- authors = [ "Andrew Gallant " ];
- sha256 = "02dycdz001g33rs2jygiq7yqqswmy1in5rczfl44clq1p118fis0";
- inherit dependencies buildDependencies features;
- };
- hex_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "hex";
- version = "0.2.0";
- authors = [ "KokaKiwi " ];
- sha256 = "0yd68d709w1z8133n9hny9dfj2fvil0r6802c3bb63czyis8rfbp";
- inherit dependencies buildDependencies features;
- };
- home_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "home";
- version = "0.3.0";
- authors = [ "Brian Anderson " ];
- sha256 = "1dzc0wd2i82zqq1s8j4mpy2almaq5fcas22s4asn38pm86k40zf2";
- inherit dependencies buildDependencies features;
- };
- idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "idna";
- version = "0.1.4";
- authors = [ "The rust-url developers" ];
- sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336";
- inherit dependencies buildDependencies features;
- };
- ignore_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "ignore";
- version = "0.2.2";
- authors = [ "Andrew Gallant " ];
- sha256 = "1b9wc8q25jwbipxmrysaps7sykbhyh6hdl8ihqzlwfvg39dy7mjc";
- inherit dependencies buildDependencies features;
- };
- itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "itoa";
- version = "0.3.4";
- authors = [ "David Tolnay " ];
- sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
- inherit dependencies buildDependencies features;
- };
- jobserver_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "jobserver";
- version = "0.1.8";
- authors = [ "Alex Crichton " ];
- sha256 = "0rscjndafcrldrlb5nax2jgnc6fk298awqc6yzi9lbnbybm6r004";
- inherit dependencies buildDependencies features;
- };
- kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "kernel32-sys";
- version = "0.2.2";
- authors = [ "Peter Atashian " ];
- sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
- libName = "kernel32";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- lazy_static_0_2_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "lazy_static";
- version = "0.2.9";
- authors = [ "Marvin Löbel " ];
- sha256 = "08ldzr5292y3hvi6l6v8l4i6v95lm1aysmnfln65h10sqrfh6iw7";
- inherit dependencies buildDependencies features;
- };
- libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "libc";
- version = "0.2.33";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1";
- inherit dependencies buildDependencies features;
- };
- libgit2_sys_0_6_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "libgit2-sys";
- version = "0.6.16";
- authors = [ "Alex Crichton " ];
- sha256 = "05axjdwkm7z8z6c7s96cakdigjiq9sfah8z48868bhby6v1q30n9";
- libPath = "lib.rs";
- libName = "libgit2_sys";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- libssh2_sys_0_2_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "libssh2-sys";
- version = "0.2.6";
- authors = [ "Alex Crichton " ];
- sha256 = "0pvdgr3lg9x8xyjmfwifr9dxirvrzjvq7i3clix50rwp7ck21jh7";
- libPath = "lib.rs";
- libName = "libssh2_sys";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- libz_sys_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "libz-sys";
- version = "1.0.18";
- authors = [ "Alex Crichton " ];
- sha256 = "0lr0rvmmfbfa4g7mhi0l93i8jq86pfcssdv4d40kzfy45ajdcgim";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "log";
- version = "0.3.8";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006";
- inherit dependencies buildDependencies features;
- };
- matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "matches";
- version = "0.1.6";
- authors = [ "Simon Sapin " ];
- sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan";
- libPath = "lib.rs";
- inherit dependencies buildDependencies features;
- };
- memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "memchr";
- version = "1.0.2";
- authors = [ "Andrew Gallant " "bluss" ];
- sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
- inherit dependencies buildDependencies features;
- };
- memchr_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "memchr";
- version = "2.0.0";
- authors = [ "Andrew Gallant " "bluss" ];
- sha256 = "182svm4sr8b7l38ss6ph5wkj3p7ypp08jq65fm83mxpylxziih9p";
- inherit dependencies buildDependencies features;
- };
- miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "miniz-sys";
- version = "0.1.10";
- authors = [ "Alex Crichton " ];
- sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln";
- libPath = "lib.rs";
- libName = "miniz_sys";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "miow";
- version = "0.2.1";
- authors = [ "Alex Crichton " ];
- sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0";
- inherit dependencies buildDependencies features;
- };
- net2_0_2_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "net2";
- version = "0.2.31";
- authors = [ "Alex Crichton " ];
- sha256 = "13mphllfcbybsdqyi1jb3kyqx65m8ch07drr59a4wb3yl89awm7y";
- inherit dependencies buildDependencies features;
- };
- num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "num-traits";
- version = "0.1.40";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
- inherit dependencies buildDependencies features;
- };
- num_cpus_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "num_cpus";
- version = "1.7.0";
- authors = [ "Sean McArthur " ];
- sha256 = "0231xmd65ma3pqfiw8pkv9dvm9x708z4xlrwp3i0sgiwv408dz3f";
- inherit dependencies buildDependencies features;
- };
- openssl_0_9_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "openssl";
- version = "0.9.20";
- authors = [ "Steven Fackler " ];
- sha256 = "0dbj6k6z828c3sqbxidw5zfval29k8dlsr8qn8fizhc1alli18gx";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- openssl_probe_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "openssl-probe";
- version = "0.1.1";
- authors = [ "Alex Crichton " ];
- sha256 = "19ykmqfnbmq56nadir0kvap4q1rpcjpmrfpnbc1qkj195dnh66na";
- inherit dependencies buildDependencies features;
- };
- openssl_sys_0_9_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "openssl-sys";
- version = "0.9.20";
- authors = [ "Alex Crichton " "Steven Fackler " ];
- sha256 = "05q6qagvy7lim9vkq2v00vpm34j1dq4xy9pchs7fb6yy803vx24m";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- percent_encoding_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "percent-encoding";
- version = "1.0.0";
- authors = [ "The rust-url developers" ];
- sha256 = "0c91wp8inj7z270i2kilxjl00kcagqalxxnnjg7fsdlimdwb7q1z";
- libPath = "lib.rs";
- inherit dependencies buildDependencies features;
- };
- pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "pkg-config";
- version = "0.3.9";
- authors = [ "Alex Crichton " ];
- sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
- inherit dependencies buildDependencies features;
- };
- psapi_sys_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "psapi-sys";
- version = "0.1.0";
- authors = [ "Peter Atashian " ];
- sha256 = "091sbrcwbnhq1mwx6rc5w5kkwzg2ph78rhwjkdy9aqnzj7yj5ppm";
- libName = "psapi";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "quote";
- version = "0.3.15";
- authors = [ "David Tolnay " ];
- sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
- inherit dependencies buildDependencies features;
- };
- rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "rand";
- version = "0.3.18";
- authors = [ "The Rust Project Developers" ];
- sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv";
- inherit dependencies buildDependencies features;
- };
- redox_syscall_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "redox_syscall";
- version = "0.1.31";
- authors = [ "Jeremy Soller " ];
- sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4";
- libName = "syscall";
- inherit dependencies buildDependencies features;
- };
- redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "redox_termios";
- version = "0.1.1";
- authors = [ "Jeremy Soller
](https://nixos.org/nixos)
[](https://www.codetriage.com/nixos/nixpkgs)
+[](https://opencollective.com/nixos)
Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package
manager. It is periodically built and tested by the [Hydra](https://hydra.nixos.org/)
@@ -12,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add
```
For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-18.09` for the latest
+custom changes on top of one of the channels, e.g. `nixos-19.03` for the latest
release and `nixos-unstable` for the latest successful build of master:
```
% git remote update channels
-% git rebase channels/nixos-18.09
+% git rebase channels/nixos-19.03
```
For pull requests, please rebase onto nixpkgs `master`.
@@ -31,9 +32,9 @@ For pull requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 18.09 release](https://hydra.nixos.org/jobset/nixos/release-18.09)
+* [Continuous package builds for 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 18.09 release](https://hydra.nixos.org/job/nixos/release-18.09/tested#tabs-constituents)
+* [Tests for 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents)
Communication:
diff --git a/doc/.gitignore b/doc/.gitignore
index cb07135e685..b5c58be03d1 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,7 +1,8 @@
*.chapter.xml
*.section.xml
.version
-out
-manual-full.xml
-highlightjs
+functions/library/generated
functions/library/locations.xml
+highlightjs
+manual-full.xml
+out
diff --git a/doc/Makefile b/doc/Makefile
index cd6d7eb8d1c..e7ca31b20d7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,10 +8,10 @@ debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
.PHONY: format
-format:
+format: doc-support/result
find . -iname '*.xml' -type f | while read f; do \
echo $$f ;\
- xmlformat --config-file "$$XMLFORMAT_CONFIG" -i $$f ;\
+ xmlformat --config-file "doc-support/result/xmlformat.conf" -i $$f ;\
done
.PHONY: fix-misc-xml
@@ -21,19 +21,19 @@ fix-misc-xml:
.PHONY: clean
clean:
- rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml functions/library/generated
+ rm -f ${MD_TARGETS} doc-support/result .version manual-full.xml functions/library/locations.xml functions/library/generated
rm -rf ./out/ ./highlightjs
.PHONY: validate
-validate: manual-full.xml
- jing "$$RNG" manual-full.xml
+validate: manual-full.xml doc-support/result
+ jing doc-support/result/docbook.rng manual-full.xml
-out/html/index.html: manual-full.xml style.css highlightjs
+out/html/index.html: doc-support/result manual-full.xml style.css highlightjs
mkdir -p out/html
- xsltproc ${xsltFlags} \
+ xsltproc \
--nonet --xinclude \
--output $@ \
- "$$XSL/docbook/xhtml/docbook.xsl" \
+ doc-support/result/xhtml.xsl \
./manual-full.xml
mkdir -p out/html/highlightjs/
@@ -43,50 +43,48 @@ out/html/index.html: manual-full.xml style.css highlightjs
cp ./style.css out/html/style.css
mkdir -p out/html/images/callouts
- cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
+ cp doc-support/result/xsl/docbook/images/callouts/*.svg out/html/images/callouts/
chmod u+w -R out/html/
out/epub/manual.epub: manual-full.xml
mkdir -p out/epub/scratch
- xsltproc ${xsltFlags} --nonet \
+ xsltproc --nonet \
--output out/epub/scratch/ \
- "$$XSL/docbook/epub/docbook.xsl" \
+ doc-support/result/epub.xsl \
./manual-full.xml
cp ./overrides.css out/epub/scratch/OEBPS
cp ./style.css out/epub/scratch/OEBPS
mkdir -p out/epub/scratch/OEBPS/images/callouts/
- cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
+ cp doc-support/result/xsl/docbook/images/callouts/*.svg out/epub/scratch/OEBPS/images/callouts/
echo "application/epub+zip" > mimetype
zip -0Xq "out/epub/manual.epub" mimetype
rm mimetype
cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
rm -rf "out/epub/scratch/"
-highlightjs:
+highlightjs: doc-support/result
mkdir -p highlightjs
- cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
- cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
- cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
- cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
+ cp -r doc-support/result/highlightjs/highlight.pack.js highlightjs/
+ cp -r doc-support/result/highlightjs/LICENSE highlightjs/
+ cp -r doc-support/result/highlightjs/mono-blue.css highlightjs/
+ cp -r doc-support/result/highlightjs/loader.js highlightjs/
manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml functions/library/generated *.xml **/*.xml **/**/*.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
-.version:
- nix-instantiate --eval \
- -E '(import ../lib).version' > .version
+.version: doc-support/result
+ ln -rfs ./doc-support/result/version .version
-function_locations := $(shell nix-build --no-out-link ./lib-function-locations.nix)
+doc-support/result: doc-support/default.nix
+ (cd doc-support; nix-build)
-functions/library/locations.xml:
- ln -s $(function_locations) ./functions/library/locations.xml
+functions/library/locations.xml: doc-support/result
+ ln -rfs ./doc-support/result/function-locations.xml functions/library/locations.xml
-functions/library/generated:
- nix-build ./lib-function-docs.nix \
- --arg locationsXml $(function_locations)\
- --out-link ./functions/library/generated
+functions/library/generated: doc-support/result
+ ln -rfs ./doc-support/result/function-docs functions/library/generated
%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index d2c7a1baae9..48356247a49 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -197,20 +197,14 @@ args.stdenv.mkDerivation (args // {
-
+