diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/apt-offline/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/misc/bashplotlib/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/doitlive/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/lbdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/svtplay-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/tldr/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/vdirsyncer/default.nix | 31 |
7 files changed, 37 insertions, 45 deletions
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 1044c0acc0a..921c1af4ad6 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - version = "1.3"; - name = "apt-offline-${version}"; +python3Packages.buildPythonApplication rec { + version = "1.8.1"; + pname = "apt-offline"; - src = fetchurl { - #url = "https://alioth.debian.org/frs/download.php/file/3855/${name}.tar.gz"; - # The above URL has two problems: it requires one to be logged in, and it - # uses a CA that curl doesn't know about. Instead, we use this mirror: - url = "http://www.falsifian.org/a/cFi5/${name}.tar.gz"; - sha256 = "1sp7ai2abzhbg9y84700qziybphvpzl2nk3mz1d1asivzyjvxlxy"; + src = fetchFromGitHub { + owner = "rickysarraf"; + repo = pname; + rev = "v${version}"; + sha256 = "0k79d1d8jiwg1s684r05njmk1dz8gsb8a9bl4agz7m31snc11j84"; }; doCheck = false; diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 2757f5f3e21..c334ee77634 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -1,7 +1,7 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { - pname = "bashplotlib-${version}"; +python3Packages.buildPythonApplication rec { + pname = "bashplotlib"; version = "2017-10-11"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index aa3e1e18ae6..3520d67abd2 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -1,15 +1,15 @@ -{ stdenv, pythonPackages }: +{ stdenv, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "doitlive"; version = "3.0.3"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "19i16ca835rb3gal1sxyvpyilj9a80n6nikf0smlzmxck38x86fj"; }; - propagatedBuildInputs = with pythonPackages; [ click ]; + propagatedBuildInputs = with python3Packages; [ click ]; # disable tests (too many failures) doCheck = false; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index d5194f42d0b..abffd6c70d5 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.46"; + version = "0.47"; in with stdenv.lib; with perlPackages; @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; - sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi"; + sha256 = "06zgj03q75gc6ri4cw3jdmi01f22anwchlv2kw4zp9nbm5swv36b"; }; buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 9ba61221684..e29e799898c 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip +{ stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip , rtmpdump }: let - inherit (pythonPackages) python nose pycrypto requests mock; + inherit (python3Packages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; version = "1.9.11"; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index bb03b9a809b..fcd556c5596 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }: +{ stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: stdenv.mkDerivation rec { name = "tldr-${version}"; @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6"; }; - buildInputs = [ curl clang libzip ]; + buildInputs = [ curl libzip ]; nativeBuildInputs = [ pkgconfig ]; + makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tldr-pages.github.io; license = licenses.mit; - maintainers = with maintainers; [ taeer ]; - platforms = platforms.linux; + maintainers = with maintainers; [ taeer carlosdagos ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 9e9ded5c3a7..0655264cc54 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,30 +1,25 @@ -{ stdenv, python3Packages, glibcLocales, rustPlatform }: +{ stdenv, python3Packages, glibcLocales, rustPlatform, pkgconfig, openssl }: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst let pythonPackages = python3Packages; - version = "0.17.0a2"; + version = "0.17.0a3"; pname = "vdirsyncer"; name = pname + "-" + version; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0y464rsx5la6bp94z2g0nnkbl4nwfya08abynvifw4c84vs1gr4q"; + sha256 = "1n7izfa5x9mh0b4zp20gd8qxfcca5wpjh834bsbi5pk6zam5pfdy"; }; native = rustPlatform.buildRustPackage { name = name + "-native"; inherit src; sourceRoot = name + "/rust"; - cargoSha256 = "1cr7xs11gbsc3x5slga9qahchwc22qq49amf28g4jgs9lzf57qis"; - postInstall = '' - mkdir $out/include $out/lib - cp $out/bin/libvdirsyncer_rustext* $out/lib - rm -r $out/bin - cp target/vdirsyncer_rustext.h $out/include - ''; + cargoSha256 = "08xq9q5fx37azzkqqgwcnds1yd8687gh26dsl3ivql5h13fa2w3q"; + buildInputs = [ pkgconfig openssl ]; }; in pythonPackages.buildPythonApplication rec { - inherit version pname src; + inherit version pname src native; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading @@ -33,6 +28,7 @@ in pythonPackages.buildPythonApplication rec { requests_oauthlib # required for google oauth sync atomicwrites milksnake + shippai ]; buildInputs = with pythonPackages; [ setuptools_scm ]; @@ -40,25 +36,20 @@ in pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ]; postPatch = '' - sed -i "/cargo build/d" Makefile + sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py ''; preBuild = '' mkdir -p rust/target/release - ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ - ln -s ${native}/include/vdirsyncer_rustext.h rust/target/ + ln -s ${native}/bin/libvdirsyncer_rustext* rust/target/release/ ''; LC_ALL = "en_US.utf8"; - preCheck = '' - ln -sf ../dist/tmpbuild/vdirsyncer/vdirsyncer/_native__lib.so vdirsyncer - ''; - checkPhase = '' - runHook preCheck + rm -rf vdirsyncer + export PYTHONPATH=$out/${pythonPackages.python.sitePackages}:$PYTHONPATH make DETERMINISTIC_TESTS=true test - runHook postCheck ''; meta = with stdenv.lib; { |