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: a884b2182243
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d6db98c8df0f
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Jan 20, 2021

  1. pkgs/os-specific/windows: fix evaluation after stdenv.lib -> lib 

    Fixes the evaluation of packages in pkgs/os-specific/windows that
weren't updated to include a new lib parameter after the refactor from
stdenv.lib -> lib (#109490).

I originally only intended this change to fix
`pkgsCross.mingw32.buildPackages.gcc` & `pkgsCross.mingwW64.buildPackages.gcc`
to support building wine with `mingwSupport`, but I noticed this was
an issue for all updated windows packages. Most of these other
packages fail to build for other reasons.
    @kira-bruneau
    kira-bruneau committed Jan 20, 2021
    Copy the full SHA
    9788188 View commit details

  2. Merge pull request #110062 from MetaDark/pkgs/os-specific/windows

    @SuperSandro2000
    SuperSandro2000 authored Jan 20, 2021
    Copy the full SHA
    d6db98c View commit details
2 changes: 1 addition & 1 deletion pkgs/os-specific/windows/cygwin-setup/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config
{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config
, zlib, bzip2, lzma, libgcrypt
}:

2 changes: 1 addition & 1 deletion pkgs/os-specific/windows/jom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, qt48, qmake4Hook, flex }:
{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }:

# At the time of committing this, the expression fails for me to cross-build in
# both mingw32 and mingw64.
2 changes: 1 addition & 1 deletion pkgs/os-specific/windows/libgnurx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:

let
version = "2.5.1";
2 changes: 1 addition & 1 deletion pkgs/os-specific/windows/mingw-w64/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, windows, fetchurl }:
{ lib, stdenv, windows, fetchurl }:

let
version = "6.0.0";
2 changes: 1 addition & 1 deletion pkgs/os-specific/windows/wxMSW-2.8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:

stdenv.mkDerivation {
name = "wxMSW-2.8.11";