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

Commits on Oct 11, 2019

  1. ell: 0.22 -> 0.24

    @flokli
    flokli committed Oct 11, 2019
    Copy the full SHA
    d3c069c View commit details

  2. 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.
    @flokli
    flokli committed Oct 11, 2019
    Copy the full SHA
    29ba759 View commit details

Commits on Oct 15, 2019

  1. iwd: 0.20 -> 0.22 (#70993) 

    iwd: 0.20 -> 0.22
    @flokli
    flokli authored Oct 15, 2019
    Copy the full SHA
    514f21a View commit details
Showing with 6 additions and 14 deletions.
  1. +2 −2 pkgs/os-specific/linux/ell/default.nix
  2. +4 −12 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.22";
version = "0.24";

outputs = [ "out" "dev" ];

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

patches = [
16 changes: 4 additions & 12 deletions pkgs/os-specific/linux/iwd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,32 +5,24 @@
, pkgconfig
, ell
, coreutils
, docutils
, readline
, python3Packages
}:

stdenv.mkDerivation rec {
pname = "iwd";
version = "0.20";
version = "0.22";

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

patches = [
# Undo creating ReadWritePaths as instalation target.
(fetchpatch {
name = "revert-create-dirs-on-install.patch";
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=5a96c11664eb553bc28a2142af382b190254edbb";
sha256 = "08gkz3ia1l5xsh3pbx4abimgf7m88wygfpfyg77yi6dwavjqm6cx";
revert = true;
})
];

nativeBuildInputs = [
autoreconfHook
docutils
pkgconfig
python3Packages.wrapPython
];