From 67a7b42167004e27cc5eac8f1f563ed55e05b69a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 14 Mar 2019 13:06:00 +0000 Subject: [PATCH 1/2] pkgs/stdenv/booter.nix: fix a typo --- pkgs/stdenv/booter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 7364a586fc2a..668dcabc0499 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -43,7 +43,7 @@ stageFuns: let /* "dfold" a ternary function `op' between successive elements of `list' as if it was a doubly-linked list with `lnul' and `rnul` base cases at either - end. In precise terms, `fold op lnul rnul [x_0 x_1 x_2 ... x_n-1]` is the + end. In precise terms, `dfold op lnul rnul [x_0 x_1 x_2 ... x_n-1]` is the same as let From 2bc525350aac8421e3f54a44ab599730a65dfb51 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 14 Mar 2019 13:25:29 +0000 Subject: [PATCH 2/2] treewide: `stdenv.config` -> `config` That attribute does not exist. --- pkgs/desktops/mate/libmatemixer/default.nix | 4 ++-- pkgs/desktops/mate/mate-settings-daemon/default.nix | 5 +++-- pkgs/development/libraries/glib/default.nix | 4 ++-- pkgs/development/libraries/librdf/default.nix | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 8bf0d9bec18c..0a0b353bb93d 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, mate +{ config, stdenv, fetchurl, pkgconfig, intltool, glib, mate , alsaSupport ? stdenv.isLinux, alsaLib -, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio +, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false }: diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 2be518bcc5e1..480304fcb1c6 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook -, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio +{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier +, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e0255be666e9..4c7c51dbdff5 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ config, stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null , buildPackages # this is just for tests (not in the closure of any regular package) -, doCheck ? stdenv.config.doCheckByDefault or false +, doCheck ? config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info , darwin diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 41047796662e..39fb68fd2467 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook +{ config, stdenv, fetchurl, pkgconfig, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib -, doCheck ? stdenv.config.doCheckByDefault or false, ladspaPlugins +, doCheck ? config.doCheckByDefault or false, ladspaPlugins }: stdenv.mkDerivation rec {