cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #191467 from Mic92/navidrome

Browse source
This commit is contained in:
Martin Weinelt 2022-09-25 13:17:01 +02:00 committed by GitHub
commit 9145070f5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/servers/misc/navidrome/default.nix
View file

@ -23,6 +23,8 @@ let
hash = "sha256-gTvJI+brdEpdpbEcdQycqw15seI+k5dMDVrjY3v6i14="; hash = "sha256-gTvJI+brdEpdpbEcdQycqw15seI+k5dMDVrjY3v6i14=";
}; };
# FIXME: we currently manually inject a patch for react-scripts in here
# See https://github.com/navidrome/navidrome/pull/1767
ui = callPackage ./ui { ui = callPackage ./ui {
inherit src version; inherit src version;
}; };

2
pkgs/servers/misc/navidrome/ui/node-composition.nix
View file

@ -12,6 +12,6 @@ let
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit runCommand fetchpatch;
inherit nodeEnv; inherit nodeEnv;
} }

19
pkgs/servers/misc/navidrome/ui/node-packages.nix generated
View file

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.11.1. Do not edit! # This file has been generated by node2nix 1.11.1. Do not edit!
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: {nodeEnv, runCommand, fetchpatch, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let let
sources = { sources = {
@ -11258,10 +11258,19 @@ let
name = "react-scripts"; name = "react-scripts";
packageName = "react-scripts"; packageName = "react-scripts";
version = "4.0.3"; version = "4.0.3";
src = fetchurl { src = runCommand "src.tgz" {} ''
url = "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.3.tgz"; tar -xvf ${fetchurl {
sha512 = "S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A=="; url = "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.3.tgz";
}; sha512 = "S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A==";
}}
pushd package
patch -p2 < ${fetchpatch {
url = "https://raw.githubusercontent.com/navidrome/navidrome/c0364331748b8e0600b27caa956caa8160b2bdcd/ui/webpack-patch-for-openssl3.patch";
sha512 = "sha512-PS1/yzneLGV76J+LvRuKtMv8imIBzB1gXnK2+vw61xQOWdNDffgfeFRUdQFBhp3Zm9oykX+YQcrwO215z+SQkg==";
}}
popd
tar -czvf $out package
'';
}; };
"react-transition-group-4.4.1" = { "react-transition-group-4.4.1" = {
name = "react-transition-group"; name = "react-transition-group";