Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2db74f11ab0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 834ad820cc60
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 14, 2020

  1. tools/security/b3sum: fix cargo hash

    @Xe
    Xe committed Mar 14, 2020
    Copy the full SHA
    f5c2ed4 View commit details

Commits on Mar 27, 2020

  1. ell: 0.27 -> 0.30 

    (cherry picked from commit 79cc0c7)
    @Ma27
    Ma27 committed Mar 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    68c3a4f View commit details

  2. iwd: 1.4 -> 1.6 

    (cherry picked from commit 0e69720)
    @Ma27
    Ma27 committed Mar 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea57fc5 View commit details

  3. Merge pull request #82515 from Xe/fix-b3sum 

    tools/security/b3sum: fix cargo hash
    @bhipple
    bhipple authored Mar 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    834ad82 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/os-specific/linux/ell/default.nix
  2. +2 −2 pkgs/os-specific/linux/iwd/default.nix
  3. +1 −1 pkgs/tools/security/b3sum/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.27";
version = "0.30";

outputs = [ "out" "dev" ];

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

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

stdenv.mkDerivation rec {
pname = "iwd";
version = "1.4";
version = "1.6";

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

nativeBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/tools/security/b3sum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {

sourceRoot = "source/b3sum";

cargoSha256 = "0qw7sr817lmj9xicc03cj1k49lwjwc1whllc7sj2g4c0nl2vndir";
cargoSha256 = "0zd02nhdh395d1yns6kxar4a5s7f6pp1a6x49nmxf7xlnbj2n4a5";
verifyCargoDeps = false;

cargoPatches = [ ./add-cargo-lock.patch ];