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: 6e753b3e623f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2667bfb1b9d7
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 15, 2017

  1. daemontools: fix build 

    (cherry picked from commit d7f6367)
    @Mic92 @joachifm
    Mic92 authored and joachifm committed Sep 15, 2017
    Copy the full SHA
    5950567 View commit details

  2. ikiwiki: mark build broken 

    The test suite fails after we updated to Imagemagick from version 6.9.7-6 to
6.9.8-4. https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/ has
more details.

(cherry picked from commit 045c707)
    @peti @joachifm
    peti authored and joachifm committed Sep 15, 2017
    Copy the full SHA
    2667bfb View commit details
Showing with 23 additions and 11 deletions.
  1. +1 −1 pkgs/applications/misc/ikiwiki/default.nix
  2. +12 −10 pkgs/tools/admin/daemontools/default.nix
  3. +10 −0 pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
2 changes: 1 addition & 1 deletion pkgs/applications/misc/ikiwiki/default.nix
View file
Original file line number Diff line number Diff line change
@@ -84,8 +84,8 @@ stdenv.mkDerivation {
description = "Wiki compiler, storing pages and history in a RCS";
homepage = "http://ikiwiki.info/";
license = stdenv.lib.licenses.gpl2Plus;

platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ];
broken = true; # https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/
};
}
22 changes: 12 additions & 10 deletions pkgs/tools/admin/daemontools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,40 +2,42 @@

stdenv.mkDerivation rec {
name = "daemontools-0.76";

src = fetchurl {
url = "https://cr.yp.to/daemontools/${name}.tar.gz";
sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5";
};


patches = [ ./fix-nix-usernamespace-build.patch ];

configurePhase = ''
cd ${name}
sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
substituteInPlace src/Makefile \
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
cat ${glibc.dev}/include/errno.h
'';

buildPhase = ''
package/compile
'';

installPhase = ''
for cmd in $(cat package/commands); do
install -Dm755 "command/$cmd" "$out/bin/$cmd"
done
'';

meta = {
license = stdenv.lib.licenses.publicDomain;
homepage = https://cr.yp.to/daemontools.html;
description = "A collection of tools for managing UNIX services.";

maintainers = with stdenv.lib.maintainers; [ kevincox ];
platforms = stdenv.lib.platforms.unix;
};
10 changes: 10 additions & 0 deletions pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- admin.org/daemontools-0.76/src/chkshsgr.c 2001-07-12 17:49:49.000000000 +0100
+++ admin/daemontools-0.76/src/chkshsgr.c 2017-05-31 23:54:56.662174028 +0100
@@ -4,6 +4,7 @@

int main()
{
+ return 0;
short x[4];

x[0] = x[1] = 0;