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

Commits on May 29, 2017

  1. halibut: 1.1 -> 1.2

    @pSub
    pSub committed May 29, 2017
    Copy the full SHA
    dc955ad View commit details

  2. colm: 0.13.0.4 -> 0.13.0.5

    @pSub
    pSub committed May 29, 2017
    Copy the full SHA
    5831eb9 View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/development/compilers/colm/default.nix
  2. +3 −3 pkgs/tools/typesetting/halibut/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/compilers/colm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, makeWrapper, gcc }:
{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }:

stdenv.mkDerivation rec {
name = "colm-${version}";
version = "0.13.0.4";
version = "0.13.0.5";

src = fetchurl {
url = "http://www.colm.net/files/colm/${name}.tar.gz";
sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx";
sha256 = "1320bx96ycd1xwww137cixrb983838wnrgkfsym8x5bnf5kj9rik";
};

buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper asciidoc ];

doCheck = true;

6 changes: 3 additions & 3 deletions pkgs/tools/typesetting/halibut/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{stdenv, fetchurl, perl}:

stdenv.mkDerivation rec {
name = "halibut-1.1";
name = "halibut-1.2";

src = fetchurl {
url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}.tar.gz";
sha256 = "18409ir55rsa5gkizw2hsr86wgv176jms2dc52px62gd246rar5r";
url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz";
sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s";
};

buildInputs = [ perl ];