Unverified Commit 7a4b840d authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

treewide: fix nixd warnings (#343155)

parents 9c711566 25341f2a

pkgs/applications/graphics/gimp/plugins/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ in 
    };

  };



  farbfeld = pluginDerivation rec {

  farbfeld = pluginDerivation {

    pname = "farbfeld";

    version = "unstable-2019-08-12";
@@ -309,7 +309,7 @@ in 
    variant = "gimp";

  };



  gimplensfun = pluginDerivation rec {

  gimplensfun = pluginDerivation {

    version = "unstable-2018-10-21";

    pname = "gimplensfun";

pkgs/development/haskell-modules/configuration-common.nix

+4 −4
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
{ pkgs, haskellLib }:



let

  inherit (pkgs) fetchpatch fetchpatch2 lib;

  inherit (lib) throwIfNot versionOlder versions;

  inherit (pkgs) fetchpatch lib;

  inherit (lib) throwIfNot versionOlder;

in



with haskellLib;
@@ -2649,7 +2649,7 @@ self: super: { 
      purescript =

        lib.pipe

          (super.purescript.overrideScope purescriptOverlay)

          ([

          [

            # https://github.com/purescript/purescript/pull/4547

            (appendPatches [

              (pkgs.fetchpatch {
@@ -2668,7 +2668,7 @@ self: super: { 
            doJailbreak

            # Generate shell completions

            (self.generateOptparseApplicativeCompletions [ "purs" ])

          ]);

          ];



      purenix =

        lib.pipe

pkgs/top-level/aliases.nix

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ let 
      aliases;

in



mapAliases ({

mapAliases {

  # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.

  forceSystem = system: _:

    (import self.path { localSystem = { inherit system; }; });
@@ -1821,4 +1821,4 @@ mapAliases ({ 
    purple-facebook

    ;



})
 
}

pkgs/top-level/all-packages.nix

+8 −8
Original line number Diff line number Diff line
@@ -3532,7 +3532,7 @@ with pkgs; 














  ecdsautils = callPackage ../tools/security/ecdsautils { };



























  echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { });













  echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/security/echidna { });





























  sedutil = callPackage ../tools/security/sedutil { };
























@@ -7614,9 +7614,9 @@ with pkgs;



























  fingerprintx = callPackage ../tools/security/fingerprintx { };



























  bsd-fingerd = bsd-finger.override({













  bsd-fingerd = bsd-finger.override {















    buildProduct = "daemon";













  });













  };





























  iprange = callPackage ../applications/networking/firehol/iprange.nix { };
























@@ -8559,9 +8559,9 @@ with pkgs;



























  hfsprogs = callPackage ../tools/filesystems/hfsprogs { };



























  highlight = callPackage ../tools/text/highlight ({













  highlight = callPackage ../tools/text/highlight {















    lua = lua5;













  });













  };





























  hockeypuck = callPackage ../servers/hockeypuck/server.nix { };
























@@ -15437,12 +15437,12 @@ with pkgs;













      stdenv.targetPlatform));















  in pkgs.${"llvmPackages_${minSupported}"};



























  llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({













  llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 {















    inherit (stdenvAdapters) overrideCC;















    buildLlvmTools = buildPackages.llvmPackages_12.tools;















    targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;















    targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm;













  }));













  });





























  inherit (rec {















    llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { });










@@ -37916,7 +37916,7 @@ with pkgs;













  /*















    A NixOS/home-manager/arion/... module that sets the `pkgs` module argument.















   */













  pkgsModule = { lib, options, ... }: {













  pkgsModule = { options, ... }: {















    config =















      if options?nixpkgs.pkgs then {















        # legacy / nixpkgs.nix style