diff options
Diffstat (limited to 'pkgs')
54 files changed, 472 insertions, 390 deletions
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 120bd4301515f..3a962458632e0 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit , cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq -, zeromq, pcsclite, readline, libsodium +, zeromq, pcsclite, readline, libsodium, hidapi , CoreData, IOKit, PCSC }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline - libsodium + libsodium hidapi ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index df43e5ed3b3d0..a268c155a0f58 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,8 +4,8 @@ , gobject-introspection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { + pname = "lollypop"; version = "0.9.611"; - name = "lollypop-${version}"; format = "other"; doCheck = false; @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { libsoup ]; - pythonPath = with python3.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 gst-python pillow @@ -56,15 +56,15 @@ python3.pkgs.buildPythonApplication rec { ''; preFixup = '' - buildPythonPath "$out/libexec/lollypop-sp $pythonPath" + buildPythonPath "$out $propagatedBuildInputs" patchPythonScript "$out/libexec/lollypop-sp" ''; meta = with stdenv.lib; { description = "A modern music player for GNOME"; - homepage = https://wiki.gnome.org/Apps/Lollypop; - license = licenses.gpl3Plus; + homepage = https://wiki.gnome.org/Apps/Lollypop; + license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 8e99005bbf6c5..11566293c49b0 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,17 +4,17 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { pname = "neovim-remote"; - version = "2.1.0"; + version = "2.1.1"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc"; + sha256 = "1hkzcc141imjin03wpfykw50k0vs7vj1lr09czb2hsyf937gyjqn"; }; - propagatedBuildInputs = with pythonPackages; [ neovim psutil ]; + propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; meta = { description = "A tool that helps controlling nvim processes from a terminal"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index bd4304560fd13..3dd3710da772e 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -16,7 +16,6 @@ let , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ , withNodeJs? false , withRuby ? true - , withPyGUI ? false , vimAlias ? false , viAlias ? false , configure ? {} @@ -43,13 +42,13 @@ let pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins; pythonEnv = pythonPackages.python.withPackages(ps: - (if withPyGUI then [ ps.neovim_gui ] else [ ps.neovim ]) + [ ps.pynvim ] ++ (extraPythonPackagesFun ps) ++ (concatMap (f: f ps) pluginPythonPackages)); pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; python3Env = python3Packages.python.withPackages (ps: - [ ps.neovim ] + [ ps.pynvim ] ++ (extraPython3PackagesFun ps) ++ (concatMap (f: f ps) pluginPython3Packages)); @@ -88,10 +87,6 @@ let makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH '' + optionalString withRuby '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' - + optionalString withPyGUI '' - makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ - --prefix PATH : "$out/bin" '' + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' + optionalString viAlias '' diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 99e250e9e4d7d..3990d0989062f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -7,19 +7,19 @@ let custom_swig = fetchFromGitHub { owner = "baldurk"; repo = "swig"; - rev = "renderdoc-modified-5"; - sha256 = "0ihrxbx56p5wn589fbbsns93fp91sypqdzfxdy7l7v9sf69a41mw"; + rev = "renderdoc-modified-6"; + sha256 = "00ykqlzx1k9iwqjlc54kfch7cnzsj53hxn7ql70dj3rxqzrnadc0"; }; in stdenv.mkDerivation rec { - version = "1.1"; + version = "1.2"; name = "renderdoc-${version}"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0kb9m1dm0mnglqyh1srvl0f1bgjghxzbqarn0xfqw49wphqwhmcd"; + sha256 = "0s1q5d58x18yz3nf94pv5i1qd2hc0a4gdj4qkpcn8s6ms2x05pz4"; }; buildInputs = [ diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix deleted file mode 100644 index c1b8a7eb86630..0000000000000 --- a/pkgs/applications/misc/acbuild/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, go, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "acbuild-${version}"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "appc"; - repo = "acbuild"; - rev = "v${version}"; - sha256 = "0s81xlaw75d05b4cidxml978hnxak8parwpnk9clanwqjbj66c7x"; - }; - - buildInputs = [ go ]; - - patchPhase = '' - sed -i -e 's|\git describe --dirty|echo "${version}"|' build - ''; - - buildPhase = '' - patchShebangs build - ./build - ''; - - installPhase = '' - mkdir -p $out - mv bin $out - ''; - - meta = with stdenv.lib; { - description = "A build tool for ACIs"; - homepage = https://github.com/appc/acbuild; - license = licenses.asl20; - maintainers = with maintainers; [ dgonyeo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index c9cc2d6db4247..1c2045f4141ea 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget, -qtquickcontrols, qtgraphicaleffects, qmake }: +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget +, qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr + '' + stdenv.lib.optionalString stdenv.isDarwin '' + ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; enableParallelBuilding = true; @@ -37,8 +39,8 @@ stdenv.mkDerivation rec { eye-candy, customizable, and reasonably lightweight. ''; homepage = https://github.com/Swordfish90/cool-retro-term; - license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3Plus; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; } diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 3e6b9fce6d09b..12a6c64c7ae42 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -4,7 +4,7 @@ , gobject-introspection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - name = "eolie-${version}"; + pname = "eolie"; version = "0.9.45"; format = "other"; @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { webkitgtk ]; - pythonPath = with python3.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 pycairo pygobject3 @@ -51,11 +51,16 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_post_install.py ''; + preFixup = '' + buildPythonPath "$out $propagatedBuildInputs" + patchPythonScript "$out/libexec/eolie-sp" + ''; + meta = with stdenv.lib; { description = "A new GNOME web browser"; - homepage = https://wiki.gnome.org/Apps/Eolie; - license = licenses.gpl3Plus; + homepage = https://wiki.gnome.org/Apps/Eolie; + license = licenses.gpl3Plus; maintainers = with maintainers; [ samdroid-apps worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 8bf6bb2069fcf..31d6139f3248a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -14,10 +14,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "63.0.3"; + ffversion = "64.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "319bdkvk1r53i8l9ilz9ffllp2yxn02glhjsf26bqchw0c4ym8y6d62j1g7s55lddzqka3kcsmzba0k8wna1aw3pydf7v84nyhaw1bc"; + sha512 = "10zbzwpdadj3ap2z66d0bz8l11qkgzlzd22nj7n3k2bzy7rd0m6cfznd9d4mgyl4ivxjv6wz8pasvacrala2dr0m78ysxiz2fpvrahs"; }; patches = nixpkgsPatches ++ [ diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 35721208a6e2e..3a0164edeb041 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "luigi"; - version = "2.7.9"; + version = "2.8.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; + sha256 = "1869lb6flmca6s7ccws7mvyn66nvrqjky40jwf2liv9fg0lp8899"; }; # Relax version constraint diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2f7f3c5836afe..9dd9a0d33345c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, wrapGAppsHook -, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig +, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, udev, libnotify @@ -24,6 +24,7 @@ let rpath = lib.makeLibraryPath [ alsaLib atk + at-spi2-atk cairo cups dbus @@ -49,18 +50,17 @@ let libXtst nspr nss - stdenv.cc.cc udev xorg.libxcb ]; in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1gak6nhv5gk37iv1bfmjx6wf0p1vcln5y29i6fkzmvcrp3j2cmfh"; + sha256 = "19a585mylbwrxd2m75hgp77ys1r350xkvawq2ysp0cxzr04l46z7"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -84,6 +84,7 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop wrapProgram $out/libexec/signal-desktop \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \ ${customLanguageWrapperArgs} \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6953b3bc6e8e6..7a9bef45b25f7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,17 +4,15 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.4.3"; - sha256Hash = "1pvjvndqc7ylgc8ihf20fl1vb1x6fj7ywl6p1fr16j683vhdcml8"; + version = "1.5.1"; + sha256Hash = "1y2fhw57g6raiv820sb53hjsqrmm81ij58dxlrv64z7ng0s8cnar"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "388730"; - archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7"; + archPatchesRevision = "415526"; + archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik"; }; in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { - version = "1.4.8"; - sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj"; stable = false; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 900e0980e74c7..302eb975d8108 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -8,15 +8,7 @@ with lib; -let - # TODO: Not optimal (maybe we should only package the stable versions) - previewPatches = fetchFromGitHub { - owner = "primeos"; - repo = "nixpkgs-tdesktop-patches"; - rev = "b3c0cbce1b412443a8712c90069932bbcae87fb6"; - sha256 = "1bymrciaci6plghaz7a6qwsidjm8rg5fqdh158cdp70il4g7kmw9"; - }; -in mkDerivation rec { +mkDerivation rec { name = "telegram-desktop-${version}"; inherit version; @@ -37,10 +29,7 @@ in mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = - (if stable - then [ "${archPatches}/tdesktop.patch" ] - else [ "${previewPatches}/tdesktop.patch" ]) + patches = [ "${archPatches}/tdesktop.patch" ] # TODO: Only required to work around a compiler bug. # This should be fixed in GCC 7.3.1 (or later?) ++ [ ./fix-internal-compiler-error.patch ]; @@ -109,9 +98,9 @@ in mkDerivation rec { sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ -e "/-msse2/d" - gyp ${lib.optionalString (!stable) '' - -Dapi_id=17349 \ - -Dapi_hash=344583e45741c457fe1862106095a5eb ''}\ + gyp \ + -Dapi_id=17349 \ + -Dapi_hash=344583e45741c457fe1862106095a5eb \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp \ diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index ec11472bbaeb5..dbb2f1b80cc94 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -75,6 +75,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr ]; extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; buildInputs_ = buildInputs; + extraRustcOpts_ = extraRustcOpts; in stdenv.mkDerivation (rec { @@ -141,7 +142,7 @@ stdenv.mkDerivation (rec { extraLinkFlags crateAuthors verbose colors target_os; }; - extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; + extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_; buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 9f42324e6d6d8..c932c7f06c036 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip}: fetchzip { - name = "powerline-fonts-2017-05-25"; + name = "powerline-fonts-2018-11-11"; - url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip; + url = https://github.com/powerline/fonts/archive/e80e3eba9091dac0655a0a77472e10f53e754bb0.zip; postFetch = '' mkdir -p $out/share/fonts/opentype @@ -22,7 +22,7 @@ fetchzip { unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf ''; - sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388"; + sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww"; meta = with stdenv.lib; { homepage = https://github.com/powerline/fonts; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 7b13c59a1a8c7..3f1dad87548ee 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.30.2"; + version = "3.30.3"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ps49js0110lrvg5xiylj9ky0ndp43wrnm0l6p6phmhx4h4477mj"; + sha256 = "1v0bqqwv34j8qamby7dwgnha50fpjs8mhlq0h6c35jxsqb2f3k66"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 07c00f5b6325e..2f7e5bbe80718 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.30.2.1"; + version = "3.30.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57"; + sha256 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index af5b861ab4724..344fb4a5738e3 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -4,15 +4,13 @@ , gnome3, gpgme, python3, openldap , libsecret, avahi, p11-kit, openssh }: -let +stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.30"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.30.1.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index c88d8c9c381fb..c9c8acfecb3bc 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.30.2"; + version = "3.30.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv"; + sha256 = "1q1wpsc3p6b1cacwgkgqbni7rdx3skvb2fm6fyjs2wjgq6zi5753"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 286bec4a367e8..a7347f74ca4b6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,13 +5,13 @@ , vala, meson, ninja }: let - version = "3.30.1"; + version = "3.30.2"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1vizpjb3ll7pndxpvwjjplgdn6b2wf0mjqr9fga0p2cj57v00m89"; + sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index f37a86be4f1fb..7e7c40e81309a 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -4,13 +4,13 @@ let pname = "nautilus"; - version = "3.30.4"; + version = "3.30.5"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1"; + sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv"; }; nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ]; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index baecba8d35507..3b70159191410 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "totem-${version}"; - version = "3.26.2"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g"; + sha256 = "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 96b18a7d7c56a..904bdd323d812 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vte-${version}"; - version = "0.54.2"; + version = "0.54.3"; src = fetchurl { url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj"; + sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 436b12d10644a..626f4652ecec4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -371,8 +371,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - libgda = callPackage ./misc/libgda { }; - libgit2-glib = callPackage ./misc/libgit2-glib { }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index d985eac4030fc..77edf27fbdd66 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-tweaks"; - version = "3.30.1"; + version = "3.30.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa"; + sha256 = "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 7054e41d72954..3776a9adbf2cf 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -3,13 +3,13 @@ let pname = "libgnome-games-support"; - version = "1.4.2"; + version = "1.4.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088"; + sha256 = "0g6a1vvhrbs0pfnzjfg3lgqvppwkydn6j3dn713zhrjhma9pljkh"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix new file mode 100644 index 0000000000000..49a71987e7549 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: + +stdenv.mkDerivation rec { + name = "lxrandr-0.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/lxde/${name}.tar.xz"; + sha256 = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e"; + }; + + configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; + + meta = with stdenv.lib; { + description = "LXRandR is the standard screen manager of LXDE."; + homepage = https://lxde.org/; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ rawkode ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0d0eee11d5c55..b0d3072443856 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -485,6 +485,7 @@ self: super: { # Test suite won't compile against tasty-hunit 0.10.x. binary-parser = dontCheck super.binary-parser; + binary-parsers = dontCheck super.binary-parsers; bytestring-strict-builder = dontCheck super.bytestring-strict-builder; bytestring-tree-builder = dontCheck super.bytestring-tree-builder; diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 93e18f519163d..ee9323ebc5c05 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala , overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null @@ -8,18 +8,13 @@ assert mysqlSupport -> mysql != null; assert postgresSupport -> postgresql != null; (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { - name = "libgda-${version}"; - version = "5.2.5"; + pname = "libgda"; + version = "5.2.8"; src = fetchurl { - url = "mirror://gnome/sources/libgda/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1j4hxhiwr4i8rgbn2ck93y1c2b792sfzlrq7abyjx8h8ik1f9lp3"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0id4my5wh2m6rd7ijqp2azsjdb4l4yjrv3imq71kly00gjc6v1z2"; }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; }; - }; - configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] ++ (optional (mysqlSupport) "--with-mysql=yes") ++ (optional (postgresSupport) "--with-postgres=yes"); @@ -28,11 +23,17 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ]; - buildInputs = with stdenv.lib; [ gtk3 openssl ] + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ]; + buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ] ++ optional (mysqlSupport) mysql.connector-c ++ optional (postgresSupport) postgresql; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Database access library"; homepage = http://www.gnome-db.org/; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 26386e0c42c47..ba62324d586ed 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: stdenv.mkDerivation rec { - version = "0.1.0"; - name = "qmltermwidget-${version}"; + version = "2018-11-24"; + name = "qmltermwidget-unstable-${version}"; src = fetchFromGitHub { repo = "qmltermwidget"; owner = "Swordfish90"; - rev = "v${version}"; - sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; + rev = "48274c75660e28d44af7c195e79accdf1bd44963"; + sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6"; }; buildInputs = [ qtbase qtquick1 qtmultimedia ] diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index fb06fd7f935fb..26fa24d8dc0fd 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo -, ppx_import, ppx_deriving, yojson, ounit +, ppx_deriving, yojson, ounit }: stdenv.mkDerivation rec { @@ -13,15 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw"; }; - buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_import ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; propagatedBuildInputs = [ ppx_deriving yojson ]; inherit (topkg) installPhase; - doCheck = true; - checkTarget = "test"; - meta = { description = "A Yojson codec generator for OCaml >= 4.02."; inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index ffac74de4edf8..bdcc6568ffe78 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,34 +1,31 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline -, cppo, ounit, ppx_deriving +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, ounit, ppx_deriving, ppx_tools_versioned }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.04" then throw "ppx_import is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ppx_import-${version}"; - - version = "1.5"; +buildDunePackage rec { + pname = "ppx_import"; + version = "1.5-3"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = "ppx_import"; - rev = "v${version}"; - sha256 = "1lf5lfp6bl5g4gdszaa6k6pkyh3qyhbarg5m1j0ai3i8zh5qg09d"; + rev = "bd627d5afee597589761d6fee30359300b5e1d80"; + sha256 = "1f9bphif1izhyx72hvwpkd9kxi9lfvygaicy6nbxyp6qgc87z4nm"; }; - buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_deriving opaline ]; + buildInputs = [ ounit ppx_deriving ]; + propagatedBuildInputs = [ ppx_tools_versioned ]; doCheck = true; checkTarget = "test"; - installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; - - meta = with stdenv.lib; { + meta = { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; - license = licenses.mit; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 7c4e15f856839..78e924e975390 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "alot"; - version = "0.7"; + version = "0.8"; outputs = [ "out" ] ++ lib.optional withManpage "man"; - disabled = isPy3k; + disabled = !isPy3k; src = fetchFromGitHub { owner = "pazz"; repo = "alot"; rev = "${version}"; - sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi"; + sha256 = "1isn0p0i2a7dlbrdk5ib01xa1wgi6bi9ka4xl4vj8iw1q4i5fqv9"; }; nativeBuildInputs = lib.optional withManpage sphinx; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix new file mode 100644 index 0000000000000..8b1100cd3f40e --- /dev/null +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, testpath +, tornado +}: + +buildPythonPackage rec { + pname = "jeepney"; + version = "0.4"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w1w1rawl9k4lx91w16d19kbmf1349mhy8ph8x3w0qp1blm432b0"; + }; + + propagatedBuildInputs = [ + tornado + ]; + + checkInputs = [ + pytest + testpath + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://gitlab.com/takluyver/jeepney; + description = "Pure Python DBus interface"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/neovim_gui/default.nix b/pkgs/development/python-modules/neovim_gui/default.nix deleted file mode 100644 index e6d36a3708903..0000000000000 --- a/pkgs/development/python-modules/neovim_gui/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, neovim -, click -, pygobject3 -, isPy27 -, pkgs -}: - -buildPythonPackage rec { - pname = "neovim-pygui"; - version = "0.1.3"; - disabled = !isPy27; - - src = fetchFromGitHub { - owner = "neovim"; - repo = "python-gui"; - rev = version; - sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz"; - }; - - propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobject-introspection pkgs.makeWrapper pkgs.gtk3 ]; - - patchPhase = '' - sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py - ''; - - postInstall = '' - wrapProgram $out/bin/pynvim \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "${pygobject3}/lib/python2.7/site-packages:$PYTHONPATH" - ''; - -} diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 20479093a4712..3811e5082c0fd 100644 --- a/pkgs/development/python-modules/neovim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - pname = "neovim"; - version = "0.3.0"; + pname = "pynvim"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "18x7gi1idsch11hijvy0mm2mk4f42rapz9niax4rnak14x2klqq2"; + sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index 98bbef174ae78..c0df4d4a878ed 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage -, dbus-python, cryptography }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }: buildPythonPackage rec { pname = "secretstorage"; - version = "2.3.1"; + version = "3.1.0"; - src = fetchFromGitHub { - owner = "mitya57"; - repo = "secretstorage"; - rev = version; - sha256 = "1sjd2jjbxgkkxyrfwx89x0hsnn39w2cr2qkxbg1iz52znr4sqism"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "SecretStorage"; + inherit version; + sha256 = "12vxzradibfmznssh7x2zd7qym2hl7wn34fn2yn58pnx6sykrai9"; }; - propagatedBuildInputs = [ dbus-python cryptography ]; + propagatedBuildInputs = [ + cryptography + jeepney + pygobject3 + ]; - doCheck = false; # requires dbus session + # Needs a D-Bus Sesison + doCheck = false; - meta = with stdenv.lib; { - homepage = "https://github.com/mitya57/secretstorage"; + meta = with lib; { + homepage = https://github.com/mitya57/secretstorage; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsdOriginal; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 1b64456fb204d..c31dfb63b3cd4 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -17,7 +17,7 @@ , postBuild ? null , document ? [] , meta ? {} -, groups ? ["default"] +, groups ? null , ignoreCollisions ? false , buildInputs ? [] , ... diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index b8e666a92f9a3..6324f27e9faf4 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -1,5 +1,10 @@ { lib, gemConfig, ... }: -rec { + +let + inherit (lib) attrValues concatMap converge filterAttrs getAttrs + intersectLists; + +in rec { bundlerFiles = { gemfile ? null , lockfile ? null @@ -22,7 +27,19 @@ rec { else gemset; }; - filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; + filterGemset = { ruby, groups, ... }: gemset: + let + platformGems = filterAttrs (_: platformMatches ruby) gemset; + directlyMatchingGems = filterAttrs (_: groupMatches groups) platformGems; + + expandDependencies = gems: + let + depNames = concatMap (gem: gem.dependencies or []) (attrValues gems); + deps = getAttrs depNames platformGems; + in + gems // deps; + in + converge expandDependencies directlyMatchingGems; platformMatches = {rubyEngine, version, ...}: attrs: ( !(attrs ? "platforms") || @@ -33,10 +50,9 @@ rec { ) attrs.platforms ); - groupMatches = groups: attrs: ( - !(attrs ? "groups") || - builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups - ); + groupMatches = groups: attrs: + groups == null || !(attrs ? "groups") || + (intersectLists (groups ++ [ "default" ]) attrs.groups) != []; applyGemConfigs = attrs: (if gemConfig ? "${attrs.gemName}" diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix new file mode 100644 index 0000000000000..6f3df32f3c041 --- /dev/null +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, cmake, boost +, gmp, llvm, clang, sqlite, python3 +, ocamlPackages, mpfr, ppl, doxygen, graphviz +}: + +let + python = python3.withPackages (ps: with ps; [ + pygments + ]); +in + +stdenv.mkDerivation rec { + name = "ikos"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "NASA-SW-VnV"; + repo = name; + rev = "v${version}"; + sha256 = "09nf47hpk5w5az4c0hcr5hhwvpz8zg1byyg185542cpzbq1xj8cb"; + }; + + buildInputs = [ cmake boost gmp clang llvm sqlite python + ocamlPackages.apron mpfr ppl doxygen graphviz ]; + + cmakeFlags = "-DAPRON_ROOT=${ocamlPackages.apron}"; + + postBuild = "make doc"; + + meta = with lib; { + homepage = https://github.com/NASA-SW-VnV/ikos; + description = "Static analyzer for C/C++ based on the theory of Abstract Interpretation"; + license = licenses.nasa13; + maintainers = with maintainers; [ atnnn ]; + }; +} diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 650e1fc39e536..f9e60e3e492ca 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,23 +1,27 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pgcli"; - version = "2.0.0"; + version = "2.0.1"; - src = pythonPackages.fetchPypi { + # Python 2 won't have prompt_toolkit 2.x.x + # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 + disabled = python3Packages.isPy27; + + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi"; + sha256 = "149naq3gp1n922vag7vixs0hd114bpbmbmv70k4kzc1q7jz748l2"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ cli-helpers click configobj humanize prompt_toolkit psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; - checkInputs = with pythonPackages; [ pytest mock ]; + checkInputs = with python3Packages; [ pytest mock ]; checkPhase = '' - py.test + pytest ''; meta = with lib; { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 197a5d756cc25..3e8c0d715d552 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -53,12 +53,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-12-07"; + name = "ale-2018-12-10"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "9226e13b31474ac17d0c25cd27aa55bff21d55c2"; - sha256 = "0x3ihhswcqy3451721f3yfi5m2m09src7yd4r67q9k2gcyldbwj8"; + rev = "2cfa09e02d65cd06649fb1ae5f988b7a110a124d"; + sha256 = "0sbbm6wwdwqbkfxkwbiijnsazdarmr6ahs2ha58s780fhkhvf2lp"; }; }; @@ -344,12 +344,12 @@ }; denite-nvim = buildVimPluginFrom2Nix { - name = "denite-nvim-2018-12-05"; + name = "denite-nvim-2018-12-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "a59c3e2f50452e0ddd1988e921624f6cfb47807d"; - sha256 = "1m96l3kflywdggypmh832piisaah3958v3ql4s267b9pk1phsgsy"; + rev = "cb1daf74c51b1670ee3914c95f85ba3852525e17"; + sha256 = "02m77q14s4y12r300ndml6nc8xwb8q15838l47j9bh1h8sz5b7al"; }; }; @@ -427,12 +427,12 @@ }; deoplete-nvim = buildVimPluginFrom2Nix { - name = "deoplete-nvim-2018-12-05"; + name = "deoplete-nvim-2018-12-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "a5ac69adb4ca5fae12e2f07a07c934213248779a"; - sha256 = "182ygr2fsbvxm3smp1s1m585vfyk5ivwmwa2wknzqwysz96bhfaf"; + rev = "04159b053ae83933d67225c53c36d98e516fa729"; + sha256 = "1d0r7jfs0b2rc1pmavn0yfqqdq9by6cd404a0vfa44ya05zrz115"; }; }; @@ -457,12 +457,12 @@ }; echodoc-vim = buildVimPluginFrom2Nix { - name = "echodoc-vim-2018-12-05"; + name = "echodoc-vim-2018-12-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "39cc8d6b5645088d3449006cffb202e751c92865"; - sha256 = "1s59jz88pdvz1nca7z5bzvazn2dp4n6xb39hagnbh4rw70s18xnx"; + rev = "2ca26d0a63210d8936ee86b82d409bd98e1b6bf7"; + sha256 = "19cmggxrgbj429fflcz0gamg1779577qm0mykq6kycx0j7zyclbf"; }; }; @@ -580,12 +580,12 @@ }; fzf-vim = buildVimPluginFrom2Nix { - name = "fzf-vim-2018-11-27"; + name = "fzf-vim-2018-12-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "95f025ef2dbc8fedf124521904a80c1879acd359"; - sha256 = "0g382ikl9vyxfrwx86nrk4chrn75kwpjx4gbxrjsbxxzxbplhnjc"; + rev = "f0acabf7e837e626c7102c30af890bccf79e33b7"; + sha256 = "0ac1xjrmidagna167i4q5ilplsqiqcaxwslyl37dw9qj75c9arj5"; }; }; @@ -771,12 +771,12 @@ }; julia-vim = buildVimPluginFrom2Nix { - name = "julia-vim-2018-11-23"; + name = "julia-vim-2018-12-11"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e6eca5e4ab8d7b716d768c2746b42bf1f15af82d"; - sha256 = "1wq5wnz5c0s6iqn34913xpk32d3n3cdh3xb01rws5psv6lri2kka"; + rev = "b81e1486d0a46b52e73763ee6e6ea1f28a3573d1"; + sha256 = "0lgjib5rni8rqiv3qkfxj204j6ccqrsnp7d7nij5bhqli3d2hryi"; }; }; @@ -801,12 +801,12 @@ }; lightline-vim = buildVimPluginFrom2Nix { - name = "lightline-vim-2018-11-24"; + name = "lightline-vim-2018-12-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "688240e0ef849cdc8457822658cedf10358c75d6"; - sha256 = "1rv8cj553h7w9y61vswq7s9hfmr5h2vxghqrkcsr6vvn7fy6smiv"; + rev = "1ef44bfa50320347004be77f836e97dc4f54982e"; + sha256 = "0xycmnd811si6c2sxwrw88law9wp5n6akxkqv0211iq9m8k72cp4"; }; }; @@ -991,12 +991,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-12-07"; + name = "neomake-2018-12-12"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "1481dd4fb9effef8831ed57ae2459310621f5df0"; - sha256 = "0y1mw113c58cy54vgfbv6km5g61wpd9v08r131jkbzylhzg2yqyh"; + rev = "2e0b5facc8452b145162b6f45b571b30188d9774"; + sha256 = "180znybxvs9cvlglx6kw5z3chyax7vadlcfj76zh39bzmgim6m7y"; }; }; @@ -1030,6 +1030,16 @@ }; }; + neovim-sensible = buildVimPluginFrom2Nix { + name = "neovim-sensible-2017-09-20"; + src = fetchFromGitHub { + owner = "jeffkreeftmeijer"; + repo = "neovim-sensible"; + rev = "e7ab7544f15e59de2d9a1b42f58e590938e496e7"; + sha256 = "06whnfvmzfdsx9gvkd2nxhx29939gjzibr2xadh54sj8ns646w58"; + }; + }; + neoyank-vim = buildVimPluginFrom2Nix { name = "neoyank-vim-2018-12-03"; src = fetchFromGitHub { @@ -1051,12 +1061,12 @@ }; nerdtree = buildVimPluginFrom2Nix { - name = "nerdtree-2018-12-07"; + name = "nerdtree-2018-12-12"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "c1876da09c38315d7fdea33d9082d1868b5fbd2b"; - sha256 = "1v2w5gf4ggm2bvnl6zhpqxna8c72fssp5bg2z350kncjjq069bks"; + rev = "72c3656799289d4635520c28e17f737066ce19d6"; + sha256 = "1dy77vjj2prn0cl2k3cf7bd240nvh95m6h6lpv0zshjzjap7m1fx"; }; }; @@ -1201,12 +1211,12 @@ }; purescript-vim = buildVimPluginFrom2Nix { - name = "purescript-vim-2018-07-05"; + name = "purescript-vim-2018-12-10"; src = fetchFromGitHub { owner = "raichoo"; repo = "purescript-vim"; - rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; - sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; + rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; + sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; }; }; @@ -1531,12 +1541,12 @@ }; traces-vim = buildVimPluginFrom2Nix { - name = "traces-vim-2018-12-04"; + name = "traces-vim-2018-12-09"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "47bd356e8a5e32b9b0be5d9805b603ee1cbb4242"; - sha256 = "145baj6jsp7j7amcgrmm3607lvgy2z2w6map0s1fcmgykrn89xfz"; + rev = "5152813d9b91692d37db176a9383f147373a7a8a"; + sha256 = "1f07nb4vn1nawcd32qy7wy0vgkd15ysg3f3yh1xd5jbfxixisbss"; }; }; @@ -1821,12 +1831,12 @@ }; vim-airline = buildVimPluginFrom2Nix { - name = "vim-airline-2018-12-03"; + name = "vim-airline-2018-12-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "3d9071e6b618280000a021a2517e28cb4b497be4"; - sha256 = "1qhwyaszhgd6vnpa9xmbnrsgs39nc87m0d35a3ccpkjp0q7bpzgq"; + rev = "e3cfd3643b0f4c9650d5eb23912fef12d88e7a60"; + sha256 = "0s7v5wfsqvq94yhgqiqr1nrfya6fvbrb5n0qwnq7shwva94pwwwr"; }; }; @@ -1871,12 +1881,12 @@ }; vim-autoformat = buildVimPluginFrom2Nix { - name = "vim-autoformat-2018-10-22"; + name = "vim-autoformat-2018-12-10"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "db17ccbacb55beea82fdaa9a1cde82f6a928d16d"; - sha256 = "0nnykvbz5hm4cpv9jqk0jb4zzywlwgbybbirf1655rqrqfv126pp"; + rev = "c203080645936e73b2124040bc963386eeb44f5e"; + sha256 = "0gzmmnzzj6hvcz216vgq46mp4lnp95f788pmhh3njq9l8rn28hd9"; }; }; @@ -2221,12 +2231,12 @@ }; vim-ghost = buildVimPluginFrom2Nix { - name = "vim-ghost-2018-11-28"; + name = "vim-ghost-2018-12-12"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "672d1052425cc9dd8f5f56ba31732f0637b95caa"; - sha256 = "14948jyyhddjpx2szs6wbs9sjnxbxvsdnkyf33558by3gn5yc7nw"; + rev = "26209657da7ea040c635b36331793a04694f4921"; + sha256 = "16gg487mxqw58s5np2a9a1kjy6kp5f0fmk60d444ymbjblv6gaix"; }; }; @@ -2271,12 +2281,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-12-07"; + name = "vim-go-2018-12-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ef278b486ad0698b74c53b61b9ebb3752d0384c2"; - sha256 = "0ki5fa6n40818rfscffpb12lzkmqns9yfbbxwipq7sf0bg2slys3"; + rev = "30cdcf3c1e4d0be92115f40ea3197a2effde0c27"; + sha256 = "1yszm8c1hqgs9pbdlff49yc08zg5qwvvy8plzvvd1hp6pir7q5kw"; }; }; @@ -2792,12 +2802,12 @@ }; vim-pathogen = buildVimPluginFrom2Nix { - name = "vim-pathogen-2018-04-05"; + name = "vim-pathogen-2018-12-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-pathogen"; - rev = "06da921608b971fb47603671bcafdb2843992eb3"; - sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; + rev = "24f5cdd8055787463dd8ca73c80c1424ff06b358"; + sha256 = "0hyn8i3gmx1vismiww7snrmfz95zmfk8j6mbyvn50gwid6wjwk14"; }; }; @@ -2942,12 +2952,12 @@ }; vim-ruby = buildVimPluginFrom2Nix { - name = "vim-ruby-2018-10-02"; + name = "vim-ruby-2018-12-11"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "a85f078d06ed11faf1b243315d67b6f37326686d"; - sha256 = "1d76yjbk9jmh3ci1fbdzsfip0r1npk07vlwibjv4cli8icq5pghz"; + rev = "0e57d862250bb4ce56e30e2c4e10781b8b1776ac"; + sha256 = "18z6170nm1vz4hh52qgiqhj9p7ak3d363rxh0q9si4hc6w56agzx"; }; }; @@ -3402,12 +3412,22 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-12-08"; + name = "vimtex-2018-12-10"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f6fae0c858558344d622cde4e2ed4a58caffb813"; - sha256 = "1pv05c90pcmxiq1553hz6f8g0x6a8b77g1m05i9f6j39acr63nrg"; + rev = "861e7b2fa00a9b0391dd8de0bf63b86dce9eb44a"; + sha256 = "1a1zvr1g8k97s8n3s2sjgi5drjsamj91fc649kgwsjjs880rfjsl"; + }; + }; + + vimux = buildVimPluginFrom2Nix { + name = "vimux-2017-10-24"; + src = fetchFromGitHub { + owner = "benmills"; + repo = "vimux"; + rev = "37f41195e6369ac602a08ec61364906600b771f1"; + sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; }; }; @@ -3523,12 +3543,12 @@ }; youcompleteme = buildVimPluginFrom2Nix { - name = "youcompleteme-2018-12-07"; + name = "youcompleteme-2018-12-12"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "80246aa9a23cab4175c41a514598284efe218c20"; - sha256 = "1s002jq0n4nhaxk42hdgqdgww67f3crx5rj5xns34ifg3y1zagn2"; + rev = "0790dc99b441f3c12fb205faf56054ccf0f4c234"; + sha256 = "0nc629x7gsqqjmdy2psj7x3z1py3hksifwbf3fq9m9kr23zhl6ql"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c369328c8d514..e914a3f432330 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -15,6 +15,7 @@ artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 benekastah/neomake +benmills/vimux bitc/vim-hdevtools bling/vim-bufferline bronson/vim-trailing-whitespace @@ -102,6 +103,7 @@ JazzCore/ctrlp-cmatcher jceb/vim-hier jceb/vim-orgmode jeetsukumaran/vim-buffergator +jeffkreeftmeijer/neovim-sensible jgdavey/tslime.vim jhradilek/vim-docbk jiangmiao/auto-pairs diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c66a5b37bb0ba..9d48ee0150993 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -3,7 +3,7 @@ , configFile ? "all" # Userspace dependencies -, zlib, libuuid, python, attr, openssl +, zlib, libuuid, python3, attr, openssl , libtirpc , nfs-utils , gawk, gnugrep, gnused, systemd @@ -54,7 +54,7 @@ let ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python attr ] + ++ optionals buildUser [ zlib libuuid python3 attr ] ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ] ++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 36f5200d43bc6..a24dee07de474 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.60"; + version = "5.5.62"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "071xaamqkbscybqzm79gf2w3bkr9lqlzwafis3gzc8w8fkhi4hd3"; + sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi"; }; patches = if stdenv.isCygwin then [ @@ -78,5 +78,6 @@ self = stdenv.mkDerivation rec { artistic1 bsd0 bsd2 bsd3 bsdOriginal gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib ]; + broken = stdenv.isAarch64; }; }; in self diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix deleted file mode 100644 index 44fa1cb7cfb10..0000000000000 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, go }: - -stdenv.mkDerivation rec { - name = "logstash-forwarder-${version}"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "elasticsearch"; - repo = "logstash-forwarder"; - rev = "v${version}"; - sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l"; - }; - - buildInputs = [ go ]; - - installPhase = '' - mkdir -p $out/bin - find . -name logstash-forwarder -type f -exec cp {} $out/bin \; - ''; - - meta = { - license = stdenv.lib.licenses.asl20; - homepage = https://github.com/elasticsearch/logstash-forwarder; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix new file mode 100644 index 0000000000000..d224ad1dcc5d5 --- /dev/null +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "me_cleaner"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "corna"; + repo = pname; + rev = "v${version}"; + sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Tool for partial deblobbing of Intel ME/TXE firmware images"; + longDescription = '' + me_cleaner is a Python script able to modify an Intel ME firmware image + with the final purpose of reducing its ability to interact with the system. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index d145e1e12c3ad..e6f2dec30e6a4 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, go }: +{ buildGoPackage, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "curl-unix-socket-2014-09-01"; +buildGoPackage rec { + name = "curl-unix-socket-2015-04-10"; src = fetchFromGitHub { owner = "Soulou"; repo = "curl-unix-socket"; - rev = "e926dca77ba7d4a1eeae073918fdd3db92f1a350"; + rev = "a7da90b01ed43e8c0d606f760c9da82f8e3ed307"; sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d"; }; - buildInputs = [ go ]; - buildPhase = "go build -o curl-unix-socket"; - installPhase = "install -D curl-unix-socket $out/bin/curl-unix-socket"; + goPackagePath = "github.com/Soulou/curl-unix-socket"; + + buildPhase = '' + runHook preBuild + ( + cd go/src/${goPackagePath} + go build -o $NIX_BUILD_TOP/go/bin/curl-unix-socket + ) + runHook postBuild + ''; meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket"; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index a76519b36b572..d8aed9ad8e07b 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,16 +1,6 @@ -{ stdenv, fetchurl, fetchgit, go }: +{ buildGoPackage, stdenv, fetchurl }: -let - - # Code with BSD license - srcNatPMP = fetchgit { - url = https://github.com/jackpal/go-nat-pmp; - rev = "e04deda90d56"; - sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; - }; - -in -stdenv.mkDerivation rec { +buildGoPackage rec { name = "filegive-0.7.4"; src = fetchurl { @@ -18,30 +8,15 @@ stdenv.mkDerivation rec { sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy"; }; - buildInputs = [ go ]; - - buildPhase = '' - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "export GOARM=5"} - - mkdir $TMPDIR/go - export GOPATH=$TMPDIR/go - - GONATPMP=$GOPATH/src/code.google.com/p/go-nat-pmp - mkdir -p $GONATPMP - cp -R ${srcNatPMP}/* $GONATPMP/ - go build -o filegive - ''; + goDeps = ./deps.nix; - installPhase = '' - mkdir -p $out/bin - cp filegive $out/bin - ''; + goPackagePath = "viric.name/soft/filegive"; - meta = { + meta = with stdenv.lib; { homepage = http://viric.name/cgi-bin/filegive; description = "Easy p2p file sending program"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.agpl3Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/filegive/deps.nix b/pkgs/tools/networking/filegive/deps.nix new file mode 100644 index 0000000000000..24c262195086b --- /dev/null +++ b/pkgs/tools/networking/filegive/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "code.google.com/p/go-nat-pmp"; + fetch = { + type = "git"; + url = "https://github.com/jackpal/go-nat-pmp"; + rev = "e04deda90d5683d6e375732740814a89eea7bafd"; + sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; + }; + } +] diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 5e3f878285295..55619b416320c 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,30 +1,18 @@ -{ stdenv, fetchFromGitHub, go }: +{ buildGoPackage, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - version = "1.1.0"; +buildGoPackage rec { + version = "2.0.0"; name = "xurls-${version}"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "05q4nqbpgfb0a35sn22rn9mlag2ks4cgwb54dx925hipp6zgj1hx"; + sha256 = "1jdjwlp19r8cb7vycyrjmpwf8dz2fzrqphq4lkvy9x2v7x0kksx8"; }; - buildInputs = [ go ]; - - buildPhase = '' - mkdir -p src/github.com/mvdan - ln -s $(pwd) src/github.com/mvdan/xurls - export GOPATH=$(pwd) - cd cmd/xurls - go build -v - ''; - - installPhase = '' - mkdir -p $out/bin - mv xurls $out/bin - ''; + goPackagePath = "mvdan.cc/xurls/v2"; + subPackages = [ "cmd/xurls" ]; meta = with stdenv.lib; { description = "Extract urls from text"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4121a66c01f0e..2e09d0204c582 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -450,8 +450,6 @@ in abduco = callPackage ../tools/misc/abduco { }; - acbuild = callPackage ../applications/misc/acbuild { }; - acct = callPackage ../tools/system/acct { }; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; @@ -3738,8 +3736,6 @@ in logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; - logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; - lolcat = callPackage ../tools/misc/lolcat { }; lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; @@ -5544,6 +5540,8 @@ in sstp = callPackage ../tools/networking/sstp {}; + strip-nondeterminism = perlPackages.strip-nondeterminism; + structure-synth = callPackage ../tools/graphics/structure-synth { }; su-exec = callPackage ../tools/security/su-exec {}; @@ -7723,6 +7721,8 @@ in lxtask = callPackage ../desktops/lxde/core/lxtask { }; + lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -7772,6 +7772,8 @@ in maude = callPackage ../development/interpreters/maude { }; + me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; + mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools wrapPython; @@ -8713,6 +8715,10 @@ in inherit (perlPackages) XMLSimple; }; + ikos = callPackage ../development/tools/analysis/ikos { + inherit (llvmPackages_7) stdenv clang llvm; + }; + include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { llvmPackages = llvmPackages_6; }; @@ -10760,6 +10766,8 @@ in }); libgap = callPackage ../development/libraries/libgap { }; + libgda = callPackage ../development/libraries/libgda { }; + libgdata = gnome3.libgdata; libgig = callPackage ../development/libraries/libgig { }; @@ -13391,7 +13399,9 @@ in dex-oidc = callPackage ../servers/dex { }; - doh-proxy = callPackage ../servers/dns/doh-proxy { }; + doh-proxy = callPackage ../servers/dns/doh-proxy { + python3Packages = python36Packages; + }; dgraph = callPackage ../servers/dgraph { }; @@ -15865,7 +15875,7 @@ in alock = callPackage ../misc/screensavers/alock { }; - inherit (python2Packages) alot; + inherit (python3Packages) alot; alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; @@ -18440,6 +18450,7 @@ in notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3; + pythonPackages = python3Packages; }; notejot = callPackage ../applications/misc/notejot { }; @@ -19664,8 +19675,6 @@ in neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; - neovim-pygui = pythonPackages.neovim_gui; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; }; vis = callPackage ../applications/editors/vis { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74e9e60a0f885..26f811bfb3344 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14109,6 +14109,39 @@ let buildInputs = [ TestToolbox ]; }; + strip-nondeterminism = buildPerlPackage rec { + name = "strip-nondeterminism-${version}"; + version = "1.0.0"; + + outputs = [ "out" "dev" ]; # no "devdoc" + + src = pkgs.fetchFromGitLab { + owner = "reproducible-builds"; + repo = "strip-nondeterminism"; + domain = "salsa.debian.org"; + rev = version; + sha256 = "1pwar1fyadqxmvb7x4zyw2iawbi5lsfjcg0ps9n9rdjb6an7vv64"; + }; + + # stray test failure + doCheck = false; + + buildInputs = [ ArchiveZip ArchiveCpio pkgs.file ]; + + perlPostHook = '' + # we don’t need the debhelper script + rm $out/bin/dh_strip_nondeterminism + rm $out/share/man/man1/dh_strip_nondeterminism.1.gz + ''; + + meta = with stdenv.lib; { + description = "A Perl module for stripping bits of non-deterministic information"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; + }; + }; + SubExporter = buildPerlPackage { name = "Sub-Exporter-0.987"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da5fa4dd102f2..949103211ff8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2570,7 +2570,10 @@ in { google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; - gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; }); + gpgme = toPythonModule (pkgs.gpgme.override { + pythonSupport = true; + inherit python; + }); gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; @@ -2706,6 +2709,8 @@ in { jellyfish = callPackage ../development/python-modules/jellyfish { }; + jeepney = callPackage ../development/python-modules/jeepney { }; + j2cli = callPackage ../development/python-modules/j2cli { }; jinja2 = callPackage ../development/python-modules/jinja2 { }; @@ -4637,9 +4642,7 @@ in { trollius = callPackage ../development/python-modules/trollius {}; - neovim = callPackage ../development/python-modules/neovim {}; - - neovim_gui = callPackage ../development/python-modules/neovim_gui { }; + pynvim = callPackage ../development/python-modules/pynvim {}; typogrify = callPackage ../development/python-modules/typogrify { }; |