Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e05a92671344
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a54709202e77
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 21, 2018

  1. xfce.xfce4-panel: 4.12.1 -> 4.12.2

    @obadz
    volth authored and obadz committed Mar 21, 2018
    Copy the full SHA
    4ddb7a7 View commit details

  2. xfce.xfwm4: 4.12.3 -> 4.12.4

    @obadz
    volth authored and obadz committed Mar 21, 2018
    Copy the full SHA
    a547092 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/desktops/xfce/core/xfce4-panel.nix
  2. +2 −2 pkgs/desktops/xfce/core/xfwm4.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce/core/xfce4-panel.nix
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@ let
inherit (stdenv.lib) optional;
p_name = "xfce4-panel";
ver_maj = "4.12";
ver_min = "1";
ver_min = "2";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";

src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck";
sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2";
};

patches = [ ./xfce4-panel-datadir.patch ];
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce/core/xfwm4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
let
p_name = "xfwm4";
ver_maj = "4.12";
ver_min = "3";
ver_min = "4";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";

src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac";
sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s";
};

buildInputs =