From ee903f23cdba587a219e67e840f88e6f12f51989 Mon Sep 17 00:00:00 2001 From: Corbin Date: Mon, 25 Jun 2018 12:17:41 -0700 Subject: [PATCH 1/5] pythonPackages.dictionaries: init at 0.0.1 --- .../python-modules/dictionaries/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/dictionaries/default.nix diff --git a/pkgs/development/python-modules/dictionaries/default.nix b/pkgs/development/python-modules/dictionaries/default.nix new file mode 100644 index 000000000000..0deab2762552 --- /dev/null +++ b/pkgs/development/python-modules/dictionaries/default.nix @@ -0,0 +1,19 @@ +{ buildPythonPackage, fetchPypi, lib, six }: + +buildPythonPackage rec { + pname = "dictionaries"; + version = "0.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jx2ph509sk4l7spslz16y8l6xn97d13nspn4ds2lxn5ward9ihy"; + }; + + buildInputs = [ six ]; + + meta = { + description = "Dict implementations with attribute access"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.MostAwesomeDude ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0af6cd7f3206..81d27ad71525 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -248,6 +248,8 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; + dictionaries = callPackage ../development/python-modules/dictionaries { }; + diff_cover = callPackage ../development/python-modules/diff_cover { }; emcee = callPackage ../development/python-modules/emcee { }; From f20100a3e44babda44c55d7873e5200c5114a2c3 Mon Sep 17 00:00:00 2001 From: Corbin Date: Mon, 25 Jun 2018 20:33:09 -0700 Subject: [PATCH 2/5] igraph: init at 0.7.1 --- pkgs/development/libraries/igraph/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/igraph/default.nix diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix new file mode 100644 index 000000000000..4ac3ebc09889 --- /dev/null +++ b/pkgs/development/libraries/igraph/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, + pkgconfig, autoreconfHook, + flex, yacc, zlib, libxml2 }: + +stdenv.mkDerivation rec { + name = "igraph"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "igraph"; + repo = name; + rev = version; + sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ flex yacc zlib libxml2 ]; + + # This file is normally generated by igraph's bootstrap.sh, but we can do it + # ourselves. ~ C. + postPatch = '' + echo "${version}" > VERSION + ''; + + meta = { + description = "The network analysis package"; + homepage = http://igraph.org/; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.MostAwesomeDude ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c5a58c4f4ff..0bb3409347cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21241,6 +21241,8 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; + igraph = callPackage ../development/libraries/igraph { }; + illum = callPackage ../tools/system/illum { }; # using the new configuration style proposal which is unstable From 14c88b67c14fb7e4ab56adee9854ca7a23858113 Mon Sep 17 00:00:00 2001 From: Corbin Date: Thu, 28 Jun 2018 21:41:45 -0700 Subject: [PATCH 3/5] pythonPackages.python-igraph: init at 0.7.1.post6 --- .../python-modules/python-igraph/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/python-igraph/default.nix diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix new file mode 100644 index 000000000000..a24f3a9fedc8 --- /dev/null +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, + pkgconfig, igraph }: + +buildPythonPackage rec { + pname = "python-igraph"; + version = "0.7.1.post6"; + + buildInputs = [ pkgconfig igraph ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0xp61zz710qlzhmzbfr65d5flvsi8zf2xy78s6rsszh719wl5sm5"; + }; + + meta = { + description = "High performance graph data structures and algorithms"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.MostAwesomeDude ]; + }; +} + + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81d27ad71525..b3c558cff595 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -449,6 +449,11 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; + python-igraph = callPackage ../development/python-modules/python-igraph { + pkgconfig = pkgs.pkgconfig; + igraph = pkgs.igraph; + }; + python3-openid = callPackage ../development/python-modules/python3-openid { }; python-periphery = callPackage ../development/python-modules/python-periphery { }; From a502f2c4c8c274a63fa762417a1c76ee8119863a Mon Sep 17 00:00:00 2001 From: Corbin Date: Sat, 28 Jul 2018 07:23:41 -0700 Subject: [PATCH 4/5] pythonPackages.ordered-set: init at 3.0.1 This package has working tests! A minor miracle in the Python tree. --- .../python-modules/ordered-set/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/ordered-set/default.nix diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix new file mode 100644 index 000000000000..bf20f7827be3 --- /dev/null +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, fetchPypi, lib, pytest }: + +buildPythonPackage rec { + pname = "ordered-set"; + version = "3.0.1"; + + buildInputs = [ pytest ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0yyfkkfzpwlx4jlfqzb7p1xpzmn2jyzq2qlakqx62pxizfzxfvrx"; + }; + + checkPhase = '' + py.test test.py + ''; + + meta = { + description = "A MutableSet that remembers its order, so that every entry has an index."; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.MostAwesomeDude ]; + }; +} + + + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3c558cff595..7e9eb275833d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -334,6 +334,8 @@ in { oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + ordered-set = callPackage ../development/python-modules/ordered-set { }; + outcome = callPackage ../development/python-modules/outcome {}; pdf2image = callPackage ../development/python-modules/pdf2image { }; From 9470c68b9f858098c0708e98eb742689d4c52cfe Mon Sep 17 00:00:00 2001 From: Corbin Date: Sun, 22 Jul 2018 11:59:14 -0700 Subject: [PATCH 5/5] pythonPackages.cozy: init at 2.0a1 --- .../python-modules/cozy/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/cozy/default.nix diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix new file mode 100644 index 000000000000..0feca2773b37 --- /dev/null +++ b/pkgs/development/python-modules/cozy/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage, fetchFromGitHub, lib, + z3, ply, python-igraph, oset, ordered-set, dictionaries }: + +buildPythonPackage { + pname = "cozy"; + version = "2.0a1"; + + propagatedBuildInputs = [ + z3 ply python-igraph oset ordered-set dictionaries + ]; + + src = fetchFromGitHub { + owner = "CozySynthesizer"; + repo = "cozy"; + rev = "f553e9b"; + sha256 = "1jhr5gzihj8dkg0yc5dmi081v2isxharl0ph7v2grqj0bwqzl40j"; + }; + + # Yoink the Z3 dependency name, because our Z3 package doesn't provide it. + postPatch = '' + sed -i -e '/z3-solver/d' requirements.txt + ''; + + # Tests are not correctly set up in the source tree. + doCheck = false; + + # There is some first-time-run codegen that we will force to happen. + postInstall = '' + $out/bin/cozy --help + ''; + + meta = { + description = "The collection synthesizer"; + homepage = https://cozy.uwplse.org/; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.MostAwesomeDude ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e9eb275833d..b21767bd8678 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -238,6 +238,8 @@ in { clustershell = callPackage ../development/python-modules/clustershell { }; + cozy = callPackage ../development/python-modules/cozy { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dbf = callPackage ../development/python-modules/dbf { };