about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-10-03 06:06:41 +0000
committerGitHub <noreply@github.com>2022-10-03 06:06:41 +0000
commit793b7f618d79295eed7ef55ab3f6f8290e8c19bc (patch)
tree58cb9442ed7c9505aa3de44af397737b1b95b1fb /pkgs/top-level
parent74f2e360359aaf3d42706c1f70911ae939d966e8 (diff)
parent978895272f8366f1a8545b26365ec0039b42ab5d (diff)
downloadnixlib-793b7f618d79295eed7ef55ab3f6f8290e8c19bc.tar
nixlib-793b7f618d79295eed7ef55ab3f6f8290e8c19bc.tar.gz
nixlib-793b7f618d79295eed7ef55ab3f6f8290e8c19bc.tar.bz2
nixlib-793b7f618d79295eed7ef55ab3f6f8290e8c19bc.tar.lz
nixlib-793b7f618d79295eed7ef55ab3f6f8290e8c19bc.tar.xz
nixlib-793b7f618d79295eed7ef55ab3f6f8290e8c19bc.tar.zst
nixlib-793b7f618d79295eed7ef55ab3f6f8290e8c19bc.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79b1e1340a82..c03522b84c7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10887,10 +10887,7 @@ with pkgs;
 
   sacd = callPackage ../tools/cd-dvd/sacd { };
 
-  safe = callPackage ../tools/security/safe {
-    # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
-    buildGoModule = buildGo117Module;
-  };
+  safe = callPackage ../tools/security/safe { };
 
   safety-cli = with python3.pkgs; toPythonApplication safety;
 
@@ -27994,10 +27991,7 @@ with pkgs;
 
   gopher = callPackage ../applications/networking/gopher/gopher { };
 
-  gophernotes = callPackage ../applications/editors/gophernotes {
-    # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
-    buildGoModule = buildGo117Module;
-  };
+  gophernotes = callPackage ../applications/editors/gophernotes { };
 
   goxel = callPackage ../applications/graphics/goxel { };