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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2020-10-18 21:21:03 +02:00
parent 79b07bba8f 5e67d80a8b
commit 5c766c5c24
777 changed files with 10716 additions and 6426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/shells/bash/bash-5.0-patches.nix
View File

@@ -18,4 +18,5 @@ patch: [
(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5")
(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz")
(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc")
(patch "018" "1lw1vv0aj6x254hgx4klbz8qkvwxif0g6i7dx116cnhhb8vlwcbw")
]

13
pkgs/shells/bash/update-patch-set.sh
View File

@@ -1,4 +1,5 @@
#!/bin/sh
#!/usr/bin/env nix-shell
#!nix-shell --pure -i bash -p wget -p gnupg -p cacert
# Update patch set for GNU Bash or Readline.
@@ -14,8 +15,6 @@ fi
PROJECT="$1"
VERSION="$2"
VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)"
GPG="$(if $(type -P gpg2 > /dev/null); then echo gpg2; else echo gpg; fi)"
PATCH_LIST="$PROJECT-$VERSION-patches.nix"
set -e
@@ -25,6 +24,12 @@ end=100 # must be > 99 for correct padding
rm -vf "$PATCH_LIST"
wget "https://tiswww.case.edu/php/chet/gpgkey.asc"
echo "4ef5051ce7200241e65d29c11eb57df8 gpgkey.asc" > gpgkey.asc.md5
md5sum -c gpgkey.asc.md5
gpg --import ./gpgkey.asc
rm gpgkey.asc{,.md5}
( echo "# Automatically generated by \`$(basename $0)'; do not edit." ; \
echo "" ; \
echo "patch: [" ) \
@@ -34,7 +39,7 @@ for i in `seq -w $start $end`
do
wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i || break
wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig
"$GPG" --verify $PROJECT$VERSION_CONDENSED-$i.sig
gpg --verify $PROJECT$VERSION_CONDENSED-$i.sig
echo "(patch \"$i\" \"$(nix-hash --flat --type sha256 --base32 $PROJECT$VERSION_CONDENSED-$i)\")" \
>> "$PATCH_LIST"

6
pkgs/shells/nushell/default.nix
View File

@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "038c61605b92a97h84hlifwks0q6miv6rn7spr5h6h2nwvaqlyk6";
sha256 = "19bpxx9pi3cl5y7h5qg4a2pmvwqavm1vciyvsq96kxkc7rq2xwvl";
};
cargoSha256 = "1vr0pqcv9gm4cwlkd06672jzz9rbm77c6j5r05waypc1lv4ln2cg";
cargoSha256 = "1ghbzahz8lbk11sjy2kis12w22rjr92aaw451rmc86pk2lsxn0dx";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

2
pkgs/shells/zsh/antigen/default.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "The plugin manager for zsh.";
description = "The plugin manager for zsh";
homepage = "http://antigen.sharats.me";
license = stdenv.lib.licenses.mit;
};

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@@ -4,15 +4,15 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2020-10-13";
version = "2020-10-15";
pname = "oh-my-zsh";
rev = "a39bee8d11aca960651403dddbb7dba38b00183e";
rev = "5b717ab3e4bfb627a936d7c04367a39867734d63";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "0ak03r58sds1q3wrm2fszwc2i1pyl7lqxnaawbfndbn3ynbaw2xd";
sha256 = "0qm0mdvcvf5s6ypbq7z1x286sdv6ii2yfqvv1dss7zqjbg5j08gz";
};
installPhase = ''

2
pkgs/shells/zsh/zsh-prezto/default.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
cp ./* $out/ -R
'';
meta = with stdenv.lib; {
description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes.";
description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes";
homepage = "https://github.com/sorin-ionescu/prezto";
license = licenses.mit;
maintainers = with maintainers; [ ];