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: 87ca34b895cc
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: 2255fce78078
Choose a head ref
  • 14 commits
  • 9 files changed
  • 6 contributors

Commits on Feb 26, 2018

  1. nixos/rspamd: Preserve runtime directory when using socket activation

    @griff
    griff committed Feb 26, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dhess Drew Hess
    GPG key ID: 4DC0BBFBE3FEF428
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    458bcc8 View commit details

Commits on Sep 24, 2018

  1. roundcube: init at 1.3.7

    @Vskilet
    Vskilet committed Sep 24, 2018

    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
    1e7997b View commit details

Commits on Sep 26, 2018

  1. roundcube: simplify using fetchzip

    @Vskilet
    Vskilet committed Sep 26, 2018
    Copy the full SHA
    e387f25 View commit details

Commits on Sep 27, 2018

  1. remove Perl 5.22 and 5.24 (end-of-life upstream few months ago)

    volth committed Sep 27, 2018
    Copy the full SHA
    507b2fd View commit details

  2. Merge pull request #47416 from volth/remove-perl522-perl524 

    remove Perl 5.22 and 5.24 (end-of-life upstream few months ago)
    @xeji
    xeji authored Sep 27, 2018
    Copy the full SHA
    2f2876b View commit details

  3. Merge pull request #35690 from griff/rspamd-socketruntime 

    nixos/rspamd: Preserve runtime directory when using socket activation
    @Mic92
    Mic92 authored Sep 27, 2018
    Copy the full SHA
    2dc1d75 View commit details

  4. haskell-hspec: fix build with ghc-8.6.x

    @peti
    peti committed Sep 27, 2018
    Copy the full SHA
    a2cbfd9 View commit details

  5. haskell-doctest: fix build with ghc-8.6.x

    @peti
    peti committed Sep 27, 2018
    Copy the full SHA
    44f68ab View commit details

  6. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.11.1 from Hackage revision
commercialhaskell/all-cabal-hashes@a415805.
    @peti
    peti committed Sep 27, 2018
    Copy the full SHA
    424f6b9 View commit details

  7. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.11.1 from Hackage revision
commercialhaskell/all-cabal-hashes@35d90c5.
    @peti
    peti committed Sep 27, 2018
    Copy the full SHA
    b70f4ff View commit details

  8. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.11.1 from Hackage revision
commercialhaskell/all-cabal-hashes@8d69413.
    @peti
    peti committed Sep 27, 2018
    Copy the full SHA
    e797f37 View commit details

  9. all-cabal-hashes: update to Hackage at 2018-09-27T00:15:48Z

    @peti
    peti committed Sep 27, 2018
    Copy the full SHA
    0af54ac View commit details

  10. multi-ghc-travis: update to latest git version

    @peti
    peti committed Sep 27, 2018
    Copy the full SHA
    3ef254a View commit details

  11. Merge pull request #47270 from Vskilet/roundcube-package 

    roundcube: init at 1.3.7
    @Mic92
    Mic92 authored Sep 27, 2018
    Copy the full SHA
    2255fce View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -4436,6 +4436,11 @@
github = "vrthra";
name = "Rahul Gopinath";
};
vskilet = {
email = "victor@sene.ovh";
github = "vskilet";
name = "Victor SENE";
};
vyp = {
email = "elisp.vim@gmail.com";
github = "vyp";
1 change: 1 addition & 0 deletions nixos/modules/services/mail/rspamd.nix
View file
Original file line number Diff line number Diff line change
@@ -308,6 +308,7 @@ in
ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
Restart = "always";
RuntimeDirectory = "rspamd";
RuntimeDirectoryPreserve = mkIf cfg.socketActivation true;
PrivateTmp = true;
Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames);
};
4 changes: 2 additions & 2 deletions pkgs/data/misc/hackage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl }:

fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b16aa9c85633ea49e19aee5e1678d082ce953a17.tar.gz";
sha256 = "185p6112b35s2vgbswrmy5lwf09q27gzkpcfla6dbddmbk948d38";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz";
sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb";
}
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -47,8 +47,11 @@ self: super: {
# LTS-12.x versions do not compile.
contravariant = self.contravariant_1_5;
doctest = self.doctest_0_16_0_1;
doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
hspec = self.hspec_2_5_7;
hspec-core = self.hspec-core_2_5_7;
hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
hspec-discover = self.hspec-discover_2_5_7;
hspec-meta = self.hspec-meta_2_5_6;
hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
primitive = self.primitive_0_6_4_0;
Loading