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

Commits on Nov 25, 2020

  1. haskellPackages.irc-core: unbreak

    @Kiwi
    Kiwi committed Nov 25, 2020
    Copy the full SHA
    211db25 View commit details

  2. haskellPackages.random_1_2_0: unbreak

    @Kiwi
    Kiwi committed Nov 25, 2020
    Copy the full SHA
    e53ee75 View commit details

  3. haskellPackages.QuickCheck_2_14_2: unbreak

    @Kiwi
    Kiwi committed Nov 25, 2020
    Copy the full SHA
    400ccc7 View commit details

  4. haskellPackages.config-value: unbreak 

    haskellPackages.config-schema: unbreak
    @Kiwi
    Kiwi committed Nov 25, 2020
    Copy the full SHA
    34ae98d View commit details

  5. haskellPackages.glirc: unbreak

    @Kiwi
    Kiwi committed Nov 25, 2020
    Copy the full SHA
    445ad06 View commit details

Commits on Nov 26, 2020

  1. haskellPackages.matterhorn: unbreak 

    haskellPackages.mattermost-api: unbreak
haskellPackages.mattermost-api-qc: unbreak
    @Kiwi
    Kiwi committed Nov 26, 2020
    Copy the full SHA
    a3ccd72 View commit details

Commits on Nov 27, 2020

  1. haskellPackages: remove QuickCheck_2_14_2 and random_1_2_0 from kiwi … 

    …maintainer
    @cdepillabout
    cdepillabout authored Nov 27, 2020
    Copy the full SHA
    aab87b1 View commit details

  2. Merge pull request #104770 from Kiwi/fixes 

    haskellPackages.*: unbreak glirc/matterhorn/QuickCheck/etc
    @cdepillabout
    cdepillabout authored Nov 27, 2020
    Copy the full SHA
    d13b61b View commit details
Showing with 16 additions and 8 deletions.
  1. +9 −1 pkgs/development/haskell-modules/configuration-common.nix
  2. +7 −7 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
10 changes: 9 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -295,6 +295,9 @@ self: super: {
github-rest = dontCheck super.github-rest; # test suite needs the network
gitlib-cmdline = dontCheck super.gitlib-cmdline;
GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
#next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds
#should be fixed soon. maybe even before this is merged. currently glirc is 2.37
glirc = doJailbreak (super.glirc.override { random = self.random_1_2_0; });
hackport = dontCheck super.hackport;
hadoop-formats = dontCheck super.hadoop-formats;
haeredes = dontCheck super.haeredes;
@@ -335,7 +338,8 @@ self: super: {
then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63
else super.math-functions;
matplotlib = dontCheck super.matplotlib;

# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :')
memcache = dontCheck super.memcache;
metrics = dontCheck super.metrics;
milena = dontCheck super.milena;
@@ -366,6 +370,9 @@ self: super: {
punycode = dontCheck super.punycode;
pwstore-cli = dontCheck super.pwstore-cli;
quantities = dontCheck super.quantities;
QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( {
splitmix = self.splitmix_0_1_0_3;
});
redis-io = dontCheck super.redis-io;
rethinkdb = dontCheck super.rethinkdb;
Rlang-QQ = dontCheck super.Rlang-QQ;
@@ -399,6 +406,7 @@ self: super: {
xsd = dontCheck super.xsd;
zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57

random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; });
# These test suites run for ages, even on a fast machine. This is nuts.
Random123 = dontCheck super.Random123;
systemd = dontCheck super.systemd;
14 changes: 7 additions & 7 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -2694,6 +2694,13 @@ package-maintainers:
# - pipes-mongodb
- streaming-wai
kiwi:
- config-schema
- config-value
- glirc
- irc-core
- matterhorn
- mattermost-api
- mattermost-api-qc
- Unique
psibi:
- path-pieces
@@ -4139,9 +4146,7 @@ broken-packages:
- conffmt
- confide
- config-parser
- config-schema
- config-select
- config-value
- config-value-getopt
- ConfigFileTH
- Configger
@@ -5530,7 +5535,6 @@ broken-packages:
- gli
- glicko
- glider-nlp
- glirc
- GLMatrix
- glob-posix
- global
@@ -6994,7 +6998,6 @@ broken-packages:
- iptadmin
- IPv6DB
- Irc
- irc-core
- irc-dcc
- irc-fun-bot
- irc-fun-client
@@ -7737,9 +7740,6 @@ broken-packages:
- matrix-market
- matrix-sized
- matsuri
- matterhorn
- mattermost-api
- mattermost-api-qc
- maude
- maxent
- maxent-learner-hw