about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/make-package-set.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-12-19 00:12:05 +0000
committerGitHub <noreply@github.com>2022-12-19 00:12:05 +0000
commit259fe227c872212a3ba6906182d53880c910b8c9 (patch)
treed0c8a38ebf6ae0ac8f8fe01dee16602fb4bb6e68 /pkgs/development/haskell-modules/make-package-set.nix
parent5d40eaa66fec25b00acb333215a1d2991bc0f0da (diff)
parente388728ddf131e4442906f90fd365b11fe999aac (diff)
downloadnixlib-259fe227c872212a3ba6906182d53880c910b8c9.tar
nixlib-259fe227c872212a3ba6906182d53880c910b8c9.tar.gz
nixlib-259fe227c872212a3ba6906182d53880c910b8c9.tar.bz2
nixlib-259fe227c872212a3ba6906182d53880c910b8c9.tar.lz
nixlib-259fe227c872212a3ba6906182d53880c910b8c9.tar.xz
nixlib-259fe227c872212a3ba6906182d53880c910b8c9.tar.zst
nixlib-259fe227c872212a3ba6906182d53880c910b8c9.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r--pkgs/development/haskell-modules/make-package-set.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 45095d7fa72c..5b9546e7505f 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -33,7 +33,7 @@
   # `self` as second, and returns a set of haskell packages
   package-set
 
-, # The final, fully overriden package set usable with the nixpkgs fixpoint
+, # The final, fully overridden package set usable with the nixpkgs fixpoint
   # overriding functionality
   extensible-self
 }:
@@ -73,7 +73,7 @@ let
 
   mkDerivation = makeOverridable mkDerivationImpl;
 
-  # manualArgs are the arguments that were explictly passed to `callPackage`, like:
+  # manualArgs are the arguments that were explicitly passed to `callPackage`, like:
   #
   # callPackage foo { bar = null; };
   #