Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 058ab4cdf539
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c826371c492
Choose a head ref
  • 6 commits
  • 6 files changed
  • 2 contributors

Commits on Aug 23, 2018

  1. Bumping mono to 5.4.1.6 (#45516)

    @sterfield @xeji
    sterfield authored and xeji committed Aug 23, 2018
    Copy the full SHA
    86b51e4 View commit details

  2. synthv1: 0.9.0 -> 0.9.2 (#45517)

    @magnetophon @xeji
    magnetophon authored and xeji committed Aug 23, 2018
    Copy the full SHA
    af4e506 View commit details

  3. guitarix: 0.37.1 -> 0.37.2 (#45518)

    @magnetophon @xeji
    magnetophon authored and xeji committed Aug 23, 2018
    Copy the full SHA
    8018df5 View commit details

  4. drumkv1: 0.9.0 -> 0.9.2 (#45519)

    @magnetophon @xeji
    magnetophon authored and xeji committed Aug 23, 2018
    Copy the full SHA
    86add99 View commit details

  5. padthv1: 0.9.0 -> 0.9.2 (#45520)

    @magnetophon @xeji
    magnetophon authored and xeji committed Aug 23, 2018
    Copy the full SHA
    33aa225 View commit details

  6. samplv1: 0.9.0 -> 0.9.2 (#45521)

    @magnetophon @xeji
    magnetophon authored and xeji committed Aug 23, 2018
    Copy the full SHA
    7c82637 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/drumkv1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.9.0";
version = "0.9.2";

src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab";
sha256 = "1z9l43z91d01b9rzam2cj9qmmg6s5y65fjvb83ms4iaa1p0mnwrn";
};

buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
8 changes: 4 additions & 4 deletions pkgs/applications/audio/guitarix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, avahi, bluez, boost, eigen, fftw, glib, glib-networking
, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, wrapGAppsHook, zita-convolver, zita-resampler
, wrapGAppsHook, zita-convolver, zita-resampler, curl
, optimizationSupport ? false # Enable support for native CPU extensions
}:

@@ -12,11 +12,11 @@ in

stdenv.mkDerivation rec {
name = "guitarix-${version}";
version = "0.37.1";
version = "0.37.3";

src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
sha256 = "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai";
sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac";
};

nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
avahi bluez boost eigen fftw glib glibmm glib-networking.out
gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf
libsndfile lilv lv2 serd sord sratom zita-convolver
zita-resampler
zita-resampler curl
];

configureFlags = [
4 changes: 2 additions & 2 deletions pkgs/applications/audio/padthv1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "padthv1-${version}";
version = "0.9.0";
version = "0.9.2";

src = fetchurl {
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh";
sha256 = "1alfl0l5qdll0w5lwhrwzj5dina1big1zmjg5imi9h06dzhz51xl";
};

buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/samplv1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "samplv1-${version}";
version = "0.9.0";
version = "0.9.2";

src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk";
sha256 = "0rfcp4v971qfhw1hb43hw12wlxmg2q13l0m1h93pyfi5l4mfjkds";
};

buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/synthv1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "synthv1-${version}";
version = "0.9.0";
version = "0.9.2";

src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
sha256 = "1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp";
sha256 = "1r60l286n8y4a4rrlnbc3h7xk4s2pvqykvskls89prxg0lkpz7kl";
};

buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
6 changes: 3 additions & 3 deletions pkgs/servers/emby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono46, ffmpeg, ... }:
{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono54, ffmpeg, ... }:

stdenv.mkDerivation rec {
name = "emby-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
makeWrapper
];
propagatedBuildInputs = with pkgs; [
mono46
mono54
sqlite
];

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -r * $out/bin
makeWrapper "${mono46}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
makeWrapper "${mono54}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
--add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
'';