git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21523 from peterhoeg/u/remarsh

remarshal: 0.3.0 -> 0.6.0

commitd57405568eab820524ffd65f2f35f0d920995e17 authorPascal Wittmann <PascalWittmann@gmx.net> dateFri 30 Dec 2016, 14:17 (10 years ago) parent652a870db90dd8
2 files changed+34−9
compare with master
unifiedsplit
pkgs/development/tools/remarshal/default.nix+12−9 pkgs/top-level/python-packages.nix+22
pkgs/development/tools/remarshal/default.nix+12−9
@@ -1,20 +1,23 @@
1−{ lib, buildGoPackage, fetchFromGitHub }:
1+{ stdenv, pythonPackages, fetchFromGitHub }:
22
3−buildGoPackage rec {
4− name = "remarshal-${rev}";
5− rev = "0.3.0";
6− goPackagePath = "github.com/dbohdan/remarshal";
3+pythonPackages.buildPythonApplication rec {
4+ name = "remarshal-${version}";
5+ version = "0.6.0";
76
87 src = fetchFromGitHub {
9− rev = "v${rev}";
108 owner = "dbohdan";
119 repo = "remarshal";
12− sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496";
10+ rev = "v${version}";
11+ sha256 = "0jslawpzghv3chamrfddnyn5p5068kjxy8d38fxvi5h06qgfb4wp";
1312 };
1413
15− goDeps = ./deps.nix;
14+ propagatedBuildInputs = with pythonPackages; [
15+ dateutil
16+ pytoml
17+ pyyaml
18+ ];
1619
17− meta = with lib; {
20+ meta = with stdenv.lib; {
1821 description = "Convert between TOML, YAML and JSON";
1922 license = licenses.mit;
2023 homepage = https://github.com/dbohdan/remarshal;
pkgs/top-level/python-packages.nix+22
@@ -31653,6 +31653,28 @@ EOF
3165331653 };
3165431654 };
3165531655
31656+ pytoml = buildPythonPackage rec {
31657+ name = "pytoml-${version}";
31658+ version = "0.1.11";
31659+
31660+ checkPhase = "${python.interpreter} test/test.py";
31661+
31662+ # fetchgit used to ensure test submodule is available
31663+ src = pkgs.fetchgit {
31664+ url = "${meta.homepage}.git";
31665+ rev = "refs/tags/v${version}";
31666+ sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j";
31667+ };
31668+
31669+ meta = {
31670+ description = "A TOML parser/writer for Python";
31671+ homepage = https://github.com/avakar/pytoml;
31672+ license = licenses.mit;
31673+ maintainers = with maintainers; [ peterhoeg ];
31674+ };
31675+
31676+ };
31677+
3165631678 ROPGadget = buildPythonPackage rec {
3165731679 name = "ROPGadget-5.4";
3165831680 src = pkgs.fetchurl {