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: 975ad807d631
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: 65eafbf443d7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 12, 2019

  1. GCC 6: Fix java support 

    Major version upper bound was one too low.
    @Ericson2314
    Ericson2314 committed Nov 12, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    903bdf1 View commit details

  2. Merge pull request #73292 from obsidiansystems/fix-gcj 

    GCC 6: Fix java support for 19.09
    @matthewbauer
    matthewbauer authored Nov 12, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1b524c2 View commit details

  3. eagle: use mkDerivation provided by qt5 

    (cherry picked from commit a84607a)
    @veprbl @worldofpeace
    veprbl authored and worldofpeace committed Nov 12, 2019
    Copy the full SHA
    65eafbf View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/applications/science/electronics/eagle/eagle.nix
  2. +1 −1 pkgs/development/compilers/gcc/common/configure-flags.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/electronics/eagle/eagle.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeDesktopItem
{ stdenv, mkDerivation, fetchurl, makeDesktopItem
, libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb
, libGL, glib, nss, nspr, expat, alsaLib
, qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine
@@ -11,7 +11,7 @@ let
qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
];
in
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "eagle";
version = "9.4.2";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/common/configure-flags.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
}:

assert cloog != null -> stdenv.lib.versionOlder version "5";
assert langJava -> stdenv.lib.versionOlder version "6";
assert langJava -> stdenv.lib.versionOlder version "7";

let
inherit (stdenv)