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

Commits on Jun 25, 2019

  1. elm: don't import <nixpkgs>, fixes tarball job 

    Don't import <nixpkgs>, because that is not allowed.
Broken by #63477

cc @turboMaCk
    @FRidh
    FRidh committed Jun 25, 2019
    Copy the full SHA
    26335f3 View commit details

  2. wxwidgets: fix passthru, fixes tarball job 

    cc @romildo
    @FRidh
    FRidh committed Jun 25, 2019
    Copy the full SHA
    32a7e35 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/development/compilers/elm/default.nix
  2. +1 −1 pkgs/development/libraries/wxwidgets/3.1/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/elm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv
{ lib, stdenv, pkgs
, haskell, nodejs
, fetchurl, fetchpatch, makeWrapper, writeScriptBin }:
let
@@ -8,7 +8,7 @@ let

elmNodePackages =
import ./packages/node-composition.nix {
inherit nodejs;
inherit nodejs pkgs;
inherit (stdenv.hostPlatform) system;
};

2 changes: 1 addition & 1 deletion pkgs/development/libraries/wxwidgets/3.1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
";

passthru = {
inherit compat24 compat26 unicode;
inherit compat28 compat30 unicode;
gtk = if withGtk2 then gtk2 else gtk3;
};