Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 42b3b7ab3552
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dac3cf5a4aa5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 5, 2017

  1. cloud-init: remove argparse from requirements.txt 

    Argparse is part of python stdlib.
    @nlewo
    nlewo committed Jun 5, 2017
    Copy the full SHA
    a4b8c21 View commit details

  2. Merge pull request #26411 from nlewo/pr/cloud-init-argparse 

    cloud-init: remove argparse from requirements.txt
    @FRidh
    FRidh authored Jun 5, 2017
    Copy the full SHA
    dac3cf5 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/tools/virtualization/cloud-init/default.nix
5 changes: 4 additions & 1 deletion pkgs/tools/virtualization/cloud-init/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,10 +23,13 @@ in pythonPackages.buildPythonApplication rec {
substituteInPlace cloudinit/config/cc_growpart.py \
--replace 'util.subp(["growpart"' 'util.subp(["${cloud-utils}/bin/growpart"'
# Argparse is part of python stdlib
sed -i s/argparse// requirements.txt
'';

propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable
oauthlib pyserial configobj pyyaml argparse requests jsonpatch ];
oauthlib pyserial configobj pyyaml requests jsonpatch ];

meta = {
homepage = http://cloudinit.readthedocs.org;