diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/archivy/default.nix | 57 | ||||
-rw-r--r-- | pkgs/applications/misc/cheat/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/cpp-ethereum/default.nix | 85 | ||||
-rw-r--r-- | pkgs/applications/misc/gallery-dl/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/misc/gpx/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/keeweb/default.nix | 6 |
6 files changed, 75 insertions, 102 deletions
diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix new file mode 100644 index 000000000000..d2fa48cd2348 --- /dev/null +++ b/pkgs/applications/misc/archivy/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, python3, fetchPypi, appdirs, attrs, requests, +beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, +pypandoc, python-dotenv, python-frontmatter, tinydb, validators, +watchdog, wtforms }: + +python3.pkgs.buildPythonApplication rec { + pname = "archivy"; + version = "0.8.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "144ckgxjaw29yp5flyxd1rnkm7hlim4zgy6xng7x0a9j54h527iq"; + }; + + # Relax some dependencies + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'validators ==' 'validators >=' \ + --replace 'elasticsearch ==' 'elasticsearch >=' \ + --replace 'python-dotenv ==' 'python-dotenv >=' \ + --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ + --replace 'WTForms ==' 'WTForms >=' \ + --replace 'python_dotenv ==' 'python_dotenv >=' \ + --replace 'attrs == 20.2.0' 'attrs' \ + --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ + --replace 'requests ==' 'requests >=' + ''; + + propagatedBuildInputs = [ + appdirs + attrs + beautifulsoup4 + click-plugins + elasticsearch + flask_login + flask_wtf + pypandoc + python-dotenv + python-frontmatter + tinydb + requests + validators + watchdog + wtforms + ]; + + # __init__.py attempts to mkdir in read-only file system + doCheck = false; + + meta = with stdenv.lib; { + description = "Self-hosted knowledge repository"; + homepage = "https://archivy.github.io"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 472eee655188..208c9c533137 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0mraraby0s213ay2ahqsdvnyg76awbqllrkkx17mrx9z3ykba62d"; + sha256 = "sha256-Q/frWu82gB15LEzwYCbJr7k0yZ+AXBvcPWxoevSpeqU="; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix deleted file mode 100644 index aed44d1213ce..000000000000 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, jsoncpp -, libjson-rpc-cpp -, curl -, boost -, leveldb -, cryptopp -, libcpuid -, opencl-headers -, ocl-icd -, miniupnpc -, libmicrohttpd -, gmp -, libGLU, libGL -, extraCmakeFlags ? [] -}: -stdenv.mkDerivation rec { - pname = "cpp-ethereum"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "ethereum"; - repo = "cpp-ethereum"; - rev = "62ab9522e58df9f28d2168ea27999a214b16ea96"; - sha256 = "1fxgpqhmjhpv0zzs1m3yf9h8mh25dqpa7pmcfy7f9qiqpfdr4zq9"; - }; - - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" extraCmakeFlags ]; - - configurePhase = '' - export BOOST_INCLUDEDIR=${boost.dev}/include - export BOOST_LIBRARYDIR=${boost.out}/lib - - mkdir -p Build/Install - pushd Build - - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install $cmakeFlags - ''; - - enableParallelBuilding = true; - - runPath = with stdenv.lib; makeLibraryPath ([ stdenv.cc.cc ] ++ buildInputs); - - installPhase = '' - make install - - mkdir -p $out - - for f in Install/lib/*.so* $(find Install/bin -executable -type f); do - patchelf --set-rpath $runPath:$out/lib $f - done - - cp -r Install/* $out - ''; - - buildInputs = [ - cmake - jsoncpp - libjson-rpc-cpp - curl - boost - leveldb - cryptopp - libcpuid - opencl-headers - ocl-icd - miniupnpc - libmicrohttpd - gmp - libGLU libGL - ]; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Ethereum C++ client"; - homepage = "https://github.com/ethereum/cpp-ethereum"; - license = licenses.gpl3; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 8135dce4d7a3..a93ebb12ed4c 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,27 +1,28 @@ -{ lib, python3Packages }: +{ lib, buildPythonApplication, fetchPypi, requests, pytestCheckHook }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "gallery_dl"; - version = "1.15.2"; + version = "1.15.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "0f2d1ixg0ir7ispxxggv378dc0m55k9y19075swf893maxf07f35"; + sha256 = "0byn1ggrb9yg9d29205q312v95jy66qp4z384kys8cmrd3mky111"; }; - propagatedBuildInputs = with python3Packages; [ requests ]; + propagatedBuildInputs = [ requests ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # requires network access "--ignore=test/test_results.py" "--ignore=test/test_downloader.py" ]; - meta = { + meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ dawidsowa ]; + license = licenses.gpl2; + maintainers = with maintainers; [ dawidsowa ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index 70ff26784a86..c052b1ddb059 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gpx"; - version = "2.6.7"; + version = "2.6.8"; nativeBuildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "markwal"; repo = "GPX"; rev = version; - sha256 = "1dl5vlsx05ipy10h18xigicb3k7m33sa9hfyd46hkpr2glx7jh4p"; + sha256 = "1izs8s5npkbfrsyk17429hyl1vyrbj9dp6vmdlbb2vh6mfgl54h8"; }; meta = { diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 159f034b8535..8c1c56dacdc3 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.15.7"; + version = "1.16.0"; name = "${pname}-${version}"; suffix = { @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "0cy0avl0m07xs523xm0rzsmifl28sv4rjb2jj3x492qmr2v64ckk"; - x86_64-darwin = "0r8c3zi0ibj0bb0gfc1axfn0y4qpjqfr0xpcxf810d65kaz6wic4"; + x86_64-linux = "1pivic7n5nv00s8bb51i2jz2mxgjn92hkc8n0p8662ai1cdng47g"; + x86_64-darwin = "0q6k0qgkgzid9yjbfsfpp8l9dr0n8xp25a4jf2bxwickm4irs9mz"; }.${system} or throwSystem; }; |