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/nixops
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0a636f2d5995
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 81a952dfb76a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 12, 2020

  1. Nixpkgs overlay: Don't use 'pkgs' 

    This can cause the package to depend on two different versions of
Nixpkgs, leading to Python module clashes.
    @edolstra
    edolstra committed Apr 12, 2020
    Copy the full SHA
    81a952d View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 flake.nix
8 changes: 4 additions & 4 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@

officialRelease = false;

version = "1.8" + (if officialRelease then "" else "pre${builtins.substring 0 8 self.lastModifiedDate}.${self.shortRev}");
version = "1.8" + (if officialRelease then "" else "pre${builtins.substring 0 8 self.lastModifiedDate}.${self.shortRev or "dirty"}");

pkgs = import nixpkgs {
system = "x86_64-linux";
@@ -38,7 +38,7 @@

buildInputs = [ python2Packages.nose python2Packages.coverage ];

nativeBuildInputs = [ pkgs.mypy ];
nativeBuildInputs = [ mypy ];

propagatedBuildInputs = with python2Packages;
[ prettytable
@@ -73,7 +73,7 @@
'';

# Needed by libcloud during tests.
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

# Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
# the version of openssh is causing errors with big networks (40+).
@@ -119,7 +119,7 @@
distPhase =
''
# Generate the manual and the man page.
cp ${(import ./doc/manual { revision = self.rev; inherit nixpkgs; }).optionsDocBook} doc/manual/machine-options.xml
cp ${(import ./doc/manual { revision = self.rev or "dirty"; inherit nixpkgs; }).optionsDocBook} doc/manual/machine-options.xml
for i in scripts/nixops setup.py doc/manual/manual.xml; do
substituteInPlace $i --subst-var-by version ${version}