Revert "WIP: Tried using explicitPkgs"

This reverts commit fff2776.
ngi-nix · Apr 11, 2024 · 768352f · 768352f
1 parent d865b13
commit 768352f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/flake.nix b/flake.nix
@@ -73,6 +73,7 @@
       pkgsByName = import ./pkgs/by-name {
         inherit (pkgs) lib;
         inherit callPackage dream2nix pkgs;
+        inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps pnpmConfigHook;
       };
 
       explicitPkgs = import ./pkgs {

diff --git a/pkgs/atomic-browser/default.nix → pkgs/by-name/atomic-browser/package.nix b/pkgs/atomic-browser/default.nix → pkgs/by-name/atomic-browser/package.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  mkDerivation,
   fetchFromGitHub,
   lib,
   nodePackages,
@@ -12,7 +12,7 @@
     maintainers
     ;
 in
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "atomic-browser";
   version = "v0.37.0";
 

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -33,11 +33,6 @@
       pretalx-venueless
       pretalx-public-voting
       ;
-
-
-    inherit (callPackage ./build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps;
-    inherit (callPackage ./build-support/node/fetch-pnpm-deps { }) pnpmConfigHook;
-    atomic-browser = callPackage ./atomic-browser {};
   };
 in
   self