Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates

This merge mostly take the changes made to the master branch.

Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.

2 files changed, 43 insertions, 0 deletions

diff --git a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh
new file mode 100755
index 000000000000..e3c38f05ab4c
--- /dev/null
+++ b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh
@@ -0,0 +1,13 @@
+cat <<EOF > linenoise.pc
+prefix=$out
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: linenoise
+Description: A minimal, zero-config, BSD licensed, readline replacement.
+Requires:
+Version: 1.0.10
+Cflags: -I\${includedir}/ \${prefix}/src/linenoise.c
+
+EOF
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix
new file mode 100644
index 000000000000..6bbcc725f22f
--- /dev/null
+++ b/pkgs/development/libraries/linenoise/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "linenoise-${version}";
+  version = "1.0.10";  # Its version 1.0 plus 10 commits
+
+  src = fetchFromGitHub {
+    owner = "antirez";
+    repo = "linenoise";
+    rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3";
+    sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
+  };
+
+  buildPhase = ./create-pkg-config-file.sh;
+
+  installPhase = ''
+    mkdir -p $out/{lib/pkgconfig,src,include}
+    cp linenoise.c $out/src/
+    cp linenoise.h $out/include/
+    cp linenoise.pc $out/lib/pkgconfig/
+  '';
+
+  meta = {
+    homepage = https://github.com/antirez/linenoise;
+    description = "A minimal, zero-config, BSD licensed, readline replacement";
+    maintainers = with stdenv.lib.maintainers; [ mpsyco ];
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}