Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit 4c08a8409e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      maintainers/maintainer-list.nix
  2. 4
      pkgs/applications/audio/faust/faustlive.nix
  3. 4
      pkgs/applications/blockchains/ergo/default.nix
  4. 12
      pkgs/applications/graphics/glabels/default.nix
  5. 4
      pkgs/applications/graphics/photoflare/default.nix
  6. 4
      pkgs/applications/misc/bottles/default.nix
  7. 9
      pkgs/applications/misc/opentx/default.nix
  8. 12
      pkgs/applications/networking/sniproxy/default.nix
  9. 12
      pkgs/applications/science/electronics/gerbv/default.nix
  10. 89
      pkgs/applications/terminal-emulators/contour/default.nix
  11. 4
      pkgs/applications/virtualization/distrobox/default.nix
  12. 20
      pkgs/applications/virtualization/open-vm-tools/default.nix
  13. 18
      pkgs/applications/window-managers/awesome/default.nix
  14. 8
      pkgs/data/misc/hackage/pin.json
  15. 6
      pkgs/data/misc/v2ray-domain-list-community/default.nix
  16. 6
      pkgs/data/misc/v2ray-geoip/default.nix
  17. 4
      pkgs/desktops/gnome/core/mutter/3.38/default.nix
  18. 4
      pkgs/desktops/gnome/core/mutter/default.nix
  19. 60
      pkgs/development/compilers/firrtl/default.nix
  20. 1
      pkgs/development/compilers/smlnj/bootstrap.nix
  21. 1
      pkgs/development/compilers/smlnj/default.nix
  22. 6
      pkgs/development/guile-modules/guile-json/default.nix
  23. 49
      pkgs/development/haskell-modules/configuration-common.nix
  24. 2
      pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
  25. 3
      pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
  26. 3
      pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
  27. 100
      pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
  28. 6
      pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
  29. 8
      pkgs/development/haskell-modules/configuration-nix.nix
  30. 12
      pkgs/development/haskell-modules/generic-builder.nix
  31. 2683
      pkgs/development/haskell-modules/hackage-packages.nix
  32. 1
      pkgs/development/libraries/glibc/common.nix
  33. 3
      pkgs/development/libraries/glibc/multi.nix
  34. 8
      pkgs/development/libraries/tbb/default.nix
  35. 10
      pkgs/development/libraries/zlog/default.nix
  36. 25
      pkgs/development/ocaml-modules/bwd/default.nix
  37. 67
      pkgs/development/ocaml-modules/cooltt/default.nix
  38. 26
      pkgs/development/ocaml-modules/yuujinchou/default.nix
  39. 4
      pkgs/development/python-modules/brother/default.nix
  40. 4
      pkgs/development/python-modules/celery/default.nix
  41. 4
      pkgs/development/python-modules/python-telegram-bot/default.nix
  42. 6
      pkgs/development/tools/azcopy/default.nix
  43. 6
      pkgs/development/tools/frugal/default.nix
  44. 5
      pkgs/development/tools/pandoc/default.nix
  45. 21
      pkgs/development/web/shopify-themekit/default.nix
  46. 300
      pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix
  47. 33
      pkgs/os-specific/linux/atop/default.nix
  48. 6
      pkgs/os-specific/linux/syslinux/default.nix
  49. 12
      pkgs/servers/http/apache-modules/mod_tile/default.nix
  50. 6
      pkgs/servers/mail/dspam/default.nix
  51. 10
      pkgs/servers/x11/xorg/default.nix
  52. 10
      pkgs/servers/x11/xorg/overrides.nix
  53. 2
      pkgs/servers/x11/xorg/tarballs.list
  54. 6
      pkgs/tools/admin/fits-cloudctl/default.nix
  55. 6
      pkgs/tools/misc/fd/default.nix
  56. 6
      pkgs/tools/misc/foma/default.nix
  57. 29
      pkgs/tools/misc/gh-cal/default.nix
  58. 6
      pkgs/tools/misc/topgrade/default.nix
  59. 6
      pkgs/tools/networking/dirb/default.nix
  60. 4
      pkgs/tools/networking/flannel/default.nix
  61. 4
      pkgs/tools/networking/ipinfo/default.nix
  62. 73
      pkgs/tools/security/spectre-cli/default.nix
  63. 5
      pkgs/tools/system/foremost/default.nix
  64. 6
      pkgs/tools/text/mdbook-mermaid/default.nix
  65. 6
      pkgs/tools/text/sad/default.nix
  66. 206
      pkgs/top-level/all-packages.nix
  67. 4
      pkgs/top-level/ocaml-packages.nix

@ -3765,6 +3765,13 @@
githubId = 11006031;
name = "Leo Maroni";
};
emmabastas = {
email = "emma.bastas@protonmail.com";
matrix = "@emmabastas:matrix.org";
github = "emmabastas";
githubId = 22533224;
name = "Emma Bastås";
};
emmanuelrosa = {
email = "emmanuelrosa@protonmail.com";
matrix = "@emmanuelrosa:matrix.org";

@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
pname = "faustlive";
version = "2.5.8";
version = "2.5.10";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faustlive";
rev = version;
sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8=";
sha256 = "sha256-yLpIJr6A+NIX9RSGfQXT0O0USuRr0Ni9aUA+mbk31/o=";
fetchSubmodules = true;
};

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.23";
version = "4.0.30";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-ZpBTfL8ghLOo8C9yDUfKelblpIlwdVAOgYVvqmxJQXo=";
sha256 = "sha256-Jeufmt2Dso13Z/TQnSA8IPNxTfha+wcklKZb+BF/dNE=";
};
nativeBuildInputs = [ makeWrapper ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkg-config, yelp-tools
}:
@ -12,6 +12,16 @@ stdenv.mkDerivation rec {
sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/jimevins/glabels/pull/76
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/jimevins/glabels/commit/f64e3f34e3631330fff2fb48ab271ff9c6160229.patch";
sha256 = "13q6g4bxzvzwjnvzkvijds2b6yvc4xqbdwgqnwmj65ln6ngxz8sa";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc yelp-tools

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "photoflare";
version = "1.6.7.1";
version = "1.6.10";
src = fetchFromGitHub {
owner = "PhotoFlare";
repo = "photoflare";
rev = "v${version}";
sha256 = "sha256-7b7ICcHuMjOMtyQDkokoHeZrF4G+bOzgRJP4mkns+Zc=";
sha256 = "sha256-lQIzvI6rjcx8pHni9LN15LWyIkMALvyYx54G9WyqpOo=";
};
nativeBuildInputs = [ qmake qttools ];

@ -20,13 +20,13 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "bottles";
version = "2022.5.14-trento-1";
version = "2022.5.28-trento-2";
src = fetchFromGitHub {
owner = "bottlesdevs";
repo = pname;
rev = version;
sha256 = "sha256-w5nSMJnt4WO1KOJvdjM1TYSOvPnogERgQWp1JVr3TZY=";
sha256 = "sha256-q4arUiHcAvkytcxnbLbMRzFVOgWqEXNIZt9Y8l3dAig=";
};
postPatch = ''

@ -6,16 +6,13 @@
mkDerivation rec {
pname = "opentx";
version = "2.3.14";
version = "2.3.15";
src = fetchFromGitHub {
owner = "opentx";
repo = "opentx";
# 2.3.14 release tag points to the commit before the one that updates the
# version number.
# rev = "release/${version}";
rev = "1e09791a1e2fe2a0ca9835019d634a4c6a4fa3bf";
sha256 = "0mhzp1j6nmqvkjxg8lv8xa637m1lavdsak30mdlq0g25dhwg6k92";
rev = "release/${version}";
sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g=";
};
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext, libev, pcre, pkg-config, udns }:
stdenv.mkDerivation rec {
pname = "sniproxy";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm";
};
patches = [
# Pull upstream fix for -fno-common toolchain support:
# https://github.com/dlundquist/sniproxy/pull/349
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/dlundquist/sniproxy/commit/711dd14affd5d0d918cd5fd245328450e60c7111.patch";
sha256 = "1vlszib2gzxnkl9zbbrf2jz632j1nhs4aanpw7qqnx826zmli0a6";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ gettext libev pcre udns ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
{ lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
stdenv.mkDerivation {
pname = "gerbv";
@ -10,6 +10,16 @@ stdenv.mkDerivation {
sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchains:
# https://sourceforge.net/p/gerbv/patches/84/
(fetchpatch {
name = "fnoc-mmon.patch";
url = "https://sourceforge.net/p/gerbv/patches/84/attachment/0001-gerbv-fix-build-on-gcc-10-fno-common.patch";
sha256 = "1avfbkqhxl7wxn1z19y30ilkwvdgpdkzhzawrs5y3damxmqq8ggk";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
buildInputs = [ gettext libtool cairo gtk2 ];

@ -1,30 +1,99 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre, nixosTests }:
{ lib
, stdenv
, mkDerivation
, fetchFromGitHub
, cmake
, pkg-config
, freetype
, fontconfig
, libGL
, pcre
, boost
, catch2
, fmt
, microsoft_gsl
, range-v3
, libyamlcpp
, ncurses
, file
, darwin
, nixosTests
}:
let
# Commits refs come from https://github.com/contour-terminal/contour/blob/master/scripts/install-deps.sh
libunicode-src = fetchFromGitHub {
owner = "contour-terminal";
repo = "libunicode";
rev = "c2369b6380df1197476b08d3e2d0e96b6446f776";
sha256 = "sha256-kq7GpFCkrJG7F9/YEGz3gMTgYzhp/QB8D5b9wwMaLvQ=";
};
termbench-pro-src = fetchFromGitHub {
owner = "contour-terminal";
repo = "termbench-pro";
rev = "cd571e3cebb7c00de9168126b28852f32fb204ed";
sha256 = "sha256-dNtOmBu63LFYfiGjXf34C2tiG8pMmsFT4yK3nBnK9WI=";
};
in
mkDerivation rec {
pname = "contour";
version = "0.1.1";
version = "0.3.1.200";
src = fetchFromGitHub {
owner = "christianparpart";
owner = "contour-terminal";
repo = pname;
rev = "v${version}";
sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI=";
fetchSubmodules = true;
sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4=";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [
cmake
pkg-config
ncurses
file
];
buildInputs = [
fontconfig
freetype
libGL
pcre
boost
catch2
fmt
microsoft_gsl
range-v3
libyamlcpp
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ];
preConfigure = ''
mkdir -p _deps/sources
cat > _deps/sources/CMakeLists.txt <<EOF
macro(ContourThirdParties_Embed_libunicode)
add_subdirectory(\''${ContourThirdParties_SRCDIR}/libunicode EXCLUDE_FROM_ALL)
endmacro()
macro(ContourThirdParties_Embed_termbench_pro)
add_subdirectory(\''${ContourThirdParties_SRCDIR}/termbench_pro EXCLUDE_FROM_ALL)
endmacro()
EOF
ln -s ${libunicode-src} _deps/sources/libunicode
ln -s ${termbench-pro-src} _deps/sources/termbench_pro
buildInputs = [ freetype libGL pcre ];
# Don't fix Darwin app bundle
sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt
'';
passthru.tests.test = nixosTests.terminal-emulators.contour;
meta = with lib; {
description = "Modern C++ Terminal Emulator";
homepage = "https://github.com/christianparpart/contour";
changelog = "https://github.com/christianparpart/contour/blob/HEAD/Changelog.md";
homepage = "https://github.com/contour-terminal/contour";
changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md";
license = licenses.asl20;
maintainers = with maintainers; [ fortuneteller2k ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/contour.x86_64-darwin
};
}

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "distrobox";
version = "1.2.15";
version = "1.3.0";
src = fetchFromGitHub {
owner = "89luca89";
repo = pname;
rev = version;
sha256 = "sha256-9rivXnHyEE1MoGY+CwUeDStLGPVq+4FvwPjV7Nblk60=";
sha256 = "sha256-31SDi9B6Ug6lRDMgaMp6lwdSsmQ7ywEwjG1Ez/jXjBc=";
};
dontConfigure = true;

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook
, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst
, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "open-vm-tools";
version = "12.0.0";
version = "12.0.5";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U=";
sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg=";
};
sourceRoot = "${src.name}/open-vm-tools";
@ -25,21 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ]
++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
patches = [
# glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow
# Will be fixed in the release after 12.0.0
(fetchpatch {
url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch";
sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh";
})
];
prePatch = ''
cd ..
'';
postPatch = ''
cd open-vm-tools
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf
{ lib, stdenv, fetchFromGitHub, fetchpatch
, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobject-introspection
, which, dbus, nettools, git, doxygen
@ -27,6 +28,21 @@ stdenv.mkDerivation rec {
sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf";
};
patches = [
# Pull upstream fix for -fno-common toolchain support:
# https://github.com/awesomeWM/awesome/pull/3065
(fetchpatch {
name = "fno-common-prerequisite.patch";
url = "https://github.com/awesomeWM/awesome/commit/c5202a48708585cc33528065af8d1b1d28b1a6e0.patch";
sha256 = "0sv36xf0ibjcm63gn9k3bl039sqavb2b5i6d65il4bdclkc0n08b";
})
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch";
sha256 = "1n3y4wnjra8blss7642jgpxnm9n92zhhjj541bb9i60m4b7bgfzz";
})
];
nativeBuildInputs = [
cmake
doxygen

@ -1,6 +1,6 @@
{
"commit": "2c56a18f7c408d4fd67a3667d93cab163692fc53",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c56a18f7c408d4fd67a3667d93cab163692fc53.tar.gz",
"sha256": "0yvikmygrb6gb0lv4jp00rsqnagvkrc94sgmrn1gfjlmazss77z5",
"msg": "Update from Hackage at 2022-05-14T01:13:33Z"
"commit": "d69efcbdc39d5a7ae25039f9737ad04e34f38f68",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d69efcbdc39d5a7ae25039f9737ad04e34f38f68.tar.gz",
"sha256": "1xlnp36h5r8q3nf1fbq472rkqp0wmgz51rylnd23kl0pba2fypkp",
"msg": "Update from Hackage at 2022-05-20T19:45:02Z"
}

@ -3,14 +3,14 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20220324104603";
version = "20220528180904";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
sha256 = "sha256-Bd/jwHZ+6cg/cgVggyFI+Nc0FZ9qxI5Rk+y7SmGB08M=";
sha256 = "sha256-j1Q7B/U0OADOcgJRJ269Jx9Z5dmmT4T2eaOHeGmUjmc=";
};
vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78=";
vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo=";
meta = with lib; {
description = "community managed domain list";
homepage = "https://github.com/v2fly/domain-list-community";

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202203310042";
version = "202205260055";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "eb0fc69f57bdceef077e38d4f4f57c114411bd76";
sha256 = "sha256-CSABX+329/WgaXy144JgYsr3OesI69vCfew5qxz5jMY=";
rev = "96f4639373709f7560ccaf374d1ff008781aa324";
sha256 = "sha256-aFTLeYr+JishhJ2AhGMrD02fKxci2rREkh8HN9HtXLs=";
};
installPhase = ''

@ -32,7 +32,6 @@
, mesa
, meson
, gnome-settings-daemon
, libxcvt
, xorgserver
, python3
, wrapGAppsHook
@ -100,8 +99,7 @@ let self = stdenv.mkDerivation rec {
pkg-config
python3
wrapGAppsHook
libxcvt
xorgserver
xorgserver # for cvt command
];
buildInputs = [

@ -33,7 +33,6 @@
, mesa
, meson
, gnome-settings-daemon
, libxcvt
, xorgserver
, python3
, wrapGAppsHook
@ -96,8 +95,7 @@ let self = stdenv.mkDerivation rec {
pkg-config
python3
wrapGAppsHook
libxcvt
xorgserver
xorgserver # for cvt command
];
buildInputs = [

@ -0,0 +1,60 @@
{ lib, stdenv, jre, setJavaClassPath, coursier, makeWrapper }:
stdenv.mkDerivation rec {
pname = "firrtl";
version = "1.5.3";
scalaVersion = "2.13"; # pin, for determinism
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version;
nativeBuildInputs = [ coursier ];
buildCommand = ''
export COURSIER_CACHE=$(pwd)
cs fetch edu.berkeley.cs:${pname}_${scalaVersion}:${version} > deps
mkdir -p $out/share/java
cp $(< deps) $out/share/java
'';
outputHashMode = "recursive";
outputHash = "sha256-xy3zdJZk6Q2HbEn5tRQ9Z0AjyXEteXepoWDaATjiUUw=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
buildInputs = [ deps ];
dontUnpack = true;
installPhase = ''
runHook preInstall
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-cp $CLASSPATH firrtl.stage.FirrtlMain"
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/firrtl --firrtl-source "${''
circuit test:
module test:
input a: UInt<8>
input b: UInt<8>
output o: UInt
o <= add(a, not(b))
''}" -o test.v
cat test.v
grep -qFe "module test" -e "endmodule" test.v
'';
meta = with lib; {
description = "Flexible Intermediate Representation for RTL";
longDescription = ''
Firrtl is an intermediate representation (IR) for digital circuits
designed as a platform for writing circuit-level transformations.
'';
homepage = "https://www.chisel-lang.org/firrtl/";
license = licenses.asl20;
maintainers = with maintainers; [ dtzWill ];
};
}

@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.free;
platforms = lib.platforms.darwin;
maintainers = [ lib.maintainers.jwiegley ];
mainProgram = "sml";
};
}

@ -87,5 +87,6 @@ in stdenv.mkDerivation {
license = licenses.bsd3;
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ thoughtpolice ];
mainProgram = "sml";
};
}

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "guile-json";
version = "4.7.0";
version = "4.7.1";
src = fetchurl {
url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz";
sha256 = "sha256-q70TV3qUUULrkZrpDGosqFZ4STO/9VgQ7l+LM7NBU5c=";
sha256 = "sha256-xTSaI4D2fIphOps698mNITJdRDAjNp5vdhs2bpaUaEM=";
};
postConfigure = ''
@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = "https://savannah.nongnu.org/projects/guile-json";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ethancedwards8 ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

@ -165,6 +165,9 @@ self: super: {
})
] super.flat;
# Too strict bounds on base, optparse-applicative: https://github.com/edsko/friendly/issues/5
friendly = doJailbreak super.friendly;
# Too strict bound on hspec: https://github.com/ivan-m/graphviz/issues/55
graphviz = doJailbreak super.graphviz;
@ -779,22 +782,6 @@ self: super: {
# The tests spuriously fail
libmpd = dontCheck super.libmpd;
# For template-haskell 2.16 and 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
size-based = overrideCabal
(drv: {
# make all line endings unix, otherwise patching fails
prePatch = ''
find . -type f -print0 | xargs -0 ${pkgs.buildPackages.dos2unix}/bin/dos2unix
'' + (drv.prePatch or "");
patches = [
(fetchpatch {
url = "https://github.com/JonasDuregard/sized-functors/pull/10/commits/fe6bf78a1b97ff7429630d0e8974c9bc40945dcf.patch";
sha256 = "sha256-mMsXOqLqSbGl9Q0txiZiciPtGT7f12lnhlpFsnCwamk=";
})
];
})
super.size-based;
# https://github.com/diagrams/diagrams-braille/issues/1
diagrams-braille = doJailbreak super.diagrams-braille;
@ -1003,10 +990,6 @@ self: super: {
# https://github.com/haskell-hvr/resolv/pull/6
resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
# Too strict bounds on base and Cabal, fixed on master
# Occasional test failures: https://github.com/phadej/spdx/issues/27
spdx = assert super.spdx.version == "1.0.0.2"; doJailbreak (dontCheck super.spdx);
# The test suite does not know how to find the 'alex' binary.
alex = overrideCabal (drv: {
testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
@ -1166,16 +1149,6 @@ self: super: {
# https://github.com/danfran/cabal-macosx/issues/13
cabal-macosx = dontCheck super.cabal-macosx;
# Causes Test.QuickCheck.resize: negative size crashes e.g. in test suites
# https://github.com/typeable/generic-arbitrary/issues/14
generic-arbitrary = appendPatches [
(pkgs.fetchpatch {
name = "generic-arbitrary-no-negative-resize.patch";
url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";
sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";
})
] super.generic-arbitrary;
# https://github.com/DanielG/cabal-helper/pull/123
cabal-helper = doJailbreak super.cabal-helper;
@ -1767,7 +1740,11 @@ self: super: {
# waiting for aeson bump
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
hercules-ci-agent =
assert super.hercules-ci-agent.version == "0.9.5"; # >0.9.5: remove source override as sdist will be fixed
overrideSrc
{ src = pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "hercules-ci-agent"; rev = "hercules-ci-agent-0.9.5"; sha256 = "sha256-7d8lf4g8CWHTzIOmma8UKvFIi1Og6RqPH9Lt+6iA4pw="; } + "/hercules-ci-agent"; }
(generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent);
# Test suite doesn't compile with aeson 2.0
# https://github.com/hercules-ci/hercules-ci-agent/pull/387
@ -2351,22 +2328,16 @@ self: super: {
"--skip" "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/repeatedBy: simple test/"
] ++ drv.testFlags or [];
}) super.Unique;
# https://github.com/AndrewRademacher/aeson-casing/issues/8
aeson-casing = assert super.aeson-casing.version == "0.2.0.0"; overrideCabal (drv: {
testFlags = [
"-p" "! /encode train/"
] ++ drv.testFlags or [];
}) super.aeson-casing;
# https://github.com/Soostone/katip/issues/134
katip = assert super.katip.version == "0.8.7.0"; overrideCabal (drv: {
testFlags = [
"-p" "!/Text-golden/&&!/respects payloadKeys for each constituent payload/"
] ++ drv.testFlags or [];
}) super.katip;
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
# 2021-12-22: https://github.com/snapframework/heist/issues/131
heist = assert super.heist.version == "1.1.0.1";
# aeson 2.0 compat https://github.com/snapframework/heist/pull/132
# not merged in master yet

@ -173,7 +173,7 @@ self: super: {
];
# lens >= 5.1 supports 9.2.1
lens = doDistribute self.lens_5_1;
lens = doDistribute self.lens_5_1_1;
# Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
alex = dontCheck super.alex;

@ -453,7 +453,6 @@ broken-packages:
- botpp
- bottom
- boundingboxes
- bower-json
- bowntz
- bpath
- BPS
@ -1552,7 +1551,6 @@ broken-packages:
- fresh
- friday-devil
- friday-scale-dct
- friendly
- frown
- frp-arduino
- frpnow
@ -4903,6 +4901,7 @@ broken-packages:
- stripeapi
- stripe-core
- stripe-servant
- strongweak
- structural-traversal
- structures
- stt

@ -85,6 +85,8 @@ default-package-overrides:
- http-client-restricted < 0.0.5
# Needs dhall 1.41.*, Stackage LTS 19 has 1.40
- dhall-nix < 1.1.24
# Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
- distribution-nixpkgs < 1.7.0
extra-packages:
- aeson < 2 # required by pantry-0.5.2
@ -131,6 +133,7 @@ extra-packages:
- hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
package-maintainers:
abbradar:

@ -1,4 +1,4 @@
# Stackage LTS 19.6
# Stackage LTS 19.7
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -13,7 +13,7 @@ default-package-overrides:
- active ==0.2.0.15
- ad ==4.5
- ad-delcont ==0.3.0.0
- adjunctions ==4.4
- adjunctions ==4.4.1
- adler32 ==0.1.2.0
- advent-of-code-api ==0.2.8.1
- aern2-mp ==0.2.8.0
@ -156,12 +156,12 @@ default-package-overrides:
- bech32 ==1.1.2
- bech32-th ==1.1.1
- bench ==1.0.12
- benchpress ==0.2.2.19
- benchpress ==0.2.2.20
- bencode ==0.6.1.1
- bencoding ==0.4.5.4
- between ==0.11.0.0
- bibtex ==0.1.0.6
- bifunctors ==5.5.11
- bifunctors ==5.5.12
- bimap ==0.4.0
- bimaps ==0.1.0.2
- bimap-server ==0.1.0.1
@ -174,7 +174,7 @@ default-package-overrides:
- binary-instances ==1.0.2
- binary-list ==1.1.1.2
- binary-orphans ==1.0.2
- binary-parser ==0.5.7.1
- binary-parser ==0.5.7.2
- binary-parsers ==0.2.4.0
- binary-search ==2.0.0
- binary-shared ==0.8.3
@ -224,7 +224,7 @@ default-package-overrides:
- bordacount ==0.1.0.0
- boring ==0.2
- both ==0.1.1.2
- bound ==2.0.4
- bound ==2.0.5
- BoundedChan ==1.0.3.0
- bounded-queue ==1.0.0
- boxes ==0.1.5
@ -234,7 +234,7 @@ default-package-overrides:
- bsb-http-chunked ==0.0.0.4
- bson ==0.4.0.1
- bson-lens ==0.1.1
- buffer-builder ==0.2.4.7
- buffer-builder ==0.2.4.8
- buffer-pipe ==0.0
- bugsnag-haskell ==0.0.4.4
- bugsnag-hs ==0.2.0.8
@ -244,11 +244,11 @@ default-package-overrides:
- buttplug-hs-core ==0.1.0.1
- bv ==0.5
- byteable ==0.1.1
- byte-count-reader ==0.10.1.8
- byte-count-reader ==0.10.1.9
- bytedump ==1.0
- byte-order ==0.1.3.0
- byteorder ==1.0.4
- bytes ==0.17.1
- bytes ==0.17.2
- byteset ==0.1.1.0
- bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.1
@ -399,8 +399,8 @@ default-package-overrides:
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- conduit-connection ==0.1.0.5
- conduit-extra ==1.3.5
- conduit-parse ==0.2.1.0
- conduit-extra ==1.3.6
- conduit-parse ==0.2.1.1
- conduit-zstd ==0.0.2.0
- conferer ==1.1.0.0
- conferer-aeson ==1.1.0.2
@ -428,7 +428,7 @@ default-package-overrides:
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.2.2
- core-program ==0.4.6.1
- core-program ==0.4.6.4
- core-text ==0.3.7.1
- countable ==1.0
- covariance ==0.1.0.6
@ -557,7 +557,7 @@ default-package-overrides:
- deriveJsonNoPrefix ==0.1.0.1
- derive-topdown ==0.0.3.0
- deriving-aeson ==0.2.8
- deriving-compat ==0.6
- deriving-compat ==0.6.1
- derulo ==2.0.0.1
- detour-via-sci ==1.0.0
- df1 ==0.4
@ -645,7 +645,7 @@ default-package-overrides:
- edit-distance ==0.2.2.1
- edit-distance-vector ==1.0.0.4
- editor-open ==0.6.0.0
- either ==5.0.1.1
- either ==5.0.2
- either-both ==0.1.1.1
- either-unwrap ==1.1
- elerea ==2.9.0
@ -798,7 +798,7 @@ default-package-overrides:
- foundation ==0.0.28
- fourmolu ==0.4.0.0
- Frames ==0.7.3
- free ==5.1.7
- free ==5.1.8
- free-categories ==0.2.0.2
- freenect ==1.2.1
- freer-simple ==1.2.1.2
@ -828,7 +828,7 @@ default-package-overrides:
- gdp ==0.0.3.0
- general-games ==1.1.1
- generic-aeson ==0.2.0.13
- generic-arbitrary ==0.2.1
- generic-arbitrary ==0.2.2
- generic-constraints ==1.1.1.1
- generic-data ==0.9.2.1
- generic-data-surgery ==0.3.0.0
@ -946,7 +946,7 @@ default-package-overrides:
- gpolyline ==0.1.0.1
- graph-core ==0.3.0.0
- graphite ==0.10.0.1
- graphs ==0.7.1
- graphs ==0.7.2
- graphula ==2.0.1.1
- graphviz ==2999.20.1.0
- graph-wrapper ==0.2.6.0
@ -1047,7 +1047,7 @@ default-package-overrides:
- hgeometry ==0.14
- hgeometry-combinatorial ==0.14
- hid ==0.2.2
- hidapi ==0.1.7
- hidapi ==0.1.8
- hie-bios ==0.9.1
- hi-file-parser ==0.1.2.0
- higher-leveldb ==0.6.0.0
@ -1140,7 +1140,7 @@ default-package-overrides:
- hspec-core ==2.8.5
- hspec-discover ==2.8.5
- hspec-expectations ==0.8.2
- hspec-expectations-json ==1.0.0.6
- hspec-expectations-json ==1.0.0.7
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.6
- hspec-golden ==0.2.0.0
@ -1150,7 +1150,7 @@ default-package-overrides:
- hspec-leancheck ==0.0.6
- hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8
- hspec-need-env ==0.1.0.8
- hspec-need-env ==0.1.0.9
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tmp-proc ==0.5.0.1
@ -1161,7 +1161,7 @@ default-package-overrides:
- hstatistics ==0.3.1
- HStringTemplate ==0.8.8
- HSvm ==0.1.1.3.25
- HsYAML ==0.2.1.0
- HsYAML ==0.2.1.1
- HsYAML-aeson ==0.2.0.1
- hsyslog ==5.0.2
- hsyslog-udp ==0.2.5
@ -1170,7 +1170,7 @@ default-package-overrides:
- html ==1.0.1.2
- html-conduit ==1.3.2.2
- html-email-validate ==0.2.0.0
- html-entities ==1.1.4.5
- html-entities ==1.1.4.6
- html-entity-map ==0.1.0.0
- http2 ==3.0.3
- HTTP ==4000.3.16
@ -1189,7 +1189,7 @@ default-package-overrides:
- http-link-header ==1.2.1
- http-media ==0.8.0.0
- http-query ==0.1.3
- http-reverse-proxy ==0.6.0
- http-reverse-proxy ==0.6.0.1
- http-streams ==0.8.9.6
- http-types ==0.12.3
- human-readable-duration ==0.2.1.4
@ -1289,7 +1289,7 @@ default-package-overrides:
- intervals ==0.9.2
- intro ==0.9.0.0
- intset-imperative ==0.1.0.0
- invariant ==0.5.5
- invariant ==0.5.6
- invert ==1.0.0.2
- invertible ==0.2.0.7
- invertible-grammar ==0.1.3.2
@ -1337,9 +1337,9 @@ default-package-overrides:
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
- jwt ==0.11.0
- kan-extensions ==5.2.3
- kan-extensions ==5.2.4
- kanji ==3.5.0
- katip ==0.8.7.0
- katip ==0.8.7.1
- katip-logstash ==0.1.0.2
- katip-wai ==0.1.1.0
- kazura-queue ==0.1.0.4
@ -1430,8 +1430,8 @@ default-package-overrides:
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==2.0.0.0
- list-t ==1.0.5.1
- list-transformer ==1.0.7
- list-t ==1.0.5.2
- list-transformer ==1.0.8
- ListTree ==0.2.3
- ListZipper ==1.2.0.2
- literatex ==0.2.0.2
@ -1459,7 +1459,7 @@ default-package-overrides:
- lsp-types ==1.4.0.1
- lua ==2.1.0
- lua-arbitrary ==1.0.1
- lucid ==2.11.0
- lucid ==2.11.1
- lucid-cdn ==0.2.2.0
- lucid-extras ==0.2.2
- lukko ==0.1.1.3
@ -1501,8 +1501,8 @@ default-package-overrides:
- mcmc-types ==1.0.3
- median-stream ==0.7.0.0
- med-module ==0.1.2.2
- megaparsec ==9.2.0
- megaparsec-tests ==9.2.0
- megaparsec ==9.2.1
- megaparsec-tests ==9.2.1
- mega-sdist ==0.4.2.1
- memory ==0.16.0
- MemoTrie ==0.6.10
@ -1655,7 +1655,7 @@ default-package-overrides:
- network-transport-tcp ==0.8.0
- network-transport-tests ==0.3.0
- network-uri ==2.6.4.1
- network-wait ==0.1.1.0
- network-wait ==0.1.2.0
- newtype ==0.2.2.0
- newtype-generics ==0.6.1
- nfc ==0.1.0
@ -1764,7 +1764,7 @@ default-package-overrides:
- ParsecTools ==0.0.2.0
- parser-combinators ==1.3.0
- parser-combinators-tests ==1.3.0
- parsers ==0.12.10
- parsers ==0.12.11
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.3.0
- partial-order ==0.2.0.0
@ -1846,7 +1846,7 @@ default-package-overrides:
- placeholders ==0.1
- plaid ==0.1.0.4
- plotlyhs ==0.2.1
- pointed ==5.0.3
- pointed ==5.0.4
- pointedlist ==0.6.1
- pointless-fun ==1.1.0.8
- poll ==0.0.0.2
@ -1873,7 +1873,7 @@ default-package-overrides:
- posix-paths ==0.3.0.0
- possibly ==1.0.0.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.12.4.2
- postgresql-binary ==0.12.4.3
- postgresql-libpq ==0.9.4.3
- postgresql-libpq-notify ==0.2.0.0
- postgresql-migration ==0.2.1.3
@ -1985,7 +1985,7 @@ default-package-overrides:
- rampart ==2.0.0.0
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.2.1
- random ==1.2.1.1
- random-bytestring ==0.1.4
- random-fu ==0.3.0.0
- random-shuffle ==0.0.4
@ -2067,7 +2067,7 @@ default-package-overrides:
- resistor-cube ==0.0.1.4
- resolv ==0.1.2.0
- resource-pool ==0.2.3.2
- resourcet ==1.2.4.3
- resourcet ==1.2.5
- result ==0.2.6.0
- retry ==0.9.2.0
- rev-state ==0.1.2
@ -2092,7 +2092,7 @@ default-package-overrides:
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5
- rpm-nvr ==0.1.1
- rpm-nvr ==0.1.2
- rp-tree ==0.7.1
- RSA ==2.4.1
- rss-conduit ==0.6.0.1
@ -2288,7 +2288,7 @@ default-package-overrides:
- speedy-slice ==0.3.2
- Spintax ==0.3.6
- splice ==0.6.1.1
- splint ==1.0.1.4
- splint ==1.0.1.5
- split ==0.2.3.4
- splitmix ==0.1.0.4
- splitmix-distributions ==0.9.0.0
@ -2316,7 +2316,7 @@ default-package-overrides:
- StateVar ==1.2.2
- stateWriter ==0.3.0
- static-text ==0.2.0.7
- statistics ==0.16.0.2
- statistics ==0.16.1.0
- status-notifier-item ==0.3.1.0
- stb-image-redux ==0.2.1.2
- step-function ==0.2
@ -2352,7 +2352,7 @@ default-package-overrides:
- streamt ==0.5.0.0
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.6
- strict-list ==0.1.7
- strict-tuple ==0.1.5
- strict-tuple-lens ==0.2
- strict-wrapper ==0.0.0.0
@ -2404,7 +2404,7 @@ default-package-overrides:
- tagged ==0.8.6.1
- tagged-binary ==0.2.0.1
- tagged-identity ==0.1.3
- tagged-transformer ==0.8.1
- tagged-transformer ==0.8.2
- tagshare ==0.0
- tagsoup ==0.14.8
- tagstream-conduit ==0.5.6
@ -2412,8 +2412,8 @@ default-package-overrides:
- tao-example ==1.0.0
- tar ==0.5.1.1
- tar-conduit ==0.3.2
- tardis ==0.4.3.0
- tasty ==1.4.2.1
- tardis ==0.4.4.0
- tasty ==1.4.2.3
- tasty-ant-xml ==1.1.8
- tasty-bench ==0.3.1
- tasty-dejafu ==2.0.0.8
@ -2435,7 +2435,7 @@ default-package-overrides:
- tasty-program ==1.0.5
- tasty-quickcheck ==0.10.2
- tasty-rerun ==1.1.18
- tasty-silver ==3.3.1
- tasty-silver ==3.3.1.1
- tasty-smallcheck ==0.8.2
- tasty-tap ==0.1.0
- tasty-test-reporter ==0.1.1.4
@ -2469,7 +2469,7 @@ default-package-overrides:
- text-binary ==0.2.1.1
- text-builder ==0.6.6.5
- text-builder-dev ==0.2.1
- text-conversions ==0.3.1
- text-conversions ==0.3.1.1
- text-icu ==0.7.1.0
- text-latin1 ==0.3.1
- text-ldap ==0.1.1.14
@ -2573,7 +2573,7 @@ default-package-overrides:
- tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- turtle ==1.5.24
- turtle ==1.5.25
- twitter-conduit ==0.6.1
- twitter-types ==0.11.0
- twitter-types-lens ==0.11.0
@ -2717,7 +2717,7 @@ default-package-overrides:
- wai-cors ==0.2.7
- wai-enforce-https ==1.0.0.0
- wai-eventsource ==3.0.0
- wai-extra ==3.1.10
- wai-extra ==3.1.12.1
- wai-feature-flags ==0.1.0.3
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.4.0
@ -2855,7 +2855,7 @@ default-package-overrides:
- yesod-routes-flow ==3.0.0.2
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
- yesod-test ==1.6.13
- yesod-test ==1.6.14
- yesod-websockets ==0.3.0.3
- yes-precure5-command ==5.5.3
- yi-rope ==0.11
@ -2875,7 +2875,7 @@ default-package-overrides:
- zipper-extra ==0.1.3.2
- zippers ==0.3.2
- zip-stream ==0.2.1.0
- zlib ==0.6.2.3
- zlib ==0.6.3.0
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
- zot ==0.0.3

@ -47,7 +47,6 @@ dont-distribute-packages:
- Bitly
- BlastHTTP
- Blobs
- BlogLiterately
- BlogLiterately-diagrams
- Bookshelf
- CBOR
@ -2621,6 +2620,7 @@ dont-distribute-packages:
- list-witnesses
- listenbrainz-client
- liszt
- little-rio_1_0_0
- live-sequencer
- llvm
- llvm-analysis
@ -3189,7 +3189,6 @@ dont-distribute-packages:
- protobuf-native
- protocol-buffers-descriptor-fork
- proton
- psc-ide
- psql
- ptera
- ptera-core
@ -3202,9 +3201,7 @@ dont-distribute-packages:
- pure-cdb
- pure-priority-queue-tests
- purenix
- purescript
- purescript-iso
- purescript-tsd-gen
- pursuit-client
- push-notify
- push-notify-apn
@ -4236,7 +4233,6 @@ dont-distribute-packages:
- yuuko
- z85
- zasni-gerna
- zephyr
- zephyr-copilot
- zeromq3-conduit
- zeromq3-haskell

@ -620,10 +620,10 @@ self: super: builtins.intersectAttrs super {
}) super.spago;
spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: {
# spago (and its dependency, bower-json) is not yet updated for aeson-2.0
# spago is not yet updated for aeson 2.0
aeson = hfinal.aeson_1_5_6_0;
# bower-json needs aeson_1_5_6_0 and is marked broken without it.
bower-json = doDistribute (markUnbroken hprev.bower-json);
# bower-json 1.1.0.0 only supports aeson 2.0, so we pull in the older version here.
bower-json = hprev.bower-json_1_0_0_1;
});
# Tests require network access.
@ -994,7 +994,6 @@ self: super: builtins.intersectAttrs super {
hls-module-name-plugin
hls-ormolu-plugin
hls-pragmas-plugin
hls-rename-plugin
hls-splice-plugin;
# Tests have file permissions expections that don‘t work with the nix store.
hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
@ -1002,6 +1001,7 @@ self: super: builtins.intersectAttrs super {
# Flaky tests
hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
hls-class-plugin = dontCheck super.hls-class-plugin;
hls-rename-plugin = dontCheck super.hls-rename-plugin;
hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin;
hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;

@ -338,9 +338,10 @@ stdenv.mkDerivation ({
echo "Build with ${ghc}."
${optionalString (isLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
setupPackageConfDir="$TMPDIR/setup-package.conf.d"
builddir="$(mktemp -d)"
setupPackageConfDir="$builddir/setup-package.conf.d"
mkdir -p $setupPackageConfDir
packageConfDir="$TMPDIR/package.conf.d"
packageConfDir="$builddir/package.conf.d"
mkdir -p $packageConfDir
setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
@ -418,7 +419,7 @@ stdenv.mkDerivation ({
done
echo setupCompileFlags: $setupCompileFlags
${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $builddir -hidir $builddir $i
runHook postCompileBuildDriver
'';
@ -469,7 +470,10 @@ stdenv.mkDerivation ({
# `--test-option`, so Cabal passes it to the underlying test suite binary.
checkPhase = ''
runHook preCheck
checkFlagsArray+=(${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)})
checkFlagsArray+=(
"--show-details=streaming"
${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)}
)
${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
runHook postCheck
'';

File diff suppressed because it is too large Load Diff

@ -209,6 +209,7 @@ stdenv.mkDerivation ({
installFlags = [ "sysconfdir=$(out)/etc" ];
# out as the first output is an exception exclusive to glibc
outputs = [ "out" "bin" "dev" "static" ];
strictDeps = true;

@ -6,7 +6,8 @@ let
glibc64 = glibc;
in
runCommand "${nameVersion.name}-multi-${nameVersion.version}"
{ outputs = [ "bin" "dev" "out"]; } # TODO: no static version here (yet)
# out as the first output is an exception exclusive to glibc
{ outputs = [ "out" "bin" "dev" ]; } # TODO: no static version here (yet)
''
mkdir -p "$out/lib"
ln -s '${glibc64.out}'/lib/* "$out/lib"

@ -28,6 +28,14 @@ stdenv.mkDerivation rec {
url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch";
sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74=";
})
# Fixes build with upcoming gcc-13:
# https://github.com/oneapi-src/oneTBB/pull/833
(fetchurl {
name = "gcc-13.patch";
url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch";
sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg=";
})
];
nativeBuildInputs = lib.optionals stdenv.isDarwin [

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.2.15";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb";
};
patches = [
(fetchpatch {
name = "CVE-2021-43521.patch";
url = "https://github.com/HardySimpson/zlog/commit/a5be8b3a8ddc498de4ad041757285136a55d97e3.patch";
sha256 = "sha256-igHXUHN2Ke8Gb5AeDrDwG2aUNRpispgqVlGuASute+8=";
})
];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {

@ -0,0 +1,25 @@
{ lib, fetchFromGitHub, buildDunePackage, qcheck-core }:
buildDunePackage rec {
pname = "bwd";
version = "2.0.0";
minimalOCamlVersion = "4.12";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "ocaml-bwd";
rev = version;
sha256 = "sha256:0zgi8an53z6wr6nzz0zlmhx19zhqy1w2vfy1sq3sikjwh74jjq60";
};
doCheck = true;
checkInputs = [ qcheck-core ];
meta = {
description = "Backward Lists";
inherit (src.meta) homepage;
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.vbgl ];
};
}

@ -1,41 +1,92 @@
{ lib
, fetchFromGitHub
, fetchurl
, buildDunePackage
, cmdliner
, bwd
, cmdliner_1_1
, containers
, ezjsonm
, menhir
, menhirLib
, ppx_deriving
, ppxlib
, uuseg
, uutf
, yuujinchou
}:
let
bantorra = buildDunePackage rec {
pname = "bantorra";
version = "unstable-2022-04-20";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "bantorra";
rev = "1e78633d9a2ef7104552a24585bb8bea36d4117b";
sha256 = "sha256:15v1cggm7awp11iwl3lzpaar91jzivhdxggp5mr48gd28kfipzk2";
};
propagatedBuildInputs = [ ezjsonm ];
meta = {
description = "Extensible Library Management and Path Resolution";
homepage = "https://github.com/RedPRL/bantorra";
license = lib.licenses.asl20;
};
};
kado = buildDunePackage rec {
pname = "kado";
version = "unstable-2022-04-30";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "kado";
rev = "8dce50e7d759d482b82565090e550d3860d64729";
sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy";
};
propagatedBuildInputs = [ bwd ];
doCheck = true;
meta = {
description = "Cofibrations in Cartecian Cubical Type Theory";
homepage = "https://github.com/RedPRL/kado";
license = lib.licenses.asl20;
};
};
in
buildDunePackage {
pname = "cooltt";
version = "unstable-2021-05-25";
version = "unstable-2022-04-28";
minimumOCamlVersion = "4.10";
useDune2 = true;
minimalOCamlVersion = "4.13";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "cooltt";
rev = "8ac06cbf7e05417d777f3ac6a471fe3576249f79";
sha256 = "sha256-JBLNJaRuP/gwlg8RS3cpOpzxChOVKfmFulf5HKhhHh4=";
rev = "88511e10cb9e17286f585882dee334f3d8ace47c";
sha256 = "sha256:1n9bh86r2n9s3mm7ayfzwjbnjqcphpsf8yqnf4whd3yi930sqisw";
};
nativeBuildInputs = [
cmdliner
cmdliner_1_1
menhir
ppxlib
];
buildInputs = [ containers ];
propagatedBuildInputs = [
bantorra
bwd
ezjsonm
kado
menhirLib
ppx_deriving
uuseg
uutf
yuujinchou
];
meta = with lib; {

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, buildDunePackage, qcheck-alcotest }:
buildDunePackage rec {
pname = "yuujinchou";
version = "2.0.0";
minimalOCamlVersion = "4.12";
src = fetchFromGitHub {
owner = "RedPRL";
repo = pname;
rev = version;
sha256 = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w";
};
doCheck = true;
checkInputs = [ qcheck-alcotest ];
meta = {
description = "Name pattern combinators";
inherit (src.meta) homepage;
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.vbgl ];
};
}

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "brother";
version = "1.2.1";
version = "1.2.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-9SC4q2iZN0/fEYS4Ii7Ndcx5UpLryGCe9ytIVDdjg0M=";
hash = "sha256-pxFp/CSoskAx6DdZlkBRvocUJ5Kt5ymPwxpLhT743uE=";
};
propagatedBuildInputs = [

@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "celery";
version = "5.2.6";
version = "5.2.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-0TmMrfMPV2Jms0Nw4o6IAwbsVfektjB1SbCunBVmNIE=";
hash = "sha256-+vvYKTTTD4oAT4Ho96Bi4xQToj1ES+juMyZVORWVjG0=";
};
propagatedBuildInputs = [

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "python-telegram-bot";
version = "13.11";
version = "13.12";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-uu/3BLqirD3BepRMAtqIgiitJY6Jvi5by9E6ilEC1XM=";
sha256 = "sha256-2vVftvQYuHUjF/0S34JN1xfjIpqH2DgQpM3W5EL2beU=";
};
propagatedBuildInputs = [

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
version = "10.14.1";
version = "10.15.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "v${version}";
sha256 = "sha256-UPn6pBttes5wq1RByE89QfE2OSUixYW4LOnFgfuAY3w=";
sha256 = "sha256-iXMkvrBANuOIyyVyQ11YQ1DWRQf4JAtu+1Ou3aQrhlc=";
};
subPackages = [ "." ];
vendorSha256 = "sha256-9ThsJySzsyS0eX/0BlAAvtaeJpPYCP0cN1YgIShYrKw=";
vendorSha256 = "sha256-OlsNFhduilo8fJs/mynrAiwuXcfCZERdaJk3VcAUCJw=";
doCheck = false;

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "frugal";
version = "3.15.0";
version = "3.15.1";
src = fetchFromGitHub {
owner = "Workiva";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EIHaCkqwCyRV1sX+9f39FbByRvhms4rJA9nQoKxxkm8=";
sha256 = "sha256-pRWTjlPTVwFzamq67hzb+ElqZuqP9aEAVz581DNMUBM=";
};
subPackages = [ "." ];
vendorSha256 = "sha256-vWqj2fRtaDextDstIb5GrdRn4nxQpCfjegYiVbPILuM=";
vendorSha256 = "sha256-ljZ3tpIJ+tg4UDBDzbse4M6ksb8AgPJLJCZeusMtQ0Q=";
meta = with lib; {
description = "Thrift improved";

@ -1,4 +1,4 @@
{ haskellPackages, fetchpatch, haskell, removeReferencesTo }:
{ stdenv, lib, haskellPackages, fetchpatch, haskell, removeReferencesTo }:
let
static = haskell.lib.compose.justStaticExecutables haskellPackages.pandoc;
@ -13,6 +13,9 @@ in
remove-references-to \
-t ${haskellPackages.pandoc-types} \
$out/bin/pandoc
'' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
mkdir -p $out/share/bash-completion/completions
$out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc
'';
}) static).overrideAttrs (drv: {
# These libraries are still referenced, because they generate

@ -1,20 +1,25 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "shopify-themekit";
version = "1.0.3";
goPackagePath = "github.com/Shopify/themekit/";
goDeps = ./shopify-themekit_deps.nix;
version = "1.3.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = "themekit";
rev = "v${version}";
sha256 = "1780h33mf2h2lv6mr4xx3shfvsabr7w138yb59vvdgvjng9wjkg0";
sha256 = "sha256-7uUKyaLzeiioW0TsEu82lJU0DoM1suwVcmacY1X0SEM=";
};
vendorSha256 = "sha256-8QpkYj0fQb4plzvk6yCrZho8rq9VBiLft/EO3cczciI=";
ldflags = [ "-s" "-w" ];
postInstall = ''
# Keep `theme` only
rm -f $out/bin/{cmd,tkrelease}
'';
meta = with lib; {
description = "A command line tool for shopify themes";
homepage = "https://shopify.github.io/themekit/";

@ -1,300 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/VividCortex/ewma";
fetch = {
type = "git";
url = "https://github.com/VividCortex/ewma";
rev = "v1.1.1";
sha256 = "14v2dy5gqchjn7k0sd6cx59ms42v681r6xz7cb1kspp4b28a74rw";
};
}
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "1c16cd01d785";
sha256 = "129iizv2rny2frg36057hayynpsdav53nhj41dia3mi2r6zyalny";
};
}
{
goPackagePath = "github.com/caarlos0/env";
fetch = {
type = "git";
url = "https://github.com/caarlos0/env";
rev = "d0de832ed2fb";
sha256 = "013shh38rs2jv4a2hsbix0hlanjr2a539akmkqkwwg0il9h3qmq2";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "v1.7.0";
sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "v1.4.7";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/go-ini/ini";
fetch = {
type = "git";
url = "https://github.com/go-ini/ini";
rev = "v1.25.4";
sha256 = "0b6cql5ripbiyrm18d6bfd1rfjnwcbskppw3d0vb80l0wy72d0c6";
};
}
{
goPackagePath = "github.com/hashicorp/go-version";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-version";
rev = "270f2f71b1ee";
sha256 = "1d43wlp932nqbwkca4bhw8l4x6cg25jyh8l1s3814vddscfpfz2v";
};
}
{
goPackagePath = "github.com/imdario/mergo";
fetch = {
type = "git";
url = "https://github.com/imdario/mergo";
rev = "v0.3.6";
sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
};
}
{
goPackagePath = "github.com/inconshreveable/go-update";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/go-update";
rev = "8152e7eb6ccf";
sha256 = "07czhspakpi7al004rm669cmf4h5l0vnygsm11280nkfn2zxqdi3";
};
}
{
goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/mousetrap";
rev = "v1.0.0";
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
goPackagePath = "github.com/jmespath/go-jmespath";
fetch = {
type = "git";
url = "https://github.com/jmespath/go-jmespath";
rev = "0b12d6b521d8";
sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
};
}
{
goPackagePath = "github.com/joho/godotenv";
fetch = {
type = "git";
url = "https://github.com/joho/godotenv";
rev = "v1.3.0";
sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "efa589957cd0";
sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "v0.0.4";
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/radovskyb/watcher";
fetch = {
type = "git";
url = "https://github.com/radovskyb/watcher";
rev = "v1.0.6";
sha256 = "1xlbrfgm6ha161szdjq2rab53plkdhmh5h86lpbk5g7fmq881945";
};
}
{
goPackagePath = "github.com/ryanuber/go-glob";
fetch = {
type = "git";
url = "https://github.com/ryanuber/go-glob";
rev = "572520ed46db";
sha256 = "0dzbpqp1h7gjmlm4irnh6lpbfz5zjc721jidibyvmxj7xcx3wp5d";
};
}
{
goPackagePath = "github.com/shibukawa/configdir";
fetch = {
type = "git";
url = "https://github.com/shibukawa/configdir";
rev = "e180dbdc8da0";
sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z";
};
}
{
goPackagePath = "github.com/skratchdot/open-golang";
fetch = {
type = "git";
url = "https://github.com/skratchdot/open-golang";
rev = "75fb7ed4208c";
sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "7c4570c3ebeb";
sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "v1.0.2";
sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.1";
sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.2.2";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
};
}
{
goPackagePath = "github.com/vbauerster/mpb";
fetch = {
type = "git";
url = "https://github.com/vbauerster/mpb";
rev = "v3.3.2";
sha256 = "18m66b80iv9z768c15dqsx5mnjq6iaa6b5lckpdqnynqzkkvw8kk";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "a1f597ede03a";
sha256 = "0yiczljll72ip2vkxgd6052rhpaba37a68vf6si3v8s8s3g870lc";
};
}
{
goPackagePath = "golang.org/x/lint";
fetch = {
type = "git";
url = "https://go.googlesource.com/lint";
rev = "d0100b6bd8b3";
sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "1272bf9dcd53";
sha256 = "1500gryd7jli7yjn4c927ppyllry8lxcmnsmpn7zxfd1k14q7nyv";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6f";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "6c81ef8f67ca";
sha256 = "1iqrral339vxb635ip5jjzn84aa86kb629kbp1w29qwyfzbs0yqi";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "3f1ed9edd1b4";
sha256 = "00d2h0df03gv57valad4wr3g2rc8dcn8w3ci783x9wzzc86y4giw";
};
}
{
goPackagePath = "gopkg.in/yaml.v1";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v1";
rev = "9f9df34309c0";
sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm";
};
}
]

@ -12,16 +12,27 @@
stdenv.mkDerivation rec {
pname = "atop";
version = "2.6.0";
version = "2.7.1";
src = fetchurl {
url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I=";
sha256 = "sha256-ykjS8X4HHe6tXm6cyeOIv2oycNaV5hl2s3lNTZJ7XE4=";
};
nativeBuildInputs = lib.optionals withAtopgpu [ python3.pkgs.wrapPython ];
buildInputs = [ zlib ncurses ] ++ lib.optionals withAtopgpu [ python3 ];
pythonPath = lib.optionals withAtopgpu [ python3.pkgs.pynvml ];
nativeBuildInputs = lib.optionals withAtopgpu [
python3.pkgs.wrapPython
];
buildInputs = [
zlib
ncurses
] ++ lib.optionals withAtopgpu [
python3
];
pythonPath = lib.optionals withAtopgpu [
python3.pkgs.pynvml
];
makeFlags = [
"DESTDIR=$(out)"
@ -53,12 +64,12 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace 'chmod 04711' 'chmod 0711'
'';
installTargets = [ "systemdinstall" ];
preInstall = ''
mkdir -p $out/bin
'';
postInstall = ''
# remove extra files we don't need
# Remove extra files we don't need
rm -r $out/{var,etc} $out/bin/atop{sar,}-${version}
'' + (if withAtopgpu then ''
wrapPythonPrograms
@ -70,9 +81,13 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ raskin ];
description = "Console system performance monitor";
longDescription = ''
Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code.
Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of
all processes (even if processes have finished during the interval), daily logging of system
and process activity for long-term analysis, highlighting overloaded system resources by using
colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory,
swap, disks and network layers, and for every active process it shows the CPU utilization,
memory growth, disk utilization, priority, username, state, and exit code.
'';
license = licenses.gpl2Plus;
downloadPage = "http://atoptool.nl/downloadatop.php";

@ -71,6 +71,12 @@ stdenv.mkDerivation {
stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: acpi/xsdt.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: multiple definition of
# `e820_types'; memory.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: first defined here
NIX_CFLAGS_COMPILE="-fcommon";
makeFlags = [
"BINDIR=$(out)/bin"
"SBINDIR=$(out)/sbin"

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }:
stdenv.mkDerivation rec {
pname = "mod_tile";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "12c96avka1dfb9wxqmjd57j30w9h8yx4y4w34kyq6xnf6lwnkcxp";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/openstreetmap/mod_tile/pull/202
(fetchpatch {
name = "fno-common";
url = "https://github.com/openstreetmap/mod_tile/commit/a22065b8ae3c018820a5ca9bf8e2b2bb0a0bfeb4.patch";
sha256 = "1ywfa14xn9aa96vx1adn1ndi29qpflca06x986bx9c5pqk761yz3";
})
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ apacheHttpd apr cairo iniparser mapnik ];

@ -53,6 +53,12 @@ in stdenv.mkDerivation rec {
] ++ lib.optional withMySQL "--with-mysql-includes=${mysql57.connector-c}/include/mysql"
++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: .libs/hash_drv.o:/build/dspam-3.10.2/src/util.h:96: multiple definition of `verified_user';
# .libs/libdspam.o:/build/dspam-3.10.2/src/util.h:96: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
# Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"
# and fix directory structure manually after that.
installFlags = [ "DESTDIR=$(out)" ];

@ -3100,17 +3100,17 @@ lib.makeScope newScope (self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile }: stdenv.mkDerivation {
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
pname = "xorg-server";
version = "21.1.3";
version = "1.20.14";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-21.1.3.tar.xz";
sha256 = "1rgbrld7spg7plkv3c3bbnlnszpflk5z1mqbjrmi2ymlnvasmmk1";
url = "mirror://xorg/individual/xserver/xorg-server-1.20.14.tar.xz";
sha256 = "0sx18vsxr0dg9z7b9ph1gz6q4pmxc1n6b4sbb7i47578kc5vgiaw";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ xorgproto openssl libX11 libXau libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile ];
buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = lib.platforms.unix;
}) {};

@ -653,7 +653,7 @@ self: super:
in attrs //
(let
version = lib.getVersion attrs;
commonBuildInputs = attrs.buildInputs ++ [ libxcvt xtrans ];
commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
commonPropagatedBuildInputs = [
zlib libGL libGLU dbus
xorgproto
@ -690,6 +690,14 @@ self: super:
#
# We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail
./dont-create-logdir-during-build.patch
# Fix e.g. xorg.xf86videovmware with libdrm 2.4.108
# TODO: remove with xorgserver >= 1.21
(fetchpatch {
name = "stdbool.patch";
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747.diff";
sha256 = "1l9qg905jvlw3r0kx4xfw5m12pbs0782v2g3267d1m6q4m6fj1zy";
})
];
buildInputs = commonBuildInputs ++ [ libdrm mesa ];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [

@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-21.1.3.tar.xz
mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "fits-cloudctl";
version = "0.10.13";
version = "0.10.17";
src = fetchFromGitHub {
owner = "fi-ts";
repo = "cloudctl";
rev = "v${version}";
sha256 = "sha256-8MSX8A/3FY95rrWuYfGYFynSi76JPcHX+N8VF9BWktM=";
sha256 = "sha256-cC6qPPRrMUMpwQ/FH+H6LuwC35dfgcZyB2yqz7tvSIg=";
};
vendorSha256 = "sha256-K6HI7aSDbrhqm2XVor7sRwHnqQPQlpZYGLgaf3SFNrU=";
vendorSha256 = "sha256-nNzmecvTAIno6+OkpmlQ0eHfNfQGUH+ICLumvLswlWA=";
meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services";

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fd";
version = "8.3.2";
version = "8.4.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg=";
sha256 = "sha256-Vy5ERc4GZVEjNP0z2zZJeNwfhoL0nnOeii+TjRszrFw=";
};
cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4=";
cargoSha256 = "sha256-Iz8QP9NdjbBL8j/iUV6iS3U1ErPHuC5NYFHUMtR8MZg=";
nativeBuildInputs = [ installShellFiles ];

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "foma";
version = "0.9.18alpha";
version = "0.10.0alpha";
src = fetchFromGitHub {
owner = "mhulden";
repo = "foma";
rev = "4456a40e81f46e3fe909c5a97a15fcf1d2a3b6c1";
sha256 = "188yxj8wahlj2yf93rj1vx549j5cq0085d2jmj3vwzbfjq1mi1f0";
rev = "82f9acdef234eae8b7619ccc3a386cc0d7df62bc";
sha256 = "1vf01l18j8cksnavbabcckp9gg692w6v5lg81xrzv6f5v14zp4nr";
};
sourceRoot = "source/foma";

@ -0,0 +1,29 @@
{ lib
, stdenv
, fetchCrate
, rustPlatform
, pkgconfig
, openssl
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "gh-cal";
version = "0.1.3";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0=";
};
cargoSha256 = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ=";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "GitHub contributions calender terminal viewer";
homepage = "https://github.com/mrshmllow/gh-cal";
license = licenses.mit;
maintainers = with maintainers; [ loicreynier ];
};
}

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "9.0.0";
version = "9.0.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D3yd5Xc+7VNBrRkkKW7BGxEXcZHmmESy2YOEKBf/k9M=";
sha256 = "sha256-9zP+rWhaK4fC2Qhd0oq9WVvCkvryooYo09k7016Rbxw=";
};
cargoSha256 = "sha256-g3Efw8HQ/fvrACyM0sW0bNAVQDdGPLnARe8Uug3szj0=";
cargoSha256 = "sha256-otn0XvZ0wufD+4mCGSM0hevKM+wWSvFVCKtTu/5m1uA=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ];

@ -25,6 +25,12 @@ in stdenv.mkDerivation rec {
sed -i "s#/usr#$out#" src/dirb.c
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: resume.o:/build/dirb222/src/variables.h:15: multiple definition of `curl';
# crea_wordlist.o:/build/dirb222/src/variables.h:15: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
postInstall = ''
mkdir -p $out/share/dirb/
cp -r wordlists/ $out/share/dirb/

@ -4,7 +4,7 @@ with lib;
buildGoModule rec {
pname = "flannel";
version = "0.17.0";
version = "0.18.0";
rev = "v${version}";
vendorSha256 = null;
@ -13,7 +13,7 @@ buildGoModule rec {
inherit rev;
owner = "flannel-io";
repo = "flannel";
sha256 = "sha256-YM/cGmtHDTzgu6Bfy52oP8E1HmLNuBHNgEpz/qTj7rg=";
sha256 = "sha256-cxdbXhj79xp5jT5xY3cIzt5XYndPC+TWIrxBjAvbP0g=";
};
ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ipinfo";
version = "2.8.0";
version = "2.8.1";
src = fetchFromGitHub {
owner = pname;
repo = "cli";
rev = "${pname}-${version}";
sha256 = "sha256-hvn50sn1UHkC2K0U5beRAYkAe8y/5sYH7Xed3atXzDo=";
hash = "sha256-j+ASyNWfYh4/u7OX3iZx8DZZg1XAwuy6fpC9TJKI+18=";
};
vendorSha256 = null;

@ -0,0 +1,73 @@
{ lib
, stdenv
, fetchFromGitLab
, cmake
, libsodium
, json_c
, ncurses
, libxml2
, jq
}:
stdenv.mkDerivation rec {
pname = "spectre-cli";
version = "unstable-2022-02-05";
src = fetchFromGitLab {
owner = "spectre.app";
repo = "cli";
rev = "a5e7aab28f44b90e5bd1204126339a81f64942d2";
sha256 = "1hp4l1rhg7bzgx0hcai08rvcy6l9645sfngy2cr96l1bpypcld5i";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
libxml2
jq
];
buildInputs = [
libsodium
json_c
ncurses
];
cmakeFlags = [
"-DBUILD_SPECTRE_TESTS=ON"
];
preConfigure = ''
echo "${version}" > VERSION
# The default buildPhase wants to create a ´build´ dir so we rename the build script to stop conflicts.
mv build build.sh
'';
# Some tests are expected to fail on ARM64
# See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
checkPhase = ''
mv ../spectre-cli-tests ../spectre_tests.xml ./
patchShebangs spectre-cli-tests
export HOME=$(mktemp -d)
./spectre-tests
./spectre-cli-tests
'';
installPhase = ''
mkdir -p $out/bin
mv spectre $out/bin
'';
meta = with lib; {
description = "A stateless cryptographic identity algorithm";
homepage = "https://spectre.app";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emmabastas ];
mainProgram = "spectre";
platforms = platforms.all;
};
}

@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
patches = [ ./makefile.patch ];
# -fcommon: Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "badboy";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dXeu/e92lafurA/bqKoszIjK/3qw/ZvVKnDxYALRpTk=";
sha256 = "sha256-1neEuDsPMI4f1HaAP+Kx62RBW8hqqNThHpUNa5DzlnY=";
};
cargoSha256 = "sha256-LVfeQPRpwv1l3Brm8HJYoYvv26fJhsfR4I9Ds4NuWQM=";
cargoSha256 = "sha256-Sk0cOLknS1UK3OcLHVSnA/H3BeMe7bpo2HgHEErQSAQ=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "sad";
version = "0.4.20";
version = "0.4.21";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BhkSqXiQPOSYnCXqjAqenKx3DextxPluqsTAMI4Xs7g=";
sha256 = "sha256-kM5jeoFmDOwgnzdSwfPJfZhpBS8RPMNt143S5iYYrF4=";
};
cargoSha256 = "sha256-aKTF0DH8Lf/H6OfQPuQ6yGOmUEUguYcHMCuYKIjNR9k=";
cargoSha256 = "sha256-JwYUM4o4I3dC1HgG4bkUS1PH4MsxcvwdefjefnEZQFs=";
meta = with lib; {
description = "CLI tool to search and replace";

@ -389,7 +389,7 @@ with pkgs;
gpick = callPackage ../tools/misc/gpick { };
hobbes = callPackage ../development/tools/hobbes { };
hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; };
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
@ -992,7 +992,7 @@ with pkgs;
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
boost = boost16x; # checkPhase fails with Boost 1.77
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
adminer = callPackage ../servers/adminer { };
@ -1132,6 +1132,10 @@ with pkgs;
gfshare = callPackage ../tools/security/gfshare { };
gh-cal = callPackage ../tools/misc/gh-cal {
inherit (darwin.apple_sdk.frameworks) Security;
};
glooctl = callPackage ../applications/networking/cluster/glooctl { };
gobgp = callPackage ../tools/networking/gobgp { };
@ -1184,6 +1188,8 @@ with pkgs;
sdlookup = callPackage ../tools/security/sdlookup { };
spectre-cli = callPackage ../tools/security/spectre-cli { };
sx-go = callPackage ../tools/security/sx-go { };
systeroid = callPackage ../tools/system/systeroid { };
@ -1516,7 +1522,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { };
contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { fmt = fmt_8; };
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
@ -1628,7 +1634,7 @@ with pkgs;
writefreely = callPackage ../applications/misc/writefreely { };
iqueue = callPackage ../development/libraries/iqueue { };
iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; };
lifecycled = callPackage ../tools/misc/lifecycled { };
@ -2021,7 +2027,7 @@ with pkgs;
bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
bonnie = callPackage ../tools/filesystems/bonnie {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
botamusique = callPackage ../tools/audio/botamusique { };
@ -2142,7 +2148,7 @@ with pkgs;
dfmt = callPackage ../tools/text/dfmt { };
diopser = callPackage ../applications/audio/diopser { };
diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; };
diskonaut = callPackage ../tools/misc/diskonaut { };
@ -2242,7 +2248,7 @@ with pkgs;
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
gammy = qt5.callPackage ../tools/misc/gammy { };
gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; };
gams = callPackage ../tools/misc/gams (config.gams or {});
@ -3010,7 +3016,7 @@ with pkgs;
clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; };
clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
@ -3339,7 +3345,7 @@ with pkgs;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
djv = callPackage ../applications/graphics/djv { };
djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; };
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
@ -4740,7 +4746,7 @@ with pkgs;
evscript = callPackage ../tools/inputmethods/evscript { };
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
kime = callPackage ../tools/inputmethods/kime { };
@ -4971,7 +4977,7 @@ with pkgs;
createrepo_c = callPackage ../tools/package-management/createrepo_c { };
cromfs = callPackage ../tools/archivers/cromfs {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
cron = callPackage ../tools/system/cron { };
@ -5623,7 +5629,7 @@ with pkgs;
endlessh-go = callPackage ../servers/endlessh-go { };
ericw-tools = callPackage ../applications/misc/ericw-tools { };
ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; };
cryfs = callPackage ../tools/filesystems/cryfs { };
@ -6655,7 +6661,7 @@ with pkgs;
robodoc = callPackage ../tools/text/robodoc { };
ucg = callPackage ../tools/text/ucg { };
ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; };
grive2 = callPackage ../tools/filesystems/grive2 { };
@ -6736,9 +6742,8 @@ with pkgs;
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
gsmlib = callPackage ../development/libraries/gsmlib {
autoreconfHook = buildPackages.autoreconfHook269;
};
gsmlib = callPackage ../development/libraries/gsmlib
{ stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; };
gssdp = callPackage ../development/libraries/gssdp { };
@ -7227,7 +7232,7 @@ with pkgs;
boost = boost16x;
};
isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; };
isync = callPackage ../tools/networking/isync {
inherit (darwin.apple_sdk.frameworks) Security;
@ -8132,7 +8137,7 @@ with pkgs;
lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { };
loki = callPackage ../development/libraries/loki { };
loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; };
longview = callPackage ../servers/monitoring/longview { };
@ -8370,7 +8375,7 @@ with pkgs;
mkclean = callPackage ../applications/video/mkclean {};
mkcue = callPackage ../tools/cd-dvd/mkcue { };
mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; };
mkp224o = callPackage ../tools/security/mkp224o { };
@ -8922,9 +8927,8 @@ with pkgs;
ola = callPackage ../applications/misc/ola { };
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor
{ stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; };
ombi = callPackage ../servers/ombi { };
@ -8956,7 +8960,7 @@ with pkgs;
opencryptoki = callPackage ../tools/security/opencryptoki { };
opendbx = callPackage ../development/libraries/opendbx { };
opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; };
opendht = callPackage ../development/libraries/opendht {
inherit (darwin.apple_sdk.frameworks) Security;
@ -9222,12 +9226,10 @@ with pkgs;
perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
percona-xtrabackup = percona-xtrabackup_8_0;
percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix {
boost = boost159;
};
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {
boost = boost170;
};
percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix
{ stdenv = gcc10StdenvCompat; boost = boost159; };
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix
{ stdenv = gcc10StdenvCompat; boost = boost170; };
pick = callPackage ../tools/misc/pick { };
@ -10849,7 +10851,7 @@ with pkgs;
textadept = callPackage ../applications/editors/textadept/10 { };
textadept11 = callPackage ../applications/editors/textadept/11 { };
textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; };
texworks = libsForQt5.callPackage ../applications/editors/texworks { };
@ -11041,7 +11043,7 @@ with pkgs;
traceroute = callPackage ../tools/networking/traceroute { };
tracebox = callPackage ../tools/networking/tracebox { };
tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
tracee = callPackage ../tools/security/tracee { };
@ -11895,7 +11897,7 @@ with pkgs;
xwinwrap = callPackage ../tools/X11/xwinwrap {};
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
yafaray-core = callPackage ../tools/graphics/yafaray-core { stdenv = gcc10StdenvCompat; };
yajsv = callPackage ../tools/misc/yajsv { };
@ -12500,6 +12502,8 @@ with pkgs;
fennel = callPackage ../development/compilers/fennel { };
firrtl = callPackage ../development/compilers/firrtl { };
flasm = callPackage ../development/compilers/flasm { };
flyctl = callPackage ../development/web/flyctl { };
@ -12570,6 +12574,8 @@ with pkgs;
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv;
# This is not intended for use in nixpkgs but for providing a faster-running
# compiler to nixpkgs users by building gcc with reproducibility-breaking
# profile-guided optimizations
@ -13504,9 +13510,8 @@ with pkgs;
mint = callPackage ../development/compilers/mint { };
mitscheme = callPackage ../development/compilers/mit-scheme {
texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; };
};
mitscheme = callPackage ../development/compilers/mit-scheme
{ stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
mitschemeX11 = mitscheme.override {
enableX11 = true;
@ -13583,9 +13588,8 @@ with pkgs;
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
obliv-c = callPackage ../development/compilers/obliv-c {
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
};
obliv-c = callPackage ../development/compilers/obliv-c
{ stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; };
ocaml-ng = callPackage ./ocaml-packages.nix { };
ocaml = ocamlPackages.ocaml;
@ -13697,7 +13701,7 @@ with pkgs;
mrustc = callPackage ../development/compilers/mrustc { };
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; };
rustPackages_1_61 = rust_1_61.packages.stable;
rustPackages = rustPackages_1_61;
@ -14946,10 +14950,7 @@ with pkgs;
buildJdk = jdk11_headless;
buildJdkName = "java11";
runJdk = jdk11_headless;
stdenv =
if stdenv.cc.isClang then llvmPackages.stdenv
else if stdenv.cc.isGNU then gcc10Stdenv
else stdenv;
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat;
bazel_self = bazel_4;
};
@ -16291,7 +16292,7 @@ with pkgs;
symfony-cli = callPackage ../development/tools/symfony-cli { };
swiftshader = callPackage ../development/libraries/swiftshader { };
swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; };
systemfd = callPackage ../development/tools/systemfd { };
@ -16306,7 +16307,7 @@ with pkgs;
c3c = callPackage ../development/compilers/c3c { };
swfmill = callPackage ../tools/video/swfmill { };
swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; };
swftools = callPackage ../tools/video/swftools {
stdenv = gccStdenv;
@ -16455,7 +16456,7 @@ with pkgs;
webdis = callPackage ../development/tools/database/webdis { };
xc3sprog = callPackage ../development/embedded/xc3sprog { };
xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; };
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
@ -16852,7 +16853,7 @@ with pkgs;
classads = callPackage ../development/libraries/classads { };
clfft = callPackage ../development/libraries/clfft {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
clipp = callPackage ../development/libraries/clipp { };
@ -16928,7 +16929,7 @@ with pkgs;
uci = callPackage ../development/libraries/uci { };
uri = callPackage ../development/libraries/uri { };
uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; };
cppcms = callPackage ../development/libraries/cppcms { };
@ -16958,7 +16959,7 @@ with pkgs;
cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { };
cxxtools = callPackage ../development/libraries/cxxtools { };
cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; };
cwiid = callPackage ../development/libraries/cwiid { };
@ -19661,7 +19662,7 @@ with pkgs;
mosquitto = callPackage ../servers/mqtt/mosquitto { };
mps = callPackage ../development/libraries/mps { };
mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; };
libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
@ -19783,7 +19784,7 @@ with pkgs;
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
non = callPackage ../applications/audio/non { };
non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; };
ntl = callPackage ../development/libraries/ntl { };
@ -20892,7 +20893,7 @@ with pkgs;
tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { };
tiscamera = callPackage ../os-specific/linux/tiscamera { };
tiscamera = callPackage ../os-specific/linux/tiscamera { stdenv = gcc10StdenvCompat; };
tivodecode = callPackage ../applications/video/tivodecode { };
@ -21106,7 +21107,7 @@ with pkgs;
websocketpp = callPackage ../development/libraries/websocket++ { };
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { };
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; };
webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { };
# bump when majoring of packages have updated
webrtc-audio-processing = webrtc-audio-processing_0_3;
@ -21276,7 +21277,7 @@ with pkgs;
zlib-ng = callPackage ../development/libraries/zlib-ng { };
libdynd = callPackage ../development/libraries/libdynd { };
libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; };
zlog = callPackage ../development/libraries/zlog { };
@ -22270,7 +22271,7 @@ with pkgs;
nginx-sso = callPackage ../servers/nginx-sso { };
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; };
percona-server = percona-server56;
riak = callPackage ../servers/nosql/riak/2.2.0.nix {
@ -22732,7 +22733,7 @@ with pkgs;
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
xqilla = callPackage ../development/tools/xqilla { };
xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; };
xquartz = callPackage ../servers/x11/xquartz { };
@ -23638,7 +23639,7 @@ with pkgs;
pipework = callPackage ../os-specific/linux/pipework { };
pktgen = callPackage ../os-specific/linux/pktgen { };
pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; };
plymouth = callPackage ../os-specific/linux/plymouth { };
@ -25894,7 +25895,7 @@ with pkgs;
droopy = python3Packages.callPackage ../applications/networking/droopy { };
drumgizmo = callPackage ../applications/audio/drumgizmo {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
dsf2flac = callPackage ../applications/audio/dsf2flac { };
@ -26216,9 +26217,9 @@ with pkgs;
flrig = callPackage ../applications/radio/flrig { };
fluxus = callPackage ../applications/graphics/fluxus { };
fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; };
flwrap = callPackage ../applications/radio/flwrap { };
flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; };
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
@ -26910,7 +26911,7 @@ with pkgs;
inherit (gnome2) GConf;
};
gosmore = callPackage ../applications/misc/gosmore { };
gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
@ -27488,7 +27489,7 @@ with pkgs;
jgmenu = callPackage ../applications/misc/jgmenu { };
jigdo = callPackage ../applications/misc/jigdo { };
jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; };
jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
@ -28102,7 +28103,7 @@ with pkgs;
mikmod = callPackage ../applications/audio/mikmod { };
miniaudicle = callPackage ../applications/audio/miniaudicle { };
miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; };
minicom = callPackage ../tools/misc/minicom { };
@ -28948,7 +28949,7 @@ with pkgs;
pianobar = callPackage ../applications/audio/pianobar { };
pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; };
pianoteq = callPackage ../applications/audio/pianoteq { };
@ -29697,7 +29698,7 @@ with pkgs;
socialscan = with python3.pkgs; toPythonApplication socialscan;
sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; };
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
@ -30652,11 +30653,8 @@ with pkgs;
wxGTK = wxGTK31;
};
wxcam = callPackage ../applications/video/wxcam {
inherit (gnome2) libglade;
wxGTK = wxGTK28;
gtk = gtk2;
};
wxcam = callPackage ../applications/video/wxcam
{ stdenv = gcc10StdenvCompat; inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; };
xa = callPackage ../development/compilers/xa/xa.nix { };
dxa = callPackage ../development/compilers/xa/dxa.nix { };
@ -31242,17 +31240,15 @@ with pkgs;
boost = boost17x;
};
oxen = callPackage ../applications/blockchains/oxen {
boost = boost17x;
};
oxen = callPackage ../applications/blockchains/oxen
{ stdenv = gcc10StdenvCompat; boost = boost17x; };
masari = callPackage ../applications/blockchains/masari { boost = boost165; };
napari = with python3Packages; toPythonApplication napari;
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet {
boost = boost172;
};
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet
{ stdenv = gcc10StdenvCompat; boost = boost172; };
namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
@ -31619,16 +31615,16 @@ with pkgs;
cuyo = callPackage ../games/cuyo { };
deliantra-server = callPackage ../games/deliantra/server.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
deliantra-arch = callPackage ../games/deliantra/arch.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
deliantra-maps = callPackage ../games/deliantra/maps.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
deliantra-data = callPackage ../games/deliantra/data.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
ddnet = callPackage ../games/ddnet { };
@ -31651,9 +31647,8 @@ with pkgs;
dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
dxx-rebirth = callPackage ../games/dxx-rebirth {
physfs = physfs_2;
};
dxx-rebirth = callPackage ../games/dxx-rebirth
{ stdenv = gcc10StdenvCompat; physfs = physfs_2; };
inherit (callPackages ../games/dxx-rebirth/assets.nix { })
descent1-assets
@ -31919,7 +31914,7 @@ with pkgs;
manaplus = callPackage ../games/manaplus { };
mars = callPackage ../games/mars { };
mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; };
megaglest = callPackage ../games/megaglest { };
@ -32018,7 +32013,7 @@ with pkgs;
openlierox = callPackage ../games/openlierox { };
openclonk = callPackage ../games/openclonk { };
openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; };
openjk = callPackage ../games/openjk { };
@ -32247,10 +32242,8 @@ with pkgs;
# You still can override by passing more arguments.
space-orbit = callPackage ../games/space-orbit { };
spring = callPackage ../games/spring {
asciidoc = asciidoc-full;
boost = boost155;
};
spring = callPackage ../games/spring
{ stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; };
springLobby = callPackage ../games/spring/springlobby.nix { };
@ -32294,12 +32287,8 @@ with pkgs;
stt = callPackage ../tools/audio/stt { };
stuntrally = callPackage ../games/stuntrally {
ogre = ogre1_9;
mygui = mygui.override {
withOgre = true;
};
};
stuntrally = callPackage ../games/stuntrally
{ stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
superTux = callPackage ../games/supertux { };
@ -32749,23 +32738,23 @@ with pkgs;
};
bpp-core = callPackage ../development/libraries/science/biology/bpp-core {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
bppsuite = callPackage ../applications/science/biology/bppsuite {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
cd-hit = callPackage ../applications/science/biology/cd-hit {
@ -32923,7 +32912,7 @@ with pkgs;
star = callPackage ../applications/science/biology/star { };
strelka = callPackage ../applications/science/biology/strelka { };
strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; };
inherit (callPackages ../applications/science/biology/sumatools {})
sumalibs
@ -32992,7 +32981,7 @@ with pkgs;
flintqs = callPackage ../development/libraries/science/math/flintqs { };
getdp = callPackage ../applications/science/math/getdp { };
getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; };
gurobi = callPackage ../applications/science/math/gurobi { };
@ -33146,7 +33135,7 @@ with pkgs;
### SCIENCE/MOLECULAR-DYNAMICS
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; };
lammps = callPackage ../applications/science/molecular-dynamics/lammps {
fftw = fftw;
@ -33242,7 +33231,7 @@ with pkgs;
alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
aspino = callPackage ../applications/science/logic/aspino {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
stdenv = gcc10StdenvCompat;
};
beluga = callPackage ../applications/science/logic/beluga {};
@ -34083,7 +34072,7 @@ with pkgs;
utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
idsk = callPackage ../tools/filesystems/idsk { };
idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; };
colima = callPackage ../applications/virtualization/colima { };
@ -34546,7 +34535,7 @@ with pkgs;
stdenv = gccStdenv;
};
rss-glx = callPackage ../misc/screensavers/rss-glx { };
rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; };
run-scaled = callPackage ../tools/X11/run-scaled { };
@ -35189,9 +35178,8 @@ with pkgs;
openring = callPackage ../applications/misc/openring { };
openvino = callPackage ../development/libraries/openvino {
python = python3;
};
openvino = callPackage ../development/libraries/openvino
{ stdenv = gcc10StdenvCompat; python = python3; };
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70

@ -93,6 +93,8 @@ let
brisk-reconciler = callPackage ../development/ocaml-modules/brisk-reconciler { };
bwd = callPackage ../development/ocaml-modules/bwd { };
bz2 = callPackage ../development/ocaml-modules/bz2 { };
ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
@ -1455,6 +1457,8 @@ let
yuscii = callPackage ../development/ocaml-modules/yuscii { };
yuujinchou = callPackage ../development/ocaml-modules/yuujinchou { };
z3 = callPackage ../development/ocaml-modules/z3 {
inherit (pkgs) z3;
};

Loading…
Cancel
Save