diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/shells | |
parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
download | nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/bash-completion/bash-4.3.patch | 22 | ||||
-rw-r--r-- | pkgs/shells/bash-completion/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/bash/bash-4.2-patches.nix | 51 | ||||
-rw-r--r-- | pkgs/shells/bash/bash-4.3-patches.nix | 37 | ||||
-rw-r--r-- | pkgs/shells/bash/default.nix | 12 | ||||
-rw-r--r-- | pkgs/shells/dash/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/default.nix | 10 | ||||
-rw-r--r-- | pkgs/shells/ipython/default.nix | 11 | ||||
-rw-r--r-- | pkgs/shells/mksh/default.nix | 48 | ||||
-rw-r--r-- | pkgs/shells/xonsh/default.nix | 31 | ||||
-rw-r--r-- | pkgs/shells/zsh/default.nix | 12 |
11 files changed, 165 insertions, 75 deletions
diff --git a/pkgs/shells/bash-completion/bash-4.3.patch b/pkgs/shells/bash-completion/bash-4.3.patch new file mode 100644 index 000000000000..e893b501d311 --- /dev/null +++ b/pkgs/shells/bash-completion/bash-4.3.patch @@ -0,0 +1,22 @@ +commit a9c556ccad819869a6a5d932aac0a75a99372f08 +Author: Barry Warsaw <barry@python.org> +Date: Wed Sep 17 19:32:43 2014 +0300 + + _init_completion: Handle cword < 0 (LP: #1289597) + + Previously only bash 4.3 seemed to provoke this, but now with the + empty command consistency tweak it occurs with earlier as well. + +diff --git a/bash_completion b/bash_completion +index 7e01ae4..3bb4bc2 100644 +--- a/bash_completion ++++ b/bash_completion +@@ -727,7 +727,7 @@ _init_completion() + fi + done + +- [[ $cword -eq 0 ]] && return 1 ++ [[ $cword -le 0 ]] && return 1 + prev=${words[cword-1]} + + [[ ${split-} ]] && _split_longopt && split=true diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index a189ed29d8cb..39f7073fcbbf 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"; }; + patches = [ ./bash-4.3.patch ]; + doCheck = true; meta = { diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix deleted file mode 100644 index 567ec3c551cf..000000000000 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ /dev/null @@ -1,51 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0yml2b6yarrr0dzv7h45lz4126i228hvqbqacqzg4jkcawla0v4d") -(patch "002" "1yffzfxryvqns513yv3r46slkysa3nbqv40442xfxb4rw4kwkfpy") -(patch "003" "1kdl9hcpf1m7gz0ja3mvin3syprl2kmbxc3wm27391wc04apq2js") -(patch "004" "1ha0453cjqdgkns2xkdgpd2izj5b6xlsc9a2w5b3sn6j63wb0d2f") -(patch "005" "182r2iyk27l28b8kyppfavvzxhax6vn5n1zyy3yirf0463klj5x8") -(patch "006" "1labcciavnfmn0alncz1x92ydrsriikcimw24rwzmnidbaa4h4f9") -(patch "007" "15byzdqvavc3zg2lbzzdwpdy43kzdnvmr89nya211pa3yjn2cn20") -(patch "008" "0dr4p83m2xpxhvd61yny0gdlasq6r9mpyiz220998y0alq8hs213") -(patch "009" "086b9jkyjgf2zhwln72d7s5x759iskgg3r4hdrw6b5y1ni059vg7") -(patch "010" "1p23m9kssdmpnjfp96bjmmshzf25cdzlyjygdw8j6sayqa159z5c") -(patch "011" "0chm4r6zv2kafq1g8xs7r0gixmw9h9r63rgd38rdgfvyk8ssx4d4") -(patch "012" "1f5pp64rv4mx3r34577pmb15pyxvhmdhmliccnwz20nssbqk6i1m") -(patch "013" "1sl5rxl3kz39xbnbaf0085jcx0l19l2yqjk0ja2wirmwrg3ca4il") -(patch "014" "0cwb5ilgx1gcbvnfk93pcpyhvq5wzasyvyllbxrk51c517k7i9mm") -(patch "015" "164afkc75534x1ad1h6qkl511k2cpirqs2kyx1jddwxx0j1nm1rd") -(patch "016" "19p20g7h7563m79vvy0adkpzlaxg192affzsm1rxm67wyyycr598") -(patch "017" "0zzfva20hxfrj5njd321pcjfydiv0kzcqryxfdh1sxlc95228mbk") -(patch "018" "0ka9pfnjmdak8lvmbryv2r1kkrlffnxbqjxq656la39pf9qlbag2") -(patch "019" "0mpb0whacppwcdx7pcnf0ah5vjvkw14ang6r2rh9fmkn401cvdx8") -(patch "020" "0vrwv9wpbr692kf427npmsxzvn007d9alk6jf99v7307s3q76is9") -(patch "021" "1p5s6apnnbmx4yf1kzndw7fiwvdxamkcgqiv937mwmr6w9xsk1x8") -(patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") -(patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") -(patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") -(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") -(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") -(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") -(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") -(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") -(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") -(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") -(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") -(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") -(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") -(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") -(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") -(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") -(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq") -(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl") -(patch "040" "0v5a98ybibwsd4iyh18gy0kc51mx8qn9w2wfpjaiycn7yg5gjrdj") -(patch "041" "1szmm8xv41hvbzgxfwrj6dg85wa7zy3781nnil428rlzpm8ikk05") -(patch "042" "017kpdqy6v9sgi2a931wyzpix86n9mkalpm6n9cb45v58lgmraps") -(patch "043" "0mswgjk3z80qm1mb93jmbql27nbczxk86cw5byf0m29y1y2869nw") -(patch "044" "1rk6jywzfvg1crvhib1zk37rsps73minhr7l4vcb3vfdkin2vlqh") -(patch "045" "0vcqn9rb26bahhrarbwhpa0ny0nrf4vyrzh97d44lfcxypqfzdyx") -(patch "046" "0vc1ngkxkamwr022ww3vjp9ww9c647az4pjn175c1v60d0xk5hcm") -(patch "047" "0ymgimqz65sx2izg1dvm1h5cc01arl3j9j5137212l1ls00r55y1") -] diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix new file mode 100644 index 000000000000..49360bd9a026 --- /dev/null +++ b/pkgs/shells/bash/bash-4.3-patches.nix @@ -0,0 +1,37 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0hip2n2s5hws8p4nfcz37379zn6cak83ljsm64z52rw6ckrdzczc") +(patch "002" "0ashj5d1g3zbyr7zf0r72s5wnk96cz1xj919y3jajadbc9qcvrzf") +(patch "003" "0z88q4daq7dmw93iqd9c5i5d1sndklih3nrh0v75746da2n6w3h0") +(patch "004" "0f0kh9j5k4ym6knshscx31przm50x5cc7ifkwqk0swh6clna982y") +(patch "005" "1ym3b8b7lgmdp3dklp8qaqhyq965wd5392namq8mz7rb0d231j0s") +(patch "006" "04q20igq49py49ynb0f83f6f52cdkyqwd9bpic6akr0m5pkqwr50") +(patch "007" "18zkz23d9myshrwfcwcdjk7qmkqp8az5n91ni9jaixlwqlhy64qi") +(patch "008" "0pprcwvh7ngdli0x95pc1cpssg4qg7layi9xrv2jq6c7965ajhcr") +(patch "009" "19a0pf0alp30d1bjj0zf3zq2f5n0s6y91w7brm9jyswl51kns8n0") +(patch "010" "1dzhr5ammyijisz48cqi5vaw26hfr5vh9smnqxq4qc9p06f7j1ff") +(patch "011" "0fvzdzzi142a8rf3v965r6gbpn0k7fv2gif1yq8a4160vcn40qvw") +(patch "012" "04lcgfcyz7p3zagb4hkia3hkpd7lii9m8ycy9qqwzyrm1c1pj4ry") +(patch "013" "0y9cqi378z6flapkd5k5lfl4lq3ivzg4njj3i3wmw7xb6r9wma5z") +(patch "014" "04xcb0k9fxxq4vashgzb98567xzdnm4655nlm4jvfvjv6si6ykas") +(patch "015" "13ay6lldy1p00xj41nfjpq8lai3vw2qwca79gx6s80z04j53wa8k") +(patch "016" "0wq7bvx3pfw90pnfb86yg5nr9jgjsvm2nq5rrkqxf6zn977hpmlj") +(patch "017" "103p7sibihv6cshqj12k546zsbz0dnd5cv5vlx1719avddfc4rqj") +(patch "018" "0n1x3812y1brb9xbabaj3fvr4cpvm2225iwckmqk2fcpkq5b9a3s") +(patch "019" "08rd1p7zpzgbpmmmnj2im8wj2pcwmbbx51psr9vdc5c049si9ad7") +(patch "020" "163c6g05qpag2plx5q795pmw3f3m904jy7z93xj2i08pgzc8cpna") +(patch "021" "1a90cl3h10dh8k9f2ddrsjmw5ywaw2d5x78xb4fd2sryi039yhs1") +(patch "022" "120s0s4qcqd0q12j1iv0hkpf9fp3w5jnqw646kv66n66jnxlfkgx") +(patch "023" "1m00sfi88p2akgiyrg4hw0gvz3s1586pkzjdr3dm73vs773m1hls") +(patch "024" "0v0gjqzjsqjfgj5x17fq7g649k94jn8zq92qsxkhc2d6l215hl1v") +(patch "025" "0lcj96i659q35f1jcmwwbnw3p7w7vvlxjxqi989vn6d6qksqcl8y") +(patch "026" "0k919ir0inwn4wai2vdzpbwqq5h54fnrlkmgccxjg91v3ch15k1f") +(patch "027" "1gnsfvq6bhb3srlbh0cannj2hackdsipcg7z0ds7zlk1hp96mdqy") +(patch "028" "17a65c4fn4c5rgsiw9gqqnzhznh3gwnd2xzzv2dppyi48znxpc78") +(patch "029" "14k27p28r5l2fz3r03kd0x72vvsq8bja8c6hjz5kxikbzsbs7i2c") +(patch "030" "0nrqb0m7s89qsrbfaffpilc5gcf82bx9yvgzld4hr79p5y54yhw5") +(patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd") +(patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8") +(patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv") +] diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 2c545ae1c33c..080cbcec1e55 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,7 +3,7 @@ assert interactive -> readline != null; let - realName = "bash-4.2"; + realName = "bash-4.3"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/bash/${realName}.tar.gz"; - sha256 = "a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8"; + sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; }; NIX_CFLAGS_COMPILE = '' @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; patches = - let + (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}"; + url = "mirror://gnu/bash/bash-4.3-patches/bash43-${nr}"; inherit sha256; }; in - import ./bash-4.2-patches.nix patch; + import ./bash-4.3-patches.nix patch); crossAttrs = { configureFlags = baseConfigureFlags + @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index a66ab994c816..d3104439e578 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.7"; + name = "dash-0.5.8"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df"; + sha256 = "03y6z8akj72swa6f42h2dhq3p09xasbi6xia70h2vc27fwikmny6"; }; meta = { diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index adfe44b3bac1..d7d69c00c5fe 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc }: +{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv }: stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.1.0"; + version = "2.1.2"; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "0i7h3hx8iszli3d4kphw79sz9m07f2lc2c9hr9smdps5s7wpllmg"; + sha256 = "1pgnz5lapm4qk48a13k9698jaswybzlbz2nyc621d852ldf0vhn6"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses libiconv ]; # Required binaries during execution # Python: Autocompletion generated from manpages and config editing @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Smart and user-friendly command line shell"; homepage = "http://fishshell.com/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ocharles ]; }; } diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 990eb174bafc..09b2d30ea7ca 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null, sip ? null +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null , notebookSupport ? true # ipython notebook , qtconsoleSupport ? true # ipython qtconsole , pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file) @@ -10,15 +10,15 @@ # pyqt4 for both. assert qtconsoleSupport == true -> pyqt4 != null; -assert pylabQtSupport == true -> pyqt4 != null && sip != null; +assert pylabQtSupport == true -> pyqt4 != null; buildPythonPackage rec { - name = "ipython-2.2.0"; + name = "ipython-2.3.1"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "1qk44lmir24gnwb3gxh0mqcghc8ln1i5ygxpalh06bx0ajx7gjmp"; + sha256 = "1764gi5m3ff481rjk336cw6i2h4zlc0nxam9rc5m8m7yl9m4d61y"; }; propagatedBuildInputs = [ @@ -37,7 +37,6 @@ buildPythonPackage rec { ] ++ stdenv.lib.optionals pylabQtSupport [ pythonPackages.matplotlib pyqt4 - sip ]; doCheck = false; @@ -45,7 +44,7 @@ buildPythonPackage rec { meta = { homepage = http://ipython.scipy.org/; description = "An interactive computing environment for Python"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The goal of IPython is to create a comprehensive environment for interactive and exploratory computing. It consists of an diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix new file mode 100644 index 000000000000..da797005be4f --- /dev/null +++ b/pkgs/shells/mksh/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, groff }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "mksh-${version}"; + version = "R50d"; + + src = fetchurl { + urls = [ + "http://www.mirbsd.org/MirOS/dist/mir/mksh/${name}.tgz" + "http://pub.allbsd.org/MirOS/dist/mir/mksh/${name}.tgz" + ]; + sha256 = "10prcdffwziksq9sw96c1r09h4kg2zwznybrggzmjfa6l4k8h9m2"; + }; + + buildInputs = [ groff ]; + + buildPhase = '' + mkdir build-dir/ + cp mksh.1 dot.mkshrc build-dir/ + cd build-dir/ + sh ../Build.sh -c lto + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 $out/share/mksh $out/bin + install -D -m 755 mksh $out/bin/mksh + install -D -m 644 mksh.1 $out/share/man/man1/mksh.1 + install -D -m 644 mksh.cat1 $out/share/mksh/mksh.cat1 + install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc + ''; + + meta = { + description = "MirBSD Korn Shell"; + longDescription = '' + The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI + approved) successor to pdksh, developed as part of the MirOS + Project as native Bourne/POSIX/Korn shell for MirOS BSD, but + also to be readily available under other UNIX(R)-like operating + systems. + ''; + homepage = "https://www.mirbsd.org/mksh.htm"; + licenses = "custom"; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix new file mode 100644 index 000000000000..3849c96ec131 --- /dev/null +++ b/pkgs/shells/xonsh/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, python3Packages}: + +python3Packages.buildPythonPackage rec { + name = "xonsh-${version}"; + version = "0.1.3"; + + # The logo xonsh prints during build contains unicode characters, and this + # fails because locales have not been set up in the build environment. + # We can fix this on Linux by setting: + # export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + # but this would not be a cross platform solution, so it's simpler to just + # patch the setup.py script to not print the logo during build. + prePatch = '' + substituteInPlace setup.py --replace "print(logo)" "" + ''; + + propagatedBuildInputs = [ python3Packages.ply ]; + + src = fetchurl { + url = "https://github.com/scopatz/xonsh/archive/${version}.zip"; + sha256 = "0p2d7p892w77ii8yy51vpw7jlz2y53k8g61m7l8bar3hr3qrl306"; + }; + + meta = with stdenv.lib; { + description = "A Python-ish, BASHwards-compatible shell"; + homepage = "http://xonsh.org"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index d187c50f2515..9887e8f1b6f4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, ncurses, coreutils }: +{ stdenv, fetchurl, ncurses, coreutils, pcre }: let - version = "5.0.5"; + version = "5.0.7"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "1wljqii2lkz5kc4y3xs65isnahvnlj678b9zv31bn444mapjpwp4"; + sha256 = "1wgw16r7z6k3mbr94mwfc8f13yc4ds2d9qk41hvsiv6rm5dnds23"; }; in @@ -16,13 +16,13 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "1bwfz9n850pclzmzrb437icfhzv1s5pgh2dhs92f194gdkxx4936"; + sha256 = "1cq4cz7ngvmbg399dva3g6njcz5d92gprmyi2swqc0klh7g2fkjl"; }; - buildInputs = [ ncurses coreutils ]; + buildInputs = [ ncurses coreutils pcre ]; preConfigure = '' - configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp" + configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" ''; # XXX: think/discuss about this, also with respect to nixos vs nix-on-X |