aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/applications/audio
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/audio')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/aacgain/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ardour/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/asunder/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/bsequencer/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/cadence/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/cantata/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/cava/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/cmusfm/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/drumkv1/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ecasound/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/eflite/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faustlive.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/geonkick/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/goattracker/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/greg/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/iannix/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/no_error.patch18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/jamulus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/build-install.patch16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mamba/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/midas/generic.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/midas/m32edit.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/midas/x32edit.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local.nix30
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/muse/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/darwin.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/musikcube/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/mympd/default.nix53
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ncspot/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/config.patch13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/nuclear/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/openmpt123/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/opustags/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/padthv1/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/pianobooster/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/picoloop/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/plexamp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/ptcollab/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/puddletag/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/qmmp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/qtractor/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/samplv1/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/sayonara/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/strawberry/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/svox/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/vmpk/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/audio/whipper/default.nix4
91 files changed, 553 insertions, 412 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/aacgain/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/aacgain/default.nix
index 194514c65b53..83b359b1b1cb 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/aacgain/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/aacgain/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ stdenv, fetchFromGitLab, fetchpatch }:
stdenv.mkDerivation {
name = "aacgain-1.9.0";
- src = fetchFromGitHub {
+ src = fetchFromGitLab {
owner = "mulx";
repo = "aacgain";
rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ardour/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ardour/default.nix
index 0c38057d56f8..49579e332946 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ardour/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ardour/default.nix
@@ -12,17 +12,14 @@
, fftw
, fftwSinglePrec
, flac
-, fluidsynth
, glibc
, glibmm
, graphviz
, gtkmm2
-, hidapi
, itstool
, libarchive
, libjack2
, liblo
-, libltc
, libogg
, libpulseaudio
, librdf_raptor
@@ -42,11 +39,11 @@
, perl
, pkg-config
, python3
-, qm-dsp
, readline
, rubberband
, serd
, sord
+, soundtouch
, sratom
, suil
, taglib
@@ -55,13 +52,13 @@
}:
stdenv.mkDerivation rec {
pname = "ardour";
- version = "6.2";
+ version = "6.3";
# don't fetch releases from the GitHub mirror, they are broken
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
rev = version;
- sha256 = "17jxbqavricy01x4ymq6d302djsqfnv84m7dm4fd8cpka0dqjp1y";
+ sha256 = "050p1adgyirr790a3xp878pq3axqwzcmrk3drgm9z6v753h0xhcd";
};
patches = [
@@ -91,15 +88,12 @@ stdenv.mkDerivation rec {
fftw
fftwSinglePrec
flac
- fluidsynth
glibmm
gtkmm2
- hidapi
itstool
libarchive
libjack2
liblo
- libltc
libogg
libpulseaudio
librdf_raptor
@@ -118,11 +112,11 @@ stdenv.mkDerivation rec {
pango
perl
python3
- qm-dsp
readline
rubberband
serd
sord
+ soundtouch
sratom
suil
taglib
@@ -136,11 +130,11 @@ stdenv.mkDerivation rec {
"--no-phone-home"
"--optimize"
"--ptformat"
- "--qm-dsp-include=${qm-dsp}/include/qm-dsp"
"--run-tests"
"--test"
- "--use-external-libs"
];
+ # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437
+ # "--use-external-libs"
# Ardour's wscript requires git revision and date to be available.
# Since they are not, let's generate the file manually.
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/asunder/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/asunder/default.nix
index 998535a8eb0b..610085a137aa 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/asunder/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/asunder/default.nix
@@ -12,11 +12,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.9.6";
+ version = "2.9.7";
pname = "asunder";
src = fetchurl {
url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
- sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a";
+ sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1";
};
nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix
index a26431a82edf..f1f97de256e6 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitHub
, qmake
, qtbase
-, qtmultimedia
, qttools
, alsaSupport ? stdenv.hostPlatform.isLinux
, alsaLib
@@ -19,20 +18,20 @@ let
in
mkDerivation rec {
pname = "bambootracker";
- version = "0.4.4";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "rerrahkr";
repo = "BambooTracker";
rev = "v${version}";
- sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc";
+ sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42";
};
sourceRoot = "source/BambooTracker";
nativeBuildInputs = [ qmake qttools ];
- buildInputs = [ qtbase qtmultimedia ]
+ buildInputs = [ qtbase ]
++ optional alsaSupport alsaLib
++ optional pulseSupport libpulseaudio
++ optional jackSupport libjack2;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix
index 7d4d53408d28..33827287712a 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 7e5099f3c318..6841cd6e75d9 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -1,17 +1,17 @@
-{ fetchurl, bitwig-studio1, pulseaudio, xorg }:
+{ fetchurl, bitwig-studio1, pulseaudio, libjack2, xorg }:
bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}";
- version = "3.2.7";
+ version = "3.2.8";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "1mj9kii4bnk5w2p18hypwy8swkpzkaqw98q5fsjq362x4qm0b3py";
+ sha256 = "18ldgmnv7bigb4mch888kjpf4abalpiwmlhwd7rjb9qf6p72fhpj";
};
buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ];
- runtimeDependencies = [ pulseaudio ];
+ runtimeDependencies = [ pulseaudio libjack2 ];
installPhase = ''
${oldAttrs.installPhase}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/bsequencer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
index 2c9217183e4a..093e9450de8b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix
index 5a2675187c02..e239a89b8995 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/cadence/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/cadence/default.nix
index 4f4ad4b8c5b0..7230bf63287d 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/cadence/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/cadence/default.nix
@@ -32,6 +32,11 @@ mkDerivation rec {
url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch";
sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8";
})
+ # Fix build with Qt 5.15
+ (fetchpatch {
+ url = "https://github.com/falkTX/Cadence/commit/c167f35fbb76c4246c730b29262a59da73010412.patch";
+ sha256 = "1gm9q6gx03sla5vcnisznc95pjdi2703f8b3mj2kby9rfx2pylyh";
+ })
];
postPatch = ''
@@ -94,7 +99,7 @@ mkDerivation rec {
homepage = "https://github.com/falkTX/Cadence/";
description = "Collection of tools useful for audio production";
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ];
+ maintainers = with stdenv.lib.maintainers; [ worldofpeace ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/cantata/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/cantata/default.nix
index df19ac942288..85806ca9a0d2 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/cantata/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/cantata/default.nix
@@ -31,7 +31,7 @@ assert withReplaygain -> withTaglib;
assert withLibVlc -> withHttpStream;
let
- version = "2.4.1";
+ version = "2.4.2";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
@@ -47,7 +47,7 @@ in mkDerivation {
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
- sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c";
+ sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/cava/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/cava/default.nix
index 26cc8cd78da3..a92a5325f16d 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/cava/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/cava/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "cava";
- version = "0.7.2";
+ version = "0.7.3";
buildInputs = [
alsaLib
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "karlstav";
repo = "cava";
rev = version;
- sha256 = "1chc08spjf5i17n8y48aqzdxsj8vvf0r2l62ldw2pqgw60dacvs1";
+ sha256 = "04j5hb29hivcbk542sfsx9m57dbnj2s6qpvy9fs488zvgjbgxrai";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix
index 3c78295db674..912662b7726c 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl,
-utillinux, pythonPackages, libnotify }:
+util-linux, pythonPackages, libnotify }:
stdenv.mkDerivation {
name = "clerk-2016-10-14";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
installPhase = ''
DESTDIR=$out PREFIX=/ make install
wrapProgram $out/bin/clerk \
- --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}"
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
index 6695b9a7237c..3e8360e1eaf6 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
stdenv.mkDerivation {
- version = "2018-10-11";
+ version = "2020-07-23";
pname = "cmusfm-unstable";
src = fetchFromGitHub {
owner = "Arkq";
repo = "cmusfm";
- rev = "ad2fd0aad3f4f1a25add1b8c2f179e8859885873";
- sha256 = "0wpwdwgyrp64nvwc6shy0n387p31j6aw6cnmfi9x2y1jhl5hbv6b";
+ rev = "73df3e64d8aa3b5053b639615b8f81d512420e52";
+ sha256 = "1p9i65v8hda9bsps4hm9m2b7aw9ivk4ncllg8svyp455gn5v8xx6";
};
# building
configureFlags = [ "--enable-libnotify" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix
index a5947bd37f19..1a78b783f53a 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
format = "other"; # no setup.py
pname = "cozy";
- version = "0.6.7";
+ version = "0.7.2";
# Temporary fix
# See https://github.com/NixOS/nixpkgs/issues/57029
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
owner = "geigi";
repo = pname;
rev = version;
- sha256 = "0f8dyqj6111czn8spgsnic1fqs3kimjwl1b19mw55fa924b9bhsa";
+ sha256 = "0fmbddi4ga0bppwg3rm3yjmf7jgqc6zfslmavnr1pglbzkjhy9fs";
};
nativeBuildInputs = [
@@ -55,18 +55,23 @@ python3Packages.buildPythonApplication rec {
]);
propagatedBuildInputs = with python3Packages; [
- gst-python
- pygobject3
+ apsw
+ cairo
dbus-python
+ distro
+ gst-python
+ magic
mutagen
+ packaging
peewee
- magic
+ pygobject3
+ pytz
+ requests
];
postPatch = ''
- chmod +x data/meson_post_install.py
- patchShebangs data/meson_post_install.py
- substituteInPlace cozy/magic/magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
'';
postInstall = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
index 7a6acb25e802..82a47b8173a2 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "drumkv1";
- version = "0.9.16";
+ version = "0.9.18";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
- sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv";
+ sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix
new file mode 100644
index 000000000000..031203dda756
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, boost, flac, id3lib, pkg-config
+, taglib, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "dsf2flac";
+ version = "unstable-2018-01-02";
+
+ src = fetchFromGitHub {
+ owner = "hank";
+ repo = pname;
+ rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16";
+ sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc";
+ };
+
+ buildInputs = [ boost flac id3lib taglib zlib ];
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ export LIBS="$LIBS -lz"
+ '';
+
+ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+
+ meta = with stdenv.lib; {
+ description = "A DSD to FLAC transcoding tool";
+ homepage = "https://github.com/hank/dsf2flac";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ dmrauh ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ecasound/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ecasound/default.nix
index 13c48fc12af3..adb6f6b74274 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ecasound/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ecasound/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ];
meta = {
- description = "Ecasound is a software package designed for multitrack audio processing";
+ description = "Software package designed for multitrack audio processing";
license = with stdenv.lib.licenses; [ gpl2 lgpl21 ];
homepage = "http://nosignal.fi/ecasound/";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/eflite/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/eflite/default.nix
index f9a579512cab..30a35501771b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/eflite/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/eflite/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://eflite.sourceforge.net";
- description = "EFlite is a speech server for screen readers";
+ description = "Speech server for screen readers";
longDescription = ''
EFlite is a speech server for Emacspeak and other screen
readers that allows them to interface with Festival Lite,
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix
index 64b8e7244311..16956433655c 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix
@@ -17,7 +17,7 @@ let
};
meta = with stdenv.lib; {
- homepage = "http://faust.grame.fr/";
+ homepage = "https://faust.grame.fr/";
downloadPage = "https://sourceforge.net/projects/faudiostream/files/";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix
index 515f8a6f9af2..1c096374a42b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix
@@ -31,7 +31,7 @@ let
};
meta = with stdenv.lib; {
- homepage = "http://faust.grame.fr/";
+ homepage = "https://faust.grame.fr/";
downloadPage = "https://github.com/grame-cncm/faust/";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
index 0f703704961a..dd4cdd29c663 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
@@ -2,7 +2,7 @@
, gtk2
, jack2Full
, alsaLib
-, opencv2
+, opencv
, libsndfile
, which
}:
@@ -20,7 +20,7 @@ faust.wrapWithBuildEnv {
gtk2
jack2Full
alsaLib
- opencv2
+ opencv
libsndfile
which
];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix
index 753208c54c25..76e4b5ce8dbb 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix
@@ -1,6 +1,5 @@
{ faust
, jack2Full
-, opencv2
, qt4
, libsndfile
, alsaLib
@@ -18,7 +17,6 @@ faust.wrapWithBuildEnv {
propagatedBuildInputs = [
jack2Full
- opencv2
qt4
libsndfile
alsaLib
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faustlive.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faustlive.nix
index 03ca4ce8eb0c..907ea3ed7caf 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faustlive.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faustlive.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
+, llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl
, bc, coreutils, which, libsndfile, pkg-config
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl
+ llvm qt48Full qrencode libmicrohttpd_0_9_70 libjack2 alsaLib faust curl
bc coreutils which libsndfile pkg-config
];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
together the convenience of a standalone interpreted language with the
efficiency of a compiled language. It's ideal for fast prototyping.
'';
- homepage = "http://faust.grame.fr/";
+ homepage = "https://faust.grame.fr/";
license = licenses.gpl3;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
index bcdc1fe719cd..7045d6811d38 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
- version = "1.31";
+ version = "1.41_fix";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
- sha256 = "02j876d4xmbdmqairrs5190dzdm3k4s5hi3g9wvx62cxnnw7igha";
+ sha256 = "0c7jli79ckachl5n2rbhc4yzml8nc36pl9yzxcwgaz544q8pzmaa";
};
nativeBuildInputs = [ cmake ];
@@ -32,7 +32,9 @@ stdenv.mkDerivation rec {
homepage = "https://16-bits.org/ft2.php";
license = licenses.bsd3;
maintainers = with maintainers; [ fgaz ];
- platforms = platforms.all;
+ # From HOW-TO-COMPILE.txt:
+ # > This code is NOT big-endian compatible
+ platforms = platforms.littleEndian;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/geonkick/default.nix
index e32bef008d99..804aaf75febe 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/geonkick/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/geonkick/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }:
+{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson
+, libjack2, lv2, libX11, cairo }:
stdenv.mkDerivation rec {
pname = "geonkick";
- version = "2.3.8";
+ version = "2.5.1";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
- sha256 = "07809yy2q7dd6fcp0yndlg1vw2ca2zisnsplb3xrxvzdvrqlw910";
+ sha256 = "14svwrxqw15j6wjy3x8s28yyrafa31bm7d1ns5h6gvpndccwc1kw";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -16,13 +17,16 @@ stdenv.mkDerivation rec {
buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
# https://github.com/iurie-sw/geonkick/issues/120
- cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ];
+ cmakeFlags = [
+ "-DGKICK_REDKITE_SDK_PATH=${redkite}"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ ];
- meta = {
+ meta = with stdenv.lib; {
homepage = "https://gitlab.com/iurie-sw/geonkick";
description = "A free software percussion synthesizer";
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.magnetophon ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
index c7df55118c7a..cf3a8ae4197b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -10,7 +10,7 @@
, python3
, pkgconfig
, glib
-, libhandy
+, libhandy_0
, gtk3
, dbus
, openssl
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
glib
gtk3
- libhandy
+ libhandy_0
dbus
openssl
sqlite
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/goattracker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/goattracker/default.nix
index 77a04221b84b..76b5617d23c3 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/goattracker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/goattracker/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, fetchurl
, unzip
+, copyDesktopItems
, makeDesktopItem
, imagemagick
, SDL
@@ -37,7 +38,7 @@ in stdenv.mkDerivation rec {
};
sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src";
- nativeBuildInputs = [ unzip imagemagick ];
+ nativeBuildInputs = [ copyDesktopItems unzip imagemagick ];
buildInputs = [ SDL ];
# PREFIX gets treated as BINDIR.
@@ -51,11 +52,16 @@ in stdenv.mkDerivation rec {
# Other files get installed during the build phase.
installPhase = ''
+ runHook preInstall
+
convert goattrk2.bmp goattracker.png
install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png
- ${desktopItem.buildCommand}
+
+ runHook postInstall
'';
+ desktopItems = [ desktopItem ];
+
meta = {
description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices"
+ optionalString isStereo " - Stereo version";
@@ -66,4 +72,3 @@ in stdenv.mkDerivation rec {
platforms = platforms.all;
};
}
-
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/greg/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/greg/default.nix
index e027680f5fe6..c243a81ac2eb 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/greg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/greg/default.nix
@@ -13,8 +13,7 @@ with pythonPackages; buildPythonApplication rec {
sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";
};
- buildInputs = with pythonPackages; [ feedparser ];
- propagatedBuildInputs = buildInputs;
+ propagatedBuildInputs = [ setuptools feedparser ];
meta = with stdenv.lib; {
homepage = "https://github.com/manolomartinez/greg";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix
index 3f1fac79623d..831df6ba3c8d 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix
@@ -4,7 +4,7 @@
let
pname = "HybridReverb2";
- version = "2.1.1";
+ version = "2.1.2";
owner = "jpcima";
DBversion = "1.0.0";
in
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
inherit owner;
repo = pname;
rev = "v${version}";
- sha256 = "15mba9qvlis0qrklr50wp3jdysvmk33m7pvclp0k1is9pirj97cb";
+ sha256 = "16r20plz1w068bgbkrydv01a991ygjybdya3ah7bhp3m5xafjwqb";
fetchSubmodules = true;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/iannix/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/iannix/default.nix
index fa779a7f0f4e..3765d2ca6788 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/iannix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/iannix/default.nix
@@ -1,14 +1,15 @@
-{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
+{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
}:
-mkDerivation {
+mkDerivation rec {
pname = "iannix";
- version = "2016-01-31";
+ version = "0.9.20-b";
+
src = fetchFromGitHub {
owner = "iannix";
repo = "IanniX";
- rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755";
- sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
+ rev = "v${version}";
+ sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q=";
};
nativeBuildInputs = [ pkgconfig qmake ];
@@ -20,11 +21,11 @@ mkDerivation {
enableParallelBuilding = true;
- meta = {
- description = "Graphical open-source sequencer,";
+ meta = with lib; {
+ description = "Graphical open-source sequencer";
homepage = "https://www.iannix.org/";
- license = stdenv.lib.licenses.lgpl3;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.nico202 ];
+ license = licenses.lgpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ freezeboy ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/default.nix
index 405217675a3e..14cda8a81b52 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }:
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
-stdenv.mkDerivation {
- name = "jackmix-0.5.2";
- src = fetchurl {
- url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz";
- sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
+mkDerivation rec {
+ pname = "jackmix";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "kampfschlaefer";
+ repo = "jackmix";
+ rev = version;
+ sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
};
patches = [ ./no_error.patch ];
nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ];
buildInputs = [
- qt4
+ qtbase
lash
jack
alsaLib
@@ -21,11 +25,11 @@ stdenv.mkDerivation {
install -D jackmix/jackmix $out/bin/jackmix
'';
- meta = {
+ meta = with lib; {
description = "Matrix-Mixer for the Jack-Audio-connection-Kit";
- homepage = "http://www.arnoldarts.de/jackmix/";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.kampfschlaefer ];
- platforms = stdenv.lib.platforms.linux;
+ homepage = "https://github.com/kampfschlaefer/jackmix";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ kampfschlaefer ];
+ platforms = platforms.linux;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/no_error.patch b/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/no_error.patch
index d1a714ded9ca..593800134e1f 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/no_error.patch
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/jackmix/no_error.patch
@@ -1,13 +1,13 @@
diff --git a/SConstruct b/SConstruct
-index 4290fa5..0a7a679 100644
+index 8bf6517..a432aa9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ env = Environment(
- env.Replace( LIBS="" )
- env.Replace( LIBPATH="" )
-
--env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] )
-+env.MergeFlags( ['-g', '-fpic'] )
-
- tests = { }
- tests.update( env['PKGCONFIG_TESTS'] )
+ env.Replace(LIBS="")
+ env.Replace(LIBPATH="")
+
+-env.MergeFlags(['-Wall', '-Werror', '-g', '-fpic', '-std=c++11'])
++env.MergeFlags(['-g', '-fpic', '-std=c++11'])
+
+ tests = {}
+ tests.update(env['PKGCONFIG_TESTS'])
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/jamulus/default.nix
index 7a5887d4f92b..4cc48b89f9c4 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/jamulus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/jamulus/default.nix
@@ -3,12 +3,12 @@
mkDerivation rec {
pname = "jamulus";
- version = "3.5.10";
+ version = "3.6.1";
src = fetchFromGitHub {
owner = "corrados";
repo = "jamulus";
rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82";
+ sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15";
};
nativeBuildInputs = [ pkg-config qmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch b/infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch
deleted file mode 100644
index 3e1c822be2ae..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c3865405ca707e3284a81709577d85ce2b3db72c Mon Sep 17 00:00:00 2001
-From: Francesco Gazzetta <fgaz@fgaz.me>
-Date: Wed, 19 Aug 2020 15:06:58 +0200
-Subject: [PATCH 2/2] Set the initial directory to the current directory
-
-otherwise the user has to navigate from the nix store, which makes the program
-crash due to its size
----
- sources/Adapters/DEB/System/DEBSystem.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/Adapters/DEB/System/DEBSystem.cpp b/sources/Adapters/DEB/System/DEBSystem.cpp
-index 6e86693..65d2cdd 100644
---- a/sources/Adapters/DEB/System/DEBSystem.cpp
-+++ b/sources/Adapters/DEB/System/DEBSystem.cpp
-@@ -54,7 +54,7 @@ void DEBSystem::Boot(int argc,char **argv) {
- }
- Path::SetAlias("bin",dirname(buff)) ;
-
-- Path::SetAlias("root","bin:..") ;
-+ Path::SetAlias("root",".") ;
-
- #ifdef _DEBUG
- Trace::GetInstance()->SetLogger(*(new StdOutLogger()));
---
-2.25.4
-
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix
index 91d709687949..2fb453cf19c5 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, unstableGitUpdater
, SDL
, jack2
, Foundation
@@ -7,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "littlegptracker";
- version = "unstable-2019-04-14";
+ version = "unstable-2020-11-26";
src = fetchFromGitHub {
owner = "Mdashdotdashn";
repo = "littlegptracker";
- rev = "0ed729b46739e3df5e111c6fa4d548fde2d3b891";
- sha256 = "1pc6lg2qp6xh7ahs5d5pb63ms4h2dz7ryp3c7mci4g37gbwbsj5b";
+ rev = "4aca8cd765e1ad586da62decd019e66cb64b45b8";
+ sha256 = "0f2ip8z5wxk8fvlw47mczsbcrzh4nh1hgw1fwf5gjrqnzm8v111x";
};
buildInputs = [
@@ -26,9 +27,6 @@ stdenv.mkDerivation rec {
# Remove outdated (pre-64bit) checks that would fail on modern platforms
# (see description in patch file)
./0001-Remove-coherency-checks.patch
- # Set starting directory to cwd, default is in /nix/store and causes a crash
- # (see description in patch file)
- ./0002-Set-the-initial-directory-to-the-current-directory.patch
];
preBuild = "cd projects";
@@ -45,6 +43,8 @@ stdenv.mkDerivation rec {
installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe";
in "install -Dm555 lgpt.${extension} $out/bin/lgpt";
+ passthru.updateScript = unstableGitUpdater { };
+
meta = with stdenv.lib; {
description = "A music tracker similar to lsdj optimised to run on portable game consoles";
longDescription = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix
index f325185920d7..14ab2aaf2d0b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix
@@ -7,6 +7,7 @@
, python3
, gtk3
, gst_all_1
+, libhandy
, libsecret
, libsoup
, appstream-glib
@@ -24,7 +25,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
- version = "1.3.2";
+ version = "1.4.5";
format = "other";
doCheck = false;
@@ -33,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "14854j1dhq67s1vzs0lqy345vbl6f5w8nb36n4i33fmpva2flsk3";
+ sha256 = "1i5qcpp3fpkda08g6nkiiff8lsjmv5xsvpa0512kigq5z0lsagrx";
};
nativeBuildInputs = [
@@ -57,6 +58,7 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-ugly
gstreamer
gtk3
+ libhandy
libsoup
pango
totem-pl-parser
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/build-install.patch b/infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/build-install.patch
deleted file mode 100644
index 4dae65438cb5..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/build-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090
-Author: Pavol Rusnak <stick@gk2.sk>
-Date: Tue Dec 4 12:06:22 2018 +0100
-
- build: add install: true to executable in meson.build
-
-diff --git a/meson.build b/meson.build
-index 050e1b1..9224ed5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -39,4 +39,5 @@ endforeach
-
- # compile the main project
- executable('luppp', luppp_src + [version_hxx],
-+ install: true,
- dependencies: deps)
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/default.nix
index c1494ffc3334..6cf2575b8e5f 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/luppp/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub
+{ stdenv
+, fetchFromGitHub
, meson
, ninja
, pkgconfig
@@ -12,26 +13,32 @@
stdenv.mkDerivation rec {
pname = "luppp";
- version = "1.2.0";
- patches = [ ./build-install.patch ];
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "openAVproductions";
repo = "openAV-Luppp";
rev = "release-${version}";
- sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a";
+ sha256 = "1ncbn099fyfnr7jw2bp3wf2g9k738lw53m6ssw6wji2wxwmghv78";
};
nativeBuildInputs = [
- meson ninja pkgconfig
+ meson
+ ninja
+ pkgconfig
];
buildInputs = [
- jack2 cairo liblo libsndfile libsamplerate ntk
+ jack2
+ cairo
+ liblo
+ libsndfile
+ libsamplerate
+ ntk
];
meta = with stdenv.lib; {
- homepage = "http://openavproductions.com/luppp/";
+ homepage = "http://openavproductions.com/luppp/"; # https does not work
description = "A music creation tool, intended for live use";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ prusnak ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mamba/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mamba/default.nix
index 23a94668ded1..dc8620fdd4e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mamba/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mamba/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "mamba";
- version = "1.6";
+ version = "1.8";
src = fetchFromGitHub {
owner = "brummer10";
repo = "Mamba";
rev = "v${version}";
- sha256 = "02w47347cbfqxybh908ww5ifd9jcns8v0msycq59y9q7x0a2h6fh";
+ sha256 = "049gvdvvv3hkh1b47h0bia02g1p71agwh6g7q0n4yxz4d81b8kha";
fetchSubmodules = true;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix
index 26736ea3e8a3..37c384967737 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "MellowPlayer";
- version = "3.6.6";
+ version = "3.6.7";
src = fetchFromGitLab {
owner = "ColinDuquesnoy";
repo = "MellowPlayer";
rev = version;
- sha256 = "14y175fl6wg04fz0fhx553r8z3nwqrs2lr3rdls70bhwx5x6lavw";
+ sha256 = "1p0z8hkbxaxrqjmknjwxb0mpf3xdssik3m5cwrsv1881k1x2x5qs";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/generic.nix
index 293d1b0b6c82..769593919d46 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/generic.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/generic.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, sha256, ... }:
+{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, url, sha256, ... }:
stdenv.mkDerivation rec {
inherit type;
baseName = "${type}-Edit";
name = "${lib.toLower baseName}-${version}";
src = fetchurl {
- url = "http://downloads.music-group.com/software/behringer/${type}/${type}-Edit_LINUX_64bit_${version}.tar.gz";
+ inherit url;
inherit sha256;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/m32edit.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/m32edit.nix
index 6af11d42e31f..082da1621be3 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/m32edit.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/m32edit.nix
@@ -1,9 +1,10 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
brand = "Midas";
type = "M32";
- version = "3.2";
- sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd";
- homepage = "http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads";
+ version = "4.1";
+ url = "https://mediadl.musictribe.com/download/software/midas_${type}/${type}-Edit_LINUX_64-Bit_${version}.tar.gz";
+ sha256 = "0aqhdrxqa49liyvbbw5x32kwk0h1spzvmizmdxklrfs64vvr9bvh";
+ homepage = "https://midasconsoles.com/midas/product?modelCode=P0B3I";
})
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/x32edit.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/x32edit.nix
index 7e364ff984a5..a07c83a9dfe4 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/x32edit.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/midas/x32edit.nix
@@ -1,9 +1,10 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
brand = "Behringer";
type = "X32";
- version = "3.2";
- sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk";
- homepage = "http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads";
+ version = "4.1";
+ url = "https://mediadl.musictribe.com/download/software/behringer/${type}/${type}-Edit_LINUX_64-Bit_${version}.tar.gz";
+ sha256 = "0zsw7qfmcci87skkpq8vx5zxk35phn8y4byispvki9ascifnnb33";
+ homepage = "https://www.behringer.com/behringer/product?modelCode=P0ASF";
})
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix
index c66771be1c9d..64c0cae7a648 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "MIDIVisualizer";
- version = "5.1";
+ version = "5.2";
src = fetchFromGitHub {
owner = "kosua20";
repo = pname;
rev = "v${version}";
- sha256 = "1fjlfa0qjpnjxl3bx5cq3dkswv9wihxmgfpkjijqp7kvf3q127rq";
+ sha256 = "19z8m6clirz8kwfjp0z1j69fjfna8ar7hkgqnlm3lrc84gyx2rpf";
};
nativeBuildInputs = [ cmake pkg-config makeWrapper];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix
index 23322ca5663e..fc532482cba4 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix
@@ -14,9 +14,7 @@ let
mopidy-gmusic = callPackage ./gmusic.nix { };
- mopidy-local-images = callPackage ./local-images.nix { };
-
- mopidy-local-sqlite = callPackage ./local-sqlite.nix { };
+ mopidy-local = callPackage ./local.nix { };
mopidy-spotify = callPackage ./spotify.nix { };
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
index 467ba6fe3f70..48f955fd7137 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages, mopidy, mopidy-local-images }:
+{ stdenv, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec {
pname = "Mopidy-Iris";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix
deleted file mode 100644
index 085fe855e8a8..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobject-introspection }:
-
-pythonPackages.buildPythonApplication rec {
- pname = "mopidy-local-images";
- version = "1.0.0";
-
- src = fetchFromGitHub {
- owner = "mopidy";
- repo = "mopidy-local-images";
- rev = "v${version}";
- sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d";
- };
-
- buildInputs = [ gobject-introspection ];
-
- checkInputs = [
- pythonPackages.mock
- ];
-
- 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 ];
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix
deleted file mode 100644
index 23e01c02a0f5..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
-
-pythonPackages.buildPythonApplication rec {
- pname = "mopidy-local-sqlite";
- 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 ];
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local.nix
new file mode 100644
index 000000000000..43554280565e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local.nix
@@ -0,0 +1,30 @@
+{ lib
+, mopidy
+, python3Packages
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "Mopidy-Local";
+ version = "3.1.1";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j";
+ };
+
+ propagatedBuildInputs = [
+ mopidy
+ python3Packages.uritools
+ ];
+
+ checkInputs = [
+ python3Packages.pytestCheckHook
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mopidy/mopidy-local";
+ description = "Mopidy extension for playing music from your local music archive";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ruuda ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix
index 28216020b78a..eb5672fe135b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix
@@ -16,13 +16,24 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = with gst_all_1; [
- gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
- glib-networking gobject-introspection
+ glib-networking
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-ugly
];
- propagatedBuildInputs = with pythonPackages; [
- gst-python pygobject3 pykka tornado requests setuptools
- ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
+ propagatedBuildInputs = [
+ gobject-introspection
+ ] ++ (with pythonPackages; [
+ gst-python
+ pygobject3
+ pykka
+ requests
+ setuptools
+ tornado
+ ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python
+ );
# There are no tests
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index d628e5894a28..b10accedc6f8 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
pname = "mopidy-musicbox-webclient";
- version = "2.4.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "pimusicbox";
repo = "mopidy-musicbox-webclient";
rev = "v${version}";
- sha256 = "0784s32pap9rbki3f0f7swaf6946sdv4xzidns13jmw9ilifk5z4";
+ sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9";
};
propagatedBuildInputs = [ mopidy ];
@@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec {
meta = with stdenv.lib; {
description = "Mopidy extension for playing music from SoundCloud";
license = licenses.mit;
+ broken = stdenv.isDarwin;
maintainers = [ maintainers.spwhitt ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/muse/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/muse/default.nix
index 6ba29226b585..e7332aa18759 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/muse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/muse/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "https://www.muse-sequencer.org/";
+ homepage = "https://muse-sequencer.github.io/";
description = "MIDI/Audio sequencer with recording and editing capabilities";
longDescription = ''
MusE is a MIDI/Audio sequencer with recording and editing capabilities
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/darwin.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/darwin.nix
index 8870a144c9f5..4a2ae29f36ad 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/darwin.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/darwin.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
pname = "musescore-darwin";
version = concatStringsSep "." versionComponents;
+ # The disk image contains the .app and a symlink to /Applications.
+ sourceRoot = "${appName}.app";
+
src = fetchurl {
url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix
index 71c639ca4068..c9a1f44ec639 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig
+{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
, qtquickcontrols2, qtscript, qtsvg, qttools
@@ -7,12 +7,13 @@
mkDerivation rec {
pname = "musescore";
- version = "3.5.0";
+ version = "3.5.2";
- src = fetchzip {
- url = "https://github.com/musescore/MuseScore/releases/download/v3.5/MuseScore-${version}.zip";
- sha256 = "0m598xh0s4f5m4l2ymy7g44bbvc14bcfi4gifhjnrg091rsk57c9";
- stripRoot = false;
+ src = fetchFromGitHub {
+ owner = "musescore";
+ repo = "MuseScore";
+ rev = "v${version}";
+ sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s=";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/musikcube/default.nix
index 8fc0616ff73b..c6d1a264a9c3 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/musikcube/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/musikcube/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "musikcube";
- version = "0.93.1";
+ version = "0.95.0";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
- sha256 = "05qsxyr7x8l0vlmn4yjg4gglxvcw9raf6vfzvblsl2ngsdsrnizy";
+ sha256 = "16ksr4yjkg88bpij1i49dzi07ffhqq8b36r090y4fq5czrc420rc";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mympd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mympd/default.nix
new file mode 100644
index 000000000000..5c8c5e7c7bff
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mympd/default.nix
@@ -0,0 +1,53 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, mpd_clientlib
+, openssl
+, lua5_3
+, libid3tag
+, flac
+, mongoose
+}:
+
+stdenv.mkDerivation rec {
+ pname = "mympd";
+ version = "6.8.1";
+
+ src = fetchFromGitHub {
+ owner = "jcorporation";
+ repo = "myMPD";
+ rev = "v${version}";
+ sha256 = "dIGg2mLxN6XBDH3GFXtF7nB9a/zf/qMlPCvIulFRXn8=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ cmake
+ ];
+ buildInputs = [
+ mpd_clientlib
+ openssl
+ lua5_3
+ libid3tag
+ flac
+ ];
+
+ cmakeFlags = [
+ "-DENABLE_LUA=ON"
+ # Otherwise, it tries to parse $out/etc/mympd.conf on startup.
+ "-DCMAKE_INSTALL_SYSCONFDIR=/etc"
+ # similarly here
+ "-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd"
+ ];
+ # See https://github.com/jcorporation/myMPD/issues/315
+ hardeningDisable = [ "strictoverflow" ];
+
+ meta = {
+ homepage = "https://jcorporation.github.io/mympd";
+ description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features";
+ maintainers = [ stdenv.lib.maintainers.doronbehar ];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
index ca61aa0cd6f0..97aa06453e52 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
@@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
- version = "0.39";
+ version = "0.42";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "08xrcinfm1a7hjycf8la7gnsxbp3six70ks987dr7j42kd42irfq";
+ sha256 = "1c21sbdm6pp3kwhnzc7c6ksna7madvsmfa7j91as2g8485symqv2";
};
buildInputs = [ glib ncurses mpd_clientlib boost ]
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix
index 32d8df2f0487..89a0da5e0d63 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ncpamixer";
- version = "1.3.3";
+ version = "1.3.3.1";
src = fetchFromGitHub {
owner = "fulhax";
repo = "ncpamixer";
rev = version;
- sha256 = "19pxfvfhhrbfk1wz5awx60y51jccrgrcvlq7lb622sw2z0wzw4ac";
+ sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z";
};
buildInputs = [ ncurses libpulseaudio ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncspot/default.nix
index 2fcbf82107d6..60fb40c5f743 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncspot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncspot/default.nix
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.2.2";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2";
+ sha256 = "0vdg1ybzfj7xg8nmrb8q9vr8bpwcs52730v9v0413wjyxb7hcll2";
};
- cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr";
+ cargoSha256 = "0afaxx8dv7jn48934ba0r8kd1h8l3k00sl83v07a1xqmfcmil2qf";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/config.patch b/infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/config.patch
deleted file mode 100644
index f6e258862db6..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config.go b/config.go
-index de16249..fb91ec0 100644
---- a/config.go
-+++ b/config.go
-@@ -20,7 +20,7 @@ const configFile = "config.toml"
-
- func initializeConfigIfNot() {
- log.Println("Checking if config needs to be initialized")
-- conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: true}
-+ conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: false}
- configdir := configDir()
- ok, err := exists(configdir)
- if err != nil {
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/default.nix
index 1739d27870a0..1932f239cfd7 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/noisetorch/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "NoiseTorch";
- version = "0.5.2-beta";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "lawl";
repo = "NoiseTorch";
rev = version;
- sha256 = "1q0gfpqczlpybxcjjkiybcy6yc0gnrq8x27r0mpg4pvgwy7mps47";
+ sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf";
};
- patches = [ ./version.patch ./config.patch ./embedlibrnnoise.patch ];
+ patches = [ ./version.patch ./embedlibrnnoise.patch ];
vendorSha256 = null;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/nuclear/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/nuclear/default.nix
new file mode 100644
index 000000000000..6b2a5b67122d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/nuclear/default.nix
@@ -0,0 +1,32 @@
+{ appimageTools, lib, fetchurl }:
+let
+ pname = "nuclear";
+ version = "0.6.6";
+ name = "${pname}-v${version}";
+
+ src = fetchurl {
+ url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${name}.AppImage";
+ sha256 = "0c1335m76fv0wfbk07s8r6ln7zbmlqd66052gqfisakl8a1aafl6";
+ };
+
+ appimageContents = appimageTools.extract { inherit name src; };
+in appimageTools.wrapType2 {
+ inherit name src;
+
+ extraInstallCommands = ''
+ mv $out/bin/${name} $out/bin/${pname}
+
+ install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace 'Exec=AppRun' 'Exec=$out/bin/nuclear'
+ cp -r ${appimageContents}/usr/share/icons $out/share
+ '';
+
+ meta = with lib; {
+ description = "Streaming music player that finds free music for you";
+ homepage = "https://nuclear.js.org/";
+ license = licenses.agpl3Plus;
+ maintainers = [ maintainers.ivar ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
index 19f6d7bfb5ae..83b1ef3b0430 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
- version = "3.9.2";
+ version = "3.9.6";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
- sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv";
+ sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
index 0646407582ed..4d1387bf6331 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
@@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let
- version = "0.5.2";
+ version = "0.5.4";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
- sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l";
+ sha256 = "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk";
};
enableParallelBuilding = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/opustags/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/opustags/default.nix
new file mode 100644
index 000000000000..8e5546aec8b6
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/opustags/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, cmake, pkgconfig, libogg, fetchFromGitHub, libiconv }:
+stdenv.mkDerivation rec {
+ pname = "opustags";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "fmang";
+ repo = "opustags";
+ rev = version;
+ sha256 = "1y0czl72paawy342ff9ickaamkih43k59yfcdw7bnddypyfa7nbg";
+ };
+
+ buildInputs = [ libogg ];
+
+ nativeBuildInputs = [ cmake pkgconfig ] ++ lib.optional stdenv.isDarwin libiconv;
+
+ meta = with lib; {
+ homepage = "https://github.com/fmang/opustags";
+ description = "Ogg Opus tags editor";
+ platforms = platforms.all;
+ maintainers = [ maintainers.kmein ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/padthv1/default.nix
index 29ef027f2f20..e321119d838f 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/padthv1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "padthv1";
- version = "0.9.17";
+ version = "0.9.18";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
- sha256 = "098fk8fwcgssnfr1gilqg8g17zvch62lrn3rqsswpzbr3an5adb3";
+ sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix
index 2c0d0a24c573..a44ba689a618 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix
@@ -15,27 +15,15 @@
stdenv.mkDerivation rec {
pname = "gem-unstable";
- # The patch below applies to the latest release (v0.94), but then the build
- # fails. I didn't track down what changed between that version and the
- # current master that fixes the build on Nix
- version = "2020-03-26";
+ version = "2020-09-22";
src = fetchFromGitHub {
owner = "umlaeute";
repo = "Gem";
- rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599";
- sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy";
+ rev = "2edfde4f0587e72ef325e7f53681936dcc19655b";
+ sha256 = "0k5sq128wxi2qhaidspkw310pdgysxs47agv09pkjgvch2n4d5dq";
};
- patches = [
- # Update autoconf OpenGL/GLU/GLUT detection scripts
- # https://github.com/umlaeute/Gem/pull/251
- (fetchpatch {
- url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff";
- sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj";
- })
- ];
-
nativeBuildInputs = [
autoreconfHook
file
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pianobooster/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/pianobooster/default.nix
index 4832fce1e962..b92808775c8a 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/pianobooster/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pianobooster/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkg-config, qttools
-, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi
+, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj";
};
- nativeBuildInputs = [ cmake pkg-config qttools ];
+ nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix
index d8c927be268b..fb6f59d0ded7 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix
@@ -12,13 +12,13 @@ let
;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
- version = "2.4.4";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
- sha256 = "0iw2v37j70881v0a2rjp2miq97nscq04x1ysk1dqmi1b9hi0y17q";
+ sha256 = "193pk6fhrqar2ra8krj6xdd7sm5qfw0p708iazzwk4b8c8g0q72j";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/picoloop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/picoloop/default.nix
index 7f6773f5e514..69052988f26f 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/picoloop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/picoloop/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)";
+ description = "A synth and a stepsequencer (a clone of the famous nanoloop)";
homepage = "https://github.com/yoyz/picoloop";
platforms = platforms.linux;
license = licenses.bsd3;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/plexamp/default.nix
index 277382452313..2c33584e3621 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/plexamp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/plexamp/default.nix
@@ -2,13 +2,13 @@
let
pname = "plexamp";
- version = "3.2.0";
+ version = "3.3.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
- sha256 = "R1BhobnwoU7oJ7bNes8kH2neXqHlMPbRCNjcHyzUPqo=";
name="${pname}-${version}.AppImage";
+ sha256 = "6/asP8VR+rJ52lKKds46gSw1or9suUEmyR75pjdWHIQ=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix
index d55b79ece595..845435be60eb 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "projectm";
- version = "3.1.7";
+ version = "3.1.8";
src = fetchFromGitHub {
owner = "projectM-visualizer";
repo = "projectM";
rev = "v${version}";
- sha256 = "1wm5fym6c1yb972pmil7j9axinqqwrj68cwd2sc7ky8c5z2fsdna";
+ sha256 = "17zyxj1q0zj17jskq8w9bn2ijn34ldvdq61wy01yf5wgngax2r4z";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix
index eaabcf4bef7d..bc89505a1fe2 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
- version = "1.23";
+ version = "1.26_fix";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
- sha256 = "1vixpp0vqpawqviwl44wn8zf602zyyrgqnjzrlwjrmdzydx9c93y";
+ sha256 = "1ikhgagniiq4irsy8i3g64m6cl61lnfvs163n8gs4hm426yckyb8";
};
nativeBuildInputs = [ cmake ];
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
homepage = "https://16-bits.org/pt2.php";
license = licenses.bsd3;
maintainers = with maintainers; [ fgaz ];
- platforms = platforms.all;
+ # From HOW-TO-COMPILE.txt:
+ # > This code is NOT big-endian compatible
+ platforms = platforms.littleEndian;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ptcollab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ptcollab/default.nix
new file mode 100644
index 000000000000..ff190fdcdd36
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ptcollab/default.nix
@@ -0,0 +1,34 @@
+{ mkDerivation
+, stdenv
+, fetchFromGitHub
+, qmake
+, qtbase
+, qtmultimedia
+, libvorbis
+}:
+
+mkDerivation rec {
+ pname = "ptcollab";
+ version = "0.3.5.1";
+
+ src = fetchFromGitHub {
+ owner = "yuxshao";
+ repo = "ptcollab";
+ rev = "v${version}";
+ sha256 = "1ahfxjm1chz8k65rs7rgn4s2bgippq58fjcxl8fr21pzn718wqf1";
+ };
+
+ nativeBuildInputs = [ qmake ];
+
+ buildInputs = [ qtbase qtmultimedia libvorbis ];
+
+ meta = with stdenv.lib; {
+ description = "Experimental pxtone editor where you can collaborate with friends";
+ homepage = "https://yuxshao.github.io/ptcollab/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ OPNA2608 ];
+ platforms = platforms.all;
+ # Requires Qt5.15
+ broken = stdenv.hostPlatform.isDarwin;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/puddletag/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/puddletag/default.nix
index 56fcdcc94cd2..55cde08fe871 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/puddletag/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/puddletag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages, chromaprint }:
+{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }:
python3Packages.buildPythonApplication rec {
pname = "puddletag";
@@ -13,6 +13,8 @@ python3Packages.buildPythonApplication rec {
sourceRoot = "source/source";
+ nativeBuildInputs = [ wrapQtAppsHook ];
+
propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [
configobj
mutagen
@@ -20,9 +22,13 @@ python3Packages.buildPythonApplication rec {
pyqt5
]);
- doCheck = false; # there are no tests
+ preFixup = ''
+ makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+ '';
+
+ doCheck = false; # there are no tests
- dontStrip = true; # we are not generating any binaries
+ dontStrip = true; # we are not generating any binaries
meta = with stdenv.lib; {
description = "An audio tag editor similar to the Windows program, Mp3tag";
@@ -30,6 +36,5 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
- broken = true; # Needs Qt wrapping
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
index 6cabdc6534dd..6a19d959a23d 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
@@ -7,13 +7,13 @@ let
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "1.67";
+ version = "1.68";
src = fetchFromGitHub {
owner = "graysky2";
repo = pname;
rev = "v${version}";
- sha256 = "1mf5r7x6aiqmx9mz7gpckrqvvzxnr5gs2q1k4m42rjk6ldkpdb46";
+ sha256 = "0wrzfanwy18wyawpg8rfvfgjh3lwngqwmfpi4ww3530rfmi84cf0";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 556dd5f10619..42e780af0989 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -18,8 +18,12 @@
let
pulseSources = runCommand "pulseaudio-sources" {} ''
mkdir $out
- tar -xf ${pulseaudio.src}
- mv pulseaudio*/* $out/
+ if [ -d ${pulseaudio.src} ]; then
+ ln -s ${pulseaudio.src}/* $out/
+ else
+ tar -xf ${pulseaudio.src}
+ mv pulseaudio*/* $out/
+ fi
'';
in stdenv.mkDerivation rec {
@@ -61,7 +65,7 @@ in stdenv.mkDerivation rec {
# Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
- substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}
+ substituteInPlace CMakeLists.txt --replace '${"\${PULSE_DIR}"}' ${pulseaudio.pulseDir}
# Fraunhofer recommends to enable afterburner but upstream has it set to false by default
substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \
@@ -72,7 +76,7 @@ in stdenv.mkDerivation rec {
for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
orig_rpath=$(patchelf --print-rpath "$so")
patchelf \
- --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
+ --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/${pulseaudio.pulseDir}/modules:$orig_rpath" \
"$so"
done
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
index 3c498fe8af1b..7cdb7de4dd13 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
@@ -8,4 +8,4 @@ index 8d20dbf..63fe7ba 100644
module-bluetooth-policy
- LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
-
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PULSE_DIR}/modules/)
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
index a7b97e9daaf8..427d29768d66 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- version = "4.8.1";
+ version = "4.8.2";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6";
+ sha256 = "19h47mrxjm6x83pqcxfsshf48kd1babfk0kwdy1c7fjri7kj0g0s";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/qmmp/default.nix
index 84ff9f787d53..e6f41711fdf6 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/qmmp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
# handle that.
mkDerivation rec {
- name = "qmmp-1.4.1";
+ name = "qmmp-1.4.2";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "0p18r2ri75vbyjzfa7bcl1dm372m6jvn9zj2p5ia2rh1g77fbm9a";
+ sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/qtractor/default.nix
index 2975e6464e1c..961314088d1a 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/qtractor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/qtractor/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "qtractor";
- version = "0.9.15";
+ version = "0.9.18";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx";
+ sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/samplv1/default.nix
index 86f8f666d80d..17b3f1c3745c 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/samplv1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/samplv1/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
+{ mkDerivation, lib, fetchurl, pkgconfig, libjack2
+, alsaLib, liblo, libsndfile, lv2, qtbase, qttools
+, rubberband
+}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "samplv1";
- version = "0.9.13";
+ version = "0.9.18";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
- sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m";
+ sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4=";
};
- buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
+ nativeBuildInputs = [ qttools pkgconfig ];
- nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
homepage = "http://samplv1.sourceforge.net/";
license = licenses.gpl2Plus;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/sayonara/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/sayonara/default.nix
index c4258174500f..722333134d90 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/sayonara/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/sayonara/default.nix
@@ -1,12 +1,12 @@
{ mkDerivation
, cmake
-, fetchgit
+, fetchFromGitLab
, gst_all_1
, lib
, libpulseaudio
, ninja
, pcre
-, pkgconfig
+, pkg-config
, qtbase
, qttools
, taglib
@@ -15,34 +15,16 @@
mkDerivation rec {
pname = "sayonara-player";
- version = "1.5.1-stable5";
+ version = "1.6.0-beta6";
- src = fetchgit {
- url = "https://git.sayonara-player.com/sayonara.git";
+ src = fetchFromGitLab {
+ owner = "luciocarreras";
+ repo = "sayonara-player";
rev = version;
- sha256 = "13l7r3gaszrkyf4z8rdijfzxvcnilax4ki2mcm30wqk8d4g4qdzj";
+ sha256 = "sha256-SbJS0DQvbW++CNXbuDHQxFlLRb1kTtDdIdHOqu0YxeQ=";
};
- # all this can go with version 1.5.2
- postPatch = ''
- # if we don't delete this, sayonara will look here instead of the provided taglib
- rm -r src/3rdParty/taglib
-
- for f in \
- src/DBus/DBusNotifications.cpp \
- src/Gui/Resources/Icons/CMakeLists.txt \
- src/Utils/Utils.cpp \
- test/Util/FileHelperTest.cpp \
- ; do
-
- substituteInPlace $f --replace /usr $out
- done
-
- substituteInPlace src/Components/Shutdown/Shutdown.cpp \
- --replace /usr/bin/systemctl systemctl
- '';
-
- nativeBuildInputs = [ cmake ninja pkgconfig qttools ];
+ nativeBuildInputs = [ cmake ninja pkg-config qttools ];
buildInputs = [
libpulseaudio
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix
index 055694fb40f5..3572bbf88abb 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix
@@ -8,7 +8,7 @@
, glib
, gst_all_1
, gtk3
-, libhandy
+, libhandy_0
, meson
, ninja
, openssl
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
gdk-pixbuf
glib
gtk3
- libhandy
+ libhandy_0
openssl
sqlite
] ++ (with gst_all_1; [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix
new file mode 100644
index 000000000000..da41fb6b64ed
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, python3Packages, dbus }:
+python3Packages.buildPythonApplication rec {
+ pname = "spotify-cli-linux";
+ version = "1.6.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0slyc3jfrj3rwq8rv6p5aqkw487aw7a87kmf1fb6n4vnvcf08v7w";
+ };
+
+ preBuild = ''
+ substituteInPlace spotifycli/spotifycli.py \
+ --replace dbus-send ${dbus}/bin/dbus-send
+ '';
+
+ disabled = !python3Packages.isPy3k;
+ propagatedBuildInputs = with python3Packages; [ lyricwikia dbus-python ];
+
+ # upstream has no code tests, but uses its "tests" for linting and formatting checks
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "https://pwittchen.github.io/spotify-cli-linux/";
+ maintainers = [ maintainers.kmein ];
+ description = "A command line interface to Spotify on Linux.";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix
index 6fd52834b007..ff44f14476f1 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix
@@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.42.622.gbd112320-37";
+ version = "1.1.46.916.g416cacf1";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "42";
+ rev = "43";
deps = [
alsaLib
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "06371c6a285aba916a779cd9f2a933f97db8fb38393545baa94c8984302e003c559af7b1b35afd7df5f2c35e379e2cb80c00facf527bc22df09061cdb67d9d7a";
+ sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
};
buildInputs = [ squashfsTools makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
index 121f9cbc960f..c4e1695f0835 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl
+{ stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl
, withALSA ? true, alsaLib ? null
, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null
@@ -7,7 +7,10 @@
, dbus ? null
}:
-rustPlatform.buildRustPackage rec {
+# rust >= 1.48 causes a panic within spotifyd on music playback. as long as
+# there is no upstream fix for the issue we use an older version of rust.
+# Upstream issue: https://github.com/Spotifyd/spotifyd/issues/719
+rustPackages_1_45.rustPlatform.buildRustPackage rec {
pname = "spotifyd";
version = "0.2.24";
@@ -40,7 +43,7 @@ rustPlatform.buildRustPackage rec {
description = "An open source Spotify client running as a UNIX daemon";
homepage = "https://github.com/Spotifyd/spotifyd";
license = with licenses; [ gpl3 ];
- maintainers = with maintainers; [ anderslundstedt filalex77 marsam ];
+ maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ];
platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/strawberry/default.nix
index d6428e40312b..c2f1a0db701c 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/strawberry/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/strawberry/default.nix
@@ -23,7 +23,7 @@
, libselinux ? null
, libsepol ? null
, p11-kit ? null
-, utillinux ? null
+, util-linux ? null
, qtbase
, qtx11extras
, qttools
@@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "0.7.2";
+ version = "0.8.4";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg=";
+ sha256 = "145djlfvbkx2b1wqipk51mz82dhm27vmh9x00lkn24q1xz1y6h5n";
};
buildInputs = [
@@ -67,7 +67,7 @@ mkDerivation rec {
libselinux
libsepol
p11-kit
- utillinux
+ util-linux
]
++ lib.optionals withGstreamer (with gst_all_1; [
gstreamer
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/svox/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/svox/default.nix
index 0f8e51438830..d5b67819cb07 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/svox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/svox/default.nix
@@ -1,37 +1,24 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub, autoreconfHook, popt }:
stdenv.mkDerivation {
pname = "svox";
- version = "2017-07-18";
+ version = "2018-02-14";
- src = fetchgit {
- url = "https://android.googlesource.com/platform/external/svox";
- rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
- sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
+ # basically took the source code from android and borrowed autotool patches from debian
+ src = fetchFromGitHub {
+ owner = "naggety";
+ repo = "picotts";
+ rev = "e3ba46009ee868911fa0b53db672a55f9cc13b1c";
+ sha256 = "0k3m7vh1ak9gmxd83x29cvhzfkybgz5hnlhd9xj19l1bjyx84s8v";
};
postPatch = ''
cd pico
'';
- buildPhase = ''
- cd lib
- for i in *.c; do
- $CC -O2 -fPIC -c -o ''${i%.c}.o $i
- done
- $CC -shared -o libttspico.so *.o
- cd ..
- '';
-
- installPhase = ''
- install -Dm755 lib/libttspico.so $out/lib/libttspico.so
- mkdir -p $out/include
- cp lib/*.h $out/include
- mkdir -p $out/share/pico/lang
- cp lang/*.bin $out/share/pico/lang
- '';
+ buildInputs = [ popt ];
- NIX_CFLAGS_COMPILE = "-include stdint.h";
+ nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
description = "Text-to-speech engine";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/vmpk/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/vmpk/default.nix
index 62ae1d2c049f..dfae5d40e114 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/vmpk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/vmpk/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, cmake, pkgconfig, alsaLib, libjack2, qt4 }:
+{ mkDerivation, lib, fetchurl, cmake, pkg-config
+, qttools, qtx11extras, drumstick
+, docbook-xsl-nons
+}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "vmpk";
- version = "0.5.1";
+ version = "0.7.2";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
- sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
+ sha256 = "5oLrjQADg59Mxpb0CNLQAE574IOSYLDLJNaQ/9q2cMQ=";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ];
- buildInputs = [ alsaLib libjack2 qt4 ];
+ buildInputs = [ qtx11extras drumstick ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Virtual MIDI Piano Keyboard";
homepage = "http://vmpk.sourceforge.net/";
license = licenses.gpl3Plus;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/whipper/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/whipper/default.nix
index 5cbc9a07b6c7..3ff1368c9432 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/audio/whipper/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/whipper/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
-, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }:
+, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
python3.pkgs.buildPythonApplication rec {
pname = "whipper";
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
];
makeWrapperArgs = [
- "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
+ "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ])
];
preBuild = ''