From ae11091a2a8ab5a9e3b773637212eb94ceaa833f Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 11:56:40 +0200
Subject: [PATCH] Document changes for 1.6.0 in new CHANGELOG

---
 distribution-nixpkgs/CHANGELOG.md               | 13 +++++++++++++
 distribution-nixpkgs/distribution-nixpkgs.cabal |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 distribution-nixpkgs/CHANGELOG.md

diff --git a/distribution-nixpkgs/CHANGELOG.md b/distribution-nixpkgs/CHANGELOG.md
new file mode 100644
index 000000000..dbfe5f28a
--- /dev/null
+++ b/distribution-nixpkgs/CHANGELOG.md
@@ -0,0 +1,13 @@
+# Revision history for distribution-nixpkgs
+
+## 1.6.0
+
+* `Distribution.Nixpkgs.PackageMap`
+  * `readNixpkgPackageMap`: instead of a list of arguments to pass to
+    `nix-env`, take path to nixpkgs and an optional nix expression
+    to pass to it as arguments.
+  * `readNixpkgPackageMap`: populate `PackageMap` with *all* attribute
+    paths that point to derivations instead of just one per derivation.
+    This fixes `resolve` not finding certain identifiers if there were
+    two attributes pointing to the same derivation in nixpkgs. See also
+    [#9](https://github.com/peti/distribution-nixpkgs/issues/9).
diff --git a/distribution-nixpkgs/distribution-nixpkgs.cabal b/distribution-nixpkgs/distribution-nixpkgs.cabal
index eea22d736..fc31b5188 100644
--- a/distribution-nixpkgs/distribution-nixpkgs.cabal
+++ b/distribution-nixpkgs/distribution-nixpkgs.cabal
@@ -12,6 +12,8 @@ bug-reports:   https://github.com/peti/distribution-nixpkgs/issues
 build-type:    Simple
 cabal-version: >= 1.10
 data-files:    derivation-attr-paths.nix
+extra-source-files: CHANGELOG.md
+                    README.md
 
 source-repository head
   type:     git