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: 348eaa280bdc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a654573b0a2
Choose a head ref
29 contributors

Commits on Nov 26, 2019

  1. mullvad-vpn: 2019.8 -> 2019.9

    @Br1ght0ne
    Br1ght0ne committed Nov 26, 2019
    Copy the full SHA
    407a8ec View commit details

  2. mullvad-vpn: add filalex77 to maintainers

    @Br1ght0ne
    Br1ght0ne committed Nov 26, 2019
    Copy the full SHA
    90d336d View commit details

Commits on Dec 12, 2019

  1. mullvad-vpn: 2019.9 -> 2019.10

    @Br1ght0ne
    Br1ght0ne committed Dec 12, 2019
    Copy the full SHA
    cd51fca View commit details

Commits on Dec 30, 2019

  1. dockerTools.buildLayeredImage: fix building layered images in parallel 

    when tar'ing store paths into layered archives when building layered
images, don't use the absolute nix store path so that tar won't complain
if something new is added to the nix store

when building the final docker image, ignore any file changes tar
detects in the layers. they are all immutable and the only thing that
might change is the number of hard links due to store optimization
    Richard Wallace committed Dec 30, 2019
    Copy the full SHA
    3be7675 View commit details

Commits on Jan 6, 2020

  1. run: init at 0.7.0

    David McKay committed Jan 6, 2020
    Copy the full SHA
    22622e9 View commit details

Commits on Jan 7, 2020

  1. google_talk_plugin: sha1 -> sha256 

    related #77238
    @turboMaCk
    turboMaCk committed Jan 7, 2020
    Copy the full SHA
    741db8c View commit details

Commits on Jan 8, 2020

  1. rq: 0.10.4 -> 1.0.2

    @Br1ght0ne
    Br1ght0ne committed Jan 8, 2020
    Copy the full SHA
    9a5b231 View commit details

  2. rq: add filalex77 to maintainers

    @Br1ght0ne
    Br1ght0ne committed Jan 8, 2020
    Copy the full SHA
    03b6800 View commit details

Commits on Jan 9, 2020

  1. cargo-deb: 1.23.0 -> 1.23.1

    @Br1ght0ne
    Br1ght0ne committed Jan 9, 2020
    Copy the full SHA
    8ab57a2 View commit details

  2. clojure-lsp: 20200106T233511 -> 20200109T185134

    @ericdallo
    ericdallo committed Jan 9, 2020
    Copy the full SHA
    42a2396 View commit details

  3. nodejs-10_x: 10.18.0 -> 10.18.1 

    Changelog: https://github.com/nodejs/node/releases/tag/v10.18.1
    @marsam
    marsam committed Jan 9, 2020
    Copy the full SHA
    df77461 View commit details

Commits on Jan 10, 2020

  1. shadowsocks-libev: 3.3.3 -> 3.3.4 

    Changelog: https://github.com/shadowsocks/shadowsocks-libev/releases/tag/v3.3.4
    @marsam
    marsam committed Jan 10, 2020
    Copy the full SHA
    8665420 View commit details

  2. Revert "haskell/with-packages-wrapper.nix: install "doc" outputs"

    @peti
    peti authored Jan 10, 2020
    Copy the full SHA
    4a2aad0 View commit details

  3. firefoxPackages.tor-browser*, tor-browser-bundle: remove 

    These are all based on firefox versions with known vulnerabilities
exploited in the wild.

We seriously shouldn't ship this in nixpkgs, especially not for
sensitive applications as the Tor Browser.

`tor-browser-bundle` is just a wrapper around
`firefoxPackages.tor-browser`, so let's remove it too.

`tor-browser-bundle-bin` is the much safer bet, which is individually
downloaded from `dist.torproject.org` and just `patchelf`-ed locally to
work on NixOS.

Co-Authored-By: Alyssa Ross <hi@alyssa.is>
Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>
Co-Authored-By: Graham Christensen <graham@grahamc.com>
    @flokli @alyssais
    @andir @grahamc
    4 people committed Jan 10, 2020
    Copy the full SHA
    1efaa03 View commit details

  4. stups-fullstop: init at 1.1.31

    @mschuwalow
    mschuwalow authored and Jon committed Jan 10, 2020
    Copy the full SHA
    5c2fbc8 View commit details

  5. matterbridge: 1.11.0 -> 1.16.3 (#77454)

    @zimbatm
    zimbatm authored Jan 10, 2020
    Copy the full SHA
    4371ecb View commit details

  6. python27Packages.catalogue: 0.0.8 -> 0.2.0

    @r-ryantm
    r-ryantm authored and Jon committed Jan 10, 2020
    Copy the full SHA
    177894c View commit details

  7. pythonPackages.junit-xml: init at 1.8

    @multun
    multun authored and Jon committed Jan 10, 2020
    Copy the full SHA
    4a73922 View commit details

  8. Merge pull request #77452 from flokli/tor-remove-insecure 

    firefoxPackages.tor-browser*, tor-browser-bundle: remove
    @flokli
    flokli authored Jan 10, 2020
    Copy the full SHA
    39f9b46 View commit details

  9. firefox-devedition-bin: 72.0b11 -> 73.0b3

    @adisbladis
    adisbladis committed Jan 10, 2020
    Copy the full SHA
    7a02373 View commit details

  10. firefox-beta-bin: 72.0b3 -> 73.0b3

    @adisbladis
    adisbladis committed Jan 10, 2020
    Copy the full SHA
    7750fd5 View commit details

  11. tor-browser-bundle-bin: 9.0.3 -> 9.0.4

    @emilazy
    emilazy committed Jan 10, 2020
    Copy the full SHA
    05c0695 View commit details

  12. Merge pull request #77458 from emilazy/tor-browser-bundle-bin-9.0.4 

    tor-browser-bundle-bin: 9.0.3 -> 9.0.4
    @grahamc
    grahamc authored Jan 10, 2020
    Copy the full SHA
    5a43727 View commit details

  13. firefoxPackages.icecat: mark as insecure 

    It's based on 60.3.0, whose support ended around October 2019.
    @flokli
    flokli committed Jan 10, 2020
    Copy the full SHA
    0e75514 View commit details

  14. Merge pull request #77463 from flokli/icecat-mark-insecure 

    firefoxPackages.icecat: mark as insecure
    @andir
    andir authored Jan 10, 2020
    Copy the full SHA
    566780f View commit details

  15. Merge pull request #77442 from NixOS/revert-76842-add-doc-to-ghc-wrapper 

    Revert patch: add "doc" to ghc wrapper
    @peti
    peti authored Jan 10, 2020
    Copy the full SHA
    d1bd0fb View commit details

  16. vimPlugins.vim-cool: init at 2018-01-11

    @iv-nn
    iv-nn authored and Jon committed Jan 10, 2020
    Copy the full SHA
    fccbde0 View commit details

  17. vimPlugins.increment-activator: init at 2019-05-09

    @iv-nn
    iv-nn authored and Jon committed Jan 10, 2020
    Copy the full SHA
    76e5ae7 View commit details

  18. LTS Haskell 14.20

    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    323fe92 View commit details

  19. hackage2nix: update list of broken builds

    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    dbe97c7 View commit details

  20. haskellPackages.webby: mark unbroken 

    Builds fine now.
    @donatello @peti
    donatello authored and peti committed Jan 10, 2020
    Copy the full SHA
    cf2df51 View commit details

  21. haskellPackages.hakyll-sass: unmark broken

    @turboMaCk @peti
    turboMaCk authored and peti committed Jan 10, 2020
    Copy the full SHA
    efa816a View commit details

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

    This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
commercialhaskell/all-cabal-hashes@e75b27b.
    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    2447c66 View commit details

  23. ghc-8.10.x: exceptions is now a core library that comes with the comp… 

    …iler
    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    2514bdd View commit details

  24. postgresql-typed: disable test suite 

    the test suite requires a running PostgreSQL instance to complete
successfully, so we'll just skip that.
    @BrianHicks @peti
    BrianHicks authored and peti committed Jan 10, 2020
    Copy the full SHA
    dfa9d01 View commit details

  25. haskell-src-exts: update overrides for the new 1.23.0 version

    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    d8cf98b View commit details

  26. haskell: add quickjump option to the haskell mkDerivation 

    When visiting local documentation via hoogle, currently for most packages the
quickjump index is missing so you only get a sad error when pressing "s" to
search in the current documentation.

The quickjump option is only supported by the haddock utility that's shipped
with ghc 8.6.x or later.

Closes #75942.
    @mgttlinger @peti
    mgttlinger authored and peti committed Jan 10, 2020
    Copy the full SHA
    900a378 View commit details

  27. haskell: add comment to default-package-overrides in configuration-ha… 

    …ckage2nix.yaml.
    @cdepillabout @peti
    cdepillabout authored and peti committed Jan 10, 2020
    Copy the full SHA
    d11d55f View commit details

  28. hackage2nix.yaml: update the comment that documents 'default-package-… 

    …overrides'
    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    2c1f974 View commit details

  29. haskell-tls: update ghc-8.8.x override for the latest version

    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    1886028 View commit details

  30. haskell-pandoc: update ghc-8.8.x override for the latest version

    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    7b8cdfa View commit details

  31. haskell-hoogle: drop obsolete jailbreak 

    The latest version of hoogle accepts haskell-src-exts-1.23.x.
    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    4ef37f4 View commit details

  32. git-annex: update sha256 hash for version 7.20191230

    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    0685be7 View commit details

  33. haskell-krank: jailbreak to fix the build

    @peti
    peti committed Jan 10, 2020
    Copy the full SHA
    29e871b View commit details

  34. Merge pull request #76982 from NixOS/haskell-updates 

    Update Haskell package set to LTS 14.20 (plus other fixes)
    @peti
    peti authored Jan 10, 2020
    Copy the full SHA
    9ed7227 View commit details

  35. thrift: fix checkPhase on darwin

    @veprbl
    veprbl committed Jan 10, 2020
    Copy the full SHA
    ef1a865 View commit details

  36. rustracer: 2.1.28 -> 2.1.29 

    https://crates.io/crates/racer/2.1.29

The package is now pinned to the git rev that is published as 2.1.29 on
crates.io (there's no 2.1.29 tag on GitHub unfortunately).
    @Ma27
    Ma27 committed Jan 10, 2020
    Copy the full SHA
    41e0619 View commit details

  37. Merge pull request #77467 from veprbl/pr/thrift_darwin_fix 

    thrift: fix checkPhase on darwin
    @veprbl
    veprbl authored Jan 10, 2020
    Copy the full SHA
    b74c26a View commit details

  38. nixos/spamassassin: allow initPreConf to be a path 

    Supporting a path here is important because it allows e.g. fetching a
configuration from a URL.  To do this and provide the configuration as
a string, IFD would be necessary.  It's just written into a path
anyway.
    @alyssais
    alyssais committed Jan 10, 2020
    Copy the full SHA
    59c4035 View commit details

  39. go: 1.13.5 -> 1.13.6

    @zowoq
    zowoq committed Jan 10, 2020
    Copy the full SHA
    116b5c5 View commit details
Showing with 3,183 additions and 2,349 deletions.
  1. +2 −2 nixos/modules/services/mail/spamassassin.nix
  2. +1 −0 nixos/tests/kafka.nix
  3. +385 −385 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  4. +385 −385 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  5. +4 −89 pkgs/applications/networking/browsers/firefox/packages.nix
  6. +5 −5 pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
  7. +12 −7 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  8. +0 −345 pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
  9. +2 −2 pkgs/applications/networking/browsers/vivaldi/default.nix
  10. +1 −1 pkgs/applications/networking/mullvad-vpn/default.nix
  11. +1 −1 pkgs/applications/science/biology/xenomapper/default.nix
  12. +16 −2 pkgs/build-support/docker/default.nix
  13. +32 −5 pkgs/build-support/docker/store-path-to-layer.sh
  14. +2 −2 pkgs/development/compilers/go/1.12.nix
  15. +2 −2 pkgs/development/compilers/go/1.13.nix
  16. +7 −3 pkgs/development/haskell-modules/configuration-common.nix
  17. +1 −0 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
  18. +2 −2 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
  19. +71 −45 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  20. +4 −0 pkgs/development/haskell-modules/configuration-nix.nix
  21. +2 −0 pkgs/development/haskell-modules/generic-builder.nix
  22. +2,009 −977 pkgs/development/haskell-modules/hackage-packages.nix
  23. +2 −12 pkgs/development/haskell-modules/with-packages-wrapper.nix
  24. +6 −2 pkgs/development/interpreters/joker/default.nix
  25. +13 −2 pkgs/development/libraries/thrift/default.nix
  26. +1 −1 pkgs/development/python-modules/Pygments/default.nix
  27. +2 −2 pkgs/development/python-modules/catalogue/default.nix
  28. +1 −1 pkgs/development/python-modules/hypothesis/default.nix
  29. +32 −0 pkgs/development/python-modules/junit-xml/default.nix
  30. +1 −1 pkgs/development/python-modules/pastescript/default.nix
  31. +1 −1 pkgs/development/python-modules/pathos/default.nix
  32. +1 −1 pkgs/development/python-modules/pivy/default.nix
  33. +1 −1 pkgs/development/python-modules/pox/default.nix
  34. +1 −1 pkgs/development/python-modules/pvlib/default.nix
  35. +1 −1 pkgs/development/python-modules/pyenchant/default.nix
  36. +1 −1 pkgs/development/python-modules/pyftdi/default.nix
  37. +1 −1 pkgs/development/python-modules/pyparsing/default.nix
  38. +1 −1 pkgs/development/python-modules/pyramid_exclog/default.nix
  39. +1 −1 pkgs/development/python-modules/pysam/default.nix
  40. +3 −1 pkgs/development/python-modules/python-sql/default.nix
  41. +1 −1 pkgs/development/python-modules/pyviz-comms/default.nix
  42. +2 −2 pkgs/development/python-modules/quantities/default.nix
  43. +4 −1 pkgs/development/python-modules/relatorio/default.nix
  44. +1 −1 pkgs/development/python-modules/robotframework/default.nix
  45. +1 −1 pkgs/development/python-modules/scikit-image/default.nix
  46. +1 −1 pkgs/development/python-modules/snakebite/default.nix
  47. +45 −0 pkgs/development/python-modules/stups-fullstop/default.nix
  48. +1 −1 pkgs/development/python-modules/sympy/default.nix
  49. +1 −1 pkgs/development/python-modules/threadpool/default.nix
  50. +1 −1 pkgs/development/python-modules/todoist/default.nix
  51. +1 −1 pkgs/development/python-modules/translationstring/default.nix
  52. +1 −1 pkgs/development/python-modules/wget/default.nix
  53. +1 −1 pkgs/development/python-modules/xstatic-bootstrap/default.nix
  54. +1 −1 pkgs/development/python-modules/xstatic-pygments/default.nix
  55. +1 −1 pkgs/development/python-modules/yattag/default.nix
  56. +1 −1 pkgs/development/python-modules/zope_filerepresentation/default.nix
  57. +2 −2 pkgs/development/tools/misc/clojure-lsp/default.nix
  58. +9 −12 pkgs/development/tools/rq/default.nix
  59. +22 −0 pkgs/development/tools/run/default.nix
  60. +4 −4 pkgs/development/tools/rust/racer/default.nix
  61. +2 −2 pkgs/development/web/nodejs/v10.nix
  62. +22 −0 pkgs/misc/vim-plugins/generated.nix
  63. +2 −0 pkgs/misc/vim-plugins/vim-plugin-names
  64. +1 −1 pkgs/os-specific/linux/kernel/linux-libre.nix
  65. +5 −0 pkgs/servers/apache-kafka/default.nix
  66. +5 −4 pkgs/servers/matterbridge/default.nix
  67. +2 −2 pkgs/tools/networking/shadowsocks-libev/default.nix
  68. +11 −7 pkgs/tools/package-management/cargo-deb/default.nix
  69. +5 −0 pkgs/top-level/aliases.nix
  70. +7 −8 pkgs/top-level/all-packages.nix
  71. +4 −0 pkgs/top-level/python-packages.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/mail/spamassassin.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ with lib;
let
cfg = config.services.spamassassin;
spamassassin-local-cf = pkgs.writeText "local.cf" cfg.config;
spamassassin-init-pre = pkgs.writeText "init.pre" cfg.initPreConf;

spamdEnv = pkgs.buildEnv {
name = "spamd-env";
@@ -65,8 +64,9 @@ in
};

initPreConf = mkOption {
type = types.str;
type = with types; either str path;
description = "The SpamAssassin init.pre config.";
apply = val: if builtins.isPath val then val else pkgs.writeText "init.pre" val;
default =
''
#
1 change: 1 addition & 0 deletions nixos/tests/kafka.nix
View file
Original file line number Diff line number Diff line change
@@ -89,4 +89,5 @@ in with pkgs; {
kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1;
kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2;
kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3;
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
}
Loading