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: 090f5e095533
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: 5cc757117d63
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 7, 2018

  1. nixos/prometheus-snmp-exporter: fix command line argument format 

    (cherry picked from commit c477d66)
    @thefloweringash @Mic92
    thefloweringash authored and Mic92 committed Oct 7, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    acdlite Andrew Clark
    SSH Key Fingerprint: kMgJy+7AI/mxxpuyx1Qgc7NZY55dREBRubChEAYfi7I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2b3b607 View commit details

  2. borgbackup: patch bug that allowed for exceeding quotas 

    See also borgbackup/borg#4093 for this.

(cherry picked from commit 0cfc923)
    @erictapen @Mic92
    erictapen authored and Mic92 committed Oct 7, 2018
    Copy the full SHA
    45c83d9 View commit details

  3. cool-retro-term: Fix link to home page 

    (cherry picked from commit 82b2b91)
    @alexherbo2 @Mic92
    alexherbo2 authored and Mic92 committed Oct 7, 2018
    Copy the full SHA
    5cc7571 View commit details
8 changes: 4 additions & 4 deletions nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
View file
Original file line number Diff line number Diff line change
@@ -60,10 +60,10 @@ in
DynamicUser = true;
ExecStart = ''
${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
-config.file ${configFile} \
-log.format ${cfg.logFormat} \
-log.level ${cfg.logLevel} \
-web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--config.file=${configFile} \
--log.format=${cfg.logFormat} \
--log.level=${cfg.logLevel} \
--web.listen-address=${cfg.listenAddress}:${toString cfg.port} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};
2 changes: 1 addition & 1 deletion pkgs/applications/misc/cool-retro-term/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
feel of the old cathode tube screens. It has been designed to be
eye-candy, customizable, and reasonably lightweight.
'';
homepage = https://github.com/Swordifish90/cool-retro-term;
homepage = https://github.com/Swordfish90/cool-retro-term;
license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ skeidel ];
11 changes: 10 additions & 1 deletion pkgs/tools/backup/borg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:

python3Packages.buildPythonApplication rec {
pname = "borgbackup";
@@ -9,6 +9,15 @@ python3Packages.buildPythonApplication rec {
sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc";
};

patches = [
# Workarounds for https://github.com/borgbackup/borg/issues/4093
# Can be deleted when 1.1.8 comes out
(fetchpatch {
url = "https://github.com/borgbackup/borg/commit/975cc33206e0e3644626fb7204c34d2157715b61.patch";
sha256 = "0b7apaixpa7bk0sy7g5ycm98cjpkg5gkwcgm7m37xj35lzxdlxhc";
})
];

nativeBuildInputs = with python3Packages; [
# For building documentation:
sphinx guzzle_sphinx_theme