3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

210 commits

Author SHA1 Message Date
Travis Whitaker 39ad303e21 tigervnc: 1.6.0 -> 1.7.0 2016-11-19 23:34:53 -08:00
Vladimír Čunát b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
Aristid Breitkreuz 8600e38bca google-cloud-sdk: add assertion for x86/x86-64 Linux 2016-11-13 11:56:25 +01:00
Aristid Breitkreuz ed9b1c673b google-cloud-sdk: 122.0.0 -> 134.0.0 2016-11-13 11:38:35 +01:00
Frederik Rietdijk dd5256993e certbot: use python2 2016-11-08 22:48:54 +01:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Philipp 5c3a6d6802 Added package for dehydrated. (#19651)
* Added package for dehydrated.
2016-10-20 13:32:05 +02:00
Frederik Rietdijk 6b724f069b cli53: use python2 2016-10-18 23:16:07 +02:00
Aneesh Agrawal 1d9a98cae0 salt: use Python 2 2016-10-18 23:14:36 +02:00
Eelco Dolstra 69bb34673e Merge pull request #19196 from groxxda/xkbbindir
xserver: replace XKB_BINDIR with compile time option
2016-10-03 17:12:59 +02:00
Alexander Ried e7ded267bd xserver: replace XKB_BINDIR with compile time option
---

Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
Alexander Ried da658b98ce gtk-vnc: 0.5.3 -> 0.6.0
gtk3 build is now default
2016-10-01 17:14:31 +02:00
Alexander Ried ecd80b9a0e gtk-vnc: remove gtk2 support (unused) 2016-10-01 17:14:31 +02:00
Aneesh Agrawal 7b7d8ddbca salttesting: remove unused package
It was added as a dependency of Salt, which no longer depends on it.
2016-09-27 13:34:22 -04:00
Frederik Rietdijk 982ac542cb cli53: do not pass in buildPythonApplication 2016-09-26 11:10:51 +02:00
Frederik Rietdijk d07270649c gtk-vnc: do not use top-level python packages 2016-09-25 23:19:40 +02:00
Aneesh Agrawal 34b5d639c6 SaltTesting: 2015.7.10 -> 2016.9.7 2016-09-23 20:33:36 -04:00
Aneesh Agrawal f61b23cd23 salt: 2015.8.8 -> 2016.3.3 2016-09-23 20:31:20 -04:00
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
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Tuomas Tynkkynen c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03: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
Rickard Nilsson f25006bfaf google-cloud-sdk: 113.0.0 -> 122.0.0 2016-08-24 13:19:38 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen b61fbf3132 treewide: Fix output references to openssl 2016-08-23 04:53:27 +03: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
Ram Kromberg 363fac7da7 gtk-vnc: vala -> vala_0_23 2016-08-21 20:17:14 +03:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02: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
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Franz Pletz e55aa50175 simp_le: apply patch to update TOS hash
Fixes #17455.

Also see https://github.com/kuba/simp_le/issues/114.
2016-08-02 21:21:02 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Zack Piper bd1e99a5ed lxd: 2.0.0.rc4 -> 2.0.2 2016-06-19 20:21:03 +01:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rickard Nilsson 548a136345 google-cloud-sdk: 109.0.0 -> 113.0.0 2016-06-10 09:07:01 +00:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski a1f3808e2f lxd: extracted from goPackages 2016-06-09 11:21:30 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Franz Pletz d580b0ac0c simp_le: needs acme 0.5.0 2016-05-22 22:47:52 +02:00
Tobias Geerinckx-Rice 9414e2d536
certbot: 0.5.0 -> 0.6.0; rename from letsencrypt 2016-05-21 13:52:28 +02:00
Joachim Fasting 488de71921 Merge pull request #15433 from zimbatm/google-gloud-sdk-109
google-cloud-sdk: 106.0.0 -> 109.0.0
2016-05-18 19:09:52 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
zimbatm 0208e92577 google-cloud-sdk: 106.0.0 -> 109.0.0 2016-05-13 12:48:04 +01:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
zimbatm 89675e4a07 Merge pull request #15371 from groxxda/bump/simp_le
simp_le: 2016-02-06 -> 2016-04-17
2016-05-10 22:17:29 +01:00
Alexander Ried 988b151fa1 letsencrypt: 0.4.0 -> 0.5.0
seems like the dependency on gnureadline is more or less optional for
letsencrypt itself but the tests will not pass without it
2016-05-10 22:16:11 +01:00
Alexander Ried 8335c68543 simp_le: 2016-02-06 -> 2016-04-17
suports acme 0.5
2016-05-10 21:54:21 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00