Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a0753151fa55
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc06fe264948
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 22, 2019

  1. lidarr: Add missing dependency chromaprint 

    Without adding this dependency in the system status page I get the
warning saying the following:
> fpcalc could not be found. Audio fingerprinting disabled.

With this dep we instead get the following:
> You have an old version of fpcalc. Please upgrade to 1.4.3.

Which I would find an improvement from the current state.
    @etu
    etu committed Oct 22, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d9975aa View commit details

  2. sonarr: Move build time dependency

    @etu
    etu committed Oct 22, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a18d59a View commit details

Commits on Oct 23, 2019

  1. Merge pull request #71445 from etu/lidarr-add-missing-dependency 

    lidarr: Add missing dependency chromaprint
    @c0bw3b
    c0bw3b authored Oct 23, 2019
    Copy the full SHA
    cc06fe2 View commit details
Showing with 4 additions and 7 deletions.
  1. +3 −4 pkgs/servers/lidarr/default.nix
  2. +1 −3 pkgs/servers/sonarr/default.nix
7 changes: 3 additions & 4 deletions pkgs/servers/lidarr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper }:

stdenv.mkDerivation rec {
pname = "lidarr";
@@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr";
};

buildInputs = [
makeWrapper
];
nativeBuildInputs = [ makeWrapper ];

installPhase = ''
mkdir -p $out/bin
@@ -22,6 +20,7 @@ stdenv.mkDerivation rec {
makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \
--add-flags "$out/bin/Lidarr.exe" \
--prefix PATH : ${stdenv.lib.makeBinPath [ chromaprint ]} \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
curl sqlite libmediainfo ]}
'';
4 changes: 1 addition & 3 deletions pkgs/servers/sonarr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "05l7l4d1765m01c14iz8lcr61dnm4xd5p09sns4w8wmanks9jg3x";
};

buildInputs = [
makeWrapper
];
nativeBuildInputs = [ makeWrapper ];

installPhase = ''
mkdir -p $out/bin