diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-11-20 18:00:50 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 18:00:50 -0300 |
| commit | 4700fda2c037f256e59597effd83050b7b994cb9 (patch) | |
| tree | fd442a68b80d7f4b4f2973951682c94d92462243 /pkgs | |
| parent | 5e560c4e24db27b73bfe5201d900952680353896 (diff) | |
| parent | e22ee9bf77ae289ce2b75018a754e0b31d0a1905 (diff) | |
Merge pull request #145395 from thiagokokada/bump-plymouth
plymouth: unstable-2020-12-07 -> unstable-2021-10-18
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/plymouth/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 8cb2a00987e1..62950b085258 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -15,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "plymouth-unstable"; - version = "2020-12-07"; + pname = "plymouth"; + version = "unstable-2021-10-18"; outputs = [ "out" @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "plymouth"; repo = "plymouth"; - rev = "c4ced2a2d70edea7fbb95274aa1d01d95928df1b"; - sha256 = "7CPuKMA0fTt8DBsaA4Td74kHT/O7PW8N3awP04nUnOI="; + rev = "18363cd887dbfe7e82a2f4cc1a49ef9513919142"; + sha256 = "sha256-+AP4ALOFdYFt/8MDXjMaHptkogCwK1iXKuza1zfMaws="; }; nativeBuildInputs = [ @@ -47,15 +47,6 @@ stdenv.mkDerivation rec { systemd ]; - patches = [ - # KillMode=none is deprecated - # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 - (fetchpatch { - url = "https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/b406b0895a95949db2adfedaeda451f36f2b51c3.patch"; - sha256 = "/UBImNuFO0G/oxlttjGIXon8YXMXlc9XU8uVuR9QuxY="; - }) - ]; - postPatch = '' sed -i \ -e "s#plymouthplugindir=.*#plymouthplugindir=/etc/plymouth/plugins/#" \ |