about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/docker-slim/default.nix37
-rw-r--r--pkgs/applications/virtualization/gvisor/default.nix2
2 files changed, 11 insertions, 28 deletions
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 6004898f08e5..8e0bd8e54ed2 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -4,26 +4,17 @@
 , makeWrapper
 }:
 
-let
-
-  version = "1.26.1";
-  rev = "2ec04e169b12a87c5286aa09ef44eac1cea2c7a1";
-
-in buildGoPackage rec {
+buildGoPackage rec {
   pname = "docker-slim";
-  inherit version;
+  version = "1.27.0";
 
   goPackagePath = "github.com/docker-slim/docker-slim";
 
   src = fetchFromGitHub {
     owner = "docker-slim";
     repo = "docker-slim";
-    inherit rev;
-    # fetchzip yields a different hash on Darwin because `use-case-hack`
-    sha256 =
-      if stdenv.isDarwin
-      then "0j72rn6qap78qparrnslxm3yv83mzy1yc7ha0crb4frwkzmspyvf"
-      else "01bjb14z7yblm7qdqrx1j2pw5x5da7a6np4rkzay931gly739gbh";
+    rev = version;
+    sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8";
   };
 
   subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
@@ -32,20 +23,12 @@ in buildGoPackage rec {
     makeWrapper
   ];
 
-  # docker-slim vendorized logrus files in different directories, which
-  # conflicts on case-sensitive filesystems
-  preBuild = stdenv.lib.optionalString stdenv.isLinux ''
-    mv go/src/${goPackagePath}/vendor/github.com/Sirupsen/logrus/* \
-      go/src/${goPackagePath}/vendor/github.com/sirupsen/logrus/
-  '';
-
-  buildFlagsArray =
-    let
-      ldflags = "-ldflags=-s -w " +
-                "-X ${goPackagePath}/pkg/version.appVersionTag=${version} " +
-                "-X ${goPackagePath}/pkg/version.appVersionRev=${rev}";
-    in
-      [ ldflags ];
+  buildFlagsArray = [
+    ''-ldflags=
+        -s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version}
+              -X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}
+    ''
+  ];
 
   # docker-slim tries to create its state dir next to the binary (inside the nix
   # store), so we set it to use the working directory at the time of invocation
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index 2d99fb3bf573..3d0ae35f5608 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -76,7 +76,7 @@ in buildBazelPackage rec {
       rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
     '';
 
-    sha256 = "122qk6iv8hd7g2a84y9aqqhij4r0m47vpxzbqhhh6k5livc73qd6";
+    sha256 = "1bn7nhv5pag8fdm8l8nvgg3fzvhpy2yv9yl2slrb16lckxzha3v6";
   };
 
   buildAttrs = {