diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 53 |
1 files changed, 34 insertions, 19 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e392af3f650..f8cc825d6eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4665,16 +4665,6 @@ in overmind = callPackage ../applications/misc/overmind { }; - owncloud = owncloud70; - - inherit (callPackages ../servers/owncloud { }) - owncloud70 - owncloud80 - owncloud81 - owncloud82 - owncloud90 - owncloud91; - owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -6964,6 +6954,36 @@ in gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; + gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { + version = "4.7-2013q3-20130916"; + releaseType = "update"; + sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; + ncurses = pkgsi686Linux.ncurses5; + }; + gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { + version = "4.8-2014q1-20140314"; + releaseType = "update"; + sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; + ncurses = pkgsi686Linux.ncurses5; + }; + gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { + version = "4.9-2015q1-20150306"; + releaseType = "update"; + sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; + ncurses = pkgsi686Linux.ncurses5; + }; + gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { + dirName = "5.0"; + subdirName = "5-2016-q2-update"; + version = "5.4-2016q2-20160622"; + releaseType = "update"; + sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; + ncurses = pkgsi686Linux.ncurses5; + }; + gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; + gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; + gcc-arm-embedded = gcc-arm-embedded-7; + gforth = callPackage ../development/compilers/gforth {}; gtk-server = callPackage ../development/interpreters/gtk-server {}; @@ -8071,11 +8091,6 @@ in spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; - spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { - inherit (darwin) libobjc; - stdenv = gccStdenv; - }; - spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { @@ -8083,7 +8098,7 @@ in })); spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; - spidermonkey = spidermonkey_31; + spidermonkey = spidermonkey_38; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; @@ -9805,8 +9820,8 @@ in gdbm = callPackage ../development/libraries/gdbm { }; gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; - gecode_4 = callPackage ../development/libraries/gecode { }; - gecode = gecode_4; + gecode_6 = qt5.callPackage ../development/libraries/gecode { }; + gecode = gecode_6; gephi = callPackage ../applications/science/misc/gephi { }; @@ -14296,7 +14311,7 @@ in ffado = callPackage ../os-specific/linux/ffado { inherit (python2Packages) python pyqt4 dbus-python; }; - libffado = ffado.override { prefix = "lib"; }; + libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; |