diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index 8208c85bfd70..fbfcc33b2dce 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -9,6 +9,8 @@ let
RAILS_ENV = "production";
NODE_ENV = "production";
+ LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
+
# mastodon-web concurrency.
WEB_CONCURRENCY = toString cfg.webProcesses;
MAX_THREADS = toString cfg.webThreads;
@@ -121,7 +123,7 @@ in {
Make sure that websockets are forwarded properly. You might want to set up caching
of some requests. Take a look at mastodon's provided nginx configuration at
- https://github.com/tootsuite/mastodon/blob/master/dist/nginx.conf.
+ https://github.com/mastodon/mastodon/blob/master/dist/nginx.conf.
'';
type = lib.types.bool;
default = false;
diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix
index 91f7175e391a..f894c856c751 100644
--- a/pkgs/applications/audio/industrializer/default.nix
+++ b/pkgs/applications/audio/industrializer/default.nix
@@ -20,13 +20,11 @@ stdenv.mkDerivation rec {
sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
alsa-lib
audiofile
- autoconf
- automake
gnome2.gtkglext
gtk2
libjack2
diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index 67c7cd18be8e..13944c8a01b2 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp";
};
- buildInputs = [ autoconf automake puredata ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ puredata ];
preBuild = ''
export LD=$CXX
diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix
index 623714e706fb..042e6b430756 100644
--- a/pkgs/applications/audio/timemachine/default.nix
+++ b/pkgs/applications/audio/timemachine/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake gtk2 libjack2
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ gtk2 libjack2
libsndfile
];
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index 0802a79df04a..61d49d110a9e 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
};
- buildInputs = [ alsa-lib autoconf automake dssi gtk2 libjack2 ladspaH
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH
ladspaPlugins liblo pkg-config ];
installPhase = ''
diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix
index 250379ee7109..a77924bb1f05 100644
--- a/pkgs/applications/blockchains/cgminer/default.nix
+++ b/pkgs/applications/blockchains/cgminer/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ libtool curl ncurses ocl-icd opencl-headers
xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ];
configureScript = "./autogen.sh";
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index c769ab426312..f310fb85a26c 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
};
- buildInputs = [ wxGTK autoconf automake libtool python2 gettext ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ wxGTK libtool python2 gettext ];
preConfigure = "patchShebangs .";
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 7068954baac8..c751f4c28026 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf gtk3 ];
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ gtk3 ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 484b9d3b4073..dffbd2079aea 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk2 libXft intltool automake autoconf libtool ];
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ gtk2 libXft intltool libtool ];
preConfigure = ''
./autogen.sh
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index dd542f9ffac6..aade6c549f31 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,84 +1,68 @@
-{ lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux
-, coreutils, libkrb5, ncurses, clang, installShellFiles
-, components ? [
- "cmd/oc"
- "cmd/openshift"
- ]
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, libkrb5
+, git
+, installShellFiles
+, testVersion
+, openshift
}:
-with lib;
-
-let
- version = "4.1.0";
- ver = lib.elemAt (lib.splitVersion version);
- versionMajor = ver 0;
- versionMinor = ver 1;
- versionPatch = ver 2;
- gitCommit = "b4261e0";
- # version is in vendor/k8s.io/kubernetes/pkg/version/base.go
- k8sversion = "v1.11.1";
- k8sgitcommit = "b1b2997";
- k8sgitMajor = "0";
- k8sgitMinor = "1";
-in buildGoPackage rec {
- pname = "openshift-origin";
- inherit version;
+buildGoModule rec {
+ pname = "openshift";
+ version = "4.10.0";
+ gitCommit = "346b183";
src = fetchFromGitHub {
owner = "openshift";
- repo = "origin";
- rev = "v${version}";
- sha256 = "16bc6ljm418kxz92gz8ldm82491mvlqamrvigyr6ff72rf7ml7ba";
+ repo = "oc";
+ rev = "release-4.10";
+ sha256 = "Pdq3OwT5P7vvB70X+GVglT9CdJbhkm35nvEGurO1HPc=";
};
- goPackagePath = "github.com/openshift/origin";
+ vendorSha256 = null;
buildInputs = [ libkrb5 ];
- nativeBuildInputs = [
- clang
- go-bindata
- installShellFiles
- ncurses
- rsync
- which
- ];
+ nativeBuildInputs = [ installShellFiles ];
patchPhase = ''
patchShebangs ./hack
'';
buildPhase = ''
- cd go/src/${goPackagePath}
# Openshift build require this variables to be set
# unless there is a .git folder which is not the case with fetchFromGitHub
- echo "OS_GIT_VERSION=v${version}" >> os-version-defs
- echo "OS_GIT_TREE_STATE=clean" >> os-version-defs
- echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs
- echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs
- echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs
- echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs
- echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs
- echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs
- echo "KUBE_GIT_MAJOR=${k8sgitMajor}" >> os-version-defs
- echo "KUBE_GIT_MINOR=${k8sgitMinor}" >> os-version-defs
- export OS_VERSION_FILE="os-version-defs"
- export CC=clang
- make all WHAT='${concatStringsSep " " components}'
+ export SOURCE_GIT_COMMIT=${gitCommit}
+ export SOURCE_GIT_TAG=v${version}
+ export SOURCE_GIT_TREE_STATE=clean
+
+ make all
'';
installPhase = ''
mkdir -p $out/bin
- cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
+ cp oc $out/bin
+
+ mkdir -p man
+ ./genman man oc
+ installManPage man/*.1
+
installShellCompletion --bash contrib/completions/bash/*
installShellCompletion --zsh contrib/completions/zsh/*
'';
+ passthru.tests.version = testVersion {
+ package = openshift;
+ command = "oc version";
+ version = "v${version}";
+ };
+
meta = with lib; {
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20;
homepage = "http://www.openshift.org";
- maintainers = with maintainers; [offline bachp moretea];
+ maintainers = with maintainers; [ offline bachp moretea stehessel ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index 14464247659c..00b970cd6871 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ bitlbee autoconf automake libtool libgcrypt ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ bitlbee libtool libgcrypt ];
preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index a7b57aa31028..c144b4bf5853 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w";
};
- buildInputs = [ bison flex autoconf automake openssl ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ bison flex openssl ];
# includes an important security patch
patches = [
diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix
index a3ee4e4ab9c7..c275f904660b 100644
--- a/pkgs/applications/networking/irc/irssi/fish/default.nix
+++ b/pkgs/applications/networking/irc/irssi/fish/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
cp src/.libs/libfish.so $out/lib/irssi/modules
'';
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gmp automake autoconf libtool openssl glib ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ gmp libtool openssl glib ];
meta = {
homepage = "https://github.com/falsovsky/FiSH-irssi";
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
index c357e78ccf29..785fa6886a86 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
pname = "owamp";
version = "3.5.6";
- buildInputs = [ autoconf automake mandoc ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ mandoc ];
src = fetchFromGitHub {
owner = "perfsonar";
repo = "owamp";
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index c8e3c4ce7b91..979ac955caf3 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -38,9 +38,9 @@ in stdenv.mkDerivation rec {
"--with-boost-libdir=${boostPython.out}/lib"
];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config automake autoconf ];
buildInputs = [
- autoconf automake libtool python2
+ libtool python2
boostPython db openssl geoip miniupnpc libiconv
];
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index b6d0d373f35b..d7b1984b0d73 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz";
sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ clutter clutter-gst gdk-pixbuf
cairo clutter-gtk ];
meta = with lib; {
diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix
index bcf47e6b6a3d..2da7f627cb40 100644
--- a/pkgs/applications/science/biology/kssd/default.nix
+++ b/pkgs/applications/science/biology/kssd/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY=";
};
- buildInputs = [ zlib automake autoconf libtool ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ zlib libtool ];
installPhase = ''
install -vD kssd $out/bin/kssd
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index 94a8f081f69a..a16d5f32e27a 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ gettext libtool automake autoconf cairo gtk2 ];
+ nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
+ buildInputs = [ gettext libtool cairo gtk2 ];
configureFlags = ["--disable-update-desktop-database"];
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
index 7ad040a7c17e..0ba747d72350 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
rev = "531bb33";
sha256 = "1sv7s2ykc840cjwbfn7ayy743643x9i1lvk4cd55w9l052xvzj65";
};
- buildInputs = [ autoconf automake libtool gmp ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool gmp ];
preConfigure = "./autogen.sh";
meta = {
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 86474da9ee61..95909e36d0c0 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -2,6 +2,7 @@
, stdenv
, bash-completion
, fetchurl
+, fetchpatch
, gdbm ? null
, glib
, gsettings-desktop-schemas
@@ -43,6 +44,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117
+ (fetchpatch {
+ url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/ed19e51407bee53988878a6ebed4e7279d00b1a1.patch";
+ sha256 = "sha256-3AbnkbhWOh0aNjUkmVoSV/9jFQtvTllOr7plnkntb2o=";
+ })
+ ];
+
nativeBuildInputs = [
glib
intltool
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix
index 9ac49167f66b..a1bdef2639a8 100644
--- a/pkgs/data/misc/ddccontrol-db/default.nix
+++ b/pkgs/data/misc/ddccontrol-db/default.nix
@@ -21,10 +21,9 @@ stdenv.mkDerivation rec {
./autogen.sh
'';
+ nativeBuildInputs = [ autoconf automake ];
buildInputs =
[
- autoconf
- automake
libtool
intltool
];
diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index ace8a3d2de39..11a2904f6086 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc=";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ gmp which flex bison autoconf automake libtool jdk perl ];
+ nativeBuildInputs = [ makeWrapper autoconf automake ];
+ buildInputs = [ gmp which flex bison libtool jdk perl ];
preConfigure = ''
cd aldor ;
diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index 55a35176e7bb..c7dc561e7b6c 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -16,9 +16,10 @@ stdenv.mkDerivation {
sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355";
};
+ nativeBuildInputs = [ autoconf automake ];
buildInputs = [
stdenv gcc glibc
- libtool gnumake autoconf automake
+ libtool gnumake
file which zsh m4 gtk2 zlib gmp
gnome2.libgnomecanvas pango sqlite
libxml2 pkg-config perl smlnj
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index 9af1eccc7935..513e4ec3eec6 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -25,10 +25,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=";
};
+ nativeBuildInputs = [ autoconf automake ];
buildInputs = [
libtool
- autoconf
- automake
makeWrapper
];
propagatedBuildInputs = [
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 20a33307bf3c..0d731e38d839 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s=";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ mono dotnetbuildhelpers autoconf automake which ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ mono dotnetbuildhelpers which ];
configurePhase = ''
sed -i '988d' src/FSharpSource.targets
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix
index ea1af60993f9..320cbdc41b0f 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -51,7 +51,8 @@ clangStdenv.mkDerivation rec {
and run this installation again.
'';
};
- buildInputs = [ git xz gnutar openssl automake autoconf libtool clang ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ git xz gnutar openssl libtool clang ];
alt_wrapper = ./alt_wrapper.c;
builder = ./9.2_builder.sh;
meta = {
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index e48bbc90d61f..030c30b96a5a 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
};
+ nativeBuildInputs = [ autoconf automake ];
buildInputs = [
- autoconf automake readline libX11 SDL2 bluez
+ readline libX11 SDL2 bluez
];
preConfigure = "cd src;autoconf";
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 2719008bbd9e..5e97e4f003e2 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
- libvorbis libogg libtheora autoconf which libtool automake
+ libvorbis libogg libtheora which libtool
];
preConfigure = "$shell ./platform/unix/automagic";
diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix
index 83095ac0924e..bb8f88379fad 100644
--- a/pkgs/development/interpreters/love/11.nix
+++ b/pkgs/development/interpreters/love/11.nix
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
sha256 = "0kpdp6v8m8j0r7ppyy067shr0lfgrlh0dwb7ccws76d389vizwhb";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
- libvorbis libogg libtheora autoconf which libtool automake
+ libvorbis libogg libtheora which libtool
];
preConfigure = "$shell ./platform/unix/automagic";
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index ca7ea10afffa..4f7891910a7d 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j";
};
+ nativeBuildInputs = [ autoconf automake ];
buildInputs =
[ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM
- libsamplerate libtool autoconf automake xorgproto libICE pkg-config
+ libsamplerate libtool xorgproto libICE pkg-config
];
meta = with lib; {
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
index 9c7f4893cbe4..e4a169ef8ba9 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-2LyBdJR0dV1CElcGfrlmNwX52lVtx9X/Z4h/1XFjOIs=";
};
- buildInputs = [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool ];
preConfigure = ''
sh autogen.sh
diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix
index a9b6325c3d71..7ca154f18e06 100644
--- a/pkgs/development/libraries/givaro/3.7.nix
+++ b/pkgs/development/libraries/givaro/3.7.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
url = "https://forge.imag.fr/frs/download.php/370/givaro-${version}.tar.gz";
sha256 = "0lf5cnbyr27fw7klc3zabkb1979dn67jmrjz6pa3jzw2ng74x9b3";
};
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [autoconf automake libtool gmpxx];
+ nativeBuildInputs = [ autoreconfHook autoconf automake ];
+ buildInputs = [libtool gmpxx];
meta = {
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix
index 1bfe7682ffa7..f52f23d15c12 100644
--- a/pkgs/development/libraries/givaro/3.nix
+++ b/pkgs/development/libraries/givaro/3.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
url = "https://forge.imag.fr/frs/download.php/592/givaro-${version}.tar.gz";
sha256 = "1822ksv8653a84hvcz0vxl3nk8dqz7d41ys8rplq0zjjmvb2i5yq";
};
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [autoconf automake libtool gmpxx];
+ nativeBuildInputs = [ autoreconfHook autoconf automake ];
+ buildInputs = [libtool gmpxx];
meta = {
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 83f7854a73b0..5f9f49f239d9 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [autoconf automake libtool];
+ nativeBuildInputs = [ autoreconfHook autoconf automake ];
+ buildInputs = [libtool];
propagatedBuildInputs = [ gmpxx ];
configureFlags = [
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix
index debf3eb59264..5992868c7343 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake glib libtool ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ glib libtool ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix
index 91053828b586..0948b5d01fac 100644
--- a/pkgs/development/libraries/gumbo/default.nix
+++ b/pkgs/development/libraries/gumbo/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1";
};
- buildInputs = [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 95eb0ce4de0a..ee1b4fb8ce8a 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -15,9 +15,9 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
- autoconf automake libtool gnome.gnome-common gtk-doc gtk2
+ libtool gnome.gnome-common gtk-doc gtk2
python pygtk lua gobject-introspection
];
diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index 8ffd42ad0335..50167f28a9db 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "frog-v${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ bzip2 libtar libtool autoconf-archive
libxml2 icu
languageMachines.ticcutils
languageMachines.timbl
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
index 7e3475e64504..5b1b07e79277 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "frogdata-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf libtool autoconf-archive
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ libtool autoconf-archive
];
preConfigure = ''
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix
index 76a2e378d5c7..6cc5bcade205 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "libfolia-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
preConfigure = "sh bootstrap.sh";
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix
index d47bdf34a08f..9556c1d56701 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/pkgs/development/libraries/languagemachines/mbt.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "mbt-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ bzip2 libtar libtool autoconf-archive
libxml2
languageMachines.ticcutils
languageMachines.timbl
diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix
index b536c3168f7c..0b5fef292fcf 100644
--- a/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/pkgs/development/libraries/languagemachines/ticcutils.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "ticcutils-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf libtool autoconf-archive libxml2
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ libtool autoconf-archive libxml2
# optional:
zlib bzip2 libtar
# broken but optional: boost
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix
index 43115eac8fac..1585798170b3 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/pkgs/development/libraries/languagemachines/timbl.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "timbl-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ bzip2 libtar libtool autoconf-archive
libxml2
languageMachines.ticcutils
];
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix
index afa1c122287f..ea40d017d471 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "timblserver-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ bzip2 libtar libtool autoconf-archive
libxml2
languageMachines.ticcutils
languageMachines.timbl
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix
index 252e1e85fbed..f707d9fb8b6e 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/development/libraries/languagemachines/ucto.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "ucto-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf bzip2 libtool autoconf-archive
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ bzip2 libtool autoconf-archive
icu libtar libxml2
languageMachines.ticcutils
languageMachines.libfolia
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
index baf851456d58..a274b6193edd 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
version = release.version;
src = fetchurl { inherit (release) url sha256;
name = "uctodata-${release.version}.tar.gz"; };
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf libtool autoconf-archive ];
+ nativeBuildInputs = [ pkg-config automake autoconf ];
+ buildInputs = [ libtool autoconf-archive ];
preConfigure = "sh bootstrap.sh";
meta = with lib; {
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index e5503169fd5f..30c147775534 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
+ nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ];
+ buildInputs = [ glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
configurePhase = ''
./configure --with-pkg-config=$PKG_CONFIG_PATH \
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index 8761ac1e5ef8..e9f117577e49 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
patches = [];
- buildInputs = [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool ];
preConfigure = ''
sh autogen.sh
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index 73277d30de3c..5b68a6526f1d 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ=";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ automake autoconf libtool m4 sqlite ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ libtool m4 sqlite ];
configureScript = "./autogen.sh";
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
index 22543972c1e6..029bec5630bf 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-libpcap=yes" ];
- buildInputs = [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool ];
propagatedBuildInputs = [ libpcap ];
diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix
index 6455bf03b5ae..717d565ef835 100644
--- a/pkgs/development/libraries/libdnet/default.nix
+++ b/pkgs/development/libraries/libdnet/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "09mhbr8x66ykhf5581a5zjpplpjxibqzgkkpx689kybwg0wk1cw3";
};
- buildInputs = [ automake autoconf libtool ];
+ nativeBuildInputs = [ automake autoconf ];
+ buildInputs = [ libtool ];
# .so endings are missing (quick and dirty fix)
postInstall = ''
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
index 683c21095e6b..be4cdd62f6e1 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
configureScript = "sh autogen.sh";
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config automake autoconf ];
buildInputs = [
- automake autoconf libtool
+ libtool
intltool
gobject-introspection glib
gtk2 gtk-doc clutter clutter-gtk
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix
index 697616f01f30..d40b5b6b0492 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/pkgs/development/libraries/libstroke/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d";
};
- buildInputs = [ automake autoconf xlibsWrapper ];
+ nativeBuildInputs = [ automake autoconf ];
+ buildInputs = [ xlibsWrapper ];
# libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
# Also, modern automake doesn't like things and returns error code 63. But it generates the file.
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index bbcefa0a4433..1d726ed7b192 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g";
};
- nativeBuildInputs = [ pkg-config makeWrapper ];
- buildInputs = [ autoconf automake libtool glib readline ];
+ nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ];
+ buildInputs = [ glib readline ];
preConfigure = ''
substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS"
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index f296f59d408b..92796b4116c4 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -21,9 +21,8 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
+ nativeBuildInputs = [ autoconf automake ];
buildInputs = [
- autoconf
- automake
gnum4
gperf
libtool
diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix
index 06ae856296f0..20f38aef3634 100644
--- a/pkgs/development/python-modules/aiosmb/default.nix
+++ b/pkgs/development/python-modules/aiosmb/default.nix
@@ -2,7 +2,7 @@
, asysocks
, buildPythonPackage
, colorama
-, fetchFromGitHub
+, fetchPypi
, minikerberos
, prompt-toolkit
, pycryptodomex
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "aiosmb";
- version = "0.2.50";
+ version = "0.3.8";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
- src = fetchFromGitHub {
- owner = "skelsec";
- repo = pname;
- rev = version;
- sha256 = "016pylxqmzm1hn1mvx6jhxvgckdqpf993sd1bki07pblmm4ikl6q";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-CvqQEJPwrZHQuEId7GbIC9LpyyN6jaQFmEQTpddHU5g=";
};
propagatedBuildInputs = [
@@ -40,7 +40,9 @@ buildPythonPackage rec {
# Project doesn't have tests
doCheck = false;
- pythonImportsCheck = [ "aiosmb" ];
+ pythonImportsCheck = [
+ "aiosmb"
+ ];
meta = with lib; {
description = "Python SMB library";
diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index 126f9a315001..6678ff63efc5 100644
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@@ -7,6 +7,7 @@
, nbconvert
, jupyter
, chainer
+, parameterized
, pytorch
, mxnet
, tensorflow
@@ -15,13 +16,13 @@
buildPythonPackage rec {
pname = "einops";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "arogozhnikov";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/NnBm5qnTY0BngEj5i5hIb0VCInBZiSiVkIGLhCkffQ=";
+ hash = "sha256-n4R4lcRimuOncisCTs2zJWPlqZ+W2yPkvkWAnx4R91s=";
};
checkInputs = [
@@ -33,6 +34,7 @@ buildPythonPackage rec {
jupyter
# For backend tests
chainer
+ parameterized
pytorch
mxnet
tensorflow
diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix
index c98dcd405344..a4d17a830e4d 100644
--- a/pkgs/development/python-modules/elegy/default.nix
+++ b/pkgs/development/python-modules/elegy/default.nix
@@ -22,16 +22,24 @@
buildPythonPackage rec {
pname = "elegy";
- version = "0.8.5";
+ version = "0.8.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "poets-ai";
repo = pname;
rev = version;
- sha256 = "sha256-2qBHiNmdO53rD9/tudnf1z4+6a5ZHH/y2wB4v3/Tqdg=";
+ hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
};
+ # The cloudpickle constraint is too strict. wandb is marked as an optional
+ # dependency but `buildPythonPackage` doesn't seem to respect that setting.
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'cloudpickle = "^1.5.0"' 'cloudpickle = "*"' \
+ --replace 'wandb = { version = "^0.12.10", optional = true }' ""
+ '';
+
nativeBuildInputs = [
poetry
];
diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix
index 5d67133b2559..0d8a131a8e42 100644
--- a/pkgs/development/python-modules/motionblinds/default.nix
+++ b/pkgs/development/python-modules/motionblinds/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "motionblinds";
- version = "0.6.3";
+ version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "motion-blinds";
rev = version;
- sha256 = "sha256-Y5yF/dJUm0ICUY8UU8ILypSAnCVanvW4hzyz7ZOdBrc=";
+ sha256 = "sha256-k0o6zGhuQPCh9bxXd7v9Hfjo1vKmf5kpw7MGJ31/1Mw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix
index ae8cfdbbc282..f3790a3f59f4 100644
--- a/pkgs/development/python-modules/optax/default.nix
+++ b/pkgs/development/python-modules/optax/default.nix
@@ -8,19 +8,19 @@
, numpy
, pytest-xdist
, pytestCheckHook
+, tensorflow
+, tensorflow-datasets
}:
buildPythonPackage rec {
pname = "optax";
- # As of 2022-01-06, the latest stable version (0.1.0) has broken tests that are fixed
- # in https://github.com/deepmind/optax/commit/d6633365d84eb6f2c0df0c52b630481a349ce562
- version = "unstable-2022-01-05";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "deepmind";
repo = pname;
- rev = "5ec5541b3486224b22e950480ff639ceaf5098f7";
- sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli";
+ rev = "v${version}";
+ hash = "sha256-s/BcqzhdfWzR61MStusUPQtuT4+t8NcC5gBGiGggFqw=";
};
buildInputs = [ jaxlib ];
@@ -35,6 +35,8 @@ buildPythonPackage rec {
dm-haiku
pytest-xdist
pytestCheckHook
+ tensorflow
+ tensorflow-datasets
];
pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
@@ -45,8 +47,7 @@ buildPythonPackage rec {
disabledTestPaths = [
# Requires `flax` which depends on `optax` creating circular dependency.
"optax/_src/equivalence_test.py"
- # Require `tensorflow_datasets` which isn't packaged in `nixpkgs`.
- "examples/datasets_test.py"
+ # See https://github.com/deepmind/optax/issues/323.
"examples/lookahead_mnist_test.py"
];
diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
index 3d2094263b6f..4c353ab7a4e7 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -2,14 +2,19 @@
, buildPythonPackage
, fetchPypi
, python
+, pythonOlder
}:
+
buildPythonPackage rec {
pname = "plac";
- version = "1.3.4";
+ version = "1.3.5";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "c91a4c9f9cc67c7e7213b6823b0ea15cd0afe5eaf8f8dda1fe5cb10192b137f5";
+ hash = "sha256-OL3YZNBFD7dIGTqoF7nEWKj1MZ+/l7ImEVHPwKWBIJA=";
};
checkPhase = ''
@@ -17,6 +22,10 @@ buildPythonPackage rec {
${python.interpreter} -m unittest discover -p "*test_plac*"
'';
+ pythonImportsCheck = [
+ "plac"
+ ];
+
meta = with lib; {
description = "Parsing the Command Line the Easy Way";
homepage = "https://github.com/micheles/plac";
diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix
index 18d688c3db3d..ab18b4886bda 100644
--- a/pkgs/development/python-modules/pybindgen/default.nix
+++ b/pkgs/development/python-modules/pybindgen/default.nix
@@ -1,22 +1,44 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools-scm, pygccxml }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pygccxml
+, pythonOlder
+, setuptools-scm
+}:
+
buildPythonPackage rec {
- pname = "PyBindGen";
- version = "0.22.0";
+ pname = "pybindgen";
+ version = "0.22.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
- inherit pname version;
- sha256 = "5b4837d3138ac56863d93fe462f1dac39fb87bd50898e0da4c57fefd645437ac";
+ pname = "PyBindGen";
+ inherit version;
+ hash = "sha256-jH8iORpJqEUY9aKtBuOlseg50Q402nYxUZyKKPy6N2Q=";
};
- buildInputs = [ setuptools-scm ];
+ buildInputs = [
+ setuptools-scm
+ ];
- checkInputs = [ pygccxml ];
- doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k
+ checkInputs = [
+ pygccxml
+ ];
+
+ pythonImportsCheck = [
+ "pybindgen"
+ ];
+
+ # Fails to import module 'cxxfilt' from pygccxml on Py3k
+ doCheck = (!isPy3k);
meta = with lib; {
- homepage = "https://github.com/gjcarneiro/pybindgen";
description = "Python Bindings Generator";
- license = licenses.lgpl2;
+ homepage = "https://github.com/gjcarneiro/pybindgen";
+ license = licenses.lgpl21Plus;
maintainers = with maintainers; [ teto ];
};
}
diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index cd3e9ed88595..3ad501324260 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
- version = "0.4.3";
+ version = "0.4.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "v${version}";
- hash = "sha256-NE6XmylUc3MeDRMOJo51jtb6J0Vi9tDT6tbYBepDsvw=";
+ hash = "sha256-eZDPi87wwsM0EriJ/Y1yTSJ9R4BqvJg3YJyJUa2vLqo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/restfly/default.nix b/pkgs/development/python-modules/restfly/default.nix
index d153a5f3c753..d705a17a1ac4 100644
--- a/pkgs/development/python-modules/restfly/default.nix
+++ b/pkgs/development/python-modules/restfly/default.nix
@@ -7,12 +7,13 @@
, pytestCheckHook
, python-box
, pythonOlder
+, responses
, requests
}:
buildPythonPackage rec {
pname = "restfly";
- version = "1.4.5";
+ version = "1.4.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "stevemcgrath";
repo = pname;
rev = version;
- hash = "sha256-wWFf8LFZkwzbHX545tA5w2sB3ClL7eFuF+jGX0fSiSc=";
+ hash = "sha256-nCubAn9AASnCsvlYdk4gmkoORRlsYEbJ8JmlT11xYWU=";
};
propagatedBuildInputs = [
@@ -34,6 +35,7 @@ buildPythonPackage rec {
pytest-datafiles
pytest-vcr
pytestCheckHook
+ responses
];
disabledTests = [
diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index a538619288f6..1d07c371ca2a 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "scmrepo";
- version = "0.0.14";
+ version = "0.0.16";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = version;
- hash = "sha256-/J8cCcGAWGrJmUvznOKXtNiHasdOJ3CzsGMeakgL0sY=";
+ hash = "sha256-gaZXQFZ1Vm8ruW42IXc6+fLA5856Oc0cGgtScwIr5f8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix
index f3271b9a3bb2..febb59880b69 100644
--- a/pkgs/development/python-modules/treeo/default.nix
+++ b/pkgs/development/python-modules/treeo/default.nix
@@ -1,5 +1,6 @@
{ buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, jax
, jaxlib
, lib
@@ -8,20 +9,30 @@
buildPythonPackage rec {
pname = "treeo";
- version = "0.4.0";
+ # Note that there is a version 0.4.0, but it was released in error. At the
+ # time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub
+ # and PyPI.
+ version = "0.0.11";
format = "pyproject";
src = fetchFromGitHub {
owner = "cgarciae";
repo = pname;
rev = version;
- sha256 = "176r1kgsdlylvdrxmhnzni81p8m9cfnsn4wwn6fnmsgam2qbp76j";
+ hash = "sha256-zs3F8i+G5OX/A9wOO60xVuvnm2QqrL+dHIrC0qwH37o=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'typing-extensions = "^3.10.0"' 'typing-extensions = "*"'
- '';
+ # See https://github.com/cgarciae/treex/issues/68.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/cgarciae/treeo/pull/14/commits/022915da2b3bf76406a7c79d1b4593bee7956f16.patch";
+ hash = "sha256-WGxJqqrf2g0yZe30RyG1xxbloiqj1awuf1Y4eh5y+z0=";
+ })
+ (fetchpatch {
+ url = "https://github.com/cgarciae/treeo/pull/14/commits/99f9488bd0c977780844fd79743167b0010d359b.patch";
+ hash = "sha256-oKDYs+Ah0QXkhiJysIudQ6VLIiUiIcnQisxYp6GJuTc=";
+ })
+ ];
nativeBuildInputs = [
poetry-core
diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
index 7ed83adc64d1..fb0a0c7d87c7 100644
--- a/pkgs/development/python-modules/treex/default.nix
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -18,21 +18,23 @@
buildPythonPackage rec {
pname = "treex";
- version = "0.6.9";
+ version = "0.6.10";
format = "pyproject";
src = fetchFromGitHub {
owner = "cgarciae";
repo = pname;
rev = version;
- sha256 = "1yvlldmhji12h249j14ba44hnb9x1fhrj7rh1cx2vn0vxj5wpg7x";
+ hash = "sha256-ZHfgmRNbFh8DFZkmilY0pmRNQhJFqT689I7Lu8FuFm4=";
};
+ # At the time of writing (2022-03-29), rich is currently at version 11.0.0.
+ # The treeo dependency is compatible with a patch, but not marked as such in
+ # treex. See https://github.com/cgarciae/treex/issues/68.
postPatch = ''
substituteInPlace pyproject.toml \
- --replace 'rich = "^10.7.0"' 'rich = ">=10.7.0"' \
- --replace 'PyYAML = "^5.4.1"' 'PyYAML = ">=5.4.1"' \
- --replace 'optax = "^0.0.9"' 'optax = ">=0.0.9"'
+ --replace 'rich = "^11.2.0"' 'rich = "*"' \
+ --replace 'treeo = "^0.0.10"' 'treeo = "*"'
'';
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index 82e0e1515921..bd04f4a2060e 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
- version = "1.15.0";
+ version = "1.15.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4YojzVwvPc+9Mn+xyRMxGEKv68eekXpH0RzSsrd8voY=";
+ sha256 = "sha256-nXrWKKHb64HGHttppBveLp45qKLnGvkElqxn8f/cWok=";
};
ldflags = [
@@ -21,7 +21,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
- vendorSha256 = "sha256-/r1KMX5YqJ3bVXNYJWv10cHkBQMuS90KMGXWUB6Idw8=";
+ vendorSha256 = "sha256-dF7x3oA2q4IuoXn8tcQAdRKWooeLoeBsQ1sAhOGwwM8=";
subPackages = [
"cmd/tfsec"
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index f5fb8e8eeb1a..b20d172a403d 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -17,8 +17,8 @@ let
sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [popt avahi pkg-config python3 gtk3 autoconf automake which procps libiberty_static];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [popt avahi pkg-config python3 gtk3 which procps libiberty_static];
preConfigure =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index 1ae54d629acc..f9d7a8156e14 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -84,7 +84,7 @@ in stdenv.mkDerivation rec {
inherit stdenv src version patches;
buildInputs =
- [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx_6
+ [ makeWrapper libtool unzip nukeReferences sqlite libpqxx_6
top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt
perlDeps perl nix
postgresql # for running the tests
@@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {
gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
- nativeBuildInputs = [ autoreconfHook pkg-config mdbook ];
+ nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix
index d38d8936c1a9..9e842acfa9a5 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/pkgs/games/garden-of-coloured-lights/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
pname = "garden-of-coloured-lights";
version = "1.0.9";
- buildInputs = [ allegro autoconf automake ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ allegro ];
prePatch = ''
noInline='s/inline //'
diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix
index 0acabb4a55f3..f135c93ff04f 100644
--- a/pkgs/games/gl-117/default.nix
+++ b/pkgs/games/gl-117/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4";
};
- buildInputs = [ libGLU libGL SDL freeglut SDL_mixer autoconf automake libtool ];
+ nativeBuildInputs = [ automake autoconf ];
+ buildInputs = [ libGLU libGL SDL freeglut SDL_mixer libtool ];
meta = with lib; {
description = "An air combat simulator";
diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix
index 3fadd73ce18e..244a826cb165 100644
--- a/pkgs/games/qqwing/default.nix
+++ b/pkgs/games/qqwing/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
--replace "sudo " ""
'';
- buildInputs = [ perl autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ perl libtool ];
makeFlags = [ "prefix=$(out)" "tgz" ];
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index e8daa9a20251..7548b082a13b 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j";
};
+ nativeBuildInputs = [ autoconf automake ];
buildInputs = [
- ncurses flex bison autoconf automake m4
+ ncurses flex bison m4
];
preConfigure = ''
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index e5de7c116c7e..40a1414cfab3 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation {
sha256 = "0w121issdjxdv5i9ksa5m23if6pz1r9ql8p894f1pqn16w0kw1ix";
};
+ nativeBuildInputs = [ automake autoconf ];
buildInputs = [
- cups automake autoconf glib libxml2 libusb1 libtool
+ cups glib libxml2 libusb1 libtool
];
# lgmon3's --enable-libdir flag is used soley for specifying in which
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 2cb3fe01ddb6..d5ccc857e8d4 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
sha256 = "06s9nl155yxmx56056y22kz1p5b2sb5fhr3gf4ddlczjkd1xch53";
};
- buildInputs = [ autoconf libtool automake
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool
cups popt libtiff libpng
ghostscript ];
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index 1f0f7ab6e91d..2bd79691461c 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -30,7 +30,8 @@ in stdenv.mkDerivation {
sha256 = "1f6vpx1z3qa88590i5m0s49j9n90vpk81xmw6pvj0nfd3qbvzkya";
};
- buildInputs = [ autoconf libtool automake
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool
cups popt libtiff libpng
ghostscript glib libusb1 libxml2 ];
diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix
index 12e7f798e79e..00e97855e261 100644
--- a/pkgs/os-specific/linux/conspy/default.nix
+++ b/pkgs/os-specific/linux/conspy/default.nix
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
curlOpts = " -A application/octet-stream ";
};
+ nativeBuildInputs = [ autoconf automake ];
buildInputs = [
- autoconf
- automake
ncurses
];
diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/os-specific/linux/cpupower-gui/default.nix
index 2fcc55e14cb3..1f57bc9428f0 100644
--- a/pkgs/os-specific/linux/cpupower-gui/default.nix
+++ b/pkgs/os-specific/linux/cpupower-gui/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, buildPythonApplication
, appstream-glib
, dbus-python
@@ -35,6 +36,15 @@ buildPythonApplication rec {
sha256 = "05lvpi3wgyi741sd8lgcslj8i7yi3wz7jwl7ca3y539y50hwrdas";
};
+ patches = [
+ # Fix build with 0.61, can be removed on next update
+ # https://hydra.nixos.org/build/171052557/nixlog/1
+ (fetchpatch {
+ url = "https://github.com/vagnum08/cpupower-gui/commit/97f8ac02fe33e412b59d3f3968c16a217753e74b.patch";
+ sha256 = "XYnpm03kq8JLMjAT73BMCJWlzz40IAuHESm715VV6G0=";
+ })
+ ];
+
nativeBuildInputs = [
appstream-glib
desktop-file-utils # needed for update-desktop-database
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 8763591d05e3..cc6e8c116eed 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ];
+ nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ];
+ buildInputs = [ apacheHttpd curl glib lasso libtool libxml2 libxslt openssl xmlsec ];
configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"];
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix
index 090450ba9688..77272694a89d 100644
--- a/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/pkgs/servers/http/spawn-fcgi/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07r6nwbg4881mdgp0hqh80c4x9wb7jg6cgc84ghwhfbd2abc2iq5";
};
- buildInputs = [ automake autoconf ];
+ nativeBuildInputs = [ automake autoconf ];
preConfigure = ''
./autogen.sh
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index dfe1a6d26ec9..ef4c22b1c2c0 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, fetchpatch, bundlerEnv, nixosTests
+{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
, fetchYarnDeps, fixup_yarn_lock
@@ -16,17 +16,9 @@ stdenv.mkDerivation rec {
# Putting the callPackage up in the arguments list also does not work.
src = if srcOverride != null then srcOverride else callPackage ./source.nix {};
- patches = [
- (fetchpatch {
- name = "CVE-2022-0432.patch";
- url = "https://github.com/mastodon/mastodon/commit/4d6d4b43c6186a13e67b92eaf70fe1b70ea24a09.patch";
- sha256 = "sha256-C18X2ErBqP/dIEt8NrA7hdiqxUg5977clouuu7Lv4/E=";
- })
- ];
-
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
- sha256 = "sha256-Z+nFMJcC2f+nDUxa2vPYnNezMLBGXfLdh+xMXPHqYyw=";
+ sha256 = "sha256-Ngfs15YKLfSBOKju3BzpZFnenB370jId2G1g9Qy1y5w=";
};
mastodon-gems = bundlerEnv {
@@ -53,7 +45,7 @@ stdenv.mkDerivation rec {
pname = "${pname}-modules";
inherit src version;
- nativeBuildInputs = [ fixup_yarn_lock mastodon-gems nodejs-slim yarn ];
+ nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];
RAILS_ENV = "production";
NODE_ENV = "production";
@@ -63,8 +55,13 @@ stdenv.mkDerivation rec {
fixup_yarn_lock ~/yarn.lock
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
+
+ patchShebangs ~/bin
patchShebangs ~/node_modules
+ # skip running yarn install
+ rm -rf ~/bin/yarn
+
OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder \
rails assets:precompile
yarn cache clean --offline
diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index f18145ec47d0..544e3b90412f 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15r6ab17iwhhq92by4ah9z4wwvjbr07qn16x8pn2ypgqwvfy74h7";
+ sha256 = "1zsb2x1j044rcx9b2ijgnp1ir7vsccxfrar59pvra83j5pjmsyiz";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1r3x9fbq5wlgn4xhqw48la09q7f97zna7ld5fglk3jpmh973x5";
+ sha256 = "1pzpf5vivh864an88gb7fab1gh137prfjpbf92mx5qnln1wjhlgh";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp";
+ sha256 = "0sm5rp2jxlikhvv7085r7zrazy42dw74k9rlniaka8m6wfas01nf";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5";
+ sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zfrkcnp9wy1dm4b6iqf29858dp04a62asfmldainqmv4a7931q7";
+ sha256 = "1hkqhliw766vcd4c83af2dd1hcnbsh5zkcx8bdqmjcq7zqfn7xib";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn";
+ sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
active_model_serializers = {
dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];
@@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jjkmrx82rn0d2bhpi6kz2h1s4w7rpk5pj2vcssyc1a2ys12vyhj";
+ sha256 = "0xdp7cpj3yj3wl4vj0nqq44kzjavlxi1wq3cf9zp0whkir0ym0gy";
type = "gem";
};
- version = "0.10.12";
+ version = "0.10.13";
};
active_record_query_trace = {
groups = ["development"];
@@ -92,10 +92,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq";
+ sha256 = "0arf4vxcahb9f9y5fa1ap7dwnknfjb0d5g9zsh0dnqfga9vp1hws";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
activemodel = {
dependencies = ["activesupport"];
@@ -103,10 +103,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal";
+ sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68";
+ sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@@ -125,10 +125,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sbpkk3r8qi47bd0ilznq4gpfyfwm2bwvxqb5z0wc75h3zj1jhqg";
+ sha256 = "0gpxx9wyavp1mhy6fmyj4b20c4x0dcdj94y0ag61fgnyishd19ph";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -136,10 +136,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr";
+ sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
addressable = {
dependencies = ["public_suffix"];
@@ -147,10 +147,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
- version = "2.7.0";
+ version = "2.8.0";
+ };
+ aes_key_wrap = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19bn0y70qm6mfj4y1m0j3s8ggh6dvxwrwrj5vfamhdrpddsz8ddr";
+ type = "gem";
+ };
+ version = "1.1.0";
};
airbrussh = {
dependencies = ["sshkit"];
@@ -179,10 +189,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dxrfppwfg13vqmambbs56xjj8qsdgcy58r2yc44vvy3z1g5yflw";
+ sha256 = "1lw0fxb5mirsdp3bp20gjyvs7clvi19jbxnrm2ihm20kzfhvlqcs";
type = "gem";
};
- version = "3.1.1";
+ version = "3.2.0";
};
ast = {
groups = ["default" "development" "test"];
@@ -205,6 +215,16 @@
};
version = "3.1.0";
};
+ attr_required = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
awrence = {
groups = ["default"];
platforms = [];
@@ -220,20 +240,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3";
+ sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
type = "gem";
};
- version = "1.1.1";
+ version = "1.2.0";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi";
+ sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm";
type = "gem";
};
- version = "1.465.0";
+ version = "1.558.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -241,10 +261,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09asbdcg96l165kq4hrks0hsk4hwr16h1qx22az4m7ld0ylvz3jc";
+ sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq";
type = "gem";
};
- version = "3.114.0";
+ version = "3.127.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -252,10 +272,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh";
+ sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";
type = "gem";
};
- version = "1.43.0";
+ version = "1.55.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -263,10 +283,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv";
+ sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax";
type = "gem";
};
- version = "1.95.1";
+ version = "1.113.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -274,20 +294,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw";
+ sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
type = "gem";
};
- version = "1.2.3";
+ version = "1.4.0";
};
bcrypt = {
groups = ["default" "pam_authentication"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb";
+ sha256 = "1rakdhrnlclrpy7sihi9ipwdh7fjkkvzga171464lq6rzp07cf65";
type = "gem";
};
- version = "3.1.16";
+ version = "3.1.17";
};
better_errors = {
dependencies = ["coderay" "erubi" "rack"];
@@ -305,10 +325,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
+ sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr";
type = "gem";
};
- version = "2.4.8";
+ version = "2.4.10";
};
binding_of_caller = {
dependencies = ["debug_inspector"];
@@ -327,10 +347,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04a4na1z36z4gplcyz3avi313c3jq6whqi5sx2clj512la3ccd2x";
+ sha256 = "1rs61mwdiyriq8mb8na2sfrqzz8igls04md63ajyhk4yj8d2j0sz";
type = "gem";
};
- version = "0.1.5";
+ version = "0.1.6";
};
bootsnap = {
dependencies = ["msgpack"];
@@ -338,20 +358,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jkh8qrsz3nhz759jwlfa20xkizn63yxym2db0c8ayjxzldyc77z";
+ sha256 = "053hx5hz1zdcqwywlnabzf0gkrrchhzh66p1bfzvrryb075lsqm1";
type = "gem";
};
- version = "1.6.0";
+ version = "1.10.3";
};
brakeman = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cdlfdaj3p9s1mck8zax35g524szs1danjrah8da3z7c8xvpq6sc";
+ sha256 = "197bvfm4rpczyrpbjzn7zh4q6rxigwnxnnmvvgfg9451k3jjygyy";
type = "gem";
};
- version = "5.0.1";
+ version = "5.2.1";
};
browser = {
groups = ["default"];
@@ -390,10 +410,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r8d3vh1xjfx46qlv75228rkshzgqxpmf491vxzpicpqi1xad5ni";
+ sha256 = "0q90zk8di7a12by3d81nl78yy90rdml77vi3waxmgzqhvs6na4vj";
type = "gem";
};
- version = "6.1.4";
+ version = "7.0.1";
};
bundler-audit = {
dependencies = ["thor"];
@@ -401,10 +421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00l8rs7cna0j3yh4s9sza0r88x7kjc7j4gp9yl378422k7i0r73v";
+ sha256 = "05k19l5388248rd74cn2lm2ksci7fzmga74n835v7k31m4kbzw8v";
type = "gem";
};
- version = "0.8.0";
+ version = "0.9.0.1";
};
byebug = {
groups = ["default" "development" "test"];
@@ -422,10 +442,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jw01z2rawipnkprxy4c2sbdna3k9pxl3gzq3y92l3i1xy5x7ax3";
+ sha256 = "0bbkmi746zddgrfhq0z19y053bax5l4jh8ji9mfam5aacchnz2cm";
type = "gem";
};
- version = "3.16.0";
+ version = "3.17.0";
};
capistrano-bundler = {
dependencies = ["capistrano"];
@@ -444,10 +464,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13fnicx9fkilgvlapjmdglcs3yjll0brx3bp4mbi3sixxcm6vy9r";
+ sha256 = "1iyhs77bff09g18dlz0li5f44khjwpqc09gk5hzcnf5v9yvijpg9";
type = "gem";
};
- version = "1.6.1";
+ version = "1.6.2";
};
capistrano-rbenv = {
dependencies = ["capistrano" "sshkit"];
@@ -472,15 +492,15 @@
version = "2.0.2";
};
capybara = {
- dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
+ dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1viqcpsngy9fqjd68932m43ad6xj656d1x33nx9565q57chgi29k";
+ sha256 = "1dv75hs45456mi76h720gxk959gpg4f6091hmk42y0ln6kp2x7i0";
type = "gem";
};
- version = "3.35.3";
+ version = "3.36.0";
};
case_transform = {
dependencies = ["activesupport"];
@@ -519,10 +539,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l8r8wdghw09clkgyk91d80lvav7ngl8j7gmrgb7m2bh8nyia54m";
+ sha256 = "1jfdz0z27p839m09xmw5anrw5jp3jd5hd5gnx4vlk6kk520cy6sf";
type = "gem";
};
- version = "5.2.0";
+ version = "7.2.4";
};
chunky_png = {
groups = ["default"];
@@ -534,17 +554,6 @@
};
version = "1.4.0";
};
- cld3 = {
- dependencies = ["ffi"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1y04ig8p9rparhff5dh3781pwf1xlirgq8p0fzvggjjpx761bvra";
- type = "gem";
- };
- version = "3.4.2";
- };
climate_control = {
groups = ["test"];
platforms = [];
@@ -580,10 +589,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
+ sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem";
};
- version = "1.1.8";
+ version = "1.1.10";
};
connection_pool = {
groups = ["default" "test"];
@@ -654,10 +663,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ag0skzk3h7bhmf1n2zwa7cg6kx5k5inxmq0kf5qpm7917ffm0mz";
+ sha256 = "0gl0b4jqf7ysv3rg99sgxa5y9va2k13p0si3a88pr7m8g6z8pm7x";
type = "gem";
};
- version = "4.8.0";
+ version = "4.8.1";
};
devise-two-factor = {
dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
@@ -665,10 +674,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "148pfr6g8dwikdq3994gsid2a3n6p5h4z1a1dzh1898shr5f9znc";
+ sha256 = "04f5rb8fg4cvzm32v413z3h53wc0fgxg927q8rqd546hdrlx4j35";
type = "gem";
};
- version = "4.0.0";
+ version = "4.0.2";
};
devise_pam_authenticatable2 = {
dependencies = ["devise" "rpam2"];
@@ -686,10 +695,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
+ sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
type = "gem";
};
- version = "1.4.4";
+ version = "1.5.0";
};
discard = {
dependencies = ["activerecord"];
@@ -697,10 +706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zq7wjmknz8fd1pw169xpwf6js4280gnphy6mw8m3xiz1715bcig";
+ sha256 = "1xavjhccyyzn9z6fz3034vgvzprc983mbrq6n9sc0drfw7m3vrip";
type = "gem";
};
- version = "1.2.0";
+ version = "1.2.1";
};
docile = {
groups = ["default" "test"];
@@ -729,10 +738,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l2ma30gkmrny47zn4i8kmak8iykra1npx1cmpax8y43c88kkv7l";
+ sha256 = "188ybg2cgghcp5r1jpfnbx3anf0z8fzlla72jra0vgwkdylk7qkz";
type = "gem";
};
- version = "5.5.1";
+ version = "5.5.4";
};
dotenv = {
groups = ["default"];
@@ -770,10 +779,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
+ sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
type = "gem";
};
- version = "1.2.4";
+ version = "1.3.0";
};
elasticsearch = {
dependencies = ["elasticsearch-api" "elasticsearch-transport"];
@@ -781,10 +790,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02liwd003fify7cpg1z8szwfnncn33h5kkvgnbpi0bpqznb64l87";
+ sha256 = "0havyxmvl157a653prspnbhgdchlx44xqxl170v1im5ggxwavcaq";
type = "gem";
};
- version = "7.10.1";
+ version = "7.13.3";
};
elasticsearch-api = {
dependencies = ["multi_json"];
@@ -792,20 +801,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ya398pcmin9l44m5z5wsh3zqz47dhrj5h2lxkpr3pa0vcacd9ig";
+ sha256 = "0bmssarkk7lqkjdn8c9j7jvxcnn4hg1zcmhsky8bfvc99k33b3w8";
type = "gem";
};
- version = "7.10.1";
+ version = "7.13.3";
};
elasticsearch-dsl = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d2qr5hvqcr5r78djzrw5fjkaggvw080sdixnnq8cf8yriwhsvnf";
+ sha256 = "174m3fwm3mawbkjg2xbmqvljq7ava4s95m8vpg5khcvfj506wxfk";
type = "gem";
};
- version = "0.1.9";
+ version = "0.1.10";
};
elasticsearch-transport = {
dependencies = ["faraday" "multi_json"];
@@ -813,10 +822,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0q45s9d4id0l35924vxmysb9s2raiixcsf7il6j5bl2z8dgfwfhs";
+ sha256 = "0blfii8qvj0m6bg9sbfynxc40in7zfmw2wpi4clv7d9gclk053db";
type = "gem";
};
- version = "7.10.1";
+ version = "7.13.3";
};
encryptor = {
groups = ["default"];
@@ -844,10 +853,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xr8i8ql4xzx17d12590i3j299hj6vc0ja2j29dy12i5nlchxrvp";
+ sha256 = "0xsfa02hin2ymfcf0bdvsw6wk8w706rrfdqpy6b4f439zbqmn05m";
type = "gem";
};
- version = "1.2.4";
+ version = "1.2.6";
};
excon = {
groups = ["default"];
@@ -864,10 +873,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1a1zv94hcss44n1b04w0rg0swg8npigrj3nva9h0y2f1iflj124k";
+ sha256 = "1zmak7fgis1nk9j157g2rjzxrw9prr3jzlxap9vix3xm0gkihr53";
type = "gem";
};
- version = "2.22.0";
+ version = "2.27.0";
};
faker = {
dependencies = ["i18n"];
@@ -875,21 +884,72 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hwir9b9zy0asy0vap7zfqv75lbws4a1pmh74lhqd2rndv32vfc5";
+ sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi";
type = "gem";
};
- version = "2.18.0";
+ version = "2.20.0";
};
faraday = {
- dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
+ dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
+ sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
type = "gem";
};
- version = "1.3.0";
+ version = "1.9.3";
+ };
+ faraday-em_http = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ faraday-em_synchrony = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ faraday-excon = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ faraday-httpclient = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ faraday-multipart = {
+ dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
+ type = "gem";
+ };
+ version = "1.0.3";
};
faraday-net_http = {
groups = ["default"];
@@ -901,35 +961,75 @@
};
version = "1.0.1";
};
+ faraday-net_http_persistent = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ faraday-patron = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ faraday-rack = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ faraday-retry = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
fast_blank = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56";
+ sha256 = "1shpmamyzyhyxmv95r96ja5rylzaw60r19647d0fdm7y2h2c77r6";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
fastimage = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lgr0vs9kg5622qaf2l3f37b238dncs037fisiygvkbq8sg11i68";
+ sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
type = "gem";
};
- version = "2.2.3";
+ version = "2.2.6";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
+ sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
- version = "1.15.0";
+ version = "1.15.5";
};
ffi-compiler = {
dependencies = ["ffi" "rake"];
@@ -991,10 +1091,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vmzjmwq5968ni9wzdp957iizddj85v69qi0hz5rk8148lz1bccm";
+ sha256 = "0l8878iqg85zmpifjfnidpp17swgh103a0br68nqakflnn0zwcka";
type = "gem";
};
- version = "1.3.9";
+ version = "1.5.2";
};
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
@@ -1007,16 +1107,27 @@
};
version = "2.5.1";
};
+ gitlab-omniauth-openid-connect = {
+ dependencies = ["addressable" "omniauth" "openid_connect"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rw99k86csafsgv4w7v7wzid5kvlk43nfyww1d3ss00mhjdhw619";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
globalid = {
dependencies = ["activesupport"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
+ sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj";
type = "gem";
};
- version = "0.4.2";
+ version = "1.0.0";
};
hamlit = {
dependencies = ["temple" "thor" "tilt"];
@@ -1040,17 +1151,6 @@
};
version = "0.2.3";
};
- hamster = {
- dependencies = ["concurrent-ruby"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1n1lsh96vnyc1pnzyd30f9prcsclmvmkdb3nm5aahnyizyiy6lar";
- type = "gem";
- };
- version = "3.0.0";
- };
hashdiff = {
groups = ["default" "test"];
platforms = [];
@@ -1112,15 +1212,15 @@
version = "4.3.4";
};
http = {
- dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"];
+ dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y";
+ sha256 = "1akaq4wnnlbavb8rjg0vbxsg6nzbqwgkgklbmb07hix3pkp7xpxf";
type = "gem";
};
- version = "4.4.1";
+ version = "5.0.4";
};
http-cookie = {
dependencies = ["domain_name"];
@@ -1128,10 +1228,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+ sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
type = "gem";
};
- version = "1.0.3";
+ version = "1.0.4";
};
http-form_data = {
groups = ["default"];
@@ -1143,17 +1243,6 @@
};
version = "2.3.0";
};
- http-parser = {
- dependencies = ["ffi-compiler"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "10wz818i7dq5zkcll0yf7pbjz1zqvs7mgh3xg3x6www2f2ccwxqj";
- type = "gem";
- };
- version = "1.2.1";
- };
http_accept_language = {
groups = ["default"];
platforms = [];
@@ -1164,6 +1253,16 @@
};
version = "2.1.1";
};
+ httpclient = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+ type = "gem";
+ };
+ version = "2.8.3";
+ };
httplog = {
dependencies = ["rack" "rainbow"];
groups = ["default"];
@@ -1181,10 +1280,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
+ sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
- version = "1.8.10";
+ version = "1.10.0";
};
i18n-tasks = {
dependencies = ["activesupport" "ast" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"];
@@ -1192,20 +1291,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lxccbhv91mbj7h3iy9xp1nhj5hrk4dyrglp2xv2qp71h129h37h";
+ sha256 = "0baaaljm7nq5z9xrhdsw1nnzvj494wi4zzbv5s89gm0rwpxfg1g2";
type = "gem";
};
- version = "0.9.34";
+ version = "0.9.37";
};
idn-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
+ sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm";
type = "gem";
};
- version = "0.1.0";
+ version = "0.1.4";
};
ipaddress = {
groups = ["default"];
@@ -1217,25 +1316,15 @@
};
version = "0.8.3";
};
- iso-639 = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1k1r8wgk6syvpsl3j5qfh5az5w4zdvk0pvpjl7qspznfdbp2mn71";
- type = "gem";
- };
- version = "0.3.5";
- };
jmespath = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr";
type = "gem";
};
- version = "1.4.0";
+ version = "1.6.0";
};
json = {
groups = ["default" "test"];
@@ -1252,10 +1341,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x6rd52dy6d75v21nzvkgpslhjsf5s3s6s4646yc34rdh6icq2ip";
+ sha256 = "179h6jfdsp9dmzyma7s7ykv1ia43r6z8x96j335q99p6mc5sk5qv";
type = "gem";
};
- version = "0.2.1";
+ version = "0.3.0";
+ };
+ json-jwt = {
+ dependencies = ["activesupport" "aes_key_wrap" "bindata"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr";
+ type = "gem";
+ };
+ version = "1.13.0";
};
json-ld = {
dependencies = ["htmlentities" "json-canonicalization" "link_header" "multi_json" "rack" "rdf"];
@@ -1263,10 +1363,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j9rj3qqdp312lbwgpxkqzbhf18nxaf6pvillql6p05l4av4717w";
+ sha256 = "08nll07gxgz2ys6i821nfbnsrx922d2yiqd5nd03785jjz1difbp";
type = "gem";
};
- version = "3.1.9";
+ version = "3.2.0";
};
json-ld-preloaded = {
dependencies = ["json-ld" "rdf"];
@@ -1274,10 +1374,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01i36aja495wvhc3259iawc7dp0ar1yglnxcv5vi3rmrdm03cviz";
+ sha256 = "0h0pfxyrsbifzhwfxj1ppaxbk7v2z8mw53a0mi49i986wyspxlgv";
type = "gem";
};
- version = "3.1.5";
+ version = "3.2.0";
};
jsonapi-renderer = {
groups = ["default"];
@@ -1305,10 +1405,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3";
+ sha256 = "0gia8irryvfhcr6bsr64kpisbgdbqjsqfgrk12a11incmpwny1y4";
type = "gem";
};
- version = "1.2.1";
+ version = "1.2.2";
};
kaminari-actionview = {
dependencies = ["actionview" "kaminari-core"];
@@ -1316,10 +1416,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri";
+ sha256 = "02f9ghl3a9b5q7l079d3yzmqjwkr4jigi7sldbps992rigygcc0k";
type = "gem";
};
- version = "1.2.1";
+ version = "1.2.2";
};
kaminari-activerecord = {
dependencies = ["activerecord" "kaminari-core"];
@@ -1327,20 +1427,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3";
+ sha256 = "0c148z97s1cqivzbwrak149z7kl1rdmj7dxk6rpkasimmdxsdlqd";
type = "gem";
};
- version = "1.2.1";
+ version = "1.2.2";
};
kaminari-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz";
+ sha256 = "1zw3pg6kj39y7jxakbx7if59pl28lhk98fx71ks5lr3hfgn6zliv";
type = "gem";
};
- version = "1.2.1";
+ version = "1.2.2";
+ };
+ kt-paperclip = {
+ dependencies = ["activemodel" "activesupport" "marcel" "mime-types" "terrapin"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08ngapld22knlkyn0dhhddkfm4vfj0lgmwj4y6x4mhi2hzfwxcxr";
+ type = "gem";
+ };
+ version = "7.1.1";
};
launchy = {
dependencies = ["addressable"];
@@ -1359,21 +1470,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9";
+ sha256 = "1y5d4ip4l12v58bgazadl45iv3a5j7jp2gwg96b6jy378zn42a1d";
type = "gem";
};
- version = "1.7.0";
+ version = "1.8.1";
};
letter_opener_web = {
- dependencies = ["actionmailer" "letter_opener" "railties"];
+ dependencies = ["actionmailer" "letter_opener" "railties" "rexml"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pianlrbf9n7jrqxpyxgsfk1j1d312d57d6gq7yxni6ax2q0293q";
+ sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik";
type = "gem";
};
- version = "1.4.0";
+ version = "2.0.0";
};
link_header = {
groups = ["default"];
@@ -1385,6 +1496,17 @@
};
version = "0.0.8";
};
+ llhttp-ffi = {
+ dependencies = ["ffi-compiler" "rake"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
lograge = {
dependencies = ["actionpack" "activesupport" "railties" "request_store"];
groups = ["production"];
@@ -1402,10 +1524,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
+ sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23";
type = "gem";
};
- version = "2.9.1";
+ version = "2.15.0";
};
mail = {
dependencies = ["mini_mime"];
@@ -1424,20 +1546,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d6r7df919jwj0xwmr95xqjqp7937djysrq2v3qvwhddhx7mfpkv";
+ sha256 = "0a6x6w1ij484s1z0wp667d6v0zb8bylhhr3av10yz60a2nz4r1l7";
type = "gem";
};
- version = "0.5.0";
+ version = "0.5.1";
};
marcel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3";
+ sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
mario-redis-lock = {
dependencies = ["redis"];
@@ -1450,6 +1572,16 @@
};
version = "1.2.1";
};
+ matrix = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
+ type = "gem";
+ };
+ version = "0.4.2";
+ };
memory_profiler = {
groups = ["development"];
platforms = [];
@@ -1487,72 +1619,60 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+ sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
type = "gem";
};
- version = "3.3.1";
+ version = "3.4.1";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
+ sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
type = "gem";
};
- version = "3.2020.0512";
- };
- mimemagic = {
- dependencies = ["nokogiri" "rake"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0cqm9n9122qpksn9v6mp0gn3lrzxhh72lwl7yb6j75gykdan6h41";
- type = "gem";
- };
- version = "0.3.10";
+ version = "3.2022.0105";
};
mini_mime = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1np6srnyagghhh2w4nyv09sz47v0i6ri3q6blicj94vgxqp12c94";
+ sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.2";
};
mini_portile2 = {
- dependencies = ["net-ftp"];
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0a2y04km3aciybk12yimkqn0ycrzy23iygl116n7addix9xdii3s";
+ sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
type = "gem";
};
- version = "2.5.2";
+ version = "2.8.0";
};
minitest = {
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
+ sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
type = "gem";
};
- version = "5.14.4";
+ version = "5.15.0";
};
msgpack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6";
+ sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739";
type = "gem";
};
- version = "1.4.2";
+ version = "1.4.4";
};
multi_json = {
groups = ["default"];
@@ -1574,17 +1694,6 @@
};
version = "2.1.1";
};
- net-ftp = {
- dependencies = ["net-protocol" "time"];
- groups = ["default" "development" "pam_authentication" "production" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1gx09b00k454fgn7q41r9xs5j5v9qj8xhfxnm650cns1ywcmzkil";
- type = "gem";
- };
- version = "0.1.2";
- };
net-ldap = {
groups = ["default"];
platforms = [];
@@ -1595,16 +1704,6 @@
};
version = "0.17.0";
};
- net-protocol = {
- groups = ["default" "development" "pam_authentication" "production" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "01wxv9sl2lcf5212vqzblw9k241ga54cppi4dk5y9ylhllbqag8a";
- type = "gem";
- };
- version = "0.1.0";
- };
net-scp = {
dependencies = ["net-ssh"];
groups = ["default" "development"];
@@ -1631,10 +1730,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5";
+ sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v";
type = "gem";
};
- version = "2.5.7";
+ version = "2.5.8";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -1642,21 +1741,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";
+ sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
type = "gem";
};
- version = "1.11.6";
- };
- nokogumbo = {
- dependencies = ["nokogiri"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0pxm7hx2lhmanm8kljd39f1j1742kl0a31zx98jsjiwrkfb5hhc6";
- type = "gem";
- };
- version = "2.0.4";
+ version = "1.13.3";
};
nsa = {
dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];
@@ -1674,10 +1762,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cnadm83qwnmbpyild9whb9bgf9r7gs046ydxypclb2l756gcnva";
+ sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl";
type = "gem";
};
- version = "3.11.5";
+ version = "3.13.11";
};
omniauth = {
dependencies = ["hashie" "rack"];
@@ -1723,6 +1811,17 @@
};
version = "1.10.3";
};
+ openid_connect = {
+ dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nqhgvq006h6crbp8lffw66ll46zf319c2637g4sybdclglismma";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
openssl = {
groups = ["default"];
platforms = [];
@@ -1758,42 +1857,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00k4l70dlbnqylng27023wz1c5hph32vwv2nwpfxdx9ip1vn4lx1";
+ sha256 = "15744bhmvw021a14gdks6k91gad6d1kgj2mc1zywpl0x9r3d85f2";
type = "gem";
};
- version = "2.14.4";
- };
- paperclip = {
- dependencies = ["activemodel" "activesupport" "mime-types" "mimemagic" "terrapin"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04mlw7aqj20ry0fy92gxnxg99hy5xczff7rhywfzz4mqlhc2wgg7";
- type = "gem";
- };
- version = "6.0.0";
+ version = "2.14.10";
};
parallel = {
- groups = ["default" "development" "test"];
+ groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
+ sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
type = "gem";
};
- version = "1.20.1";
- };
- parallel_tests = {
- dependencies = ["parallel"];
- groups = ["test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vrd24lg1pqxvp63664hrndywpdyn8i38j4gfvqk8zjl1mxy9840";
- type = "gem";
- };
- version = "3.7.0";
+ version = "1.22.1";
};
parser = {
dependencies = ["ast"];
@@ -1801,10 +1878,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pxsi1i5z506xfzhiyavlasf8777h55ab40phvp7pfv9npmd5pnj";
+ sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
type = "gem";
};
- version = "3.0.1.1";
+ version = "3.1.1.0";
};
parslet = {
groups = ["default"];
@@ -1832,10 +1909,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
+ sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb";
type = "gem";
};
- version = "1.2.3";
+ version = "1.3.4";
};
pghero = {
dependencies = ["activerecord"];
@@ -1843,20 +1920,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0abfdw301acfnq2h4zccwzd32i6mh9wp6qya2l0fsy0mmn14j405";
+ sha256 = "00rqwbbxiq7rsmfisfnqbgdswbwdm937f2wmj840j8wahsqmj2r8";
type = "gem";
};
- version = "2.8.1";
+ version = "2.8.2";
};
pkg-config = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl";
+ sha256 = "1rkxhps7fxzjhld68bpdaq8sss2k6fp14jz5kcqgrxp8x3yd15mk";
type = "gem";
};
- version = "1.4.6";
+ version = "1.4.7";
};
posix-spawn = {
groups = ["default"];
@@ -1949,10 +2026,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj";
+ sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
type = "gem";
};
- version = "5.3.2";
+ version = "5.6.2";
};
pundit = {
dependencies = ["activesupport"];
@@ -1960,30 +2037,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18kwm5rkazb89yf792y3fxqihcxw2vdy7k1w542s4hg82ibfpyx3";
+ sha256 = "17z2f7w3syh3c04c8m1v9pvb9pfpymk8b5plszr5l24hx374xvsd";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
raabro = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1idqvx5cpmyj1a5nwb1b19szx4lilyr6qpp6drkn744mzq2hppgr";
+ sha256 = "10m8bln9d00dwzjil1k42i5r7l82x25ysbi45fwyv4932zsrzynl";
type = "gem";
};
- version = "1.3.3";
+ version = "1.4.0";
};
racc = {
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
type = "gem";
};
- version = "1.5.2";
+ version = "1.6.0";
};
rack = {
groups = ["default" "development" "pam_authentication" "production" "test"];
@@ -2001,10 +2078,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kiixzpazjqgljjy1ngfz1by5vz6kjx0d4mf1fq7b3ywpfjf80lq";
+ sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx";
type = "gem";
};
- version = "6.5.0";
+ version = "6.6.0";
};
rack-cors = {
dependencies = ["rack"];
@@ -2017,16 +2094,27 @@
};
version = "1.1.1";
};
+ rack-oauth2 = {
+ dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k";
+ type = "gem";
+ };
+ version = "1.16.0";
+ };
rack-proxy = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v40xd3xhzhbdqfynd03gn88j1pga2zhrv58xs9fl4hzrlbp096s";
+ sha256 = "0jdr2r5phr3q7d6k9cnxjwlkaps0my0n43wq9mzw3xdqhg9wa3d6";
type = "gem";
};
- version = "0.6.5";
+ version = "0.7.0";
};
rack-test = {
dependencies = ["rack"];
@@ -2045,10 +2133,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0flnpli87b9j0zvb3c4l5addjbznbpkbmp1wzfjc1gh8qxlhcs1n";
+ sha256 = "1yr66s65nfw5yclf1x0ziy80gzhp9vqvyy0yzl0npmx25h4aizdv";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@@ -2078,10 +2166,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
+ sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
type = "gem";
};
- version = "1.3.0";
+ version = "1.4.2";
};
rails-i18n = {
dependencies = ["i18n" "railties"];
@@ -2111,41 +2199,41 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2";
+ sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93";
type = "gem";
};
- version = "6.1.3.2";
+ version = "6.1.5";
};
rainbow = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+ sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
- version = "3.0.0";
+ version = "3.1.1";
};
rake = {
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
+ sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
- version = "13.0.3";
+ version = "13.0.6";
};
rdf = {
- dependencies = ["hamster" "link_header"];
+ dependencies = ["link_header"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mn0q6a8cx32kz01pd8byhyhghi30dc6rbazislp2fw3wphvx553";
+ sha256 = "15bb075k614pjiw4np29y1z2xl8qx9qgdi9rpaqa1hxcmbqaxkk5";
type = "gem";
};
- version = "3.1.13";
+ version = "3.2.3";
};
rdf-normalize = {
dependencies = ["rdf"];
@@ -2153,20 +2241,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kfhh5n57im80i1ak00qz9f5hx8k10ldn0r5l1gw1qaa1lydmydg";
+ sha256 = "0ysa8v2xw0ln4kdwhkg6mh71v5wbancsz5cf945kbk47m1ybn271";
type = "gem";
};
- version = "0.4.0";
+ version = "0.5.0";
};
redis = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48";
+ sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw";
type = "gem";
};
- version = "4.2.5";
+ version = "4.5.1";
};
redis-namespace = {
dependencies = ["redis"];
@@ -2174,20 +2262,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8";
+ sha256 = "0ndj4lcm8rw01078zr0249grsk93zbda8qsibdvlx69b5ijg1rzf";
type = "gem";
};
- version = "1.8.1";
+ version = "1.8.2";
};
regexp_parser = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr";
+ sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
type = "gem";
};
- version = "2.1.1";
+ version = "2.2.1";
};
request_store = {
dependencies = ["rack"];
@@ -2200,16 +2288,6 @@
};
version = "1.5.0";
};
- resolv = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1a23805sa3ip589id3npq39wyzgqz2qzx0dcsa1z91rxfax7fllz";
- type = "gem";
- };
- version = "0.1.0";
- };
responders = {
dependencies = ["actionpack" "railties"];
groups = ["default" "pam_authentication"];
@@ -2257,20 +2335,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02";
+ sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.1";
};
rqrcode_core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1djrfpzdy19c336nlzxdsm9qkrgqnm1himdawflsjsmxpq4j826c";
+ sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg";
type = "gem";
};
- version = "1.0.0";
+ version = "1.2.0";
};
rspec-core = {
dependencies = ["rspec-support"];
@@ -2278,10 +2356,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc";
+ sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6";
type = "gem";
};
- version = "3.10.1";
+ version = "3.11.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -2289,10 +2367,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17";
+ sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53";
type = "gem";
};
- version = "3.10.1";
+ version = "3.11.0";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -2300,10 +2378,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k";
+ sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3";
type = "gem";
};
- version = "3.10.2";
+ version = "3.11.0";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
@@ -2311,10 +2389,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pj2a9vrkp2xzlq0810q90sdc2zcqc7k92n57hxzhri2vcspy7n6";
+ sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa";
type = "gem";
};
- version = "5.0.1";
+ version = "5.1.1";
};
rspec-sidekiq = {
dependencies = ["rspec-core" "sidekiq"];
@@ -2332,10 +2410,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl";
+ sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03";
type = "gem";
};
- version = "3.10.2";
+ version = "3.11.0";
};
rspec_junit_formatter = {
dependencies = ["rspec-core"];
@@ -2343,10 +2421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p";
+ sha256 = "1jqh5v1kjisncfzf9z0hghkaiqab086rcgy21cy3djg828sm1bxk";
type = "gem";
};
- version = "0.4.1";
+ version = "0.5.1";
};
rubocop = {
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
@@ -2354,10 +2432,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w";
+ sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";
type = "gem";
};
- version = "1.15.0";
+ version = "1.26.1";
};
rubocop-ast = {
dependencies = ["parser"];
@@ -2365,10 +2443,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hx4im1a2qpiwipvsl3fma358ixjp4h0mhj56ichq15xrq709qlf";
+ sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
type = "gem";
};
- version = "1.5.0";
+ version = "1.16.0";
};
rubocop-rails = {
dependencies = ["activesupport" "rack" "rubocop"];
@@ -2376,10 +2454,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h8k2i6qgl7pdvb8bnh1w43zqdxqg3kglyxy9b2vdh2w7q5rrl5y";
+ sha256 = "14xagb3jbms5mlcf932kx1djn2q4k952d4xia75ll36vh7xf2fpp";
type = "gem";
};
- version = "2.10.1";
+ version = "2.14.2";
};
ruby-progressbar = {
groups = ["default" "development" "test"];
@@ -2407,10 +2485,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
+ sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
- version = "0.0.4";
+ version = "0.0.5";
};
rufus-scheduler = {
dependencies = ["fugit"];
@@ -2418,10 +2496,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bcr8y9nq0anw0gkkpl0zvzgzhhsamw2swp9jwwffd33n8fxg76c";
+ sha256 = "1jvxcvsqhalndc1wh7zfdqfg78j5sx57vrgsh54pjsm1d73q79hc";
type = "gem";
};
- version = "3.6.0";
+ version = "3.8.1";
};
safety_net_attestation = {
dependencies = ["jwt"];
@@ -2435,15 +2513,15 @@
version = "0.4.0";
};
sanitize = {
- dependencies = ["crass" "nokogiri" "nokogumbo"];
+ dependencies = ["crass" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xi2c9vbfjs0gk4i9y4mrlb3xx6g5lj22hlg5cx6hyc88ri7j4bc";
+ sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1";
type = "gem";
};
- version = "5.2.3";
+ version = "6.0.0";
};
scenic = {
dependencies = ["activerecord" "railties"];
@@ -2451,10 +2529,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11inxsg0qd6kdj8cdwbh7syvr9wzv93jpp5nhlhjwp4v9ngrm9xk";
+ sha256 = "0cl14f5lfidbvcx52q49xnxc4dccyrzyv38qjkda8dh07zsksw85";
type = "gem";
};
- version = "1.5.4";
+ version = "1.6.0";
};
securecompare = {
groups = ["default"];
@@ -2482,10 +2560,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ac57q6lnqg9h9lsj49wlwhgsfqfr83lgka1c1srk6g8vghhz662";
+ sha256 = "0fq3nxpj1c9s2bi056p9cldb7zy45bgdkjq8721zypw1pkvllb7f";
type = "gem";
};
- version = "6.2.1";
+ version = "6.4.1";
};
sidekiq-bulk = {
dependencies = ["sidekiq"];
@@ -2504,10 +2582,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ycwmpf17mdd762l5q9w01b4ms5fqrr6hb7s4ndi3nwz8pcngw91";
+ sha256 = "13pc206l9w1wklrgkcafbp332cf8ikl4wfks6ikhk9lvd6hi22sx";
type = "gem";
};
- version = "3.0.1";
+ version = "3.1.1";
};
sidekiq-unique-jobs = {
dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];
@@ -2515,10 +2593,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m8l8mwvbf6cdd7jqy0l6cg2zxi1qs8ya78jail8pvi4ay7hglm1";
+ sha256 = "1fgk2a66yn7v2011j8zk2z9mwgzmb52gjrkd5wb5xbpxwm8qfjqy";
type = "gem";
};
- version = "7.0.11";
+ version = "7.1.15";
};
simple-navigation = {
dependencies = ["activesupport"];
@@ -2590,10 +2668,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2";
+ sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min";
type = "gem";
};
- version = "3.2.2";
+ version = "3.4.2";
};
sshkit = {
dependencies = ["net-scp" "net-ssh"];
@@ -2611,10 +2689,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06lz70k8c0r7fyxk1nc3idh14x7nvsr21ydm1bsmbj00jyhmfzsn";
+ sha256 = "19rnk17rz0lhf7l9awy0s7xxyw91ydcqxlx0576xvwyi79jh6a2m";
type = "gem";
};
- version = "0.2.17";
+ version = "0.2.19";
};
statsd-ruby = {
groups = ["default"];
@@ -2642,10 +2720,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dv55gbazp96w27yhvikm2xa6ny51q88aim2by11crc0jwr5agvk";
+ sha256 = "0yk45ri2rnp00x4mdsvwdzdd9yziqxj5v9sjk74nzw0y927y3m1w";
type = "gem";
};
- version = "0.7.6";
+ version = "0.7.9";
+ };
+ swd = {
+ dependencies = ["activesupport" "attr_required" "httpclient"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0c5cdpykx2h4jx8q01hjhv8f0plw5r9iqm2i1m0ijiyk7dqm824w";
+ type = "gem";
+ };
+ version = "1.2.0";
};
temple = {
groups = ["default"];
@@ -2663,10 +2752,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dlaadjnx8aw8lhr0z8jpy2gyi7az3mks6f49d3fllilhps9ayi8";
+ sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.2";
};
terrapin = {
dependencies = ["climate_control"];
@@ -2684,10 +2773,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
+ sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
type = "gem";
};
- version = "1.1.0";
+ version = "1.2.1";
};
thwait = {
dependencies = ["e2mmap"];
@@ -2710,16 +2799,6 @@
};
version = "2.0.10";
};
- time = {
- groups = ["default" "development" "pam_authentication" "production" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ayfwm8b0c6n0z34vwfpmy83lf1gd0mq7jbybzarkqp2ylmdlzvy";
- type = "gem";
- };
- version = "0.1.0";
- };
tpm-key_attestation = {
dependencies = ["bindata" "openssl-signature_algorithm"];
groups = ["default"];
@@ -2811,10 +2890,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ik16lnsyr2739jzwl4r5sz8q639lqw8f9s68iszwhm2pcq8p4w2";
+ sha256 = "0yvfyxz70r45j65763fzy0p5j8cxlhnpn1n5lcxj4is7hp8v5i23";
type = "gem";
};
- version = "1.2021.1";
+ version = "1.2022.1";
};
unf = {
dependencies = ["unf_ext"];
@@ -2832,30 +2911,52 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+ sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
type = "gem";
};
- version = "0.0.7.7";
+ version = "0.0.8";
};
unicode-display_width = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+ sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
type = "gem";
};
- version = "1.7.0";
+ version = "2.1.0";
};
uniform_notifier = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05f81da1x7jh9xfsn8gsw6cfn42l0ldpg7zckrv875h4swknyffy";
+ sha256 = "1614dqnky0f9f1znj0lih8i184vfps86md93dw0kxrg3af9gnqb4";
type = "gem";
};
- version = "1.14.1";
+ version = "1.14.2";
+ };
+ validate_email = {
+ dependencies = ["activemodel" "mail"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx";
+ type = "gem";
+ };
+ version = "0.1.6";
+ };
+ validate_url = {
+ dependencies = ["activemodel" "public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bwj34rz7961rrl545f006m2jdz1nrc0m72gfqmnb41xwsvpagbk";
+ type = "gem";
+ };
+ version = "1.0.13";
};
warden = {
dependencies = ["rack"];
@@ -2879,16 +2980,27 @@
};
version = "3.0.0.alpha1";
};
+ webfinger = {
+ dependencies = ["activesupport" "httpclient"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zd5aid4ya47xlfsaf1mlf83vkyljpnsvgwqhchf0cs7353kdss9";
+ sha256 = "1l8vh8p0g92cqcvv0ra3mblsa4nczh0rz8nbwbkc3g3yzbva85xk";
type = "gem";
};
- version = "3.13.0";
+ version = "3.14.0";
};
webpacker = {
dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"];
@@ -2896,10 +3008,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bs6m6annfb2pazb5wb2l3lbnkaa4438ixldnamlx9hg7z3j646h";
+ sha256 = "1cq6m5qwm3bmi7hkjfmbg2cs4qjq4wswlrwcfk8l1svfqbi135v3";
type = "gem";
};
- version = "5.4.0";
+ version = "5.4.3";
};
webpush = {
dependencies = ["hkdf" "jwt"];
@@ -2918,10 +3030,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
+ sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052";
type = "gem";
};
- version = "0.7.3";
+ version = "0.7.5";
};
websocket-extensions = {
groups = ["default"];
@@ -2969,10 +3081,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
+ sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
- version = "2.4.2";
+ version = "2.5.4";
};
}
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 3493962e6bd9..5581742ebe1e 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -1,11 +1,11 @@
# This file was generated by pkgs.mastodon.updateScript.
{ fetchgit, applyPatches }: let
src = fetchgit {
- url = "https://github.com/tootsuite/mastodon.git";
- rev = "v3.4.6";
- sha256 = "1lg25m6wsnb7iabbn1vpvn85csv6ywyvcm0ji6d8iq7wwgyq77xs";
+ url = "https://github.com/mastodon/mastodon.git";
+ rev = "v3.5.0";
+ sha256 = "1181zqz7928b6mnp4p502gy2rrwxyv5ysgfydx0n04y8wiq00g48";
};
in applyPatches {
inherit src;
- patches = [ ];
+ patches = [];
}
diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh
index 7d53845a8cba..77071be6ea90 100755
--- a/pkgs/servers/mastodon/update.sh
+++ b/pkgs/servers/mastodon/update.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
-URL=https://github.com/tootsuite/mastodon.git
+URL=https://github.com/mastodon/mastodon.git
POSITIONAL=()
while [[ $# -gt 0 ]]; do
@@ -40,7 +40,7 @@ if [[ -z "$VERSION" || -n "$POSITIONAL" ]]; then
echo "URL may be any path acceptable to 'git clone' and VERSION the"
echo "semantic version number. If VERSION is not a revision acceptable to"
echo "'git checkout', you must provide one in REVISION. If URL is not"
- echo "provided, it defaults to https://github.com/tootsuite/mastodon.git."
+ echo "provided, it defaults to https://github.com/mastodon/mastodon.git."
echo "PATCHES, if provided, should be one or more Nix expressions"
echo "separated by spaces."
exit 1
diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix
index 77b242e89770..90b75fe4fd16 100644
--- a/pkgs/servers/mastodon/version.nix
+++ b/pkgs/servers/mastodon/version.nix
@@ -1 +1 @@
-"3.4.6"
+"3.5.0"
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix
index 2e5a4eca2910..6911166b0e40 100644
--- a/pkgs/tools/X11/xinput_calibrator/default.nix
+++ b/pkgs/tools/X11/xinput_calibrator/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh --with-gui=X11";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ xorgproto libXi libtool m4 xlibsWrapper ];
meta = {
homepage = "https://github.com/tias/xinput_calibrator";
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index afb1c9a3dcda..94ba5a56d032 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -31,9 +31,8 @@ in stdenv.mkDerivation {
sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw";
};
+ nativeBuildInputs = [ autoconf automake ];
buildInputs = [
- autoconf
- automake
libtool
pkg-config
glib
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix
index 4f67c86864d8..3d881717e792 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/pkgs/tools/audio/pa-applet/default.nix
@@ -11,9 +11,9 @@ stdenv.mkDerivation {
sha256 = "sha256-ihvZFXHgr5YeqMKmVY/GB86segUkQ9BYqJYfE3PTgog=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
- gtk3 libpulseaudio glibc automake autoconf libnotify libX11 xf86inputevdev
+ gtk3 libpulseaudio glibc libnotify libX11 xf86inputevdev
];
preConfigure = ''
diff --git a/pkgs/tools/cd-dvd/ventoy-bin/add-mips64.patch b/pkgs/tools/cd-dvd/ventoy-bin/add-mips64.patch
new file mode 100644
index 000000000000..66c9085d2edf
--- /dev/null
+++ b/pkgs/tools/cd-dvd/ventoy-bin/add-mips64.patch
@@ -0,0 +1,5 @@
+--- VentoyPlugson.sh
++++ VentoyPlugson.sh
+@@ -27,0 +28,2 @@ elif echo $machine | egrep -q 'x86_64|am
++elif echo $machine | egrep -q 'mips64'; then
++ TOOLDIR=mips64el
diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix
index b5f33f7a6585..cf573472307c 100644
--- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix
+++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix
@@ -1,40 +1,55 @@
{ lib, stdenv, fetchurl, fetchpatch
, autoPatchelfHook, makeWrapper
-, hexdump, exfat, dosfstools, e2fsprogs, xz, util-linux, bash, parted
-, withGtk3 ? true, gtk3
+, bash, coreutils, dosfstools, exfat, gawk, gnugrep, gnused, hexdump, parted
+, procps, util-linux, which, xz
+, withCryptsetup ? false, cryptsetup
+, withXfs ? false, xfsprogs
+, withExt4 ? false, e2fsprogs
+, withNtfs ? false, ntfs3g
+, withGtk3 ? false, gtk3
, withQt5 ? false, qt5
+, defaultGuiType ? ""
}:
-let arch = {
- x86_64-linux = "x86_64";
- i686-linux = "i386";
- aarch64-linux = "aarch64";
- mipsel-linux = "mips64el";
-}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
-defaultGuiType = if withGtk3 then "gtk3"
- else if withQt5 then "qt5"
- else "";
+assert lib.elem defaultGuiType ["" "gtk3" "qt5"];
+assert defaultGuiType == "gtk3" -> withGtk3;
+assert defaultGuiType == "qt5" -> withQt5;
+
+let
+ arch = {
+ x86_64-linux = "x86_64";
+ i686-linux = "i386";
+ aarch64-linux = "aarch64";
+ mipsel-linux = "mips64el";
+ }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
in stdenv.mkDerivation rec {
pname = "ventoy-bin";
- version = "1.0.56";
+ version = "1.0.72";
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional withQt5 qt5.wrapQtAppsHook;
- buildInputs = [ hexdump exfat dosfstools e2fsprogs xz util-linux bash parted ]
+ buildInputs = [
+ bash coreutils dosfstools exfat gawk gnugrep gnused hexdump parted procps
+ util-linux which xz
+ ] ++ lib.optional withCryptsetup cryptsetup
+ ++ lib.optional withXfs xfsprogs
+ ++ lib.optional withExt4 e2fsprogs
+ ++ lib.optional withNtfs ntfs3g
++ lib.optional withGtk3 gtk3
++ lib.optional withQt5 qt5.qtbase;
src = fetchurl {
url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
- sha256 = "da53d51e653092a170c11dd560e0ad6fb27c497dd77ad0ba483c32935c069dea";
+ sha256 = "sha256-1mfe6ZnqkeBNGNjI7Qx7jG5FLgfn6rVwr0VQvSOG7Ow=";
};
patches = [
(fetchpatch {
name = "sanitize.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=ventoy-bin&id=ce4c26c67a1de4b761f9448bf92e94ffae1c8148";
- sha256 = "c00f9f9cd5b4f81c566267b7b2480fa94d28dda43a71b1e47d6fa86f764e7038";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=19f8922b3d96c5ff55eeefc269ae43369a0748e8";
+ sha256 = "sha256-RDdxPCmrfNMwXNuJwQW48fAiJPbMjdHiBmF03fKqm2o=";
})
./fix-for-read-only-file-system.patch
+ ./add-mips64.patch
];
patchFlags = [ "-p0" ];
postPatch = ''
@@ -42,7 +57,8 @@ in stdenv.mkDerivation rec {
find -type f -name \*.sh -exec chmod a+x '{}' \;
# Fix path to log.
- sed -i 's:[lL]og\.txt:/var/log/ventoy\.log:g' WebUI/static/js/languages.js
+ sed -i 's:log\.txt:/var/log/ventoy\.log:g' \
+ WebUI/static/js/languages.js tool/languages.json
'';
installPhase = ''
# Setup variables.
@@ -66,8 +82,8 @@ in stdenv.mkDerivation rec {
aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};;
mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};;
esac
- rm README
- rm tool/"$ARCH"/Ventoy2Disk.gtk2
+ rm README tool/VentoyWorker.sh.orig
+ rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el.
# Copy from "$src" to "$out".
mkdir -p "$out"/bin "$VENTOY_PATH"
@@ -76,20 +92,24 @@ in stdenv.mkDerivation rec {
# Fill bin dir.
for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \
CreatePersistentImg.sh_ventoy-persistent \
- ExtendPersistentImg.sh_ventoy-extend-persistent; do
- makeWrapper "$VENTOY_PATH/''${f%_*}" "$out/bin/''${f#*_}" \
+ ExtendPersistentImg.sh_ventoy-extend-persistent \
+ VentoyPlugson.sh_ventoy-plugson; do
+ local bin="''${f%_*}" wrapper="''${f#*_}"
+ makeWrapper "$VENTOY_PATH/$bin" "$out/bin/$wrapper" \
--prefix PATH : "${lib.makeBinPath buildInputs}" \
--run "cd '$VENTOY_PATH' || exit 1"
done
'' + lib.optionalString (withGtk3 || withQt5) ''
+ # VentoGUI uses the `ventoy_gui_type` file to determine the type of GUI.
+ # See .
echo "${defaultGuiType}" > "$VENTOY_PATH/ventoy_gui_type"
makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \
--prefix PATH : "${lib.makeBinPath buildInputs}" \
--run "cd '$VENTOY_PATH' || exit 1"
'' + lib.optionalString (!withGtk3) ''
- rm "$out"/share/ventoy/tool/"$ARCH"/Ventoy2Disk.gtk3
+ rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.gtk3"
'' + lib.optionalString (!withQt5) ''
- rm "$out"/share/ventoy/tool/"$ARCH"/Ventoy2Disk.qt5
+ rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"
'';
meta = with lib; {
@@ -99,10 +119,14 @@ in stdenv.mkDerivation rec {
ISO/WIM/IMG/VHD(x)/EFI files. With ventoy, you don't need to format the
disk over and over, you just need to copy the ISO/WIM/IMG/VHD(x)/EFI
files to the USB drive and boot them directly. You can copy many files
- at a time and ventoy will give you a boot menu to select them
- (screenshot). x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and
- MIPS64EL UEFI are supported in the same way. Most type of OS supported
- (Windows/WinPE/Linux/Unix/VMware/Xen...).
+ at a time and ventoy will give you a boot menu to select them. You can
+ also browse ISO/WIM/IMG/VHD(x)/EFI files in local disk and boot them.
+ x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and MIPS64EL UEFI are
+ supported in the same way. Most type of OS supported
+ (Windows/WinPE/Linux/ChromeOS/Unix/VMware/Xen...). With ventoy you can
+ also browse ISO/WIM/IMG/VHD(x)/EFI files in local disk and boot them.
+ 800+ image files are tested. 90%+ distros in
+ supported.
'';
homepage = "https://www.ventoy.net";
changelog = "https://www.ventoy.net/doc_news.html";
diff --git a/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch b/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch
index fa3eb7c38b34..d448417bf913 100644
--- a/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch
+++ b/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch
@@ -1,7 +1,6 @@
-diff -Naurp0 old/CreatePersistentImg.sh new/CreatePersistentImg.sh
---- CreatePersistentImg.sh 2021-07-17 13:13:51.000000000 +0300
-+++ CreatePersistentImg.sh 2021-07-20 17:37:53.605911754 +0300
-@@ -94,7 +94,3 @@ if [ -n "$config" ]; then
+--- CreatePersistentImg.sh
++++ CreatePersistentImg.sh
+@@ -110,7 +110,3 @@ if [ -n "$config" ]; then
- if [ -d ./persist_tmp_mnt ]; then
- rm -rf ./persist_tmp_mnt
- fi
@@ -9,110 +8,47 @@ diff -Naurp0 old/CreatePersistentImg.sh new/CreatePersistentImg.sh
- mkdir ./persist_tmp_mnt
- if mount $freeloop ./persist_tmp_mnt; then
- echo '/ union' > ./persist_tmp_mnt/$config
-+ path_to_persist_mnt="$(mktemp -d)"
++ path_to_persist_mnt="`mktemp -d`"
+ if mount $freeloop "$path_to_persist_mnt"; then
+ echo '/ union' > "$path_to_persist_mnt"/$config
-@@ -102 +98 @@ if [ -n "$config" ]; then
+@@ -118 +114 @@ if [ -n "$config" ]; then
- umount ./persist_tmp_mnt
+ umount "$path_to_persist_mnt"
-@@ -104 +100 @@ if [ -n "$config" ]; then
+@@ -120 +116 @@ if [ -n "$config" ]; then
- rm -rf ./persist_tmp_mnt
+ rm -rf "$path_to_persist_mnt"
-diff -Naurp0 old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh
---- tool/VentoyWorker.sh 2021-07-17 13:13:51.000000000 +0300
-+++ tool/VentoyWorker.sh 2021-07-20 17:27:10.885452119 +0300
-@@ -153,12 +152,0 @@ fi
+--- tool/VentoyWorker.sh
++++ tool/VentoyWorker.sh
+@@ -162,12 +161,0 @@ fi
-#check tmp_mnt directory
-if [ -d ./tmp_mnt ]; then
- vtdebug "There is a tmp_mnt directory, now delete it."
- umount ./tmp_mnt >/dev/null 2>&1
- rm -rf ./tmp_mnt
- if [ -d ./tmp_mnt ]; then
-- vterr "tmp_mnt directory exits, please delete it first."
+- vterr "tmp_mnt directory exists, please delete it first."
- exit 1
- fi
-fi
-
-
-@@ -322 +310 @@ if [ "$MODE" = "install" ]; then
-- mkdir ./tmp_mnt
-+ path_to_mnt="$(mktemp -d)"
-@@ -326 +314 @@ if [ "$MODE" = "install" ]; then
-- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then
-+ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then
-@@ -335,9 +323,9 @@ if [ "$MODE" = "install" ]; then
-- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
-- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi
-- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
-- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi
-- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi
-- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi
-- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
-- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
-- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
-+ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
-+ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi
-+ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
-+ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi
-+ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi
-+ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi
-+ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
-+ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
-+ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
-@@ -348 +336 @@ if [ "$MODE" = "install" ]; then
-- if umount ./tmp_mnt; then
-+ if umount "$path_to_mnt"; then
-@@ -350 +338 @@ if [ "$MODE" = "install" ]; then
-- rm -rf ./tmp_mnt
-+ rm -rf "$path_to_mnt"
-@@ -407,2 +395,2 @@ else
+@@ -569,2 +557,2 @@ else
- rm -f ./diskuuid.bin
- dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin
-+ path_to_diskuuid="$(mktemp)"
++ path_to_diskuuid="`mktemp`"
+ dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid"
-@@ -411,2 +399,2 @@ else
+@@ -573,2 +561,2 @@ else
- dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384
- rm -f ./diskuuid.bin
+ dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384
+ rm -f "$path_to_diskuuid"
-@@ -415,2 +403,2 @@ else
+@@ -577,2 +565,2 @@ else
- rm -f ./rsvdata.bin
- dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin
-+ path_to_rsvdata="$(mktemp)"
++ path_to_rsvdata="`mktemp`"
+ dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata"
-@@ -438,2 +426,2 @@ else
+@@ -600,2 +588,2 @@ else
- dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK}
- rm -f ./rsvdata.bin
+ dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK}
+ rm -f "$path_to_rsvdata"
-@@ -448 +436 @@ else
-- mkdir ./tmp_mnt
-+ path_to_mnt="$(mktemp -d)"
-@@ -454 +442 @@ else
-- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then
-+ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then
-@@ -463,9 +451,9 @@ else
-- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
-- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi
-- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
-- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi
-- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi
-- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi
-- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
-- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
-- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
-+ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
-+ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi
-+ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
-+ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi
-+ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi
-+ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi
-+ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
-+ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI
-+ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI
-@@ -476 +464 @@ else
-- if umount ./tmp_mnt > /dev/null 2>&1; then
-+ if umount "$path_to_mnt" > /dev/null 2>&1; then
-@@ -478 +466 @@ else
-- rm -rf ./tmp_mnt
-+ rm -rf "$path_to_mnt"
diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix
index ec05a44a5189..a8463f8abc4e 100644
--- a/pkgs/tools/compression/pixz/default.nix
+++ b/pkgs/tools/compression/pixz/default.nix
@@ -18,10 +18,8 @@ stdenv.mkDerivation rec {
pname = "pixz";
version = "1.0.7";
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
- autoconf
- automake
libtool
asciidoc
libxslt
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
index 0149071ab0d0..0367ed6037e2 100644
--- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix
+++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x";
};
- nativeBuildInputs = [ pkg-config makeWrapper ];
- buildInputs = [ fuse autoconf automake ];
+ nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ];
+ buildInputs = [ fuse ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 3c1e0c50d614..e25c50e09503 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,7 +15,7 @@ let
buildInputs = [
fuse bison flex openssl ncurses readline
- autoconf automake libtool pkg-config zlib libaio libxml2
+ libtool pkg-config zlib libaio libxml2
acl sqlite liburcu attr makeWrapper util-linux libtirpc gperftools
liburing
(python3.withPackages (pkgs: [
@@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
"--localstatedir=/var"
];
- nativeBuildInputs = [ rpcsvc-proto ];
+ nativeBuildInputs = [ rpcsvc-proto autoconf automake ];
makeFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix
index 8976700006bc..7cac5a8e21bd 100644
--- a/pkgs/tools/graphics/pgf/default.nix
+++ b/pkgs/tools/graphics/pgf/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1vfm12cfq3an3xg0679bcwdmjq2x1bbij1iwsmm60hwmrm3zvab0";
};
- buildInputs = [ autoconf automake libtool dos2unix libpgf freeimage doxygen ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool dos2unix libpgf freeimage doxygen ];
patchPhase = ''
sed 1i'#include ' -i src/PGF.cpp
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 735bba8bd4f4..537e5d0a6db0 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "0hy5a3q5092szk2x3s9lpn1zkszgq9bp15rxzdncxlvnanyzsasf";
};
-
- buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ];
+ nativeBuildInputs = [ automake autoconf ];
+ buildInputs = [ boost zlib libpng libjpeg libtiff xlibsWrapper SDL ];
# the installPhase wants to put files into $HOME. I let it put the files
# to $TMPDIR, so they don't get into the $out
diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix
index 0322f3b708f1..e287306dfb94 100644
--- a/pkgs/tools/misc/cunit/default.nix
+++ b/pkgs/tools/misc/cunit/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "CUnit";
version = "2.1-3";
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [autoconf automake libtool];
+ nativeBuildInputs = [ autoreconfHook autoconf automake ];
+ buildInputs = [libtool];
src = fetchurl {
url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 759e86080903..f8862cfa5677 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl ];
preConfigure = ''
cd ldapvi
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index a826f3a0de54..9635f8e1a8cc 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
configureScript = "sh autogen.sh";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ gtk-doc lvm2 libxslt.bin
libtool readline gobject-introspection json-glib libuuid
];
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index bffcd5e1dca4..18ba5f4b5fc5 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
})
];
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ autoconf automake curl jdk nettools python2 git ];
+ nativeBuildInputs = [ makeWrapper autoconf automake ];
+ buildInputs = [ curl jdk nettools python2 git ];
preConfigure = ''
patchShebangs ./build-aux/
diff --git a/pkgs/tools/misc/scrub/default.nix b/pkgs/tools/misc/scrub/default.nix
index baa3732b5840..f3a1ae619305 100644
--- a/pkgs/tools/misc/scrub/default.nix
+++ b/pkgs/tools/misc/scrub/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0ndcri2ddzqlsxvy1b607ajyd4dxpiagzx331yyi7hf3ijph129f";
};
- buildInputs = [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 409072f50bac..d440a55f334b 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
- version = "3.18.3";
+ version = "3.19.0";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
- sha256 = "sha256-DsIqG+r2PrMKEypLuLky60U3nXNt0Ms9YrZetIQGnpE=";
+ sha256 = "sha256-mhz+SjJwVsosbfJLnFUBt4y6W+afQFokciuBrFpfC48=";
};
- vendorSha256 = "sha256-hYrv5z+9JY7gXkC4xQvko7qhwBtzywUy0TMqrlgqXb0=";
+ vendorSha256 = "sha256-DGeMSyyucdU1FGRfil3I12UZ4DR1nQWD9oEDRhWQQzo=";
outputs = [ "out" "wordlists" ];
diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix
index c67a8747aa89..940c7d58904c 100644
--- a/pkgs/tools/networking/ipinfo/default.nix
+++ b/pkgs/tools/networking/ipinfo/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ipinfo";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchFromGitHub {
owner = pname;
repo = "cli";
rev = "${pname}-${version}";
- sha256 = "sha256-5kXFSxdZrlaBX+7R9hlM+40+3KlJ7g8xu4BN2PyxXEc=";
+ sha256 = "sha256-hvn50sn1UHkC2K0U5beRAYkAe8y/5sYH7Xed3atXzDo=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index 748bfdcb2cad..456ea0890cac 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake openssl libgsf gmp ];
+ nativeBuildInputs = [ pkg-config autoconf automake ];
+ buildInputs = [ openssl libgsf gmp ];
installPhase =
''
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index 7cd6b5fd194b..a0c6e0a5f628 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "1k6kj0913imwh53lh6hrhqmrpygqg2h462raafjsn7gbd3vkgx8n";
};
- buildInputs = [ autoconf automake which procps kbd ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ which procps kbd ];
postPatch = ''
substituteInPlace src/Makefile.am --replace 'root' '$(id -u)'
diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix
index f8f7bece3a59..5b30d5270df9 100644
--- a/pkgs/tools/security/zzuf/default.nix
+++ b/pkgs/tools/security/zzuf/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9";
};
- buildInputs = [ autoconf automake libtool pkg-config ];
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool pkg-config ];
preConfigure = "./bootstrap";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc9b7d6f7ca2..ce5af28eff68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19524,7 +19524,7 @@ with pkgs;
nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
- nvidia-vaapi-driver = callPackage ../development/libraries/nvidia-vaapi-driver { };
+ nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { };
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix
index bc91b9e26a4f..d15db2b1d388 100644
--- a/pkgs/top-level/emscripten-packages.nix
+++ b/pkgs/top-level/emscripten-packages.nix
@@ -83,8 +83,8 @@ rec {
pname = "xmlmirror";
version = "unstable-2016-06-05";
- buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
- nativeBuildInputs = [ pkg-config zlib ];
+ buildInputs = [ pkg-config libtool gnumake libxml2 nodejs openjdk json_c ];
+ nativeBuildInputs = [ pkg-config zlib autoconf automake ];
src = pkgs.fetchgit {
url = "https://gitlab.com/odfplugfest/xmlmirror.git";