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: f6f961e2d054
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f161520cc0d8
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 19, 2020

  1. matterhorn: init at 50200.6.0 

    Command line mattermost client
    @Kiwi
    Kiwi committed Jan 19, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    592b8e5 View commit details

Commits on Jan 20, 2020

  1. Merge pull request #78029 from Kiwi/matterhorn 

    matterhorn: init at 50200.6.0
    @cdepillabout
    cdepillabout authored Jan 20, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f161520 View commit details
12 changes: 12 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1347,6 +1347,18 @@ self: super: {
regex-base = self.regex-base_0_94_0_0;
});

# 2020-01-19 - there were conflicting versions of brick, vty, and brick-skylighting;
# multiple versions of them were being pulled in by the others which is not allowed.
# There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
matterhorn = doJailbreak (super.matterhorn.override {
brick-skylighting = self.brick-skylighting.override {
brick = self.brick_0_50_1;
};
});

# 2020-01-19 - because of QuickCheck bounds | was broken anyway and is needed for matterhorn -- kiwi
Unique = doJailbreak super.Unique;

# apply patches from https://github.com/snapframework/snap-server/pull/126
# manually until they are accepted upstream
snap-server = overrideCabal super.snap-server (drv: {
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -2603,6 +2603,8 @@ package-maintainers:
- streaming-wai
kiwi:
- glirc
- matterhorn
- Unique
psibi:
- path-pieces
- persistent
@@ -7171,7 +7173,6 @@ broken-packages:
- mathlink
- matrix-as-xyz
- matsuri
- matterhorn
- maude
- maxent
- maxent-learner-hw
@@ -9923,7 +9924,6 @@ broken-packages:
- uniform-io
- union
- union-map
- Unique
- uniqueid
- uniquely-represented-sets
- units-attoparsec
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -13262,6 +13262,8 @@ in

matio = callPackage ../development/libraries/matio { };

matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn;

mbedtls = callPackage ../development/libraries/mbedtls { };

mdds = callPackage ../development/libraries/mdds { };