cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
134173 commits 1 branch 0 tags 3.7 GiB
Commit graph

887 commits

Author SHA1 Message Date
Jan Tojnar
c3c844a0f5
apt: Rely on XML_CATALOG_FILES variable 2017-10-07 23:39:15 +02:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Michael Weiss
5f0a7cded7 nox: Add a temporary patch for the "wip" command 
See #29684.
 2017-09-23 04:25:11 +02:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
Frederik Rietdijk
8a09e51dc2 niff: init at 0.1 2017-09-17 15:37:35 +02:00
Georges Dubus
94400c0cd2 nox: 0.0.5 -> 0.0.6 2017-09-16 21:29:40 +01:00
Eelco Dolstra
6dad1f70ce
nix: 1.11.14 -> 1.11.15 2017-09-15 16:38:33 +02:00
Eelco Dolstra
b86fd340f0
nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1 2017-09-15 11:27:32 +02:00
Eelco Dolstra
79954b9d1f
nix: 1.11.13 -> 1.11.14 2017-08-31 11:00:09 +02:00
Matthew Justin Bauer
2eacddf0dc treewide: homepage URL fixes (#28475) 
* pgadmin: use https homepage

* msn-pecan: move homepage to github

google code is now unavailable

* pidgin-latex: use https for homepage

* pidgin-opensteamworks: use github for homepage

google code is unavailable

* putty: use https for homepage

* ponylang: use https for homepage

* picolisp: use https for homepage

* phonon: use https for homepage

* pugixml: use https for homepage

* pioneer: use https for homepage

* packer: use https for homepage

* pokerth: usee https for homepage

* procps-ng: use https for homepage

* pycaml: use https for homepage

* proot: move homepage to .github.io

* pius: use https for homepage

* pdfread: use https for homepage

* postgresql: use https for homepage

* ponysay: move homepage to new site

* prometheus: use https for homepage

* powerdns: use https for homepage

* pm-utils: use https for homepage

* patchelf: move homepage to https

* tesseract: move homepage to github

* quodlibet: move homepage from google code

* jbrout: move homepage from google code

* eiskaltdcpp: move homepage to github

* nodejs: use https to homepage

* nix: use https for homepage

* pdf2djvu: move homepage from google code

* game-music-emu: move homepage from google code

* vacuum: move homepae from google code
 2017-08-22 20:50:04 +02:00
Rickard Nilsson
3c136e5fa4 dpkg: 1.18.18 -> 1.18.24 
Fixes CVE-2017-8283
 2017-08-14 14:00:12 +02:00
Frederik Rietdijk
946f536f93 Merge pull request #28205 from mimadrid/update/clib-1.8.0 
clib: 1.7.0 -> 1.8.0
 2017-08-13 22:34:29 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
mimadrid
8e178502e5
clib: 1.7.0 -> 1.8.0 2017-08-12 20:39:32 +02:00
Robin Gloster
28cc2642f0
treewide: use less phases if not necessary 
This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
 2017-08-11 11:40:36 +02:00
Robin Gloster
c00a95be63
nix-prefetch-git: fix wrapProgram call 2017-08-08 21:45:46 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Sander van der Burg
94f0a6793b disnix: 0.7.1 -> 0.7.2 2017-07-26 19:22:19 +00:00
Charles Strahan
c1fdf3341b Merge pull request #27347 from cstrahan/osquery-new 
osquery: init at 2.5.2
 2017-07-24 21:51:10 -04:00
Benno Fünfstück
1d1735ce0f nix-index: init at 0.1.0 2017-07-23 23:12:37 +02:00
Eelco Dolstra
8a31137441
nixUnstable: 1.12pre5506_3162ad5f -> 1.12pre5511_c94f3d55 2017-07-21 12:52:57 +02:00
zimbatm
2780e2a780 nixUnstable: pre5413_b4b1f452 -> pre5506_3162ad5f 2017-07-19 11:06:06 +01:00
Eelco Dolstra
17642b5fd0
nix: 1.11.12 -> 1.11.13 2017-07-18 10:54:01 +02:00
Pascal Wittmann
e621a6a5f8
opkg: 0.3.4 -> 0.3.5 2017-07-16 11:14:26 +02:00
Eelco Dolstra
40cf34aaae
nix: 1.11.11 -> 1.11.12 2017-07-13 16:37:11 +02:00
Sander van der Burg
42e6b754fb disnix: 0.7 -> 0.7.1 2017-07-11 00:26:16 +02:00
Jörg Thalheim
aacb816eb6 Merge pull request #27213 from sigma/pr/gx 
gx: 20160601-f84ddf7 -> 0.12.0
 2017-07-09 13:19:15 +01:00
Yann Hodique
c4ecdfd39e gx: 20160601-f84ddf7 -> 0.12.0 2017-07-07 08:17:21 -07:00
Rob Vermaas
74f55017d2
Update nixops to 1.5.1 
(cherry picked from commit 1b57bf274ae5c76e91b2b264d8aa8bfcecb72102)
 2017-07-06 11:14:20 +00:00
Robert Vollmert
57a0224a42 nix: short TMPDIR for tests on Darwin 
This fixes test failures due to overly long nix-daemon socket paths.
 2017-07-04 21:48:59 +02:00
Robert Hensing
3d48fa72d3 elm-github-install: init at 1.0.1 2017-06-30 10:22:18 +02:00
hsloan
40be9738ab nix: Don't use stdenv.cross 2017-06-28 21:29:07 -04:00
Charles Strahan
7f8e3f87b3
apt: init at 1.4.6 2017-06-27 21:39:07 -04:00
Franz Pletz
e9840d0482
librepo 1.7.18 -> 1.7.20 2017-06-20 05:27:48 +02:00
Eelco Dolstra
5446934b41
nix: 1.11.10 -> 1.11.11 
(cherry picked from commit 7b1e936b24ca60810cdb6d46b68300cd179836f1)
 2017-06-19 19:03:39 +02:00
Eelco Dolstra
0bffe03828
nix: 1.11.9 -> 1.11.10 2017-06-12 20:13:27 +02:00
Eelco Dolstra
3d4a8e1f84 nixUnstable: 1.12pre5350_7689181e -> 1.12pre5413_b4b1f452 2017-06-06 15:06:42 +02:00
Andrew R. M
a114eaaec7 nix: add "man" to meta.outputsToInstall 2017-05-25 06:34:31 -04:00
Dmitry Kalinkin
467a91d9ee
nixStable: remove old patches 
773313591f
ad9e6037a4
 2017-05-23 17:32:30 -04:00
Domen Kožar
5e75c73559
nixopsUnstable: 2017-05-15 -> 2017-05-22 2017-05-22 15:52:50 +02:00
Jörg Thalheim
78c409d44d Merge pull request #25860 from pjones/pjones/mynewt-newt 
mynewt-newt: init at 1.0.0
 2017-05-20 10:40:25 +01:00
Jörg Thalheim
486a073d21 mynewt-newt: disable darwin 2017-05-20 10:40:08 +01:00
Domen Kožar
395496a62a
nixopsUnstable: correct tarball 
(cherry picked from commit 3e47e6251930294711d625a8123b7f395dd16b58)
Signed-off-by: Domen Kožar <domen@dev.si>
 2017-05-18 15:39:47 +02:00
Domen Kožar
8ae6797c0e
nixopsUnstable: 1.5 -> 2017-05-15 2017-05-18 11:40:41 +02:00
Peter Jones
f326caaeea
mynewt-newt: init at 1.0.0 
Add package for mynewt-newt build manager.
 2017-05-17 09:30:12 -07:00
Eelco Dolstra
234cdc02eb
nixUnstable: 1.12pre5344_eba840c8 -> 1.12pre5350_7689181e 2017-05-08 16:50:58 +02:00
Frederik Rietdijk
ef4442e827 Python: replace requests2 with requests tree-wide 
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
 2017-05-07 12:56:09 +02:00
Eelco Dolstra
d53540dd32
nixUnstable: 1.12pre5308_2f21d522 -> 1.12pre5344_eba840c8 2017-05-04 20:45:20 +02:00
Jörg Thalheim
f556d94527 Merge pull request #25484 from l2dy/nix-confdir 
nix: add confDir argument
 2017-05-03 21:52:01 +01:00
Eelco Dolstra
20d846bcdd
nixUnstable.perlBindings: Fix Nix::Config generation 
The configure script calls nix-instantiate, which fails if /nix/var
doesn't exist (e.g. in a sandbox). This caused a bogus Nix::Config
module to be generated, causing issues in Hydra.
 2017-05-03 17:39:43 +02:00
Zero King
8bb7328300 nix: add confDir argument 2017-05-03 13:04:52 +00:00
Michael Raskin
ebc9e7a201 Merge pull request #22660 from timbertson/nix-update-source 
nix-update-source: init at 0.3.0
 2017-04-30 18:49:07 +02:00
Frederik Rietdijk
3425c37ac6 Merge pull request #25336 from matthewbauer/nix-bundle 
nix-bundle: v0.1.1 -> v0.1.3
 2017-04-30 09:58:18 +02:00
Matthew Bauer
8b5854e260 nix-bundle: 0.1.2 -> 0.1.3 2017-04-30 02:23:31 -05:00
Dan Peebles
90b9719f4f treewide: fix the remaining issues with meta attributes 2017-04-29 04:24:34 +00:00
Eelco Dolstra
e042db5e41
nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522 2017-04-28 17:55:53 +02:00
Domen Kožar
6108ee50b9 Merge pull request #25236 from matthewbauer/nix-bundle 
nix-bundle: init at 0.1.1
 2017-04-26 09:38:07 +02:00
Matthew Bauer
30ea4f0807 nix-bundle: init at 0.1.1 
Adds the nix-bundle derivation from https://github.com/matthewbauer/nix-bundle
 2017-04-26 01:53:40 -05:00
Shea Levy
5aa936d0ee nix perl-bindings: Fix Config.pm 2017-04-25 20:36:04 -04:00
Eelco Dolstra
e4190943c8
nix: 1.11.8 -> 1.11.9 2017-04-25 17:19:10 +02:00
Daniel Peebles
e9f1d8693a Merge pull request #23026 from copumpkin/nixos-install-wip 
Refactor nixos-install to separate out filesystem build logic
 2017-04-17 09:50:35 -04:00
Dan Peebles
d990aa7163 Refactor nixos-install to separate out filesystem build logic 
The key distinction I'm drawing is that there's a component that deals
with the store of the machine being built, and another component for
the store building it. The inner part of it assumes nothing from the
builder (doesn't need chroot or root powers) so it can run comfortably
inside a Nix build, as well as nixos-rebuild. I have some upcoming work
that will use that to significantly speed up and streamline image builds
for NixOS, especially on virtualized hosts like EC2, but it's also a
reasonable speedup on native hosts.
 2017-04-16 16:09:41 +00:00
William Casarin
209e8e53fb cargo-edit: init at 0.1.6 2017-04-15 09:17:21 -07:00
Jörg Thalheim
d5afba485b
rpm: fix rpmquery/rpmverify symlinks 2017-04-15 10:24:16 +02:00
armijnhemel
fed7d4a6e9 RPM: 4.13.0-rc1 -> 4.13.0.1 (#24910) 2017-04-15 10:18:04 +02:00
Eelco Dolstra
29b415dcdb
Add nixUnstable.perl-bindings 2017-04-11 15:36:51 +02:00
Eelco Dolstra
3dd66ec6e9
nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa 2017-04-11 15:02:45 +02:00
Dan Peebles
ec674a6372 nix: fix evaluation 
Sorry!
 2017-04-08 21:15:21 -04:00
Dan Peebles
fbdc4616ab nix: fix on LLVM 4.0 2017-04-08 16:54:16 -04:00
Tim Cuthbertson
892fd83ec8 nix-update-source: init at 0.4.0 2017-04-07 22:11:34 +10:00
Sander van der Burg
7408aca528 Regenerate NPM expressions with node2nix 1.2.0 2017-03-31 20:51:14 +02:00
Rob Vermaas
3139993740
nixUnstable: update to 1.12pre5122_c60715e 
(cherry picked from commit 4da11d7c9b7ed59b5acb19dd6ba335aef113db94)
 2017-03-28 11:32:17 +00:00
Domen Kožar
5912496490 Merge pull request #24277 from NixOS/hydra-bump 
Nix, Hydra: bump to 2017-03-21
 2017-03-26 18:33:59 +02:00
Domen Kožar
99632d5466
Nix, Hydra: bump to 2017-03-21 2017-03-25 13:00:49 +01:00
ndowens
16d2799af2 Changed fetchgit to fetchFromGitHub 2017-03-23 18:04:36 -05:00
Richard Lupton
d09ed00e2d
cde: init at 0.1 2017-03-22 22:45:42 +00:00
Eelco Dolstra
2cb25f8b59
nix: 1.11.7 -> 1.11.8 2017-03-21 14:49:23 +01:00
Pascal Wittmann
e8a395079a
opkg: 0.3.3 -> 0.3.4 2017-03-19 18:42:43 +01:00
Jörg Thalheim
a4c5fc068a
createrepo_c: add missing patches 2017-03-19 16:10:11 +01:00
Jörg Thalheim
d21c647ddb
createrepo_c: fix build 
(cc: @copumpkin)
 2017-03-19 11:11:43 +01:00
Sander van der Burg
a26c51116d disnix: 0.6 -> 0.7 2017-03-14 23:18:23 +01:00
Rob Vermaas
8784b0582e
Update nixUnstable 
(cherry picked from commit fce036d16443b8b9f5f02a9d2bcadc5976044dbc)
 2017-03-06 13:32:56 +00:00
Shea Levy
4da420709d nixUnstable: Add s3 support on darwin 2017-03-05 07:39:23 -05:00
Eelco Dolstra
f5e53aea5d
nixUnstable: 1.12pre4997_1351b0d -> 1.12pre5060_fa125b9 2017-03-01 18:04:18 +01:00
Eelco Dolstra
8e1fa01f3a
nix: 1.11.6 -> 1.11.7 2017-02-24 12:53:53 +01:00
Rob Vermaas
1c366b4e06
nixops: update to 1.5 
(cherry picked from commit 780a38c611162c34229c9d06b09dd4ec2f8466f4)
 2017-02-16 17:03:12 +00:00
Eelco Dolstra
97fc806a7b
nix-prefetch-zip: Remove 
This script is not needed anymore since "nix-prefetch-url --unpack
<url>" and "nix-prefetch-url -A foo.src" (where "foo.src" is a
fetchzip / fetchFromGitHub call) work fine.
 2017-02-16 11:28:23 +01:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk
bce69c9cec librepo: use python2 
python3 support is experimental. Let's wait with changing.
 2017-02-08 19:48:21 +01:00
Joachim F
664360229e Merge pull request #22374 from peterhoeg/f/ruby-tar 
fpm: fix vulnerable dependency
 2017-02-04 15:27:32 +01:00
Eelco Dolstra
dea81956fc nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d 2017-02-03 14:47:05 +01:00
Peter Hoeg
4494720241 fpm: fix vulnerable dependency 2017-02-02 22:58:43 +08:00
Eelco Dolstra
5fdc6db957
Revert "add nix-prefetch-source (#21734)" 
This reverts commit ca38ef79e9 due its
use of importJSON and external source info files, which is
non-idiomatic.
 2017-01-30 11:44:15 +01:00
Eelco Dolstra
e7ec067b6b
Revert "nix-update-source: 0.2.1 -> 0.2.2" 
This reverts commit b984d5d25f.
 2017-01-30 11:44:15 +01:00
Michael Raskin
1d44213c7e Merge pull request #21516 from timbertson/gup 
gup: 0.5.5 -> 0.6.0 and extract src into JSON
 2017-01-26 07:46:16 +00:00
Franz Pletz
2a7707cf5c
dpkg: 1.18.15 -> 1.18.18 2017-01-26 03:52:48 +01:00
Tim Cuthbertson
b984d5d25f nix-update-source: 0.2.1 -> 0.2.2 2017-01-25 22:23:52 +11:00
Tim Cuthbertson
ca38ef79e9 add nix-prefetch-source (#21734) 2017-01-23 17:44:43 +00:00
Sander van der Burg
5cf1a4d36a nodePackages: upgrade node2nix to version 1.1.1 and regenerate the package set 2017-01-20 22:05:44 +01:00
Eelco Dolstra
96b6968950
nix: 1.11.5 -> 1.11.6 2017-01-13 11:38:09 +01:00
Georges Dubus
08fd548dfd nox: 0.0.4 -> 0.0.5 2017-01-04 15:31:41 +01:00
Eelco Dolstra
0108c31e22
nix: 1.11.4 -> 1.11.5 2017-01-03 11:25:38 +01:00
ikervagyok
fa80bf7b0d packagekit: add 'enableNixBackend' as an option (#21157) 
* packagekit: disable nix-backend

Packagekit fails to build on my machines, as long as it's nix-backend is enabled

* packagekit: add 'enableNixBackend' as an option
 2016-12-17 16:53:27 +01:00
Eelco Dolstra
c94454a45a nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7 2016-12-09 11:21:06 +01:00
Frederik Rietdijk
74276caf19 koji -> pythonPackages.koji 
koji is both a library and an application. It is used in Nixpkgs
primarily as a library and therefore I move it.
 2016-12-01 21:07:33 +01:00
Tuomas Tynkkynen
8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Pascal Wittmann
e8f7c31dfb
opkg: 0.3.1 -> 0.3.3 2016-11-27 15:58:29 +01:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
2de9321880 nodejs: add python to passthru 
so nodeEnv uses the exact same version.

See also https://github.com/svanderburg/node2nix/issues/25
 2016-11-24 22:28:04 +01:00
Frederik Rietdijk
1e52bed8a3 createrepo_c: use python2 2016-11-24 22:28:02 +01:00
Domen Kožar
ce6abb9495 nixopsUnstable: init at 2016-11-23 2016-11-23 17:35:36 +01:00
Tobias Geerinckx-Rice
2034ffdc07
dpkg: 1.18.14 -> 1.18.15 2016-11-16 13:20:32 +01:00
Tobias Geerinckx-Rice
8ef3eaeb4e
dpkg: remove commented old postPatch 
This was supposed to be removed in 7f71b89454
since it doesn't appear to be needed any longer.
 2016-11-14 05:32:22 +01:00
Tobias Geerinckx-Rice
7f71b89454
dpkg: 1.18.10 -> 1.18.14 2016-11-14 01:45:49 +01:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Kirill Boltaev
0c34b202e3 nixops: explicitly specify python2 2016-10-19 18:51:44 +03:00
Frederik Rietdijk
582ab2cf4e koji: use python2 2016-10-18 23:16:07 +02:00
Vladimír Čunát
061758490f Merge branch 'master' into staging 
... to get the openssl mass rebuild: 942dbf89c.
 2016-10-14 13:16:11 +02:00
zimbatm
6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins 
Bundler env bins
 2016-10-14 11:51:23 +01:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Dan Peebles
f35ab9c2f8 rpm-ostree: 2016.1 -> 2016.10 
This also updates a bunch of its dependencies to enable the update,
and gets rid of libhif because upstream stopped maintaining it as
such, instead using it internally in other projects until they can
agree on an interface for it. Nothing seemed to be using libhif so
I'm not too concerned about removing it.
 2016-10-12 20:31:02 +00:00
zimbatm
16cf3cf687 fpm: simplify 2016-10-08 22:38:57 +01:00
Robert Helgesson
e8817a2d20
bash-completion: change attribute name 
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
 2016-09-28 17:46:29 +02:00
Graham Christensen
dad5651bd4
rpm: 4.12.0 -> 4.13.0-rc1 for CVEs 
Null pointer deref & out of bound reads. See: https://lwn.net/Vulnerabilities/685287/

Fedora is shipping the rc1 as well.

re: https://github.com/NixOS/nixpkgs/pull/18975
 2016-09-27 21:07:35 -04:00
Tuomas Tynkkynen
bb19e17d14 rpm: Split into multiple outputs 
Patch away two things:

- %_includedir, %_oldincludedir, %_mandir, %_infodir macros from
  lib/rpm/platform/*/macros to avoid cycles between outputs. Hopefully
  anything doesn't really need those.
- Change %__ld, %__nm, %__objcopy, %__objdump in lib/rpm/macros to
  refer to the commands in PATH. Should be safe as %__cc for instance is
  already like that.
 2016-09-19 16:09:34 +03:00
Tuomas Tynkkynen
48d7948808 rpm: Use list for configureFlags 2016-09-19 16:09:34 +03: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
Sander van der Burg
77b9abf78c disnix: 0.6 -> 0.6.1 2016-09-13 19:47:19 +00:00
Sander van der Burg
2edb28ffc5 dysnomia: bump to version 0.6.1 2016-09-13 19:41:54 +00:00
Eelco Dolstra
6a9fb8b9e0 nix: Enable install check 
Looks like this got disabled accidentally in
ec5b66eb4a.
 2016-09-12 23:34:08 +02:00
Eelco Dolstra
f2ddf2a9be nix: 1.11.3 -> 1.11.4 2016-09-06 16:15:22 +02:00
Benjamin Staffin
2e88851c61 dpkg: Fix the build on Darwin 
There are still some bugs and quirks, but this gets dpkg building at
least, and some parts of it are useful.
 2016-09-05 01:14:36 -04:00
Sander van der Burg
792f50fe7c nixui: migrate to node2nix 2016-09-01 12:14:20 +00:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Vladimír Čunát
3996aa8953 nix: maintenance 1.11.2 -> 1.11.3 
Fixes #17804.
 2016-08-29 22:44:01 +02:00
Tuomas Tynkkynen
b2e701cb1d nix-repl: Use 'dev' output of nix 2016-08-29 21:30:52 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +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
Jaka Hudoklin
869cfddcfc Merge pull request #17888 from peterhoeg/fpm_162 
fpm: 1.4.0 -> 1.6.2
 2016-08-24 23:39:51 +02:00
Robin Gloster
8cd050f6ba rpm: remove hack 
elfutils now adds a eu- prefix to avoid collisions
 2016-08-24 19:23:42 +00: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
1730151d97 packagekit: vala -> vala_0_23 2016-08-21 20:18:21 +03:00
Peter Hoeg
9aa2515d14 fpm: 1.4.0 -> 1.6.2 2016-08-21 20:28:39 +08:00
Aneesh Agrawal
e2ddcc938f nix: remove unused unstable.nix file 2016-08-18 23:14:07 -04:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Domen Kožar
49222660fc Merge pull request #17256 from matthewbauer/patch-4 
Travis fixes
 2016-08-13 14:17:59 +02:00
Luca Bruno
a10886dfdc Merge pull request #17514 from matthewbauer/packagekit-1.1.3 
packagekit: git -> 1.1.3
 2016-08-12 22:03:55 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00