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

Commits on Jun 18, 2019

  1. singularity: 3.0.1 -> 3.2.1

    @jbedo
    jbedo committed Jun 18, 2019
    Copy the full SHA
    086d599 View commit details

Commits on Jun 20, 2019

  1. Merge pull request #63409 from jbedo/singularity 

    singularity: 3.0.1 -> 3.2.1
    @markuskowa
    markuskowa authored Jun 20, 2019
    Copy the full SHA
    b8c4769 View commit details
Showing with 5 additions and 678 deletions.
  1. +4 −9 pkgs/applications/virtualization/singularity/default.nix
  2. +1 −669 pkgs/applications/virtualization/singularity/deps.nix
13 changes: 4 additions & 9 deletions pkgs/applications/virtualization/singularity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@ with lib;

buildGoPackage rec {
name = "singularity-${version}";
version = "3.0.1";
version = "3.2.1";

src = fetchFromGitHub {
owner = "sylabs";
repo = "singularity";
rev = "v${version}";
sha256 = "1wpsd0il2ipa2n5cnbj8dzs095jycdryq2rx62kikbq7ahzz4fsi";
sha256 = "14lhxwy21s7q081x7kbnvkjsbxgsg2f181qlzmlxcn6n7gfav3kj";
};

goPackagePath = "github.com/sylabs/singularity";
@@ -32,22 +32,16 @@ buildGoPackage rec {
propagatedBuildInputs = [ coreutils squashfsTools ];

postConfigure = ''
find . -name vendor -type d -print0 | xargs -0 rm -rf
cd go/src/github.com/sylabs/singularity
patchShebangs .
sed -i 's|defaultEnv := "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"|defaultEnv := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' src/cmd/singularity/cli/singularity.go
sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
./mconfig -V ${version} -p $bin --localstatedir=/var
touch builddir/.dep-done
touch builddir/vendors-done
# Don't install SUID binaries
sed -i 's/-m 4755/-m 755/g' builddir/Makefile
# Point to base gopath
sed -i "s|^cni_vendor_GOPATH :=.*\$|cni_vendor_GOPATH := $NIX_BUILD_TOP/go/src/github.com/containernetworking/plugins/plugins|" builddir/Makefile
'';

buildPhase = ''
@@ -57,6 +51,7 @@ buildGoPackage rec {
installPhase = ''
make -C builddir install LOCALSTATEDIR=$bin/var
chmod 755 $bin/libexec/singularity/bin/starter-suid
wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
'';

postFixup = ''
670 changes: 1 addition & 669 deletions pkgs/applications/virtualization/singularity/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.