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: cbe420d6d796
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70963b382f3f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 9, 2018

  1. singularity: add missing file dependency

    @jbedo
    jbedo committed May 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48808f1 View commit details

  2. Merge pull request #40192 from jbedo/singfile 

    singularity: add missing file dependency
    @xeji
    xeji authored May 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    70963b3 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/applications/virtualization/singularity/default.nix
3 changes: 2 additions & 1 deletion pkgs/applications/virtualization/singularity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
, curl
, utillinux
, libarchive
, file
}:

stdenv.mkDerivation rec {
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ autoreconfHook makeWrapper ];
buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive ];
buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive file ];

meta = with stdenv.lib; {
homepage = http://singularity.lbl.gov/;