public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '71186e73455a4e06e96a31da34b76f84e545ba1f' into gcc-simplify-flags

Browse Source
This commit is contained in:
John Ericson
2017-12-05 17:09:41 -05:00
parent c9ca541994 71186e7345
commit 93cd0685c5
3957 changed files with 75666 additions and 53192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/altcoins/bitcoin-xt.nix
View File

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec{
Core release, applying a series of patches, and then doing deterministic
builds so anyone can check the downloads correspond to the source code.
'';
homepage = "https://bitcoinxt.software/";
homepage = https://bitcoinxt.software/;
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
platforms = platforms.unix;

2
pkgs/applications/altcoins/bitcoin.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec{
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
'';
homepage = "http://www.bitcoin.org/";
homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ roconnor AndersonTorres ];
license = licenses.mit;
platforms = platforms.unix;

24
pkgs/applications/altcoins/cryptop/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ lib, python2}:
python2.pkgs.buildPythonApplication rec {
pname = "cryptop";
version = "0.1.0";
name = "${pname}-${version}";
src = python2.pkgs.fetchPypi {
inherit pname version;
sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh";
};
propagatedBuildInputs = [ python2.pkgs.requests ];
# No tests in archive
doCheck = false;
meta = {
homepage = https://github.com/huwwp/cryptop;
description = "Command line Cryptocurrency Portfolio";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ bhipple ];
};
}

33
pkgs/applications/altcoins/dapp.nix Normal file
View File

@@ -0,0 +1,33 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
, seth, git, solc, shellcheck, nodejs, hsevm }:
stdenv.mkDerivation rec {
name = "dapp";
version = "0.5.3";
src = fetchFromGitHub {
owner = "dapphub";
repo = "dapp";
rev = "v${version}";
sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird";
};
nativeBuildInputs = [makeWrapper shellcheck];
buildPhase = "true";
doCheck = true;
checkPhase = "make test";
makeFlags = ["prefix=$(out)"];
postInstall = let path = lib.makeBinPath [
nodejs solc git seth hsevm
]; in ''
wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
'';
meta = {
description = "Simple tool for creating Ethereum-based dapps";
homepage = https://github.com/dapphub/dapp/;
maintainers = [stdenv.lib.maintainers.dbrock];
license = lib.licenses.gpl3;
inherit version;
};
}

9
pkgs/applications/altcoins/default.nix
View File

@@ -38,9 +38,18 @@ rec {
ethabi = callPackage ./ethabi.nix { };
ethrun = callPackage ./ethrun.nix { };
seth = callPackage ./seth.nix { };
dapp = callPackage ./dapp.nix { };
hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {});
primecoin = callPackage ./primecoin.nix { withGui = true; };
primecoind = callPackage ./primecoin.nix { withGui = false; };
stellar-core = callPackage ./stellar-core.nix { };
zcash = callPackage ./zcash {
withGui = false;
openssl = pkgs.openssl_1_1_0;
boost = pkgs.boost163;
};
}

2
pkgs/applications/altcoins/freicoin.nix
View File

@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
# I think that openssl and zlib are required, but come through other
# packages
preBuild = "unset AR";
installPhase = ''
mkdir -p $out/bin
cp freicoin-qt $out/bin

2
pkgs/applications/altcoins/go-ethereum-classic/default.nix
View File

@@ -18,7 +18,7 @@ buildGoPackage rec {
meta = {
description = "Golang implementation of Ethereum Classic";
homepage = "https://github.com/ethereumproject/go-ethereum";
homepage = https://github.com/ethereumproject/go-ethereum;
license = with lib.licenses; [ lgpl3 gpl3 ];
};
}

25
pkgs/applications/altcoins/go-ethereum.nix
View File

@@ -1,33 +1,22 @@
{ stdenv, lib, go, fetchgit }:
{ stdenv, lib, clang, buildGoPackage, fetchgit }:
stdenv.mkDerivation rec {
buildGoPackage rec {
name = "go-ethereum-${version}";
version = "1.4.7";
version = "1.6.6";
rev = "refs/tags/v${version}";
goPackagePath = "github.com/ethereum/go-ethereum";
buildInputs = [ go ];
buildInputs = [ clang ];
preBuild = "export CC=clang";
src = fetchgit {
inherit rev;
url = "https://${goPackagePath}";
sha256 = "19q518kxkvrr44cvsph4wv3lr6ivqsckz1f22r62932s3sq6gyd8";
sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a";
};
buildPhase = ''
export GOROOT=$(mktemp -d --suffix=-goroot)
ln -sv ${go}/share/go/* $GOROOT
ln -svf ${go}/bin $GOROOT
make all
'';
installPhase = ''
mkdir -p $out/bin
cp -v build/bin/* $out/bin
'';
meta = {
homepage = "https://ethereum.github.io/go-ethereum/";
homepage = https://ethereum.github.io/go-ethereum/;
description = "Official golang implementation of the Ethereum protocol";
license = with lib.licenses; [ lgpl3 gpl3 ];
};

2
pkgs/applications/altcoins/hivemind.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
into a blockchain so that Bitcoin-users can speculate in Prediction
Markets.
'';
homepage = "https://bitcoinhivemind.com";
homepage = https://bitcoinhivemind.com;
maintainers = with maintainers; [ canndrew ];
license = licenses.mit;
platforms = platforms.unix;

53
pkgs/applications/altcoins/hsevm.nix Normal file
View File

@@ -0,0 +1,53 @@
{ aeson, ansi-wl-pprint, base, base16-bytestring
, base64-bytestring, binary, brick, bytestring, containers
, cryptonite, data-dword, deepseq, directory, filepath, ghci-pretty
, here, HUnit, lens, lens-aeson, memory, mtl, optparse-generic
, process, QuickCheck, quickcheck-text, readline, rosezipper
, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
, text-format, unordered-containers, vector, vty
, mkDerivation, fetchFromGitHub, lib
, ncurses, zlib, bzip2, solc
}:
lib.overrideDerivation (mkDerivation rec {
pname = "hsevm";
version = "0.3.2";
src = fetchFromGitHub {
owner = "dapphub";
repo = "hsevm";
rev = "v${version}";
sha256 = "1c6zpphs03yfvyfbv1cjf04qh5q2miq7rpd7kx2cil77msi8hxw4";
};
isLibrary = false;
isExecutable = true;
enableSharedExecutables = false;
postInstall = ''
rm -rf $out/{lib,share}
'';
extraLibraries = [
aeson ansi-wl-pprint base base16-bytestring base64-bytestring
binary brick bytestring containers cryptonite data-dword deepseq
directory filepath ghci-pretty lens lens-aeson memory mtl
optparse-generic process QuickCheck quickcheck-text readline
rosezipper temporary text text-format unordered-containers vector
vty
];
executableHaskellDepends = [
readline zlib bzip2
];
testHaskellDepends = [
base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
tasty tasty-hunit tasty-quickcheck text vector
];
homepage = https://github.com/dapphub/hsevm;
description = "Ethereum virtual machine evaluator";
license = stdenv.lib.licenses.agpl3;
maintainers = [stdenv.lib.maintainers.dbrock];
}) (attrs: {
buildInputs = attrs.buildInputs ++ [solc];
})

5
pkgs/applications/altcoins/memorycoin.nix
View File

@@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
preBuild = "unset AR;"
+ (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
installPhase =
if withGui
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec{
Memorycoin is based on the Bitcoin code, but with some key
differences.
'';
homepage = "http://www.bitcoin.org/";
homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ AndersonTorres ];
license = licenses.mit;
platforms = platforms.unix;

3
pkgs/applications/altcoins/primecoin.nix
View File

@@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
preBuild = "unset AR;"
+ (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
installPhase =
if withGui

8
pkgs/applications/altcoins/seth.nix
View File

@@ -1,22 +1,22 @@
{ stdenv, makeWrapper, lib, fetchFromGitHub
, bc, coreutils, curl, ethabi, git, gnused, jshon, solc, which }:
, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }:
stdenv.mkDerivation rec {
name = "seth-${version}";
version = "0.5.1";
version = "0.5.6";
src = fetchFromGitHub {
owner = "dapphub";
repo = "seth";
rev = "v${version}";
sha256 = "1qph1gldj24r8l6aswb1w133lrm8zsxmmxl4krjik0a73bm4ghdm";
sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6";
};
nativeBuildInputs = [makeWrapper];
buildPhase = "true";
makeFlags = ["prefix=$(out)"];
postInstall = let path = lib.makeBinPath [
bc coreutils curl ethabi git gnused jshon solc which
bc coreutils curl ethabi git gnused jshon perl solc which
]; in ''
wrapProgram "$out/bin/seth" --prefix PATH : "${path}"
'';

49
pkgs/applications/altcoins/zcash/default.nix Normal file
View File

@@ -0,0 +1,49 @@
{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost
, zlib, gtest, gmock, miniupnpc, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
, withGui }:
let libsnark = callPackage ./libsnark { inherit boost openssl; };
librustzcash = callPackage ./librustzcash {};
in
with stdenv.lib;
stdenv.mkDerivation rec{
name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
version = "1.0.8";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "f630519d865ce22a6cf72a29785f2a876902f8e1";
sha256 = "1zjxg3dp0amjfs67469yp9b223v9hx29lkxid9wz2ivxj3paq7bv";
};
enableParallelBuilding = true;
buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib
miniupnpc protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark"
"--with-boost-libdir=${boost.out}/lib"
] ++ optionals withGui [ "--with-gui=qt4" ];
patchPhase = ''
sed -i"" '/^\[LIBSNARK_INCDIR/d' configure.ac
sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac
sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am
'';
postInstall = ''
cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params
'';
meta = {
description = "Peer-to-peer, anonymous electronic cash system";
homepage = https://z.cash/;
maintainers = with maintainers; [ rht ];
license = licenses.mit;
platforms = platforms.unix;
};
}

30
pkgs/applications/altcoins/zcash/librustzcash/default.nix Normal file
View File

@@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
name = "librustzcash-unstable-${version}";
version = "2017-03-17";
src = fetchFromGitHub {
owner = "zcash";
repo = "librustzcash";
rev = "91348647a86201a9482ad4ad68398152dc3d635e";
sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c";
};
depsSha256 = "02qx8zdhmj7rmhqqq5q9428x9mlrjxxcnn4yhnygz9gfgvada2hx";
installPhase = ''
mkdir -p $out/lib
cp target/release/librustzcash.a $out/lib/
mkdir -p $out/include
cp include/librustzcash.h $out/include/
'';
meta = with stdenv.lib; {
description = "Rust-language assets for Zcash";
homepage = https://github.com/zcash/librustzcash;
maintainers = with maintainers; [ rht ];
license = with licenses; [ mit asl20 ];
platforms = platforms.unix;
};
}

29
pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, xbyak, gmp, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "ate-pairing-unstable-${version}";
version = "2016-05-03";
src = fetchFromGitHub {
owner = "herumi";
repo = "ate-pairing";
rev = "dcb9da999b1113f90b115bccb6f4b57ddf3a8452";
sha256 = "0jr6r1cma414k8mhsyp7n8hqaqxi7zklsp6820a095sbb3zajckh";
};
buildInputs = [ gmp xbyak ];
installPhase = ''
mkdir -p $out
cp -r lib $out
cp -r include $out
'';
meta = with stdenv.lib; {
description = "Optimal Ate Pairing over Barreto-Naehrig Curves";
homepage = https://github.com/herumi/ate-pairing;
maintainers = with maintainers; [ rht ];
license = licenses.bsd3;
platforms = platforms.unix;
};
}

45
pkgs/applications/altcoins/zcash/libsnark/default.nix Normal file
View File

@@ -0,0 +1,45 @@
{ stdenv, libsodium, callPackage, boost, zlib, openssl, gmp, procps, fetchFromGitHub }:
let atePairing = callPackage ./ate-pairing.nix { inherit xbyak; };
mie = callPackage ./mie.nix { };
xbyak = callPackage ./xbyak.nix {};
in
stdenv.mkDerivation rec{
name = "libsnark-unstable-${version}";
version = "2017-02-09";
src = fetchFromGitHub {
owner = "zcash";
repo = "libsnark";
rev = "9ada3f84ab484c57b2247c2f41091fd6a0916573";
sha256 = "0vhslcb9rwqab9szavyn856z4h9w1syiamfcixqmj0s908zzlaaq";
};
buildInputs = [ libsodium atePairing mie xbyak zlib openssl boost gmp ];
makeFlags = [
"PREFIX=$(out)"
"CURVE=ALT_BN128"
"NO_SUPERCOP=1"
"STATIC=1"
];
buildPhase = ''
CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" \
make lib \
CURVE=ALT_BN128 \
MULTICORE=1 \
STATIC=1 \
NO_PROCPS=1 \
NO_GTEST=1 \
FEATUREFLAGS=-DMONTGOMERY_OUTPUT \
'';
meta = with stdenv.lib; {
description = "a C++ library for zkSNARK proofs";
homepage = https://github.com/zcash/libsnark;
maintainers = with maintainers; [ rht ];
license = licenses.mit;
platforms = platforms.unix;
};
}

27
pkgs/applications/altcoins/zcash/libsnark/mie.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "mie-unstable-${version}";
version = "2016-05-10";
src = fetchFromGitHub {
owner = "herumi";
repo = "mie";
rev = "704b625b7770a8e1eab26ac65d1fed14c2fcf090";
sha256 = "144bpmgfs2m4qqv7a2mccgi1aq5jmlr25gnk78ryq09z8cyv88y2";
};
phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out
cp -r include $out
'';
meta = with stdenv.lib; {
homepage = https://github.com/herumi/mie;
maintainers = with maintainers; [ rht ];
license = licenses.bsd3;
platforms = platforms.unix;
};
}

28
pkgs/applications/altcoins/zcash/libsnark/xbyak.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "xbyak-unstable-${version}";
version = "2016-05-03";
src = fetchFromGitHub {
owner = "herumi";
repo = "xbyak";
rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa";
sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn";
};
dontBuild = true;
installPhase = ''
mkdir -p $out/include
cp -r xbyak $out/include
'';
meta = with stdenv.lib; {
description = "JIT assembler for x86, x64";
homepage = https://github.com/herumi/xbyak;
maintainers = with maintainers; [ rht ];
license = licenses.bsd3;
platforms = platforms.unix;
};
}

5
pkgs/applications/audio/a2jmidid/default.nix
View File

@@ -8,8 +8,8 @@ in stdenv.mkDerivation rec {
version = "8";
src = fetchurl {
url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
url = "http://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz";
sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
};
buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ];
@@ -24,7 +24,6 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = http://home.gna.org/a2jmidid;
description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];

2
pkgs/applications/audio/amarok/default.nix
View File

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
repositories.git = git://anongit.kde.org/amarok.git;
description = "Popular music player for KDE";
license = "GPL";
homepage = http://amarok.kde.org;
homepage = https://amarok.kde.org;
inherit (kdelibs4.meta) platforms;
};
}

6
pkgs/applications/audio/ardour/default.nix
View File

@@ -16,7 +16,7 @@ let
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
# Version to build.
tag = "5.10";
tag = "5.11";
in
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
rev = "9c629c0c76808cc3e8f05e43bc760f849566dce6";
sha256 = "062igiaaj18kbismrpzbafyq1ryyqj3lh0ajqqs2s8ms675x33sl";
rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71";
sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay";
};
buildInputs =

2
pkgs/applications/audio/ario/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "GTK2 client for MPD (Music player daemon)";
homepage = "http://ario-player.sourceforge.net/";
homepage = http://ario-player.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.garrison ];
platforms = stdenv.lib.platforms.all;

8
pkgs/applications/audio/audio-recorder/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patches = [ ./icon-names.diff ];
buildInputs = with gst_all_1; [
glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 gnome3.dconf
glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf)
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
] ++ optional pulseaudioSupport libpulseaudio;
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'
'--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"'
'--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"')
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0
--prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules)
'';
meta = with stdenv.lib; {

4
pkgs/applications/audio/baudline/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, jack
{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2
, makeWrapper
}:
let
rpath = stdenv.lib.makeLibraryPath
[ libXmu libXt libX11 libXext libXxf86vm jack ];
[ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
in
stdenv.mkDerivation rec {
name = "baudline-${version}";

7
pkgs/applications/audio/bitwig-studio/default.nix
View File

@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "bitwig-studio-${version}";
version = "2.0";
version = "2.1.3";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas";
sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb";
};
nativeBuildInputs = [ dpkg makeWrapper ];
@@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
cp -r usr/share $out/share
substitute usr/share/applications/bitwig-studio.desktop \
$out/share/applications/bitwig-studio.desktop \
--replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
'';
meta = with stdenv.lib; {

2
pkgs/applications/audio/bs1770gain/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A audio/video loudness scanner implementing ITU-R BS.1770";
license = licenses.gpl2Plus;
homepage = "http://bs1770gain.sourceforge.net/";
homepage = http://bs1770gain.sourceforge.net/;
platforms = platforms.all;
};
}

39
pkgs/applications/audio/cantata/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, vlc
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
, withQt4 ? false, qt4
, withQt5 ? true, qtbase, qtsvg, qttools
, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out.
@@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
version = "2.0.1";
version = "2.1.0";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
@@ -44,24 +44,27 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36";
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh";
};
buildInputs =
[ cmake vlc ]
++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
buildInputs = [ vlc ]
++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ stdenv.lib.optional withCdda cdparanoia
++ stdenv.lib.optional withCddb libcddb
++ stdenv.lib.optional withLame lame
++ stdenv.lib.optional withMtp libmtp
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
++ stdenv.lib.optional withCdda cdparanoia
++ stdenv.lib.optional withCddb libcddb
++ stdenv.lib.optional withLame lame
++ stdenv.lib.optional withMtp libmtp
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [
(fstat withQt5 "QT5")
@@ -94,6 +97,6 @@ stdenv.mkDerivation rec {
# Technically Cantata can run on Windows so if someone wants to
# bother figuring that one out, be my guest.
platforms = platforms.linux;
maintainers = [ maintainers.fuuzetsu ];
maintainers = with maintainers; [ fuuzetsu ];
};
}

14
pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch
View File

@@ -1,14 +0,0 @@
diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt
--- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600
+++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600
@@ -158,6 +158,10 @@
include_directories(${TAGLIB_INCLUDE_DIRS})
include_directories(${QJSON_INCLUDE_DIRS})
include_directories(${GSTREAMER_INCLUDE_DIRS})
+include_directories(${GSTREAMER_APP_INCLUDE_DIRS})
+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})
+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS})
+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})
include_directories(${GLIB_INCLUDE_DIRS})
include_directories(${GLIBCONFIG_INCLUDE_DIRS})
include_directories(${LIBXML_INCLUDE_DIRS})

36
pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
View File

@@ -1,36 +0,0 @@
From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.chocobo@gmail.com>
Date: Wed, 16 Jul 2014 15:57:25 +0200
Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
---
src/CMakeLists.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 650fa74..775b0a5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
if(HAVE_DBUS)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
- # Hack to get it to generate interfaces without namespaces - required
- # because otherwise org::freedesktop::UDisks and
- # org::freedesktop::UDisks::Device conflict.
- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
-
# MPRIS DBUS interfaces
qt4_add_dbus_adaptor(SOURCES
dbus/org.freedesktop.MediaPlayer.player.xml
@@ -964,6 +959,10 @@ if(HAVE_DBUS)
# DeviceKit DBUS interfaces
if(HAVE_DEVICEKIT)
+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml
+ PROPERTIES NO_NAMESPACE dbus/udisks)
+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
+ PROPERTIES NO_NAMESPACE dbus/udisksdevice)
qt4_add_dbus_interface(SOURCES
dbus/org.freedesktop.UDisks.xml
dbus/udisks)

21
pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch Normal file
View File

@@ -0,0 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23070d9..83b6772 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
optional_component(VISUALISATIONS ON "Visualisations")
if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
- "code must be compiled in")
elseif(CRYPTOPP_FOUND)
set(HAVE_CRYPTOPP ON)
set(HAVE_SPOTIFY_DOWNLOADER ON)
@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD)
endif(HAVE_BREAKPAD)
if(HAVE_SPOTIFY_BLOB)
- add_subdirectory(ext/clementine-spotifyblob)
endif(HAVE_SPOTIFY_BLOB)
if(HAVE_MOODBAR)

26
pkgs/applications/audio/clementine/clementine-spotify-blob.patch
View File

@@ -1,25 +1,13 @@
From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 4 May 2015 19:59:38 -0500
Subject: [PATCH] Runtime selection of Spotify blob
---
src/internet/spotifyservice.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp
index 543744e..d987a36 100644
--- a/src/internet/spotifyservice.cpp
+++ b/src/internet/spotifyservice.cpp
@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp
index 88c7383..6e0893c 100644
--- a/src/internet/spotify/spotifyservice.cpp
+++ b/src/internet/spotify/spotifyservice.cpp
@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
system_blob_path_ = QCoreApplication::applicationDirPath() +
"/../PlugIns/clementine-spotifyblob";
"/../PlugIns/clementine-spotifyblob";
#else
- system_blob_path_ = QCoreApplication::applicationDirPath() +
+ system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") +
"/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
"/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
#endif
--
2.3.6

42
pkgs/applications/audio/clementine/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base
, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig
, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf
, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
let
withSpotify = config.clementine.spotify or false;
@@ -10,31 +10,36 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
version = "1.2.3";
version = "1.3.1";
exeName = "clementine";
src = fetchurl {
url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz;
sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq";
};
patches = [
./clementine-1.2.1-include-paths.patch
./clementine-dbus-namespace.patch
./clementine-spotify-blob.patch
# Required so as to avoid adding libspotify as a build dependency (as it is
# unfree and thus would prevent us from having a free package).
./clementine-spotify-blob-remove-from-build.patch
];
buildInputs = [
boost
cmake
chromaprint
fftw
gettext
glew
gst-plugins-base
gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
gvfs
libechonest
liblastfm
libpulseaudio
pcre
pkgconfig
protobuf
qca2
@@ -59,7 +64,7 @@ let
-e 's,-Wno-unused-private-field,,g'
'';
meta = with stdenv.lib; {
homepage = "http://www.clementine-player.org";
homepage = http://www.clementine-player.org;
description = "A multiplatform music player";
license = licenses.gpl3Plus;
platforms = platforms.linux;
@@ -71,7 +76,12 @@ let
blob = stdenv.mkDerivation {
name = "clementine-blob-${version}";
# Use the same patches and sources as Clementine
inherit patches src;
inherit src;
patches = [
./clementine-spotify-blob.patch
];
buildInputs = buildInputs ++ [ libspotify ];
# Only build and install the Spotify blob
preBuild = ''
@@ -84,7 +94,7 @@ let
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = "http://www.clementine-player.org";
homepage = http://www.clementine-player.org;
description = "Spotify integration for Clementine";
# The blob itself is Apache-licensed, although libspotify is unfree.
license = licenses.asl20;
@@ -104,7 +114,7 @@ runCommand "clementine-${version}"
dontPatchELF = true;
dontStrip = true;
meta = {
homepage = "http://www.clementine-player.org";
homepage = http://www.clementine-player.org;
description = "A multiplatform music player"
+ " (" + (optionalString withSpotify "with Spotify, ")
+ "with gstreamer plugins: "
@@ -119,7 +129,7 @@ runCommand "clementine-${version}"
mkdir -p $out/bin
makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \
${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
mkdir -p $out/share
for dir in applications icons kde4; do

6
pkgs/applications/audio/clerk/default.nix
View File

@@ -13,13 +13,11 @@ stdenv.mkDerivation {
buildInputs = [ makeWrapper pythonPackages.mpd2 ];
buildPhase = ''
echo skipping build phase...
'';
dontBuild = true;
installPhase = ''
DESTDIR=$out PREFIX=/ make install
wrapProgram $out/bin/clerk $out/bin/clerk \
wrapProgram $out/bin/clerk \
--prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"
'';

2
pkgs/applications/audio/cmus/default.nix
View File

@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
makeFlags = [ "LD=$(CC)" ];
meta = with stdenv.lib; {
description = "Small, fast and powerful console music player for Linux and *BSD";
homepage = https://cmus.github.io/;

2
pkgs/applications/audio/deadbeef/default.nix
View File

@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Ultimate Music Player for GNU/Linux";
homepage = "http://deadbeef.sourceforge.net/";
homepage = http://deadbeef.sourceforge.net/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.abbradar ];

2
pkgs/applications/audio/deadbeef/plugins/mpris2.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "MPRISv2 plugin for the DeaDBeeF music player";
homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/";
homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.abbradar ];

2
pkgs/applications/audio/dirt/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An unimpressive thingie for playing bits of samples with some level of accuracy";
homepage = "https://github.com/tidalcycles/Dirt";
homepage = https://github.com/tidalcycles/Dirt;
license = licenses.gpl3;
maintainers = with maintainers; [ anderspapitto ];
platforms = with platforms; linux;

6
pkgs/applications/audio/distrho/default.nix
View File

@@ -2,12 +2,12 @@
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec {
name = "distrho-ports-unstable-2016-06-26";
name = "distrho-ports-unstable-2017-08-04";
src = fetchgit {
url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
rev = "e3969853ec9ba897c50ac060f0167313e2a18b29";
sha256 = "0id4p8dlnlv5271yvmyawfr754nzah7xhvjkj633lw5yr3mq707m";
rev = "f591a1066cd3929536699bb516caa4b5efd9d025";
sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9";
};
patchPhase = ''

29
pkgs/applications/audio/dr14_tmeter/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, python3Packages, pkgs }:
python3Packages.buildPythonApplication rec {
name = "dr14_tmeter-${version}";
version = "1.0.16";
disabled = !python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "simon-r";
repo = "dr14_t.meter";
rev = "v${version}";
sha256 = "1nfsasi7kx0myxkahbd7rz8796mcf5nsadrsjjpx2kgaaw5nkv1m";
};
propagatedBuildInputs = with pkgs; [
python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame
];
# There are no tests
doCheck = false;
meta = with stdenv.lib; {
description = "Compute the DR14 of a given audio file according to the procedure described by the Pleasurize Music Foundation";
license = licenses.gpl3Plus;
homepage = http://dr14tmeter.sourceforge.net/;
maintainers = [ maintainers.adisbladis ];
};
}

12
pkgs/applications/audio/drumgizmo/default.nix
View File

@@ -1,26 +1,26 @@
{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libX11, libpng
{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng
, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler
}:
stdenv.mkDerivation rec {
version = "0.9.12";
version = "0.9.14";
name = "drumgizmo-${version}";
src = fetchurl {
url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
sha256 = "0kqrss9v3vpznmh4jgi3783wmprr645s3i485jlvdscpysjfkh6z";
sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4";
};
configureFlags = [ "--enable-lv2" ];
buildInputs = [
alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf
libsndfile lv2 pkgconfig zita-resampler
alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs
libsmf libsndfile lv2 pkgconfig zita-resampler
];
meta = with stdenv.lib; {
description = "An LV2 sample based drum plugin";
homepage = http://www.drumgizmo.org;
homepage = https://www.drumgizmo.org;
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu maintainers.nico202 ];

6
pkgs/applications/audio/easytag/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram $out/bin/easytag \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
'';
NIX_LDFLAGS = "-lid3tag -lz";
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf
itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
];
meta = with stdenv.lib; {
description = "View and edit tags for various audio files";
homepage = "http://projects.gnome.org/easytag/";
homepage = http://projects.gnome.org/easytag/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fuuzetsu ];
platforms = platforms.linux;

2
pkgs/applications/audio/espeak-ng/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak";
homepage = "https://github.com/espeak-ng/espeak-ng";
homepage = https://github.com/espeak-ng/espeak-ng;
license = licenses.gpl3;
maintainers = with maintainers; [ aske ];
platforms = platforms.linux;

4
pkgs/applications/audio/flac/default.nix
View File

@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
#doCheck = true; # takes lots of time
outputs = [ "bin" "dev" "out" "doc" ];
outputs = [ "bin" "dev" "out" "man" "doc" ];
meta = with stdenv.lib; {
homepage = http://xiph.org/flac/;
homepage = https://xiph.org/flac/;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
platforms = platforms.all;
maintainers = [ maintainers.mornfall ];

21
pkgs/applications/audio/flac123/default.nix Normal file
View File

@@ -0,0 +1,21 @@
{ stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }:
stdenv.mkDerivation rec {
name = "flac123-${version}";
version = "0.0.12";
src = fetchurl {
url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz";
sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ flac libao libogg popt ];
meta = with stdenv.lib; {
homepage = http://flac-tools.sourceforge.net/;
description = "A command-line program for playing FLAC audio files";
license = licenses.gpl2Plus;
platforms = platforms.all;
};
}

2
pkgs/applications/audio/fldigi/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Digital modem program";
homepage = http://sourceforge.net/projects/fldigi/;
homepage = https://sourceforge.net/projects/fldigi/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ];
platforms = stdenv.lib.platforms.linux;

4
pkgs/applications/audio/freewheeling/default.nix
View File

@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
improv. We leave mice and menus, and dive into our own process
of making sound.
Freewheeling runs under Mac OS X and Linux, and is open source
Freewheeling runs under macOS and Linux, and is open source
software, released under the GNU GPL license.
'' ;
homepage = "http://freewheeling.sourceforge.net";
homepage = http://freewheeling.sourceforge.net;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.sepi ];
platforms = stdenv.lib.platforms.linux;

4
pkgs/applications/audio/google-play-music-desktop-player/default.nix
View File

@@ -4,7 +4,7 @@
}:
let
version = "4.3.0";
version = "4.4.0";
deps = [
alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
sha256 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb";
sha256 = "01a52rsp0a9k47mm3wqnhnmlnd7fw6xmdrn882msldijjgwsq5cc";
};
dontBuild = true;

2
pkgs/applications/audio/gpodder/default.nix
View File

@@ -61,7 +61,7 @@ python2Packages.buildPythonApplication rec {
gPodder downloads and manages free audio and video content (podcasts)
for you. Listen directly on your computer or on your mobile devices.
'';
homepage = "http://gpodder.org/";
homepage = http://gpodder.org/;
license = licenses.gpl3;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ skeidel mic92 ];

2
pkgs/applications/audio/gtklick/default.nix
View File

@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
'';
meta = {
homepage = "http://das.nasophon.de/gtklick/";
homepage = http://das.nasophon.de/gtklick/;
description = "Simple metronome with an easy-to-use GTK interface";
license = stdenv.lib.licenses.gpl2Plus;
};

11
pkgs/applications/audio/helm/default.nix
View File

@@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, libjack2
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
, lv2, pkgconfig, mesa }:
stdenv.mkDerivation rec {
version = "0.8.6";
version = "0.9.0";
name = "helm-${version}";
src = fetchFromGitHub {
owner = "mtytel";
repo = "helm";
rev = "19f86e6b4db83c1c6b143fc27883592ac4e43489";
sha256 = "0a46wnbfqkns8l136v79rr9gv4hhba065igjwkjddf045c9l94l8";
rev = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e";
sha256 = "17ys2vvhncx9i3ydg3xwgz1d3gqv4yr5mqi7vr0i0ca6nad6x3d4";
};
buildInputs = [
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender xorg.libXrandr
freetype alsaLib libjack2 pkgconfig mesa lv2
freetype alsaLib curl libjack2 pkgconfig mesa lv2
];
CXXFLAGS = "-DHAVE_LROUND";
@@ -26,6 +26,7 @@
buildPhase = ''
make lv2
make standalone
'';
installPhase = ''

2
pkgs/applications/audio/iannix/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Graphical open-source sequencer,";
homepage = http://www.iannix.org/;
homepage = https://www.iannix.org/;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.nico202 ];

2
pkgs/applications/audio/klick/default.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
meta = {
homepage = "http://das.nasophon.de/klick/";
homepage = http://das.nasophon.de/klick/;
description = "Advanced command-line metronome for JACK";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;

2
pkgs/applications/audio/lastfmsubmitd/default.nix
View File

@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
installCommand = "python setup.py install --prefix=$out";
meta = {
homepage = "http://www.red-bean.com/decklin/lastfmsubmitd/";
homepage = http://www.red-bean.com/decklin/lastfmsubmitd/;
description = "An last.fm audio scrobbler and daemon";
};
}

2
pkgs/applications/audio/lastwatch/default.nix
View File

@@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec {
];
meta = {
homepage = "https://github.com/aszlig/LastWatch";
homepage = https://github.com/aszlig/LastWatch;
description = "An inotify-based last.fm audio scrobbler";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;

2
pkgs/applications/audio/lmms/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Linux MultiMedia Studio";
homepage = "http://lmms.sourceforge.net";
homepage = http://lmms.sourceforge.net;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];

4
pkgs/applications/audio/mixxx/default.nix
View File

@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
};
patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776
buildInputs = [
chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = http://mixxx.org;
homepage = https://mixxx.org;
description = "Digital DJ mixing software";
license = licenses.gpl2Plus;
maintainers = [ maintainers.aszlig maintainers.goibhniu ];

13
pkgs/applications/audio/mixxx/sqlite.patch Normal file
View File

@@ -0,0 +1,13 @@
diff -urN old/src/library/trackcollection.h mixxx-2.0.0/src/library/trackcollection.h
--- old/src/library/trackcollection.h 2017-07-30 00:04:48.511029517 -0400
+++ mixxx-2.0.0/src/library/trackcollection.h 2017-07-30 00:05:03.378699826 -0400
@@ -34,8 +34,7 @@
#include "library/dao/libraryhashdao.h"
#ifdef __SQLITE3__
-typedef struct sqlite3_context sqlite3_context;
-typedef struct Mem sqlite3_value;
+#include <sqlite3.h>
#endif
class TrackInfoObject;

27
pkgs/applications/audio/mopidy-iris/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, pythonPackages, mopidy, mopidy-local-images }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-iris-${version}";
version = "3.2.0";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
sha256 = "cb97cb14b2d6836f3c28c5fd0ada44b4a33f2e74380f44bd5d03beffa5f67b30";
};
propagatedBuildInputs = [
mopidy
mopidy-local-images
pythonPackages.configobj
pythonPackages.pylast
pythonPackages.spotipy
];
meta = with stdenv.lib; {
homepage = https://github.com/jaedb/Iris;
description = "A fully-functional Mopidy web client encompassing Spotify and many other backends";
license = licenses.asl20;
maintainers = [ maintainers.rvolosatovs ];
};
}

27
pkgs/applications/audio/mopidy-local-images/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-local-images-${version}";
version = "1.0.0";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy-local-images";
rev = "v${version}";
sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d";
};
propagatedBuildInputs = [
mopidy
pythonPackages.pykka
pythonPackages.uritools
];
meta = with stdenv.lib; {
homepage = https://github.com/mopidy/mopidy-local-images;
description = "Mopidy local library proxy extension for handling embedded album art";
license = licenses.asl20;
maintainers = [ maintainers.rvolosatovs ];
};
}

26
pkgs/applications/audio/mopidy-local-sqlite/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-local-sqlite-${version}";
version = "1.0.0";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy-local-sqlite";
rev = "v${version}";
sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv";
};
propagatedBuildInputs = [
mopidy
pythonPackages.uritools
];
meta = with stdenv.lib; {
homepage = https://github.com/mopidy/mopidy-local-sqlite;
description = "Mopidy SQLite local library extension";
license = licenses.asl20;
maintainers = [ maintainers.rvolosatovs ];
};
}

2
pkgs/applications/audio/mp3splt/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
homepage = http://sourceforge.net/projects/mp3splt/;
homepage = https://sourceforge.net/projects/mp3splt/;
license = licenses.gpl2;
maintainers = [ maintainers.bosu ];
platforms = platforms.unix;

8
pkgs/applications/audio/mpg123/default.nix
View File

@@ -1,19 +1,19 @@
{ stdenv
, fetchurl, alsaLib
, buildPlatform, hostPlatform
, hostPlatform
}:
stdenv.mkDerivation rec {
name = "mpg123-1.23.8";
name = "mpg123-1.25.4";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy";
sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
${if buildPlatform != hostPlatform then "configureFlags" else null} =
configureFlags =
stdenv.lib.optional (hostPlatform ? mpg123) "--with-cpu=${hostPlatform.mpg123.cpu}";
meta = {

18
pkgs/applications/audio/ncmpcpp/default.nix
View File

@@ -1,39 +1,33 @@
{ stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline
, libiconv, icu
, libiconv, icu, curl
, outputsSupport ? false # outputs screen
, visualizerSupport ? false, fftw ? null # visualizer screen
, clockSupport ? false # clock screen
, unicodeSupport ? true # utf8 support
, curlSupport ? true, curl ? null # allow fetching lyrics from the internet
, taglibSupport ? true, taglib ? null # tag editor
}:
assert visualizerSupport -> (fftw != null);
assert curlSupport -> (curl != null);
assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ncmpcpp-${version}";
version = "0.7.7";
version = "0.8";
src = fetchurl {
url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
sha256 = "1vq19m36608pvw1g8nbcaqqb89wsw05v35pi45xwr20z7g4bxg5p";
sha256 = "0nj6ky805a55acj0w57sbn3vfmmkbqp97rhbi0q9848n10f2l3rg";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
++ optional outputsSupport "--enable-outputs"
++ optional visualizerSupport "--enable-visualizer --with-fftw"
++ optional clockSupport "--enable-clock"
++ optional unicodeSupport "--enable-unicode"
++ optional curlSupport "--with-curl"
++ optional taglibSupport "--with-taglib";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu ]
++ optional curlSupport curl
buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ]
++ optional visualizerSupport fftw
++ optional taglibSupport taglib;
@@ -41,7 +35,7 @@ stdenv.mkDerivation rec {
description = "A featureful ncurses based MPD client inspired by ncmpc";
homepage = http://ncmpcpp.rybczak.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lovek323 mornfall koral ];
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ];
platforms = platforms.all;
};
}

10
pkgs/applications/audio/nova-filters/default.nix
View File

@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
sed -i -e '4d' SConstruct
sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct
sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp
sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp
sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp
'';
@@ -27,10 +28,11 @@ stdenv.mkDerivation rec {
scons $sconsFlags "prefix=$out" install
'';
meta = {
homepage = http://klingt.org/~tim/nova-filters/;
meta = with stdenv.lib; {
description = "LADSPA plugins based on filters of nova";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
homepage = http://klingt.org/~tim/nova-filters/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
};
}

2
pkgs/applications/audio/paprefs/default.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
dialog for the PulseAudio sound server.
'';
homepage = "http://freedesktop.org/software/pulseaudio/paprefs/";
homepage = http://freedesktop.org/software/pulseaudio/paprefs/;
license = licenses.gpl2Plus;

2
pkgs/applications/audio/pavucontrol/default.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
easily control the volume of all clients, sinks, etc.
'';
homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/";
homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/;
license = stdenv.lib.licenses.gpl2Plus;

3
pkgs/applications/audio/pd-plugins/zexy/default.nix
View File

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake puredata ];
patchPhase = ''
preBuild = ''
export LD=$CXX
cd src/
for i in ${puredata}/include/pd/*; do
ln -s $i .

2
pkgs/applications/audio/pianobar/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A console front-end for Pandora.com";
homepage = "http://6xq.net/projects/pianobar/";
homepage = http://6xq.net/projects/pianobar/;
platforms = platforms.linux;
license = licenses.mit; # expat version
maintainers = with maintainers; [ eduarrrd ];

2
pkgs/applications/audio/picard/default.nix
View File

@@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication {
doCheck = false;
meta = with stdenv.lib; {
homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
homepage = http://musicbrainz.org/doc/MusicBrainz_Picard;
description = "The official MusicBrainz tagger";
maintainers = with maintainers; [ ehmry ];
license = licenses.gpl2;

2
pkgs/applications/audio/ponymix/default.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "CLI PulseAudio Volume Control";
homepage = "http://github.com/falconindy/ponymix";
homepage = https://github.com/falconindy/ponymix;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ericsagnes ];

2
pkgs/applications/audio/projectm/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
meta = {
description = "Music Visualizer";
homepage = "http://projectm.sourceforge.net/";
homepage = http://projectm.sourceforge.net/;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
};

37
pkgs/applications/audio/renoise/default.nix
View File

@@ -1,36 +1,35 @@
{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }:
{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:
# To use the full release version:
# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
# for your machine to some stable location.
# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
# Note: Renoise creates an individual build for each license which screws somewhat with the
# use of functions like requireFile as the hash will be different for every user.
let fileversion = "3_1_0";
in
stdenv.mkDerivation rec {
name = "renoise";
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
src =
if stdenv.system == "x86_64-linux" then
if demo then
if builtins.isNull releasePath then
fetchurl {
url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";
sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg";
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2";
sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
}
else
requireFile {
url = "http://backstage.renoise.com/frontend/app/index.html#/login";
name = "rns_3_0_1_linux_x86_64.tar.gz";
sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";
}
releasePath
else if stdenv.system == "i686-linux" then
if demo then
if builtins.isNull releasePath then
fetchurl {
url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";
sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58";
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2";
sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
}
else
requireFile {
url = "http://backstage.renoise.com/frontend/app/index.html#/login";
name = "rns_3_0_1_reg_x86.tar.gz";
sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";
}
else throw "platform is not suppored by Renoise";
releasePath
else throw "Platform is not supported by Renoise";
installPhase = ''
cp -r Resources $out

2
pkgs/applications/audio/schismtracker/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Music tracker application, free reimplementation of Impulse Tracker";
homepage = "http://schismtracker.org/";
homepage = http://schismtracker.org/;
license = stdenv.lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];

2
pkgs/applications/audio/seq24/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Minimal loop based midi sequencer";
homepage = "http://www.filter24.org/seq24";
homepage = http://www.filter24.org/seq24;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu nckx ];

2
pkgs/applications/audio/sisco.lv2/default.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
inherit name;
srcs = [ src robtkSrc ];
sourceRoot = "sisco.lv2-${src.rev}-src";
sourceRoot = src.name;
buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ];

2
pkgs/applications/audio/sonata/default.nix
View File

@@ -62,7 +62,7 @@ in buildPythonApplication rec {
- Commandline control
- Available in 24 languages
'';
homepage = "http://www.nongnu.org/sonata/";
homepage = http://www.nongnu.org/sonata/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.rvl ];

2
pkgs/applications/audio/sooperlooper/default.nix
View File

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
version = "${version}";
homepage = "http://essej.net/sooperlooper/index.html";
homepage = http://essej.net/sooperlooper/index.html;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
platforms = stdenv.lib.platforms.linux;

4
pkgs/applications/audio/sound-juicer/default.nix
View File

@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
makeWrapper gnome3.dconf
makeWrapper (stdenv.lib.getLib gnome3.dconf)
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
wrapProgram "$f" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
done
'';

5
pkgs/applications/audio/spotify/default.nix
View File

@@ -8,7 +8,8 @@ let
# Please update the stable branch!
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
version = "1.0.55.487.g256699aa-16";
# Be careful not to pick the testing version.
version = "1.0.49.125.g72ee7853-111";
deps = [
alsaLib
@@ -53,7 +54,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
sha256 = "09rhm0jp5prcvyf8zpw4pl422yiy8nkazcjc3lv61ngpznk3n1r0";
sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
};
buildInputs = [ dpkg makeWrapper ];

2
pkgs/applications/audio/ssrc/default.nix
View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'';
version = "${version}";
homepage = "http://shibatch.sourceforge.net/";
homepage = http://shibatch.sourceforge.net/;
license = licenses.gpl2;
maintainers = with maintainers; [ leenaars];
platforms = with platforms; [ linux ] ;

8
pkgs/applications/audio/svox/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "svox-${version}";
version = "2016-10-20";
version = "2017-07-18";
src = fetchgit {
url = "https://android.googlesource.com/platform/external/svox";
rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d";
sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g";
rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
};
postPatch = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Text-to-speech engine";
homepage = "https://android.googlesource.com/platform/external/svox";
homepage = https://android.googlesource.com/platform/external/svox;
platforms = platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ abbradar ];

2
pkgs/applications/audio/tomahawk/default.nix
View File

@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A multi-source music player";
homepage = "http://tomahawk-player.org/";
homepage = http://tomahawk-player.org/;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.aszlig ];

2
pkgs/applications/audio/yasr/default.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
]; # taken from the debian yasr package
meta = {
homepage = "http://yasr.sourceforge.net";
homepage = http://yasr.sourceforge.net;
description = "A general-purpose console screen reader";
longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems.";
platforms = stdenv.lib.platforms.linux;

2
pkgs/applications/audio/ympd/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake pkgconfig mpd_clientlib openssl ];
meta = {
homepage = "http://www.ympd.org";
homepage = http://www.ympd.org;
description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
maintainers = [ stdenv.lib.maintainers.siddharthist ];
platforms = stdenv.lib.platforms.unix;

4
pkgs/applications/audio/zynaddsubfx/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}";
version = "3.0.1";
version = "3.0.2";
src = fetchurl {
url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8";
sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm";
};
buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];

6
pkgs/applications/backup/crashplan/default.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
stdenv.mkDerivation rec {
version = "4.8.2";
version = "4.8.3";
rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
name = "crashplan-${version}-r${rev}";
src = fetchurl {
url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
sha256 = "0wh8lcm06ilcyncnp4ckg4yhyf9z3gb6v1kr111j4bpgmnd0v1yf";
sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113";
};
meta = with stdenv.lib; {
description = "An online/offline backup solution";
homepage = "http://www.crashplan.org";
homepage = http://www.crashplan.org;
license = licenses.unfree;
maintainers = with maintainers; [ sztupi domenkozar jerith666 ];
};

10
pkgs/applications/display-managers/sddm/default.nix
View File

@@ -14,7 +14,7 @@ let
};
in mkDerivation rec {
name = "sddm-unwrapped-${version}";
name = "sddm-${version}";
src = fetchFromGitHub {
owner = "sddm";
@@ -36,11 +36,7 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [
libxcb libpthreadstubs libXdmcp libXau pam systemd
];
propagatedBuildInputs = [
qtbase qtdeclarative
libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd
];
cmakeFlags = [
@@ -65,7 +61,7 @@ in mkDerivation rec {
meta = with lib; {
description = "QML based X11 display manager";
homepage = "https://github.com/sddm/sddm";
homepage = https://github.com/sddm/sddm;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ttuegel ];
};

2
pkgs/applications/editors/aewan/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Ascii-art Editor Without A Name";
homepage = "http://aewan.sourceforge.net/";
homepage = http://aewan.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};

45
pkgs/applications/editors/android-studio/default.nix → pkgs/applications/editors/android-studio/common.nix
View File

@@ -1,3 +1,4 @@
{ pname, version, build, sha256Hash, meta }:
{ bash
, buildFHSUserEnv
, coreutils
@@ -32,12 +33,14 @@
}:
let
version = "2.3.3.0";
build = "162.4069837";
androidStudio = stdenv.mkDerivation {
name = "android-studio";
name = "${pname}";
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
sha256 = sha256Hash;
};
buildInputs = [
makeWrapper
unzip
@@ -96,32 +99,22 @@ let
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf}
'';
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
};
meta = with stdenv.lib; {
description = "The Official IDE for Android";
homepage = https://developer.android.com/studio/index.html;
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ primeos ];
};
};
# Android Studio downloads prebuilt binaries as part of the SDK. These tools
# (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
# environment is used as a work around for that.
fhsEnv = buildFHSUserEnv {
name = "android-studio-fhs-env";
name = "${pname}-fhs-env";
};
in writeTextFile {
name = "android-studio-${version}";
destination = "/bin/android-studio";
executable = true;
text = ''
#!${bash}/bin/bash
${fhsEnv}/bin/android-studio-fhs-env ${androidStudio}/bin/studio.sh
'';
}
in
writeTextFile {
name = "${pname}-${version}";
destination = "/bin/${pname}";
executable = true;
text = ''
#!${bash}/bin/bash
${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
'';
} // { inherit meta; }

40
pkgs/applications/editors/android-studio/packages.nix Normal file
View File

@@ -0,0 +1,40 @@
{ stdenv, callPackage, fetchurl, makeFontsConf }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
fontsConf = makeFontsConf {
fontDirectories = [];
};
};
in rec {
stable = mkStudio rec {
pname = "android-studio";
version = "2.3.3.0";
build = "162.4069837";
sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
meta = with stdenv.lib; {
description = "The Official IDE for Android (stable version)";
longDescription = ''
Android Studio is the official IDE for Android app development, based on
IntelliJ IDEA.
'';
homepage = https://developer.android.com/studio/index.html;
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ primeos ];
};
};
preview = mkStudio rec {
pname = "android-studio-preview";
version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
build = "171.4263559";
sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";
homepage = https://developer.android.com/studio/preview/index.html;
maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
};
};
}

2
pkgs/applications/editors/aseprite/default.nix
View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Animated sprite editor & pixel art tool";
homepage = "http://www.aseprite.org/";
homepage = https://www.aseprite.org/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};

7
pkgs/applications/editors/atom/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
version = "1.18.0";
version = "1.19.2";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6";
sha256 = "0bfhcxhjsa7p35s5dz3zjxm4wc802m3k137p04l9anr3v5hrgqmb";
name = "${name}.deb";
};
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
$out/share/atom/resources/app/apm/bin/node
find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
paxmark m $out/share/atom/atom
paxmark m $out/share/atom/resources/app/apm/bin/node
'';
meta = with stdenv.lib; {

6
pkgs/applications/editors/eclipse/build-eclipse.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk2
, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2
, makeWrapper, ... }:
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11
libXrender libXtst makeWrapper zlib
] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2;
] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2;
buildCommand = ''
# Unpack tarball.
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2)} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"

68
pkgs/applications/editors/eclipse/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas
, webkitgtk2 ? null # for internal web browser
, webkitgtk24x-gtk2 ? null # for internal web browser
, buildEnv, writeText, runCommand
, callPackage
}:
@@ -12,27 +12,27 @@ rec {
buildEclipse = import ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk2
jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2
makeWrapper;
};
### Eclipse CPP
eclipse-cpp = eclipse-cpp-46; # always point to latest
eclipse-cpp = eclipse-cpp-47; # always point to latest
eclipse-cpp-46 = buildEclipse {
name = "eclipse-cpp-4.6.0";
description = "Eclipse IDE for C/C++ Developers, Neon release";
eclipse-cpp-47 = buildEclipse {
name = "eclipse-cpp-4.7.0";
description = "Eclipse IDE for C/C++ Developers, Oxygen release";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz;
sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz;
sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a";
}
else throw "Unsupported system: ${stdenv.system}";
};
@@ -56,21 +56,21 @@ rec {
### Eclipse Modeling
eclipse-modeling = eclipse-modeling-46; # always point to latest
eclipse-modeling = eclipse-modeling-47; # always point to latest
eclipse-modeling-46 = buildEclipse {
name = "eclipse-modeling-4.6";
eclipse-modeling-47 = buildEclipse {
name = "eclipse-modeling-4.7";
description = "Eclipse Modeling Tools";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz;
sha1 = "3695fd049c4cca2d235f424557e19877795a8183";
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz;
sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271";
}
else
fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz;
sha1 = "fa0694a0b44e8e9c2301417f84dba45cf9ac6e61";
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz;
sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206";
};
};
@@ -93,7 +93,7 @@ rec {
### Eclipse Platform
eclipse-platform = eclipse-platform-46; # always point to latest
eclipse-platform = eclipse-platform-47; # always point to latest
eclipse-platform-46 = buildEclipse {
name = "eclipse-platform-4.6.2";
@@ -110,6 +110,21 @@ rec {
};
};
eclipse-platform-47 = buildEclipse {
name = "eclipse-platform-4.7";
description = "Eclipse Platform Oxygen";
sources = {
"x86_64-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz;
sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq";
};
"i686-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz;
sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc";
};
};
};
### Eclipse Scala SDK
eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
@@ -132,7 +147,7 @@ rec {
### Eclipse SDK
eclipse-sdk = eclipse-sdk-46; # always point to latest
eclipse-sdk = eclipse-sdk-47; # always point to latest
eclipse-sdk-46 = buildEclipse {
name = "eclipse-sdk-4.6.2";
@@ -149,6 +164,21 @@ rec {
};
};
eclipse-sdk-47 = buildEclipse {
name = "eclipse-sdk-4.7";
description = "Eclipse Oxygen Classic";
sources = {
"x86_64-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz;
sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3";
};
"i686-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz;
sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5";
};
};
};
eclipse-sdk-37 = buildEclipse {
name = "eclipse-sdk-3.7";
description = "Eclipse Classic";

28
pkgs/applications/editors/eclipse/plugins.nix
View File

@@ -106,16 +106,16 @@ rec {
anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
version = "2.6.0.201511291145";
version = "2.7.0.201705171641";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b";
sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
};
srcPlugin = fetchurl {
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4";
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
};
meta = with stdenv.lib; {
@@ -129,16 +129,16 @@ rec {
autodetect-encoding = buildEclipsePlugin rec {
name = "autodetect-encoding-${version}";
version = "1.8.3.201610171338";
version = "1.8.4.201708052053";
srcFeature = fetchurl {
url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar";
sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f";
sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c";
};
srcPlugin = fetchurl {
url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar";
sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y";
sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im";
};
meta = with stdenv.lib; {
@@ -194,12 +194,12 @@ rec {
checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
version = "7.3.0.201612142232";
version = "8.0.0.201707161819";
src = fetchzip {
stripRoot = false;
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip";
sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj";
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip";
sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2";
};
meta = with stdenv.lib; {
@@ -364,12 +364,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
version = "4.6.2";
version = "4.7";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/org.eclipse.jdt-4.6.2.zip";
sha256 = "1nnlrl05lh1hcsh14dlisnx0vwmj21agm4wia98rv0gl2gkp19n1";
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip";
sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p";
};
meta = with stdenv.lib; {
@@ -416,7 +416,7 @@ rec {
};
meta = with stdenv.lib; {
homepage = "http://scala-ide.org/";
homepage = http://scala-ide.org/;
description = "The Scala IDE for Eclipse";
license = licenses.bsd3;
platforms = platforms.all;

8
pkgs/applications/editors/ed/default.nix
View File

@@ -32,7 +32,13 @@ stdenv.mkDerivation rec {
*/
doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
configureFlags = if hostPlatform == buildPlatform then null else [
# TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix
# 1.12 is released.
preConfigure = ''
export DESTDIR=$out
'';
configureFlags = [
"--exec-prefix=${stdenv.cc.prefix}"
"CC=${stdenv.cc.prefix}cc"
];

2
pkgs/applications/editors/emacs-modes/bbdb/3.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://savannah.nongnu.org/projects/bbdb/";
homepage = http://savannah.nongnu.org/projects/bbdb/;
description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
license = "GPL";
};

2
pkgs/applications/editors/emacs-modes/bbdb/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://bbdb.sourceforge.net/";
homepage = http://bbdb.sourceforge.net/;
description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
license = "GPL";
};

2
pkgs/applications/editors/emacs-modes/cask/default.nix
View File

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
building, packaging and more. Cask can also be used to manage
dependencies for your local Emacs configuration.
'';
homepage = "https://github.com/cask/cask";
homepage = https://github.com/cask/cask;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.jgeerds ];

Some files were not shown because too many files have changed in this diff Show More