Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d61616bfe5db
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b003af75393
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 7, 2020

  1. dhall-nix: Fix build

    @infinisil
    infinisil committed Mar 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    680f15a View commit details

  2. Merge pull request #81970 from Infinisil/dhall-nix-fix 

    [20.03] dhall-nix: Fix build
    @infinisil
    infinisil authored Mar 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8b85be4 View commit details

  3. du-dust: Change derivation name from dust to du-dust 

    This prevents confusion by nix-env when installing packages by
derivation name, since there is another package named dust already

(cherry picked from commit ad126ee)
    @infinisil
    infinisil committed Mar 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4b003af View commit details
21 changes: 8 additions & 13 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1051,22 +1051,14 @@ self: super: {
# `removeTrailingWhitespace` is buggy in earlier versions.
# This will probably be able to be removed when we update to LTS-15.
dhall_1_29_0 =
dontCheck (super.dhall_1_29_0.override {
dontCheck (super.dhall_1_29_0.overrideScope (self: super: {
prettyprinter = self.prettyprinter_1_6_0;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_6_0;
};
});
}));
dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; };
dhall-json_1_6_1 = super.dhall-json_1_6_1.override {
dhall-json_1_6_1 = super.dhall-json_1_6_1.overrideScope (self: super: {
dhall = self.dhall_1_29_0;
prettyprinter = self.prettyprinter_1_6_0;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_6_0;
};
};
});

# Tests for dhall access the network.
dhall_1_27_0 = dontCheck super.dhall_1_27_0;
@@ -1080,7 +1072,10 @@ self: super: {

dhall-nix =
generateOptparseApplicativeCompletion "dhall-to-nix" (
super.dhall-nix
(super.dhall-nix.overrideScope (self: super: {
dhall = self.dhall_1_29_0;
prettyprinter = self.prettyprinter_1_6_0;
}))
);

# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -4225,7 +4225,6 @@ broken-packages:
- dhall-check
- dhall-fly
- dhall-lsp-server
- dhall-nix
- dhall-to-cabal
- dhall-yaml
- dhcp-lease-parser
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkgs/tools/misc/dust/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:

rustPlatform.buildRustPackage rec {
pname = "dust";
pname = "du-dust";
version = "0.4.4";

src = fetchFromGitHub {