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: d276fbaa6e95
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0f3035e4800
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 27, 2017

  1. cheat: 2.2.1 -> 2.2.2

    @Mic92
    Mic92 committed Nov 27, 2017
    Copy the full SHA
    cd3bdc9 View commit details

  2. iozone: 3.434 -> 3.471

    @Mic92
    Mic92 committed Nov 27, 2017
    Copy the full SHA
    d0f3035 View commit details
Showing with 15 additions and 9 deletions.
  1. +12 −6 pkgs/applications/misc/cheat/default.nix
  2. +3 −3 pkgs/development/tools/misc/iozone/default.nix
18 changes: 12 additions & 6 deletions pkgs/applications/misc/cheat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
{ stdenv, python3Packages, fetchurl }:
{ stdenv, python3Packages, fetchFromGitHub }:

with python3Packages;
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "cheat";
version = "2.2.1";
version = "2.2.2";

propagatedBuildInputs = with python3Packages; [ docopt pygments ];
propagatedBuildInputs = [ docopt pygments ];

src = fetchPypi {
inherit pname version;
sha256 = "0w4k1h02p2gjv5wcr1c7r0ynb7v50qajx4hpyxz0ndh96f6x30pl";
src = fetchFromGitHub {
owner = "chrisallenlane";
repo = "cheat";
rev = version;
sha256 = "1da4m4n6nivjakpll6jj0aszrv24g2zax74034lzpv3pbh84fvas";
};
# no tests available
doCheck = false;

postInstall = ''
install -D man1/cheat.1.gz $out/share/man/man1/cheat.1.gz
'';

meta = with stdenv.lib; {
description = "cheat allows you to create and view interactive cheatsheets on the command-line";
maintainers = with maintainers; [ mic92 ];
6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/iozone/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ let
in

stdenv.mkDerivation rec {
name = "iozone-3.434";
name = "iozone-3.471";

src = fetchurl {
url = http://www.iozone.org/src/current/iozone3_434.tar;
sha256 = "0aj63mlb91aivz3z71zn8nbwci1pi18qk8zc65dm19cknffqsf1c";
url = http://www.iozone.org/src/current/iozone3_471.tar;
sha256 = "0w63b3d4ws1sm52lpdd08sl7n4ay438dl3wy0q9la12iq81rglid";
};

license = fetchurl {