From babbf2ac5cc665a6597674e8c7a9fd3cf8a63144 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sun, 8 Apr 2018 09:45:42 +1000 Subject: [PATCH 1/2] perlPackages.CDDB_get: init at 2.28 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6169959367ad..ea0c0d9159bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1196,6 +1196,11 @@ github = "ElvishJerricco"; name = "Will Fancher"; }; + endgame = { + email = "jack@jackkelly.name"; + github = "endgame"; + name = "Jack Kelly"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c65adafc78fe..d455dde6aeef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1658,6 +1658,21 @@ let self = _self // overrides; _self = with self; { }; }; + CDDB_get = buildPerlPackage rec { + name = "CDDB_get-2.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FO/FONKIE/${name}.tar.gz"; + sha256 = "1jfrwvfasylcafbvb0jjm94ad4v6k99a7rf5i4qwzhg4m0gvmk5x"; + }; + meta = { + homepage = https://metacpan.org/module/CDDB_get; + description = "Get the CDDB info for an audio cd"; + license = stdenv.lib.licenses.artistic1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; + }; + CGI = buildPerlPackage rec { name = "CGI-4.38"; src = fetchurl { From e1f6778e115e255ad1ffb5661a3b6348c8293dc9 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sun, 8 Apr 2018 11:42:13 +1000 Subject: [PATCH 2/2] crip: init at 3.9 --- pkgs/applications/audio/crip/default.nix | 68 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/audio/crip/default.nix diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix new file mode 100644 index 000000000000..0383af06795e --- /dev/null +++ b/pkgs/applications/audio/crip/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchurl +, makeWrapper + +, perl +, perlPackages + +, cdparanoia +, coreutils +, eject +, flac +, gnugrep +, nano +, sox +, vorbis-tools +, vorbisgain +, which +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "crip-3.9"; + src = fetchurl { + url = "http://bach.dynet.com/crip/src/${name}.tar.gz"; + sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz"; + }; + + buildInputs = [ perl perlPackages.CDDB_get ]; + nativeBuildInputs = [ makeWrapper ]; + + toolDeps = makeBinPath [ + cdparanoia + coreutils + eject + flac + gnugrep + sox + vorbis-tools + vorbisgain + which + ]; + + scripts = [ "crip" "editcomment" "editfilenames" ]; + + installPhase = '' + mkdir -p $out/bin/ + + for script in ${escapeShellArgs scripts}; do + cp $script $out/bin/ + + substituteInPlace $out/bin/$script \ + --replace '$editor = "vim";' '$editor = "${nano}/bin/nano";' + + wrapProgram $out/bin/$script \ + --set PERL5LIB "${makePerlPath [ perlPackages.CDDB_get ]}" \ + --set PATH "${toolDeps}" + done + ''; + + meta = { + homepage = http://bach.dynet.com/crip/; + description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; + license = stdenv.lib.licenses.gpl1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1480b906403b..b002534f29ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1053,6 +1053,8 @@ with pkgs; cri-tools = callPackage ../tools/virtualization/cri-tools {}; + crip = callPackage ../applications/audio/crip { }; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { };