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: 636910e56325
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c75cb87721be
Choose a head ref
  • 8 commits
  • 7 files changed
  • 1 contributor

Commits on Mar 11, 2019

  1. docker: export GOCACHE for all platforms

    @kalbasit
    kalbasit committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eee09b1 View commit details

  2. gitlab-shell: export GOCACHE in the installPhase 

    TMPDIR, in `GOCACHE = "$TMPDIR";`, will not be intepreted  when it's set
outside of a phase.
    @kalbasit
    kalbasit committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    483d823 View commit details

  3. deepin.go-dbus-generator: fix the GOCACHE make flag

    @kalbasit
    kalbasit committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d925c32 View commit details

  4. deepin.go-gir-generator: fix the GOCACHE make flag

    @kalbasit
    kalbasit committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f10522d View commit details

  5. boringssl: export GOCACHE in the makeFlags

    @kalbasit
    kalbasit committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b39fc3a View commit details

  6. cadvisor: export GOCACHE in the buildPhase 

    TMPDIR, in `GOCACHE = "$TMPDIR";`, will not be intepreted  when it's set
outside of a phase.
    @kalbasit
    kalbasit committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    09435db View commit details

  7. vault: export GOCACHE in the preBuild phase 

    TMPDIR, in `GOCACHE = "$TMPDIR";`, will not be intepreted  when it's set
outside of a phase.
    @kalbasit
    kalbasit committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7cb4e4b View commit details

  8. Merge pull request #57296 from kalbasit/nixpkgs_go-fixes 

    Fixes to a few Go packages.
    @kalbasit
    kalbasit authored Mar 11, 2019

    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
    c75cb87 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {

buildInputs = [ ruby bundler go ];

GOCACHE="$TMPDIR/go-cache";

patches = [ ./remove-hardcoded-locations.patch ];

installPhase = ''
export GOCACHE="$TMPDIR/go-cache"
ruby bin/compile
mkdir -p $out/
cp -R . $out/
5 changes: 3 additions & 2 deletions pkgs/applications/virtualization/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -94,13 +94,14 @@ rec {

dontStrip = true;

buildPhase = (optionalString (stdenv.isLinux) ''
buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
'' + (optionalString (stdenv.isLinux) ''
# build engine
cd ./components/engine
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}"
export VERSION="${version}"
export GOCACHE="$TMPDIR/go-cache"
./hack/make.sh dynbinary
cd -
'') + ''
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/go-dbus-generator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

makeFlags = [
"PREFIX=$(out)"
"GOCACHE=$TMPDIR/go-cache"
"GOCACHE=$(TMPDIR)/go-cache"
];

passthru.updateScript = deepin.updateScript { inherit name; };
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/go-gir-generator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {

makeFlags = [
"PREFIX=$(out)"
"GOCACHE=$TMPDIR/go-cache"
"GOCACHE=$(TMPDIR)/go-cache"
];

passthru.updateScript = deepin.updateScript { inherit name; };
2 changes: 1 addition & 1 deletion pkgs/development/libraries/boringssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-Wno-error";

GOCACHE="$TMPDIR/go-cache";
makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ];

installPhase = ''
mkdir -p $out/bin $out/include $out/lib
3 changes: 1 addition & 2 deletions pkgs/servers/monitoring/cadvisor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,9 +13,8 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ go ];

GOCACHE="$TMPDIR/go-cache";

buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
mkdir -p Godeps/_workspace/src/github.com/google/
ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor
GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor github.com/google/cadvisor
3 changes: 1 addition & 2 deletions pkgs/tools/security/vault/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ go gox removeReferencesTo ];

GOCACHE="$TMPDIR/go-cache";

preBuild = ''
patchShebangs ./
substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
@@ -24,6 +22,7 @@ stdenv.mkDerivation rec {
ln -s $(pwd) src/github.com/hashicorp/vault
export GOPATH=$(pwd)
export GOCACHE="$TMPDIR/go-cache"
'';

installPhase = ''