From a1044bd26e63502f7a8797f075349bb277c3b1c1 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 26 Mar 2015 14:25:17 -0400 Subject: [PATCH 1/9] xonsh: new package --- pkgs/shells/xonsh/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/shells/xonsh/default.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db1d42c1614d..80c970cf9f53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3239,6 +3239,8 @@ let rush = callPackage ../shells/rush { }; + xonsh = callPackage ../shells/xonsh { }; + zsh = callPackage ../shells/zsh { }; From f6d223c7736f9dc9def8a640b487bb68eafc0665 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 14:29:10 -0400 Subject: [PATCH 2/9] Add SSL support to HAProxy --- pkgs/tools/networking/haproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 58e238c3c025..66a4e7536468 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl }: +{ stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { version = "1.5.11"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; - buildInputs = [ ]; + buildInputs = [ openssl ]; # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux2628 PREFIX=$out" + export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes" ''; meta = { From eb54c42ffaf44b7504fcca79f433ccdbae739741 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 14:32:37 -0400 Subject: [PATCH 3/9] Clean up HAProxy nix expression --- pkgs/tools/networking/haproxy/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 66a4e7536468..9a7d05d79bf3 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,11 +1,12 @@ { stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { - version = "1.5.11"; + major-version = "1.5"; + version = "${major-version}.11"; name = "haproxy-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/1.5/src/${name}.tar.gz"; + url = "http://haproxy.1wt.eu/download/${major-version}/src/${name}.tar.gz"; sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; @@ -29,9 +30,6 @@ stdenv.mkDerivation rec { homepage = http://haproxy.1wt.eu; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; - /* TODO license = [ - stdenv.lib.licenses.gpl2 - stdenv.lib.licenses.lgpl21 - ];*/ + license = stdenv.lib.licenses.gpl2; }; } From ab2cb8593091984bbd985836f0d0d52b4e1dc043 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 16:21:15 -0400 Subject: [PATCH 4/9] Fixed case in HAProxy nix expr --- pkgs/tools/networking/haproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 9a7d05d79bf3..4119afa5228a 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,12 +1,12 @@ { stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { - major-version = "1.5"; - version = "${major-version}.11"; + majorVersion = "1.5"; + version = "${majorVersion}.11"; name = "haproxy-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/${major-version}/src/${name}.tar.gz"; + url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz"; sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; From 0fb50ed75460579dec6258dec44b2bdccfbd5263 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 28 Feb 2015 10:11:23 -0500 Subject: [PATCH 5/9] libass: build on Darwin --- pkgs/development/libraries/libass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 7dda6912a986..2a9af50fcde9 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Portable ASS/SSA subtitle renderer"; homepage = https://github.com/libass/libass; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel urkud ]; repositories.git = git://github.com/libass/libass.git; }; From f74adfdb453790ccf08e7d04bafb33eeb6713e69 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:51:24 -0500 Subject: [PATCH 6/9] libdc1394: Build on Darwin --- pkgs/development/libraries/libdc1394/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index afde4e260e8f..1d6b00abe539 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; - buildInputs = [ libraw1394 libusb1 ]; + buildInputs = [ libusb1 ] + ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ]; meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 8a8097eb90bc5e78f725dfd3e53f7b5415486927 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:09:56 -0700 Subject: [PATCH 7/9] nedit: 5.5 -> 5.6 --- pkgs/applications/editors/nedit/builder.sh | 10 ------- pkgs/applications/editors/nedit/default.nix | 22 ++++++++------- pkgs/applications/editors/nedit/dynamic.patch | 27 ------------------- 3 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 pkgs/applications/editors/nedit/builder.sh delete mode 100644 pkgs/applications/editors/nedit/dynamic.patch diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh deleted file mode 100644 index 15706b0c37dd..000000000000 --- a/pkgs/applications/editors/nedit/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" - -installPhase() { - mkdir -p $out/bin - cp -p source/nedit source/nc $out/bin -} - -genericBuild diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index bd53f8d81d08..a4dfc4719dc4 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,22 +1,26 @@ -{stdenv, fetchurl, x11, motif, libXpm}: +{ stdenv, fetchurl, x11, motif, libXpm }: assert stdenv.isLinux; -stdenv.mkDerivation { - name = "nedit-5.5"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "nedit-5.6"; src = fetchurl { - url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2; - md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe"; + url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; + sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - patches = [./dynamic.patch]; - inherit motif; - buildInputs = [x11 motif libXpm]; + buildInputs = [ x11 motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; + NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; + + installPhase = '' + mkdir -p $out/bin + cp -p source/nedit source/nc $out/bin + ''; + meta = { homepage = http://www.nedit.org; }; diff --git a/pkgs/applications/editors/nedit/dynamic.patch b/pkgs/applications/editors/nedit/dynamic.patch deleted file mode 100644 index adb2cbc25927..000000000000 --- a/pkgs/applications/editors/nedit/dynamic.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux -*** nedit-5.5-orig/makefiles/Makefile.linux 2003-05-20 02:27:56.000000000 +0200 ---- nedit-5.5/makefiles/Makefile.linux 2005-12-03 00:42:23.000000000 +0100 -*************** -*** 17,27 **** - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common - ---- 17,27 ---- - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -lXm -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common From b91e83dc77a4d9bcb437d1b302972f9de0f33248 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:33:12 -0700 Subject: [PATCH 8/9] vim: 7.4.410 -> 7.4.683 --- pkgs/applications/editors/vim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 8f27f5409975..4f14aade5a5d 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.410"; + version = "7.4.683"; src = fetchhg { - url = "https://vim.googlecode.com/hg/"; - rev = "v7-4-410"; - sha256 = "145llhj6gq2bh9b7p8xkxc388krrximq80b87f3cn4w4d4k9fhqp"; + url = "https://code.google.com/p/vim/"; + rev = "v7-4-663"; + sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc"; }; enableParallelBuilding = true; From 041e3b46adde5404a568b6476f2648aa58cda12c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:38:42 -0700 Subject: [PATCH 9/9] bluedevil: 1.3.1 -> 2.1.1 --- pkgs/tools/bluetooth/bluedevil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index e5a4f83ab0f8..229b0512679b 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bluedevil"; - version = "1.3.1"; + version = "2.1.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0di3hwgqzhx51x172wnbccf9f84cg69mab83qkcif0v3gv3pzy4f"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi"; }; buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ];