Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-12 18:04:56 +00:00 committed by GitHub
commit 65a7d168af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 1979 additions and 547 deletions

View file

@ -38,7 +38,7 @@ git add $broken_config
git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
git add pkgs/development/haskell-modules/hackage-packages.nix
git commit -F - << EOF
hackage2nix: Mark failing builds broken
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
EOF

View file

@ -37,7 +37,7 @@ echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackag
if [[ "${1:-}" == "--do-commit" ]]; then
git add pkgs/development/haskell-modules/hackage-packages.nix
git commit -F - << EOF
hackage-packages.nix: Regenerate based on current config
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
EOF

View file

@ -61,7 +61,7 @@ sed -r \
if [[ "${1:-}" == "--do-commit" ]]; then
git add $stackage_config
git commit -F - << EOF
Stackage Nightly: $old_version -> $version
haskellPackages: stackage-nightly $old_version -> $version
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
EOF

View file

@ -43,13 +43,14 @@ in
options.console = {
font = mkOption {
type = types.str;
type = with types; either str path;
default = "Lat2-Terminus16";
example = "LatArCyrHeb-16";
description = ''
The font used for the virtual consoles. Leave empty to use
whatever the <command>setfont</command> program considers the
default font.
Can be either a font name or a path to a PSF font file.
'';
};

View file

@ -1,14 +1,16 @@
{ mkDerivation
{ lib
, stdenv
, cmark-gfm
, fetchurl
, fetchpatch
, qmake
, qtbase
, qtwebkit
, lib
, qtwebengine
, wrapGAppsHook
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "mindforger";
version = "1.52.0";
@ -17,19 +19,41 @@ mkDerivation rec {
sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd";
};
nativeBuildInputs = [ qmake wrapGAppsHook ] ;
buildInputs = [ qtbase qtwebkit cmark-gfm ] ;
nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ];
buildInputs = [ qtbase qtwebengine cmark-gfm ];
doCheck = true;
patches = [ ./build.patch ] ;
patches = [
# this makes the package relocatable - removes hardcoded references to /usr
./paths.patch
# this fixes compilation with QtWebEngine - referencing a commit trying to upstream the change - see https://github.com/dvorka/mindforger/pull/1357
(fetchpatch {
url = "https://github.com/dvorka/mindforger/commit/d28e2bade0278af1b5249953202810540969026a.diff";
sha256 = "sha256-qHKQQNGSc3F9seaOHV0gzBQFFqcTXk91LpKrojjpAUw=";
})
];
postPatch = ''
substituteInPlace lib/src/install/installer.cpp --replace /usr "$out"
substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out"
for f in app/app.pro lib/lib.pro; do
substituteInPlace "$f" --replace "QMAKE_CXX = g++" ""
done
'';
qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ;
qmakeFlags = [
"-r"
"mindforger.pro"
"CONFIG+=mfnoccache"
"CONFIG+=mfwebengine"
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir "$out"/Applications
mv app/mindforger.app "$out"/Applications/
wrapQtApp "$out"/Applications/mindforger.app/Contents/MacOS/mindforger
'';
meta = with lib; {
description = "Thinking Notebook & Markdown IDE";

View file

@ -102,5 +102,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2Plus ];
maintainers = with lib.maintainers; [ turion ];
};
}

View file

@ -16,6 +16,7 @@
, glib-networking
, librsvg
, gst_all_1
, xdg-utils
}:
stdenv.mkDerivation rec {
@ -78,6 +79,9 @@ stdenv.mkDerivation rec {
sqlite
webkitgtk
# open link in browser
xdg-utils
# TLS support for loading external content in webkitgtk WebView
glib-networking

View file

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "kdeltachat";
version = "unstable-2021-05-31";
version = "unstable-2021-06-06";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
rev = "318ae67c17f3e64532bad23c2a61a93446db553d";
sha256 = "1qy0hlp0r91sqn26ai9isxw4rl8kcmmb10a2p9yqynhm8py3dfn4";
rev = "321c19b7415e837acc4e66d535e82518618bc096";
sha256 = "19py9mxpjz09fhyyvxf75s77nq0jwwfiljq9289192p61grk6625";
};
nativeBuildInputs = [

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, perl, libiconv, zlib, popt
, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null
, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null
, enableLZ4 ? true, lz4 ? null
, enableOpenSSL ? true, openssl ? null
, enableXXHash ? true, xxHash ? null

View file

@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.20.3";
version = "0.21.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "sha256-rORIrbUqtQZuU6TjjYP7IZHfCPeLnrNy6wInnAwhG48=";
sha256 = "sha256-n8ipIQAfKPVApJhuTrlSSsd6dlPeCUvk7rdiVmL9i+4=";
};
buildInputs = [
@ -63,10 +63,6 @@ buildPythonApplication rec {
outputs = [ "out" "terminfo" ];
patches = [
./fix-paths.patch
];
# Causes build failure due to warning
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

View file

@ -1,16 +0,0 @@
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
# Patching is needed here for the following reason:
# * importing the `constants` package from Kitty has a side effect that it
# creates the user configuration directory. This package gets imported
# while sphinx scans the code for documentation strings.
#
# You can set these variables from the command line.
SPHINXOPTS = -j auto -T $(FAIL_WARN)
-SPHINXBUILD = sphinx-build
+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build
SPHINXPROJ = kitty
SOURCEDIR = .
BUILDDIR = _build

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }:
stdenv.mkDerivation {
name = "urxvt-font-size-2015-05-22";
dontPatchShebangs = true;
stdenv.mkDerivation rec {
name = "urxvt-font-size";
version = "1.3";
src = fetchFromGitHub {
owner = "majutsushi";
repo = "urxvt-font-size";
rev = "fd5b09c10798c6723bbf771d4d8881cf6563bc69";
sha256 = "16m3kkypg3y00x597zx05zy167a0kaqpawz0l591wzb2bv1dz55z";
rev = "v${version}";
sha256 = "1526ap161cp3378f4ijd09nmsh71ld7bkxxhp8p6razdi2v8r16h";
};
installPhase = ''

View file

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "fossil";
version = "2.14";
version = "2.15.1";
src = fetchurl {
urls =
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${pname}-${version}.tar.gz";
sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k=";
sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E=";
};
nativeBuildInputs = [ installShellFiles tcl tcllib ];
@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib openssl readline sqlite which ed ]
++ lib.optional stdenv.isDarwin libiconv;
enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
configureFlags = [ "--disable-internal-sqlite" ]
@ -57,8 +59,9 @@ stdenv.mkDerivation rec {
many such systems in use today. Fossil strives to distinguish itself
from the others by being extremely simple to setup and operate.
'';
homepage = "http://www.fossil-scm.org/";
homepage = "https://www.fossil-scm.org/";
license = licenses.bsd2;
maintainers = with maintainers; [ maggesi viric ];
platforms = platforms.all;
};
}

View file

@ -11,14 +11,14 @@ let
depSrcs = import ./deps.nix { inherit fetchurl; };
in mkDerivation rec {
pname = "plex-media-player";
version = "2.58.0.1076";
vsnHash = "38e019da";
version = "2.58.1";
vsnHash = "ae73e074";
src = fetchFromGitHub {
owner = "plexinc";
repo = "plex-media-player";
rev = "v${version}-${vsnHash}";
sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw=";
sha256 = "1q20fdp5d0blb0q6p2357bwdc2g65cadkgdp4w533ij2nyaxydjd";
};
nativeBuildInputs = [ pkg-config cmake python3 ];

View file

@ -7,22 +7,22 @@ rec {
webClient = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc=";
sha256 = "1xsacy1xb8a9rfdrd7lvx7n3hd0cf2c3mgmg9wl18jvwnqxyac83";
};
webClientDesktopHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8=";
sha256 = "07spxyhrg45ppa2zjn3ri4qvi6qimlmq6wmh492r3jkrwd71rxgf";
};
webClientDesktop = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4=";
sha256 = "1zll79hpgx8fghx228li9qairfd637yf8rhvjzdgpq4dvn21fv65";
};
webClientTvHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8=";
sha256 = "1zzfw2g76wqrxrx9kck5q79if78z91wn3awj703kz9sgxi4bkjsk";
};
webClientTv = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g=";
sha256 = "1f1zvrr3c0w37gvl78blg9rgxxi64nc4iv5vd87qbysfh1vpsjz0";
};
}

View file

@ -1,6 +1,6 @@
{
"commit": "9be76e8f01853e5a2f0600107c9b50d12a17581b",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9be76e8f01853e5a2f0600107c9b50d12a17581b.tar.gz",
"sha256": "0sy8lx04yb9lk9liscqr44z7lzzq67w3zmkq78a0yv37jadb557k",
"msg": "Update from Hackage at 2021-06-02T14:32:36Z"
"commit": "d1a32be92531e75b1acae3126313cdc013951965",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d1a32be92531e75b1acae3126313cdc013951965.tar.gz",
"sha256": "190m9drzg7rgkjpimlgvl8hsv2g1jg0m0fdgy8xkrh7xr1vjxxgz",
"msg": "Update from Hackage at 2021-06-06T15:18:11Z"
}

View file

@ -10,6 +10,7 @@
, libxfce4ui
, libxfce4util
, libxslt
, pcre
, xfconf
, gobject-introspection
, makeWrapper
@ -39,6 +40,7 @@ let unwrapped = mkXfceDerivation {
libnotify
libxfce4ui
libxfce4util
pcre
xfconf
];

View file

@ -89,9 +89,19 @@ let
targetCC = builtins.head toolsForTarget;
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
coreutils
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
];
in
stdenv.mkDerivation (rec {
@ -235,7 +245,7 @@ stdenv.mkDerivation (rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
done
'';

View file

@ -98,9 +98,19 @@ let
targetCC = builtins.head toolsForTarget;
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
coreutils
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
];
in
stdenv.mkDerivation (rec {
@ -242,7 +252,7 @@ stdenv.mkDerivation (rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
done
'';

View file

@ -90,9 +90,19 @@ let
targetCC = builtins.head toolsForTarget;
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
coreutils
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
];
in
stdenv.mkDerivation (rec {
@ -225,7 +235,7 @@ stdenv.mkDerivation (rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
done
'';

View file

@ -100,9 +100,19 @@ let
targetCC = builtins.head toolsForTarget;
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
coreutils
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
];
in
stdenv.mkDerivation (rec {
@ -242,7 +252,7 @@ stdenv.mkDerivation (rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
done
'';

View file

@ -0,0 +1,48 @@
{ lib
, stdenv
, fetchFromGitLab
, guile
, libgit2
, scheme-bytestructures
, autoreconfHook
, pkg-config
, texinfo
}:
stdenv.mkDerivation rec {
pname = "guile-git";
version = "0.3.0";
src = fetchFromGitLab {
owner = "guile-git";
repo = pname;
rev = "v${version}";
sha256 = "1s77s70gzfj6h7bglq431kw8l4iknhsfpc0mnvcp4lkhwdcgyn1n";
};
postConfigure = ''
sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile;
sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile;
'';
nativeBuildInputs = [
autoreconfHook pkg-config texinfo
];
buildInputs = [
guile
];
propagatedBuildInputs = [
libgit2 scheme-bytestructures
];
enableParallelBuilding = true;
meta = with lib; {
description = "Bindings to Libgit2 for GNU Guile";
homepage = "https://gitlab.com/guile-git/guile-git";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ethancedwards8 ];
platforms = platforms.linux;
};
}

View file

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2021-05-28";
version = "unstable-2021-06-12";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/5fb325e094af91328e02cc2ecfd211feaeb135a7.tar.gz";
sha256 = "1zbd336s99rgk24yjqlp012d0f66s5nf190sjmsl7mfhqx9j2y4l";
url = "https://github.com/NixOS/cabal2nix/archive/01feffa0aeee835504e0c0ccf4bca2e33a698252.tar.gz";
sha256 = "0clckh0qqvjcb8szy1d6qqlxj6sqp28jc2p3vhzhkf95cv491si9";
};
isLibrary = true;
isExecutable = true;

View file

@ -37,6 +37,10 @@ self: super: {
# Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
happy = dontCheck super.happy;
# Disable GClosure based signals implementation on aarch64 as it causes linker issues
# https://github.com/gtk2hs/gtk2hs/issues/305
gtk2hs-buildtools = appendConfigureFlag super.gtk2hs-buildtools "-f-ClosureSignals";
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
# AARCH64-SPECIFIC OVERRIDES

View file

@ -1925,10 +1925,6 @@ EOT
# https://github.com/haskell-hvr/missingh/issues/56
MissingH = doJailbreak super.MissingH;
# Too strict bound on containers
# https://github.com/batterseapower/parallel-io/issues/14#issuecomment-853441933
parallel-io = doJailbreak super.parallel-io;
# Disable flaky tests
# https://github.com/DavidEichmann/alpaca-netcode/issues/2
alpaca-netcode = overrideCabal super.alpaca-netcode {
@ -1953,4 +1949,10 @@ EOT
# https://github.com/HeinrichApfelmus/reactive-banana/issues/215
reactive-banana = doJailbreak super.reactive-banana;
# Too strict version bounds on QuickCheck and semirings
# https://github.com/erikd/wide-word/issues/57
wide-word = doJailbreak super.wide-word;
hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -87,4 +87,8 @@ self: super: {
# Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = self.hackage-db_2_1_0;
}

View file

@ -106,4 +106,8 @@ self: super: {
# https://github.com/haskellari/time-compat/issues/23
time-compat = dontCheck super.time-compat;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
}

View file

@ -135,4 +135,8 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that dont work on older compilers
vector = dontCheck super.vector;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
}

View file

@ -101,4 +101,18 @@ self: super: {
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
lens = super.lens_5_0_1;
# 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
memory = super.memory_0_16_0;
# 0.29 introduced support for GHC 9.0.x, stackage has 0.28
cryptonite = super.cryptonite_0_29;
# GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
# https://github.com/snoyberg/mono-traversable/issues/192
mono-traversable = dontCheck super.mono-traversable;
# Disable tests pending resolution of
# https://github.com/Soostone/retry/issues/71
retry = dontCheck super.retry;
}

View file

@ -370,6 +370,7 @@ broken-packages:
- biohazard
- bio-sequence
- birds-of-paradise
- biscuit-haskell
- bisect-binary
- bishbosh
- bitcoin-hs
@ -998,6 +999,7 @@ broken-packages:
- dhall-fly
- dhall-text
- dhall-to-cabal
- dhcp-lease-parser
- dhrun
- dia-base
- diagrams-boolean
@ -2202,6 +2204,7 @@ broken-packages:
- hs-carbon-examples
- hscd
- hs-cdb
- hscdio
- hsclock
- hScraper
- hscuid
@ -2480,6 +2483,7 @@ broken-packages:
- Irc
- irc-dcc
- irc-fun-types
- iri
- iridium
- iron-mq
- irt
@ -2548,6 +2552,7 @@ broken-packages:
- json-schema
- jsonschema-gen
- jsonsql
- json-syntax
- json-tools
- json-tracer
- jsontsv
@ -3059,6 +3064,7 @@ broken-packages:
- movie-monad
- mpppc
- mpris
- mptcp-pm
- mpvguihs
- mqtt
- mqtt-hs
@ -3390,6 +3396,7 @@ broken-packages:
- pandoc-utils
- pang-a-lambda
- pangraph
- pan-os-syslog
- panpipe
- pansite
- pantry-tmp
@ -4209,6 +4216,7 @@ broken-packages:
- shorten-strings
- show-prettyprint
- Shpadoinkle-backend-snabbdom
- Shpadoinkle-isreal
- Shpadoinkle-streaming
- shwifty
- sifflet
@ -4282,6 +4290,7 @@ broken-packages:
- slug
- slugify
- smallarray
- small-bytearray-builder
- smallcheck-kind-generics
- smallcheck-laws
- smallcheck-lens
@ -4681,6 +4690,7 @@ broken-packages:
- thank-you-stars
- th-build
- th-dict-discovery
- themoviedb
- thentos-cookie-session
- Theora
- theoremquest
@ -4919,6 +4929,7 @@ broken-packages:
- unordered-intmap
- unpacked-either
- unpacked-maybe
- unpacked-maybe-numeric
- unpack-funcs
- unroll-ghc-plugin
- unsafely
@ -5119,7 +5130,6 @@ broken-packages:
- whiskers
- whois
- why3
- wide-word
- WikimediaParser
- windns
- winerror

View file

@ -93,6 +93,9 @@ default-package-overrides:
- futhark < 0.19.5
# 2021-06-05: remove once pandoc 2.14 is in stackage
- pandoc-crossref < 0.3.11.0
# 2021-06-07: stackage still has dhall < 1.39
- dhall-nix < 1.1.21
- dhall-openapi < 1.0.1
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -122,6 +125,7 @@ extra-packages:
- gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501
package-maintainers:
abbradar:
@ -393,6 +397,7 @@ unsupported-platforms:
mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ]
mpi-hs-store: [ aarch64-linux, x86_64-darwin ]
mplayer-spot: [ aarch64-linux ]
mptcp-pm: [ x86_64-darwin ]
netlink: [ x86_64-darwin ]
oculus: [ x86_64-darwin ]
pam: [ x86_64-darwin ]

View file

@ -20,7 +20,6 @@ dont-distribute-packages:
- activehs
- actor
- AC-Vector-Fancy
- addy
- adhoc-network
- adict
- ADPfusionForest
@ -117,10 +116,8 @@ dont-distribute-packages:
- atp
- AttoJson
- attoparsec-enumerator
- attoparsec-ip
- attoparsec-iteratee
- attoparsec-text-enumerator
- attoparsec-uri
- atuin
- audiovisual
- aura
@ -168,7 +165,6 @@ dont-distribute-packages:
- Barracuda
- base16-lens
- base32-bytestring
- base62
- base64-bytes
- baserock-schema
- BASIC
@ -309,10 +305,8 @@ dont-distribute-packages:
- buster-network
- butterflies
- bv-sized-lens
- bytebuild
- bytehash
- bytelog
- bytesmith
- bytestring-read
- c0check
- cabal2arch
@ -622,7 +616,6 @@ dont-distribute-packages:
- dewdrop
- dfinity-radix-tree
- dhall-docs
- dhcp-lease-parser
- dia-functions
- diagrams-haddock
- diagrams-html5
@ -1565,7 +1558,6 @@ dont-distribute-packages:
- invertible-hlist
- ion
- IORefCAS
- ip
- ipatch
- ipc
- ipld-cid
@ -1575,7 +1567,6 @@ dont-distribute-packages:
- irc-fun-client
- irc-fun-color
- irc-fun-messages
- iri
- ironforge
- isevaluated
- ismtp
@ -1631,7 +1622,6 @@ dont-distribute-packages:
- json-incremental-decoder
- json-query
- jsons-to-schema
- json-syntax
- json-togo
- json-tokens
- jspath
@ -1886,7 +1876,6 @@ dont-distribute-packages:
- markdown2svg
- markdown-pap
- markov-processes
- markup
- marmalade-upload
- marquise
- marvin
@ -1986,7 +1975,6 @@ dont-distribute-packages:
- mpretty
- mprover
- mps
- mptcp-pm
- msgpack-aeson
- msgpack-idl
- msgpack-rpc
@ -2127,6 +2115,7 @@ dont-distribute-packages:
- openpgp-crypto-api
- OpenSCAD
- openssh-github-keys
- opentelemetry-extra_0_7_0
- opentracing-jaeger
- opentracing-zipkin-v1
- open-union
@ -2146,7 +2135,6 @@ dont-distribute-packages:
- pairing
- panda
- pandoc-japanese-filters
- pan-os-syslog
- papa
- papa-base
- papa-base-implement
@ -2526,7 +2514,6 @@ dont-distribute-packages:
- runtime-arbitrary
- S3
- safe-coloured-text-layout-gen
- safe-numeric
- safer-file-handles
- safer-file-handles-bytestring
- safer-file-handles-text
@ -2565,7 +2552,6 @@ dont-distribute-packages:
- scholdoc
- scholdoc-citeproc
- scholdoc-texmath
- scientific-notation
- SciFlow
- SciFlow-drmaa
- scion
@ -2688,11 +2674,9 @@ dont-distribute-packages:
- skylark-client
- slidemews
- slip32
- small-bytearray-builder
- smallstring
- smartword
- smcdel
- smith
- smith-cli
- smith-client
- Smooth
@ -2842,6 +2826,8 @@ dont-distribute-packages:
- swearjure
- sweet-egison
- switch
- sydtest_0_2_0_0
- sydtest-persistent-postgresql
- sylvia
- symantic-atom
- symantic-lib
@ -3035,7 +3021,6 @@ dont-distribute-packages:
- universe-th
- unix-fcntl
- unix-simple
- unpacked-maybe-numeric
- unpacked-these
- unpacked-validation
- unparse-attoparsec
@ -3048,9 +3033,7 @@ dont-distribute-packages:
- urembed
- uri-enumerator
- uri-enumerator-file
- url-bytes
- UrlDisp
- urlpath
- URLT
- usb
- usb-enumerator
@ -3063,7 +3046,6 @@ dont-distribute-packages:
- uu-cco-examples
- uu-cco-hut-parsing
- uu-cco-uu-parsinglib
- uuid-bytes
- uuid-crypto
- uvector-algorithms
- v4l2
@ -3090,6 +3072,7 @@ dont-distribute-packages:
- vfr-waypoints
- ViennaRNA-extras
- vigilance
- vimeta
- vinyl-operational
- vision
- visual-graphrewrite
@ -3110,7 +3093,6 @@ dont-distribute-packages:
- wai-middleware-cache
- wai-middleware-cache-redis
- wai-middleware-consul
- wai-middleware-content-type
- wai-middleware-rollbar
- wai-middleware-route
- wai-session-tokyocabinet
@ -3144,7 +3126,6 @@ dont-distribute-packages:
- wheb-redis
- wheb-strapped
- whitespace
- wide-word-instances
- wikipedia4epub
- windowslive
- winio
@ -3163,7 +3144,6 @@ dont-distribute-packages:
- wrecker-ui
- wright
- writer-cps-full
- ws
- wss-client
- wtk-gtk
- wumpus-basic
@ -3235,7 +3215,6 @@ dont-distribute-packages:
- yesod-colonnade
- yesod-continuations
- yesod-examples
- yesod-ip
- yesod-mangopay
- yesod-paypal-rest
- yesod-platform

View file

@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
# Use the default version of mysql to build this package (which is actually mariadb).
# test phase requires networking
mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
mysql = dontCheck super.mysql;
# CUDA needs help finding the SDK headers and libraries.
cuda = overrideCabal super.cuda (drv: {
@ -833,4 +833,16 @@ self: super: builtins.intersectAttrs super {
sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs
'' + (drv.postPatch or "");
});
# Runtime dependencies and CLI completion
nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal
super.nvfetcher (drv: {
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
postInstall = drv.postInstall or "" + ''
wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${
pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ]
}"
'';
}));
}

View file

@ -481,7 +481,7 @@ stdenv.mkDerivation ({
# ^^ if the project is not a library, and we have a build target, then use "copy" to install
# just the target specified; "install" will error here, since not all targets have been built.
else ''
${setupCommand} copy
${setupCommand} copy ${buildTarget}
local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
local packageConfFile="$packageConfDir/${pname}-${version}.conf"
mkdir -p "$packageConfDir"

File diff suppressed because it is too large Load diff

View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "2D physics engine";
homepage = "https://box2d.org/";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.zlib;
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
{ lib, stdenv, fetchurl, autoreconfHook, gtk-doc, gettext
, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip
}:
@ -6,11 +6,10 @@ stdenv.mkDerivation rec {
pname = "liblangtag";
version = "0.6.3";
src = fetchFromBitbucket {
owner = "tagoh";
repo = pname;
rev = version;
sha256 = "10rycs8xrxzf9frzalv3qx8cs1jcildhrr4imzxdmr9f4l585z96";
# Artifact tarball contains lt-localealias.h needed for darwin
src = fetchurl {
url = "https://bitbucket.org/tagoh/liblangtag/downloads/${pname}-${version}.tar.bz2";
sha256 = "sha256-HxKiCgLsOo0i5U3tuLaDpDycFgvaG6M3vxBgYHrnM70=";
};
core_zip = fetchurl {
@ -31,19 +30,19 @@ stdenv.mkDerivation rec {
cp "${language_subtag_registry}" data/language-subtag-registry
'';
configureFlags = [
"--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"
];
configureFlags =
lib.optional
(stdenv.hostPlatform.libc == "glibc")
"--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias";
buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ];
nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ];
meta = {
inherit version;
meta = with lib; {
description = "An interface library to access tags for identifying languages";
license = lib.licenses.mpl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.mpl20;
maintainers = [ maintainers.raskin ];
platforms = platforms.unix;
# There are links to a homepage that are broken by a BitBucket change
homepage = "https://bitbucket.org/tagoh/liblangtag/overview";
};

View file

@ -8,50 +8,48 @@
buildDunePackage rec {
pname = "arp";
version = "2.3.1";
minimumOCamlVersion = "4.06";
useDune2 = true;
version = "2.3.2";
src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "1nzm3fbkvz702g8f60fs49736lpffwchy64i1l1raxm9b4lmdk3p";
sha256 = "1s09ibj9v6pp2ckn96wxmn3mjifcj97asls5xc4zg75pflk0grgz";
};
minimumOCamlVersion = "4.06";
useDune2 = true;
nativeBuildInputs = [
bisect_ppx
];
propagatedBuildInputs = [
cstruct
ipaddr
macaddr
logs
mirage-time
mirage-protocols
lwt
duration
ipaddr
logs
lwt
macaddr
mirage-profile
mirage-protocols
mirage-time
];
doCheck = true;
checkInputs = [
alcotest
ethernet
mirage-clock-unix
mirage-profile
mirage-random
mirage-random-test
mirage-vnetif
mirage-clock-unix
mirage-random
mirage-time-unix
ethernet
mirage-vnetif
];
meta = with lib; {
description = "Address Resolution Protocol purely in OCaml";
license = licenses.isc;
homepage = "https://github.com/mirage/arp";
maintainers = [ maintainers.sternenseemann ];
license = licenses.isc;
maintainers = with maintainers; [ sternenseemann ];
};
}

View file

@ -6,29 +6,41 @@
buildDunePackage rec {
pname = "index";
version = "1.3.0";
minimumOCamlVersion = "4.08";
useDune2 = true;
version = "1.3.1";
src = fetchurl {
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
sha256 = "00qwhwg79scs5bgp8nbppv06qs9yhicf686q7lh64ngh0642iz6n";
sha256 = "sha256-ycZi/TFLoGRloSpjYqH5FCHWP3eyiTCIDLESEn5inuI=";
};
buildInputs = [ stdlib-shims ];
minimumOCamlVersion = "4.08";
useDune2 = true;
buildInputs = [
stdlib-shims
];
propagatedBuildInputs = [
fmt logs mtime repr ppx_repr cmdliner progress semaphore-compat
cmdliner
fmt
logs
mtime
ppx_repr
progress
repr
semaphore-compat
];
checkInputs = [
alcotest
crowbar
re
];
doCheck = true;
checkInputs = [ alcotest crowbar re ];
meta = {
homepage = "https://github.com/mirage/index";
meta = with lib; {
description = "A platform-agnostic multi-level index";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/index";
license = licenses.mit;
maintainers = with maintainers; [ vbgl ];
};
}

View file

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, poetry-core
, yarl
, aresponses
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ambee";
version = "0.2.1";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-ambee";
rev = "v${version}";
sha256 = "11liw2206lyrnx09giqapjpi25lr2qnbmigi6rgynr2a1i9vxy1s";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
yarl
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
postPatch = ''
# Upstream doesn't set a version for the pyproject.toml
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}" \
--replace "--cov" ""
'';
pythonImportsCheck = [ "ambee" ];
meta = with lib; {
description = "Python client for Ambee API";
homepage = "https://github.com/frenck/python-ambee";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
, guile
, autoreconfHook
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "scheme-bytestructures";
version = "1.0.7";
src = fetchFromGitHub {
owner = "TaylanUB";
repo = pname;
rev = "v${version}";
sha256 = "0q0habjiy3h9cigb7q1br9kz6z212dn2ab31f6dgd3rrmsfn5rvb";
};
postConfigure = ''
sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile;
sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile;
'';
nativeBuildInputs = [
autoreconfHook pkg-config
];
buildInputs = [
guile
];
meta = with lib; {
description = "Structured access to bytevector contents";
homepage = "https://github.com/TaylanUB/scheme-bytestructures";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ethancedwards8 ];
platforms = platforms.linux;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tflint";
version = "0.29.0";
version = "0.29.1";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "1ciwr2bwbxnw8366wvgl5ga3y2qj46i0h3yp3av1x9n2r8rddrlh";
sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82";
};
vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk";

View file

@ -44,16 +44,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.9";
version = "6.10";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-GFVOYB3vhqmiAXKwhcZoMpFPwh511VX25U/4nn6uW/4=";
sha256 = "sha256-WO3hSEgtSRiCYtWi0MnXAKdMacUcyqEcWt9j0/MUQZ8=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "6.1.1";
version = "6.2.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-rDsUvq/eNLhIIofllwABE9wGqRXzLJ/QbHfrgZB544s=";
sha256 = "sha256-zY1TUT2DV7KHama6sIllTvmUH0LvaQ+1VcZJP1OB28o=";
};
patches = [
@ -65,17 +65,12 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-g0NmiypafOAmKDRoRf4uz5NnhFo6uga0fKYNCF29jbE=";
sha256 = "sha256-nqXgJe2i1xDW1aCAmwFPshiUI2PtZ/S7p8Cq2ODMTQk=";
owner = "wine-staging";
repo = "wine-staging";
#rev = "v${version}";
# FIXME: replace with line above with 6.10 release
# Fix https://bugs.winehq.org/show_bug.cgi?id=51172
rev = "5bbe3e47a559b3c04bc8791e0b398a271c772af7";
rev = "v${version}";
# Actually only "d3d11-Deferred_Context" cause problems, two others only dependencies
# see FIXME above
disabledPatchsets = [ "d3d11-Deferred_Context" "wined3d-CSMT_Main" "nvapi-Stub_DLL" "nvcuvid-CUDA_Video_Support" "nvencodeapi-Video_Encoder" ];
disabledPatchsets = [ ];
};
winetricks = fetchFromGitHub rec {

View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "mas";
version = "1.8.1";
version = "1.8.2";
src = fetchurl {
url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas.pkg";
sha256 = "W/wgg+ETeJPoZ7MoVGH2uJzQiZMLIy3n1JYKUloc3ZU=";
sha256 = "HlLQKBVIYKanS6kjkbYdabBi1T0irxE6fNd2H6mDKe4=";
};
nativeBuildInputs = [ libarchive p7zip ];
@ -25,13 +25,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
cp -r ./bin $out
cp -r ./Frameworks $out
'';
postFixup = ''
install_name_tool -change @rpath/MasKit.framework/Versions/A/MasKit $out/Frameworks/MasKit.framework/Versions/A/MasKit $out/bin/mas
install_name_tool -change @rpath/Commandant.framework/Commandant $out/Frameworks/MasKit.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Commandant $out/bin/mas
cp -r ./usr/local/bin $out
'';
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, pkg-config, git, libmicrohttpd_0_9_70 }:
{ stdenv, lib, fetchgit, pkg-config, git, libmicrohttpd }:
stdenv.mkDerivation rec {
pname = "fileshare";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config git ];
buildInputs = [ libmicrohttpd_0_9_70 ];
buildInputs = [ libmicrohttpd ];
makeFlags = [ "BUILD=release" ];

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "8.0.0";
version = "8.0.1";
excludedPackages = [ "release_publisher" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-HtubiSx4Orf9knZcuYy4eF2qwclX/JVd2Ba9L33tM74=";
sha256 = "sha256-Vs/4urH/XuoVly26YfhFbf/T3x5jdS4BgrVStuTHaHo=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-bwBpkPy4kwfnkRsLOktUgQx+Sm8WJA2d65efMBCnGp4=";
sha256 = "sha256-b05nUApLjdQW5vbS56HUK+/GXKcHo2UAHybfe6ZTr3U=";
};
vendorSha256 = "sha256-Hon5WrhXUvZUtMRxx3XcBDQe3rkRkfqbnXjY3xCzuuM=";
vendorSha256 = "sha256-iwB1JtekxFYSHjaV+TqBDqnyE5zt3RJ4dQmf12AA53U=";
preBuild = ''
# The testcase makes an API call against grafana.com:
@ -38,6 +38,10 @@ buildGoModule rec {
rm -r scripts/go
'';
buildFlagsArray = ''
-ldflags=-s -w -X main.version=${version}
'';
postInstall = ''
tar -xvf $srcStatic
mkdir -p $out/share/grafana

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pgvector";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "ankane";
repo = pname;
rev = "v${version}";
sha256 = "0zrb9r9yh05nip2gwg96fhfk766hwqwa8plcvj2b4x4hhjk6q1ps";
sha256 = "108qf5pvqhz4vh31sijikajf4hrrk7rknrqzwj999psr33acag4z";
};
buildInputs = [ postgresql ];

View file

@ -4,21 +4,21 @@ let
webassets = fetchFromGitHub {
owner = "gravitational";
repo = "webassets";
rev = "cf396f868aebb8ba654ea2398c25f033181e7114";
sha256 = "sha256-12jkpWl/kL0ttRHtxyDnKjYAZNrheEGQF8HEGSXvvAk=";
rev = "8c2812c169fa6bd5f31c13160bd93ef8b317bbc9";
sha256 = "sha256-O+H8N1yqQiH645mgXeSc330GRmxF+gxiJJ5iYn65Z6Q=";
};
in
buildGoModule rec {
pname = "teleport";
version = "6.1.3";
version = "6.2.3";
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub {
owner = "gravitational";
repo = "teleport";
rev = "v${version}";
sha256 = "sha256-kb7qRPZKXDY0Qy3/72epAGaN2FCOO/XAN8lOoUYkoM0=";
sha256 = "sha256-3syl1a2ui8/aTgCvihuhg575Df31loOXuENBNJG3nR0=";
};
vendorSha256 = null;

View file

@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "1f86pkjsp8lrmk8ap40wh9zbzb2ni49vc2cjsdjbj4pkkwivihpv";
sha256 = "0xhy2sa04ir5ncjnnx25nyf66k21w3f649smhfpz9973s7vk5vhg";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "1l47lq2wq8y0adrjij3w5ki1mm1f00503ks398flfmbzyav6bad3";
sha256 = "1dkj4cpy891nd3l1xcqaj1mfphirs9fzbm081i8pyn36nwmdpg2j";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
version = "343.0.0";
version = "344.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
version = "0.1.16";
version = "0.1.17";
src = fetchFromGitHub {
owner = "printfn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ITS2wE4vwp0W/nlTyX55cY5E95VIwR46JBzF0pD/xsE=";
sha256 = "sha256-Xq2UjeZiKy9BjNQ9xnC7tppEwrEtg8ZN5BVDz1bUOmw=";
};
cargoSha256 = "sha256-YqOc/B+ZP1i9xJLrOguQ6fwQr6SV0qvQ3fWwguY2S0I=";
cargoSha256 = "sha256-Bf3fYHhpoX05AmTdwwdRU2YRfGVb1EmaGDm75i+Vs2w=";
doInstallCheck = true;

View file

@ -1,45 +1,37 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, jdk
# Enable ECDSA pubkey recovery module
, enableRecovery ? true
# Enable ECDH shared secret computation (disabled by default because it is
# experimental)
, enableECDH ? false
# Enable libsecp256k1_jni (disabled by default because it requires a jdk,
# which is a large dependency)
, enableJNI ? false
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
}:
let inherit (lib) optionals; in
stdenv.mkDerivation {
pname = "secp256k1";
# I can't find any version numbers, so we're just using the date of the
# last commit.
version = "2020-08-16";
version = "unstable-2021-06-06";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "secp256k1";
rev = "670cdd3f8be25f81472b2d16dcd228b0d24a5c45";
sha256 = "0ak2hrr0wznl5d9s905qwn5yds7k22i28d2jp957l4a8yf8cqv3s";
rev = "7973576f6e3ab27d036a09397152b124d747f4ae";
sha256 = "0vjk55dv0mkph4k6bqgkykmxn05ngzvhc4rzjnvn33xzi8dzlvah";
};
buildInputs = optionals enableJNI [ jdk ];
nativeBuildInputs = [ autoreconfHook ];
configureFlags =
[ "--enable-benchmark=no" "--enable-tests=yes" "--enable-exhaustive-tests=no" ] ++
optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++
optionals enableRecovery [ "--enable-module-recovery" ] ++
optionals enableJNI [ "--enable-jni" ];
configureFlags = [
"--enable-benchmark=no"
"--enable-exhaustive-tests=no"
"--enable-experimental"
"--enable-module-ecdh"
"--enable-module-recovery"
"--enable-module-schnorrsig"
"--enable-tests=yes"
];
doCheck = true;
checkPhase = "./tests";
meta = with lib; {

View file

@ -7221,13 +7221,7 @@ in
nvchecker = with python3Packages; toPythonApplication nvchecker;
nvfetcher = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.nvfetcher) (drv: {
executableToolDepends = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/nvfetcher \
--prefix PATH ":" "${nvchecker}/bin:${nix-prefetch-git}/bin"
'';
});
nvfetcher = haskell.lib.justStaticExecutables haskellPackages.nvfetcher;
miller = callPackage ../tools/text/miller { };
@ -12577,6 +12571,8 @@ in
scheme48 = callPackage ../development/interpreters/scheme48 { };
scheme-bytestructures = callPackage ../development/scheme-modules/scheme-bytestructures { };
self = pkgsi686Linux.callPackage ../development/interpreters/self { };
spark = callPackage ../applications/networking/cluster/spark { };
@ -12651,6 +12647,8 @@ in
guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
guile-git = callPackage ../development/guile-modules/guile-git { };
guile-gnome = callPackage ../development/guile-modules/guile-gnome {
gconf = gnome2.GConf;
guile = guile_2_0;
@ -22734,10 +22732,7 @@ in
jnetmap = callPackage ../applications/networking/jnetmap {};
libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
secp256k1 = secp256k1.override { enableECDH = true; };
};
libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { };
libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix { };
libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { };
libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix { };

View file

@ -481,18 +481,4 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "*" ];
};
YamlDotNet = fetchNuGet {
baseName = "YamlDotNet";
version = "11.1.1";
sha256 = "rwZ/QyDVrN3wGrEYKY3QY5Xqo2Tp3FkR6dh4QrC+QS0=";
outputFiles = [ "lib/*" ];
meta = with lib; {
description = "YamlDotNet is a .NET library for YAML";
homepage = "https://github.com/aaubry/YamlDotNet";
license = licenses.mit;
maintainers = [ maintainers.ratsclub ];
};
};
}; in self

View file

@ -385,6 +385,8 @@ in {
amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
ambee = callPackage ../development/python-modules/ambee { };
ambiclimate = callPackage ../development/python-modules/ambiclimate { };
amcrest = callPackage ../development/python-modules/amcrest { };

View file

@ -222,6 +222,7 @@ let
# working as expected.
cabal-install = all;
Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];
cabal2nix-unstable = all;
funcmp = all;
# Doesn't currently work on ghc-9.0:
# https://github.com/haskell/haskell-language-server/issues/297