Commit graph

12091 commits

Author SHA1 Message Date
mimadrid fa33bbc01b
parallel: 20170122 -> 20170422 2017-05-07 22:45:42 +02:00
Joachim F 2b922a8d0d Merge pull request #25532 from volth/pngquant-2.9.1
pngquant: 2.6.0 -> 2.9.1
2017-05-07 19:02:15 +01:00
volth 27e8a7945b reaver: database on readwrite medium (#25321) 2017-05-07 19:01:36 +01: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
Jörg Thalheim 63b294eb0c
tigervnc: 1.8.0pre20170211 -> 1.8.0pre20170419 2017-05-07 09:38:42 +01:00
gnidorah 42cad8b6b0
winusb: init at 2017-01-30
fixes #25536
2017-05-07 08:26:22 +01:00
Frederik Rietdijk e75096142c pythonPackages.llfuse-0-41: move into attic
because that's the only expression using this older version.
2017-05-07 08:50:14 +02:00
Joachim Fasting 22cffa0716
socklog: init at 2.1.0 2017-05-06 19:41:49 +02:00
Joachim F 3c320fe7b1 Merge pull request #19898 from bzizou/irods4.2
irods: init at 4.2.0
2017-05-06 18:19:04 +01:00
Joachim F 1035af4789 Merge pull request #25545 from calvertvl/update-pass-1.7.1
pass: 1.7 -> 1.7.1
2017-05-06 17:36:18 +01:00
Tristan Helmich 450a0571cd graylog: 2.2.2 -> 2.2.3 2017-05-06 16:10:04 +02:00
Pascal Wittmann c15a17eb84 Merge pull request #25457 from jb55/mb2md
mb2md: init at 3.20
2017-05-05 22:16:16 +02:00
Victor Calvert 9bc0b12c68 pass: 1.7 -> 1.7.1 2017-05-05 16:09:03 -04:00
Frederik Rietdijk f6dd52cd69 pythonPackage.Pyro: use upstream name 2017-05-05 21:13:26 +02:00
William Casarin 8d03054f77 mb2md: init at 3.20 2017-05-05 08:52:06 -07:00
Volth 76b5d53067 pngquant: 2.6.0 -> 2.9.1 2017-05-05 10:54:21 +00:00
Joachim F 7c283b44c9 Merge pull request #25446 from romildo/new.connman-gtk
connman-gtk: init at 1.1.1
2017-05-05 00:21:37 +01:00
Eelco Dolstra d53540dd32
nixUnstable: 1.12pre5308_2f21d522 -> 1.12pre5344_eba840c8 2017-05-04 20:45:20 +02:00
Rob Vermaas a9f054c834
dd-agent: Add default config files of dd-agent and auto_conf dir
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.

Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d

In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.

This change implements similar functionality as PR #25288, without
breaking backwards compatibility.

(cherry picked from commit 77c85b0ecbc1070d7adff31b339bede92e4193fa)
2017-05-04 09:47:21 +00: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
Pascal Wittmann c5a5ac1ef7 Merge pull request #25471 from aneeshusa/update-mosh-to-1.3.0
mosh: 1.2.6 -> 1.3.0
2017-05-03 07:33:44 +02:00
Aneesh Agrawal bc4e30a12b mosh: 1.2.6 -> 1.3.0
Release announcement is available at
http://mailman.mit.edu/pipermail/mosh-users/2017-March/000341.html.
2017-05-02 19:39:25 -04:00
Aneesh Agrawal ded7953478 treewide: meta.platform -> meta.platforms 2017-05-02 19:32:02 -04:00
Matthew Bauer 1234825656 xsv: fix "has invalid meta attribute"
Without this there's an eval error, when running nix-env -f '<nixpkgs>'
--query --available --json.

  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘override’
  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘overrideDerivation’

[Bjørn: extend commit message.]
2017-05-02 21:04:34 +02:00
Ioannis Koutras cc4e2505e4 efivar: 31 -> 30
According to the release page, version 31 of efivar is still considered
as a pre-release and the sha256sum has changed at least once. This commit
switches to the last, stable release.
2017-05-02 20:56:36 +02:00
Matthew Bauer aac48708c1 jing-trang: supports all unix
This is needed to build the manual on macOS.
2017-05-02 20:52:19 +02:00
romildo 0de51ef70e connman-gtk: init at 1.1.1 2017-05-02 14:13:31 -03:00
Pascal Wittmann cac205c252 Merge pull request #25436 from romildo/upd.cmst
cmst: 2016.10.03 -> 2017.03.18
2017-05-02 15:00:04 +02:00
Vladimír Čunát d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
2017-05-02 14:00:45 +02:00
romildo ed76d724d3 cmst: 2016.10.03 -> 2017.03.18 2017-05-02 08:50:55 -03:00
Pascal Wittmann de48ca0466 Merge pull request #25425 from romildo/upd.connman
connman: 1.33 -> 1.34
2017-05-02 12:21:22 +02:00
Peter Hoeg d4dbef90f3 rockboxutility: do not pull in espeak by default 2017-05-02 15:52:10 +08:00
Peter Hoeg 13bca4ba2d rockboxutility: fix linking to Qt libs 2017-05-02 14:34:52 +08:00
romildo ac8698b7d1 connman: 1.33 -> 1.34 2017-05-01 23:35:18 -03:00
Michael Raskin a5f436814a Merge pull request #21017 from AndersonTorres/rst2html5
rst2html5: init at 1.9.3
2017-05-01 23:58:28 +02:00
AndersonTorres 4a87eae13c rst2html5: put its expression in a separate file
As recommended by @7c6f434c and @FRidh, rst2html5 now resides
in its proper file.
2017-05-01 18:12:36 -03:00
Michael Raskin 208fa65256 Merge pull request #23080 from nixy/init/linode-cli
linode-cli: init at 1.4.7
2017-05-01 19:27:30 +02:00
Michael Raskin ee790bf944 Merge pull request #23321 from jensbin/networkmanager_dmenu
networkmanager_dmenu: init at unstable-2017-04-13
2017-05-01 19:25:44 +02:00
Jens Binkert 4c6d267ae8 networkmanager_dmenu: init at unstable-2017-04-13 2017-05-01 19:06:23 +02:00
Jens Grunert 87a450e466 Adding networkmanager_dmenu 2017-05-01 19:00:33 +02:00
Andrew R. M 61668b036a linode-cli: init at 1.4.7 2017-05-01 12:58:54 -04:00
Michael Raskin 008bd11363 Merge pull request #25237 from ericsagnes/pkg-update/fcitx-related
fcitx-engines.mozc: 2.17.2313.102.1 -> 2.18.2612.102.1 and other minor fcitx packages updates
2017-05-01 18:58:53 +02:00
Vladimír Čunát 92ee3b02e8
Merge branch 'staging'
Master is seeing a very large rebuild now, and this version of staging
seemed rather fine already (only a few thousand builds remaining now).
I really didn't want to wait a few more days because of this.
2017-05-01 18:00:21 +02:00
Michael Raskin 8a4bb1beb6 Merge pull request #25130 from jeaye/simp_le-0.2.0
simp_le: 0.1.1 -> 0.2.0
2017-05-01 14:40:08 +02:00
Michael Raskin 5ef193446e Merge pull request #24997 from romildo/upd.efibootmgr
efibootmgr: 13 -> 15
2017-05-01 13:22:28 +02:00
Pascal Wittmann c133bf6a79
nzbget: 18.0 -> 18.1 2017-05-01 12:03:41 +02:00
Michael Raskin 4d2f7b63e0 Merge pull request #24803 from pajowu/master
browserpass: init at 1.0.2
2017-05-01 11:27:17 +02:00
Michael Raskin 1a380c094f Remove empty longDescription 2017-05-01 11:27:03 +02:00
Cray Elliott c5fbf35be0 xpra: fix missed ffmpeg_3_2 reference 2017-04-30 16:58:33 -07:00
Cray Elliott c49a454210 mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2
effectively updates them to depend on ffmpeg_3_3
2017-04-30 16:52:49 -07:00
José Romildo Malaquias 2b140a795c offlineimap: 7.0.13 -> 7.1.0 (#25342) 2017-05-01 00:06:48 +02:00
Daiderd Jordan ed8fbe3dae Merge pull request #25358 from sigma/pr/fzf-0.16.7
fzf: 0.16.6 -> 0.16.7
2017-04-30 23:21:54 +02:00
Benno Fünfstück 17a8227c3c Merge pull request #25360 from sigma/pr/pt-2.1.5
the_platinum_searcher: 2.1.3 -> 2.1.5
2017-04-30 23:04:11 +02:00
Yann Hodique 5c9986e406 the_platinum_searcher: 2.1.3 -> 2.1.5 2017-04-30 12:51:58 -07:00
Michael Raskin d5ec7bc748 Merge pull request #23697 from sargon/master
sshguard + service: init at 2.0.0
2017-04-30 21:43:12 +02:00
Yann Hodique 078b7c9f16 fzf: 0.16.6 -> 0.16.7 2017-04-30 11:38:58 -07:00
Michael Raskin eedc0f0a78 Merge pull request #23333 from romildo/upd.qt5ct
qt5ct: 0.24 -> 0.30
2017-04-30 19:42:31 +02: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
Michael Raskin b3d1050cf2 Merge pull request #22438 from rnhmjoj/masscan
masscan: init at 2016-11-03
2017-04-30 18:40:58 +02:00
Vladimír Čunát 9860e77f79
Merge branch 'master' into staging 2017-04-30 14:40:39 +02:00
obadz f5939cde52 Merge pull request #25341 from womfoo/bump/facter-3.6.4
facter: 3.6.0 -> 3.6.4 and related deps
2017-04-30 12:47:20 +01:00
Kranium Gikos Mendoza 673ac9506b facter: 3.6.0 -> 3.6.4 2017-04-30 21:13:26 +10: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
Joachim F f15dae36fe Merge pull request #25295 from mguentner/youtubedl_170428
youtube-dl: 2017.04.17 -> 2017.04.28
2017-04-29 22:06:50 +01:00
Jörg Thalheim fddeacfe4c Merge pull request #25316 from ericsagnes/pkg-update/ibus-mozc
ibus-engines.mozc:  2.17.2313.102 -> 2.20.2673.102
2017-04-29 11:14:00 +02:00
Jaka Hudoklin 85d16bd7af Merge pull request #25312 from calvertvl/update-xpra-2_0_2
xpra: 2.0.1 -> 2.0.2
2017-04-29 10:33:32 +02:00
Eric Sagnes 54d05a5700 fcitx-engines.mozc: 2.17.2313.102.1 -> 2.18.2612.102.1 2017-04-29 15:34:48 +09:00
Eric Sagnes 424f175546 ibus-engines.mozc: 2.17.2313.102 -> 2.20.2673.102 2017-04-29 15:26:22 +09:00
Dan Peebles 90b9719f4f treewide: fix the remaining issues with meta attributes 2017-04-29 04:24:34 +00:00
Victor Calvert 5539f8acfa xpra: 2.0.1 -> 2.0.2 2017-04-28 23:39:19 -04:00
Maximilian Güntner 76d8811d8a
youtube-dl: 2017.04.17 -> 2017.04.28 2017-04-28 20:06:40 +02:00
Eelco Dolstra e042db5e41
nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522 2017-04-28 17:55:53 +02:00
Joachim Fasting 7301bf8581
tor: 0.2.9.10 -> 0.3.0.6
First stable release in the 0.3 series.

https://blog.torproject.org/blog/tor-0306-released-new-series-stable
2017-04-27 19:26:59 +02:00
Armijn Hemel b85893cb9c acct: 6.6.2 -> 6.6.3 2017-04-27 19:25:49 +02:00
Franz Pletz 286ab2a5ec Merge pull request #24490 from takikawa/add-nfdump
nfdump: init at 1.6.15
2017-04-27 17:13:41 +02:00
Tim Steinbach 68d7c42247 Merge pull request #25024 from NeQuissimus/staging_curl_7_54_0
curl: 7.53.1 -> 7.54.0 (staging)
2017-04-27 08:27:02 -04:00
Peter Hoeg 4639e68fd1 grc: 1.10.1 -> 1.11 2017-04-26 22:45:03 +08:00
Michael Raskin aea9257581 Merge pull request #25206 from matthiasbeyer/update-my-pkgs
Update my pkgs
2017-04-26 11:50:11 +02:00
Matthias Beyer cca20a7114 vdirsyncer: 0.14.1 -> 0.15.0 2017-04-26 09:53:54 +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
Eric Sagnes a08f5c7705 fcitx-qt5: 1.0.5 -> 1.1.0 2017-04-26 15:47:58 +09:00
Eric Sagnes 698d1bdd10 fcitx-configtool: 0.4.8 -> 0.4.9 2017-04-26 15:47:14 +09:00
Shea Levy 5aa936d0ee nix perl-bindings: Fix Config.pm 2017-04-25 20:36:04 -04:00
Asumu Takikawa 6b0736b01d nfdump: init at 1.6.15 2017-04-25 15:00:59 -07:00
Michael Raskin ba974d4b74 Merge pull request #24214 from NickHu/proselint
proselint: disable tests and put in correct scope
2017-04-25 23:18:34 +02:00
Eelco Dolstra e4190943c8
nix: 1.11.8 -> 1.11.9 2017-04-25 17:19:10 +02:00
Armijn Hemel b5530755a5 bc: 1.06 -> 1.07.1 2017-04-25 15:08:36 +03:00
Tuomas Tynkkynen 0537320062 networkmanager: Temporarily disable -Wformat-security until next release
Reportedly this is due to GLib 2.52 which added a G_GNUC_PRINTF attribute to
g_dbus_message_new_method_error().
2017-04-24 20:01:22 +03:00
Tuomas Tynkkynen cf3800b38c Merge remote-tracking branch 'upstream/staging' into master 2017-04-24 19:25:38 +03:00
Domen Kožar 9f11d17ed2
add papertrail at 0.10.1
Thank you @grahamc <3
2017-04-24 17:05:03 +02:00
Tuomas Tynkkynen 84982c28de Merge remote-tracking branch 'upstream/master' into staging 2017-04-24 15:04:43 +03:00
Benno Fünfstück 30a9923f4c Merge pull request #24359 from rnhmjoj/radeon-profile
radeon-profile: init at 20161221
2017-04-24 11:28:34 +02:00
rnhmjoj 9b1b22fcb6
radeon-profile: init at 20161221 2017-04-24 10:52:14 +02:00
Daiderd Jordan 80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors
Add Darwin as platform to various "broken" packages that actually build
2017-04-24 08:14:21 +02:00
Matthew Bauer 02285dcd10
cron: supports darwin 2017-04-23 18:08:42 -05:00
Matthew Bauer 9e92c53b53
flvstreamer: supports darwin 2017-04-23 18:08:41 -05:00
Matthew Bauer fe9b9e7f38
icoutils: already supports darwin 2017-04-23 18:08:38 -05:00
Matthew Bauer bd07af92ec
desktop-file-utils: support darwin 2017-04-23 18:08:37 -05:00
Matthew Bauer 0293d0dbec
lhasa: supports darwin 2017-04-23 18:08:36 -05:00
Matthew Bauer d3084b2798
sourceHighlight: supports darwin 2017-04-23 18:08:35 -05:00
Matthew Bauer 5312c48399
miniupnpc: supports darwin 2017-04-23 18:08:35 -05:00
Vladimír Čunát 5a3e454db3
Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c7.
The problem was fixed by the parent commit.
2017-04-23 20:53:34 +02:00
Tuomas Tynkkynen 814772e93e Revert "patchutils: 0.3.3 -> 0.3.4"
This reverts commit d550c90712.

This changes the output of filterpatch thus affects hashes of any
fetchpatch calls in nixpkgs:

https://github.com/NixOS/nixpkgs/issues/25154
2017-04-23 21:46:35 +03:00
Tuomas Tynkkynen f3b1d6925e Revert "patchutils: Drop patch applied upstream"
This reverts commit 1e1b68b4a0.
2017-04-23 21:46:29 +03:00
Nikolay Amiantov 5565728670 system-config-printer: 1.5.7 -> 1.5.9
Use gappsWrapHook.
2017-04-23 17:08:56 +03:00
Benno Fünfstück c3e830f1a6 Merge pull request #25134 from MP2E/ripgrep_update
ripgrep: 0.5.0 -> 0.5.1
2017-04-23 13:59:27 +02:00
Frederik Rietdijk 4fc9b1852a Merge remote-tracking branch 'upstream/master' into HEAD 2017-04-23 11:26:47 +02:00
Joachim Fasting 5a04a30653
runit: replace hardcoded /sbin/runit with in-store runit binary
runit-init calls the runit executable as /sbin/runit, which
obviously fails for us.

This should improve support for using runit as an init replacement.
2017-04-23 11:00:55 +02:00
Joachim Fasting 160b9ab43f
runit: explain what static actually does 2017-04-23 11:00:53 +02:00
Rok Garbas 0feca1abb6 Merge pull request #25135 from garbas/update-asciinema
Update asciinema
2017-04-23 04:33:27 +02:00
Rok Garbas 93cacf61a8
asciinema: 1.3.0 -> 1.4.0 2017-04-23 04:18:11 +02:00
Cray Elliott df86c9731b ripgrep: 0.5.0 -> 0.5.1 2017-04-22 19:03:09 -07:00
jeaye ae878851f2
simp_le: 0.1.1 -> 0.2.0
The release is here:
https://github.com/zenhack/simp_le/releases/tag/0.2.0

This is needed, since the existing package is broken. See this
https://github.com/kuba/simp_le/issues/120 for reference.
2017-04-22 17:46:35 -07:00
Vladimír Čunát b72d4e13c7
kdiff3: fixup patch hash after #25059
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
2017-04-22 16:37:48 +02:00
pajowu b4caf7a11e browserpass: add support for firefox 2017-04-22 15:13:02 +02:00
Edward Tjörnhammar da2518fe25
i2pd: 0.12.0 -> 0.13.0 2017-04-22 09:43:24 +02:00
Benno Fünfstück cfcceaee27 Merge pull request #24473 from jgertm/tj/xsv
xsv: init at 0.11.0
2017-04-22 00:26:10 +02:00
Eelco Dolstra d387a1f0ae youtube-dl: 2017.04.02 -> 2017.04.17 2017-04-21 23:32:37 +02:00
obadz c4fecfb1ec ecryptfs-helper: fix makeWrapper use after 7ff6eec5 2017-04-21 21:25:30 +01:00
Philipp Hausmann 27e05f98fc cloud-init: Fix growpart support 2017-04-21 12:48:02 +02:00
Philipp Hausmann 5083a75a92 cloud-init: Use prePatch instead of patchPhase hack. 2017-04-21 11:11:24 +02:00
Tomas Hlavaty 6878d0661b stunnel: 5.39 -> 5.41 2017-04-20 23:37:24 +02:00
Vincent Laporte a76841e399 asymptote: 2.40 -> 2.41 2017-04-20 19:56:14 +00:00
Philipp Hausmann a03ff825b3 Revert "Remove spurious call to patchPhase."
This reverts commit 9a12461586.
2017-04-20 19:12:08 +02:00
Michael Raskin 38933324a6 Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool
kdiff3: fix with git mergetool
2017-04-20 16:55:15 +02:00
Vladimír Čunát be7ce1b0e9
kdiff3: fix with git mergetool
The quick patch has been submitted upstream.
2017-04-20 14:48:40 +02:00
Jörg Thalheim b7984d3077 Merge pull request #25053 from Mesh33/buildtorrent-0.8
buildtorrent: init at 0.8
2017-04-20 13:08:53 +02:00
Jörg Thalheim 67adf69a16
inetutils: fix service name 2017-04-20 10:33:42 +02:00
Michael Raskin 1aadcd712d Merge pull request #25042 from Mesh33/update-units
units: 2.13 -> 2.14
2017-04-20 08:34:37 +02:00
Jörg Thalheim 080c799f38
jwhois: fix service name
after an update of iana-etc the service name of whois changed
2017-04-20 07:33:38 +02:00
Unknown 2f66670162 buildtorrent: init at 0.8 2017-04-20 03:42:49 +02:00
Mesh33 1675d54db3 units: 2.13 -> 2.14 2017-04-20 00:09:54 +02:00
Tim Steinbach 55e334e62a
curl: 7.53.1 -> 7.54.0 2017-04-19 11:31:09 -04:00
Benno Fünfstück bc09640d91 Merge pull request #24977 from dsprenkels/master
mpDris2: 0.6 -> 0.7
2017-04-18 22:29:06 +02:00
armijnhemel a8c8d5a588 upx: 3.91 -> 3.93
* moved from sourceforge to github
2017-04-18 21:49:54 +02:00
romildo 86b853e275 efibootmgr: 13 -> 15
- Update to efibootmgr 15
- Add dependency on pkgconfig (listed as required in INSTALL)
- Remove dependency on perl, pciutils and zlib
- Set EFIDIR to 'nixos' (the same used in fwupdate)
- Update homepage
2017-04-18 12:26:55 -03:00
Daan Sprenkels 0479e68db9 mpDris2: 0.6 -> 0.7 2017-04-18 14:38:24 +02:00
Frederik Rietdijk e0abe74baf Merge remote-tracking branch 'upstream/master' into HEAD 2017-04-18 11:25:43 +02:00
John Ericson 37e5e71fdf Merge pull request #24974 from Ericson2314/mapNullable
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
John Ericson 85aa5005af Introduce mapNullable into lib and use it in a few places
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Chris Hodapp 228f33b21d osm2pgsql: init at 0.92.1-unstable 2017-04-17 16:19:41 -04: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
Joachim Fasting c2130eca44
logcheck: point homepage to alioth.debian.org
The page at logcheck dot org contains questionable links and it is unclear
whether it is controlled by the logcheck project at all.  Fix by using the
homepage debian points to instead.

Fixes https://github.com/NixOS/nixpkgs/issues/24952
2017-04-16 20:52:14 +02:00
Jörg Thalheim 769de5629c Merge pull request #24932 from jb55/add/cargo-edit
cargo-edit: init at 0.1.6
2017-04-16 20:51:44 +02: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
Joachim F 901a0bb9fa Merge pull request #24908 from adamruzicka/cjdns-v19.1
cjdns: 18 -> 19.1
2017-04-16 12:10:59 +01:00