colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-08 12:01:24 +00:00 committed by GitHub
commit 40b71c3159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 135 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/editors/hexcurse/default.nix
View File

@ -23,6 +23,22 @@ stdenv.mkDerivation rec {
url = "https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch";
sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix";
})
# Fix pending upstream inclusion for gcc10 -fno-common compatibility:
# https://github.com/LonnyGomes/hexcurse/pull/28
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/LonnyGomes/hexcurse/commit/9cf7c9dcd012656df949d06f2986b57db3a72bdc.patch";
sha256 = "1awsyxys4pd3gkkgyckgjg3njgqy07223kcmnpfdkidh2xb0s360";
})
# Fix pending upstream inclusion for ncurses-6.3 support:
# https://github.com/LonnyGomes/hexcurse/pull/40
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/LonnyGomes/hexcurse/commit/cb70d4a93a46102f488f471fad31a7cfc9fec025.patch";
sha256 = "19674zhhp7gc097kl4bxvi0gblq6jzjy8cw8961svbq5y3hv1v5y";
})
];
meta = with lib; {

4
pkgs/applications/misc/gpxsee/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
version = "9.6";
version = "9.11";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "sha256-Yj8lR8zgIV+gshea7rzLbMF84n1nyN3DytiIkr3B274=";
sha256 = "sha256-5FGdcmkVOxjDngVQIlXnH3OPRMjaixqJ2Xb239usUuo=";
};
patches = (substituteAll {

4
pkgs/applications/misc/sfm/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sfm";
version = "0.3.1";
version = "0.4";
src = fetchFromGitHub {
owner = "afify";
repo = pname;
rev = "v${version}";
hash = "sha256-NmafUezwKK9bYPAWDNhegyjqkb4GY/i1WEtQ9puIaig=";
hash = "sha256-VwPux6n+azpR4qDkzZJia95pJJOaFDBBoz6/VwlC0zw=";
};
configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf);

9
pkgs/applications/window-managers/evilwm/default.nix
View File

@ -26,8 +26,11 @@ stdenv.mkDerivation rec {
xorgproto
];
prePatch = ''substituteInPlace ./Makefile --replace /usr $out \
--replace "CC = gcc" "#CC = gcc"'';
postPatch = ''
substituteInPlace ./Makefile \
--replace /usr $out \
--replace "CC = gcc" "#CC = gcc"
'';
# Allow users set their own list of patches
inherit patches;
@ -35,14 +38,12 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://www.6809.org.uk/evilwm/";
description = "Minimalist window manager for the X Window System";
license = {
shortName = "evilwm";
fullName = "Custom, inherited from aewm and 9wm";
url = "http://www.6809.org.uk/evilwm/";
free = true;
}; # like BSD/MIT, but Share-Alike'y; See README.
maintainers = with maintainers; [ amiloradovsky ];
platforms = platforms.all;
};

36
pkgs/applications/window-managers/i3/lock-fancy.nix
View File

@ -11,35 +11,39 @@
}:
stdenv.mkDerivation rec {
rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a";
pname = "i3lock-fancy";
version = "unstable-2018-11-25_rev${builtins.substring 0 7 rev}";
version = "unstable-2018-11-25";
src = fetchFromGitHub {
owner = "meskarune";
repo = "i3lock-fancy";
inherit rev;
rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a";
sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1";
};
patchPhase = ''
sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" i3lock-fancy
sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy
sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy
sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy
sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy
sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy
sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy
sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy
sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy
sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy
sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy
sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" i3lock-fancy
postPatch = ''
sed -i i3lock-fancy \
-e "s|mktemp|${coreutils}/bin/mktemp|" \
-e "s|'rm -f |'${coreutils}/bin/rm -f |" \
-e "s|scrot -z |${scrot}/bin/scrot -z |" \
-e "s|convert |${imagemagick.out}/bin/convert |" \
-e "s|awk -F|${gawk}/bin/awk -F|" \
-e "s| awk | ${gawk}/bin/awk |" \
-e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" \
-e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \
-e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' \
-e "s|getopt |${getopt}/bin/getopt |" \
-e "s|fc-match |${fontconfig.bin}/bin/fc-match |" \
-e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|"
rm Makefile
'';
installPhase = ''
mkdir -p $out/bin $out/share/i3lock-fancy/icons
cp i3lock-fancy $out/bin/i3lock-fancy
cp icons/lock*.png $out/share/i3lock-fancy/icons
'';
meta = with 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";

20
pkgs/applications/window-managers/ion-3/default.nix
View File

@ -1,19 +1,25 @@
{ lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:
stdenv.mkDerivation rec {
name = "ion";
pname = "ion";
version = "3-20090110";
meta = {
description = "Tiling tabbed window manager designed with keyboard users in mind";
homepage = "http://modeemi.fi/~tuomov/ion";
platforms = with lib.platforms; linux;
license = lib.licenses.lgpl21;
};
src = fetchurl {
url = "http://tuomov.iki.fi/software/dl/ion-${version}.tar.gz";
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
};
buildInputs = [ xlibsWrapper lua gettext groff ];
buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ];
installFlags = [ "PREFIX=\${out}" ];
meta = with lib; {
description = "Tiling tabbed window manager designed with keyboard users in mind";
homepage = "http://modeemi.fi/~tuomov/ion";
platforms = with platforms; linux;
license = licenses.lgpl21;
maintainers = with maintainers; [ ];
};
}

8
pkgs/applications/window-managers/tabbed/default.nix
View File

@ -1,10 +1,8 @@
{ lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }:
with lib;
stdenv.mkDerivation {
name = "tabbed";
version = "unstable-20180310";
pname = "tabbed";
version = "unstable-2018-03-10";
src = fetchgit {
url = "https://git.suckless.org/tabbed";
@ -24,7 +22,7 @@ stdenv.mkDerivation {
"PREFIX=$(out)"
];
meta = {
meta = with lib; {
homepage = "https://tools.suckless.org/tabbed";
description = "Simple generic tabbed fronted to xembed aware applications";
license = licenses.mit;

9
pkgs/applications/window-managers/trayer/default.nix
View File

@ -4,9 +4,6 @@ stdenv.mkDerivation rec {
pname = "trayer";
version = "1.1.8";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gdk-pixbuf gtk2 ];
src = fetchFromGitHub {
owner = "sargon";
repo = "trayer-srg";
@ -14,10 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg";
};
preConfigure = ''
postPatch = ''
patchShebangs configure
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gdk-pixbuf gtk2 ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {

4
pkgs/development/interpreters/clisp/default.nix
View File

@ -82,6 +82,10 @@ stdenv.mkDerivation rec {
cd builddir
'';
# Fails to build in parallel due to missing gnulib header dependency used in charstrg.d:
# ../src/charstrg.d:319:10: fatal error: uniwidth.h: No such file or directory
enableParallelBuilding = false;
postInstall =
lib.optionalString (withModules != [])
(''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''

23
pkgs/development/libraries/nco/default.nix
View File

@ -1,32 +1,33 @@
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
version = "5.0.1";
pname = "nco";
nativeBuildInputs = [ flex which antlr2 ];
buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ];
version = "5.0.3";
src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
sha256 = "sha256-Mdnko+0ZuMoKgBp//+rCVsbFJx90Tmrnal7FAmwIKEQ=";
sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw=";
};
prePatch = ''
nativeBuildInputs = [ flex which antlr2 ];
buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ];
postPatch = ''
substituteInPlace src/nco/nco_fl_utl.c \
--replace "/bin/cp" "${coreutils}/bin/cp"
substituteInPlace src/nco/nco_fl_utl.c \
--replace "/bin/mv" "${coreutils}/bin/mv"
'';
parallelBuild = true;
enableParallelBuilding = true;
meta = {
meta = with lib; {
description = "NetCDF Operator toolkit";
longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
homepage = "http://nco.sourceforge.net/";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.bzizou ];
platforms = lib.platforms.linux;
license = licenses.bsd3;
maintainers = with maintainers; [ bzizou ];
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/wolfssl/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "wolfssl";
version = "4.8.1";
version = "5.0.0";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h";
sha256 = "sha256-rv9D+P42RMH1O4YLQbZIEkD6KQfs8KgYjhnHeA9vQqE=";
};
# Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed

4
pkgs/development/python-modules/zeroconf/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.36.11";
version = "0.36.12";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "sha256-MGaikOO4vdBRCR+jYHr38FGOdg2rjypK5z0UY5lThY4=";
sha256 = "sha256-W66tL5uVcOhdahtYDYS8WYKXiz58UL6yEUp0uL9u5SI=";
};
propagatedBuildInputs = [

5
pkgs/development/tools/database/sqlfluff/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
version = "0.7.1";
version = "0.8.1";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-kNoUoelD4EiNWZlXvOrWNPX+wsLCwY3329rJf83l7Wg=";
sha256 = "sha256-p2vRHJ7IDjGpAqWLkAHIjNCFRvUfpkvwVtixz8wWR8I=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
pytest
tblib
toml
tqdm
typing-extensions
] ++ lib.optionals (pythonOlder "3.7") [
dataclasses

6
pkgs/development/tools/parsing/tree-sitter/grammar.nix
View File

@ -51,10 +51,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
# Auto strip cannot detect files missing extension.
fixupPhase = ''
# Strip failed on darwin: strip: error: symbols referenced by indirect symbol table entries that can't be stripped
fixupPhase = lib.optionalString stdenv.isLinux ''
runHook preFixup
strip -s $out/parser
$STRIP $out/parser
runHook postFixup
'';
}

1
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
View File

@ -3,6 +3,7 @@
{
tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json;
tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json;
tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json;
tree-sitter-c = lib.importJSON ./tree-sitter-c.json;
tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json;
tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json;

10
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json Normal file
View File

@ -0,0 +1,10 @@
{
"url": "https://github.com/polarmutex/tree-sitter-beancount",
"rev": "79ae7c1f2654a2a6936b0f37bf754e5ff59c9186",
"date": "2021-09-07T00:09:23-04:00",
"path": "/nix/store/adv2yl8kr4pk6430iclkppirhb5ibcqc-tree-sitter-beancount",
"sha256": "1g2p2dnxm50l7npg2cbycwcfz9c9682bj02nrlycyjhwl4may9dn",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

4
pkgs/development/tools/parsing/tree-sitter/update.nix
View File

@ -70,6 +70,10 @@ let
# If you need a grammar that already exists in the official orga,
# make sure to give it a different name.
otherGrammars = {
"tree-sitter-beancount" = {
orga = "polarmutex";
repo = "tree-sitter-beancount";
};
"tree-sitter-clojure" = {
orga = "sogaiu";
repo = "tree-sitter-clojure";

8
pkgs/misc/vscode-extensions/cpptools/default.nix
View File

@ -50,13 +50,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "cpptools";
publisher = "ms-vscode";
version = "1.0.1";
version = "1.7.1";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix";
sha256 = "1lb5pza2ny1ydan19596amabs1np10nq08yqsfbvvfw7zbg4gnyc";
sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk=";
};
buildInputs = [
@ -77,8 +77,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
touch "./install.lock"
# Mono runtimes from nix package (used by generated `OpenDebugAD7`).
mv ./debugAdapters/OpenDebugAD7 ./debugAdapters/OpenDebugAD7_orig
cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7"
mv ./debugAdapters/bin/OpenDebugAD7 ./debugAdapters/bin/OpenDebugAD7_orig
cp -p "${openDebugAD7Script}" "./debugAdapters/bin/OpenDebugAD7"
# Clang-format from nix package.
mv ./LLVM/ ./LLVM_orig

4
pkgs/misc/vscode-extensions/python/default.nix
View File

@ -59,13 +59,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "2021.5.829140558";
version = "2021.11.1422169775";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";
sha256 = "0y2HN4WGYUUXBfqp8Xb4oaA0hbLZmE3kDUXMBAOjvPQ=";
sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs=";
};
buildInputs = [

12
pkgs/misc/vscode-extensions/wakatime/default.nix
View File

@ -8,23 +8,15 @@ in
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "4.0.9";
sha256 = "0sm2fr9zbk1759r52dpnz9r7xbvxladlpinlf2i0hyaa06bhp3b1";
version = "17.1.0";
sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw";
};
postPatch = ''
mkdir wakatime-cli
ln -s ${wakatime}/bin/wakatime ./wakatime-cli/wakatime-cli
'';
meta = with lib; {
description = ''
Visual Studio Code plugin for automatic time tracking and metrics generated
from your programming activity
'';
license = licenses.bsd3;
maintainers = with maintainers; [
eadwu
];
};
}

8
pkgs/tools/backup/gamerbackup/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule {
pname = "gb-backup";
version = "unstable-2021-08-16";
version = "unstable-2021-10-27";
src = fetchFromGitHub {
owner = "leijurv";
repo = "gb";
rev = "fa996208d06766bf523686fbe5831628130d80f7";
sha256 = "1vggl8d69sf4z2lmixfndwwd6l9gi0fkkrxga7v4w7a7yr96b1vp";
rev = "61383d445af7b035fb8e1df0cacc424340dd16df";
sha256 = "sha256-YRrD2gW+gzxD2JwadCbF/SBSsHeeGPsa8kKZHHAytVo=";
};
vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx";
vendorSha256 = "sha256-H3Zf4VNJVX9C3GTeqU4YhNqCIQz1R55MfhrygDgJTxc=";
nativeBuildInputs = [ makeWrapper ];

23
pkgs/tools/misc/wakatime/default.nix
View File

@ -1,26 +1,17 @@
{ lib, python3Packages, fetchFromGitHub, glibcLocales }:
{ lib, buildGoModule, fetchFromGitHub }:
with python3Packages;
buildPythonApplication rec {
buildGoModule rec {
pname = "wakatime";
version = "13.0.7";
version = "1.18.7";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime";
rev = version;
sha256 = "1rnapzaabg962wxrmfcq9lxz0yyqd3mxqbx3dq1ih4w33lf4fi8d";
repo = "wakatime-cli";
rev = "v${version}";
sha256 = "171x4pixmh5ni89iawdjl1fk9gr10bgp5bnslpskhspcqzyl1y5b";
};
# needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt
# especially nose-capturestderr, which we do not package yet.
doCheck = false;
checkInputs = [ mock testfixtures pytest glibcLocales ];
checkPhase = ''
export HOME=$(mktemp -d) LC_ALL=en_US.utf-8
pytest tests
'';
vendorSha256 = "01c2vbnafhhm345nyfmvbvj5mga6laf9w46lhh0flq6kdgdw168s";
meta = with lib; {
inherit (src.meta) homepage;

12
pkgs/tools/networking/vpn-slice/default.nix
View File

@ -1,20 +1,26 @@
{ lib, buildPythonApplication, python3Packages, fetchFromGitHub }:
{ lib, buildPythonApplication, nix-update-script, python3Packages, fetchFromGitHub }:
buildPythonApplication rec {
pname = "vpn-slice";
version = "0.14";
version = "0.15";
src = fetchFromGitHub {
owner = "dlenski";
repo = pname;
rev = "v${version}";
sha256 = "1z2mdl3arzl95zrj4ir57f762gcimmmq5nk91j679cshxz4snxyr";
sha256 = "sha256-9JnRuJkpcgW1cEgJPiqFDYotNSCl7XcmbHS6D4E13gM=";
};
propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ];
doCheck = false;
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
homepage = "https://github.com/dlenski/vpn-slice";
description =