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: 2702da0d8fa0
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: a850d0a83df7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 24, 2020

  1. fwupd: 1.3.7 → 1.3.8 

    fwupd/fwupd@1.3.7...1.3.8
    @jtojnar
    jtojnar committed Feb 24, 2020
    Copy the full SHA
    a6f1220 View commit details

  2. rictydiminished-with-firacode: 1.2.0 → 1.2.2

    @jtojnar
    jtojnar committed Feb 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    10c7a4d View commit details

  3. Merge pull request #80101 from NixOS/fwupd-1.3.8 

    fwupd: 1.3.7 → 1.3.8
    @jtojnar
    jtojnar authored Feb 24, 2020
    Copy the full SHA
    a850d0a View commit details
Showing with 15 additions and 13 deletions.
  1. +6 −11 pkgs/data/fonts/rictydiminished-with-firacode/default.nix
  2. +9 −2 pkgs/os-specific/linux/firmware/fwupd/default.nix
17 changes: 6 additions & 11 deletions pkgs/data/fonts/rictydiminished-with-firacode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchgit, fontforge, python2, python3 }:
{ stdenv, fetchgit, fontforge, python3 }:

stdenv.mkDerivation rec {
pname = "rictydiminished-with-firacode";
version = "1.2.0";
version = "1.2.2";

src = fetchgit {
url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
rev = version;
sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn";
sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
fetchSubmodules = true;
};

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace apply-feature.py --replace \
'ricty = ttLib.TTFont(options.in_font)' \
'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)'
substituteInPlace build-py3.py --replace \
substituteInPlace build.py --replace \
'datetime.date.today()' \
'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))'
'';
@@ -30,21 +30,16 @@ stdenv.mkDerivation rec {
'';

nativeBuildInputs = [
# Python 3 not supported by parts of the build system
# https://github.com/hakatashi/RictyDiminished-with-FiraCode/pull/3
(fontforge.override {
python = python2;
})
(python3.withPackages (ps: [
ps.jinja2
ps.py3to2
ps.fonttools
ps.fontforge
]))
];

meta = with stdenv.lib; {
homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode";
description = "The best Japanese programming font meets the awesone ligatures of Firacode";
description = "The best Japanese programming font meets the awesome ligatures of Firacode";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ mt-caret ];
11 changes: 9 additions & 2 deletions pkgs/os-specific/linux/firmware/fwupd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

{ stdenv
, fetchurl
, fetchpatch
, substituteAll
, gtk-doc
, pkgconfig
@@ -87,11 +88,11 @@ in

stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.3.7";
version = "1.3.8";

src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "02mzn3whk5mba4nxyrkypawr1gzjx79n4nrkhrp8vja6mxxgsf10";
sha256 = "14hbwp3263n4z61ws62vj50kh9a89fz2l29hyv7f1xlas4zz6j8x";
};

# libfwupd goes to lib
@@ -162,6 +163,12 @@ stdenv.mkDerivation rec {
# needs a different set of modules than po/make-images
inherit installedTestsPython;
})

# Find the correct lds and crt name when specifying -Defi_ldsdir
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/52cda3db9ca9ab4faf99310edf29df926a713b5c.patch";
sha256 = "0hsj79dzamys7ryz33iwxwd58kb1h7gaw637whm0nkvzkqq6rm16";
})
];

postPatch = ''