diff --git a/flake.nix b/flake.nix index e30d0c3b..7eb5f9c4 100644 --- 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 b/pkgs/by-name/atomic-browser/package.nix similarity index 97% rename from pkgs/atomic-browser/default.nix rename to pkgs/by-name/atomic-browser/package.nix index 4442fa15..01407a30 100644 --- a/pkgs/atomic-browser/default.nix +++ b/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 index fda24fe7..c5b3eaae 100644 --- 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