diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/antimony/default.nix | 39 | ||||
-rw-r--r-- | pkgs/applications/graphics/antimony/paths-fix.patch | 118 | ||||
-rw-r--r-- | pkgs/applications/misc/pdfmod/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/17.0.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/webrtc-audio-processing/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/xercesc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 15 | ||||
-rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/alarm-clock-applet/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/misc/cloc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/default.nix | 44 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 23 |
13 files changed, 119 insertions, 175 deletions
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 8d17a290ceb..b7d9f4a8159 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,29 +1,25 @@ -{ stdenv, fetchgit, libpng, python3, boost, mesa, qtbase, qmakeHook, ncurses }: +{ stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }: let - gitRev = "745eca3a2d2657c495d5509e9083c884e021d09c"; + gitRev = "e8480c718e8c49ae3cc2d7af10ea93ea4c2fff9a"; gitBranch = "master"; - gitTag = "0.8.0b"; + gitTag = "0.9.2"; in stdenv.mkDerivation rec { name = "antimony-${version}"; version = gitTag; - src = fetchgit { - url = "git://github.com/mkeeter/antimony.git"; - rev = gitRev; - sha256 = "0azjdkbixz2pyk2yy7a0ya5xk60xgw3l2pd4pj4ijyqxx5jmh0sy"; + src = fetchFromGitHub { + owner = "mkeeter"; + repo = "antimony"; + rev = gitTag; + sha256 = "0fpgy5cb4knz2z9q078206k8wzxfs8b9g76mf4bz1ic77931ykjz"; }; patches = [ ./paths-fix.patch ]; - # fix build with glibc-2.23 + postPatch = '' - sed 's/\<isinf(/std::isinf(/g' -i \ - src/export/export_heightmap.cpp \ - src/fab/types/bounds.cpp \ - src/graph/hooks/meta.cpp \ - src/ui/dialogs/resolution_dialog.cpp \ - src/render/render_task.cpp + sed -i "s,/usr/local,$out,g" app/CMakeLists.txt app/app/app.cpp app/app/main.cpp ''; buildInputs = [ @@ -31,15 +27,13 @@ in mesa qtbase ncurses ]; - nativeBuildHooks = [ qmakeHook ]; - - preConfigure = '' - export GITREV=${gitRev} - export GITBRANCH=${gitBranch} - export GITTAG=${gitTag} + nativeBuildInputs = [ cmake flex lemon ]; - cd qt - ''; + cmakeFlags= [ + "-DGITREV=${gitRev}" + "-DGITTAG=${gitTag}" + "-DGITBRANCH=${gitBranch}" + ]; enableParallelBuilding = true; @@ -48,6 +42,5 @@ in homepage = "https://github.com/mkeeter/antimony"; license = licenses.mit; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/applications/graphics/antimony/paths-fix.patch b/pkgs/applications/graphics/antimony/paths-fix.patch index de8d9e7beb0..9235dd6cdce 100644 --- a/pkgs/applications/graphics/antimony/paths-fix.patch +++ b/pkgs/applications/graphics/antimony/paths-fix.patch @@ -1,99 +1,21 @@ -diff --git a/qt/antimony.pro b/qt/antimony.pro -index 9d586f4..b055a6d 100644 ---- a/qt/antimony.pro -+++ b/qt/antimony.pro -@@ -12,14 +12,9 @@ QMAKE_CXXFLAGS_RELEASE += -O3 - - QMAKE_CXXFLAGS += -Werror=switch - --GITREV = $$system(git log --pretty=format:'%h' -n 1) --GITDIFF = $$system(git diff --quiet --exit-code || echo "+") --GITTAG = $$system(git describe --exact-match --tags 2> /dev/null) --GITBRANCH = $$system(git rev-parse --abbrev-ref HEAD) -- --QMAKE_CXXFLAGS += "-D'GITREV=\"$${GITREV}$${GITDIFF}\"'" --QMAKE_CXXFLAGS += "-D'GITTAG=\"$${GITTAG}\"'" --QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$${GITBRANCH}\"'" -+QMAKE_CXXFLAGS += "-D'GITREV=\"$$(GITREV)\"'" -+QMAKE_CXXFLAGS += "-D'GITTAG=\"$$(GITTAG)\"'" -+QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$$(GITBRANCH)\"'" - - OLD_GL_SET = $$(OLD_GL) - equals(OLD_GL_SET, "true") { -@@ -125,11 +120,11 @@ macx { - } - - linux { -- executable.path = /usr/local/bin -+ executable.path = $$(out)/bin - executable.files = antimony -- nodes_folder.path = /usr/local/bin/sb/nodes -+ nodes_folder.path = $$(out)/bin/sb/nodes - nodes_folder.files = ../py/nodes/* -- fab_folder.path = /usr/local/bin/sb/fab -+ fab_folder.path = $$(out)/bin/sb/fab - fab_folder.files = ../py/fab/* - INSTALLS += executable nodes_folder fab_folder - } -diff --git a/qt/fab.pri b/qt/fab.pri -index a54813b..b500536 100644 ---- a/qt/fab.pri -+++ b/qt/fab.pri -@@ -54,7 +54,7 @@ DEFINES += '_STATIC_= ' - - linux { - QMAKE_CFLAGS += -std=gnu99 -- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes) -+ QMAKE_CXXFLAGS += $$system(python3-config --includes) - LIBS += -lpng - } - -diff --git a/qt/shared.pri b/qt/shared.pri -index e7d0e3a..026eae3 100644 ---- a/qt/shared.pri -+++ b/qt/shared.pri -@@ -39,41 +39,11 @@ macx { - } - - linux { -- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes) -- QMAKE_LFLAGS += $$system(/usr/bin/python3-config --ldflags) -+ QMAKE_CXXFLAGS += $$system(python3-config --includes) -+ QMAKE_LFLAGS += $$system(python3-config --ldflags) - - # Even though this is in QMAKE_LFLAGS, the linker is picky about - # library ordering (so it needs to be here too). - LIBS += -lpython3.4m -- -- # ldconfig is being used to find libboost_python, but it's in a different -- # place in different distros (and is not in the default $PATH on Debian). -- # First, check to see if it's on the default $PATH. -- system(which ldconfig > /dev/null) { -- LDCONFIG_BIN = "ldconfig" -- } -- # If that failed, then search for it in its usual places. -- isEmpty(LDCONFIG_BIN) { -- for(p, $$list(/sbin/ldconfig /usr/bin/ldconfig)) { -- exists($$p): LDCONFIG_BIN = $$p -- } -- } -- # If that search failed too, then exit with an error. -- isEmpty(LDCONFIG_BIN) { -- error("Could not find ldconfig!") -- } -- -- # Check for different boost::python naming schemes -- LDCONFIG_OUT = $$system($$LDCONFIG_BIN -p|grep python) -- for (b, $$list(boost_python-py34 boost_python3)) { -- contains(LDCONFIG_OUT, "lib$${b}.so") { -- LIBS += "-l$$b" -- GOT_BOOST_PYTHON = True -- } -- } +diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt +index ddc5c9b..d80728a 100644 +--- a/app/CMakeLists.txt ++++ b/app/CMakeLists.txt +@@ -158,16 +158,6 @@ target_link_libraries(${ANTIMONY_APP} + + ################################################################################ + +-execute_process(COMMAND git log --pretty=format:'%h' -n 1 +- OUTPUT_VARIABLE GITREV) +-execute_process(COMMAND bash -c "git diff --quiet --exit-code || echo +" +- OUTPUT_VARIABLE GITDIFF) +-execute_process(COMMAND git describe --exact-match --tags +- OUTPUT_VARIABLE GITTAG +- ERROR_QUIET) +-execute_process(COMMAND git rev-parse --abbrev-ref HEAD +- OUTPUT_VARIABLE GITBRANCH) - -- # If we couldn't find boost::python, exit with an error. -- isEmpty(GOT_BOOST_PYTHON) { -- error("Could not find boost::python3") -- } -+ LIBS += -lboost_python3 - } + add_definitions(-D'GITREV="${GITREV}${GITDIFF}"' + -D'GITTAG="${GITTAG}"' + -D'GITBRANCH="${GITBRANCH}"') diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 24a0a8c6967..0978da3512b 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib , mono, gtk-sharp, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -33,12 +33,7 @@ stdenv.mkDerivation rec { --add-flags "$out/lib/pdfmod/PdfMod.exe" \ --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${glib}/lib \ - --prefix LD_LIBRARY_PATH : ${gtk-sharp}/lib \ - --prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \ - --prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \ - --prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \ - --prefix LD_LIBRARY_PATH : ${poppler.out}/lib + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp gtk-sharp.gtk poppler ]} ''; dontStrip = true; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index cbe2c47594d..5cd3ff0cca6 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isArm; # fails on v7 with "Alignment trap: not handling instruction" in kernel log preCheck = '' rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index ef6f9ed4971..f5d49290484 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1yl0187xjh1j2zkb7v9cs9i868zcaj23pzn4a36qhzam9wfjjvkm"; }; + # Avoid this error: + # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode + patchPhase = stdenv.lib.optionalString stdenv.isArm '' + substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' + ''; + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 5020ab3f2df..b6bb4e63df3 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xerces-c-${version}"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; - sha256 = "0jav1cbwcyq4miy790dd62yrypf7n0j98vdin9ny30f9nwyzgm7k"; + sha256 = "1xpccqzykpd3806kd788lgkl01pk7v5lklva6q4kp9zq9jnfv3n9"; }; meta = { diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index a3c8327655e..edb3f841069 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: + +assert guileSupport -> ( pkgconfig != null && guile != null ); let version = "4.2"; @@ -19,12 +21,16 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; + buildInputs = stdenv.lib.optionals guileSupport [ guile pkgconfig ]; + + configureFlags = stdenv.lib.optional guileSupport "--with-guile"; + outputs = [ "out" "doc" ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/make/; description = "A tool to control the generation of non-source files from sources"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' Make is a tool which controls the generation of executables and @@ -37,6 +43,7 @@ stdenv.mkDerivation { to build and install the program. ''; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; }; } diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 09b7769dc45..deefb6bbad2 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -6,8 +6,8 @@ rec { coreutils_ = coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; - # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks. - singleBinary = "symlinks"; + # Cannot use a single binary build, or it gets dynamically linked against gmp. + singleBinary = false; }); # Avoid debugging larger changes for now. diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index bde6ed54eed..9a3e0b905e1 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -8,6 +8,7 @@ , libunique , intltool , gst_plugins ? with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ] +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -35,17 +36,13 @@ stdenv.mkDerivation rec { libxml2 libunique intltool + wrapGAppsHook ]; propagatedUserEnvPkgs = [ gnome.GConf.out ]; enableParallelBuilding = true; - preFixup = '' - wrapProgram $out/bin/alarm-clock-applet \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - meta = with stdenv.lib; { homepage = http://alarm-clock.pseudoberries.com/; description = "A fully-featured alarm clock for your GNOME panel or equivalent"; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index deb915c9a5e..46c056ef0c0 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -1,29 +1,36 @@ { fetchgit , stdenv , enableXRandr ? true, xrandr ? null -, enableDisper ? false, disper ? null +, enableDisper ? true, disper ? null +, python , xdpyinfo }: assert enableXRandr -> xrandr != null; assert enableDisper -> disper != null; let - rev = "4f5e2401ef"; + # Revision and date taken from the legacy tree, which still + # supports disper: + # https://github.com/phillipberndt/autorandr/tree/legacy + rev = "59f6aec0bb72e26751ce285d079e085b7178e45d"; + date = "20150127"; in stdenv.mkDerivation { - name = "autorandr-${rev}"; + name = "autorandr-${date}"; src = fetchgit { inherit rev; - url = "https://github.com/wertarbyte/autorandr.git"; - sha256 = "1x8agg6mf5jr0imw7dznr8kxyw970bf252bda9q7b0z4yksya2zd"; + url = "https://github.com/phillipberndt/autorandr.git"; + sha256 = "0mnggsp42477kbzwwn65gi8y0rydk10my9iahikvs6n43lphfa1f"; }; patchPhase = '' substituteInPlace "autorandr" \ --replace "/usr/bin/xrandr" "${if enableXRandr then xrandr else "/nowhere"}/bin/xrandr" \ --replace "/usr/bin/disper" "${if enableDisper then disper else "/nowhere"}/bin/disper" \ - --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo" + --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo" \ + --replace "which xxd" "false" \ + --replace "python" "${python}/bin/python" ''; installPhase = '' diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index eda2bfa0270..b58ae6505dc 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.68"; + version = "1.70"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "17n6w7rd17h4q4cnjg4hxcfpx4plp40gd58bdyig9lsfbn6xcjxj"; + sha256 = "1abkfkjn4fxplq33cwqjmgxabk2x6ij2klqn0w4a0lj82a7xx10x"; }; sourceRoot = "cloc-v${version}-src/Unix"; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index cff8671b65d..8913dc1ef59 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -22,43 +22,37 @@ , # Allow a configuration attribute set to be passed in as an # argument. Otherwise, it's read from $NIXPKGS_CONFIG or # ~/.nixpkgs/config.nix. - config ? null + # + # [For NixOS (nixos-rebuild), use nixpkgs.config option to set.] + config ? let + inherit (builtins) getEnv pathExists; + + configFile = getEnv "NIXPKGS_CONFIG"; + homeDir = getEnv "HOME"; + configFile2 = homeDir + "/.nixpkgs/config.nix"; + in + if configFile != "" && pathExists configFile then import configFile + else if homeDir != "" && pathExists configFile2 then import configFile2 + else {} , crossSystem ? null , platform ? null }: -let config_ = config; platform_ = platform; in # rename the function arguments +let configExpr = config; platform_ = platform; in # rename the function arguments let lib = import ../../lib; - # The contents of the configuration file found at $NIXPKGS_CONFIG or - # $HOME/.nixpkgs/config.nix. - # for NIXOS (nixos-rebuild): use nixpkgs.config option + # Allow both: + # { /* the config */ } and + # { pkgs, ... } : { /* the config */ } config = - let - inherit (builtins) getEnv pathExists; - - configFile = getEnv "NIXPKGS_CONFIG"; - homeDir = getEnv "HOME"; - configFile2 = homeDir + "/.nixpkgs/config.nix"; - - configExpr = - if config_ != null then config_ - else if configFile != "" && pathExists configFile then import configFile - else if homeDir != "" && pathExists configFile2 then import configFile2 - else {}; - - in - # allow both: - # { /* the config */ } and - # { pkgs, ... } : { /* the config */ } - if builtins.isFunction configExpr - then configExpr { inherit pkgs; } - else configExpr; + if builtins.isFunction configExpr + then configExpr { inherit pkgs; } + else configExpr; # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f14dbfaea47..1ff7e9b8d5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6100,6 +6100,29 @@ in modules // { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); + flowlogs_reader = buildPythonPackage rec { + name = "flowlogs_reader-1.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/f/flowlogs_reader/${name}.tar.gz"; + sha256 = "0158aki6m3pkf98hpd60088qyhrfxkmybdf8hv3qfl8nb61vaiwf"; + }; + + propagatedBuildInputs = with self; [ + botocore boto3 docutils + ]; + buildInputs = with self; [ + unittest2 mock + ]; + + meta = with pkgs.stdenv.lib; { + description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier"; + homepage = "https://github.com/obsrvbl/flowlogs-reader"; + maintainers = with maintainers; [ cransom ]; + license = licenses.asl20; + }; + }; + frozendict = buildPythonPackage rec { name = "frozendict-0.5"; |