Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-10-15 06:07:54 +00:00 committed by GitHub
commit 4f07e7f326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
135 changed files with 2736 additions and 7819 deletions

View File

@ -117,7 +117,7 @@ in {
ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {};
ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {};
certmgr = handleTest ./certmgr.nix {};
cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {};
charliecloud = handleTest ./charliecloud.nix {};
chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {};
cinnamon = handleTest ./cinnamon.nix {};
@ -147,7 +147,7 @@ in {
corerad = handleTest ./corerad.nix {};
coturn = handleTest ./coturn.nix {};
couchdb = handleTest ./couchdb.nix {};
cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {};
cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
deluge = handleTest ./deluge.nix {};
@ -160,8 +160,8 @@ in {
dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {};
dnsdist = handleTest ./dnsdist.nix {};
doas = handleTest ./doas.nix {};
docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
docker-rootless = handleTestOn ["x86_64-linux"] ./docker-rootless.nix {};
docker = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker.nix {};
docker-rootless = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker-rootless.nix {};
docker-registry = handleTest ./docker-registry.nix {};
docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
@ -253,7 +253,7 @@ in {
herbstluftwm = handleTest ./herbstluftwm.nix {};
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});
invidious = handleTest ./invidious.nix {};
oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
odoo = handleTest ./odoo.nix {};
# 9pnet_virtio used to mount /nix partition doesn't support
# hibernation. This test happens to work on x86_64-linux but
@ -495,9 +495,9 @@ in {
plikd = handleTest ./plikd.nix {};
plotinus = handleTest ./plotinus.nix {};
podgrab = handleTest ./podgrab.nix {};
podman = handleTestOn ["x86_64-linux"] ./podman/default.nix {};
podman-dnsname = handleTestOn ["x86_64-linux"] ./podman/dnsname.nix {};
podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman/tls-ghostunnel.nix {};
podman = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/default.nix {};
podman-dnsname = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/dnsname.nix {};
podman-tls-ghostunnel = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/tls-ghostunnel.nix {};
polaris = handleTest ./polaris.nix {};
pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};
postfix = handleTest ./postfix.nix {};
@ -635,8 +635,7 @@ in {
tmate-ssh-server = handleTest ./tmate-ssh-server.nix { };
tomcat = handleTest ./tomcat.nix {};
tor = handleTest ./tor.nix {};
# traefik test relies on docker-containers
traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
traefik = handleTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix {};
trafficserver = handleTest ./trafficserver.nix {};
transmission = handleTest ./transmission.nix {};
# tracee requires bpf

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config
, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook
, libX11, libXtst, libXfixes, libXcursor
, xorg
}:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 gsettings-desktop-schemas
libX11 libXtst libXfixes libXcursor
xorg.libX11 xorg.libXtst xorg.libXfixes xorg.libXcursor
];
passthru = {

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "wvkbd";
version = "0.10";
version = "0.11";
src = fetchFromGitHub {
owner = "jjsullivan5196";
repo = pname;
rev = "v${version}";
sha256 = "sha256-h/hXHQfLiDkVKYZFsjyq2+w1Pnn3lR6H+r+fXYkP5ZY=";
sha256 = "sha256-rMaJzePtT7K0X9o9/yT1hfKIo07W2CLEZKqHwfCLQBE=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
stdenv.mkDerivation rec {
pname = "carla";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "falkTX";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI=";
sha256 = "sha256-SN+9Q5v0bv+kQcYLBJmSCd9WIGSeQuOZze8LVwF20EA=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, jsoncpp
, taglib
, curl
, curlpp
, glib
, gtk4
, libadwaita
, wrapGAppsHook4
, desktop-file-utils
, chromaprint # fpcalc
}:
stdenv.mkDerivation rec {
pname = "tagger";
version = "2022.10.3";
src = fetchFromGitHub {
owner = "nlogozzo";
repo = "NickvisionTagger";
rev = version;
hash = "sha256-dyp2XzTnDs08tTTbCnjWh061UXnH4Q0Gnt0jofgVm2U=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
glib
gtk4
libadwaita
jsoncpp
taglib
curl
curlpp
];
# Don't install compiled binary
postPatch = ''
sed -i '/fpcalc/d' meson.build
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ chromaprint ]}"
)
'';
meta = with lib; {
description = "An easy-to-use music tag (metadata) editor";
homepage = "https://github.com/nlogozzo/NickvisionTagger";
mainProgram = "org.nickvision.tagger";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ zendo ];
};
}

View File

@ -1,25 +1,35 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
, lmdb, miniupnpc, readline }:
, lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }:
stdenv.mkDerivation rec {
pname = "masari";
version = "0.1.4.0";
version = "unstable-2022-10-09";
src = fetchFromGitHub {
owner = "masari-project";
repo = "masari";
rev = "v${version}";
sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3";
rev = "ff71f52220858b84a4403dab9a14339bcad57826";
sha256 = "sha256-GunNFqZNgpLfyAA9BiBC98axgTQuK76z3BUl5T0iJqs=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
postPatch = ''
# remove vendored libraries
rm -r external/{miniupnpc,rapidjson}
'';
nativeBuildInputs = [ cmake pkg-config git ];
buildInputs = [
boost miniupnpc openssl unbound
zeromq readline libsodium
rapidjson cppzmq
];
meta = with lib; {
description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol";
homepage = "https://www.getmasari.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ matthewcroughan ];
platforms = platforms.linux;
};
}

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
, dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon
, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
stdenv.mkDerivation {
pname = "lightdm-enso-os-greeter";
@ -30,15 +30,15 @@ stdenv.mkDerivation {
pcre
libepoxy
libgee
libX11
xorg.libX11
lightdm
libXdmcp
xorg.libXdmcp
gdk-pixbuf
clutter-gtk
libxklavier
at-spi2-core
libxkbcommon
libpthreadstubs
xorg.libpthreadstubs
librsvg
];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libX11 }:
{ lib, stdenv, fetchFromGitHub, cmake, xorg }:
stdenv.mkDerivation rec {
pname = "maiko";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libX11 ];
buildInputs = [ xorg.libX11 ];
installPhase = ''
runHook preInstall
find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \;
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "https://interlisp.org/";
license = licenses.mit;
maintainers = with maintainers; [ ehmry ];
inherit (libX11.meta) platforms;
inherit (xorg.libX11.meta) platforms;
};
}

View File

@ -4,11 +4,7 @@
, stdenv
, python3
, libGL
, libX11
, libXcursor
, libXi
, libXrandr
, libxcb
, xorg
, libxkbcommon
, AppKit
, IOKit
@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [
libGL
libX11
libXcursor
libXi
libXrandr
libxcb
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libxcb
libxkbcommon
] ++ lib.optionals stdenv.isDarwin [
AppKit

View File

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "501";
version = "502";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
sha256 = "sha256-dmQD3CAAAhE6IOfT38PHUIlHdDFdk6HZ6ZEZmKw7+WM=";
sha256 = "sha256-f3VnPmrRdo4PLQvS5pUafOh6ppq4hiwolz/FVVBNgxI=";
};
nativeBuildInputs = [

View File

@ -6,8 +6,7 @@
, stdenv
, withSixel ? false
, libsixel
, libX11
, libXrandr
, xorg
, AppKit
, withSki ? true
}:
@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optional withSixel libsixel
++ lib.optionals stdenv.isLinux [ libX11 libXrandr ]
++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ])
++ lib.optional stdenv.isDarwin AppKit;
buildNoDefaultFeatures = !withSki;

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "bfcal";
version = "1.0";
version = "1.0.1";
src = fetchFromSourcehut {
owner = "~bitfehler";
repo = "bfcal";
rev = "v${version}";
sha256 = "sha256-2z5ICVEZ55omwcoVWpac/HPwyKF9jDCYO78S9p21VMU=";
sha256 = "sha256-5xyBU+0XUNFUGgvw7U8YE64zncw6SvPmbJhc1LY2u/g=";
};
nativeBuildInputs = [
@ -27,15 +27,11 @@ stdenv.mkDerivation rec {
qtbase
];
postInstall = ''
mkdir -p $out/bin
install bfcal $out/bin
'';
meta = with lib; {
description = "Quickly display a calendar";
homepage = "https://git.sr.ht/~bitfehler/bfcal";
license = licenses.gpl3Plus;
platforms = qtbase.meta.platforms;
maintainers = with maintainers; [ laalsaas ];
};
}

View File

@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "calibre";
version = "6.6.1";
version = "6.7.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
hash = "sha256-jJMHliPTRqiI4Wx5N9qbSryoARcGBisSq6awXIaTk5g=";
hash = "sha256-R1poU9qhqf1DYZJ9tkupJrPR99pn5nTpkS6vkMzrwCg=";
};
# https://sources.debian.org/patches/calibre/${version}+dfsg-1

View File

@ -4,12 +4,8 @@
, stdenv
, pkg-config
, fontconfig
, libXcursor
, libXi
, libXrandr
, libxcb
, xorg
, libGL
, libX11
, openssl
, AppKit
, ApplicationServices
@ -42,10 +38,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [
fontconfig
libXcursor
libXi
libXrandr
libxcb
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libxcb
openssl
] ++ lib.optionals stdenv.isDarwin [
AppKit
@ -64,7 +60,7 @@ rustPlatform.buildRustPackage rec {
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/inlyne \
--add-rpath ${lib.makeLibraryPath [ libGL libX11 ]}
--add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
'';
meta = with lib; {

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kanboard";
version = "1.2.23";
version = "1.2.24";
src = fetchFromGitHub {
owner = "kanboard";
repo = "kanboard";
rev = "v${version}";
sha256 = "sha256-Sr20WAJLKy/vaCw76abq8qoKWZbuVgqjlCTZom/puPU=";
sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc=";
};
dontBuild = true;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rmapi";
version = "0.0.20";
version = "0.0.21";
src = fetchFromGitHub {
owner = "juruen";
repo = "rmapi";
rev = "v${version}";
sha256 = "sha256-khQ4Q2y/MJdz5EpfTSrLBROCX2QP2+3PXRO+x+FaXro=";
sha256 = "sha256-PObuO+Aea2MS1DW3/uOS7GajtFUPolDnPgwxYehGPlA=";
};
vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU=";
vendorSha256 = "sha256-LmKcHV0aq7NDEwaL+u8zXkbKzzdWD8zmnAGw5xShDYo=";
doCheck = false;

View File

@ -1,9 +1,7 @@
{ lib
, fetchFromGitHub
, rustPlatform
, libX11
, libXft
, libXinerama
, xorg
}:
rustPlatform.buildRustPackage rec {
@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec {
# The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch
patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch
'';
meta = with lib; {

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake, ninja, git, pandoc, pkg-config
, libGL, libGLU, libXxf86vm, freeimage
, libGL, libGLU, freeimage
, catch2, fmt, glew, miniz, tinyxml-2, xorg
, qtbase, wrapQtAppsHook
, copyDesktopItems, makeDesktopItem
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ];
buildInputs = [
libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
xorg.libSM
];
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";

View File

@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
};
maintainers = [ ];
platforms = with lib.platforms; linux ++ darwin;
mainProgram = "wn";
};
}

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, curl, db, libgeotiff
, libXpm, libXt, motif, pcre
, xorg, motif, pcre
, perl, proj, rastermagick, shapelib
}:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl db libgeotiff
libXpm libXt motif pcre
xorg.libXpm xorg.libXt motif pcre
perl proj rastermagick shapelib
];

View File

@ -2,7 +2,7 @@
# at https://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg
{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }:
{ lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }:
stdenv.mkDerivation rec {
pname = "xfontsel";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ libX11 libXaw ];
buildInputs = [ xorg.libX11 xorg.libXaw ];
# Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "driftctl";
version = "0.37.0";
version = "0.38.1";
src = fetchFromGitHub {
owner = "snyk";
repo = "driftctl";
rev = "v${version}";
sha256 = "sha256-Abp5JetsMqIXZK8BxNa22OBFCxquoLoy3npv6XxCWGo=";
sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4=";
};
vendorSha256 = "sha256-uWPnBqT6lZSRClw2RyxHEOzue1Azj9VpPaulMA3qlug=";
vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -21,13 +21,13 @@
buildGoModule rec {
pname = "kubernetes";
version = "1.23.12";
version = "1.23.13";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "sha256-PuSjMyve7YxxuVr3ztM6nM86gl3GpcIa+LHajzfXODU=";
sha256 = "sha256-Te31+geLT2hzyDfSGkCoXS0pXC1gbIJmpfC0DNDecAI=";
};
vendorSha256 = null;

View File

@ -16,7 +16,7 @@
buildGoModule rec {
inherit pname ;
version = "1.8.0";
version = "1.8.1";
tags = lib.optionals enableGateway ["gateway"];
vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng=";
@ -24,7 +24,7 @@ buildGoModule rec {
owner = "kumahq";
repo = "kuma";
rev = version;
sha256 = "sha256-5459Fl7AbzuNGIOfDpVYlhvzLzfLT2Ckhr5omxZr76w=";
sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs=";
};
doCheck = false;

View File

@ -479,13 +479,13 @@
"version": "1.29.0"
},
"gridscale": {
"hash": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=",
"hash": "sha256-3JB82wbZ6mosFJZ96rGOnv/f1VFhHk6WEfm2u6sop2E=",
"owner": "gridscale",
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
"repo": "terraform-provider-gridscale",
"rev": "v1.15.0",
"rev": "v1.16.0",
"vendorHash": null,
"version": "1.15.0"
"version": "1.16.0"
},
"hcloud": {
"hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=",
@ -669,13 +669,13 @@
"version": "0.7.0"
},
"linode": {
"hash": "sha256-FtJYpHmXkXBIcxlrUN9hOid3x4wMSk5NI2CFzmwniu4=",
"hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=",
"owner": "linode",
"provider-source-address": "registry.terraform.io/linode/linode",
"repo": "terraform-provider-linode",
"rev": "v1.29.3",
"rev": "v1.29.4",
"vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=",
"version": "1.29.3"
"version": "1.29.4"
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@ -777,13 +777,13 @@
"version": "0.6.12"
},
"newrelic": {
"hash": "sha256-2JYRvlpHqEU5VPVhZlBkMYD88L7vMjELFWDY9eJYkK8=",
"hash": "sha256-Sm5GwfILRCg0/gTNJtrDrWZY+uBXvuTYtrrtTnugP9Q=",
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.4.4",
"vendorHash": "sha256-vtpRDE6tAhJGtYDG65NvtKx/fyt0yBqJTg5s5kXls+8=",
"version": "3.4.4"
"rev": "v3.5.0",
"vendorHash": "sha256-1D66m18oWwuXgBIWstRWvjfy9iGrmO3gyVBucdPps2c=",
"version": "3.5.0"
},
"nomad": {
"hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=",
@ -1012,13 +1012,13 @@
"version": "1.2.1"
},
"selectel": {
"hash": "sha256-27Sdez4coJ4Enc1zTg4lr1SzlW3r6wCjciC5ID8vo0w=",
"hash": "sha256-2PwqVzwl8UIO+334lp9zkwkr2zAdI8S/rO+6iqTLu+I=",
"owner": "selectel",
"provider-source-address": "registry.terraform.io/selectel/selectel",
"repo": "terraform-provider-selectel",
"rev": "v3.8.4",
"vendorHash": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=",
"version": "3.8.4"
"rev": "v3.8.5",
"vendorHash": "sha256-/7YQa84hOrOAGQSW1kVE27aM2253IB4pvA0ASAJe8VQ=",
"version": "3.8.5"
},
"sentry": {
"hash": "sha256-dNyUp+gXrOvMQu5tEnv2dOsXihyd19gdYakIo7+h3pY=",

View File

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "profanity";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = version;
hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY=";
hash = "sha256-A9ZgHliLb4v/3W5tm5zD0WN8mRmxLE/MUSTBXGvBCCM=";
};
patches = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ii";
version = "1.9";
version = "2.0";
src = fetchurl {
url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc=";
sha256 = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls=";
};
makeFlags = [ "CC:=$(CC)" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "2.9.34";
version = "2.9.35";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-oytnWzIsxLOeQvy1iSWysyMQuJ3vTnv7Ot9izOvgPHg=";
sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo=";
};
vendorSha256 = "sha256-1/EnIPUufPwJqH24mqok5ijMenaPUldHBx8dOydECj8=";
vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;

View File

@ -11,7 +11,7 @@
, enableSpellcheck ? true
# Arguments to include external libraries
, enableLibSM ? true, libSM
, enableLibSM ? true, xorg
, enableGnuTLS ? true, gnutls
, enableEnchant ? enableSpellcheck, enchant
, enableDbus ? true, dbus, dbus-glib
@ -76,7 +76,7 @@ let
{ flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; }
{ flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; }
{ flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; }
{ flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; }
{ flags = [ "libsm" ]; enabled = enableLibSM; deps = [ xorg.libSM ]; }
{ flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; }
{ flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; }
{ flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; }

View File

@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp,
pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }:
pkg-config, soapysdr-with-plugins, wxGTK32, enableDigitalLab ? false,
Cocoa, WebKit }:
stdenv.mkDerivation rec {
pname = "cubicsdr";
@ -14,7 +15,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ];
buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ]
++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ]
++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ];
cmakeFlags = [ "-DUSE_HAMLIB=ON" ]
++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
@ -24,6 +27,6 @@ stdenv.mkDerivation rec {
description = "Software Defined Radio application";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lasandell ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "abc-verifier";
version = "2022.07.27";
version = "unstable-2022-09-08";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "abc";
rev = "7cc11f7f0c49d4ce7e0ed88950d1c4c8abb1cba4";
hash = "sha256-6m8XpSYWT0uMpYHXm3ExnH7RMg923YqZAJPTBeFXMzg=";
rev = "ab5b16ede2ff3a4ab5209df24db2c76700899684";
hash = "sha256-G4MnBViwIosFDiPfUimGqf6fq1KJlxj+LozmgoKaH3A=";
};
nativeBuildInputs = [ cmake ];

View File

@ -16,12 +16,7 @@
, fontconfig
, freetype
, libGL
, libX11
, libXcursor
, libXi
, libXrandr
, libXxf86vm
, libxcb
, xorg
, libxkbcommon
, wayland
, xdg-utils
@ -41,12 +36,12 @@ let
fontconfig
freetype
libGL
libX11
libXcursor
libXi
libXrandr
libXxf86vm
libxcb
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libXxf86vm
xorg.libxcb
] ++ lib.optionals stdenv.isLinux [
libxkbcommon
wayland

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-Ic2AsPFdRk3XdTVGbPBByxcHRAGGQfYoQm9GlgmSvA4=";
sha256 = "sha256-YgW0Q1s3V9WvhYQJlAszD7DdEbfggV5w1uMKXhDrn0s=";
};
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";

View File

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv }:
let
version = "1.1.1";
version = "1.1.2";
suffix = {
x86_64-linux = "x86_64";
@ -22,7 +22,7 @@ stdenv.mkDerivation {
sourceRoot = ".";
src = dlbin {
x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c=";
x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8=";
aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc=";
};

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }:
{ lib, stdenv, fetchFromGitHub, xorg }:
stdenv.mkDerivation rec {
pname = "cherry";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
};
nativeBuildInputs = [ fonttosfnt mkfontdir ];
nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontdir ];
buildPhase = ''
patchShebangs make.sh

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }:
{ lib, stdenv, fetchurl, xorg, libfaketime }:
stdenv.mkDerivation rec {
pname = "clearlyU";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
};
nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ];
nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontscale libfaketime ];
buildPhase = ''
# convert bdf fonts to otb

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, libfaketime
, fonttosfnt, mkfontscale
, xorg
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
};
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
buildPhase = ''
faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, unzip
, bdftopcf, mkfontscale, fonttosfnt
, bdftopcf, xorg
}:
stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs =
[ unzip bdftopcf mkfontscale fonttosfnt ];
[ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ];
postPatch = ''
sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, libfaketime
, fonttosfnt, mkfontscale
, xorg
}:
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
};
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
unpackPhase = ''
tar -xzf $src --strip-components=1

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchFromGitHub
, mkfontscale, bdf2psf, bdftopcf
, fonttosfnt, libfaketime
, xorg, bdf2psf, bdftopcf
, libfaketime
}:
stdenv.mkDerivation rec {
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs =
[ mkfontscale bdf2psf bdftopcf
fonttosfnt libfaketime
[ xorg.mkfontscale bdf2psf bdftopcf
xorg.fonttosfnt libfaketime
];
buildPhase = ''

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, mkfontscale }:
{ lib, stdenv, fetchzip, xorg }:
stdenv.mkDerivation {
pname = "profont";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
dontBuild = true;
nativeBuildInputs = [ mkfontscale ];
nativeBuildInputs = [ xorg.mkfontscale ];
installPhase = ''
mkdir -p "$out/share/fonts/misc"

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }:
{ lib, stdenv, fetchFromGitHub, libfaketime, xorg }:
stdenv.mkDerivation rec {
name = "siji-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
};
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
buildPhase = ''
# compress pcf fonts

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, mkfontscale }:
{ lib, fetchurl, xorg }:
let
pname = "spleen";
@ -17,7 +17,7 @@ in fetchurl {
install -m644 fonts.alias-spleen $d/fonts.alias
# create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d"
${xorg.mkfontscale}/bin/mkfontdir "$d"
'';
sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94=";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fontforge, mkfontscale }:
{ lib, stdenv, fetchurl, fontforge, xorg }:
let
version = "1.11";
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp";
};
nativeBuildInputs = [ fontforge mkfontscale ];
nativeBuildInputs = [ fontforge xorg.mkfontscale ];
unpackPhase = ''
tar -xzf $src --strip-components=1

View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, mkfontscale, lib, stdenv }:
{ fetchFromGitHub, xorg, lib, stdenv }:
stdenv.mkDerivation rec {
pname = "tamzen-font";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s";
};
nativeBuildInputs = [ mkfontscale ];
nativeBuildInputs = [ xorg.mkfontscale ];
installPhase = ''
install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python3
, bdftopcf, mkfontscale
, bdftopcf, xorg
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ];
nativeBuildInputs =
[ python3 bdftopcf mkfontscale ];
[ python3 bdftopcf xorg.mkfontscale ];
enableParallelBuilding = true;

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, python3
, bdftopcf, mkfontscale
, libfaketime, fonttosfnt
, bdftopcf, xorg
, libfaketime,
}:
stdenv.mkDerivation rec {
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs =
[ python3 bdftopcf mkfontscale
libfaketime fonttosfnt
[ python3 bdftopcf xorg.mkfontscale
libfaketime xorg.fonttosfnt
];
postPatch = ''

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, bdftopcf
, libfaketime, fonttosfnt, mkfontscale
, libfaketime, xorg
}:
stdenv.mkDerivation {
@ -24,8 +24,8 @@ stdenv.mkDerivation {
sourceRoot = ".";
nativeBuildInputs =
[ bdftopcf libfaketime fonttosfnt
mkfontscale
[ bdftopcf libfaketime xorg.fonttosfnt
xorg.mkfontscale
];
buildPhase = ''

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, perl, kbd, bdftopcf
, libfaketime, fonttosfnt, mkfontscale
, libfaketime, xorg
}:
stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
nativeBuildInputs =
[ bdftopcf libfaketime
fonttosfnt mkfontscale
xorg.fonttosfnt xorg.mkfontscale
] ++ lib.optionals stdenv.isLinux [ perl kbd ];
postPatch = "patchShebangs .";

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, mkfontscale
, libfaketime, fonttosfnt
{ lib, stdenv, fetchurl, xorg
, libfaketime
}:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0=";
};
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
dontUnpack = true;

View File

@ -1,6 +1,5 @@
{ lib, stdenv, fetchurl, perl
, bdftopcf, bdf2psf, mkfontdir
, fonttosfnt
, bdftopcf, bdf2psf, xorg
, targetsDat ? null
, variantsDat ? null
}:
@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
# remove for version >1.3
patches = [ ./determinism.patch ];
nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ];
nativeBuildInputs = [ perl bdftopcf bdf2psf xorg.fonttosfnt xorg.mkfontdir ];
# configure sizes, encodings and variants
preConfigure =

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20220905";
version = "20221004";
src = fetchurl {
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
sha256 = "sha256-+1f6ILeoMO+6a+uL3y95PAbcyr2KXh0yMQfzsUcCg0E=";
sha256 = "sha256-r2m5nfNWg5aGJBRLVZwmgilpgc4epLWY4qx34pRIi6Q=";
};
dontUnpack = true;

View File

@ -72,18 +72,27 @@ let
in stdenv.mkDerivation rec {
pname = "yosys";
version = "0.20";
version = "0.22";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "${pname}-${version}";
hash = "sha256-0oDF6wLcWlDG2hWFjIL+oQmICQl/H6YAwDzgTiuF298=";
hash = "sha256-us4GiulqkzcwD2iuNXB5eTd3iqgUdvj9Nd2p/9TJerQ=";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config bison flex ];
buildInputs = [ tcl readline libffi python3 protobuf zlib ];
buildInputs = [
tcl
readline
libffi
protobuf
zlib
(python3.withPackages (pp: with pp; [
click
]))
];
makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];

View File

@ -167,10 +167,10 @@ in {
sourceVersion = {
major = "3";
minor = "7";
patch = "14";
patch = "15";
suffix = "";
};
sha256 = "sha256-QVeuMeuBrxnoHDaIJhBJGw+49Q4A+ooXsJXIiQi5xFw=";
sha256 = "sha256-WRFHWgesK1PXRuiKBxavbStHNJQZGRNuoNM/ucdblxQ=";
inherit (darwin) configd;
inherit passthruFun;
};
@ -180,10 +180,10 @@ in {
sourceVersion = {
major = "3";
minor = "8";
patch = "14";
patch = "15";
suffix = "";
};
sha256 = "sha256-XXfieCcbqAPpkJpBpPO6ygBhgck62mgqXl/o3EokxfM=";
sha256 = "sha256-URT8eRiipeIOtarGlrMMNvQSxu8ksT9cnrngVpgtlVA=";
inherit (darwin) configd;
inherit passthruFun;
};

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "postgresql-jdbc";
version = "42.2.20";
version = "42.5.0";
src = fetchMavenArtifact {
artifactId = "postgresql";
groupId = "org.postgresql";
sha256 = "0kjilsrz9shymfki48kg1q84la1870ixlh2lnfw347x8mqw2k2vh";
sha256 = "sha256-pNGLWrGuuShaixezZfQk8mhEUinKv45BIRXbYVK33uM=";
inherit version;
};

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmysofa";
version = "1.2.1";
version = "1.3.1";
src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
sha256 = "sha256-SCyeicZ+JkJU1x2X3efOvxUXT2qF2IiUsj+anLg5Lsg=";
sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE=";
};
nativeBuildInputs = [ cmake ];

View File

@ -49,7 +49,7 @@ stdenv.mkDerivation (rec {
'';
meta = with lib; {
homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
homepage = "https://www.oracle.com/database/technologies/related/berkeleydb.html";
description = "Berkeley DB";
license = license;
platforms = platforms.unix;

View File

@ -10,10 +10,7 @@
, gobject-introspection
, grail
, gtk3
, libX11
, libXext
, libXi
, libXtst
, xorg
, pango
, xorgserver
}:
@ -38,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython];
buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver
];
patchPhase = ''

View File

@ -3,8 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, imlib2
, libX11
, libXext
, xorg
, ncurses
, pkg-config
, zlib
@ -32,8 +31,8 @@ stdenv.mkDerivation rec {
zlib
(imlib2.override { inherit x11Support; })
] ++ lib.optionals x11Support [
libX11
libXext
xorg.libX11
xorg.libXext
];
outputs = [ "bin" "dev" "out" "man" ];

View File

@ -2,22 +2,14 @@
stdenv.mkDerivation rec {
pname = "libcdr";
version = "0.1.6";
version = "0.1.7";
src = fetchurl {
url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.xz";
sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
hash = "sha256-VmYknWE0ZrmqHph+pBCcBDZYZuknfYD2zZZj6GuOzdQ=";
};
patches = [
# Fix build with icu 68
# Remove in next release
(fetchpatch {
name = "libcdr-fix-icu-68";
url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894";
sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k";
})
];
strictDeps = true;
buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];

View File

@ -1,6 +1,8 @@
{ fetchurl
{ fetchFromGitLab
, lib
, stdenv
, autoreconfHook
, gtk-doc
, pkg-config
, intltool
, gettext
@ -21,12 +23,26 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "bmwg0HeDOQadWDwNY3WdKX6BfqENDYl+u+ll8W4ujlI=";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libgsf";
rev = "LIBGSF_${lib.replaceStrings ["."] ["_"] version}";
hash = "sha256-6RP2DJWcDQ8dkKtcPxAkRsS7jSvvLoDNZHXiDJwR8Eg=";
};
postPatch = ''
# Fix cross-compilation
substituteInPlace configure.ac \
--replace "AC_PATH_PROG(PKG_CONFIG, pkg-config, no)" \
"PKG_PROG_PKG_CONFIG"
'';
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
gtk-doc
pkg-config
intltool
libintl

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libnats";
version = "3.4.0";
version = "3.4.1";
src = fetchFromGitHub {
owner = "nats-io";
repo = "nats.c";
rev = "v${version}";
sha256 = "sha256-NtZjAXwp1JraoWsB750itKv1b+cfLwbr4XuxgIuZ+8A=";
sha256 = "sha256-Mbmd1bhFnc4feC0bnOa5mD15DxvY4Sgftx3Ep/7Cdp4=";
};
nativeBuildInputs = [ cmake ];

View File

@ -3,6 +3,8 @@
, fetchFromGitHub
, autoreconfHook
, cctools
, autoSignDarwinBinariesHook
, fixDarwinDylibNames
}:
stdenv.mkDerivation rec {
@ -17,7 +19,9 @@ stdenv.mkDerivation rec {
};
configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ];
nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ cctools ];
nativeBuildInputs = [ autoreconfHook ]
++ lib.optionals stdenv.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ];
meta = {
homepage = "https://liquidsdr.org/";

View File

@ -6,7 +6,7 @@
, wxGTK32
, Cocoa
, enableXWin ? false
, libX11
, xorg
}:
stdenv.mkDerivation rec {
@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional enableWX wxGTK32
++ lib.optional (enableWX && stdenv.isDarwin) Cocoa
++ lib.optional enableXWin libX11;
++ lib.optional enableXWin xorg.libX11;
passthru = {
inherit (xorg) libX11;
inherit
enableWX
enableXWin
libX11
;
};

View File

@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "ipopt";
version = "3.14.9";
version = "3.14.10";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Ipopt";
rev = "releases/${version}";
sha256 = "sha256-mlRr1BjkWiJZSgpxQIc0k1tXGewJkHwxf6xe0edUHaY=";
sha256 = "sha256-4SHmqalrGeqp1nBx2BQLRnRWEYw5lJk5Yao67GQw3qM=";
};
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg_4, xcbutilrenderutil, seatd
, libcap, mesa, xorg
, libpng, ffmpeg_4, seatd
, enableXWayland ? true, xwayland ? null
}:
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg_4 xcbutilrenderutil seatd
xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
libpng ffmpeg_4 xorg.xcbutilrenderutil seatd
]
++ lib.optional enableXWayland xwayland
;

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang
,libcap, mesa, xorg
, libpng, ffmpeg_4, seatd, vulkan-loader, glslang
, nixosTests
, enableXWayland ? true, xwayland ? null
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader
xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader
]
++ lib.optional enableXWayland xwayland
;

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.118";
version = "0.6.119";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nUhVHVjhrZm+Y/kIF3D85orm/EECug2xYSpcItYCThU=";
sha256 = "sha256-IYFVju7OcCxdFJKWK6TiXPt4p16oiTuBi51gfpi9tAE=";
};
vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";

View File

@ -1,4 +1,4 @@
{ stdenvNoCC, lndir, newlib, msp430GccSupport }:
{ stdenvNoCC, xorg, newlib, msp430GccSupport }:
stdenvNoCC.mkDerivation {
name = "msp430-${newlib.name}";
@ -10,9 +10,9 @@ stdenvNoCC.mkDerivation {
buildCommand = ''
mkdir $out
${lndir}/bin/lndir -silent $newlib $out
${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
${xorg.lndir}/bin/lndir -silent $newlib $out
${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
'';
passthru = {

View File

@ -120,6 +120,7 @@
, "dockerfile-language-server-nodejs"
, "elasticdump"
, "@electron-forge/cli"
, "eas-cli"
, "elm-oracle"
, "emoj"
, "emojione"

File diff suppressed because it is too large Load Diff

View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "aocd";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "wimglenn";
repo = "advent-of-code-data";
rev = "refs/tags/v${version}";
sha256 = "sha256-3Cs9tiyWXtyeDXf4FK4gXokCZgtxv4Z5jmSv47t04ag=";
sha256 = "sha256-V6byleGCgXc2xfceb+aO0sYwGD6uThE6/8s5NDEjerw=";
};
propagatedBuildInputs = [

View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "cli_helpers";
version = "2.2.1";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-DMwc/Noaxk3H7YPXATBVzxnll50p5Wwh87aS3gFVWq4=";
sha256 = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc=";
};
propagatedBuildInputs = [

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "datasets";
version = "2.5.2";
version = "2.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-C+REl68BZKP3NwkSmBQ/Xs8/sMGNT4bjXa8Jkk/C0Uw=";
hash = "sha256-BYTsIdzKcCxJBQs6s1MkBs6ZnUx1nYjSFGGFDkhTuUg=";
};
postPatch = ''

View File

@ -11,13 +11,13 @@
}:
buildPythonPackage rec {
version = "0.9.6";
version = "0.9.7";
pname = "eyeD3";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "4b5064ec0fb3999294cca0020d4a27ffe4f29149e8292fdf7b2de9b9cabb7518";
sha256 = "sha256-k7GOk5M3akURT5QJ18yhGftvT5o31LaXtQCvSLTFzw8=";
};
# requires special test data:

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "graphql-core";
version = "3.2.1";
version = "3.2.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "graphql-python";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-LLvfjlio0UmTwR2ZRpsoKTJoWHOEk740QE6K+5GNlrk=";
hash = "sha256-LtBbHA5r6/YNh2gKX0+NqQjrpKuMioyOYWT0R59SIL4=";
};
checkInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "huggingface-hub";
version = "0.9.1";
version = "0.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "huggingface_hub";
rev = "refs/tags/v${version}";
hash = "sha256-/FUr66lj0wgmuLcwc84oHKBGzU8jFnBVMOXk7uKUpSk=";
hash = "sha256-iQ8c48lDn9jLZ8GPzJ5b+9OaRRLte/md5UuwxgYtWVo=";
};
propagatedBuildInputs = [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "idasen";
version = "0.9.3";
version = "0.9.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "newAM";
repo = "idasen";
rev = "v${version}";
hash = "sha256-O5EquX2zoSCsPdXRarTcqwt4aTBS6YF8SBq+/Ft3P1A=";
hash = "sha256-GYQj7hiwyrCQDK19tZ7gN/pS1mFDSHgRfz7eCsKise4=";
};
nativeBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jupyterlab";
version = "3.4.7";
version = "3.4.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TcSKsJgOOvLpId/ybgAT3QOxBLG2fw2FtnRI4W4lMR4=";
sha256 = "sha256-H6+4tlcAXZFgPzw639bZ6OrzP9xgFTf+8JKDMy7+Z8s=";
};
nativeBuildInputs = [

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "kazoo";
version = "2.8.0";
version = "2.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "1zpj5cc8624w6i0pxgcxqkjwbkm4pkrv19d7wh5df3jais32g3jq";
sha256 = "sha256-gAMYx/PatkjN9hbfslvavu+rKmg3qmlR4Po/+A5laWk=";
};
propagatedBuildInputs = [ six ];

View File

@ -3,6 +3,7 @@
, fetchPypi
, importlib-metadata
, passlib
, python-dateutil
, pythonOlder
, scramp
, setuptools
@ -10,14 +11,14 @@
buildPythonPackage rec {
pname = "pg8000";
version = "1.29.1";
version = "1.29.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gLT03ksCVIMreUhRHg3UY0LRwERszU/diStj0C5PvHs=";
hash = "sha256-23XCGqCqLm95qVK3GoKaJ17KLi5WUnVpZtpZ192dbyQ=";
};
nativeBuildInputs = [
@ -26,6 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
passlib
python-dateutil
scramp
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.12.55";
version = "8.12.56";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-G+PHNT6TJd3qqQmrF5NkI8YpWNVwDWjl2lvpUDxG0Ic=";
hash = "sha256-gqTyJskw0C3N9tSynkz9hniZH+ZcLv1f3RQ1VxhvCGg=";
};
checkInputs = [

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "PyGithub";
version = "1.55";
version = "1.56";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "PyGithub";
repo = "PyGithub";
rev = "v${version}";
sha256 = "sha256-PuGCBFSbM91NtSzuyf0EQUr3LiuHDq90OwkSf53rSyA=";
rev = "refs/tags/v${version}";
sha256 = "sha256-L6xrv3dAT/sWt/7ZeDy3P095g7Lpht52LkfCVYNLkbA=";
};
propagatedBuildInputs = [

View File

@ -24,13 +24,13 @@
}:
buildPythonPackage rec {
version = "3.5.4";
version = "3.5.5";
pname = "rpy2";
disabled = isPyPy;
src = fetchPypi {
inherit version pname;
sha256 = "sha256-ugqHeyuW4n0gkTg9RlK4KqInHP9KUFJD1F2kMLcSqvU=";
sha256 = "sha256-olLEDiHPTyOsbhO//cuCtZALScMEPtj9MdpcYftY0Dc=";
};
patches = [

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "superqt";
version = "0.3.5";
version = "0.3.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "napari";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-nKNFV/mzdugQ+UJ/qB0SkCSm5vEpvI/tgHYKJr6NEyg=";
sha256 = "sha256-zEMG2zscGDlRxtLn/lUTEjZBPabcwzMcj/kMcy3yOs8=";
};
nativeBuildInputs = [ setuptools-scm ];

View File

@ -1,25 +1,31 @@
{ lib
, appdirs
, buildPythonPackage
, fetchFromGitHub
, multitasking
, numpy
, pandas
, pythonOlder
, requests
, lxml
}:
buildPythonPackage rec {
pname = "yfinance";
version = "0.1.74";
version = "0.1.77";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ranaroussi";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-3YOUdrLCluOuUieBwl15B6WHSXpMoNAjdeNJT3zmTTI=";
hash = "sha256-gg9wX3WWacS5BmbR1wgdicFxhPN5b45KH0+obWmJ65g=";
};
propagatedBuildInputs = [
appdirs
multitasking
numpy
pandas
@ -27,8 +33,12 @@ buildPythonPackage rec {
lxml
];
doCheck = false; # Tests require internet access
pythonImportsCheck = [ "yfinance" ];
# Tests require internet access
doCheck = false;
pythonImportsCheck = [
"yfinance"
];
meta = with lib; {
description = "Yahoo! Finance market data downloader (+faster Pandas Datareader)";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.189.0";
version = "0.190.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "sha256-sV2O5bFzIRm6ZiBwgDz8Y+NA5y44UztIAyvnIzkup/I=";
sha256 = "sha256-/MxV1nbOwqW1SKaKhWFpdg6PuQflmqRgF76/JPuegRg=";
};
makeFlags = [ "FLOW_RELEASE=1" ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.15.10";
version = "0.15.11";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
sha256 = "sha256-QgK1+cUW3ntPnzopYTGrIEzGvsQwzBwwryw5MXHX2+c=";
};
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

View File

@ -1,11 +1,9 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, git, Virtualization, testers, linuxkit }:
buildGoPackage rec {
buildGoModule rec {
pname = "linuxkit";
version = "1.0.0";
goPackagePath = "github.com/linuxkit/linuxkit";
src = fetchFromGitHub {
owner = "linuxkit";
repo = "linuxkit";
@ -13,15 +11,30 @@ buildGoPackage rec {
sha256 = "sha256-y/jsMr7HmrHjVMn4fyQ3MPHION8hQO2G4udX1AMx8bk=";
};
subPackages = [ "src/cmd/linuxkit" ];
vendorSha256 = null;
ldflags = [ "-s" "-w" "-X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev}" "-X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ];
modRoot = "./src/cmd/linuxkit";
buildInputs = lib.optionals stdenv.isDarwin [ Virtualization ];
ldflags = [
"-s"
"-w"
"-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${version}"
];
checkInputs = [ git ];
passthru.tests.version = testers.testVersion {
package = linuxkit;
command = "linuxkit version";
};
meta = with lib; {
description = "A toolkit for building secure, portable and lean operating systems for containers";
license = licenses.asl20;
homepage = "https://github.com/linuxkit/linuxkit";
maintainers = [ maintainers.nicknovitski ];
maintainers = with maintainers; [ nicknovitski ];
platforms = platforms.unix;
};
}

View File

@ -1,10 +1,10 @@
{ lib, fetchurl, makeDesktopItem, appimageTools }:
let
name = "saleae-logic-2";
version = "2.4.0";
version = "2.4.1";
src = fetchurl {
url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
sha256 = "sha256-jvD/DLpcJKAqy9LSSEVZFtD+BMxfbUmdJwfnQMtA7rg=";
sha256 = "sha256-Xx5HSwO+m/DWAZjD6zePvKa6BghZJwtlLoaDIqnH/qg=";
};
desktopItem = makeDesktopItem {
inherit name;

View File

@ -6,11 +6,7 @@
, cmake
, fontconfig
, libGL
, libxcb
, libX11
, libXcursor
, libXi
, libXrandr
, xorg
, libxkbcommon
, wayland
# Darwin Frameworks
@ -24,7 +20,7 @@
}:
let
rpathLibs = [ fontconfig libGL libxcb libX11 libXcursor libXrandr libXi ]
rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ]
++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ];
in
rustPlatform.buildRustPackage rec {
@ -39,7 +35,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4=";
nativeBuildInputs = [ cmake pkg-config fontconfig ];
buildInputs = rpathLibs ++ [ libxcb.dev ]
buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]
++ lib.optionals stdenv.isDarwin [
AppKit
CoreGraphics

View File

@ -23,11 +23,11 @@ let
in buildPythonApplication rec {
pname = "pipenv";
version = "2022.10.9";
version = "2022.10.12";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MuBqtQlX2549Kpn8e+vdRF5zg9lP8rME64sz33FhTmA=";
sha256 = "sha256-pNiPZmfLzZ6kMtYmqLNzzTEBiGufuWTqfn+WUKg/wwc=";
};
LC_ALL = "en_US.UTF-8";

View File

@ -1,675 +0,0 @@
# Generated by carnix 0.10.0: carnix generate-nix
{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
with buildRustCrateHelpers;
let inherit (lib.lists) fold;
inherit (lib.attrsets) recursiveUpdate;
in
rec {
crates = cratesIO;
cargo_download = crates.crates.cargo_download."0.1.2" deps;
__all = [ (cargo_download {}) ];
deps.adler32."1.0.2" = {};
deps.aho_corasick."0.5.3" = {
memchr = "0.1.11";
};
deps.ansi_term."0.9.0" = {};
deps.arrayvec."0.4.8" = {
nodrop = "0.1.13";
};
deps.atty."0.2.3" = {
termion = "1.5.1";
libc = "0.2.44";
kernel32_sys = "0.2.2";
winapi = "0.2.8";
};
deps.base64."0.9.3" = {
byteorder = "1.1.0";
safemem = "0.3.0";
};
deps.bitflags."0.7.0" = {};
deps.bitflags."0.9.1" = {};
deps.bitflags."1.0.4" = {};
deps.byteorder."1.1.0" = {};
deps.bytes."0.4.11" = {
byteorder = "1.1.0";
iovec = "0.1.1";
};
deps.cargo_download."0.1.2" = {
ansi_term = "0.9.0";
clap = "2.27.1";
conv = "0.3.3";
derive_error = "0.0.3";
exitcode = "1.1.2";
flate2 = "0.2.20";
isatty = "0.1.5";
itertools = "0.6.5";
lazy_static = "0.2.10";
log = "0.3.8";
maplit = "0.1.6";
reqwest = "0.9.5";
semver = "0.9.0";
serde_json = "1.0.6";
slog = "1.7.1";
slog_envlogger = "0.5.0";
slog_stdlog = "1.1.0";
slog_stream = "1.2.1";
tar = "0.4.13";
time = "0.1.38";
};
deps.case."0.1.0" = {};
deps.cc."1.0.3" = {};
deps.cfg_if."0.1.2" = {};
deps.chrono."0.2.25" = {
num = "0.1.40";
time = "0.1.38";
};
deps.clap."2.27.1" = {
ansi_term = "0.9.0";
atty = "0.2.3";
bitflags = "0.9.1";
strsim = "0.6.0";
textwrap = "0.9.0";
unicode_width = "0.1.4";
vec_map = "0.8.0";
};
deps.cloudabi."0.0.3" = {
bitflags = "1.0.4";
};
deps.conv."0.3.3" = {
custom_derive = "0.1.7";
};
deps.core_foundation."0.5.1" = {
core_foundation_sys = "0.5.1";
libc = "0.2.44";
};
deps.core_foundation_sys."0.5.1" = {
libc = "0.2.44";
};
deps.crc32fast."1.1.1" = {};
deps.crossbeam."0.2.10" = {};
deps.crossbeam_deque."0.6.2" = {
crossbeam_epoch = "0.6.1";
crossbeam_utils = "0.6.1";
};
deps.crossbeam_epoch."0.6.1" = {
arrayvec = "0.4.8";
cfg_if = "0.1.2";
crossbeam_utils = "0.6.1";
lazy_static = "1.2.0";
memoffset = "0.2.1";
scopeguard = "0.3.3";
};
deps.crossbeam_utils."0.6.1" = {
cfg_if = "0.1.2";
};
deps.custom_derive."0.1.7" = {};
deps.derive_error."0.0.3" = {
case = "0.1.0";
quote = "0.3.15";
syn = "0.11.11";
};
deps.dtoa."0.4.2" = {};
deps.either."1.4.0" = {};
deps.encoding_rs."0.8.13" = {
cfg_if = "0.1.2";
};
deps.exitcode."1.1.2" = {};
deps.filetime."0.1.14" = {
cfg_if = "0.1.2";
redox_syscall = "0.1.31";
libc = "0.2.44";
};
deps.flate2."0.2.20" = {
libc = "0.2.44";
miniz_sys = "0.1.10";
};
deps.fnv."1.0.6" = {};
deps.foreign_types."0.3.2" = {
foreign_types_shared = "0.1.1";
};
deps.foreign_types_shared."0.1.1" = {};
deps.fuchsia_zircon."0.2.1" = {
fuchsia_zircon_sys = "0.2.0";
};
deps.fuchsia_zircon."0.3.3" = {
bitflags = "1.0.4";
fuchsia_zircon_sys = "0.3.3";
};
deps.fuchsia_zircon_sys."0.2.0" = {
bitflags = "0.7.0";
};
deps.fuchsia_zircon_sys."0.3.3" = {};
deps.futures."0.1.25" = {};
deps.futures_cpupool."0.1.7" = {
futures = "0.1.25";
num_cpus = "1.8.0";
};
deps.h2."0.1.13" = {
byteorder = "1.1.0";
bytes = "0.4.11";
fnv = "1.0.6";
futures = "0.1.25";
http = "0.1.14";
indexmap = "1.0.2";
log = "0.4.6";
slab = "0.4.0";
string = "0.1.2";
tokio_io = "0.1.10";
};
deps.http."0.1.14" = {
bytes = "0.4.11";
fnv = "1.0.6";
itoa = "0.4.3";
};
deps.httparse."1.2.3" = {};
deps.hyper."0.12.16" = {
bytes = "0.4.11";
futures = "0.1.25";
futures_cpupool = "0.1.7";
h2 = "0.1.13";
http = "0.1.14";
httparse = "1.2.3";
iovec = "0.1.1";
itoa = "0.4.3";
log = "0.4.6";
net2 = "0.2.33";
time = "0.1.38";
tokio = "0.1.7";
tokio_executor = "0.1.5";
tokio_io = "0.1.10";
tokio_reactor = "0.1.7";
tokio_tcp = "0.1.2";
tokio_threadpool = "0.1.9";
tokio_timer = "0.2.5";
want = "0.0.6";
};
deps.hyper_tls."0.3.1" = {
bytes = "0.4.11";
futures = "0.1.25";
hyper = "0.12.16";
native_tls = "0.2.2";
tokio_io = "0.1.10";
};
deps.idna."0.1.4" = {
matches = "0.1.6";
unicode_bidi = "0.3.4";
unicode_normalization = "0.1.5";
};
deps.indexmap."1.0.2" = {};
deps.iovec."0.1.1" = {
libc = "0.2.44";
winapi = "0.2.8";
};
deps.isatty."0.1.5" = {
libc = "0.2.44";
kernel32_sys = "0.2.2";
winapi = "0.2.8";
};
deps.itertools."0.6.5" = {
either = "1.4.0";
};
deps.itoa."0.3.4" = {};
deps.itoa."0.4.3" = {};
deps.kernel32_sys."0.2.2" = {
winapi = "0.2.8";
winapi_build = "0.1.1";
};
deps.lazy_static."0.2.10" = {};
deps.lazy_static."1.2.0" = {};
deps.lazycell."1.2.0" = {};
deps.libc."0.2.44" = {};
deps.libflate."0.1.19" = {
adler32 = "1.0.2";
byteorder = "1.1.0";
crc32fast = "1.1.1";
};
deps.lock_api."0.1.5" = {
owning_ref = "0.4.0";
scopeguard = "0.3.3";
};
deps.log."0.3.8" = {};
deps.log."0.4.6" = {
cfg_if = "0.1.2";
};
deps.maplit."0.1.6" = {};
deps.matches."0.1.6" = {};
deps.memchr."0.1.11" = {
libc = "0.2.44";
};
deps.memoffset."0.2.1" = {};
deps.mime."0.3.12" = {
unicase = "2.1.0";
};
deps.mime_guess."2.0.0-alpha.6" = {
mime = "0.3.12";
phf = "0.7.21";
unicase = "1.4.2";
phf_codegen = "0.7.21";
};
deps.miniz_sys."0.1.10" = {
libc = "0.2.44";
cc = "1.0.3";
};
deps.mio."0.6.16" = {
iovec = "0.1.1";
lazycell = "1.2.0";
log = "0.4.6";
net2 = "0.2.33";
slab = "0.4.0";
fuchsia_zircon = "0.3.3";
fuchsia_zircon_sys = "0.3.3";
libc = "0.2.44";
kernel32_sys = "0.2.2";
miow = "0.2.1";
winapi = "0.2.8";
};
deps.miow."0.2.1" = {
kernel32_sys = "0.2.2";
net2 = "0.2.33";
winapi = "0.2.8";
ws2_32_sys = "0.2.1";
};
deps.native_tls."0.2.2" = {
lazy_static = "1.2.0";
libc = "0.2.44";
security_framework = "0.2.1";
security_framework_sys = "0.2.1";
tempfile = "3.0.5";
openssl = "0.10.15";
openssl_probe = "0.1.2";
openssl_sys = "0.9.39";
log = "0.4.6";
schannel = "0.1.14";
};
deps.net2."0.2.33" = {
cfg_if = "0.1.2";
libc = "0.2.44";
winapi = "0.3.6";
};
deps.nodrop."0.1.13" = {};
deps.num."0.1.40" = {
num_integer = "0.1.35";
num_iter = "0.1.34";
num_traits = "0.1.40";
};
deps.num_integer."0.1.35" = {
num_traits = "0.1.40";
};
deps.num_iter."0.1.34" = {
num_integer = "0.1.35";
num_traits = "0.1.40";
};
deps.num_traits."0.1.40" = {};
deps.num_cpus."1.8.0" = {
libc = "0.2.44";
};
deps.openssl."0.10.15" = {
bitflags = "1.0.4";
cfg_if = "0.1.2";
foreign_types = "0.3.2";
lazy_static = "1.2.0";
libc = "0.2.44";
openssl_sys = "0.9.39";
};
deps.openssl_probe."0.1.2" = {};
deps.openssl_sys."0.9.39" = {
libc = "0.2.44";
cc = "1.0.3";
pkg_config = "0.3.9";
};
deps.owning_ref."0.4.0" = {
stable_deref_trait = "1.1.1";
};
deps.parking_lot."0.6.4" = {
lock_api = "0.1.5";
parking_lot_core = "0.3.1";
};
deps.parking_lot_core."0.3.1" = {
rand = "0.5.5";
smallvec = "0.6.7";
rustc_version = "0.2.3";
libc = "0.2.44";
winapi = "0.3.6";
};
deps.percent_encoding."1.0.1" = {};
deps.phf."0.7.21" = {
phf_shared = "0.7.21";
};
deps.phf_codegen."0.7.21" = {
phf_generator = "0.7.21";
phf_shared = "0.7.21";
};
deps.phf_generator."0.7.21" = {
phf_shared = "0.7.21";
rand = "0.3.18";
};
deps.phf_shared."0.7.21" = {
siphasher = "0.2.2";
unicase = "1.4.2";
};
deps.pkg_config."0.3.9" = {};
deps.quote."0.3.15" = {};
deps.rand."0.3.18" = {
libc = "0.2.44";
fuchsia_zircon = "0.2.1";
};
deps.rand."0.5.5" = {
rand_core = "0.2.2";
cloudabi = "0.0.3";
fuchsia_zircon = "0.3.3";
libc = "0.2.44";
winapi = "0.3.6";
};
deps.rand."0.6.1" = {
rand_chacha = "0.1.0";
rand_core = "0.3.0";
rand_hc = "0.1.0";
rand_isaac = "0.1.1";
rand_pcg = "0.1.1";
rand_xorshift = "0.1.0";
rustc_version = "0.2.3";
cloudabi = "0.0.3";
fuchsia_zircon = "0.3.3";
libc = "0.2.44";
winapi = "0.3.6";
};
deps.rand_chacha."0.1.0" = {
rand_core = "0.3.0";
rustc_version = "0.2.3";
};
deps.rand_core."0.2.2" = {
rand_core = "0.3.0";
};
deps.rand_core."0.3.0" = {};
deps.rand_hc."0.1.0" = {
rand_core = "0.3.0";
};
deps.rand_isaac."0.1.1" = {
rand_core = "0.3.0";
};
deps.rand_pcg."0.1.1" = {
rand_core = "0.3.0";
rustc_version = "0.2.3";
};
deps.rand_xorshift."0.1.0" = {
rand_core = "0.3.0";
};
deps.redox_syscall."0.1.31" = {};
deps.redox_termios."0.1.1" = {
redox_syscall = "0.1.31";
};
deps.regex."0.1.80" = {
aho_corasick = "0.5.3";
memchr = "0.1.11";
regex_syntax = "0.3.9";
thread_local = "0.2.7";
utf8_ranges = "0.1.3";
};
deps.regex_syntax."0.3.9" = {};
deps.remove_dir_all."0.5.1" = {
winapi = "0.3.6";
};
deps.reqwest."0.9.5" = {
base64 = "0.9.3";
bytes = "0.4.11";
encoding_rs = "0.8.13";
futures = "0.1.25";
http = "0.1.14";
hyper = "0.12.16";
hyper_tls = "0.3.1";
libflate = "0.1.19";
log = "0.4.6";
mime = "0.3.12";
mime_guess = "2.0.0-alpha.6";
native_tls = "0.2.2";
serde = "1.0.21";
serde_json = "1.0.6";
serde_urlencoded = "0.5.1";
tokio = "0.1.7";
tokio_io = "0.1.10";
url = "1.6.1";
uuid = "0.7.1";
};
deps.rustc_version."0.2.3" = {
semver = "0.9.0";
};
deps.safemem."0.3.0" = {};
deps.schannel."0.1.14" = {
lazy_static = "1.2.0";
winapi = "0.3.6";
};
deps.scopeguard."0.3.3" = {};
deps.security_framework."0.2.1" = {
core_foundation = "0.5.1";
core_foundation_sys = "0.5.1";
libc = "0.2.44";
security_framework_sys = "0.2.1";
};
deps.security_framework_sys."0.2.1" = {
core_foundation_sys = "0.5.1";
libc = "0.2.44";
};
deps.semver."0.9.0" = {
semver_parser = "0.7.0";
};
deps.semver_parser."0.7.0" = {};
deps.serde."1.0.21" = {};
deps.serde_json."1.0.6" = {
dtoa = "0.4.2";
itoa = "0.3.4";
num_traits = "0.1.40";
serde = "1.0.21";
};
deps.serde_urlencoded."0.5.1" = {
dtoa = "0.4.2";
itoa = "0.3.4";
serde = "1.0.21";
url = "1.6.1";
};
deps.siphasher."0.2.2" = {};
deps.slab."0.4.0" = {};
deps.slog."1.7.1" = {};
deps.slog_envlogger."0.5.0" = {
log = "0.3.8";
regex = "0.1.80";
slog = "1.7.1";
slog_stdlog = "1.1.0";
slog_term = "1.5.0";
};
deps.slog_extra."0.1.2" = {
slog = "1.7.1";
thread_local = "0.3.4";
};
deps.slog_stdlog."1.1.0" = {
crossbeam = "0.2.10";
lazy_static = "0.2.10";
log = "0.3.8";
slog = "1.7.1";
slog_term = "1.5.0";
};
deps.slog_stream."1.2.1" = {
slog = "1.7.1";
slog_extra = "0.1.2";
thread_local = "0.3.4";
};
deps.slog_term."1.5.0" = {
chrono = "0.2.25";
isatty = "0.1.5";
slog = "1.7.1";
slog_stream = "1.2.1";
thread_local = "0.3.4";
};
deps.smallvec."0.6.7" = {
unreachable = "1.0.0";
};
deps.stable_deref_trait."1.1.1" = {};
deps.string."0.1.2" = {};
deps.strsim."0.6.0" = {};
deps.syn."0.11.11" = {
quote = "0.3.15";
synom = "0.11.3";
unicode_xid = "0.0.4";
};
deps.synom."0.11.3" = {
unicode_xid = "0.0.4";
};
deps.tar."0.4.13" = {
filetime = "0.1.14";
libc = "0.2.44";
xattr = "0.1.11";
};
deps.tempfile."3.0.5" = {
cfg_if = "0.1.2";
rand = "0.6.1";
remove_dir_all = "0.5.1";
redox_syscall = "0.1.31";
libc = "0.2.44";
winapi = "0.3.6";
};
deps.termion."1.5.1" = {
libc = "0.2.44";
redox_syscall = "0.1.31";
redox_termios = "0.1.1";
};
deps.textwrap."0.9.0" = {
unicode_width = "0.1.4";
};
deps.thread_id."2.0.0" = {
kernel32_sys = "0.2.2";
libc = "0.2.44";
};
deps.thread_local."0.2.7" = {
thread_id = "2.0.0";
};
deps.thread_local."0.3.4" = {
lazy_static = "0.2.10";
unreachable = "1.0.0";
};
deps.time."0.1.38" = {
libc = "0.2.44";
redox_syscall = "0.1.31";
kernel32_sys = "0.2.2";
winapi = "0.2.8";
};
deps.tokio."0.1.7" = {
futures = "0.1.25";
mio = "0.6.16";
tokio_executor = "0.1.5";
tokio_fs = "0.1.4";
tokio_io = "0.1.10";
tokio_reactor = "0.1.7";
tokio_tcp = "0.1.2";
tokio_threadpool = "0.1.9";
tokio_timer = "0.2.5";
tokio_udp = "0.1.3";
};
deps.tokio_codec."0.1.1" = {
bytes = "0.4.11";
futures = "0.1.25";
tokio_io = "0.1.10";
};
deps.tokio_executor."0.1.5" = {
futures = "0.1.25";
};
deps.tokio_fs."0.1.4" = {
futures = "0.1.25";
tokio_io = "0.1.10";
tokio_threadpool = "0.1.9";
};
deps.tokio_io."0.1.10" = {
bytes = "0.4.11";
futures = "0.1.25";
log = "0.4.6";
};
deps.tokio_reactor."0.1.7" = {
crossbeam_utils = "0.6.1";
futures = "0.1.25";
lazy_static = "1.2.0";
log = "0.4.6";
mio = "0.6.16";
num_cpus = "1.8.0";
parking_lot = "0.6.4";
slab = "0.4.0";
tokio_executor = "0.1.5";
tokio_io = "0.1.10";
};
deps.tokio_tcp."0.1.2" = {
bytes = "0.4.11";
futures = "0.1.25";
iovec = "0.1.1";
mio = "0.6.16";
tokio_io = "0.1.10";
tokio_reactor = "0.1.7";
};
deps.tokio_threadpool."0.1.9" = {
crossbeam_deque = "0.6.2";
crossbeam_utils = "0.6.1";
futures = "0.1.25";
log = "0.4.6";
num_cpus = "1.8.0";
rand = "0.6.1";
tokio_executor = "0.1.5";
};
deps.tokio_timer."0.2.5" = {
futures = "0.1.25";
tokio_executor = "0.1.5";
};
deps.tokio_udp."0.1.3" = {
bytes = "0.4.11";
futures = "0.1.25";
log = "0.4.6";
mio = "0.6.16";
tokio_codec = "0.1.1";
tokio_io = "0.1.10";
tokio_reactor = "0.1.7";
};
deps.try_lock."0.2.2" = {};
deps.unicase."1.4.2" = {
version_check = "0.1.3";
};
deps.unicase."2.1.0" = {
version_check = "0.1.3";
};
deps.unicode_bidi."0.3.4" = {
matches = "0.1.6";
};
deps.unicode_normalization."0.1.5" = {};
deps.unicode_width."0.1.4" = {};
deps.unicode_xid."0.0.4" = {};
deps.unreachable."1.0.0" = {
void = "1.0.2";
};
deps.url."1.6.1" = {
idna = "0.1.4";
matches = "0.1.6";
percent_encoding = "1.0.1";
};
deps.utf8_ranges."0.1.3" = {};
deps.uuid."0.7.1" = {
rand = "0.5.5";
};
deps.vcpkg."0.2.2" = {};
deps.vec_map."0.8.0" = {};
deps.version_check."0.1.3" = {};
deps.void."1.0.2" = {};
deps.want."0.0.6" = {
futures = "0.1.25";
log = "0.4.6";
try_lock = "0.2.2";
};
deps.winapi."0.2.8" = {};
deps.winapi."0.3.6" = {
winapi_i686_pc_windows_gnu = "0.4.0";
winapi_x86_64_pc_windows_gnu = "0.4.0";
};
deps.winapi_build."0.1.1" = {};
deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
deps.ws2_32_sys."0.2.1" = {
winapi = "0.2.8";
winapi_build = "0.1.1";
};
deps.xattr."0.1.11" = {
libc = "0.2.44";
};
}

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +0,0 @@
{ stdenv, lib, fetchgit, darwin, buildPlatform
, buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }:
((import ./Cargo.nix {
inherit lib buildPlatform buildRustCrate buildRustCrateHelpers fetchgit;
cratesIO = import ./crates-io.nix { inherit lib buildRustCrate buildRustCrateHelpers; };
}).cargo_download {}).override {
crateOverrides = defaultCrateOverrides // {
cargo-download = attrs: {
buildInputs = lib.optional stdenv.isDarwin
darwin.apple_sdk.frameworks.Security;
};
};
}

Some files were not shown because too many files have changed in this diff Show More