diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-26 18:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-26 18:01:45 +0000 |
| commit | 6d0026d4d66dd0079ca9f023a5081743388e43c0 (patch) | |
| tree | 0cb85b1bcd7b7d958746b9d18e38ab3d14159e7b /pkgs/data | |
| parent | f49ee75d3ebbd2eb94c1ea54637e209be4605f7e (diff) | |
| parent | 01526058703b101957eaec9480c3bcc8a7b8472a (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/libkkc-data/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/data/themes/marwaita/default.nix | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix index 7fcd2fbf516f9..516dd61c60f36 100644 --- a/pkgs/data/misc/libkkc-data/default.nix +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2, libkkc }: +{ lib, stdenv, fetchurl, fetchpatch, python3, libkkc }: stdenv.mkDerivation rec { pname = "libkkc-data"; @@ -9,7 +9,16 @@ stdenv.mkDerivation rec { sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; }; - nativeBuildInputs = [ python2.pkgs.marisa ]; + patches = [ + (fetchpatch { + name = "build-python3.patch"; + url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch"; + relative = "data/templates/libkkc-data"; + hash = "sha256-q4zUclJtDQ1E5v2PW00zRZz6GXllLUcp2h3tugufrRU="; + }) + ]; + + nativeBuildInputs = [ python3.pkgs.marisa ]; strictDeps = true; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 189ef5277eb29..3aa93d2a11646 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "15.0"; + version = "16.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-GjBIAir4xTWnc1VXe5CF+FPcZJTSyJpi8MqlJUpkyy4="; + sha256 = "sha256-kBXGYXOrza4tb5J9hmheDhZcwEd1xT6wLUc9cBGJ/AY="; }; buildInputs = [ |