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

Commits on May 10, 2018

  1. slang: 2.3.1a -> 2.3.2

    @peterhoeg
    peterhoeg committed May 10, 2018
    Copy the full SHA
    6e62f01 View commit details

  2. mc: parallel build

    @peterhoeg
    peterhoeg committed May 10, 2018
    Copy the full SHA
    0c810ee View commit details

  3. Merge pull request #40274 from peterhoeg/u/slang 

    slang: 2.3.1a -> 2.3.2
    @FRidh
    FRidh authored May 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dbd148d View commit details
Showing with 24 additions and 7 deletions.
  1. +18 −5 pkgs/development/libraries/slang/default.nix
  2. +6 −2 pkgs/tools/misc/mc/default.nix
23 changes: 18 additions & 5 deletions pkgs/development/libraries/slang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:

stdenv.mkDerivation rec {
name = "slang-2.3.1a";
name = "slang-2.3.2";
src = fetchurl {
url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2";
sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l";
sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw";
};

outputs = [ "out" "dev" "man" "doc" ];
@@ -16,10 +16,23 @@ stdenv.mkDerivation rec {
sed -i -e "s|/bin/ln|ln|" src/Makefile.in
sed -i -e "s|-ltermcap|-lncurses|" ./configure
'';
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];

configureFlags = [
"--with-png=${libpng.dev}"
"--with-z=${zlib.dev}"
"--with-pcre=${pcre.dev}"
"--with-readline=${readline.dev}"
];

buildInputs = [
pcre libpng zlib readline
] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];

propagatedBuildInputs = [ ncurses ];

# slang 2.3.2 does not support parallel building
enableParallelBuilding = false;

postInstall = ''
find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \;
sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc
@@ -29,7 +42,7 @@ stdenv.mkDerivation rec {
description = "A multi-platform programmer's library designed to allow a developer to create robust software";
homepage = http://www.jedsoft.org/slang/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fuuzetsu ];
platforms = platforms.unix;
maintainers = [ maintainers.fuuzetsu ];
};
}
8 changes: 6 additions & 2 deletions pkgs/tools/misc/mc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl glib slang zip unzip file gettext libX11 libICE
libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];

buildInputs = [
perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];

enableParallelBuilding = true;

configureFlags = [ "--enable-vfs-smb" ];