aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkgs/default.nix12
-rw-r--r--pkgs/libraries/logc/default.nix5
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ea787f4..0bdc99f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -13,10 +13,14 @@ let
) { };
logc = callPackage ./libraries/logc { };
- logc-0_1 = callPackage ./libraries/logc {
- pkgversion = "0.1.0";
- pkgsha256 = "1swjzs2249wvnqx2zvxwd7d1z22kd3512xxfvq002cvgbq78ka9a";
- };
+ logc-0_1 = logc.overrideAttrs (oldAttrs: rec {
+ version = "0.1.0";
+ src = fetchgit {
+ url = "https://gitlab.nic.cz/turris/logc.git";
+ rev = "v" + version;
+ sha256 = "1swjzs2249wvnqx2zvxwd7d1z22kd3512xxfvq002cvgbq78ka9a";
+ };
+ });
logc-libs = callPackage ./libraries/logc-libs { };
base64c = callPackage ./libraries/base64c { };
paho-mqtt-c = callPackage ./libraries/paho-mqtt-c { };
diff --git a/pkgs/libraries/logc/default.nix b/pkgs/libraries/logc/default.nix
index 1c99e19..784efd7 100644
--- a/pkgs/libraries/logc/default.nix
+++ b/pkgs/libraries/logc/default.nix
@@ -1,12 +1,11 @@
{ stdenv, lib, fetchgit
, bootstrapHook, pkg-config, gperf
, libconfig
-, pkgversion ? "0.4.0", pkgsha256 ? "15nplgjgg6dxryy4yzbj4524y77ci0syi970rmbr955m9vxvhrib"
}:
stdenv.mkDerivation rec {
pname = "logc";
- version = pkgversion;
+ version = "0.4.0";
meta = with lib; {
homepage = "https://gitlab.nic.cz/turris/logc";
description = "Logging for C";
@@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://gitlab.nic.cz/turris/logc.git";
rev = "v" + version;
- sha256 = pkgsha256;
+ sha256 = "15nplgjgg6dxryy4yzbj4524y77ci0syi970rmbr955m9vxvhrib";
};
buildInputs = [libconfig];