Commit Graph

1710 Commits

Author SHA1 Message Date
obadz
92d929c884 Merge branch 'master' into staging 2016-08-28 14:48:02 +01:00
Graham Christensen
1a64734bc6 Merge pull request #18031 from ambrop72/kdevelop5.0
kdevelop: Init at 5.0
2016-08-28 08:58:21 -04:00
Ambroz Bizjak
529fbe05a3 kdevelop: Init at 5.0
Doesn't use Okteta yet.
2016-08-28 14:15:54 +02:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Rok Garbas
1102352a79 Merge pull request #17906 from garbas/neovim-0.1.5-update
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
2016-08-27 17:44:34 +02:00
Joachim F
cb2bb72de5 Merge pull request #17996 from Ptival/vscode-1.4.0
vscode: 1.2.1 -> 1.4.0
2016-08-27 10:51:54 +02:00
Domen Kožar
9d22624eb0 Merge pull request #17976 from despairblue/patch-1
atom: 1.9.6 -> 1.9.9
2016-08-26 12:05:41 +02:00
Valentin Robert
4370f2583f vscode: 1.2.1 -> 1.4.0 2016-08-25 13:16:51 -07:00
Jaka Hudoklin
b0b02c848d Merge pull request #17668 from steveeJ/manuskript
manuskript: init at 0.3.0
2016-08-24 23:44:08 +02:00
Danny Arnold
d0e86a0d48 atom: 1.9.6 -> 1.9.9 2016-08-24 23:29:24 +02:00
Robin Gloster
5e3294d6a6 idea.idea-ultimate: 2016.2 -> 2016.2.2
Clean up builds on the way.
2016-08-24 20:42:29 +00:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Stefan Junker
4f812be509 manuskript: init at 0.3.0 2016-08-23 21:29:07 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Moritz Ulrich
594eb327aa Merge pull request #17934 from DamienCassou/emacs-25.1-rc2
emacs25pre: rc1 -> rc2
2016-08-23 13:56:40 +02:00
Damien Cassou
11b45b3712 emacs25pre: rc1 -> rc2 2016-08-23 10:41:13 +02:00
Tuomas Tynkkynen
f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen
282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
Rok Garbas
c3ef13a828
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
* neovimLibvterm: a9c7c6f -> 487f21db
* libmpack: 071d944c -> 80bd55e
2016-08-22 12:15:41 +02:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz
ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Ram Kromberg
49bd29ae57 vanubi: vala -> vala_0_26 2016-08-21 20:02:05 +03:00
obadz
68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
obadz
f515427cce emacs: add compiler flag to cope with glibc 2.24 2016-08-20 21:48:25 +01:00
J Phani Mahesh
64fb9bb0e2 ht: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:30 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors"
This reverts commit 217594fd1d, reversing
changes made to 8e8a89d8a8.

Turns out it wasn't ready afterall ...
2016-08-20 15:14:23 +02:00
J Phani Mahesh
1673b19be3 ht: switch sf downloads to mirror:// 2016-08-20 17:28:27 +05:30
obadz
3f783e7fd1 nano: 2.6.2 -> 2.6.3
Add patch to make Darwin happy & fix #17835
2016-08-19 18:17:25 +01:00
Joachim F
b5bfa099b6 Merge pull request #17795 from RamKromberg/fix/leo-editor
leo-editor: 5.1 -> 5.3
2016-08-18 16:44:27 +02:00
Frederik Rietdijk
0e6822b522 kile: 2016-07-02 -> 2016-07-25 2016-08-18 09:59:25 +02:00
Ram Kromberg
d6d716490e leo-editor: 5.1 -> 5.3 2016-08-17 16:44:25 +03:00
Matthew Bauer
fc9508d387 mg: fix darwin build
-Wno-error is needed
2016-08-16 19:25:43 +00:00
Matthew Bauer
1705b314d5 geany: fix darwin build 2016-08-16 19:25:39 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Joachim F
2c3964fabc Merge pull request #17742 from mimadrid/update/nano-2.6.3
nano: 2.6.2 -> 2.6.3
2016-08-15 00:59:20 +02:00
mimadrid
f5b2d63e4c
nano: 2.6.2 -> 2.6.3 2016-08-15 00:51:05 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Hoang Xuan Phu
f822b93e05 android-studio: repackage in an FHS environment
This commit fixes 2 main problems:

  - Android Studio comes with its own package manager. The current
    packaging approach doesn't allow such management. As a result the
    package is unusable (see
    https://github.com/NixOS/nixpkgs/issues/8650 and
    https://github.com/NixOS/nixpkgs/issues/14903). In this version,
    $ANDROID_HOME is _not_ set, allowing Android Studio to deal with the
    Android SDK as it pleases (typically in $HOME/Android/Sdk).

  - Android Studio downloads prebuilt binaries as part of the SDK. These
    tools (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the
    interpreter. An FHS environment is used as a work around for that.
2016-08-10 20:42:16 +08:00
Danny Arnold
c15795a082 atom: 1.9.0 -> 1.9.6 2016-08-09 16:47:00 +02:00
Tuomas Tynkkynen
8f098d71f0 idea.android-studio: Disable Hydra build
http://hydra.nixos.org/build/38305379
2016-08-08 16:12:29 +03:00
Moritz Ulrich
f7f8de64f4 Merge pull request #17574 from DamienCassou/add-checks-back-to-emacs25pre
emacs25pre: Removes doCheck = false
2016-08-07 11:11:58 +02:00
Damien Cassou
882ad3bbd0 emacs25pre: Removes doCheck = false
Fixes #13573. This package builds fine without this line now.
2016-08-07 09:04:31 +02:00
Tuomas Tynkkynen
ce537c98de tweak: Broken on Darwin
http://hydra.nixos.org/build/38316344
2016-08-06 17:06:45 +03:00
Aneesh Agrawal
5e3eb476f5 neovim: remove unused glib dependency (#17499)
As far as I can tell, neovim has never required glib to build.
The neovim libtermkey does include a demo-glib.c example, but that is
optional.
2016-08-05 09:33:05 +02:00
Dinnanid
672447f1ad
eclipse-sdk: 4.5.2 -> 4.6 2016-08-04 20:11:08 +02:00
Dinnanid
b78a70ccc8
eclipse-sdk: 4.5.1 -> 4.5.2 2016-08-04 20:11:08 +02:00
Joachim F
70bf931498 Merge pull request #17410 from knedlsepp/motif-on-darwin
motif: Add support for darwin
2016-08-03 18:31:43 +02:00