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: 1aa527111710
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: f8463ef80020
Choose a head ref
  • 9 commits
  • 10 files changed
  • 6 contributors

Commits on Jun 6, 2020

  1. fwupd: 1.3.7 → 1.3.8 

    fwupd/fwupd@1.3.7...1.3.8
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Jun 6, 2020
    Copy the full SHA
    83b5900 View commit details

  2. fwupd: 1.3.8 → 1.3.9 

    https://github.com/fwupd/fwupd/blob/1.3.9/data/org.freedesktop.fwupd.metainfo.xml#L38-L63
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Jun 6, 2020
    Copy the full SHA
    a2add30 View commit details

Commits on Jun 7, 2020

  1. Merge pull request #89692 from grahamc/fwupd-backport 

    [r20.03] fwupd: 1.3.7 -> 1.3.9
    @grahamc
    grahamc authored Jun 7, 2020
    Copy the full SHA
    a53ed23 View commit details

  2. epkowa: fix parsing of interpreters (#82909) (#89506) 

    Building with -std=c99 breaks the obsolete "%as" format string, which
completely breaks the parsing of epkowa interpreters. This means that
no scanner requiring plugins worked.

(cherry picked from commit e22eb2d)

Co-authored-by: Dominik Honnef <dominik@honnef.co>
    @symphorien @dominikh
    symphorien and dominikh authored Jun 7, 2020
    Copy the full SHA
    0c2ddc1 View commit details

  3. boot: fix order of arguments for hasPrefix (#89751) 

    (cherry picked from commit e4f4450)
    @Nadrieril @Ekleog
    Nadrieril authored and Ekleog committed Jun 7, 2020
    Copy the full SHA
    11c84a9 View commit details

  4. roundcube: 1.4.5 -> 1.4.6 

    https://github.com/roundcube/roundcubemail/releases/tag/1.4.6
(cherry picked from commit fbf25a9)
    @Ma27
    Ma27 committed Jun 7, 2020
    Copy the full SHA
    3154bb9 View commit details

  5. i3status-rust: 0.13.1 -> 0.14.0 

    https://github.com/greshake/i3status-rust/releases/tag/v0.14.0
(cherry picked from commit 8454ef7)
    @Ma27
    Ma27 committed Jun 7, 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
    cc28f9c View commit details

  6. dlib: 19.19 -> 19.20 

    https://github.com/davisking/dlib/releases/tag/v19.20
(cherry picked from commit 3fec30c)
    @Ma27
    Ma27 committed Jun 7, 2020
    Copy the full SHA
    7a7fcac View commit details

  7. cargo-make: 0.30.8 -> 0.31.0 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.31.0
(cherry picked from commit 0558bb9)
    @Ma27
    Ma27 committed Jun 7, 2020
    Copy the full SHA
    f8463ef View commit details
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/stage-1.nix
View file
Original file line number Diff line number Diff line change
@@ -571,7 +571,7 @@ in
{ assertion = !config.boot.loader.supportsInitrdSecrets ->
all (source:
builtins.isPath source ||
(builtins.isString source && hasPrefix source builtins.storeDir))
(builtins.isString source && hasPrefix builtins.storeDir source))
(attrValues config.boot.initrd.secrets);
message = ''
boot.loader.initrd.secrets values must be unquoted paths when
16 changes: 12 additions & 4 deletions pkgs/applications/window-managers/i3/status-rust.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }:
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio, fetchpatch }:

rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.13.1";
version = "0.14.0";

src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg";
sha256 = "0d2xigm932x6pc9z24g5cg8xq2crd9n3wq1bwi96h35w799lagjg";
};

cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv";
cargoPatches = [
# https://github.com/greshake/i3status-rust/pull/732/ (Update Cargo.lock)
(fetchpatch {
url = "https://github.com/greshake/i3status-rust/commit/7762a5c7ad668272fb8bb8409f12242094b032b8.patch";
sha256 = "097f6w91cn53cj1g3bbdqm9jjib5fkb3id91jqvq88h43x14b8zb";
})
];

cargoSha256 = "098d08likpnycfb32s83vp0bphxf27k1gfcc26721fc9c8ah0lah";

nativeBuildInputs = [ pkgconfig ];

4 changes: 2 additions & 2 deletions pkgs/development/libraries/dlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

stdenv.mkDerivation rec {
pname = "dlib";
version = "19.19";
version = "19.20";

src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
sha256 = "0574p46zf85nx33cam4yqcg20g94kkmrvi5689r1xshprr0szghp";
sha256 = "10b5hrprlls0nhljx18ys8cms7bgqirvhxlx6gbvbprbi6q16f9r";
};

postPatch = ''
124 changes: 72 additions & 52 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading