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

Merge pull request #6480 from jagajaga/fix_names

Browse Source 
Fix names (use date instead of revs) and update pkgs (cont)
This commit is contained in:
cillianderoiste 2015-02-22 14:05:07 +01:00
commit 7d719dd785
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,13 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2 { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2
, libxslt, lv2, pkgconfig, premake3, xlibs }: , libxslt, lv2, pkgconfig, premake3, xlibs }:
let
rev = "3bfddf7f";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "distrho-${rev}"; name = "DISTRHO-Ports-git-2015-01-28";
src = fetchgit { src = fetchgit {
url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
inherit rev; rev = "b4e2dc24802fe6804c60fcd2559a0bca46b7709c";
sha256 = "55dc52921bb757c3213da5ef6cab40909f39be3e3b41ba4c6cd66ad90bfb2e6c"; sha256 = "661ff6f7cda71a8dd08cbcea3f560e99f0fc2232053cbc9a2aaba854137805c6";
}; };
patchPhase = '' patchPhase = ''

11
pkgs/applications/audio/swh-lv2/default.nix
View File

@ -1,15 +1,12 @@
{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }: { stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }:
let
rev = "ec6b85e19e24ed";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "swh-lv2-${rev}"; name = "swh-lv2-git-2013-05-17";
src = fetchgit { src = fetchgit {
url = "git://github.com/swh/lv2.git"; url = "https://github.com/swh/lv2.git";
inherit rev; rev = "978d5d8f549fd22048157a6d044af0faeaacbd7f";
sha256 = "d0d918ee642cd9649215737fcc008ce2bf55f4ea893a1897138b33775ea60d17"; sha256 = "3a9c042785b856623339aedafa5bc019b41beb8034d8594c7bbd6c9c26368065";
}; };
patchPhase = '' patchPhase = ''

17
pkgs/applications/misc/twmn/default.nix
View File

@ -1,19 +1,20 @@
{ fetchurl, stdenv, fetchgit, qt4, pkgconfig, boost, dbus }: { fetchurl, stdenv, fetchgit, qt5, pkgconfig, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "9f52882688ba03d7aaab2e3fd83cb05cfbf1a374"; name = "twmn-git-2014-09-23";
name = "twmn-${rev}";
src = fetchgit { src = fetchgit {
inherit rev;
url = "https://github.com/sboli/twmn.git"; url = "https://github.com/sboli/twmn.git";
sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3"; rev = "9492a47e25547e602dd57efd807033677c90b150";
sha256 = "9c91e9d3d6d7f9d90d34da6f1a4b9f3dee65605c1e43729417d6921c54dded6b";
}; };
buildInputs = [ qt4 pkgconfig boost ]; buildInputs = [ qt5 pkgconfig boost ];
propagatedBuildInputs = [ dbus ];
configurePhase = "qmake"; configurePhase = ''
sed -i s/-Werror// twmnd/twmnd.pro
qmake
'';
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"