1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Commit graph

364 commits

Author SHA1 Message Date
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01: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
Joachim F c30792ed43 Merge pull request #17947 from RamKromberg/init/rc
rc: init at 1.7.4
2016-08-26 18:34:32 +02:00
Franz Pletz 098680e78e
Revert "Revert "bash: 4.3-p42 -> 4.3-p46""
This reverts commit 36e75a2285.

Sorry, had bash reverted temporarily to test the build of the
sqlite bump and forgot to remove that commit.
2016-08-26 17:08:58 +02:00
Franz Pletz 36e75a2285
Revert "bash: 4.3-p42 -> 4.3-p46"
This reverts commit e39a3237e6.
2016-08-26 17:06:45 +02:00
Eelco Dolstra e39a3237e6 bash: 4.3-p42 -> 4.3-p46 2016-08-26 16:36:07 +02:00
Ram Kromberg 4c72c81e08 rc: init at 1.7.4 2016-08-26 16:24:43 +03:00
Michael Raskin 693be25cc3 tcsh: take patch from Debian and edit it to fix handling of glibc-2.24 union wait removal 2016-08-26 14:59:39 +02:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Tim Steinbach 43fd03a6df oh-my-zsh: 2016-07-15 -> 2016-08-01 2016-08-05 09:53:48 -04:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 16d48b8280 Re-enable bunch of packages on Darwin
Prior to 1bf5ded193 these contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-03 00:55:42 +03:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Rahul Gopinath fbf85ce15a pash: 2015-11-06 -> 2016-07-06 2016-07-28 17:16:37 -07:00
Robin Gloster 1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rok Garbas d9871f52b4 xonsh: 0.4.1 -> 0.4.3 2016-07-21 01:01:57 +02:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Tim Steinbach 1e510fd87c oh-my-zsh: 2016-07-05 -> 2016-07-15 2016-07-18 10:55:02 -04:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Tim Steinbach 71ad2ed226 oh-my-zsh: 2016-06-18 -> 2016-07-05 (#16874) 2016-07-12 09:55:17 +02:00
Louis Taylor 5ee480bce5 fish: 2.3.0 -> 2.3.1 2016-07-11 05:43:47 +01:00
Joachim Fasting 3ac882ad44 Merge pull request #16589 from vrthra/elvish
elvish: disable darwin
2016-07-02 15:35:49 +02:00
Rahul Gopinath 8c7a32a670 elvish: disable darwin 2016-06-28 21:13:33 -07:00
Ole Jørgen Brønner 08f0ce1d0a zsh-completions: init at version 0.18.0 (#16512)
"This projects aims at gathering/developing new completion scripts that
are not available in Zsh yet. The scripts are meant to be contributed to
the Zsh project when stable enough."
2016-06-27 00:39:18 +02:00
Rahul Gopinath ae3d492924 xonsh: Add XONSH_INTERACTIVE and remove replay test 2016-06-25 17:50:27 -07:00
Rahul Gopinath f3fc9f1eb0 xonsh: 0.3.4 -> 0.4.1
* Disable windows tests that get erroneously executed
2016-06-25 09:27:18 -07:00
Arseniy Seroka 045cd10e77 Merge pull request #16329 from vrthra/elvish
elvish: init at 0.1
2016-06-25 13:40:47 +03:00
Michael Raskin b3bcb59bd5 tcsh: import an Arch patch (merging the two patches into a single one) for fixing gcc5 optimisation 2016-06-23 11:01:21 +02:00
Michael Raskin b300a8937e Merge pull request #14583 from AndersonTorres/tcsh
tcsh: 6.18.01 -> 6.19.00
2016-06-23 08:47:20 +00:00
Rahul Gopinath 293d23abb4 elvish: init at 0.1
A novel unix shell written in go language.
2016-06-21 00:04:54 -07:00
Ricardo Ardissone b81f3e4682 pythonPackages.prompt_toolkit: move pygments to propagatedBuildInputs 2016-06-20 13:41:05 +02:00
Ricardo Ardissone 5d80a0244b xonsh: 0.3.2 -> 0.3.4 2016-06-20 13:41:05 +02:00
Joachim Fasting b3832e6288 Merge pull request #16339 from NeQuissimus/ohmyzsh20160618
oh-my-zsh: 2016-04-20 -> 2016-06-18
2016-06-20 03:54:10 +02:00
Tim Steinbach b2faec8adc oh-my-zsh: 2016-04-20 -> 2016-06-18 2016-06-19 14:19:23 +00:00
zimbatm 7e578dc334 zsh: add shellPath passthru 2016-06-12 18:57:31 +01:00
zimbatm a9f42f633b xonsh: add shellPath passthru 2016-06-12 18:57:31 +01:00
zimbatm 53060e5bb8 tcsh: add shellPath passthru 2016-06-12 18:57:31 +01:00
zimbatm 2e22de1f58 rush: add shellPath passthru 2016-06-12 18:57:30 +01:00
zimbatm 27ef2eb695 pash: add shellPath passthru 2016-06-12 18:57:30 +01:00
zimbatm 7fcd50da4f mksh: add shellPath passthru 2016-06-12 18:57:30 +01:00
zimbatm b482036cbb fish: add shellPath passthru 2016-06-12 18:57:29 +01:00
zimbatm 68865f51ef es: add shellPath passthru 2016-06-12 18:57:29 +01:00
zimbatm b5dad466d5 dash: add shellPath passthru 2016-06-12 18:57:29 +01:00
Kjetil Orbekk 3d7c8bd179 fish: fix completion from NIX_PROFILES
Load NIX_PROFILES at shell startup, not at build time.
This one was missed in #16039.
2016-06-12 01:16:35 -04:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00