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: 5491aaa27e96
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d3e23fa32fa
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 7, 2018

  1. audacity: 2.2.0 -> 2.2.1

    @adisbladis
    adisbladis committed Jan 7, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: C34BF9DCC9DF8210
    Learn about vigilant mode
    Copy the full SHA
    c06f2ef View commit details

  2. btrfs-progs: 4.14 -> 4.14.1

    @adisbladis
    adisbladis committed Jan 7, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: C34BF9DCC9DF8210
    Learn about vigilant mode
    Copy the full SHA
    9ece657 View commit details

  3. debootstrap: 1.0.92 -> 1.0.93

    @adisbladis
    adisbladis committed Jan 7, 2018
    Copy the full SHA
    470ba2f View commit details

  4. linuxPackages.dpdk: needs libelf from kernel.moduleBuildDependencies

    @adisbladis
    adisbladis committed Jan 7, 2018
    Copy the full SHA
    0d3e23f View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/audacity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "2.2.0";
version = "2.2.1";
name = "audacity-${version}";

src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z";
};

preConfigure = /* we prefer system-wide libs */ ''
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/dpdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
buildInputs = [ libvirt ];

RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/btrfs-progs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
}:

let version = "4.14"; in
let version = "4.14.1"; in

stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";

src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "1bwirg6hz6gyfj5r3xkj4lfwadvl9pxlccf916fsmdn27fy5q289";
sha256 = "1palnddw3d50kyflwk1j4xapbc6jniid6j5i9dsr8l8a7nkv7ich";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/debootstrap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
# There is also cdebootstrap now. Is that easier to maintain?
stdenv.mkDerivation rec {
name = "debootstrap-${version}";
version = "1.0.92";
version = "1.0.93";

src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
sha256 = "06gp6ivmfh0ks4mibx1mz0pwzjyxqas319s741pp9b3k091jkip1";
sha256 = "1nyp9fwb7xrk1vin81dmgx2g9rb52yg4gwz4rcx97gamw4mlvbfd";
};

buildInputs = [ dpkg gettext gawk perl ];