Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 76e50a3fbfbc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ae72f2715d8
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 21, 2017

  1. alsa-lib: 1.1.4.1 -> 1.1.5

    @andir
    andir committed Nov 21, 2017
    Copy the full SHA
    e207ac1 View commit details

  2. alsa-utils: 1.1.4 -> 1.1.5

    @andir
    andir committed Nov 21, 2017
    Copy the full SHA
    9b8ebd8 View commit details

  3. alsa-tools: 1.1.3 -> 1.1.5

    @andir
    andir committed Nov 21, 2017
    Copy the full SHA
    e1f8c72 View commit details

  4. alsa-plugins: 1.1.4 -> 1.1.5

    @andir
    andir committed Nov 21, 2017
    Copy the full SHA
    111c8f1 View commit details

Commits on Nov 22, 2017

  1. Merge pull request #31908 from andir/alsa-1.1.5 

    alsa upgrade to 1.1.5
    @Mic92
    Mic92 authored Nov 22, 2017
    Copy the full SHA
    9ae72f2 View commit details
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/alsa-lib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "alsa-lib-1.1.4.1";
name = "alsa-lib-1.1.5";

src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
"http://alsa.cybermirror.org/lib/${name}.tar.bz2"
];
sha256 = "0xjvi381105gldhv0z872a0x58sghznyx19j45lw5iyi2h68gfwi";
sha256 = "1rhacnlj0grvfagjx5qzsnbhw7m7lyccghqs4jsv0dnsqv9qmxpl";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/alsa-plugins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:

stdenv.mkDerivation rec {
name = "alsa-plugins-1.1.4";
name = "alsa-plugins-1.1.5";

src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
"http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
];
sha256 = "12hsvm6rpinjkg06pa9hzndkdrbfw6wk6yk00cm8y1gbv8xiq3ak";
sha256 = "073zpgvj4pldmzqq97l40wngvbqnvrkc8yw153mgny9kypwaazbr";
};

# ToDo: a52, etc.?
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/alsa-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@

stdenv.mkDerivation rec {
name = "alsa-tools-${version}";
version = "1.1.3";
version = "1.1.5";

src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2"
"http://alsa.cybermirror.org/tools/${name}.tar.bz2"
];
sha256 = "02b75fyfmm9m2iz59d3xa97cas4f697a4pzdxn1i64kjd36iv3yq";
sha256 = "0d6m5dm5yskfr6q42cv1ihp5lfgv4a67nj39gpp26ll3vrknag5w";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/alsa-utils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

stdenv.mkDerivation rec {
name = "alsa-utils-${version}";
version = "1.1.4";
version = "1.1.5";

src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
"http://alsa.cybermirror.org/utils/${name}.tar.bz2"
];
sha256 = "17cxih9ibjp1193dyd79j50pyfa9dvrs6r9kpwrvzicjvr2110x7";
sha256 = "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj";
};

patchPhase = ''