Skip to content
This repository has been 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
base: 4707311e2020
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: b719c465f25e
Choose a head ref
  • 13 commits
  • 25 files changed
  • 7 contributors

Commits on Mar 4, 2020

  1. codimd: 1.5.0 -> 1.6.0

    (cherry picked from commit 6c22840)
    WilliButz authored and Ma27 committed Mar 4, 2020
    Copy the full SHA
    9cefdd7 View commit details
    Browse the repository at this point in the history
  2. nixos/codimd: update useCDN default to false

    (cherry picked from commit 68410b0)
    WilliButz authored and Ma27 committed Mar 4, 2020
    Copy the full SHA
    0419b78 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. palemoon: 28.8.2.1 -> 28.8.4

    (cherry picked from commit e633927)
    r-ryantm authored and OPNA2608 committed Mar 5, 2020
    Copy the full SHA
    f5fa7bf View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. Merge pull request #81757 from Ma27/backport-codimd

    [20.03] codimd: 1.5.0 -> 1.6.0
    WilliButz committed Mar 6, 2020
    Copy the full SHA
    3fbd8bd View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    5c35647 View commit details
    Browse the repository at this point in the history
  3. nixos/prometheus-*-exporter: escape shell args

    (cherry picked from commit 0ac24cc)
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    c3bb46e View commit details
    Browse the repository at this point in the history
  4. nixos/prometheus-snmp-exporter: update log options

    The allowed values have changed in bd3319d.
    
    0.15:
          --log.level="info"        Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]
          --log.format="logger:stderr"
                                    Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"
    
    0.17:
          --log.level=info          Only log messages with the given severity or above. One of: [debug, info, warn, error]
          --log.format=logfmt       Output format of log messages. One of: [logfmt, json]
    
    (cherry picked from commit 87f87fb)
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    6673c4f View commit details
    Browse the repository at this point in the history
  5. nixos/prometheus-snmp-exporter: fix assertion

    The assertion was printed when user explicitly defined only the
    configurationPath option.
    
    (cherry picked from commit 2a080ac)
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    bddb172 View commit details
    Browse the repository at this point in the history
  6. nixos/prometheus-mail-exporter: fix assertion

    The assertion was printed when user explicitly defined only the
    configFile option.
    
    (cherry picked from commit 3b5cf35)
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    f382c70 View commit details
    Browse the repository at this point in the history
  7. nixos/prometheus-mail-exporter: misc fixes

     - Fix misspelled option. mkRenamedOptionModule is not used because the
       option hasn't really worked before.
     - Add missing cfg.telemetryPath arg to ExecStart.
     - Fix mkdir invocation in test.
    
    (cherry picked from commit e7ed790)
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    ebb7ec3 View commit details
    Browse the repository at this point in the history
  8. nixos/tests/prometheus-exporters: increase memory for rspamd

    Before this, the test failed because rspamd did invoke the oom-killer.
    
    (cherry picked from commit 0d832ee)
    WilliButz committed Mar 6, 2020
    Copy the full SHA
    9db4062 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #81880 from OPNA2608/palemoon_28.8.4_cherrypick_20.03

    [20.03] palemoon: 28.8.2.1 -> 28.8.4
    AndersonTorres committed Mar 6, 2020
    Copy the full SHA
    253e2d9 View commit details
    Browse the repository at this point in the history
  10. pulumi: 1.4.0 -> 1.12.0

    (cherry picked from commit c4f5f95)
    Dillen Meijboom authored and Mic92 committed Mar 6, 2020
    Copy the full SHA
    b719c46 View commit details
    Browse the repository at this point in the history