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: a2a2fae53b1c
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: 960f8495454b
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 15, 2020

  1. retdec: fix build 

    The build was broken by the gcc9 update. Pinning to gcc8 for now.

(cherry picked from commit e5642d4)
    @timokau
    timokau committed Mar 15, 2020
    Copy the full SHA
    13f4c4a View commit details

  2. xfce4-12: remove alias 

    (cherry picked from commit 175f9ef)
    @Ekleog
    Ekleog committed Mar 15, 2020
    Copy the full SHA
    a4bf572 View commit details

  3. Merge pull request #82648 from timokau/retdec-fix-20.03 

    [20.03] retdec: fix build
    @timokau
    timokau authored Mar 15, 2020
    Copy the full SHA
    960f849 View commit details
8 changes: 4 additions & 4 deletions nixos/doc/manual/release-notes/rl-2003.xml
View file
Original file line number Diff line number Diff line change
@@ -446,10 +446,10 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
</listitem>
<listitem>
<para>
There is now only one Xfce package-set and module. This means attributes, <literal>xfce4-14</literal>
<literal>xfce4-12</literal>, and <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14
packages. And in future NixOS releases will be the latest released version of Xfce available at the
time during the releases development (if viable).
There is now only one Xfce package-set and module. This means that attributes <literal>xfce4-14</literal>
and <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14
packages. And in the future NixOS releases will be the latest released version of Xfce available at the
time of the release's development (if viable).
</para>
</listitem>
<listitem>
2 changes: 1 addition & 1 deletion pkgs/desktops/xfce/core/xfwm4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
mkXfceDerivation {
category = "xfce";
pname = "xfwm4";
version = "4.14.0";
version = "4.14.0"; # TODO: remove xfce4-14 alias when this gets bumped

sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m";

1 change: 1 addition & 0 deletions pkgs/development/tools/analysis/retdec/default.nix
View file
Original file line number Diff line number Diff line change
@@ -130,6 +130,7 @@ in stdenv.mkDerivation rec {
# itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions.
# I've notified upstream about this problem here:
# https://github.com/avast-tl/retdec/issues/412
# gcc is pinned to gcc8 in all-packages.nix. That should probably be re-evaluated on update.
version = "3.2";

src = fetchFromGitHub {
2 changes: 1 addition & 1 deletion pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -496,7 +496,7 @@ mapAliases ({
morituri = whipper; # added 2018-09-13
xfceUnstable = xfce4-14; # added 2019-09-17
xfce4-14 = xfce;
xfce4-12 = xfce;
xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14
x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10505,7 +10505,9 @@ in

remake = callPackage ../development/tools/build-managers/remake { };

retdec = callPackage ../development/tools/analysis/retdec { };
retdec = callPackage ../development/tools/analysis/retdec {
stdenv = gcc8Stdenv;
};
retdec-full = retdec.override {
withPEPatterns = true;
};