Commit graph

197 commits

Author SHA1 Message Date
Frederik Rietdijk 9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00
R. RyanTM 7ff3ccfa74 google-compute-engine: 20181023 -> 20181206 (#52894)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/google-compute-engine/versions
2019-01-04 16:25:54 +01:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Joachim F 7db540633f
Merge pull request #52605 from Scriptkiddi/amazon-ecs-cli
amazon-ecs-cli: init at 1.12.1
2019-01-02 18:18:12 +00:00
Fritz Otlinghaus 8cb8b2be91 amazon-ecs-cli: init at 1.12.1 2018-12-28 08:32:40 +08:00
Jan Tojnar ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Florian Klink fb41136208 google-compute-engine-oslogin: init at 1.4.3 2018-12-21 17:52:37 +01:00
volth fed7914539
Merge branch 'staging' into make-perl-pathd 2018-12-18 17:13:27 +00:00
volth bb9557eb7c lib.makePerlPath -> perlPackages.makePerlPath 2018-12-15 03:50:31 +00:00
Meghea Iulian efe8be7fd4 distrobuilder: 2018_06_29 -> 2018_10_04 2018-12-09 18:38:23 +02:00
Ding Xiang Fei f4414da64a use interactive bash for gce 2018-12-05 09:47:01 +08:00
Frederik Rietdijk c31cb577ae Merge master into staging-next 2018-11-22 09:57:08 +01:00
Matthieu Coudron 35f74c3608 mininet: init at 2.3.0d4 (#41261)
Mininet (https://github.com/mininet/mininet) is a popular network emulator that
glues several components such as network namespaces, traffic control
commands into a set of python bindings. It is then "easy" to describe a
topology and run experiments on it.
2018-11-21 23:33:10 +00:00
Frederik Rietdijk aabf1a93bc Merge staging-next into staging 2018-11-20 11:51:11 +01:00
R. RyanTM 9434dc3dfb google-compute-engine: 20181011 -> 20181023 (#50751)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/google-compute-engine/versions
2018-11-19 18:19:15 +01:00
Frederik Rietdijk 1d3bff25db Merge staging-next into staging 2018-11-11 14:28:08 +01:00
R. RyanTM c5f42c7d35 google-compute-engine: 20180905 -> 20181011
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/google-compute-engine/versions
2018-11-09 19:03:58 -08:00
Patrick Hilhorst 9ec40cc3bf
treewide: Fix overrides having wrong versions 2018-11-06 00:06:21 +01:00
volth f65dfb3caf buildPerlPackage -> perlPackages.buildPerlPackage 2018-10-14 09:10:41 +02:00
zimbatm 9fb79868ab google-compute-engine: 20180510 -> 20180905
The list of corresponding NixOS services are also updated
2018-09-26 11:48:16 +02:00
Maximilian Bosch baa7e52fe0 python3Packages.google-compute-engine: fix build (#47267)
The dependency `distro` was missing.
See https://hydra.nixos.org/build/81330387

Addresses #45960
2018-09-24 15:50:52 +02:00
R. RyanTM 035b2f5250 google-compute-engine: 20180129 -> 20180510 (#46278)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
google-compute-engine
2018-09-13 20:09:08 +01:00
Markus Kowalewski 4f0010dbec
euca2ools: update homepage 2018-09-07 23:51:50 +02:00
Robert Schütz dbd3d509e0 awsebcli: use python3
Its dependency cement is disabled on python2 since 36a4df6.
2018-09-01 10:41:37 +02:00
Markus Kowalewski 5c395d5095
cri-tools: add license 2018-08-15 21:55:04 +02:00
volth cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Meghea Iulian 66e18c3aab distrobuilder: 2018_04_28 -> 2018_06_29 (#42810) 2018-06-30 18:46:00 +02:00
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Ryan Mulligan 0d5eb901ad treewide: http -> https 2018-06-23 04:34:55 -07:00
Ryan Mulligan af9d10a91b treewide: fix derivation names 2018-05-28 05:59:57 -07:00
Unknown 37af5704f9 distrobuilder: init at HEAD
Implement feedback
2018-05-12 21:14:10 +03:00
Peter Hoeg 236a9189e3
Merge pull request #39717 from peterhoeg/f/container
nixos-container: support restarts
2018-05-02 07:33:42 +00:00
Ruben Maher e8dcf87007 awsebcli: 3.12.3 -> 3.12.4 2018-04-27 10:29:19 +09:30
Ruben Maher ffe9f0a2bb awsebcli: pin pathspec dependency to 0.5.5
pathspec has been bumped to 0.5.6 in c705acef and awsebcli's setup.py refuses to
use that version.
2018-04-27 10:29:19 +09:30
Ryan Mulligan d32983a1ca google-compute-engine: 20170914 -> 20180129 (#36565)
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -V` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -v` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --version` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue version` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -h` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --help` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue help` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_accounts_daemon-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_accounts_daemon-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_accounts_daemon -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_accounts_daemon --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_instance_setup-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_instance_setup-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_instance_setup -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_instance_setup --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_network_setup-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_network_setup-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_network_setup -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_network_setup --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_metadata_script_runner-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_metadata_script_runner-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_metadata_script_runner -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_metadata_script_runner --help` got 0 exit code
- found 20180129 with grep in /nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129
- found 20180129 in filename of file in /nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129

only build on Linux
2018-04-23 22:03:19 +01:00
Peter Hoeg b95a24fdf1 nixos-container: support restarts 2018-04-20 11:07:07 +08:00
Franz Pletz 5461e72cc9
Merge pull request #32992 from nh2/fix-32545-blocking-container-destroy
nixos-container: Fix `destroy` terminating before it's done. Fixes #32545
2018-03-12 21:27:50 +00:00
Ruben Maher 411b7869d2 awsebcli: clean up derivation 2018-02-28 10:10:05 +10:30
Ruben Maher e5a64bd1f1 awsebcli: 3.12.2 -> 3.12.3 2018-02-22 15:04:58 +10:30
Nick Novitski 8c7af333df govc: init at 0.16.0 2018-02-16 11:59:07 -08:00
Ruben Maher 84f30286d2 awsebcli: 3.12.1 -> 3.12.2 2018-02-08 09:37:12 +10:30
Bruno Bzeznik b2cf8cff7d udocker: init at 1.1.1 2018-02-02 13:59:59 +01:00
Shea Levy f607771d0f
Add cri-tools 2018-01-09 11:18:25 -05:00
Samuel Dionne-Riel 7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Niklas Hambüchen 5d83988c1e nixos-container: Fix destroy terminating before it's done. Fixes #32545.
This also fixes the race condition found in #32551.

And it fixes nixops's repeated destroy/deploy being broken
(https://github.com/NixOS/nixops/issues/809).
2017-12-29 16:26:18 +01:00
Orivej Desh 3701531dbd google-compute-engine: fix build by disable check phase
after it was activated by #32244
2017-12-21 18:36:20 +00:00
pe@pijul.org 85c70266ea Fixing tests for Google Compute Engine 2017-12-21 18:49:26 +01:00
Ruben Maher 757725e071 awsebcli: 3.12.0 -> 3.12.1 2017-12-15 08:43:11 +10:30
Orivej Desh 8dd33e803e cloud-init: disable check after #32244 2017-12-11 11:04:06 +00:00
Martin Bornhold ac7edeebfd nixos-container: Make show-ip work together with ipv4 + netmask
The containers local address can be given as ipv4 only or with a subnetmask in
CIDR notation in the container configuration, see [1]. This works fine but the
'nixos-container show-ip' only supports plain ipv4 addresses without the netmask
suffix.

Changed the regex to also match in case of a CIDR netmask suffix.

[1] 9939032e35/nixos/modules/virtualisation/containers.nix (L382)
2017-11-16 20:25:45 +01:00
Ruben Maher 47c000b894 awsebcli: 3.11.0 -> 3.12.0 2017-11-03 09:38:16 +10:30
Ruben Maher fcf0df2cf6 awsebcli: tiny whitespace fix 2017-11-03 09:38:16 +10:30
Ruben Maher 054baf2cbe awsebcli: unbreak after cement update
awsebcli requests that the cement package be exactly at version 2.8.2 and won't
build without it.
2017-11-03 09:38:15 +10:30
Ruben Maher b686f934c5 awsebcli: 3.10.5 -> 3.11.0 2017-10-13 09:44:25 +10:30
Nikolay Amiantov 8d53efb19c google-compute-engine: 20170523 -> 20170914 2017-09-25 22:46:44 +03:00
Ruben Maher b1c4498b41 awsebcli: init at 3.10.5 2017-09-23 08:23:43 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
zimbatm 812346c9c9 google-compute-engine: init at 20170523 2017-07-15 18:00:55 +01:00
Antoine Eiche a4b8c214be cloud-init: remove argparse from requirements.txt
Argparse is part of python stdlib.
2017-06-05 21:44:05 +02:00
Kranium Gikos Mendoza 4126cc18be cloudmonkey: init at 5.3.3 2017-05-30 06:37:19 +10:00
Frederik Rietdijk a2598e4ca1 Merge pull request #23024 from phile314/cloud-init-update
cloud-init: 0.7.6 -> 0.7.9 + module improvements
2017-05-22 16:33:31 +02:00
Andrew R. M 61668b036a linode-cli: init at 1.4.7 2017-05-01 12:58:54 -04: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
Philipp Hausmann a03ff825b3 Revert "Remove spurious call to patchPhase."
This reverts commit 9a12461586.
2017-04-20 19:12:08 +02:00
Philipp Hausmann 9a12461586 Remove spurious call to patchPhase. 2017-04-11 11:03:34 +02:00
Robin Gloster 91e74ed3b2
nixos-container: check for correct path for chattr
Could fail on destroy if the container wasn't created correctly
2017-03-22 15:15:42 +01:00
Robin Gloster 3ac02dfc40
nixos-container: allow _ in container name
fixes #15089
2017-03-22 15:15:41 +01:00
Robin Gloster 9b9416cca4
nixos-container: don't use host's $NIXOS_CONFIG
fixes #22948
2017-03-22 15:15:41 +01:00
Eelco Dolstra cb49c14324
Revert "nixos-container: Use machinectl shell (#18825)"
This reverts commit
c37e76b4d2. Unfortunately, using
"machinectl shell" has two bad side effects:

* It sends the command's stderr to stdout.

* It doesn't propagate the command's exit status.

This broke NixOps.

PR #18825.
2017-03-21 16:51:08 +01:00
Michael Fellinger 6cc1200bd5
marathonctl: init at 2017-03-06 2017-03-17 23:10:27 +01:00
Philipp Hausmann 2e4d0ff2e0 cloud-init: 0.7.6 -> 0.7.9 2017-03-06 17:36:23 +01:00
Peter Hoeg 8e3d0b8323 awless: 0.0.13 -> 0.0.14 2017-02-24 11:15:26 +08:00
Robin Gloster 492101dfce
nixos-container: fix destroy with immutable /var/empty
fixes #21573
2017-02-18 22:51:21 +01:00
Pradeep Chhetri 6515854248 awless: init at 0.0.13 2017-02-17 02:12:23 +01:00
Ian-Woo Kim a238c8a575 nixos-container: add --port option for nixos-container (forward network ports to systemd-nspawn container) 2017-02-15 05:12:46 +01:00
Ian-Woo Kim 3490508ed1 nixos-container: support bridge. 2017-02-15 05:12:46 +01:00
Frederik Rietdijk a881da7548 euca2ools: use python2 2016-11-24 22:28:02 +01:00
Wilhelm Schuster c37e76b4d2 nixos-container: Use machinectl shell (#18825)
Using nsenter+su was suboptimal since the environment they provided was
not quite the same as the real container environment. See [1] for more
background.

Note that we directly invoke /bin/sh for `nixos-container root-login`
since setting the user's shell is quite complex. See [2] for a related
systemd issue.

[1]: https://github.com/systemd/systemd/issues/825#issuecomment-127917622
[2]: https://github.com/systemd/systemd/issues/1395
2016-09-24 00:40:41 +02:00
Sander van der Burg 20cebe22c4 azure-cli: remove, because it has been supersed by a version generated by node2nix 2016-09-01 19:07:13 +00:00
Tuomas Tynkkynen 282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
aszlig 9f0acda7eb
nixos-container: Fix missing comma in GetOptions
Regression introduced by fe8f0dbd53.

Tested using "nix-build nixos/tests/containers-imperative.nix".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @ericbmerritt
2016-08-07 14:29:33 +02:00
Joachim F dece583a94 Merge pull request #17484 from srp/nixos-container-terminate
nixos-container: add 'terminate' command which 'destroy' now uses
2016-08-05 23:03:38 +02:00
Eric Merritt a2feaf6d79 nixos-container: feature add 'config-file' option
This adds a config file option to nixos-container.pl that makes it quite
a bit easier to use.
2016-08-04 07:08:56 -07:00
Eric Merritt fe8f0dbd53 nixos-container: fix allow alternative nixos paths
This should be completely backwards compatible. It allows the '-f' part
of the nix-env command to be configured. This greatly eases using
nixos-container as part of development where several nixpkgs
repositories might be tested at the same time.
2016-08-04 07:08:05 -07:00
Scott R. Parish d6c55c16f6 nixos-container: replace 'kill' command with 'terminate'
My earlier commit to have `nixos-container destroy` use `kill` broke
the `container-imperative` test, see[1]. As suggested by @aszlig,
`machinectl terminate` doesn't have that problem, and is the command
that should have been used to begin with rather then `kill`.

1| 60c6c7bc9a (commitcomment-18478032)
2016-08-03 11:08:32 -07:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Scott R. Parish 60c6c7bc9a nixos-container: add 'kill' command, 'destroy' to use 'kill'
Using 'machinectl kill' is much faster then gracefully stopping the
container.

In the case of 'destroy', since we're destroying it anyway, there's no
reason to do a graceful shutdown.
2016-07-21 14:58:05 -07:00
Eric Merritt eb92804f91 nixos-containers: init package (#16959)
This moves nixos-containers into its own package so that it can be
relied upon by other packages/systems. This should make development
using dynamic containers much easier.
2016-07-19 08:13:06 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ben Booth 449d908b88 xe-guest-utilities: init at 6.2.0
use mkEnableOption

use sha256

add xe-guest-utilities to module-list.nix
2016-03-30 09:27:40 -07:00
Cole Mickens 6e8db533ec azure-cli: 0.9.15 -> 0.9.17 2016-03-11 16:00:20 -08:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Cole Mickens f3cce60346 azure-cli 0.9.13 -> 0.9.15 2016-02-05 00:05:33 -08:00