fider: 0.24.0 -> 0.26.0 (#406992)
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
{
|
||||
lib,
|
||||
esbuild,
|
||||
buildNpmPackage,
|
||||
|
||||
pname,
|
||||
@@ -13,8 +11,6 @@ buildNpmPackage {
|
||||
inherit version src npmDepsHash;
|
||||
pname = "${pname}-frontend";
|
||||
|
||||
nativeBuildInputs = [ esbuild ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@@ -37,6 +33,5 @@ buildNpmPackage {
|
||||
|
||||
env = {
|
||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1;
|
||||
ESBUILD_BINARY_PATH = lib.getExe esbuild;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,21 +3,19 @@
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
callPackage,
|
||||
esbuild,
|
||||
buildGoModule,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fider";
|
||||
version = "0.24.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getfider";
|
||||
repo = "fider";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nzOplwsE0ppmxbTrNAgePnIQIAD/5Uu4gXlebFKWGfc=";
|
||||
hash = "sha256-uABRIR/3D+//qYu/396qqVizP0kLmAA8auYd83rABhE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -32,8 +30,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# vendorHash = "...";
|
||||
# npmDepsHash = "...";
|
||||
# })
|
||||
vendorHash = "sha256-CfopU72fpXiTaBtdf9A57Wb+flDu2XEtTISxImeJLL0=";
|
||||
npmDepsHash = "sha256-gnboT5WQzftOCZ2Ouuza7bqpxJf+Zs7OWC8OHMZNHvw=";
|
||||
vendorHash = "sha256-4ilOdUblpwteY0ZInitSuzuB8mU1ltYgRJjla6LiziU=";
|
||||
npmDepsHash = "sha256-c8CFMMmFcLZkJL50bfLlk2HP9B/rexNZ2WWJkV0x4Rk=";
|
||||
|
||||
server = callPackage ./server.nix {
|
||||
inherit (finalAttrs)
|
||||
@@ -50,31 +48,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
src
|
||||
npmDepsHash
|
||||
;
|
||||
# We specify the esbuild override here instead of in frontend.nix so end users can
|
||||
# again easily override it if necessary, for example when changing to an unreleased
|
||||
# version of fider requiring a newer esbuild than specified here:
|
||||
# pkgs.fider.overrideAttrs (prev: {
|
||||
# frontend = prev.frontend.override {
|
||||
# esbuild = ...;
|
||||
# };
|
||||
# })
|
||||
esbuild = esbuild.override {
|
||||
buildGoModule =
|
||||
args:
|
||||
buildGoModule (
|
||||
args
|
||||
// rec {
|
||||
version = "0.14.38";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rvMi1oC7qGidvi4zrm9KCMMntu6LJGVOGN6VmU2ivQE=";
|
||||
};
|
||||
vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
Reference in New Issue
Block a user