Commit Graph

197 Commits

Author SHA1 Message Date
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
Tuomas Tynkkynen
13b3f3f246 treewide: Mass replace 'openssl}/bin' to refer the 'bin' output 2016-02-01 20:46:16 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Evgeny Egorochkin
26f221d6b6 azure-cli: fix dependencies 2016-01-16 00:33:03 +02:00
Evgeny Egorochkin
dcd428db08 azure-cli: init at 0.9.13 2016-01-15 03:11:20 +02:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Domen Kožar
a912c45ee2 buildPythonPackage: get rid of setupPyInstallFlags since there is no such thing 2015-11-21 21:44:12 +01:00
Vladimír Čunát
99e4371526 curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
Eelco Dolstra
5ab7a37feb ec2-api-tools: Update to 1.7.5.1 2015-09-24 11:49:18 +02:00
Eelco Dolstra
b3d4b1bef2 ec2-ami-tools: Update to 1.5.7 2015-09-24 11:49:18 +02:00
Benjamin Staffin
ed6ce446d0 euca2ools: bump to 2.1.4, use python27
Change-Id: I8be644bcf2892e1146c3b3eedea36c5f5e749c16
2015-03-07 14:06:08 -08:00
Domen Kožar
9b7b2ce8eb Revert "Introduce patchShebangsPhase ran in preConfigurePhases"
This reverts commit 512fbb280f.

See #5368
2015-01-08 10:26:49 +01:00
Domen Kožar
512fbb280f Introduce patchShebangsPhase ran in preConfigurePhases
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-02 02:58:32 +01:00
Georges Dubus
1c3a9336ed Packaged cloud-init and its dependencies 2014-12-01 10:55:45 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimir Kirillov
e10a8b7318 ec2-ami-tools -> 1.5.6, updated license & homepage 2014-11-05 15:28:52 +02:00
Domen Kožar
47182da0a3 remove pythonPackages.ssl reference 2014-10-11 20:29:17 +02:00
Rickard Nilsson
55e6d092ca ec2-ami-tools: Update from 1.4.0.9 to 1.5.3 2014-08-05 01:25:16 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Shea Levy
77817b7638 aws: hardcode perl location 2014-02-12 08:27:08 -05:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Rob Vermaas
1f4c75f9e8 Update euca2ools to 2.1.3 2013-05-30 15:02:36 +02:00
Eelco Dolstra
8dba5cd411 ec2-ami-tools: Update to 1.4.0.9 2013-01-24 18:23:04 +01:00
Eelco Dolstra
b74e1c9187 ec2-api-tools: Update to 1.6.5.1
Also, move everything to $out/libexec/ec2-api-tools.
2012-11-08 16:31:08 +01:00
Eelco Dolstra
403e594207 ec2-ami-tools: Update to 1.6.0.0 2012-07-25 23:18:39 -04:00
Eelco Dolstra
a0cb7e4a61 Add aws, a utility for working with various AWS services 2012-07-09 13:47:41 -04:00
Shea Levy
02cafefac4 ec2-api-tools: Upstream updated zipball 2012-07-08 07:00:50 -04:00
Eelco Dolstra
b222e1b61f * Updated the EC2 API tools to 1.5.3.0.
svn path=/nixpkgs/trunk/; revision=33916
2012-04-25 13:33:25 +00:00
Eelco Dolstra
205dbbd991 * Update euca2ools.
svn path=/nixpkgs/trunk/; revision=33762
2012-04-12 14:16:23 +00:00
Eelco Dolstra
fcc5136cfc * Latest EC2 AMI/API tools.
svn path=/nixpkgs/trunk/; revision=33760
2012-04-12 13:20:58 +00:00
Shea Levy
584ccabaac svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
2012-02-25 20:52:15 +00:00
Eelco Dolstra
f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
78ff18a538 * ec2-api-tools updated to 1.4.4.2.
svn path=/nixpkgs/trunk/; revision=30054
2011-10-27 15:15:28 +00:00
Eelco Dolstra
9704af30c3 * Latest EC2 AMI tools.
svn path=/nixpkgs/trunk/; revision=29963
2011-10-21 16:25:27 +00:00
Sander van der Burg
1ecf17711d Updated hashcode
svn path=/nixpkgs/trunk/; revision=29005
2011-09-04 16:47:54 +00:00
Rob Vermaas
25fd505136 update ec2-ami-tools hash
svn path=/nixpkgs/trunk/; revision=28672
2011-08-19 02:41:23 +00:00
Rob Vermaas
ddd5cb7d29 update ec2-api-tools hash
svn path=/nixpkgs/trunk/; revision=28671
2011-08-19 02:40:51 +00:00
Eelco Dolstra
83b4c9cd8f * Provide an old version of Boto for euca2ools.
svn path=/nixpkgs/branches/modular-python/; revision=26608
2011-03-30 14:42:20 +00:00
Eelco Dolstra
45159cdc89 * Added euca2ools.
svn path=/nixpkgs/branches/modular-python/; revision=26607
2011-03-30 14:37:53 +00:00
Eelco Dolstra
8df32943a0 * ec2-api-tools updated to 1.4.2.2.
svn path=/nixpkgs/branches/modular-python/; revision=26606
2011-03-30 14:17:26 +00:00
Eelco Dolstra
f85cf594d3 * Updated the EC2 API/AMI tools.
svn path=/nixpkgs/trunk/; revision=22588
2010-07-13 20:58:58 +00:00
Eelco Dolstra
2feb604243 * A patch to ec2-bundle-image to make it work properly on read-only
images (in the Nix store).

svn path=/nixpkgs/trunk/; revision=19616
2010-01-22 16:42:54 +00:00
Eelco Dolstra
c63858a169 * Fix the path to bash.
* Add openssl as a dependency.

svn path=/nixpkgs/trunk/; revision=19436
2010-01-14 14:26:35 +00:00
Rob Vermaas
8c29f10134 amazon ec2 ami tools
svn path=/nixpkgs/trunk/; revision=19396
2010-01-13 14:25:45 +00:00
Eelco Dolstra
3df8e6662a * Updated ec2-api-tools to the latest version. Also, generate
wrappers that set EC2_HOME and JAVA_HOME.

svn path=/nixpkgs/trunk/; revision=19390
2010-01-13 12:54:26 +00:00
Rob Vermaas
93ab1e0724 amazon ec2 api tools
svn path=/nixpkgs/trunk/; revision=17974
2009-10-27 12:48:26 +00:00