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

Commits on Jul 5, 2020

  1. ell: 0.31 -> 0.32 

    https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.32
(cherry picked from commit 8683ac0)
    @Ma27
    Ma27 committed Jul 5, 2020
    Copy the full SHA
    88b7aed View commit details

  2. iwd: 1.7 -> 1.8 

    https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=1.8
(cherry picked from commit 77ffd8d)
    @Ma27
    Ma27 committed Jul 5, 2020
    Copy the full SHA
    afa9ca6 View commit details
Showing with 6 additions and 4 deletions.
  1. +2 −2 pkgs/os-specific/linux/ell/default.nix
  2. +4 −2 pkgs/os-specific/linux/iwd/default.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/ell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@

stdenv.mkDerivation rec {
pname = "ell";
version = "0.31";
version = "0.32";

outputs = [ "out" "dev" ];

src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa";
sha256 = "07hm9lrhhb5y53l13yja2kr3xmjgs0azk3x7w2si99cplwkgxak2";
};

patches = [
6 changes: 4 additions & 2 deletions pkgs/os-specific/linux/iwd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,14 +13,16 @@

stdenv.mkDerivation rec {
pname = "iwd";
version = "1.7";
version = "1.8";

src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2";
sha256 = "0ds8nhbnkhxzhnnsi7vj3y2v8wq0nxqbmidhiac7mpxgjkc684gf";
};

outputs = [ "out" "man" ];

nativeBuildInputs = [
autoreconfHook
docutils