diff --git a/flake.nix b/flake.nix index 832bfb9b..5d93396f 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,6 @@ inherit (pkgs) lib; inherit (pkgs) mkPnpmPackage; inherit callPackage dream2nix pkgs; - inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps pnpmConfigHook; }; explicitPkgs = import ./pkgs { diff --git a/pkgs/by-name/atomic-browser/package.nix b/pkgs/atomic-browser/default.nix similarity index 96% rename from pkgs/by-name/atomic-browser/package.nix rename to pkgs/atomic-browser/default.nix index 390da48b..10363f8d 100644 --- a/pkgs/by-name/atomic-browser/package.nix +++ b/pkgs/atomic-browser/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, + stdenv, fetchFromGitHub, lib, mkPnpmPackage, @@ -12,7 +12,7 @@ maintainers ; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "atomic-browser"; version = "v0.37.0"; diff --git a/pkgs/by-name/default.nix b/pkgs/by-name/default.nix index a1db4ecb..c1d9c715 100644 --- a/pkgs/by-name/default.nix +++ b/pkgs/by-name/default.nix @@ -3,8 +3,6 @@ callPackage, dream2nix, mkPnpmPackage, - fetchPnpmDeps, - pnpmConfigHook, pkgs, }: let baseDirectory = ./.; diff --git a/pkgs/default.nix b/pkgs/default.nix index c5b3eaae..aade196f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -33,6 +33,11 @@ pretalx-venueless pretalx-public-voting ; + + + inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps; + inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) pnpmConfigHook; + atomic-browser = callPackage ./atomic-browser {}; }; in self