Unverified Commit d2afb051 authored by Stanisław Pitucha's avatar Stanisław Pitucha Committed by GitHub
Browse files

Merge pull request #195210 from yorickvP/guake 

guake: 3.6.3 -> 3.9.0
parents 05645561 1441c793

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+8 −0
Original line number Diff line number Diff line
@@ -728,6 +728,14 @@ 
          release notes</link> for more details.

        </para>

      </listitem>

      <listitem>

        <para>

          The <literal>guake</literal> package has been updated from

          3.6.3 to 3.9.0, see the

          <link xlink:href="https://github.com/Guake/guake/releases">changelog</link>

          for more details.

        </para>

      </listitem>

      <listitem>

        <para>

          <literal>dockerTools.buildImage</literal> deprecates the

nixos/doc/manual/release-notes/rl-2211.section.md

+2 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). 


- The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details.



- The `guake` package has been updated from 3.6.3 to 3.9.0, see the [changelog](https://github.com/Guake/guake/releases) for more details.



- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`.

  Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`.

pkgs/applications/terminal-emulators/guake/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "guake";

  version = "3.6.3";

  version = "3.9.0";



  format = "other";



  src = fetchFromGitHub {

    owner = "Guake";

    repo = "guake";

    rev = version;

    sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b";

    rev = "refs/tags/${version}";

    sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";

  };



  # Strict deps breaks guake
@@ -51,16 +51,16 @@ python3.pkgs.buildPythonApplication rec { 


  propagatedBuildInputs = with python3.pkgs; [

    dbus-python

    pbr

    pycairo

    pygobject3

    setuptools

    setuptools-scm

    pyyaml

  ];



  PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var

  SETUPTOOLS_SCM_PRETEND_VERSION = version;



  makeFlags = [

    "prefix=${placeholder "out"}"

    "PREFIX=${placeholder "out"}"

  ];



  preFixup = ''