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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-19 06:43:37 +00:00 committed by GitHub
commit 4f6b8a3611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/cmus/default.nix
View File

@ -102,13 +102,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cmus"; pname = "cmus";
version = "2.8.0"; version = "2.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cmus"; owner = "cmus";
repo = "cmus"; repo = "cmus";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar"; sha256 = "sha256-eSKF3xacJptAYdm0Qf1AEWLa+lKUWz6C8nKyTHAl5QI=";
}; };
patches = [ ./option-debugging.patch ]; patches = [ ./option-debugging.patch ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "janet"; pname = "janet";
version = "1.12.2"; version = "1.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "janet-lang"; owner = "janet-lang";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c"; sha256 = "sha256-JXRPW1PYhVe2Qu8SAmcLgtwf8u3sb43H7AFeW7EqPZo=";
}; };
nativeBuildInputs = [ meson ninja ]; nativeBuildInputs = [ meson ninja ];

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

@ -19,13 +19,13 @@
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "folly"; pname = "folly";
version = "2020.09.28.00"; version = "2021.01.18.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "folly"; repo = "folly";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ry2nqfavcbz0jvsqw71105gbxm5hpmdi2k1w155m957jrv3n5vg"; sha256 = "sha256-jTLHaaD/Rkfo96IMV4XtvmPzo34P26e17IabFU/5o6Y=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/tools/jbang/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.58.0"; version = "0.62.0";
pname = "jbang"; pname = "jbang";
src = fetchzip { src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
sha256 = "sha256:08haij8nzzf2759ddzx0i6808g2if0v2fc21mlz00kmggjc03xz3"; sha256 = "sha256-Ffh08477Wc4yEUo2YBM2yxC288Kq05ZkKXf/XSW2iXc=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

10
pkgs/development/tools/yq-go/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "yq-go"; pname = "yq-go";
version = "3.4.1"; version = "4.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mikefarah"; owner = "mikefarah";
rev = version; rev = "v${version}";
repo = "yq"; repo = "yq";
sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b"; sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus=";
}; };
vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g=";
doCheck = false; doCheck = false;
@ -19,7 +19,7 @@ buildGoModule rec {
postInstall = '' postInstall = ''
for shell in bash fish zsh; do for shell in bash fish zsh; do
$out/bin/yq shell-completion --variation $shell > yq.$shell $out/bin/yq shell-completion $shell > yq.$shell
installShellCompletion yq.$shell installShellCompletion yq.$shell
done done
''; '';

8
pkgs/tools/misc/mcfly/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub }: { lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mcfly"; pname = "mcfly";
version = "0.5.2"; version = "0.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cantino"; owner = "cantino";
repo = "mcfly"; repo = "mcfly";
rev = "v${version}"; rev = "v${version}";
sha256 = "0a2jff72l5my00pg9lhjdmnwkqfv4hmnl0a9cfbnzsqh39lbklqy"; sha256 = "1p51wdv47cyg6dmb81fm0d92x1kp7bwwpgax6vlh669nkddiwvmm";
}; };
postInstall = '' postInstall = ''
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
install -Dm644 -t $out/share/mcfly mcfly.fish install -Dm644 -t $out/share/mcfly mcfly.fish
''; '';
cargoSha256 = "1c8qjkpc8wi095zzmgd05721kdf1knh9la91l081mvwa3inwk6ax"; cargoSha256 = "0gcdgca8w8i978b067rwm5zrc81rxb704006k9pbcwizkq2281yy";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/cantino/mcfly"; homepage = "https://github.com/cantino/mcfly";

4
pkgs/tools/system/htop/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "htop"; pname = "htop";
version = "3.0.4"; version = "3.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "htop-dev"; owner = "htop-dev";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9"; sha256 = "sha256-9zecDd3oZ24RyOLnKdJmR29Chx6S24Kvuf/F7RYzl4I=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];