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: 1d6532d9765b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6450d8c5ca6f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 21, 2019

  1. haskell-hledger: don't install data files that don't belong to this p… 

    …ackage

Fixes #53936.
    @peti
    peti committed Feb 21, 2019
    Copy the full SHA
    7a6bbb4 View commit details

  2. haskell-hledger: drop obsolete (and already commented-out) overrides

    @peti
    peti committed Feb 21, 2019
    Copy the full SHA
    6450d8c View commit details
Showing with 4 additions and 13 deletions.
  1. +4 −13 pkgs/development/haskell-modules/configuration-common.nix
17 changes: 4 additions & 13 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -953,17 +953,13 @@ self: super: {
# Tries to read a file it is not allowed to in the test suite
load-env = dontCheck super.load-env;

# hledger needs a newer megaparsec version than we have in LTS 12.x.
hledger-lib = super.hledger-lib.overrideScope (self: super: {
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
# megaparsec = self.megaparsec_7_0_4;
});

# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {
postInstall = ''
# Don't install files that don't belong into this package to avoid
# conflicts when hledger and hledger-ui end up in the same profile.
rm embeddedfiles/hledger-{api,ui,web}.*
for i in $(seq 1 9); do
for j in embeddedfiles/*.$i; do
mkdir -p $out/share/man/man$i
@@ -974,7 +970,7 @@ self: super: {
cp -v embeddedfiles/*.info* $out/share/info/
'';
});
hledger-ui = (overrideCabal super.hledger-ui (drv: {
hledger-ui = overrideCabal super.hledger-ui (drv: {
postInstall = ''
for i in $(seq 1 9); do
for j in *.$i; do
@@ -985,11 +981,6 @@ self: super: {
mkdir -p $out/share/info
cp -v *.info* $out/share/info/
'';
})).overrideScope (self: super: {
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
# config-ini = self.config-ini_0_2_4_0;
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
# megaparsec = self.megaparsec_7_0_4;
});
hledger-web = overrideCabal super.hledger-web (drv: {
postInstall = ''