diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-07 09:29:44 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-07 09:29:44 +0200 |
commit | d38ee5b46c5ca7d479786a4fa40efd53dcd748ec (patch) | |
tree | e08ae826f8b3727f2a6b18cd833819ab3f086c59 /pkgs/applications | |
parent | 0c660ad42f108869a9dbce9092f793480f6b08ad (diff) | |
parent | aabadda0c2e316f8c2cda35cba11be214472f1b8 (diff) | |
download | nixlib-d38ee5b46c5ca7d479786a4fa40efd53dcd748ec.tar nixlib-d38ee5b46c5ca7d479786a4fa40efd53dcd748ec.tar.gz nixlib-d38ee5b46c5ca7d479786a4fa40efd53dcd748ec.tar.bz2 nixlib-d38ee5b46c5ca7d479786a4fa40efd53dcd748ec.tar.lz nixlib-d38ee5b46c5ca7d479786a4fa40efd53dcd748ec.tar.xz nixlib-d38ee5b46c5ca7d479786a4fa40efd53dcd748ec.tar.zst nixlib-d38ee5b46c5ca7d479786a4fa40efd53dcd748ec.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/toot/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/networking/syncthing/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/adms/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/qucs/cmakelists.patch | 34 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/qucs/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 23 | ||||
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 14 |
7 files changed, 102 insertions, 27 deletions
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 4f66d7167e10..0342722c7f7c 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,19 +1,25 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "0.8.0"; + version = "0.13.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "1y1jz4f53njq94zab0icf7jhd4jp10ywm508l4lw6spb69wr7rdy"; + sha256 = "0gbsq43qv5qg4avx7czs57k40m8lzh8f1z5yizqqc7r02p2sacnc"; }; + checkInputs = with pythonPackages; [ pytest ]; + propagatedBuildInputs = with pythonPackages; [ requests beautifulsoup4 future ]; + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index dd2576cd0830..e82bd462fe32 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.36"; + version = "0.14.37"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1l4s74qlabwfkpi9lmm588ym0myavbs06a5gpp9nihzrsal18727"; + sha256 = "0mk09m5wc6g7w65cf86rrvzb2gfzbg4jrkwpsabn732iyhkkaj4z"; }; buildInputs = [ go removeReferencesTo ]; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix new file mode 100644 index 000000000000..d4ec974007cf --- /dev/null +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libtool, autoreconfHook, flex, bison, gperf, + libxml2, perl, perlPackages, gd }: + +stdenv.mkDerivation rec { + version = "2.3.6"; + name = "adms-${version}"; + + src = fetchFromGitHub { + owner = "Qucs"; + repo = "adms"; + rev = "release-${version}"; + sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg"; + }; + + buildInputs = [ autoreconfHook flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ]; + configureFlags = [ "--enable-maintainer-mode" ]; + + meta = { + description = "automatic device model synthesizer"; + homepage = https://github.com/Qucs/adms; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [disassembler]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/science/electronics/qucs/cmakelists.patch b/pkgs/applications/science/electronics/qucs/cmakelists.patch new file mode 100644 index 000000000000..27066f09c84e --- /dev/null +++ b/pkgs/applications/science/electronics/qucs/cmakelists.patch @@ -0,0 +1,34 @@ +diff --git i/qucs-core/CMakeLists.txt w/qucs-core/CMakeLists.txt +index 2dbbd41..d174b50 100644 +--- i/qucs-core/CMakeLists.txt ++++ w/qucs-core/CMakeLists.txt +@@ -158,26 +158,9 @@ ENDIF() + + # + # Need Bison +-# +-# This is a HACK to get arround a PATH issue with Qt Creator on OSX. +-# It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance. +-# The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available. +-IF(WIN32) +- FIND_PACKAGE(BISON 2.4 REQUIRED) +- IF(BISON_FOUND) +- #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) +- ENDIF() +-ELSE() # Linux, OSX +- # use -DBISON_DIR=/path/ to provide the path to bison +- FIND_PROGRAM( BISON_EXECUTABLE bison +- PATHS /usr/local/bin/ /opt/local/bin/ /usr/bin ${BISON_DIR} +- DOC "bison path" +- NO_DEFAULT_PATH ) +- IF(BISON_EXECUTABLE ) +- MESSAGE(STATUS "Found bison: " ${BISON_EXECUTABLE}) +- ELSE() +- MESSAGE(FATAL_ERROR "Unable to find bison. Try to provide -DBISON_DIR=[path]") +- ENDIF() ++FIND_PACKAGE(BISON 2.4 REQUIRED) ++IF(BISON_FOUND) ++ #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) + ENDIF() + + # diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 6d89d9e52715..1a5fbf90d10b 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -1,16 +1,23 @@ -{stdenv, fetchurl, flex, bison, qt4, libX11 }: +{stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: stdenv.mkDerivation rec { - name = "qucs-0.0.18"; + version = "0.0.19"; + name = "qucs-${version}"; - src = fetchurl { - url = "mirror://sourceforge/qucs/${name}.tar.gz"; - sha256 = "3609a18b57485dc9f19886ac6694667f3251702175bd1cbbbea37981b2c482a7"; + src = fetchFromGitHub { + owner = "Qucs"; + repo = "qucs"; + rev = "qucs-${version}"; + sha256 = "106h3kjyg7c0hkmzkin7h8fcl32n60835121b2qqih8ixi6r5id6"; }; QTDIR=qt4; - buildInputs = [ flex bison qt4 libX11 ]; + patches = [ + ./cmakelists.patch + ]; + + buildInputs = [ flex bison qt4 libX11 cmake gperf adms ]; meta = { description = "Integrated circuit simulator"; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9620140dde4b..7378aedc1be7 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -2,10 +2,10 @@ # - The csdp program used for the Micromega tactic is statically referenced. # However, coq can build without csdp by setting it to null. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. -# - The patch-level version can be specified through the `version` argument to -# the derivation; it defaults to the greatest. +# - The exact version can be specified through the `version` argument to +# the derivation; it defaults to the latest stable version. -{ stdenv, fetchurl, writeText, pkgconfig +{ stdenv, fetchFromGitHub, writeText, pkgconfig , ocamlPackages, ncurses , buildIde ? true , csdp ? null @@ -14,11 +14,12 @@ let sha256 = { - "8.5pl1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb"; - "8.5pl2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; - "8.5pl3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; - "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; - "8.6.1" = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j"; + "8.5pl1" = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n"; + "8.5pl2" = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh"; + "8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; + "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; + "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; + "8.7+beta1" = "006rn5896pf39p4z9c6d4xj4zm80j4b67v5gwcixd63msrjqkmxp"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; @@ -81,8 +82,10 @@ self = stdenv.mkDerivation { ''; }; - src = fetchurl { - url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "coq"; + repo = "coq"; + rev = "V${version}"; inherit sha256; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3ba019aa8d58..043f27e13d24 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -177,13 +177,13 @@ rec { # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits docker_17_06 = dockerGen rec { - version = "17.06.1-ce"; - rev = "874a7374f31c77aca693d025101b2de1b20b96c2"; # git commit - sha256 = "08xhww2rhpyj73zgh5maycs85zpc0sm3ak8yyyd92dwgncmyi2im"; - runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4"; - runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq"; - containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429"; - containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j"; + version = "17.06.2-ce"; + rev = "cec0b72a9940e047e945a09e1febd781e88366d6"; # git commit + sha256 = "1scqx28vzh72ziq00lbx92vsb896mj974j8f0zg11y6qc5n5jx3l"; + runcRev = "810190ceaa507aa2727d7ae6f4790c76ec150bd2"; + runcSha256 = "0f1x1z262qg579qb1w21axj3mibq4fbff3gamliw49sdqqnb7vk3"; + containerdRev = "6e23458c129b551d5c9871e5174f6b1b7f6d1170"; + containerdSha256 = "12kzc5z1nhxdbizzr494ywilbs6rdv39v5ql7lmfzwh350gwlg93"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; |