pps-tools: init at v1.0.2, enable for chrony, gpsd, ntp #42889
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
orivej
suggested changes
Jul 2, 2018
|
|
||
| stdenv.mkDerivation rec { | ||
| baseName = "pps-tools"; | ||
| version = "v1.0.2"; |
There was a problem hiding this comment.
v is a part of rev, it is not a part of version.
| meta = with stdenv.lib;{ | ||
| description = "User-space tools for LinuxPPS"; | ||
| homepage = http://linuxpps.org/; | ||
| license = licenses.gpl2; |
There was a problem hiding this comment.
The license is gpl2Plus.
Could you list yourself as the maintainer?
pkgs/servers/gpsd/default.nix
Outdated
| scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ | ||
| systemd=yes udevdir="$out/lib/udev" \ | ||
| python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" | ||
| export CFLAGS="-I${pps-tools.dev}/include" |
There was a problem hiding this comment.
Add pps-tools to buildInputs instead.
There was a problem hiding this comment.
Doesn't seem to be detected in that case.
There was a problem hiding this comment.
This is a common issue with scons-based projects. Please add this patch for gpsd then:
--- a/SConstruct
+++ b/SConstruct
@@ -226 +226 @@ import_env = (
-envs = {}
+envs = os.environ
pkgs/top-level/all-packages.nix
Outdated
| @@ -21855,5 +21855,6 @@ with pkgs; | |||
| yrd = callPackage ../tools/networking/yrd { }; | |||
|
|
|||
| powershell = callPackage ../shells/powershell { }; | |||
| pps-tools = callPackage ../development/libraries/pps-tools { }; | |||
There was a problem hiding this comment.
This is primarily a set of Linux tools, please move it to pkgs/os-specific/linux/ and after powertop in all-packages.nix.
sorki
force-pushed
the
pps-tools
branch
2 times, most recently
from
5279cbb
to
40ec7a7
Compare
|
Added scons patch, thanks for the hints. |
orivej
approved these changes
Jul 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Enable PPS support
Things done
Packaged pps-tools, enabled in supported apps.
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)