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

Commits on Aug 25, 2019

  1. singularity: prepatch path to cp in 3.2.1

    scalavision committed Aug 25, 2019
    Copy the full SHA
    3ce3e75 View commit details

Commits on Aug 26, 2019

  1. Merge pull request #67457 from scalavision/singularity-rewrite-path-t… 

    …o-cp

singularity: prepatch path to cp in 3.2.1
    @markuskowa
    markuskowa authored Aug 26, 2019
    Copy the full SHA
    a69ce83 View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/applications/virtualization/singularity/default.nix
5 changes: 5 additions & 0 deletions pkgs/applications/virtualization/singularity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,11 @@ buildGoPackage rec {
nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ];
propagatedBuildInputs = [ coreutils squashfsTools ];

prePatch = ''
substituteInPlace internal/pkg/build/copy/copy.go \
--replace /bin/cp ${coreutils}/bin/cp
'';

postConfigure = ''
cd go/src/github.com/sylabs/singularity