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

Commits on Oct 15, 2019

  1. ell: 0.21 -> 0.22 

    (cherry picked from commit f0779e4)
    @dtzWill @flokli
    dtzWill authored and flokli committed Oct 15, 2019
    Copy the full SHA
    988c9ad View commit details

  2. ell: 0.22 -> 0.24 

    (cherry picked from commit d3c069c)
    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    76da71f View commit details

  3. iwd: 0.20 -> 0.22 

    We need rst2man to build manpages.

I also removed revert-create-dirs-on-install.patch, as it doesn't apply
cleanly anymore, and is purely cosmetic anyway.

(cherry picked from commit 29ba759)
    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    e160758 View commit details
Showing with 16 additions and 6 deletions.
  1. +2 −2 pkgs/os-specific/linux/ell/default.nix
  2. +14 −4 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.21";
version = "0.24";

outputs = [ "out" "dev" ];

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

patches = [
18 changes: 14 additions & 4 deletions pkgs/os-specific/linux/iwd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, python3Packages }:
{ stdenv
, fetchgit
, fetchpatch
, autoreconfHook
, pkgconfig
, ell
, coreutils
, docutils
, readline
, python3Packages
}:

stdenv.mkDerivation rec {
pname = "iwd";

version = "0.19";
version = "0.22";

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

nativeBuildInputs = [
autoreconfHook
docutils
pkgconfig
python3Packages.wrapPython
];