dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
96cec2a7bd
nixpkgs/pkgs/development
History
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
..
arduino
compilers Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
eclipse ecj: Build on Darwin 2014-07-15 11:51:27 +02:00
guile-modules Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
interpreters Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
libraries Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
lisp-modules fetchbzr, fetchdarcs, fetchhg: use rev attr 2014-06-28 21:06:10 +02:00
misc intelgen4asm: Remove obsolete package 2014-08-07 01:32:43 +02:00
mobile Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
ocaml-modules Merge master into PR 2014-08-12 21:52:20 +02:00
perl-modules Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
pharo/vm Adding myself to the maintainers 2014-08-10 15:57:24 +02:00
python-modules Merge #3152: add pyqt5 2014-08-12 20:33:34 +02:00
qtcreator qtcreator: install desktop file 2014-08-02 21:11:36 +02:00
r-modules RcmdrPlugin_ROC: remove broken package 2014-08-15 18:51:47 +02:00
ruby-modules
tools Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
web Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00