diff options
author | Peter Simons <simons@cryp.to> | 2013-10-26 18:28:05 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-10-26 18:28:05 +0200 |
commit | 91f2c362dee33f74bd6941f3b480dde30833a375 (patch) | |
tree | 49eaa78856da07d2aee812ac743c319126cf7b74 /pkgs/misc | |
parent | f7bec094e62a64580fdcd7a46283cea0c94c70a9 (diff) | |
parent | e1c9c133b0fc244794194bbf5bcee32c6d777dee (diff) | |
download | nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.gz nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.bz2 nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.lz nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.xz nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.zst nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/wine/stable.nix (renamed from pkgs/misc/emulators/wine/default.nix) | 19 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/stable.upstream | 8 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/unstable.nix | 77 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/unstable.upstream (renamed from pkgs/misc/emulators/wine/default.upstream) | 1 | ||||
-rw-r--r-- | pkgs/misc/my-env/default.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/my-env/loadenv.sh | 2 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 62 |
7 files changed, 160 insertions, 15 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/stable.nix index 4e6ef5af00db..9c1f7fd24ae0 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/stable.nix @@ -6,7 +6,16 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; -let gecko = fetchurl { +let + version = "1.6"; + name = "wine-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/wine/${name}.tar.bz2"; + sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1"; + }; + + gecko = fetchurl { url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; }; @@ -22,13 +31,7 @@ let gecko = fetchurl { }; in stdenv.mkDerivation rec { - version = "1.6"; - name = "wine-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1"; - }; + inherit version name src; buildInputs = [ xlibs.xlibs flex bison xlibs.libXi mesa diff --git a/pkgs/misc/emulators/wine/stable.upstream b/pkgs/misc/emulators/wine/stable.upstream new file mode 100644 index 000000000000..b5913798a886 --- /dev/null +++ b/pkgs/misc/emulators/wine/stable.upstream @@ -0,0 +1,8 @@ +url http://sourceforge.net/projects/wine/files/Source/ +version_link '[-][0-9]+[.][0-9]*[24680][.]([0-9]+[.])*tar[.][^./]+/download$' +SF_redirect +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +} diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix new file mode 100644 index 000000000000..02ce076ce0fd --- /dev/null +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib +, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge +, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper +}: + +assert stdenv.isLinux; +assert stdenv.gcc.gcc != null; + +let + version = "1.7.4"; + name = "wine-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/wine/${name}.tar.bz2"; + sha256 = "0sb9zfrvlrjx1icfb94clgac239i9yfhyv48zv9iddgmvdjk8ysi"; + }; + + gecko = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; + sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; + }; + + gecko64 = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi"; + sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; + }; + + mono = fetchurl { + url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi"; + sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; + }; + +in stdenv.mkDerivation rec { + inherit version name src; + + buildInputs = [ + xlibs.xlibs flex bison xlibs.libXi mesa + xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr + xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite + alsaLib ncurses libpng libjpeg lcms fontforge + libxml2 libxslt openssl gnutls cups makeWrapper + ]; + + # Wine locates a lot of libraries dynamically through dlopen(). Add + # them to the RPATH so that the user doesn't have to set them in + # LD_LIBRARY_PATH. + NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ + freetype fontconfig stdenv.gcc.gcc mesa libdrm + xlibs.libXinerama xlibs.libXrender xlibs.libXrandr + xlibs.libXcursor xlibs.libXcomposite libpng libjpeg + openssl gnutls cups + ]; + + # Don't shrink the ELF RPATHs in order to keep the extra RPATH + # elements specified above. + dontPatchELF = true; + + postInstall = '' + install -D ${gecko} $out/share/wine/gecko/${gecko.name} + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + install -D ${gecko} $out/share/wine/gecko/${gecko64.name} + '' + '' + install -D ${mono} $out/share/wine/mono/${mono.name} + wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "http://www.winehq.org/"; + license = "LGPL"; + inherit version; + description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; + maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/wine/default.upstream b/pkgs/misc/emulators/wine/unstable.upstream index e23f341c28a2..e3616df76802 100644 --- a/pkgs/misc/emulators/wine/default.upstream +++ b/pkgs/misc/emulators/wine/unstable.upstream @@ -1,4 +1,5 @@ url http://sourceforge.net/projects/wine/files/Source/ +attribute_name wine_unstable version_link '[.]tar[.][^./]+/download$' SF_redirect do_overwrite () { diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index ac2dc7f8cda5..1c0dc0cbfe9b 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -59,7 +59,7 @@ { mkDerivation, substituteAll, pkgs }: { stdenv ? pkgs.stdenv, name, buildInputs ? [] , propagatedBuildInputs ? [], gcc ? stdenv.gcc, cTags ? [], extraCmds ? "" - , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash"}: + , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: mkDerivation { # The setup.sh script from stdenv will expect the native build inputs in @@ -146,8 +146,8 @@ mkDerivation { EOF mkdir -p $out/bin - sed -e s,@shell@,${shell}, -e s,@myenvpath@,$out/dev-envs/${name}, \ - -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-env-${name} + sed -e 's,@shell@,${shell},' -e s,@myenvpath@,$out/dev-envs/${name}, \ + -e 's,@name@,${name},' ${./loadenv.sh} > $out/bin/load-env-${name} chmod +x $out/bin/load-env-${name} ''; } diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 5d126f0c29bb..6752d1c03b5f 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -10,5 +10,5 @@ export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" -@shell@ --norc +@shell@ diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index af4363f9217e..b17b8490a0b1 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip }: +{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }: /* About Vim and plugins @@ -90,14 +90,13 @@ let vimHelpTags = '' installPhase = '' target=$out/vim-plugins/$path ensureDir $out/vim-plugins - ls -l cp -r . $target ${vimHelpTags} vimHelpTags $target ''; }); -in +in rec { @@ -251,4 +250,61 @@ in path = "xdebug"; postInstall = false; }; + + vimshell = simpleDerivation rec { + version = "9.2"; + name = "vimshell-${version}"; + + meta = with stdenv.lib; { + description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script"; + homepage = https://github.com/Shougo/vimshell.vim; + repositories.git = https://github.com/Shougo/vimshell.vim.git; + license = licenses.gpl3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + src = fetchurl { + url = "https://github.com/Shougo/vimshell.vim/archive/ver.${version}.tar.gz"; + sha256 = "1pbwxdhpv6pr09b6hwkgy7grpmpwlqpsgsawl38r40q6yib8zb4a"; + }; + + buildInputs = [ vimproc ]; + + preBuild = '' + sed -ie '1 i\ + set runtimepath+=${vimproc}/vim-plugins/vimproc\ + ' autoload/vimshell.vim + ''; + + path = "vimshell"; + }; + + vimproc = simpleDerivation rec { + version = "5cf4c6bfe9bf0649159b5648d736d54c96e99b3e"; + name = "vimproc-${version}"; + + meta = with stdenv.lib; { + description = "An asynchronous execution library for Vim"; + homepage = https://github.com/Shougo/vimproc.vim; + repositories.git = https://github.com/Shougo/vimproc.vim.git; + license = licenses.gpl3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + src = fetchurl { + url = "${meta.homepage}/archive/${version}.tar.gz"; + sha256 = "0f76mc7v3656sf9syaq1rxzk3dqz6i5w190wgj15sjjnapzd956p"; + }; + + buildInputs = [ which ]; + + buildPhase = '' + sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim + make -f make_unix.mak + ''; + + path = "vimproc"; + }; } |