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: 8d77a83e96fc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58ddd8f16a67
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 21, 2019

  1. libechonest: 2.3.0 -> 2.3.1 (#71525) 

    Just a package revamp
+ one less sha1 hash in nixpkgs
    @c0bw3b
    c0bw3b authored Oct 21, 2019
    Copy the full SHA
    58ddd8f View commit details
Showing with 23 additions and 7 deletions.
  1. +23 −7 pkgs/development/libraries/libechonest/default.nix
30 changes: 23 additions & 7 deletions pkgs/development/libraries/libechonest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,36 @@
{ stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:

stdenv.mkDerivation rec {
pname = "libechonest";
version = "2.3.0";
version = "2.3.1";

src = fetchurl {
url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2";
sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db";
src = fetchFromGitHub {
owner = "lfranchi";
repo = pname;
rev = version;
sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq";
};

buildInputs = [ cmake qt4 qjson doxygen boost ];
patches = [
(fetchpatch {
url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch";
sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx";
})
(fetchpatch {
url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch";
sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94";
})
];

nativeBuildInputs = [ cmake doxygen ];
buildInputs = [ qt4 qjson ];

enableParallelBuilding = true;
doCheck = false; # requires network access

meta = {
description = "A C++/Qt wrapper around the Echo Nest API";
homepage = http://projects.kde.org/projects/playground/libs/libechonest;
homepage = "https://projects.kde.org/projects/playground/libs/libechonest";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};