Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1030 commits
Select commit Hold shift + click to select a range
a540d2b
pythonPackages.sqlalchemy9: drop
lsix Apr 4, 2016
c74cbb8
Merge pull request #14429 from samuelrivas/avoid-conflicts-in-emacs-w…
ttuegel Apr 4, 2016
2c0310d
xapian10/xapianBindings10: Remove, 5 years old.
grahamc Mar 31, 2016
2b462dc
xapian-bindings: build against php56
grahamc Mar 31, 2016
e3a335d
xapian-bindings:1.2.8 -> 1.2.23
grahamc Mar 31, 2016
374709f
xapian: 1.2.21 -> 1.2.23 and disable PHP support in xapianBindings
grahamc Mar 31, 2016
2ec1d2c
sup: 0.20.0 -> 0.22.1
grahamc Mar 31, 2016
2ce26f4
kiwix: mark as broken
grahamc Apr 1, 2016
5024e03
pythonPackages.pyramid_beaker: 0.7 -> 0.8, mark as broken
grahamc Apr 1, 2016
8e0f077
mini-httpd: update to version 1.6
peti Apr 4, 2016
399d2bc
mosh: fix segfaulting issue
fadenb Apr 4, 2016
0c0aa04
hackage-packages.nix: update Haskell package set
peti Mar 29, 2016
368324d
Add LTS Haskell 5.10.
peti Mar 29, 2016
a68e670
Add LTS Haskell 5.11.
peti Apr 4, 2016
574f63b
haskell-hspec: fix infinite recursion in version 2.2.2
peti Mar 29, 2016
de613e0
haskell-doctest: use version 0.11.0 when compiling with GHC 8.0.x
peti Mar 31, 2016
f5c95fc
configuration-hackage2nix.yaml: disable broken builds
peti Mar 31, 2016
0d39f48
haskell-hruby: remove obsolete override
peti Apr 4, 2016
dd0994e
travis: init at 1.8.2
zimbatm Apr 4, 2016
88c97e2
Merge pull request #14413 from abbradar/steam-run
abbradar Apr 4, 2016
3a75ed4
citrix-receiver: fix patchelf error during installPhase
Apr 4, 2016
84f3cd3
Merge pull request #14441 from mayflower/fix/mosh
peti Apr 4, 2016
d076a13
openmpi: patch for legitimate zero size messages
costrouc Apr 4, 2016
c5741f5
fbida: 2.10 -> 2.11
pSub Apr 4, 2016
74eee1f
libfastjson: init at v0.99.2
Apr 4, 2016
925d546
libksi: 3.2.2.0 -> 3.4.0.5
Apr 4, 2016
158558e
rsyslog: 8.14.0 -> 8.17.0
Apr 4, 2016
bb125c7
README: 15.09 -> 16.03
Apr 4, 2016
cf39ca1
Merge pull request #14451 from NeQuissimus/readme1603
copumpkin Apr 4, 2016
9b26566
drumgizmo: 0.9.9 -> 0.9.10
nico202 Apr 4, 2016
08cf0dc
sbcl: 1.3.3 -> 1.3.4
Apr 4, 2016
621218c
cpp-netlib: 0.11.2 -> 0.12.0
nckx Apr 2, 2016
d54bc76
hplip: canonicalise 56-hpmud.rules' paths if installed
nckx Apr 1, 2016
f6807db
sbcl: better thread support and arm detection
Apr 4, 2016
106d0f6
clisp: control build options and fix non x86* architectures
Apr 4, 2016
ad8857a
Merge pull request #14367 from grahamc/xapian-sup-kiwix
joachifm Apr 4, 2016
95afec5
Merge pull request #14455 from nico202/dgz
cillianderoiste Apr 4, 2016
b39fd4f
hipchat: fix links being broken
puffnfresh Apr 5, 2016
0c059b4
playerctl: 0.4.2 -> 0.5.0
micxjo Apr 5, 2016
56ff116
zpaq: 7.07 -> 7.08
nckx Apr 5, 2016
9fc2dfa
Merge pull request #14460 from puffnfresh/package/hipchat
copumpkin Apr 5, 2016
bfc979c
pell: init at 0.0.1
ebzzry Apr 4, 2016
9dfa26d
why3: 0.86.3 -> 0.87.0
vbgl Apr 5, 2016
9b52caa
emacs25pre: 25.0.50-1b5630e -> 25.0.92
DamienCassou Apr 5, 2016
d2ef7ab
Merge pull request #14467 from DamienCassou/emacs-25.0.92
peti Apr 5, 2016
2bbae96
nixpkgs manual introduction: improve
vcunat Apr 5, 2016
69c746d
Update AMI creation script
edolstra Apr 5, 2016
ab2855b
Add 16.03 AMIs
edolstra Apr 5, 2016
15434be
Merge pull request #14456 from tohl/master
7c6f434c Apr 5, 2016
f2a88f8
discord: init at 0.0.1
ldesgoui Apr 2, 2016
aa670eb
vmTools: update debian jessie 8.3 -> 8.4
vcunat Apr 5, 2016
90624dc
conkeror: 1.0pre-20150730 -> 1.0pre-20160130
mwotringer Apr 5, 2016
1f72a26
Merge pull request #13588 from Profpatsch/yolk
lsix Apr 5, 2016
53e8e93
nixos/stage-1: Removed logCommands conditional for resetting the file…
CMCDragonkai Apr 5, 2016
14cb8a7
mutt: 1.5.24 -> 1.6.0
kragniz Apr 4, 2016
81e23c5
mutt: update sidebar patch
kragniz Apr 4, 2016
2a36723
Remove broken node packages
NicolasPetton Apr 5, 2016
00cc0ca
Sort node packages in node-packages.json alphabetically
NicolasPetton Apr 5, 2016
54d93ab
liquibase: init at 3.4.2
Apr 5, 2016
822665f
paprefs: propagate GConf dbus service
abbradar Mar 2, 2016
9585630
Merge pull request #14461 from micxjo/update-playerctl
jagajaga Apr 5, 2016
028c0b7
Merge pull request #14452 from ebzzry/pell-0.0.1
jagajaga Apr 5, 2016
ae9a867
Merge pull request #14473 from NeQuissimus/liquibase
jagajaga Apr 5, 2016
56c3b22
Merge pull request #14449 from NeQuissimus/rsyslog8170
jagajaga Apr 5, 2016
33c2134
Merge pull request #14453 from markWot/fix/conkeror-update
jagajaga Apr 5, 2016
d06dfe8
ocaml-text: 0.7.1 -> 0.8
vbgl Apr 5, 2016
a269e43
Merge pull request #14475 from NicolasPetton/master
DamienCassou Apr 5, 2016
8f7d11e
Merge pull request #14468 from vbgl/why3-0.87
DamienCassou Apr 5, 2016
56d45e9
eclipse-plugin-scala: 4.3.0.201512011535 -> 4.4.0.201604010956
rycee Apr 5, 2016
97c8bf6
Merge pull request #14474 from MatrixAI/fixed-stage1
joachifm Apr 5, 2016
9c2a49e
mpv: 0.15.0 -> 0.16.0
edolstra Apr 5, 2016
2dd01bd
liferea: maintenance update 1.10.18 -> 1.10.19
vcunat Apr 5, 2016
bed0ee3
Merge pull request #14400 from ldesgoui/master
joachifm Apr 5, 2016
7ec55f3
Merge pull request #14420 from phunehehe/emacs-helm
joachifm Apr 5, 2016
6b42f9f
Merge commit 'bde820' from staging
dezgeg Apr 5, 2016
fd80407
libsodium: 1.0.8 -> 1.0.10
joachifm Apr 4, 2016
eb860f9
Merge pull request #14445 from costrouc/costrouc-openmpi
joachifm Apr 5, 2016
3e8f020
japa: init at 0.8.4
magnetophon Apr 4, 2016
76ad245
Merge pull request #14458 from magnetophon/japa
joachifm Apr 5, 2016
a811902
anki: 2.0.33 -> 2.0.35
micxjo Apr 6, 2016
ea4fb2c
inspectrum: 20160103 -> 20160403
mogorman Apr 6, 2016
6420542
platformio: 2.8.3 -> 2.8.6
mogorman Apr 6, 2016
b3732a7
sopel: 6.3.0 -> 6.3.1
mogorman Apr 6, 2016
1f68a8c
Merge pull request #14483 from mogorman/inspectrum
joachifm Apr 6, 2016
a312688
Merge pull request #14482 from micxjo/update-anki
joachifm Apr 6, 2016
244581d
Merge pull request #14484 from mogorman/platformio-2.8.6
joachifm Apr 6, 2016
8eaa5fb
Merge pull request #14485 from mogorman/sopel-6.3.1
joachifm Apr 6, 2016
3e9b101
libast: init at 0.7
AndersonTorres Apr 6, 2016
bd7ce5a
Eterm: init at 0.9.6
AndersonTorres Apr 6, 2016
e1ab998
pharo-spur: 2016.02.15 -> 2016.04.04
DamienCassou Apr 6, 2016
21cb5fc
pharo-no-spur: 2015.08.06 -> 2016.02.18
DamienCassou Apr 6, 2016
a8ac2ea
Merge pull request #14488 from DamienCassou/update-pharo-vm
DamienCassou Apr 6, 2016
cfad821
telegram-cli: 2015-07-30 -> 2016-03-23
nico202 Apr 6, 2016
3d412dd
nodejs: 5.10.0 -> 5.10.1
lo1tuma Apr 6, 2016
4e2e743
Merge pull request #14492 from gilligan/node-5.10.1
svanderburg Apr 6, 2016
f059af9
Merge pull request #14491 from nico202/telegram-cli
jagajaga Apr 6, 2016
6f1467b
Merge pull request #14487 from AndersonTorres/eterm
jagajaga Apr 6, 2016
b95a1c4
kernel: fix build of 3.10 and 3.12 on i686
domenkozar Mar 25, 2016
04f480a
Merge pull request #14425 from grahamc/libsrtp
fpletz Apr 6, 2016
b77df19
phantomjs2: 2.0.0 -> 2.1.1 (fix build)
domenkozar Apr 6, 2016
e9842ea
kernelHeaders: fix build with libmpc
domenkozar Apr 6, 2016
c850203
linuxHeaders: add platforms
domenkozar Apr 6, 2016
c6e6c68
pythonPackages.fusepy: 2.0.2 -> 2.0.4
nckx Apr 5, 2016
77103ed
Merge pull request #14471 from lancelotsix/continue_sqlalchemy_legacy…
FRidh Apr 6, 2016
5d142bd
uncertainties: 2.4.6.1 -> 2.4.8.1
rnhmjoj Apr 6, 2016
59ef7d2
nvidia-x11: 358.16 -> 361.42
edolstra Apr 6, 2016
b95274c
kernel: Don't patchELF manually
dezgeg Apr 6, 2016
a4e7cc5
pythonPackages.cgkit: init at 2.0.0
expipiplus1 Apr 6, 2016
33530b5
wcslib: 5.14 -> 5.15
nckx Apr 6, 2016
8be8b6c
thunderbird-bin: 38.7.1 -> 38.7.2
taku0 Apr 6, 2016
80db147
rtv: 1.8.0 -> 1.9.0
wedens Apr 6, 2016
dbcf467
Merge pull request #14499 from rnhmjoj/uncertainties
FRidh Apr 6, 2016
9435e53
sane-backends-git -> 2016-04-06
nckx Apr 6, 2016
eec0400
tldr: 1.1.0 -> 1.2.0
nckx Apr 6, 2016
0661a98
libpsl: list 2016-03-30 -> 2016-04-05
nckx Apr 6, 2016
6cd2ecc
neovim: Fix build by via order of `buildInputs`
the-kenny Apr 6, 2016
d2d3ef9
gforth: fix build on darwin
henrytill Apr 6, 2016
8c2e8ec
haskellPackages.dnssd: override the dns_sd dependency to point to ava…
Apr 6, 2016
47e5145
taskserver: integrate pki scripts
makefu Apr 6, 2016
61929cf
Merge pull request #14503 from obadz/haskell-dnssd
peti Apr 6, 2016
5330244
Merge commit 'refs/pull/14242/head' of git://github.com/NixOS/nixpkgs
abbradar Apr 7, 2016
1f79dc2
Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgs
abbradar Apr 7, 2016
d8f9997
hackage-packages.nix: update Haskell package set
peti Apr 4, 2016
e6e5d98
configuration-hackage2nix.yaml: update list of broken packages
peti Apr 6, 2016
2daf67b
haskell-pipes-transduce: fix build
mdorman Apr 5, 2016
bec10ed
haskell-present: remove obsolete patch
mdorman Mar 11, 2016
3110ba4
cabal2nix: update to version 20160406
peti Apr 6, 2016
7f976c7
haskell-fail: fix build with ghc-8.0.x
peti Apr 6, 2016
7694bb1
haskell-comonad: fix build with ghc-8.0.x
peti Apr 6, 2016
07f26f3
configuration-ghc-8.0.x.nix: clean up overrides
peti Apr 6, 2016
c0a5872
configuration-common.nix: fix syntax error (and cosmetic)
peti Apr 7, 2016
961d1e8
linux: kernel config for extended BPF support
ragnard Apr 6, 2016
551296a
mendeley: 1.16 -> 1.16.1
FRidh Apr 7, 2016
4907fc9
Merge pull request #14509 from ragnard/bpf-tracing-kernel-config
edolstra Apr 7, 2016
136c35b
exim: 4.86.2 -> 4.87
4z3 Apr 7, 2016
e1bcc27
Making trac/ldap handle httpd 2.4.
viric Apr 7, 2016
28c8f37
rethinkdb: 2.2.4 -> 2.3.0
kragniz Apr 7, 2016
2be0505
pythonPackages.cgkit: Add maintenance information
expipiplus1 Apr 7, 2016
5f02808
Revert "kernelHeaders: fix build with libmpc"
domenkozar Apr 7, 2016
1d421f4
Merge pull request #14511 from 4z3/bump-exim
jagajaga Apr 7, 2016
679dc0e
putty: 0.66 -> 0.67
georgewhewell Apr 7, 2016
009a9ce
snabbswitch: 2015.12 -> 2016.04, rename to snabb
domenkozar Apr 7, 2016
0d8b694
oh-my-zsh: 2016-03-31 -> 2016-04-06
Apr 7, 2016
d1df28f
Merge 'staging' into closure-size
vcunat Apr 7, 2016
4ac323d
kde5: enable libmtp udev rules
ttuegel Apr 7, 2016
5b27ed4
Merge pull request #14515 from NeQuissimus/ohmyzsh20160406
joachifm Apr 7, 2016
a6a7dcd
wego: init at 81d72ff
Apr 7, 2016
c245d14
Merge pull request #14513 from georgewhewell/putty-0.67
joachifm Apr 7, 2016
3342f71
stdenv: set meta.outputsToInstall unless overridden
vcunat Mar 14, 2016
2995439
buildEnv: respect meta.outputsToInstall
vcunat Mar 14, 2016
9a824f2
treewide: rename extraOutputs{ToLink,ToInstall}
vcunat Mar 14, 2016
710573c
Merge #12653: rework default outputs
vcunat Apr 7, 2016
c73191f
nixpkgs manual: add multiple-output chapter
vcunat Apr 3, 2016
133e6e1
httpd.service: Support reload
edolstra Apr 7, 2016
48d8f05
pythonPackages.click: 6.4 -> 6.6
nckx Apr 6, 2016
16b12fb
apt-cacher-ng: disable on OSX
aespinosa Apr 7, 2016
2968a8c
wkhtmltopdf: 0.12.2.4 -> 0.12.3.2
jb55 Apr 7, 2016
b5e4f31
Merge pull request #14519 from aespinosa/disable-acng-on-osx
jagajaga Apr 7, 2016
c3f181f
Merge pull request #14520 from jb55/bump/wkhtmltopdf
wmertens Apr 7, 2016
30e61aa
Merge pull request #14507 from taku0/thunderbird-bin-38.7.2
joachifm Apr 7, 2016
25cc1c1
Merge pull request #14506 from makefu/taskserver-pki
joachifm Apr 7, 2016
2d0e18f
aria2: 1.20.0 -> 1.21.0
micxjo Apr 7, 2016
feca169
zpaq: 7.08 -> 7.09
nckx Apr 7, 2016
26ba010
Merge pull request #14435 from joachifm/libsodium-1_0_9
joachifm Apr 7, 2016
50e16a2
pcl: buildable without GUI components
acowley Apr 7, 2016
9b0890c
graphviz: build with pango even without xorg
acowley Apr 7, 2016
df3a139
Merge pull request #14439 from zimbatm/travis-1.8.2
joachifm Apr 7, 2016
c4bbfdb
steam: add xdg_utils to chrootenv
abbradar Apr 8, 2016
62ef65f
Merge pull request #14523 from micxjo/update-aria2
joachifm Apr 8, 2016
6d2df6d
Merge pull request #14222 from Pleune/fix/iodined-client-mode
joachifm Apr 8, 2016
fdf8e2a
Merge pull request #14126 from mpscholten/factorio
joachifm Apr 8, 2016
0f18769
Merge pull request #14524 from acowley/graphviz
falsifian Apr 8, 2016
0db23cf
Merge pull request #14525 from acowley/pcl
joachifm Apr 8, 2016
f9099de
mercurial: 3.7.1 -> 3.7.3 for multiple CVEs
grahamc Apr 8, 2016
21c7841
qutebrowser: 0.5.1 -> 0.6.0
kragniz Apr 8, 2016
ab58c22
Merge pull request #14528 from kragniz/qutebrowser-0.6.0
gebner Apr 8, 2016
eda6508
optipng: 0.7.5 -> 0.7.6 (CVE-2016-2191)
micxjo Apr 8, 2016
800d088
gambit: 4.7.3 -> 4.8.5
micxjo Apr 8, 2016
b6dc2b3
Merge pull request #14529 from micxjo/update-optipng
joachifm Apr 8, 2016
d48eaa3
Merge pull request #14527 from grahamc/mercurial
edolstra Apr 8, 2016
0f5dff4
doxygen: fix finding libiconv after #13856
vcunat Apr 8, 2016
f1f7950
find-tarballs.nix: Handle stdenv bootstrap fetchurl
edolstra Apr 8, 2016
03e74fb
flashplayer: 11.2.202.577 -> 11.2.202.616
taku0 Apr 8, 2016
af8fd3c
Add nodePackages.tern
NicolasPetton Apr 8, 2016
ab9b693
Merge pull request #14535 from taku0/flashplayer_11.2.202.616
joachifm Apr 8, 2016
e9e5cf9
lxmenu-data: init at 0.1.5
Balletie Apr 8, 2016
36b5fd8
cjdns: 16 -> 17.3
Apr 8, 2016
28232c3
flashplayer: fix build on 32-bit platform
taku0 Apr 8, 2016
77642ec
rustc: fix build with multiple outputs
vcunat Apr 8, 2016
33b1dbb
qt54.qttools: fix build
vcunat Apr 8, 2016
d45ac41
flashplayer: cleanup, add comment to maintainers
abbradar Apr 8, 2016
c7379b3
u9fs service: switch user with systemd
Apr 8, 2016
b685652
texlive: comment on a couple of internal functions
vcunat Apr 8, 2016
46a3a12
sshuttle: 0.77.2 -> 0.78.0
nckx Apr 8, 2016
28f9491
Merge pull request #14531 from micxjo/update-gambit
joachifm Apr 8, 2016
678e195
manual: delete dangling pointer to real-world NixOS configs
joachifm Apr 8, 2016
295df8c
Merge pull request #14537 from Balletie/lxmenu-data
jagajaga Apr 8, 2016
239d38e
Merge pull request #14500 from wedens/rtv_update
jagajaga Apr 8, 2016
89c619f
plex: 0.9.15.6.1714 -> 0.9.16.4.1911
colemickens Apr 8, 2016
bd38653
plexpass: 0.9.16.3.1840 -> 0.9.16.4.1911
colemickens Apr 8, 2016
db9640b
plex module: restart on failure
colemickens Apr 8, 2016
9fa5c5d
blender: 2.77 -> 2.77a
edolstra Apr 8, 2016
bd4720a
cudatoolkit: Don't barf on GCC > 4.9
edolstra Apr 8, 2016
4d87926
minidlna: use hostname in DLNA friendly name
groxxda Apr 8, 2016
72cd570
minidlna: use journalctl for logging, systemd for runtimedir
groxxda Apr 8, 2016
ed791db
minidlna: install manpages
groxxda Apr 8, 2016
b080956
libinput: 1.2.1 -> 1.2.2
groxxda Apr 8, 2016
9722fa0
libinput: propagate udev dependency
groxxda Apr 8, 2016
8fe327a
wraith: init at 1.4.6
elitak Apr 8, 2016
af82b8f
wayland-protocols: init at 1.3
groxxda Apr 8, 2016
7f2d418
wayland: 1.9.0 -> 1.10.0
groxxda Apr 8, 2016
c6a4bc4
weston: 1.9.0 -> 1.10.0
groxxda Apr 8, 2016
a011083
fish: pick up completion files from other packages
Profpatsch Apr 8, 2016
98d9bba
Add DPI option to xserver invocation.
brandonedens Apr 9, 2016
f14bf70
awscli: 1.10.1 -> 1.10.18
pmahoney Apr 9, 2016
569cb20
Merge pull request #14536 from NicolasPetton/ternjs
DamienCassou Apr 9, 2016
7da3bba
Merge pull request #14545 from elitak/wraith
jagajaga Apr 9, 2016
8430db7
lombok: init at 1.16.8
CrystalGamma Apr 7, 2016
dddafe6
Merge pull request #14498 from expipiplus1/python-cgkit
FRidh Apr 9, 2016
50e8994
spotify: 1.0.26.125.g64dc8bc6-14 -> 1.0.27.71.g0a26e3b2-9
sheenobu Apr 9, 2016
d023e15
ffmpeg: enable x265 support
abbradar Apr 9, 2016
cae3491
ffmpeg: install man pages
abbradar Apr 9, 2016
30e17a9
ocamlPackages.cryptokit: 1.9 -> 1.10
vbgl Apr 9, 2016
ab707cf
Merge pull request #14549 from brandonedens/xserver-dpi
nbp Apr 9, 2016
8b18b35
ums 5.4.0 -> 6.2.2
thall Apr 9, 2016
64a16de
Merge pull request #14556 from vbgl/cryptokit-1.10
maggesi Apr 9, 2016
5d15c0f
p7zip: 9.38 -> 15.14.1
mbakke Mar 25, 2016
ddef343
Merge pull request #14518 from CrystalGamma/master
joachifm Apr 9, 2016
079c03a
Merge pull request #14539 from colemickens/update-plex
joachifm Apr 9, 2016
2b5b904
Merge pull request #14554 from sheenobu/bugfix/spotify/upgrade_ssl
joachifm Apr 9, 2016
427fda9
Merge pull request #14551 from pmahoney/awscli
joachifm Apr 9, 2016
26ad6b8
Merge pull request #14555 from thall/ums_6_2_2
zimbatm Apr 9, 2016
ff52ac7
Merge pull request #14191 from mbakke/p7zip-15.14.1
joachifm Apr 9, 2016
85129e6
dumptorrent: init at 1.2
zohl Apr 9, 2016
34732f0
Merge pull request #14552 from zohl/dumptorrent
joachifm Apr 9, 2016
03c6434
Merge pull request #14526 from Profpatsch/fish-completions
dezgeg Apr 9, 2016
2486191
thttpd: 2.26 -> 2.27
fsteinel Mar 8, 2016
1d36e6e
Merge pull request #14382 from aneeshusa/update-ccache-stdenv-documen…
joachifm Apr 9, 2016
73bf336
duc: init at 1.3.3
lucabrunox Apr 9, 2016
2601b32
khard: 0.8.1 -> 0.9.0
DamienCassou Apr 9, 2016
aec8dae
duc: fix meta.license
joachifm Apr 9, 2016
60fa61c
manual multiple-output: clarify a note
vcunat Apr 9, 2016
44af20f
Merge pull request #14560 from DamienCassou/khard-0.9.0
joachifm Apr 9, 2016
870ce8f
Merge pull request #14544 from groxxda/bump/libinput
fpletz Apr 9, 2016
2579128
Merge pull request #14547 from groxxda/bump/wayland
fpletz Apr 9, 2016
b667040
Merge pull request #14543 from groxxda/fix/minidlna
fpletz Apr 9, 2016
fe97489
virt-manager: remove sqlalchemy from (transitive) dependencies
globin Mar 15, 2016
2463e09
virtinst: Fix cherry-pick merge
fpletz Apr 9, 2016
50fccad
Merge branch 'staging' into closure-size
vcunat Apr 10, 2016
30f1424
Merge branch 'master' into closure-size
vcunat Apr 10, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 6 additions & 10 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
## Basic info
## Issue description

To make sure that we are on the same page:

* Kernel: (run `uname -a`)
* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
* Nix version: (run `nix-env --version`)
* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)

## Describe your issue here
### Steps to reproduce

### Expected result

### Actual result

### Steps to reproduce
## Technical details

* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
* Nix version: (run `nix-env --version`)
* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ build daemon as so-called channels. To get channel information via git, add
```

For stability and maximum binary package support, it is recommended to maintain
custom changes on top of one of the channels, e.g. `nixos-15.09` for the latest
custom changes on top of one of the channels, e.g. `nixos-16.03` for the latest
release and `nixos-unstable` for the latest successful build of master:

```
% git remote update channels
% git rebase channels/nixos-15.09
% git rebase channels/nixos-16.03
```

For pull-requests, please rebase onto nixpkgs `master`.
Expand All @@ -33,9 +33,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Nix Wiki](https://nixos.org/wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 15.09 release](https://hydra.nixos.org/jobset/nixos/release-15.09)
* [Continuous package builds for 16.03 release](https://hydra.nixos.org/jobset/nixos/release-16.03)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 15.09 release](https://hydra.nixos.org/job/nixos/release-15.09/tested#tabs-constituents)
* [Tests for 16.03 release](https://hydra.nixos.org/job/nixos/release-16.03/tested#tabs-constituents)

Communication:

Expand Down
39 changes: 22 additions & 17 deletions doc/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,48 @@ date: 2015-11-25

# Introduction

The Nix Packages collection (Nixpkgs) is a set of over 30,000 packages for the
[Nix package manager](http://nixos.org/nix/), released under a [permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
Packages are available for several architectures, and can be used with the Nix package manager
on most GNU/Linux distributions as well as NixOS.

This manual describes how to write packages for the Nix Packages collection
(Nixpkgs). Thus it’s for packagers and developers who want to add packages to
The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the
[Nix package manager](http://nixos.org/nix/), released under a
[permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
Packages are available for several platforms, and can be used with the Nix
package manager on most GNU/Linux distributions as well as NixOS.

This manual primarily describes how to write packages for the Nix Packages collection
(Nixpkgs). Thus it’s mainly for packagers and developers who want to add packages to
Nixpkgs. If you like to learn more about the Nix package manager and the Nix
expression language, then you are kindly referred to the [Nix manual](http://nixos.org/nix/manual/).

## Overview of Nixpkgs

Nix expressions describe how to build packages from source and are collected in
the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
collection are Nix expressions for [NixOS modules](http://nixos.org/nixos/manual/index.html#sec-writing-modules). With
these expressions the Nix package manager can build binary packages.
collection are Nix expressions for
[NixOS modules](http://nixos.org/nixos/manual/index.html#sec-writing-modules).
With these expressions the Nix package manager can build binary packages.

Packages, including the Nix packages collection, are distributed through
[channels](http://nixos.org/nix/manual/#sec-channels). The collection is
distributed for users of Nix on non-NixOS distributions through the channel
`nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g.
`nixos-15.09`, which includes all packages and modules for the stable NixOS
15.09. The channels of the stable NixOS releases are generally only given
`nixos-16.03`, which includes all packages and modules for the stable NixOS
16.03. The purpose of stable NixOS releases are generally only given
security updates. More up to date packages and modules are available via the
`nixos-unstable` channel.

Both `nixos-unstable` and `nixpkgs` follow the `master` branch of the Nixpkgs
repository, although both do lag the `master` branch by generally [a couple of days](http://howoldis.herokuapp.com/). Updates to a channel are distributed as
soon as all tests for that channel pass, e.g. [this table](http://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
repository, although both do lag the `master` branch by generally
[a couple of days](http://howoldis.herokuapp.com/). Updates to a channel are
distributed as soon as all tests for that channel pass, e.g.
[this table](http://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
shows the status of tests for the `nixpkgs` channel.

The tests are conducted by a cluster called [Hydra](http://nixos.org/hydra/),
which also builds binary packages from the Nix expressions in Nixpkgs. As soon
as a channel is updated, the binaries are made available via a [binary cache](https://cache.nixos.org). Until the channel updates, binaries that have
already been built, are available via [Hydra's binary cache](https://hydra.nixos.org).
which also builds binary packages from the Nix expressions in Nixpkgs for
`x86_64-linux`, `i686-linux` and `x86_64-darwin`.
The binaries are made available via a [binary cache](https://cache.nixos.org).

The current Nix expressions of the channels are available in the
[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
which has branches corresponding to the available channels. There is also the
Nixpkgs Monitor which keeps track of updates and security vulnerabilities.
[Nixpkgs Monitor](http://monitor.nixos.org) which keeps track of updates
and security vulnerabilities.
1 change: 1 addition & 0 deletions doc/manual.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<xi:include href="introduction.xml" />
<xi:include href="quick-start.xml" />
<xi:include href="stdenv.xml" />
<xi:include href="multiple-output.xml" />
<xi:include href="configuration.xml" />
<xi:include href="functions.xml" />
<xi:include href="meta.xml" />
Expand Down
91 changes: 91 additions & 0 deletions doc/multiple-output.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE chapter [
<!ENTITY ndash "&#x2013;"> <!-- @vcunat likes to use this one ;-) -->
]>
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-multiple-output">

<title>Multiple-output packages</title>

<section><title>Introduction</title>
<para>The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs.</para>
<para>The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.</para>
<note><para>The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.</para></note>
</section>

<section><title>Installing a split package</title>
<para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para>
<warning><para>Currently <command>nix-env</command> almost always installs all outputs until https://github.com/NixOS/nix/pull/815 gets merged.</para></warning>
<itemizedlist>
<listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The <varname>outputs</varname> attribute contains a list of output names.</para></listitem>
<listitem><para>You can let it use the default outputs. These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para>
<para>TODO: more about tweaking the attribute, etc.</para></listitem>
<listitem><para>NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options.</para>
<note><para>At this moment there is no similar configurability for packages installed by <command>nix-env</command>. You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way.</para></note>
</listitem>
</itemizedlist>
</section>

<section><title>Using a split package</title>
<para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para>
<para>When a multiple-output derivation gets into a build input of another derivation, the first output is added (<varname>.dev</varname> by convention) and also <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname>. (See <xref linkend="multiple-output-file-type-groups" />.)</para>
</section>


<section><title>Writing a split derivation</title>
<para>Here you find how to write a derivation that produces multiple outputs.</para>
<para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para>
<programlisting>outputs = [ "dev" "out" "bin" "doc" ];</programlisting>
<para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should usually be <varname>dev</varname>; typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>

<note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note>

<section xml:id="multiple-output-file-type-groups">
<title>File type groups</title>
<para>The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed &ndash; a default output name is defined, falling back to other possibilities if the output isn't defined.</para>
<variablelist>
<varlistentry><term><varname>
$outputDev</varname></term><listitem><para>
is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to <varname>dev</varname> or <varname>out</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputBin</varname></term><listitem><para>
is meant for user-facing binaries, typically residing in bin/. They go to <varname>bin</varname> or <varname>out</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputLib</varname></term><listitem><para>
is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>. They go to <varname>lib</varname> or <varname>out</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputDoc</varname></term><listitem><para>
is for user documentation, typically residing in <filename>share/doc/</filename>. It goes to <varname>doc</varname> or <varname>out</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputDocdev</varname></term><listitem><para>
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and man3 pages in there. It goes to <varname>docdev</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputMan</varname></term><listitem><para>
is for man pages (except for section 3). They go to <varname>man</varname> or <varname>doc</varname> or <varname>$outputBin</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputInfo</varname></term><listitem><para>
is for info pages. They go to <varname>info</varname> or <varname>doc</varname> or <varname>$outputMan</varname> by default.
</para></listitem></varlistentry>
</variablelist>
</section>

<section><title>Common caveats</title>
<itemizedlist>
<listitem><para>Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You can disable this by setting <literal>setOutputFlags = false;</literal>.</para></listitem>
<listitem><para>The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.)</para></listitem>
<listitem><para>Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier.</para></listitem>
<listitem><para>Some packages have hidden assumptions on install paths, which complicates splitting.</para></listitem>
</itemizedlist>
</section>

</section><!--Writing a split derivation-->

</chapter>

2 changes: 1 addition & 1 deletion doc/stdenv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ following:
phase.</para></listitem>
</varlistentry>

<varlistentry>
<varlistentry xml:id="stdenv-separateDebugInfo">
<term><varname>separateDebugInfo</varname></term>
<listitem><para>If set to <literal>true</literal>, the standard
environment will enable debug information in C/C++ builds. After
Expand Down
2 changes: 1 addition & 1 deletion lib/customisation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ rec {
};

outputsList = map outputToAttrListElement outputs;
in commonAttrs.${drv.outputName};
in commonAttrs // { outputUnspecified = true; };


/* Strip a derivation of all non-essential attributes, returning
Expand Down
3 changes: 3 additions & 0 deletions lib/maintainers.nix
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
coroa = "Jonas Hörsch <jonas@chaoflow.net>";
couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
DamienCassou = "Damien Cassou <damien@cassou.me>";
Expand Down Expand Up @@ -117,6 +118,7 @@
ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
exi = "Reno Reckling <nixos@reckling.org>";
exlevan = "Alexey Levan <exlevan@gmail.com>";
expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
falsifian = "James Cook <james.cook@utoronto.ca>";
flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
Expand Down Expand Up @@ -186,6 +188,7 @@
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
lassulus = "Lassulus <lassulus@gmail.com>";
layus = "Guillaume Maudoux <layus.on@gmail.com>";
ldesgoui = "Lucas Desgouilles <ldesgoui@gmail.com>";
lebastr = "Alexander Lebedev <lebastr@gmail.com>";
leenaars = "Michiel Leenaars <ml.software@leenaa.rs>";
leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
Expand Down
6 changes: 4 additions & 2 deletions lib/strings.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ rec {
makeLibraryPath [ pkgs.openssl pkgs.zlib ]
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib"
*/
makeLibraryPath = makeSearchPath "lib";
makeLibraryPath = pkgs: makeSearchPath "lib"
# try to guess the right output of each pkg
(map (pkg: pkg.lib or (pkg.out or pkg)) pkgs);

/* Construct a binary search path (such as $PATH) containing the
binaries for a set of packages.
Expand Down Expand Up @@ -258,7 +260,7 @@ rec {
/* Cut a string with a separator and produces a list of strings which
were separated by this separator.

NOTE: this function is not performant and should be avoided
NOTE: this function is not performant and should never be used.

Example:
splitString "." "foo.bar.baz"
Expand Down
4 changes: 2 additions & 2 deletions maintainers/scripts/find-tarballs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ let
operator = const [ ];
});

urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies;
urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies;

fetchurlDependencies =
filter
(drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat"
&& drv.postFetch or "" == "" && drv ? urls)
&& drv.postFetch or "" == "" && (drv ? url || drv ? urls))
dependencies;

dependencies = map (x: x.value) (genericClosure {
Expand Down
2 changes: 1 addition & 1 deletion nixos/doc/manual/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ let
echo "for hints about the offending path)."
exit 1
fi
${libxslt}/bin/xsltproc \
${libxslt.bin}/bin/xsltproc \
--stringparam revision '${revision}' \
-o $out ${./options-to-docbook.xsl} $optionsXML
'';
Expand Down
Loading