Vladimír Čunát
e4832c7541
Merge branch 'staging'
...
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Graham Christensen
f993e6543a
facetimehd, facetimehd-firmware: Add grahamc as a maintainer
2016-05-26 14:10:03 -05:00
Vladimír Čunát
81039713fa
Merge branch 'master' into staging
...
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Domen Kožar
1ab408e1da
lib.lists: fix fold example
2016-05-26 11:52:35 +01:00
Eelco Dolstra
b056948c00
Improve types.listOf error message
...
If an option value is not a list, you now get
The option value `bla' in `file.nix' is not a list.
rather than
value is a string while a list was expected, at .../nixpkgs/lib/lists.nix:49:56
2016-05-25 11:39:17 +02:00
obadz
47950b5353
modules/misc/version.nix: populate nixosRevision based on <nixpkgs/.git> when possible ( #15624 )
...
Example:
$ nixos-option system.nixosLabel
Value:
"16.09.git.4643ca1"
2016-05-24 23:34:28 +01:00
Vladimír Čunát
0b192a0976
Merge branch 'master' into staging
...
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát
c4661e9643
Merge: make dev output references explicit
...
This is a rebase of most commits from #14766 ,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
NikolaMandic
9bc61f92ff
adding me to maintainers
2016-05-20 19:46:20 +00:00
Charles Strahan
5d54038771
maintainers: update cstrahan's email address
2016-05-19 15:51:04 -04:00
Vladimír Čunát
da2788c3d7
Merge #15354 : add tracefilegen and tracefilesim
2016-05-19 10:29:28 +02:00
Tuomas Tynkkynen
e28e010b36
treewide: Make explicit that 'dev' output of curl is used
2016-05-19 10:00:29 +02:00
Roger Qiu
83e9c5caaf
Added cmcdragonkai to the list of maintainers
2016-05-19 18:00:14 +10:00
Nikolay Amiantov
cdff1f61f0
lib: revert my bogus comment fix
...
See 5445e521b6 (commitcomment-17531945)
2016-05-19 01:26:04 +03:00
Nikolay Amiantov
5445e521b6
firefox: restore gstreamer support for older firefox releases
2016-05-19 00:28:49 +03:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
Peter Simons
b4f60add6a
lib/maintainers.nix: alphabetize the list of user names
2016-05-16 22:49:55 +02: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
obadz
abd64abdb5
maintainers: fix my email address
2016-05-16 20:09:45 +01:00
Sebastian Jordan
8484328a34
guile-sdl2: init at 0.1.0
2016-05-15 19:04:48 +02:00
Julien Dehos
6400283c09
cpputest: init at 3.7.2
2016-05-15 14:54:19 +02:00
Vladimír Čunát
3e387c3e00
Merge branch 'staging'
...
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Frederik Rietdijk
53ffb3fcf1
Merge pull request #15414 from teh/dask
...
distributed: init at 1.10.0 (+init and update dependencies)
2016-05-12 18:06:34 +02:00
Tom Hunger
dacbeea15b
locket: init at 0.2.0
2016-05-12 17:04:40 +01:00
Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
Andrew Abbott
90201710a2
cava: update to 0.4.1
2016-05-11 20:40:03 +10:00
Martijn Vermaat
3ada292a67
lesspipe: init at 1.82
...
lesspipe.sh is a preprocessor for less.
2016-05-10 22:21:42 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
zimbatm
0bc713f817
Merge pull request #15135 from gpyh/asciidoctor
...
asciidoctor: Init at 1.5.4
2016-05-04 20:42:26 +01:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Nikolay Amiantov
7fec04cd7f
Merge pull request #15129 from rardiol/openra
...
openra: 20141029 -> 20151224
2016-05-02 16:28:20 +04:00
Joachim Fasting
ae59e8c644
Merge pull request #15062 from holidaycheck/node-6.0.0
...
nodejs-6_x : init at 6.0.0
2016-05-02 09:53:18 +02:00
Tobias Pflug
822abc49ad
nodejs-6_x : init at 6.0.0
2016-05-02 08:58:50 +02:00
ryneeverett
1e84b0c070
you-get: init at 0.4.390
2016-05-02 06:21:42 +00:00
Ricardo Ardissone
42cce6ab11
openra: my maintainership
2016-05-01 19:03:07 -03:00
Yacine Hmito
a5a98ce5a3
Added gpyh to the list of maintainers
2016-05-01 15:55:39 +02:00
Nathan Moos
6dac18a8be
imatix_gsl: init at 4.1
2016-04-28 18:26:10 -04:00
Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Allen Nelson
d7f032e805
Add new package "lsi" ( #12780 )
2016-04-26 12:24:25 +02:00
Nikolay Amiantov
5f19542581
Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:23 +03:00
Nikolay Amiantov
5ff40ddedf
add get* helper functions and mass-replace manual outputs search with them
2016-04-25 13:24:39 +03:00
Nikolay Amiantov
c779e30d53
make*Path: implement via makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Nikolay Amiantov
7d3e75827b
getOutput function: init
2016-04-25 13:22:41 +03:00
Nikolay Amiantov
5f3987f44f
Revert "tryAttrs: init function"
...
This reverts commit 338340f993
.
2016-04-25 13:22:41 +03:00
Rafał Łasocha
bea31c31f2
pws: Init at 1.0.6
2016-04-25 01:55:07 +02:00
obadz
5b5ce8dcff
fix my email address
2016-04-22 17:16:10 -05:00
Nikolay Amiantov
b2426adf1c
Merge pull request #14870 from retrry/rust-updates
...
Rust Updates
2016-04-22 14:29:14 +04:00
Andrew Burkett
0ddf8c7f6f
scrapy: init at 1.0.5
2016-04-21 16:09:18 -07:00
zimbatm
898d9d9e83
Merge pull request #14815 from choochootrain/add-xbanish
...
xbanish: init at 1.4
2016-04-20 11:36:20 +01:00