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: 1c5386fa1dee
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: 19aac2413ae2
Choose a head ref

Commits on May 27, 2020

  1. musikcube: 0.90.1 -> 0.92.1

    aanderse committed May 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    2e29f5f View commit details

Commits on May 28, 2020

  1. codeql: 2.1.3 -> 2.1.4

    r-ryantm committed May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    e5b02a7 View commit details
  2. libfyaml: init at 0.5.7

    marsam committed May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    501e613 View commit details
  3. dump1090: 3.8.0 -> 3.8.1

    r-ryantm committed May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    d001b9b View commit details
  4. fldigi: 4.1.12 -> 4.1.13

    r-ryantm committed May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    c845c36 View commit details
  5. php.buildEnv: Let enabled extensions to pass through by default

    If only extraConfig is specified in buildEnv, keep the currently
    enabled extensions active. Brought up in #89011.
    talyz committed May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    bfdc832 View commit details
  6. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    cd0b121 View commit details

Commits on May 29, 2020

  1. maintainers: change my data

    gnidorah committed May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    b7e89a5 View commit details
  2. openmpt123: 0.4.12 -> 0.5.0

    gnidorah committed May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    9822824 View commit details
  3. Merge pull request #88872 from gnidorah/openmpt123

    openmpt123: 0.4.12 -> 0.5.0
    marsam authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    1f2e949 View commit details
  4. Merge pull request #89146 from marsam/init-libfyaml

    libfyaml: init at 0.5.7
    marsam authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    d9f9fcf View commit details
  5. Merge pull request #89125 from r-ryantm/auto-update/dump1090

    dump1090: 3.8.0 -> 3.8.1
    marsam authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    a674766 View commit details
  6. Merge pull request #89130 from r-ryantm/auto-update/fldigi

    fldigi: 4.1.12 -> 4.1.13
    marsam authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    3f9902e View commit details
  7. Merge pull request #89131 from Luflosi/update/youtube-dl

    youtube-dl: 2020.05.08 -> 2020.05.29
    Ma27 authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    6da14c9 View commit details
  8. Merge pull request #88998 from aanderse/musikcube

    musikcube: 0.90.1 -> 0.92.1
    aanderse authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    22a231c View commit details
  9. Merge pull request #89132 from talyz/php-buildenv-keep-extensions

    php.buildEnv: Let enabled extensions to pass through by default
    Ma27 authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    4eb9c62 View commit details
  10. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    7c74817 View commit details
  11. Merge pull request #89068 from r-ryantm/auto-update/codeql

    codeql: 2.1.3 -> 2.1.4
    ryantm authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    a3a94a9 View commit details
  12. bazel: 3.1.0 -> 3.2.0

    avdv authored and Profpatsch committed May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    7172514 View commit details
  13. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    b8cc675 View commit details
  14. direnv: fix missing BASH_PATH (#89165)

    This was broken by the switch to go modules (#87932) which doesn't
    respect makeFlags.
    
    Fixes #89129
    zimbatm authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    bc3b694 View commit details
  15. gpsd: clarify license

    orivej committed May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    3bc5b85 View commit details
  16. Merge pull request #89172 from zowoq/ripgrep

    ripgrep: 12.1.0 -> 12.1.1
    Ma27 authored May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    1b4497c View commit details
  17. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    Copy the full SHA
    19aac24 View commit details
4 changes: 2 additions & 2 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -2917,10 +2917,10 @@
name = "Robin Gloster";
};
gnidorah = {
email = "gnidorah@yandex.com";
email = "gnidorah@users.noreply.github.com";
github = "gnidorah";
githubId = 12064730;
name = "Alex Ivanov";
name = "gnidorah";
};
gnxlxnxx = {
email = "gnxlxnxx@web.de";
11 changes: 6 additions & 5 deletions pkgs/applications/audio/musikcube/default.nix
Original file line number Diff line number Diff line change
@@ -17,18 +17,15 @@

stdenv.mkDerivation rec {
pname = "musikcube";
version = "0.90.1";
version = "0.92.1";

src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
sha256 = "1ff2cgbllrl2pl5zfbf0cd9qbf6hqpwr395sa1k245ar4f1rfwpg";
sha256 = "0l4ncxqxvp5m014j7vlglhzxhhrxl0c2m71xn0i0a27hn4nc72mr";
};

# https://github.com/clangen/musikcube/issues/339
patches = [ ./dont-strip.patch ];

nativeBuildInputs = [
cmake
pkg-config
@@ -46,6 +43,10 @@ stdenv.mkDerivation rec {
taglib
] ++ stdenv.lib.optional systemdSupport systemd;

cmakeFlags = [
"-DDISABLE_STRIP=true"
];

meta = with stdenv.lib; {
description = "A fully functional terminal-based music player, library, and streaming audio server";
homepage = "https://musikcube.com/";
14 changes: 0 additions & 14 deletions pkgs/applications/audio/musikcube/dont-strip.patch

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/applications/audio/openmpt123/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:

let
version = "0.4.12";
version = "0.5.0";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;

src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "0q2yf9g6hcwvr2nk3zggkscyf0np6i03q2g7fx10i2kcdr3n9k8c";
sha256 = "0zl3djy9z7cpqk8g8pxrzmmikxsskb0y5qdabg6c683j7x5abjs3";
};

enableParallelBuilding = true;
4 changes: 2 additions & 2 deletions pkgs/applications/radio/dump1090/default.nix
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@

stdenv.mkDerivation rec {
pname = "dump1090";
version = "3.8.0";
version = "3.8.1";

src = fetchFromGitHub {
owner = "flightaware";
repo = pname;
rev = "v${version}";
sha256 = "0c30x56h79hza9m6b9zp5y28jxx4f4n5xgaaw597l8agcm5iia0p";
sha256 = "0xg8rzrxqklx1m9ncxsd96dlkbjcsxfi2mrb859v50f07xysdyd8";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/applications/radio/fldigi/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:

stdenv.mkDerivation rec {
version = "4.1.12";
version = "4.1.13";
pname = "fldigi";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1";
sha256 = "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224";
};

buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/gvisor/default.nix
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
'';

sha256 = "1nghj9gjdx2nfi1k98nsfsjnglbfmqrcbn73zvb8ii5j7hdm7392";
sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v";
};

buildAttrs = {
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/php/default.nix
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ let
# consecutive calls to buildEnv and overrides to work as
# expected.
mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable (
{ extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs:
{ extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs:
let
allArgs = args // prevArgs // innerArgs;
filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ];
@@ -55,8 +55,8 @@ let
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
enabledExtensions =
builtins.foldl'
(state: f:
f { enabled = state; all = php-packages.extensions; })
(enabled: f:
f { inherit enabled; all = php-packages.extensions; })
[]
allExtensionFunctions;

21 changes: 21 additions & 0 deletions pkgs/development/libraries/libfyaml/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, fetchurl, gnum4 }:

stdenv.mkDerivation rec {
pname = "libfyaml";
version = "0.5.7";

src = fetchurl {
url = "https://github.com/pantoniou/libfyaml/releases/download/v${version}/libfyaml-${version}.tar.gz";
sha256 = "143m30f006jsvhikk9nc050hxzqi8xg0sbd88kjrgfpyncdz689j";
};

nativeBuildInputs = [ gnum4 ];

meta = with stdenv.lib; {
homepage = "https://github.com/pantoniou/libfyaml";
description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
platforms = platforms.all;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/dm-sonnet/default.nix
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ let
bazelTarget = ":install";

fetchAttrs = {
sha256 = "1v5wwlg5v95fz2qg96pdkxlnvw029fxcbsjl906lxdgdi3f8xmmz";
sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3";
};

bazelFlags = [
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ let
bazelTarget = ":pip_pkg";

fetchAttrs = {
sha256 = "1rnbxgfhrv4rq8kc0ryxn6i5aqwx51cys0vd5r2m7mqz53aypawk";
sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i";
};

buildAttrs = {
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/codeql/default.nix
Original file line number Diff line number Diff line change
@@ -12,15 +12,15 @@

stdenv.mkDerivation rec {
pname = "codeql";
version = "2.1.3";
version = "2.1.4";

dontConfigure = true;
dontBuild = true;
dontStrip = true;

src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "1b0hqc8zs6v47w9sjk40sbj1fw5x5bxg7kw9s84y6s60yr897376";
sha256 = "0jgwvc9flqdm88q9kknzjs125j9d3j5l5adcpngfy17ljgziy4nn";
};

nativeBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/development/tools/bazel-watcher/default.nix
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';

sha256 = "0qx641bxwpkg42sps67k1x1r68ql42qalpn7irf85vn634rw4r8v";
sha256 = "0i77nnbd1sd39qw4vm3n5mwkag3dskqjhzr7qs4w1arbiih45zd4";
};

buildAttrs = {
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';

sha256 = "16rb9kgv1izqnv80lvfrd7dxrmgnjrlknv1396w6q2qanskh3cjv";
sha256 = "0rfjyvw370yn4rp1f2772b2h3jbycymdw26zx38krzy5zq0iajyp";
};

buildAttrs = {
Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@
}:

let
version = "3.1.0";
version = "3.2.0";

src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "d7f40d0cac95a06cea6cb5b7f7769085257caebc3ee84269dd9298da760d5615";
sha256 = "1ylbfdcb6rhnc3sr292c6shl754i0h0i050f4gr4bppn6sa15v24";
};

# Update with `eval $(nix-build -A bazel.updater)`,
@@ -54,7 +54,7 @@ let
srcs."coverage_output_generator-v2.1.zip"
srcs.build_bazel_rules_nodejs
srcs."android_tools_pkg-0.16.0.tar.gz"
srcs."2.1.0.tar.gz"
srcs."3.1.0.tar.gz"
srcs.rules_pkg
srcs.rules_cc
srcs.rules_java
30 changes: 15 additions & 15 deletions pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
Original file line number Diff line number Diff line change
@@ -7,14 +7,6 @@
"https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
]
},
"2.1.0.tar.gz": {
"name": "2.1.0.tar.gz",
"sha256": "4d348abfaddbcee0c077fc51bb1177065c3663191588ab3d958f027cbfe1818b",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/2.1.0/bazel-toolchains-2.1.0.tar.gz"
]
},
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": {
"name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
"sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
@@ -23,6 +15,14 @@
"https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz"
]
},
"3.1.0.tar.gz": {
"name": "3.1.0.tar.gz",
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
]
},
"46993efdd33b73649796c5fc5c9efb193ae19d51.zip": {
"name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip",
"sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88",
@@ -111,11 +111,11 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "4d348abfaddbcee0c077fc51bb1177065c3663191588ab3d958f027cbfe1818b",
"strip_prefix": "bazel-toolchains-2.1.0",
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
"strip_prefix": "bazel-toolchains-3.1.0",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/2.1.0/bazel-toolchains-2.1.0.tar.gz"
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
]
},
"build_bazel_rules_nodejs": {
@@ -157,7 +157,7 @@
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"patches": [
"@io_bazel//third_party/protobuf:3.11.3.patch"
"//third_party/protobuf:3.11.3.patch"
],
"sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
"strip_prefix": "protobuf-3.11.3",
@@ -661,8 +661,8 @@
"name": "rules_nodejs-1.3.0.tar.gz",
"sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/rules_nodejs-1.3.0.tar.gz",
"https://github.com/bazelbuild/rules_nodejs/archive/rules_nodejs-1.3.0.tar.gz"
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz",
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"
]
},
"rules_pkg": {
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ def rules_pkg_dependencies(*args, **kw): pass
def winsdk_configure(*args, **kw): pass
def register_local_rc_exe_toolchains(*args, **kw): pass
def register_toolchains(*args, **kw): pass
def debian_deps(): pass

# execute the WORKSPACE like it was python code in this module,
# using all the function stubs from above.
2 changes: 1 addition & 1 deletion pkgs/servers/gpsd/default.nix
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
location-aware applications GPS/AIS logs for diagnostic purposes.
'';
homepage = "http://catb.org/gpsd/";
license = "BSD-style";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ bjornfor rasendubi ];
};
6 changes: 3 additions & 3 deletions pkgs/tools/backup/duplicati/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "duplicati";
version = "2.0.4.23";
version = "2.0.5.1";
channel = "beta";
build_date = "2019-07-14";
build_date = "2020-01-18";

src = fetchzip {
url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
sha256 = "1m2448vgl1fc2hkxkyasvdfgl728rqv16b41niznv5rsxv5643w2";
sha256 = "1k3gfwcw7snxkqn4lf9rx1vzradpyq5vc48pwvaa8wwqnlykiimw";
stripRoot = false;
};

11 changes: 8 additions & 3 deletions pkgs/tools/misc/direnv/default.nix
Original file line number Diff line number Diff line change
@@ -14,9 +14,14 @@ buildGoModule rec {
};

# we have no bash at the moment for windows
makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [
"BASH_PATH=${bash}/bin/bash"
];
BASH_PATH =
stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
"${bash}/bin/bash";

# replace the build phase to use the GNUMakefile instead
buildPhase = ''
make BASH_PATH=$BASH_PATH
'';

installPhase = ''
make install DESTDIR=$out
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2020.05.08";
version = "2020.05.29";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6";
sha256 = "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3";
};

nativeBuildInputs = [ installShellFiles makeWrapper ];
13 changes: 9 additions & 4 deletions pkgs/tools/system/confd/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:

buildGoPackage rec {
pname = "confd";
version = "0.9.0";
version = "0.16.0";
rev = "v${version}";

goPackagePath = "github.com/kelseyhightower/confd";
@@ -12,8 +12,13 @@ buildGoPackage rec {
inherit rev;
owner = "kelseyhightower";
repo = "confd";
sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
sha256 = "0q7r6dkgirnmqi3rhqdaai88jqzw52l6jdrrwsf2qq0hva09961p";
};

goDeps = ./deps.nix;
meta = {
description = "Manage local application configuration files using templates and data from etcd or consul";
homepage = "https://github.com/kelseyhightower/confd";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.zimbatm ];
};
}
Loading