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: da65cfca0242
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 146eb2a5743c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 13, 2018

  1. rubber: 1.4 -> 1.5.1 (#50320)

    @stites @timokau
    stites authored and timokau committed Nov 13, 2018
    Copy the full SHA
    146eb2a View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/tools/typesetting/rubber/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/typesetting/rubber/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, python2Packages, texinfo }:
{ fetchurl, stdenv, python3Packages, texinfo }:

python2Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
name = "rubber-${version}";
version = "1.4";
version = "1.5.1";

src = fetchurl {
url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz";
sha256 = "1d7hq19vpb3l31grldbxg8lx1qdd18f5f3gqw96q0lhf58agcjl2";
sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p";
};

propagatedBuildInputs = [ texinfo ];
@@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
# the check scripts forces python2. If we need to use python3 at some point, we should use
# the correct python
checkPhase = ''
sed -i 's|python=python2|python=${python2Packages.python.interpreter}|' tests/run.sh
sed -i 's|python=python3|python=${python3Packages.python.interpreter}|' tests/run.sh
cd tests && ${stdenv.shell} run.sh
'';