Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 726c05e5a8bd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 896a18112460
Choose a head ref
  • 13 commits
  • 7 files changed
  • 5 contributors

Commits on Jan 17, 2021

  1. mcfly: 0.5.2 -> 0.5.3

    marsam committed Jan 17, 2021
    Copy the full SHA
    9483d11 View commit details

Commits on Jan 18, 2021

  1. cmus: 2.8.0 -> 2.9.0

    r-ryantm committed Jan 18, 2021
    Copy the full SHA
    7c574d7 View commit details

Commits on Jan 19, 2021

  1. htop: 3.0.4 -> 3.0.5

    r-ryantm committed Jan 19, 2021
    Copy the full SHA
    69a7b21 View commit details
  2. janet: 1.12.2 -> 1.13.1

    r-ryantm committed Jan 19, 2021
    Copy the full SHA
    d53c315 View commit details
  3. jbang: 0.58.0 -> 0.62.0

    r-ryantm committed Jan 19, 2021
    Copy the full SHA
    00305cc View commit details
  4. Merge pull request #109873 from r-ryantm/auto-update/janet

    janet: 1.12.2 -> 1.13.1
    ryantm authored Jan 19, 2021
    Copy the full SHA
    428161e View commit details
  5. folly: 2020.09.28.00 -> 2021.01.18.00

    r-ryantm authored and veprbl committed Jan 19, 2021
    Copy the full SHA
    513b264 View commit details
  6. Merge pull request #109862 from r-ryantm/auto-update/htop

    htop: 3.0.4 -> 3.0.5
    ryantm authored Jan 19, 2021
    Copy the full SHA
    694cadc View commit details
  7. Merge pull request #109668 from marsam/update-mcfly

    mcfly: 0.5.2 -> 0.5.3
    marsam authored Jan 19, 2021
    Copy the full SHA
    cf07f8d View commit details
  8. Merge pull request #109874 from r-ryantm/auto-update/jbang

    jbang: 0.58.0 -> 0.62.0
    ryantm authored Jan 19, 2021
    Copy the full SHA
    3b2ef04 View commit details
  9. Merge pull request #109754 from r-ryantm/auto-update/cmus

    cmus: 2.8.0 -> 2.9.0
    ryantm authored Jan 19, 2021
    Copy the full SHA
    77d90b8 View commit details
  10. Copy the full SHA
    dd3238c View commit details
  11. Copy the full SHA
    896a181 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/cmus/default.nix
Original file line number Diff line number Diff line change
@@ -102,13 +102,13 @@ in

stdenv.mkDerivation rec {
pname = "cmus";
version = "2.8.0";
version = "2.9.0";

src = fetchFromGitHub {
owner = "cmus";
repo = "cmus";
rev = "v${version}";
sha256 = "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar";
sha256 = "sha256-eSKF3xacJptAYdm0Qf1AEWLa+lKUWz6C8nKyTHAl5QI=";
};

patches = [ ./option-debugging.patch ];
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/janet/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "janet";
version = "1.12.2";
version = "1.13.1";

src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c";
sha256 = "sha256-JXRPW1PYhVe2Qu8SAmcLgtwf8u3sb43H7AFeW7EqPZo=";
};

nativeBuildInputs = [ meson ninja ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/folly/default.nix
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@

stdenv.mkDerivation (rec {
pname = "folly";
version = "2020.09.28.00";
version = "2021.01.18.00";

src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "1ry2nqfavcbz0jvsqw71105gbxm5hpmdi2k1w155m957jrv3n5vg";
sha256 = "sha256-jTLHaaD/Rkfo96IMV4XtvmPzo34P26e17IabFU/5o6Y=";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/tools/jbang/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:

stdenv.mkDerivation rec {
version = "0.58.0";
version = "0.62.0";
pname = "jbang";

src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
sha256 = "sha256:08haij8nzzf2759ddzx0i6808g2if0v2fc21mlz00kmggjc03xz3";
sha256 = "sha256-Ffh08477Wc4yEUo2YBM2yxC288Kq05ZkKXf/XSW2iXc=";
};

nativeBuildInputs = [ makeWrapper ];
10 changes: 5 additions & 5 deletions pkgs/development/tools/yq-go/default.nix
Original file line number Diff line number Diff line change
@@ -2,24 +2,24 @@

buildGoModule rec {
pname = "yq-go";
version = "3.4.1";
version = "4.4.1";

src = fetchFromGitHub {
owner = "mikefarah";
rev = version;
rev = "v${version}";
repo = "yq";
sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b";
sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus=";
};

vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd";
vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g=";

doCheck = false;

nativeBuildInputs = [ installShellFiles ];

postInstall = ''
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
done
'';
8 changes: 4 additions & 4 deletions pkgs/tools/misc/mcfly/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub }:
{ lib, rustPlatform, fetchFromGitHub }:

rustPlatform.buildRustPackage rec {
pname = "mcfly";
version = "0.5.2";
version = "0.5.3";

src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
sha256 = "0a2jff72l5my00pg9lhjdmnwkqfv4hmnl0a9cfbnzsqh39lbklqy";
sha256 = "1p51wdv47cyg6dmb81fm0d92x1kp7bwwpgax6vlh669nkddiwvmm";
};

postInstall = ''
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
install -Dm644 -t $out/share/mcfly mcfly.fish
'';

cargoSha256 = "1c8qjkpc8wi095zzmgd05721kdf1knh9la91l081mvwa3inwk6ax";
cargoSha256 = "0gcdgca8w8i978b067rwm5zrc81rxb704006k9pbcwizkq2281yy";

meta = with lib; {
homepage = "https://github.com/cantino/mcfly";
4 changes: 2 additions & 2 deletions pkgs/tools/system/htop/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "htop";
version = "3.0.4";
version = "3.0.5";

src = fetchFromGitHub {
owner = "htop-dev";
repo = pname;
rev = version;
sha256 = "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9";
sha256 = "sha256-9zecDd3oZ24RyOLnKdJmR29Chx6S24Kvuf/F7RYzl4I=";
};

nativeBuildInputs = [ autoreconfHook ];