Merge remote-tracking branch 'nixpkgs/master' into staging-next

Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
main
Alyssa Ross 2 years ago
commit ac5a927919
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
  1. 4
      nixos/modules/services/web-apps/mastodon.nix
  2. 4
      pkgs/applications/audio/industrializer/default.nix
  3. 3
      pkgs/applications/audio/pd-plugins/zexy/default.nix
  4. 4
      pkgs/applications/audio/timemachine/default.nix
  5. 3
      pkgs/applications/audio/xsynth-dssi/default.nix
  6. 4
      pkgs/applications/blockchains/cgminer/default.nix
  7. 3
      pkgs/applications/editors/wxhexeditor/default.nix
  8. 4
      pkgs/applications/misc/gsimplecal/default.nix
  9. 4
      pkgs/applications/misc/pcmanx-gtk2/default.nix
  10. 86
      pkgs/applications/networking/cluster/openshift/default.nix
  11. 4
      pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
  12. 3
      pkgs/applications/networking/irc/bip/default.nix
  13. 4
      pkgs/applications/networking/irc/irssi/fish/default.nix
  14. 3
      pkgs/applications/networking/owamp/default.nix
  15. 4
      pkgs/applications/networking/p2p/twister/default.nix
  16. 4
      pkgs/applications/office/pinpoint/default.nix
  17. 3
      pkgs/applications/science/biology/kssd/default.nix
  18. 4
      pkgs/applications/science/electronics/gerbv/default.nix
  19. 3
      pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
  20. 10
      pkgs/applications/virtualization/virt-viewer/default.nix
  21. 3
      pkgs/data/misc/ddccontrol-db/default.nix
  22. 4
      pkgs/development/compilers/aldor/default.nix
  23. 3
      pkgs/development/compilers/aliceml/default.nix
  24. 3
      pkgs/development/compilers/ecl/16.1.2.nix
  25. 4
      pkgs/development/compilers/fsharp/default.nix
  26. 3
      pkgs/development/compilers/ios-cross-compile/9.2.nix
  27. 3
      pkgs/development/compilers/x11basic/default.nix
  28. 4
      pkgs/development/interpreters/love/0.10.nix
  29. 4
      pkgs/development/interpreters/love/11.nix
  30. 3
      pkgs/development/libraries/dssi/default.nix
  31. 3
      pkgs/development/libraries/fastjson/default.nix
  32. 4
      pkgs/development/libraries/givaro/3.7.nix
  33. 4
      pkgs/development/libraries/givaro/3.nix
  34. 4
      pkgs/development/libraries/givaro/default.nix
  35. 4
      pkgs/development/libraries/gnet/default.nix
  36. 3
      pkgs/development/libraries/gumbo/default.nix
  37. 4
      pkgs/development/libraries/keybinder/default.nix
  38. 4
      pkgs/development/libraries/languagemachines/frog.nix
  39. 4
      pkgs/development/libraries/languagemachines/frogdata.nix
  40. 4
      pkgs/development/libraries/languagemachines/libfolia.nix
  41. 4
      pkgs/development/libraries/languagemachines/mbt.nix
  42. 4
      pkgs/development/libraries/languagemachines/ticcutils.nix
  43. 4
      pkgs/development/libraries/languagemachines/timbl.nix
  44. 4
      pkgs/development/libraries/languagemachines/timblserver.nix
  45. 4
      pkgs/development/libraries/languagemachines/ucto.nix
  46. 4
      pkgs/development/libraries/languagemachines/uctodata.nix
  47. 4
      pkgs/development/libraries/lasso/default.nix
  48. 3
      pkgs/development/libraries/libHX/default.nix
  49. 4
      pkgs/development/libraries/libcangjie/default.nix
  50. 3
      pkgs/development/libraries/libcrafter/default.nix
  51. 3
      pkgs/development/libraries/libdnet/default.nix
  52. 4
      pkgs/development/libraries/libmx/default.nix
  53. 3
      pkgs/development/libraries/libstroke/default.nix
  54. 4
      pkgs/development/libraries/neardal/default.nix
  55. 3
      pkgs/development/libraries/xcb-util-cursor/HEAD.nix
  56. 18
      pkgs/development/python-modules/aiosmb/default.nix
  57. 6
      pkgs/development/python-modules/einops/default.nix
  58. 12
      pkgs/development/python-modules/elegy/default.nix
  59. 4
      pkgs/development/python-modules/motionblinds/default.nix
  60. 15
      pkgs/development/python-modules/optax/default.nix
  61. 13
      pkgs/development/python-modules/plac/default.nix
  62. 42
      pkgs/development/python-modules/pybindgen/default.nix
  63. 4
      pkgs/development/python-modules/pysigma/default.nix
  64. 6
      pkgs/development/python-modules/restfly/default.nix
  65. 4
      pkgs/development/python-modules/scmrepo/default.nix
  66. 23
      pkgs/development/python-modules/treeo/default.nix
  67. 12
      pkgs/development/python-modules/treex/default.nix
  68. 6
      pkgs/development/tools/analysis/tfsec/default.nix
  69. 4
      pkgs/development/tools/misc/distcc/default.nix
  70. 4
      pkgs/development/tools/misc/hydra/common.nix
  71. 3
      pkgs/games/garden-of-coloured-lights/default.nix
  72. 3
      pkgs/games/gl-117/default.nix
  73. 3
      pkgs/games/qqwing/default.nix
  74. 3
      pkgs/games/zangband/default.nix
  75. 3
      pkgs/misc/cups/drivers/cnijfilter2/default.nix
  76. 3
      pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
  77. 3
      pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
  78. 3
      pkgs/os-specific/linux/conspy/default.nix
  79. 10
      pkgs/os-specific/linux/cpupower-gui/default.nix
  80. 4
      pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
  81. 2
      pkgs/servers/http/spawn-fcgi/default.nix
  82. 19
      pkgs/servers/mastodon/default.nix
  83. 900
      pkgs/servers/mastodon/gemset.nix
  84. 8
      pkgs/servers/mastodon/source.nix
  85. 4
      pkgs/servers/mastodon/update.sh
  86. 2
      pkgs/servers/mastodon/version.nix
  87. 4
      pkgs/tools/X11/xinput_calibrator/default.nix
  88. 3
      pkgs/tools/audio/mpdcron/default.nix
  89. 4
      pkgs/tools/audio/pa-applet/default.nix
  90. 5
      pkgs/tools/cd-dvd/ventoy-bin/add-mips64.patch
  91. 78
      pkgs/tools/cd-dvd/ventoy-bin/default.nix
  92. 96
      pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch
  93. 4
      pkgs/tools/compression/pixz/default.nix
  94. 4
      pkgs/tools/filesystems/fuse-7z-ng/default.nix
  95. 4
      pkgs/tools/filesystems/glusterfs/default.nix
  96. 3
      pkgs/tools/graphics/pgf/default.nix
  97. 4
      pkgs/tools/graphics/povray/default.nix
  98. 4
      pkgs/tools/misc/cunit/default.nix
  99. 4
      pkgs/tools/misc/ldapvi/default.nix
  100. 4
      pkgs/tools/misc/ldmtool/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -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
<code>https://github.com/tootsuite/mastodon/blob/master/dist/nginx.conf</code>.
<code>https://github.com/mastodon/mastodon/blob/master/dist/nginx.conf</code>.
'';
type = lib.types.bool;
default = false;

@ -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

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp";
};
buildInputs = [ autoconf automake puredata ];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ puredata ];
preBuild = ''
export LD=$CXX

@ -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
];

@ -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 = ''

@ -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";

@ -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 .";

@ -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";

@ -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

@ -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;
};
}

@ -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

@ -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 = [

@ -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";

@ -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";

@ -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
];

@ -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; {

@ -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

@ -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"];

@ -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 = {

@ -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

@ -21,10 +21,9 @@ stdenv.mkDerivation rec {
./autogen.sh
'';
nativeBuildInputs = [ autoconf automake ];
buildInputs =
[
autoconf
automake
libtool
intltool
];

@ -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 ;

@ -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

@ -25,10 +25,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
libtool
autoconf
automake
makeWrapper
];
propagatedBuildInputs = [

@ -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

@ -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 = {

@ -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";

@ -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";

@ -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";

@ -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; {

@ -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

@ -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;

@ -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;

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [autoconf automake libtool];
nativeBuildInputs = [ autoreconfHook autoconf automake ];
buildInputs = [libtool];
propagatedBuildInputs = [ gmpxx ];
configureFlags = [

@ -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";

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1";
};
buildInputs = [ autoconf automake libtool ];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool ];
preConfigure = "./autogen.sh";

@ -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
];

@ -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

@ -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 = ''

@ -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

@ -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

@ -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

@ -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
];

@ -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

@ -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

@ -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; {

@ -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 \

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
patches = [];
buildInputs = [ autoconf automake libtool ];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool ];
preConfigure = ''
sh autogen.sh

@ -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";

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-libpcap=yes" ];
buildInputs = [ autoconf automake libtool ];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool ];
propagatedBuildInputs = [ libpcap ];

@ -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 = ''

@ -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

@ -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.

@ -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"

@ -21,9 +21,8 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
autoconf
automake
gnum4
gperf
libtool

@ -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";

@ -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

@ -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
];

@ -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 = [

@ -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"
];

@ -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";

@ -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
];
checkInputs = [ pygccxml ];
doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k
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 ];
};
}

@ -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 = [

@ -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 = [

@ -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 = [

@ -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

@ -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 = [

@ -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"

@ -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)

@ -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" ];

@ -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 //'

@ -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";

@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
--replace "sudo " ""
'';
buildInputs = [ perl autoconf automake libtool ];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ perl libtool ];
makeFlags = [ "prefix=$(out)" "tgz" ];

@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
ncurses flex bison autoconf automake m4
ncurses flex bison m4
];
preConfigure = ''

@ -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

@ -25,7 +25,8 @@ stdenv.mkDerivation {
sha256 = "06s9nl155yxmx56056y22kz1p5b2sb5fhr3gf4ddlczjkd1xch53";
};
buildInputs = [ autoconf libtool automake
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool
cups popt libtiff libpng
ghostscript ];

@ -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 ];

@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
curlOpts = " -A application/octet-stream ";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
autoconf
automake
ncurses
];

@ -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

@ -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"];

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07r6nwbg4881mdgp0hqh80c4x9wb7jg6cgc84ghwhfbd2abc2iq5";
};
buildInputs = [ automake autoconf ];
nativeBuildInputs = [ automake autoconf ];
preConfigure = ''
./autogen.sh

@ -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

File diff suppressed because it is too large Load Diff

@ -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 = [];
}

@ -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

@ -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";

@ -31,9 +31,8 @@ in stdenv.mkDerivation {
sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
autoconf
automake
libtool
pkg-config
glib

@ -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 = ''

@ -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

@ -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 <https://github.com/ventoy/Ventoy/blob/471432fc50ffad80bde5de0b22e4c30fa3aac41b/LinuxGUI/Ventoy2Disk/ventoy_gui.c#L1044>.
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 <distrowatch.com>
supported.
'';
homepage = "https://www.ventoy.net";
changelog = "https://www.ventoy.net/doc_news.html";

@ -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"

@ -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

@ -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";

@ -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)" ];

@ -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 <inttypes.h>' -i src/PGF.cpp

@ -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

@ -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";

@ -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

@ -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
];

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

Loading…
Cancel
Save