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

Commits on Feb 6, 2017

  1. firmwareLinuxNonfree: 2016-07-12 -> 2017-02-06

    @fpletz
    fpletz committed Feb 6, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01cf43a View commit details

  2. youtubeDL: 2017.02.01 -> 2017.02.04.1

    @fpletz
    fpletz committed Feb 6, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a6b080e View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
  2. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
8 changes: 4 additions & 4 deletions pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

stdenv.mkDerivation rec {
name = "firmware-linux-nonfree-${version}";
version = "2016-07-12";
version = "2017-02-06";

# This repo is built by merging the latest versions of
# http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
# the usual set of firmware. firmware/linux-firmware usually lags kernel releases
# so iwlwifi cards will fail to load on newly released kernels.
src = fetchFromGitHub {
owner = "wkennington";
owner = "fpletz";
repo = "linux-firmware";
rev = "cccb6a0da98372bd66787710249727ad6b0aaf72";
sha256 = "1c7h8i37nbyy37zqhybxd3y6aqabfv4nrdkjg789w67mdnn6hka0";
rev = version;
sha256 = "1r5ph97rqp8asw8kx65izb3p934669n2na20yfwplbsk76c9i82v";
};

preInstall = ''
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@ with stdenv.lib;
buildPythonApplication rec {

name = "youtube-dl-${version}";
version = "2017.02.01";
version = "2017.02.04.1";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "1jkra0kgqg9ks76hwfcfsdaiknr9w8vavja0rc81ia644085axzz";
sha256 = "1aqca4mxgdjiv1qfnzqxx6lpwggfxsaahvvs235pyz0j3kywa4nj";
};

buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;