From 4b4d5c96c8ef976384fd00e67d1e21a1bb818fe7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 7 Feb 2016 12:11:31 +0100 Subject: bats: init at 4.0.4 --- pkgs/development/interpreters/bats/default.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 pkgs/development/interpreters/bats/default.nix (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix new file mode 100644 index 000000000000..4eb86460be9a --- /dev/null +++ b/pkgs/development/interpreters/bats/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "bats-${version}"; + version = "0.4.0"; + + src = fetchzip { + url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz"; + sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm"; + }; + + installPhase = "./install.sh $out"; + + meta = with stdenv.lib; { + homepage = https://github.com/sstephenson/bats; + description = "Bash Automated Testing System"; + maintainers = [ maintainers.lnl7 ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} -- cgit 1.4.1 From 112476ec9649d51dd2fd014d759c9bce7626cd49 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 9 Feb 2016 23:47:41 +0100 Subject: bundix: 1.0.4 -> 2.0.4 --- .../interpreters/ruby/bundix/default.nix | 54 ++++++++++++++++------ 1 file changed, 39 insertions(+), 15 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index b5a49043c60b..88679f74753d 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -1,20 +1,44 @@ -{ ruby, fetchgit, buildRubyGem, bundler }: +{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }: -let - thor = buildRubyGem { - gemName = "thor"; - version = "0.19.1"; - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; +buildRubyGem rec { + inherit ruby; -in buildRubyGem { + name = "${gemName}-${version}"; gemName = "bundix"; - version = "1.0.4"; - gemPath = [ thor bundler ]; - src = fetchgit { - url = "https://github.com/cstrahan/bundix.git"; - rev = "6dcf1f71c61584f5c9b919ee9df7b0c554862076"; - sha256 = "1w17bvc9srcgr4ry81ispcj35g9kxihbyknmqp8rnd4h5090b7b2"; + version = "2.0.4"; + + sha256 = "0i7fdxi6w29yxnblpckczazb79m5x03hja8sfnabndg4yjc868qs"; + + buildInputs = [bundler]; + + postInstall = '' + gem_root=$GEM_HOME/gems/${gemName}-${version} + sed \ + -e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \ + -i $gem_root/lib/bundix.rb + sed \ + -e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \ + -i $gem_root/lib/bundix.rb + sed \ + -e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \ + -i $gem_root/lib/bundix.rb + sed \ + -e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \ + -i $gem_root/lib/bundix.rb + ''; + + meta = { + inherit version; + description = "Creates Nix packages from Gemfiles"; + longDescription = '' + This is a tool that converts Gemfile.lock files to nix expressions. + + The output is then usable by the bundlerEnv derivation to list all the + dependencies of a ruby package. + ''; + homepage = "https://github.com/manveru/bundix"; + license = "MIT"; + maintainers = with lib.maintainers; [ manveru zimbatm ]; + platforms = lib.platforms.all; }; } -- cgit 1.4.1 From b061225c54356e5ae6ec8c5cf9de40f01d8e8fae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 11:22:15 +0100 Subject: php: 5.6.17 -> 5.6.18 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c963c01e65bf..66a686d78ecb 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -298,8 +298,8 @@ in { }; php56 = generic { - version = "5.6.17"; - sha256 = "0fyxg95m918ngi6lnxyfb4y0ii4f8f5znb5l4axpagp6l5b5zd3p"; + version = "5.6.18"; + sha256 = "1vgl2zjq6ws5cjjb3llhwpfwg9gasq3q84ibdv9hj8snm4llmkf3"; }; php70 = generic { -- cgit 1.4.1 From 42634fe6ccc62341de56f738e412951af389f84c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 11:22:51 +0100 Subject: php: 5.5.31 -> 5.5.32 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 66a686d78ecb..1c06ecaef2eb 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -293,8 +293,8 @@ in { }; php55 = generic { - version = "5.5.31"; - sha256 = "0xx23gb70jsgbd772hy8f79wh2rja617s17gnx4vgklxk8mkhjpv"; + version = "5.5.32"; + sha256 = "1vljdvyqsq0vas4yhvpqycqyxl2gfndbmak6cfgxn1cfvc4c3wmh"; }; php56 = generic { -- cgit 1.4.1 From fc84ee22df2a6d14b638a93c0e802c033233f21e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 11:27:34 +0100 Subject: php: Remove version 5.4 which is EOL --- pkgs/development/interpreters/php/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 1c06ecaef2eb..5503ee9c8870 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -287,11 +287,6 @@ let in { - php54 = generic { - version = "5.4.45"; - sha256 = "10k59j7zjx2mrldmgfvjrrcg2cslr2m68azslspcz5acanqjh3af"; - }; - php55 = generic { version = "5.5.32"; sha256 = "1vljdvyqsq0vas4yhvpqycqyxl2gfndbmak6cfgxn1cfvc4c3wmh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f541c5feac8b..74488951ad78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5309,7 +5309,6 @@ let }); inherit (callPackages ../development/interpreters/php { }) - php54 php55 php56 php70; -- cgit 1.4.1 From 447851b9d28211f93faf41a0cd9809aee14241e4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 11 Feb 2016 23:31:41 +0000 Subject: jruby: 1.7.21 -> 9.0.5.0 --- pkgs/development/interpreters/jruby/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index bc76abb45460..1d05f9406b45 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "1.7.21"; + version = "9.0.5.0"; src = fetchurl { - url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha1 = "4955b69a913b22f96bd599eff2a133d8d1ed42c6"; + url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; + sha256 = "1wysymqzc7591743f2ycgwpm232y6i050izn72lck44nhnyr5wwy"; }; buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -pv $out + mkdir -pv $out/docs mv * $out rm $out/bin/*.{bat,dll,exe,sh} mv $out/COPYING $out/LICENSE* $out/docs -- cgit 1.4.1 From b9c13dcbc7c512194d98926a82afba4e70fcc2f0 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 12 Feb 2016 09:56:02 +0100 Subject: bundix: 2.0.4 -> 2.0.5 Fixes issue with the -d flag creating duplicated `dependencies` properties. --- pkgs/development/interpreters/ruby/bundix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index 88679f74753d..245090e66e1a 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -5,9 +5,9 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.0.4"; + version = "2.0.5"; - sha256 = "0i7fdxi6w29yxnblpckczazb79m5x03hja8sfnabndg4yjc868qs"; + sha256 = "0bsynhr44jz6nih0xn7v32h1qvywnb5335ka208gn7jp6bjwabhy"; buildInputs = [bundler]; -- cgit 1.4.1 From 9acbb9021b1477a0a7f25d54d79811dc33b16e15 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 14 Feb 2016 16:58:51 +0000 Subject: bundix: cleaner substitution Use the builtin substituteInPlace instead of sed --- .../interpreters/ruby/bundix/default.nix | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index 245090e66e1a..1ce2528291eb 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }: +{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-git }: buildRubyGem rec { inherit ruby; @@ -12,19 +12,19 @@ buildRubyGem rec { buildInputs = [bundler]; postInstall = '' - gem_root=$GEM_HOME/gems/${gemName}-${version} - sed \ - -e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \ - -i $gem_root/lib/bundix.rb - sed \ - -e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \ - -i $gem_root/lib/bundix.rb - sed \ - -e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \ - -i $gem_root/lib/bundix.rb - sed \ - -e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \ - -i $gem_root/lib/bundix.rb + substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \ + --replace \ + "'nix-instantiate'" \ + "'${nix}/bin/nix-instantiate'" \ + --replace \ + "'nix-hash'" \ + "'${nix}/bin/nix-hash'" \ + --replace \ + "'nix-prefetch-url'" \ + "'${nix}/bin/nix-prefetch-url'" \ + --replace \ + "'nix-prefetch-git'" \ + "'${nix-prefetch-git}/bin/nix-prefetch-git'" ''; meta = { -- cgit 1.4.1 From f4a32be72988441cc67d0325cd85991505f547e2 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sun, 14 Feb 2016 22:14:00 +0100 Subject: love: 0.8 -> 0.10.1 --- pkgs/development/interpreters/love/0.10.nix | 38 +++++++++++++++++++ pkgs/development/interpreters/love/0.8.nix | 51 ++++++++++++++++++++++++++ pkgs/development/interpreters/love/default.nix | 51 -------------------------- pkgs/top-level/all-packages.nix | 5 ++- 4 files changed, 92 insertions(+), 53 deletions(-) create mode 100644 pkgs/development/interpreters/love/0.10.nix create mode 100644 pkgs/development/interpreters/love/0.8.nix delete mode 100644 pkgs/development/interpreters/love/default.nix (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix new file mode 100644 index 000000000000..ed5aa1e60de3 --- /dev/null +++ b/pkgs/development/interpreters/love/0.10.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit, + libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, + libtheora, which, autoconf, automake, libtool +}: + +let + pname = "love"; + version = "0.10.1"; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchFromBitbucket { + owner = "rude"; + repo = "love"; + rev = "${version}"; + sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj"; + }; + + buildInputs = [ + pkgconfig SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 + libvorbis libogg libtheora autoconf which libtool automake + ]; + + preConfigure = "$shell ./platform/unix/automagic"; + + configureFlags = [ + "--with-lua=luajit" + ]; + + meta = { + homepage = "http://love2d.org"; + description = "A Lua-based 2D game engine/scripting language"; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix new file mode 100644 index 000000000000..fc1f01cb3730 --- /dev/null +++ b/pkgs/development/interpreters/love/0.8.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, pkgconfig +, SDL, mesa, openal, lua +, libdevil, freetype, physfs +, libmodplug, mpg123, libvorbis, libogg +}: + +stdenv.mkDerivation rec { + name = "love-0.8.0"; + src = fetchurl { + url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; + }; + + buildInputs = [ + pkgconfig SDL mesa openal lua + libdevil freetype physfs libmodplug mpg123 libvorbis libogg + ]; + + preConfigure = '' + luaoptions="${"''"} lua luajit " + for i in lua luajit-; do + for j in 5 5.0 5.1 5.2 5.3 5.4; do + luaoptions="$luaoptions $i$j " + done + done + luaso="$(echo "${lua}/lib/"lib*.so.*)" + luaso="''${luaso##*/lib}" + luaso="''${luaso%%.so*}" + luaoptions="$luaoptions $luaso" + sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure + + luaincdir="$(echo "${lua}/include"/*/ )" + test -d "$luaincdir" && { + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir" + } || true + ''; + + NIX_CFLAGS_COMPILE = '' + -I${SDL}/include/SDL + -I${freetype}include/freetype2 + ''; + + meta = { + homepage = "http://love2d.org"; + description = "A Lua-based 2D game engine/scripting language"; + license = stdenv.lib.licenses.zlib; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix deleted file mode 100644 index fc1f01cb3730..000000000000 --- a/pkgs/development/interpreters/love/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua -, libdevil, freetype, physfs -, libmodplug, mpg123, libvorbis, libogg -}: - -stdenv.mkDerivation rec { - name = "love-0.8.0"; - src = fetchurl { - url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; - sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; - }; - - buildInputs = [ - pkgconfig SDL mesa openal lua - libdevil freetype physfs libmodplug mpg123 libvorbis libogg - ]; - - preConfigure = '' - luaoptions="${"''"} lua luajit " - for i in lua luajit-; do - for j in 5 5.0 5.1 5.2 5.3 5.4; do - luaoptions="$luaoptions $i$j " - done - done - luaso="$(echo "${lua}/lib/"lib*.so.*)" - luaso="''${luaso##*/lib}" - luaso="''${luaso%%.so*}" - luaoptions="$luaoptions $luaso" - sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure - - luaincdir="$(echo "${lua}/include"/*/ )" - test -d "$luaincdir" && { - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir" - } || true - ''; - - NIX_CFLAGS_COMPILE = '' - -I${SDL}/include/SDL - -I${freetype}include/freetype2 - ''; - - meta = { - homepage = "http://love2d.org"; - description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 298bbfc18007..b16ae4744f23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5221,9 +5221,10 @@ let lolcode = callPackage ../development/interpreters/lolcode { }; - love = callPackage ../development/interpreters/love {lua=lua5_1;}; - love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; + love_0_8 = callPackage ../development/interpreters/love/0.8.nix { }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; + love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; + love = love_0_10; ### LUA MODULES -- cgit 1.4.1