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: 7c5784d1f066
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 93cabca3bd82
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 2, 2017

  1. puddletag: get rid of pypkgs variable

    Peter Hoeg committed Jan 2, 2017
    Copy the full SHA
    c049463 View commit details

  2. Merge pull request #21587 from peterhoeg/f/puddletag 

    puddletag: get rid of pypkgs variable
    @FRidh
    FRidh authored Jan 2, 2017
    Copy the full SHA
    93cabca View commit details
Showing with 4 additions and 7 deletions.
  1. +4 −7 pkgs/applications/audio/puddletag/default.nix
11 changes: 4 additions & 7 deletions pkgs/applications/audio/puddletag/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:

let
pypkgs = python2Packages;
pname = "puddletag";

in pypkgs.buildPythonApplication rec {
in python2Packages.buildPythonApplication rec {
name = "${pname}-${version}";
version = "1.2.0";

@@ -17,11 +16,9 @@ in pypkgs.buildPythonApplication rec {

sourceRoot = "${pname}-v${version}-src/source";

disabled = pypkgs.isPy3k; # work to support python 3 has not begun
disabled = python2Packages.isPy3k; # work to support python 3 has not begun

outputs = [ "out" ];

propagatedBuildInputs = [ chromaprint ] ++ (with pypkgs; [
propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [
configobj
mutagen
pyparsing
@@ -35,7 +32,7 @@ in pypkgs.buildPythonApplication rec {
siteDir=$(toPythonPath $out)
mkdir -p $siteDir
PYTHONPATH=$PYTHONPATH:$siteDir
${pypkgs.python.interpreter} setup.py install --prefix $out
${python2Packages.python.interpreter} setup.py install --prefix $out
'';

meta = with stdenv.lib; {