diff options
Diffstat (limited to 'pkgs')
22 files changed, 300 insertions, 36 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 5978612fdf33..de4849e21620 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { libvisio libcdr libexif potrace python2Env icu ]; - enableParallelBuilding = true; + # To avoid non-deterministic build failure using make. + # When switching back to cmake turn parallel back on, see #40046. + enableParallelBuilding = false; preConfigure = '' intltoolize -f diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 7477e5c0af2a..b92012a29ddb 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" - "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ libGLU + libGL xorg.libXmu xorg.libXi xorg.libXext diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 7da71df7814c..d08b183d9d00 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast replacement for PGAdmin"; longDescription = '' - At the heart of Postage is a modern, fast, event-based C-binary, built in - the style of NGINX and Node.js. This heart makes Postage as fast as any - PostgreSQL interface can hope to be. + At the heart of pgManage is a modern, fast, event-based C-binary, built in + the style of NGINX and Node.js. This heart makes pgManage as fast as any + PostgreSQL interface can hope to be. (Note: pgManage replaces Postage, + which is no longer maintained.) ''; homepage = https://github.com/pgManage/pgManage; license = licenses.postgresql; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix new file mode 100644 index 000000000000..5246f8d3d1d6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGo110Package, fetchFromGitHub }: + +buildGo110Package rec { + name = "gomuks-${version}"; + version = "2018-05-16"; + + goPackagePath = "maunium.net/go/gomuks"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "gomuks"; + rev = "512ca88804268bf58a754e8a02be556f953db317"; + sha256 = "1bpgjkpvqqks3ljw9s0hm5pgscjs4rjy8rfpl2444m4rbpz1xvmr"; + }; + + meta = with stdenv.lib; { + homepage = https://maunium.net/go/gomuks/; + description = "A terminal based Matrix client written in Go"; + license = licenses.gpl3; + maintainers = with maintainers; [ tilpner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 443f3a7cf0b2..8c1170213f82 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -62,10 +62,6 @@ let version = "5.5.0"; ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch - - # This could be applied unconditionally but I don't want to cause a full - # Linux rebuild. - ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch ++ optional stdenv.hostPlatform.isMusl (fetchpatch { url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff; sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm"; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 22f80ae559f7..6cf4c85fb200 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iasl-${version}"; - version = "20180313"; + version = "20180508"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; + sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix new file mode 100644 index 000000000000..91801850ebfb --- /dev/null +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchzip, coq }: + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-stdpp-1.1"; + src = fetchzip { + url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz"; + sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0"; + }; + + buildInputs = [ coq ]; + + enableParallelBuilding = true; + + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + + meta = { + homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp"; + description = "An extended “Standard Library” for Coq"; + inherit (coq.meta) platforms; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; + +} diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index bde4f85f6784..bbc3d856ff2d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -176,6 +176,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) # , modifier : Defaulted + # , returnShellEnv : Defaulted # } -> NixShellAwareDerivation # Given a path to a haskell package directory whose cabal file is # named the same as the directory name, an optional set of @@ -183,11 +184,19 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # function, an optional set of arbitrary overrides, and an optional # haskell package modifier, return a derivation appropriate # for nix-build or nix-shell to build that package. - developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }: - let name = builtins.baseNameOf root; - drv = - (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {}; - in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv; + developPackage = + { root + , source-overrides ? {} + , overrides ? self: super: {} + , modifier ? drv: drv + , returnShellEnv ? pkgs.lib.inNixShell }: + let drv = + (extensible-self.extend + (pkgs.lib.composeExtensions + (self.packageSourceOverrides source-overrides) + overrides)) + .callCabal2nix (builtins.baseNameOf root) root {}; + in if returnShellEnv then (modifier drv).env else modifier drv; ghcWithPackages = selectFrom: withPackages (selectFrom self); diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 562d79b00921..873d71d178bc 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.4"; + version = "2.3.0"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "0y1237m2wilxgrsd0cdjpbf1zj9z954sd8518g53hlmkmk8v27j4"; + sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 470ba291825a..6cf36e44dd1c 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gllvm-${version}"; - version = "1.2.0"; + version = "1.2.1"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is"; + sha256 = "1rbvn7qhzb7xxqv0wrkwxq4sm657vsl6q7nwrfq2zwb21573811z"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 399a8e66860b..8fa7574f3110 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,20 +1,20 @@ { stdenv, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.2.0"; + version = "1.2.1"; pname = "wllvm"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z"; + sha256 = "1yr0gijhgbxx1sl5a8dygr3a8g5wfkh9rk4v789r2aplvcbanv5a"; }; meta = with stdenv.lib; { homepage = https://github.com/travitch/whole-program-llvm; description = "A wrapper script to build whole-program LLVM bitcode files"; license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 dtzWill ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index e06460994150..0ff6f3f041e2 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -6,8 +6,6 @@ buildScript ? null, configureFlags ? "" }: -assert stdenv.cc.cc.isGNU or false; - with import ./util.nix { inherit lib; }; stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { @@ -54,9 +52,14 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] - ++ (with pkgs.xorg; [ - libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext - ]))); + ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ + CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security + ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon + ]) + ++ lib.optionals stdenv.isLinux (with pkgs.xorg; [ + libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext + ]) + ++ [ pkgs.xorg.libX11 ])); # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in @@ -105,7 +108,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 - hardeningDisable = [ "bindnow" ]; + hardeningDisable = [ "bindnow" ] + ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"; passthru = { inherit pkgArches; }; meta = { diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index a786babc79de..d2305aa37ba6 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -20,7 +20,7 @@ in with src; { geckos = [ gecko64 ]; monos = [ mono ]; configureFlags = [ "--enable-win64" ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; wineWow = callPackage ./base.nix { name = "wine-wow-${version}"; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 6e3e444240ac..c5daaabd5be8 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180420"; + version = "0.0.20180514"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m"; + sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 0e53b35e06d0..f482c92ed9f7 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -15,6 +15,15 @@ inputs = [ pkgs.brotli ]; }; + ipscrub = { + src = fetchFromGitHub { + owner = "masonicboom"; + repo = "ipscrub"; + rev = "99230f66d5afe1f929cf4ed217901acb6206f620"; + sha256 = "0mfrwkg4srql38w713pg6qxi0h4hgy8inkvgc9cm80bwlv2ng9s1"; + } + "/ipscrub"; + }; + rtmp ={ src = fetchFromGitHub { owner = "arut"; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 18dbed4d1f30..f79e53b64cf4 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,15 +1,20 @@ { stdenv, buildPerlPackage, fetchurl -, perl, perlPackages }: +, perl, perlPackages, fetchpatch }: buildPerlPackage rec { name = "slimserver-${version}"; - version = "7.9.0"; + version = "7.9.1"; src = fetchurl { url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz"; - sha256 = "07rhqipg7m28x0nqdd83nyzi88dp9cf8rr2pamdyrfcwyp1h1b44"; + sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp"; }; + patches = [ (fetchpatch { + url = "https://github.com/Logitech/slimserver/pull/204.patch"; + sha256 = "0n1c8nsbvqkmwj5ivkcxh1wkqqm1lwymmfz9i47ih6ifj06hkpxk"; + } ) ]; + buildInputs = [ perl perlPackages.AnyEvent diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix new file mode 100644 index 000000000000..f8475ee2e0e0 --- /dev/null +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, dpkg +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: + +let + + version = "1.13.1"; + + rpath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + glib + gnome2.GConf + gnome2.gdk_pixbuf + gnome2.gtk + gnome2.pango + libnotify + libxcb + nspr + nss + stdenv.cc.cc + systemd + + xorg.libxkbfile + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXScrnSaver + ] + ":${stdenv.cc.cc.lib}/lib64"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; + sha256 = "0x23jshnr0rafm5sn2vhq2y2gryg8mksahzyv5fszblgaxay234p"; + } + else + throw "MongoDB compass is not supported on ${stdenv.system}"; + +in stdenv.mkDerivation { + name = "mongodb-compass-${version}"; + + inherit src; + + buildInputs = [ dpkg ]; + unpackPhase = "true"; + + buildCommand = '' + IFS=$'\n' + dpkg -x $src $out + cp -av $out/usr/* $out + rm -rf $out/share/lintian + #The node_modules are bringing in non-linux files/dependencies + find $out -name "*.app" -exec rm -rf {} \; || true + find $out -name "*.dll" -delete + find $out -name "*.exe" -delete + # Otherwise it looks "suspicious" + chmod -R g-w $out + for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do + echo "Manipulating file: $file" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/share/mongodb-compass "$file" || true + done + ''; + + meta = with stdenv.lib; { + description = "The GUI for MongoDB"; + homepage = https://www.mongodb.com/products/compass; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix new file mode 100644 index 000000000000..e5d260ef7d42 --- /dev/null +++ b/pkgs/tools/networking/yrd/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +let + pname = "yrd"; + version = "0.5.3"; + sha256 = "1yx1hr8z4cvlb3yi24dwafs0nxq41k4q477jc9q24w61a0g662ps"; + +in pythonPackages.buildPythonApplication { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = "${pname}"; + rev = "v${version}"; + inherit sha256; + }; + + propagatedBuildInputs = with pythonPackages; [ argh ]; + + meta = with stdenv.lib; { + description = "Cjdns swiss army knife"; + maintainers = with maintainers; [ akru ]; + platforms = platforms.linux; + license = licenses.gpl3; + homepage = https://github.com/kpcyrd/yrd; + }; +} diff --git a/pkgs/tools/package-management/xbps/cert-paths.patch b/pkgs/tools/package-management/xbps/cert-paths.patch new file mode 100644 index 000000000000..569161d9f2e4 --- /dev/null +++ b/pkgs/tools/package-management/xbps/cert-paths.patch @@ -0,0 +1,25 @@ +From d13a550dbc8876c35b912fe3e0eadd45b278be27 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Fri, 18 May 2018 09:51:48 -0500 +Subject: [PATCH] add certificate path fallbacks + +--- + lib/fetch/common.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/fetch/common.c b/lib/fetch/common.c +index 94fb2651..79b50115 100644 +--- a/lib/fetch/common.c ++++ b/lib/fetch/common.c +@@ -1012,6 +1012,8 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose) + + if (getenv("SSL_NO_VERIFY_PEER") == NULL) { + ca_cert_file = getenv("SSL_CA_CERT_FILE"); ++ ca_cert_file = ca_cert_file ? ca_cert_file : getenv("NIX_SSL_CERT_FILE"); ++ ca_cert_file = ca_cert_file ? ca_cert_file : "/etc/ssl/certs/ca-certificates.crt"; + ca_cert_path = getenv("SSL_CA_CERT_PATH") != NULL ? + getenv("SSL_CA_CERT_PATH") : X509_get_default_cert_dir(); + if (verbose) { +-- +2.17.0 + diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix new file mode 100644 index 000000000000..dbcd9dafbef6 --- /dev/null +++ b/pkgs/tools/package-management/xbps/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: + +stdenv.mkDerivation rec { + name = "xbps-${version}"; + version = "0.52"; + + src = fetchFromGitHub { + owner = "voidlinux"; + repo = "xbps"; + rev = version; + sha256 = "1sf6iy9l3dijsczsngzbhksshfm1374g2rrdasc04l6gz35l2cdp"; + }; + + nativeBuildInputs = [ pkgconfig which ]; + + buildInputs = [ zlib openssl libarchive ]; + + patches = [ ./cert-paths.patch ]; + + postPatch = '' + # fix unprefixed ranlib (needed on cross) + substituteInPlace lib/Makefile \ + --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) ' + + # Don't try to install keys to /var/db/xbps, put in $out/share for now + substituteInPlace data/Makefile \ + --replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)' + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/voidlinux/xbps; + description = "The X Binary Package System"; + platforms = platforms.linux; # known to not work on Darwin, at least + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64cdad2282bb..63e9be24226f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1445,6 +1445,8 @@ with pkgs; mcrypt = callPackage ../tools/misc/mcrypt { }; + mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; mozlz4a = callPackage ../tools/compression/mozlz4a { @@ -15781,6 +15783,8 @@ with pkgs; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; + gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; + inherit (ocamlPackages) google-drive-ocamlfuse; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; @@ -21257,6 +21261,8 @@ with pkgs; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xbps = callPackage ../tools/package-management/xbps { }; + xcftools = callPackage ../tools/graphics/xcftools { }; xhyve = callPackage ../applications/virtualization/xhyve { @@ -21468,4 +21474,7 @@ with pkgs; inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) netbsd; + + yrd = callPackage ../tools/networking/yrd { }; + } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index e21445b423d0..519d1cb9ed46 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -36,6 +36,7 @@ let paco = callPackage ../development/coq-modules/paco {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; ssreflect = callPackage ../development/coq-modules/ssreflect { }; + stdpp = callPackage ../development/coq-modules/stdpp { }; tlc = callPackage ../development/coq-modules/tlc {}; }; |