Commit graph

696 commits

Author SHA1 Message Date
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