JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39478 from pngwjpgh/infinoted

Browse Source 
nixos/infinoted: Abstract over libinfinity version
This commit is contained in:
Matthew Justin Bauer 2018-05-01 10:22:25 -05:00 committed by GitHub
commit 4e58e23262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/editors/infinoted.nix
View File

@ -129,7 +129,7 @@ in {
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
Restart = "always"; Restart = "always";
ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf"; ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf";
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
PermissionsStartOnly = true; PermissionsStartOnly = true;

7
pkgs/development/libraries/libinfinity/default.nix
View File

@ -12,7 +12,8 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libinfinity-0.7.1"; name = "libinfinity-${version}";
version = "0.7.1";
src = fetchurl { src = fetchurl {
url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";
@ -36,6 +37,10 @@ in stdenv.mkDerivation rec {
${edf avahiSupport "avahi"} ${edf avahiSupport "avahi"}
''; '';
passthru = {
inherit version;
};
meta = { meta = {
homepage = http://gobby.0x539.de/; homepage = http://gobby.0x539.de/;
description = "An implementation of the Infinote protocol written in GObject-based C"; description = "An implementation of the Infinote protocol written in GObject-based C";