ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

readline 7.0 -> 7.0.3

Browse Source 
Discussion: https://groups.google.com/forum/#!topic/nix-devel/agupzdm352Q
This commit is contained in:
Klaas van Schelven 2017-08-17 16:46:04 +02:00
parent b5af77004a
commit 53d67bcc26
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -595,6 +595,7 @@
uwap = "uwap <me@uwap.name>"; uwap = "uwap <me@uwap.name>";
vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>"; vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
vandenoever = "Jos van den Oever <jos@vandenoever.info>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>";
vanschelven = "Klaas van Schelven <klaas@vanschelven.com>";
vanzef = "Ivan Solyankin <vanzef@gmail.com>"; vanzef = "Ivan Solyankin <vanzef@gmail.com>";
vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>"; vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>"; vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";

19
pkgs/development/libraries/readline/7.0.nix
View File

@ -4,7 +4,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "readline-${version}"; name = "readline-${version}";
version = "7.0p0"; version = "7.0p${toString (builtins.length upstreamPatches)}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz";
@ -17,13 +17,7 @@ stdenv.mkDerivation rec {
patchFlags = "-p0"; patchFlags = "-p0";
patches = upstreamPatches =
[ ./link-against-ncurses.patch
./no-arch_only-6.3.patch
]
;
/*
++
(let (let
patch = nr: sha256: patch = nr: sha256:
fetchurl { fetchurl {
@ -32,7 +26,12 @@ stdenv.mkDerivation rec {
}; };
in in
import ./readline-7.0-patches.nix patch); import ./readline-7.0-patches.nix patch);
*/
patches =
[ ./link-against-ncurses.patch
./no-arch_only-6.3.patch
]
++ upstreamPatches;
# Don't run the native `strip' when cross-compiling. # Don't run the native `strip' when cross-compiling.
dontStrip = hostPlatform != buildPlatform; dontStrip = hostPlatform != buildPlatform;
@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ ]; maintainers = [ vanschelven ];
platforms = platforms.unix; platforms = platforms.unix;
branch = "7.0"; branch = "7.0";

7
pkgs/development/libraries/readline/readline-7.0-patches.nix Normal file
View File

@ -0,0 +1,7 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs")
(patch "002" "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7")
(patch "003" "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")
]