commit b06884b33bafcce216d44a274cfd22cb75be31b6
parent e192fd103021183fbe55154634d36c47056ac1c7
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 29 Mar 2021 02:41:01 +0300
Up
Diffstat:
4 files changed, 33 insertions(+), 58 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -13,20 +13,6 @@
"url": "https://github.com/ruarxive/apibackuper/archive/1ff139f688d59b899ff041ccc282e224110ddc76.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "bson": {
- "branch": "master",
- "builtin": false,
- "date": "2020-05-26T11:13:32Z",
- "description": "Independent BSON codec for Python that doesn't depend on MongoDB",
- "homepage": "https://github.com/py-bson/bson",
- "owner": "py-bson",
- "repo": "bson",
- "rev": "a68073661c637051985f3d0c24b8c7828a4c3ff4",
- "sha256": "0gh0kbblmxnidr9xp05d8nlfjna7461bxx82l82mwwz1a7i7x36d",
- "type": "tarball",
- "url": "https://github.com/py-bson/bson/archive/a68073661c637051985f3d0c24b8c7828a4c3ff4.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"cfiles": {
"branch": "master",
"builtin": false,
@@ -209,20 +195,6 @@
"url": "https://github.com/konstare/gdcv/archive/39fd2667362710f69c13dd596e112b0391e0a57e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "gef": {
- "branch": "dev",
- "builtin": false,
- "date": "2021-03-02T03:44:36Z",
- "description": "GEF - GDB Enhanced Features for exploit devs & reversers",
- "homepage": "http://gef.rtfd.io",
- "owner": "hugsy",
- "repo": "gef",
- "rev": "0fa225771a788d7e6214e50f27d0262b60d90745",
- "sha256": "00q7247axbwph5c7ljxvyyp74pjlrjwibc9nqdm43h3n9ml10bc8",
- "type": "tarball",
- "url": "https://github.com/hugsy/gef/archive/0fa225771a788d7e6214e50f27d0262b60d90745.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"geminid": {
"branch": "master",
"builtin": false,
@@ -986,20 +958,6 @@
"url": "https://github.com/mapbox/supermercado/archive/ecc9f5a36c1c8d13872df5bdcbd01621e5f3ab48.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "tatoebatools": {
- "branch": "master",
- "builtin": false,
- "date": "2020-12-01T13:06:20Z",
- "description": "A library for downloading, updating and iterating over monolingual data files from Tatoeba",
- "homepage": "https://github.com/LBeaudoux/tatoebatools",
- "owner": "LBeaudoux",
- "repo": "tatoebatools",
- "rev": "97a50b9aa4d7a66550aa338ab595cb10eb7f799d",
- "sha256": "0a482kirbv3hnlgfgz75kdq52mbaazawg40cy5vq079kqd3m8v09",
- "type": "tarball",
- "url": "https://github.com/LBeaudoux/tatoebatools/archive/97a50b9aa4d7a66550aa338ab595cb10eb7f799d.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"thinplatespline": {
"branch": "master",
"builtin": false,
diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix
@@ -1,15 +1,21 @@
-{ lib, python3Packages, sources }:
+{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonPackage {
- pname = "bson-unstable";
- version = lib.substring 0 10 sources.bson.date;
+ pname = "bson";
+ version = "0.5.10";
- src = sources.bson;
+ src = fetchFromGitHub {
+ owner = "py-bson";
+ repo = "bson";
+ rev = "a68073661c637051985f3d0c24b8c7828a4c3ff4";
+ sha256 = "0gh0kbblmxnidr9xp05d8nlfjna7461bxx82l82mwwz1a7i7x36d";
+ };
propagatedBuildInputs = with python3Packages; [ python-dateutil six ];
meta = with lib; {
- inherit (sources.bson) description homepage;
+ description = "Independent BSON codec for Python that doesn't depend on MongoDB";
+ homepage = "https://github.com/py-bson/bson";
license = with licenses; [ bsd3 asl20 ];
maintainers = [ maintainers.sikmir ];
};
diff --git a/pkgs/dict/tatoebatools/default.nix b/pkgs/dict/tatoebatools/default.nix
@@ -1,10 +1,15 @@
-{ lib, python3Packages, sources, withCli ? true, checkLang ? false }:
+{ lib, python3Packages, fetchFromGitHub, withCli ? true, checkLang ? false }:
python3Packages.buildPythonApplication {
- pname = "tatoebatools-unstable";
- version = lib.substring 0 10 sources.tatoebatools.date;
+ pname = "tatoebatools";
+ version = "0.1.1";
- src = sources.tatoebatools;
+ src = fetchFromGitHub {
+ owner = "LBeaudoux";
+ repo = "tatoebatools";
+ rev = "c3b4e40886233a83e30a517d63a1eee0547650d7";
+ sha256 = "1h977ghl13jj5xvyan88xjqgbp31ckk4krr2jgjl65c30wyrjlkj";
+ };
patches = lib.optional (!checkLang) ./dont-check-lang-validity.patch
++ lib.optional withCli ./cli.patch;
@@ -20,7 +25,8 @@ python3Packages.buildPythonApplication {
];
meta = with lib; {
- inherit (sources.tatoebatools) description homepage;
+ description = "A library for downloading, updating and iterating over data files from Tatoeba";
+ homepage = "https://github.com/LBeaudoux/tatoebatools";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/misc/gef/default.nix b/pkgs/misc/gef/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, sources
, runtimeShell
, writeScript
, procps
@@ -28,11 +27,16 @@ let
unicorn
];
in
-stdenv.mkDerivation {
- pname = "gef-unstable";
- version = lib.substring 0 10 sources.gef.date;
+stdenv.mkDerivation rec {
+ pname = "gef";
+ version = "2021.01";
- src = sources.gef;
+ src = fetchFromGitHub {
+ owner = "hugsy";
+ repo = "gef";
+ rev = version;
+ sha256 = "0gw112s16pdjd5csp8ap0qq2d3bkp2s8pyhjbw4f8k0mkgy1j66i";
+ };
dontBuild = true;
doCheck = false;
@@ -49,7 +53,8 @@ stdenv.mkDerivation {
'';
meta = with lib; {
- inherit (sources.gef) description homepage;
+ description = "GDB Enhanced Features for exploit devs & reversers";
+ homepage = "http://gef.rtfd.io/";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.sikmir ];
