Merge master into staging-next
This commit is contained in:
commit
5021a8bc13
16 changed files with 1034 additions and 858 deletions
pkgs
applications
editors/emacs-modes
networking/browsers/qutebrowser
development
libraries
python-modules
tools/rust/cargo-udeps
shells/xonsh
tools
top-level
|
@ -223,10 +223,10 @@
|
|||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "13.0.4";
|
||||
version = "13.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.4.tar";
|
||||
sha256 = "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.5.tar";
|
||||
sha256 = "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
|
@ -2203,10 +2203,10 @@
|
|||
elpaBuild {
|
||||
pname = "modus-operandi-theme";
|
||||
ename = "modus-operandi-theme";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.1.tar";
|
||||
sha256 = "08l9qmhvxiscxn4mfb80x57mk4gfm5r0fs2l9c8i3gfzd4i3h091";
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.2.tar";
|
||||
sha256 = "1sw18ijp9rhaf8y8x8z5rmxy23pxd3gaicgmp2zndcfmm54gwsic";
|
||||
};
|
||||
packageRequires = [ emacs modus-themes ];
|
||||
meta = {
|
||||
|
@ -2237,10 +2237,10 @@
|
|||
elpaBuild {
|
||||
pname = "modus-vivendi-theme";
|
||||
ename = "modus-vivendi-theme";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.1.tar";
|
||||
sha256 = "0xz304zcc872c2zwnlm8ky0m18smf7bffiyj21ygghgclr7kgma1";
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.2.tar";
|
||||
sha256 = "1qn3kzxwf81zc7gprd9wblhb8b8akdkxwajpgk036y8i4cmvmspn";
|
||||
};
|
||||
packageRequires = [ emacs modus-themes ];
|
||||
meta = {
|
||||
|
@ -3252,10 +3252,10 @@
|
|||
elpaBuild {
|
||||
pname = "setup";
|
||||
ename = "setup";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/setup-0.1.1.tar";
|
||||
sha256 = "0z34m06lxw6xd6bxacm1h5cijamsksk4daf6fbzhd7kqmw3gbgqg";
|
||||
url = "https://elpa.gnu.org/packages/setup-0.1.2.tar";
|
||||
sha256 = "1q29phch4fvmvc255kgvzsnzdqp6kaip7ybpxprd0kkdjs3jrsqv";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210315";
|
||||
version = "20210322";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210315.tar";
|
||||
sha256 = "128agds82kfmvxshzrs61802vgwlf2dsm79hq9x2bljrnvf8p14l";
|
||||
url = "https://orgmode.org/elpa/org-20210322.tar";
|
||||
sha256 = "0iv54rhwa0972yr1wqzmlkggs5vc6qajz8mmyfhynp65ap088g6v";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
@ -19,10 +19,10 @@
|
|||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210315";
|
||||
version = "20210322";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210315.tar";
|
||||
sha256 = "0dih4690pbbnwlphjnv1kgvsw43pkcgk41xjjiphy9sf7w9gr11j";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210322.tar";
|
||||
sha256 = "0riswc3ira8hsawm37yypji55z47bw2477kaw3qx7ghz3n62r9nf";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -31,12 +31,12 @@ let
|
|||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0fxkazz4ykmkiww27l92yr96hq00qn5vvjmknxcy4cl97d2pxa28";
|
||||
sha256 = "0fz6rbacy9sbzx0jsvwkrcyv2849ia8pj1w716l6pw9i9wx3gp8x";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
@ -60,6 +60,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
|
|||
# scripts and userscripts libs
|
||||
tldextract beautifulsoup4
|
||||
pyreadability pykeepass stem
|
||||
pynacl
|
||||
# extensive ad blocking
|
||||
adblock
|
||||
]
|
||||
|
|
|
@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
|
|||
|
||||
{
|
||||
newScope,
|
||||
lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
|
||||
lib, stdenv, fetchurl, fetchpatch, fetchgit, fetchFromGitHub, makeSetupHook, makeWrapper,
|
||||
bison, cups ? null, harfbuzz, libGL, perl,
|
||||
gstreamer, gst-plugins-base, gtk3, dconf,
|
||||
llvmPackages_5,
|
||||
|
@ -48,6 +48,27 @@ let
|
|||
};
|
||||
version = "5.212.0-alpha4";
|
||||
};
|
||||
|
||||
# Even if developed in the public, QtWebEngine does not have official
|
||||
# releases or new tags since the Qt company made 5.15.3 proprietary.
|
||||
# Apparently they care more about licensing than the security of their users.
|
||||
# See https://lists.qt-project.org/pipermail/interest/2021-March/036387.html
|
||||
qtwebengine =
|
||||
let
|
||||
branchName = "5.15.3";
|
||||
rev = "a059e7404a6db799f4da0ad696e65ae9c854b4b0";
|
||||
in
|
||||
{
|
||||
version = "${branchName}-${lib.substring 0 8 rev}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/qt/qtwebengine.git";
|
||||
sha256 = "19l1i4sk3pvnwbvz5s97jchqawfz8k1xmjza29bgvkp1zz96r0jx";
|
||||
inherit rev branchName;
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
patches = {
|
||||
|
@ -83,11 +104,16 @@ let
|
|||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qtwebengine = [ ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./qtwebengine-darwin-no-platform-check.patch
|
||||
./qtwebengine-mac-dont-set-dsymutil-path.patch
|
||||
];
|
||||
qtwebengine = [
|
||||
# Fix crashes with non en_US.UTF-8 locales
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch";
|
||||
sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2";
|
||||
})
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
./qtwebengine-darwin-no-platform-check.patch
|
||||
./qtwebengine-mac-dont-set-dsymutil-path.patch
|
||||
];
|
||||
qtwebkit = [
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-bison-3.7-build.patch";
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
|
||||
|
||||
, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which
|
||||
, nodejs, qtbase, perl
|
||||
|
||||
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
|
||||
, fontconfig, freetype, harfbuzz, icu, dbus, libdrm
|
||||
|
@ -25,7 +26,15 @@ qtModule {
|
|||
name = "qtwebengine";
|
||||
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
|
||||
nativeBuildInputs = [
|
||||
bison coreutils flex git gperf ninja pkg-config python2 which gn
|
||||
bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs
|
||||
|
||||
# qmake looks for syncqt instead of syncqt.pl and fails with a cryptic
|
||||
# error if it can't find it. syncqt.pl also has a /usr/bin/env shebang, so
|
||||
# it can't be directly used in a sandboxed build environment.
|
||||
(writeScriptBin "syncqt" ''
|
||||
#!${stdenv.shell}
|
||||
exec ${perl}/bin/perl ${qtbase.dev}/bin/syncqt.pl "$@"
|
||||
'')
|
||||
] ++ optional stdenv.isDarwin xcbuild;
|
||||
doCheck = true;
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
@ -40,9 +49,17 @@ qtModule {
|
|||
hardeningDisable = [ "format" ];
|
||||
|
||||
postPatch =
|
||||
# Patch Chromium build tools
|
||||
''
|
||||
( cd src/3rdparty/chromium; patchShebangs . )
|
||||
# Patch Chromium build tools
|
||||
(
|
||||
cd src/3rdparty/chromium;
|
||||
|
||||
# Manually fix unsupported shebangs
|
||||
substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
|
||||
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
|
||||
|
||||
patchShebangs .
|
||||
)
|
||||
''
|
||||
# Prevent Chromium build script from making the path to `clang` relative to
|
||||
# the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR`
|
||||
|
@ -120,7 +137,7 @@ qtModule {
|
|||
if [ -d "$PWD/tools/qmake" ]; then
|
||||
QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
|
||||
fi
|
||||
'';
|
||||
'';
|
||||
|
||||
qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
|
||||
then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
|
||||
|
|
|
@ -1,17 +1,27 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
|
||||
, gfortran, blas, lapack, eigen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arpack";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencollab";
|
||||
repo = "arpack-ng";
|
||||
rev = version;
|
||||
sha256 = "1x7a1dj3dg43nlpvjlh8jzzbadjyr3mbias6f0256qkmgdyk4izr";
|
||||
sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/opencollab/arpack-ng/pull/301
|
||||
(fetchpatch {
|
||||
name = "pkg-config-paths.patch";
|
||||
url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch";
|
||||
excludes = [ "CHANGES" ];
|
||||
sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = assert (blas.isILP64 == lapack.isILP64); [
|
||||
gfortran
|
||||
|
@ -24,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}"
|
||||
"-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
|
||||
];
|
||||
|
||||
preCheck = if stdenv.isDarwin then ''
|
||||
|
@ -36,12 +46,6 @@ stdenv.mkDerivation rec {
|
|||
export OMP_NUM_THREADS=2
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cp arpack.pc $out/lib/pkgconfig/
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/opencollab/arpack-ng";
|
||||
description = ''
|
||||
|
@ -49,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
problems.
|
||||
'';
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
maintainers = with lib.maintainers; [ ttuegel dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ buildPythonPackage, fetchPypi
|
||||
, pyasn1, pyasn1-modules, pytest
|
||||
, pyasn1, pyasn1-modules
|
||||
, pythonAtLeast, pytestCheckHook
|
||||
, openldap, cyrus_sasl, lib, stdenv }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -13,20 +14,22 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ pyasn1 pyasn1-modules ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
buildInputs = [ openldap cyrus_sasl ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
preCheck = ''
|
||||
# Needed by tests to setup a mockup ldap server.
|
||||
export BIN="${openldap}/bin"
|
||||
export SBIN="${openldap}/bin"
|
||||
export SLAPD="${openldap}/libexec/slapd"
|
||||
export SCHEMA="${openldap}/etc/schema"
|
||||
|
||||
py.test
|
||||
'';
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.9") [
|
||||
# See https://github.com/python-ldap/python-ldap/issues/407
|
||||
"test_simple_bind_noarg"
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -14,12 +14,12 @@ let
|
|||
|
||||
in buildPythonPackage rec {
|
||||
pname = "PyQtWebEngine";
|
||||
version = "5.15.2";
|
||||
version = "5.15.4";
|
||||
format = "other";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0d56ak71r14w4f9r96vaj34qcn2rbln3s6ildvvyc707fjkzwwjd";
|
||||
sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknx";
|
||||
version = "0.17.2";
|
||||
version = "0.17.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XKNX";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DJglvcpqGBVkycEjq+Oa9gz9Keop39+UR9SctX0lg/A=";
|
||||
sha256 = "sha256-QMtpGd7JFPGTLHbhyjOsan1Ow32v8B2ss84GpHA0qqs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-udeps";
|
||||
version = "0.1.19";
|
||||
version = "0.1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "est31";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0XE1w/FZmy0iMm5LI885S7F6GxgeHwh57t8N4hreSKw=";
|
||||
sha256 = "sha256-1gAkc8x9rl80xkFWR2iKYOjkHplWUPWQZDbE8U5gkOM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7pfGMCChOMSLlZ/bvaHfpksru5bCHfBQUN+sGyI1M8E=";
|
||||
cargoSha256 = "sha256-APUQYqC0MYNeeuehkQvxQsjOnXBgvEMNBqfoUy2KH0U=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xonsh";
|
||||
version = "0.9.24";
|
||||
version = "0.9.27";
|
||||
|
||||
# fetch from github because the pypi package ships incomplete tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "xonsh";
|
||||
repo = "xonsh";
|
||||
rev = version;
|
||||
sha256 = "1nk7kbiv7jzmr6narsnr0nyzkhlc7xw3b2bksyq2j6nda67b9b3y";
|
||||
sha256 = "09w6bl3qsygfs2ph2r423ndnbd74bzf67vp8587h2dkkfxlzjbad";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
|
|||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks'
|
||||
HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks and not test_command_pipeline_capture and not test_git_dirty_working_directory_includes_untracked and not test_dirty_working_directory and not test_vc_get_branch'
|
||||
HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5
|
||||
HOME=$TMPDIR pytest -k 'test_ptk_highlight'
|
||||
'';
|
||||
|
@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "A Python-ish, BASHwards-compatible shell";
|
||||
homepage = "https://xon.sh/";
|
||||
changelog = "https://github.com/xonsh/xonsh/releases/tag/${version}";
|
||||
changelog = "https://github.com/xonsh/xonsh/raw/${version}/CHANGELOG.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ spwhitt vrthra ];
|
||||
platforms = platforms.all;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "vault";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9";
|
||||
sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/hashicorp/vault";
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, unzip }:
|
||||
|
||||
let
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
sources = let
|
||||
base = "https://releases.hashicorp.com/vault/${version}";
|
||||
in {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/vault_${version}_linux_amd64.zip";
|
||||
sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4";
|
||||
sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
url = "${base}/vault_${version}_linux_386.zip";
|
||||
sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my";
|
||||
sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "${base}/vault_${version}_darwin_amd64.zip";
|
||||
sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j";
|
||||
sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base}/vault_${version}_linux_arm64.zip";
|
||||
sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i";
|
||||
sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -35,9 +35,13 @@ in stdenv.mkDerivation {
|
|||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/bash-completion/completions
|
||||
mv vault $out/bin
|
||||
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "4.8.1";
|
||||
version = "4.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3qx9nL1lzVbtvVW3O9kQw4FoVuCqo8fxl8u1WXZNRFs=";
|
||||
sha256 = "sha256-fQzKWgePF7SszYMwRSB3s59AmVjvzMvXPM49PXFTBGM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
|
||||
|
|
|
@ -16803,7 +16803,7 @@ in
|
|||
qt515 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.15) {
|
||||
inherit newScope;
|
||||
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit bison;
|
||||
inherit cups;
|
||||
inherit dconf;
|
||||
|
|
Loading…
Reference in a new issue