diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
| commit | 59b5bbeae91109007e36a269a94cccc865dc5175 (patch) | |
| tree | 1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/development/tools/grabserial/default.nix | |
| parent | Do not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff) | |
| parent | Merge pull request #19675 from edwtjo/dictd-touchup (diff) | |
| download | nixpkgs-gitlab.intr/security-updates.tar.gz | |
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
Diffstat (limited to 'pkgs/development/tools/grabserial/default.nix')
| -rw-r--r-- | pkgs/development/tools/grabserial/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index 1020ed864dfb..c86c2e275ed1 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { - name = "grabserial-20141120"; + name = "grabserial-1.9.3"; namePrefix = ""; src = fetchgit { url = https://github.com/tbird20d/grabserial.git; - rev = "8b9c98ea35d382bac2aafc7a8a9c02440369a792"; - sha256 = "ff27f5e5ab38c8450a4a0291e943e6c5a265e56d29d6a1caa849ae3238d71679"; + rev = "7cbf104b61ffdf68e6782a8e885050565399a014"; + sha256 = "043r2p5jw0ymx8ka1d39q1ap39i7sliq5f4w3yr1n53lzshjmc5g"; }; propagatedBuildInputs = [ pythonPackages.pyserial ]; |