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: 938a0ddf4a05
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: fc3120ce90f2
Choose a head ref
  • 11 commits
  • 12 files changed
  • 6 contributors

Commits on Oct 5, 2018

  1. haskell: re-enable aarch64, but disable parallel builds on that arch.

    This is a workaround for unreliable parallel Haskell builds on
    aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449
    dhess committed Oct 5, 2018
    Copy the full SHA
    4babe7f View commit details

Commits on Oct 7, 2018

  1. Copy the full SHA
    99c8dc4 View commit details
  2. Copy the full SHA
    cd71e10 View commit details
  3. wolfssl: add license

    schneefux committed Oct 7, 2018
    Copy the full SHA
    fdec2e1 View commit details
  4. wego: add license

    schneefux committed Oct 7, 2018
    Copy the full SHA
    241a13c View commit details
  5. tnt: add license

    schneefux committed Oct 7, 2018
    Copy the full SHA
    59da235 View commit details
  6. sipcmd: add license

    schneefux committed Oct 7, 2018
    Copy the full SHA
    aba5390 View commit details
  7. Copy the full SHA
    346f1c8 View commit details
  8. Merge pull request #47901 from dhess/ghc-aarch64

    haskell: re-enable aarch64, but disable parallel builds on that arch.
    samueldr authored Oct 7, 2018
    Copy the full SHA
    d8d8584 View commit details
  9. Merge pull request #47996 from Lassulus/charybdis

    charybdis service: bin/charybdis-ircd -> bin/charybdis
    Mic92 authored Oct 7, 2018
    Copy the full SHA
    113827d View commit details
  10. Copy the full SHA
    fc3120c View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/charybdis.nix
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ in
BANDB_DBPATH = "${cfg.statedir}/ban.db";
};
serviceConfig = {
ExecStart = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}";
ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}";
Group = cfg.group;
User = cfg.user;
PermissionsStartOnly = true; # preStart needs to run with root permissions
4 changes: 4 additions & 0 deletions pkgs/applications/misc/wego/default.nix
Original file line number Diff line number Diff line change
@@ -14,4 +14,8 @@ buildGoPackage rec {
};

goDeps = ./deps.nix;

meta = {
license = stdenv.lib.licenses.isc;
};
}
1 change: 1 addition & 0 deletions pkgs/applications/networking/sipcmd/default.nix
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/tmakkonen/sipcmd;
description = "The command line SIP/H.323/RTP softphone";
platforms = with stdenv.lib.platforms; linux;
license = stdenv.lib.licenses.gpl2;
};
}

3 changes: 1 addition & 2 deletions pkgs/development/compilers/ghc/8.2.1-binary.nix
Original file line number Diff line number Diff line change
@@ -169,6 +169,5 @@ stdenv.mkDerivation rec {
};

meta.license = stdenv.lib.licenses.bsd3;
# AArch64 should work in theory but eventually some builds start segfaulting
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */];
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
}
3 changes: 2 additions & 1 deletion pkgs/development/compilers/ghc/8.2.2.nix
Original file line number Diff line number Diff line change
@@ -88,7 +88,8 @@ stdenv.mkDerivation (rec {
sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv";
};

enableParallelBuilding = true;
# https://ghc.haskell.org/trac/ghc/ticket/15449
enableParallelBuilding = !buildPlatform.isAarch64;

outputs = [ "out" "doc" ];

3 changes: 2 additions & 1 deletion pkgs/development/compilers/ghc/8.4.3.nix
Original file line number Diff line number Diff line change
@@ -90,7 +90,8 @@ stdenv.mkDerivation (rec {
sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
};

enableParallelBuilding = true;
# https://ghc.haskell.org/trac/ghc/ticket/15449
enableParallelBuilding = !buildPlatform.isAarch64;

outputs = [ "out" "doc" ];

3 changes: 2 additions & 1 deletion pkgs/development/compilers/ghc/8.6.1.nix
Original file line number Diff line number Diff line change
@@ -86,7 +86,8 @@ stdenv.mkDerivation (rec {
sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
};

enableParallelBuilding = true;
# https://ghc.haskell.org/trac/ghc/ticket/15449
enableParallelBuilding = !buildPlatform.isAarch64;

outputs = [ "out" "doc" ];

4 changes: 3 additions & 1 deletion pkgs/development/haskell-modules/generic-builder.nix
Original file line number Diff line number Diff line change
@@ -48,7 +48,9 @@ in
# We cannot enable -j<n> parallelism for libraries because GHC is far more
# likely to generate a non-determistic library ID in that case. Further
# details are at <https://github.com/peti/ghc-library-id-bug>.
, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version
#
# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449.
, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64)
, maintainers ? []
, doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false)
1 change: 1 addition & 0 deletions pkgs/development/libraries/rlog/default.nix
Original file line number Diff line number Diff line change
@@ -12,5 +12,6 @@ stdenv.mkDerivation {
homepage = http://www.arg0.net/rlog;
description = "A C++ logging library used in encfs";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
};
}
1 change: 1 addition & 0 deletions pkgs/development/libraries/tnt/default.nix
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://math.nist.gov/tnt/;
description = "Template Numerical Toolkit: C++ headers for array and matrices";
license = stdenv.lib.licenses.publicDomain;
platforms = stdenv.lib.platforms.unix;
};
}
1 change: 1 addition & 0 deletions pkgs/development/libraries/wolfssl/default.nix
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
homepage = "https://www.wolfssl.com/";
platforms = platforms.all;
license = stdenv.lib.licenses.gpl2;
maintainers = with maintainers; [ mcmtroffaes ];
};
}
1 change: 1 addition & 0 deletions pkgs/tools/text/zimreader/default.nix
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A tool to serve ZIM files using HTTP";
homepage = http://git.wikimedia.org/log/openzim;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ];
platforms = [ "x86_64-linux" ];
};