Unverified Commit cdde22ae authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'staging' (older one)

parents 86ffdce8 9ab58483

pkgs/applications/editors/ed/default.nix

+1 −19
Original line number Diff line number Diff line
@@ -11,27 +11,9 @@ stdenv.mkDerivation rec { 
    sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";

  };



  unpackCmd = "tar --lzip -xf";



  nativeBuildInputs = [ lzip ];



  /* FIXME: Tests currently fail on Darwin:



       building test scripts for ed-1.5...

       testing ed-1.5...

       *** Output e1.o of script e1.ed is incorrect ***

       *** Output r3.o of script r3.ed is incorrect ***

       make: *** [check] Error 127



    */

  doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);



  installFlags = [ "DESTDIR=$(out)" ];



  configureFlags = [

    "--exec-prefix=${stdenv.cc.targetPrefix}"

    "CC=${stdenv.cc.targetPrefix}cc"

  ];

  doCheck = hostPlatform == buildPlatform;



  meta = {

    description = "An implementation of the standard Unix editor";

pkgs/applications/version-management/git-and-tools/git/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
}:



let

  version = "2.15.0";

  version = "2.15.1";

  svn = subversionClient.override { perlBindings = true; };

in
@@ -22,7 +22,7 @@ stdenv.mkDerivation { 


  src = fetchurl {

    url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

    sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h";

    sha256 = "0p04linqdywdf7m1hqa904fzqvgzplsxlzdqrn96j1j5gpyr174r";

  };



  hardeningDisable = [ "format" ];

pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ stdenv.mkDerivation { 
    sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x";

  };



  buildInputs = [ unzip ];

  nativeBuildInputs = [ unzip ];



  installPhase =

    ''

pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ stdenv.mkDerivation { 


  unpackPhase = "true";



  buildInputs = [ unzip ];

  nativeBuildInputs = [ unzip ];



  installPhase =

    ''

pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ stdenv.mkDerivation { 


  unpackPhase = "true";



  buildInputs = [ unzip ];

  nativeBuildInputs = [ unzip ];



  installPhase =

    ''