Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a11494d83b
@ -11326,6 +11326,12 @@
|
||||
githubId = 1151264;
|
||||
name = "Sebastian Graf";
|
||||
};
|
||||
shadaj = {
|
||||
email = "shadaj@users.noreply.github.com";
|
||||
github = "shadaj";
|
||||
githubId = 543055;
|
||||
name = "Shadaj Laddad";
|
||||
};
|
||||
shahrukh330 = {
|
||||
email = "shahrukh330@gmail.com";
|
||||
github = "shahrukh330";
|
||||
|
||||
@ -225,7 +225,14 @@ in {
|
||||
See <https://mailman.readthedocs.io/en/latest/src/mailman/docs/mta.html>.
|
||||
'';
|
||||
};
|
||||
in (lib.optionals cfg.enablePostfix [
|
||||
in [
|
||||
{ assertion = cfg.webHosts != [];
|
||||
message = ''
|
||||
services.mailman.serve.enable requires there to be at least one entry
|
||||
in services.mailman.webHosts.
|
||||
'';
|
||||
}
|
||||
] ++ (lib.optionals cfg.enablePostfix [
|
||||
{ assertion = postfix.enable;
|
||||
message = ''
|
||||
Mailman's default NixOS configuration requires Postfix to be enabled.
|
||||
@ -275,15 +282,14 @@ in {
|
||||
globals().update(json.load(f))
|
||||
'';
|
||||
|
||||
services.nginx = mkIf cfg.serve.enable {
|
||||
services.nginx = mkIf (cfg.serve.enable && cfg.webHosts != []) {
|
||||
enable = mkDefault true;
|
||||
virtualHosts."${lib.head cfg.webHosts}" = {
|
||||
serverAliases = cfg.webHosts;
|
||||
virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
|
||||
locations = {
|
||||
"/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
|
||||
"/static/".alias = webSettings.STATIC_ROOT + "/";
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
environment.systemPackages = [ (pkgs.buildEnv {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pianobar";
|
||||
version = "2020.11.28";
|
||||
version = "2022.04.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://6xq.net/projects/pianobar/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5";
|
||||
sha256 = "sha256-FnCyiGWouCpXu23+p/FuL6QUXS81SRC7FzgLMsm5R2M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From 54aebffc4584ee68149d4b5b64ceaa79a82b8427 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Kenji Okada <thiagokokada@gmail.com>
|
||||
Date: Sat, 9 Apr 2022 13:16:08 +0100
|
||||
Subject: [PATCH] Revert "Added PDF documentation to dist.mak"
|
||||
|
||||
This reverts commit c0e93076232e794c919231e4386445d78b2d80b1.
|
||||
---
|
||||
dist.mak | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dist.mak b/dist.mak
|
||||
index edbb4cd67cb..c378dfdf708 100644
|
||||
--- a/dist.mak
|
||||
+++ b/dist.mak
|
||||
@@ -109,7 +109,7 @@ GEN_FOLDERS := $(addprefix $(STAGEDIR)/,$(CREATED_DIRS))
|
||||
COPY_BINARIES := $(addprefix $(STAGEDIR)/,$(addsuffix $(EXE),$(BINARIES)))
|
||||
COPY_FILES := $(addprefix $(STAGEDIR)/,$(COPIED_FILES))
|
||||
|
||||
-all: $(COPY_BINARIES) $(COPY_FILES) $(STAGEDIR)/docs/MAME.pdf
|
||||
+all: $(COPY_BINARIES) $(COPY_FILES)
|
||||
|
||||
clean:
|
||||
$(SILENT) rm -rf $(STAGEDIR)
|
||||
@@ -124,10 +124,4 @@ $(STAGEDIR)/%: $(BINDIR)/% | $(GEN_FOLDERS)
|
||||
$(STAGEDIR)/%: % | $(GEN_FOLDERS)
|
||||
$(call COPY,$<,$@)
|
||||
|
||||
-$(STAGEDIR)/docs/MAME.pdf: docs/build/latex/MAME.pdf | $(GEN_FOLDERS)
|
||||
- $(call COPY,$<,$@)
|
||||
-
|
||||
-docs/build/latex/MAME.pdf:
|
||||
- $(MAKE) -C docs latexpdf
|
||||
-
|
||||
.PHONY: all clean
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@ -2,22 +2,34 @@
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, CoreAudioKit
|
||||
, expat
|
||||
, fetchFromGitHub
|
||||
, flac
|
||||
, fontconfig
|
||||
, ForceFeedback
|
||||
, glm
|
||||
, installShellFiles
|
||||
, libjpeg
|
||||
, libpcap
|
||||
, libpulseaudio
|
||||
, libXi
|
||||
, libXinerama
|
||||
, lua5_3
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, portaudio
|
||||
, portmidi
|
||||
, pugixml
|
||||
, python3
|
||||
, qtbase
|
||||
, rapidjson
|
||||
, SDL2
|
||||
, SDL2_ttf
|
||||
, utf8proc
|
||||
, which
|
||||
, writeScript
|
||||
, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
@ -33,39 +45,69 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mame";
|
||||
version = "0.239";
|
||||
version = "0.242";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
|
||||
sha256 = "sha256-svclBaFkp4d6db+zWZNvZP8vWIFz/7M5N1M6WseOFEk=";
|
||||
sha256 = "sha256-06iKM9cpjXuNvChQTPjhb9oQptC4KTZEoxzZk8+x3/k=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" "-Wno-error=missing-braces" ];
|
||||
|
||||
makeFlags = [
|
||||
"TOOLS=1"
|
||||
"USE_LIBSDL=1"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"CXX=${stdenv.cc.targetPrefix}c++"
|
||||
"TOOLS=1"
|
||||
"USE_LIBSDL=1"
|
||||
# "USE_SYSTEM_LIB_ASIO=1"
|
||||
"USE_SYSTEM_LIB_EXPAT=1"
|
||||
"USE_SYSTEM_LIB_FLAC=1"
|
||||
"USE_SYSTEM_LIB_GLM=1"
|
||||
"USE_SYSTEM_LIB_JPEG=1"
|
||||
"USE_SYSTEM_LIB_LUA=1"
|
||||
"USE_SYSTEM_LIB_PORTAUDIO=1"
|
||||
"USE_SYSTEM_LIB_PORTMIDI=1"
|
||||
"USE_SYSTEM_LIB_PUGIXML=1"
|
||||
"USE_SYSTEM_LIB_RAPIDJSON=1"
|
||||
"USE_SYSTEM_LIB_UTF8PROC=1"
|
||||
"USE_SYSTEM_LIB_ZLIB=1"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# https://docs.mamedev.org/initialsetup/compilingmame.html
|
||||
buildInputs =
|
||||
[ SDL2 SDL2_ttf qtbase ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ]
|
||||
++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ];
|
||||
buildInputs = [
|
||||
expat
|
||||
zlib
|
||||
flac
|
||||
lua5_3
|
||||
portmidi
|
||||
portaudio
|
||||
utf8proc
|
||||
libjpeg
|
||||
rapidjson
|
||||
pugixml
|
||||
glm
|
||||
SDL2
|
||||
SDL2_ttf
|
||||
qtbase
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ]
|
||||
++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ];
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config which makeWrapper installShellFiles ];
|
||||
|
||||
# by default MAME assumes that paths with stock resources
|
||||
# are relative and that you run MAME changing to
|
||||
# install directory, so we add absolute paths here
|
||||
patches = [
|
||||
# MAME is now generating the PDF documentation on its release script since commit:
|
||||
# https://github.com/mamedev/mame/commit/c0e93076232e794c919231e4386445d78b2d80b1
|
||||
# however this needs sphinx+latex to build, and it is available in the website
|
||||
# anyway for those who need it
|
||||
./0001-Revert-Added-PDF-documentation-to-dist.mak.patch
|
||||
# by default MAME assumes that paths with stock resources
|
||||
# are relative and that you run MAME changing to
|
||||
# install directory, so we add absolute paths here
|
||||
./emuopts.patch
|
||||
];
|
||||
|
||||
@ -93,13 +135,21 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = writeScript "mame-update-script" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts jq
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
latest_version=$(curl -s https://api.github.com/repos/mamedev/mame/releases/latest | jq --raw-output .tag_name)
|
||||
update-source-version mame "''${latest_version/mame0/0.}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Is a multi-purpose emulation framework";
|
||||
homepage = "https://www.mamedev.org/";
|
||||
license = with licenses; [ bsd3 gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thiagokokada ];
|
||||
# macOS needs more time to build
|
||||
timeout = 24 * 3600;
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.91"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.100"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "3f4fb8f73a6635dbdca9dd11738c3a793f53ac65";
|
||||
sha256 = "1amky7a2rikl5sg8y0y6il0jjqwhjgxw0d2ivynfhmhz2v2ciwwi";
|
||||
rev = "26a881176eb6513a98889648e0d5b7fe647cd0e3";
|
||||
sha256 = "09wjygkdr9sr0hwv77czi0x5xw8y585k9pghdm5s3iqjn9gbb45k";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
|
||||
2
pkgs/applications/emulators/ryujinx/deps.nix
generated
2
pkgs/applications/emulators/ryujinx/deps.nix
generated
@ -11,7 +11,7 @@
|
||||
(fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; })
|
||||
(fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; })
|
||||
(fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; })
|
||||
(fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; })
|
||||
(fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; })
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-D/K+C7IX4VGv+FFYuPQEqwVYSjiDcSeElVunVMiFWI8=";
|
||||
sha256 = "sha256-oLVrYM7F9JFDYgQL/XgJS9LeUexqcSlvmkwyAk1bpoY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests yt-dlp ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "21.09";
|
||||
version = "22.03";
|
||||
pname = "mediainfo";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv";
|
||||
sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -5,8 +5,8 @@ let
|
||||
description = "PrusaSlicer fork with more features and faster development cycle";
|
||||
|
||||
versions = {
|
||||
stable = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; };
|
||||
latest = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; };
|
||||
stable = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; };
|
||||
latest = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; };
|
||||
};
|
||||
|
||||
override = { version, sha256 }: super: {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "98.0.2-1",
|
||||
"packageVersion": "99.0-1",
|
||||
"source": {
|
||||
"rev": "98.0.2-1",
|
||||
"sha256": "033l6mjmhfhf7b8p652s7ziw8zz725082hhzzvr3ahi498wshkx6"
|
||||
"rev": "99.0-1",
|
||||
"sha256": "0x9c19h4l1djhdq48ylnqjrrfkk2zalfpgj57cba5jqxl2fhglx3"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "98.0.2",
|
||||
"sha512": "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e"
|
||||
"version": "99.0",
|
||||
"sha512": "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c"
|
||||
}
|
||||
}
|
||||
|
||||
@ -87,7 +87,7 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "11.0.9";
|
||||
version = "11.0.10";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
@ -98,7 +98,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0cl01bx64d6bmajknj7085nzc6841adkp65fz531r3y6nnpwr9ds";
|
||||
sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@ -107,7 +107,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0j6alhm1pqp7fb6nk55vzvr1qjz6gyd3vn6v2dkkvj9mgm57x1j5";
|
||||
sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "vieb";
|
||||
version = "7.1.2";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jelmerro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4LGg3w/rleTyHJd4867dog+/fIXhtKbYgF1bYKwoh/I=";
|
||||
sha256 = "sha256-4iokmUzs72aVHb95D98ZITRygn4gGAc/K+M5uMnF2NM=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
||||
@ -10,12 +10,12 @@ in
|
||||
rec {
|
||||
thunderbird = (common rec {
|
||||
pname = "thunderbird";
|
||||
version = "91.7.0";
|
||||
version = "91.8.0";
|
||||
application = "comm/mail";
|
||||
binaryName = pname;
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0";
|
||||
sha512 = "147c7ad68b0a32cc0fd4405935836af1fa77bbce6a1e367b51ef9871e7fc2a8fe908a1d200be34326f4f339d272e62f619b75680201fe82d301ddd02e23824d5";
|
||||
};
|
||||
extraPatches = [
|
||||
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
|
||||
|
||||
34
pkgs/applications/science/logic/cvc5/default.nix
Normal file
34
pkgs/applications/science/logic/cvc5/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cadical, symfpu, gmp, git, python3, gtest, libantlr3c, antlr3_4, boost, jdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvc5";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
rev = "cvc5-${version}";
|
||||
sha256 = "03sxqwmlajffmv7lncqs1bx8gyihkpnikk87q9wjrd4776n13ign";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ cadical.dev symfpu gmp git python3 python3.pkgs.toml gtest libantlr3c antlr3_4 boost jdk ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./src/
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Production"
|
||||
"-DBUILD_SHARED_LIBS=1"
|
||||
"-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-performance theorem prover and SMT solver";
|
||||
homepage = "https://cvc5.github.io";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ shadaj ];
|
||||
};
|
||||
}
|
||||
26
pkgs/applications/science/logic/symfpu/default.nix
Normal file
26
pkgs/applications/science/logic/symfpu/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "symfpu";
|
||||
version = "unstable-2019-05-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martin-cs";
|
||||
repo = "symfpu";
|
||||
rev = "8fbe139bf0071cbe0758d2f6690a546c69ff0053";
|
||||
sha256 = "1jf5lkn67q136ppfacw3lsry369v7mdr1rhidzjpbz18jfy9zl9q";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/symfpu
|
||||
cp -r * $out/symfpu/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A (concrete or symbolic) implementation of IEEE-754 / SMT-LIB floating-point";
|
||||
homepage = "https://github.com/martin-cs/symfpu";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ shadaj ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "e4f120f36a6e55fc2fe15c5ed774773420d38108",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e4f120f36a6e55fc2fe15c5ed774773420d38108.tar.gz",
|
||||
"sha256": "16ljr256nrlmmsll2pbnf0xk07mqbcwa9n6d0mc2j44vyb478qwl",
|
||||
"msg": "Update from Hackage at 2022-04-03T10:13:27Z"
|
||||
"commit": "6387c3141750050e170d6ac030c063536c39aede",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6387c3141750050e170d6ac030c063536c39aede.tar.gz",
|
||||
"sha256": "1w9vy5ky3aqqnkldxqdvma21qz3myhc961xmgh1iqn60q03j4d2j",
|
||||
"msg": "Update from Hackage at 2022-04-06T22:24:53Z"
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, automake
|
||||
, fontconfig
|
||||
@ -18,20 +19,27 @@
|
||||
, gmp-static
|
||||
, verilog
|
||||
, asciidoctor
|
||||
, tex }:
|
||||
, tex
|
||||
, which
|
||||
}:
|
||||
|
||||
let
|
||||
ghcWithPackages = ghc.withPackages (g: (with g; [ old-time regex-compat syb split ]));
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "bluespec";
|
||||
version = "2021.07";
|
||||
version = "2022.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "B-Lang-org";
|
||||
repo = "bsc";
|
||||
rev = version;
|
||||
sha256 = "0gw8wyp65lpkyfhv3laazz9qypdl8qkp1j7cqp0gv11592a9p5qw";
|
||||
sha256 = "sha256-ivTua3MLa8akma3MGkhsqwSdwswYX916kywKdlj7TqY=";
|
||||
};
|
||||
|
||||
yices-src = fetchurl {
|
||||
url = "https://github.com/B-Lang-org/bsc/releases/download/${version}/yices-src-for-bsc-${version}.tar.gz";
|
||||
sha256 = "sha256-ey5yIIVFZyG4EnYGqbIJqmxK1rZ70FWM0Jz+2hIoGXE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -43,8 +51,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
postUnpack = ''
|
||||
mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2
|
||||
# XXX: only works because yices.src isn't a tarball.
|
||||
cp -av ${yices.src}/* $sourceRoot/src/vendor/yices/v2.6/yices2
|
||||
tar -C $sourceRoot/src/vendor/yices/v2.6/yices2 -xf ${yices-src}
|
||||
chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2
|
||||
'';
|
||||
|
||||
@ -68,6 +75,7 @@ in stdenv.mkDerivation rec {
|
||||
libX11 # tcltk
|
||||
tcl
|
||||
tk
|
||||
which
|
||||
xorg.libXft
|
||||
zlib
|
||||
];
|
||||
|
||||
@ -418,7 +418,6 @@ stdenv.mkDerivation rec {
|
||||
# long as the evaluator runs on a platform that supports
|
||||
# `pkgsMusl`.
|
||||
platforms = builtins.attrNames ghcBinDists.${distSetName};
|
||||
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
|
||||
maintainers = with lib.maintainers; [
|
||||
prusnak
|
||||
domenkozar
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
# platform). Static libs are always built.
|
||||
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
|
||||
|
||||
, version ? "9.3.20211111"
|
||||
, version ? "9.3.20220406"
|
||||
, # What flavour to build. An empty string indicates no
|
||||
# specific flavour and falls back to ghc default values.
|
||||
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
|
||||
@ -186,8 +186,8 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc.git/";
|
||||
rev = "cc635da167fdec2dead0603b0026cb841f0aa645";
|
||||
sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46";
|
||||
rev = "c44432db254d2fc960d7864e080cb50e65dfa7c6";
|
||||
sha256 = "0xagijcfcw3a19s6dmh6z7085lvkrakys3lcby4ncq1v0syh507h";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -62,7 +62,6 @@ self: super: {
|
||||
headroom = dontCheck super.headroom;
|
||||
hgeometry = dontCheck super.hgeometry;
|
||||
hhp = dontCheck super.hhp;
|
||||
hint = dontCheck super.hint;
|
||||
hls-splice-plugin = dontCheck super.hls-splice-plugin;
|
||||
hsakamai = dontCheck super.hsakamai;
|
||||
hsemail-ns = dontCheck super.hsemail-ns;
|
||||
|
||||
@ -1045,12 +1045,6 @@ self: super: {
|
||||
# Generate shell completion.
|
||||
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
|
||||
|
||||
# 2022-03-20: niv is unmaintained we pin stuff to keep it running
|
||||
niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: {
|
||||
optparse-applicative = self.optparse-applicative_0_15_1_0;
|
||||
aeson = self.aeson_1_5_6_0;
|
||||
}));
|
||||
|
||||
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
|
||||
|
||||
stack =
|
||||
|
||||
@ -213,7 +213,9 @@ self: super: {
|
||||
regex-rure = doDistribute (markUnbroken super.regex-rure);
|
||||
jacinda = doDistribute super.jacinda;
|
||||
some = doJailbreak super.some;
|
||||
fourmolu = super.fourmolu_0_5_0_1;
|
||||
fourmolu = super.fourmolu_0_6_0_0;
|
||||
# hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
|
||||
hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.2.0"; doJailbreak super.hls-fourmolu-plugin;
|
||||
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
|
||||
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
|
||||
hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
|
||||
|
||||
@ -17,23 +17,25 @@ self: super: {
|
||||
|
||||
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC 8.7.x core libraries.
|
||||
# Disable GHC core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
binary = null;
|
||||
bytestring = null;
|
||||
Cabal = null;
|
||||
Cabal-syntax = null;
|
||||
containers = null;
|
||||
deepseq = null;
|
||||
directory = null;
|
||||
exceptions = null;
|
||||
filepath = null;
|
||||
ghc-bignum = null;
|
||||
ghc-boot = null;
|
||||
ghc-boot-th = null;
|
||||
ghc-bignum = null;
|
||||
ghc-compact = null;
|
||||
ghc-heap = null;
|
||||
ghci = null;
|
||||
ghc-prim = null;
|
||||
ghci = null;
|
||||
haskeline = null;
|
||||
hpc = null;
|
||||
integer-gmp = null;
|
||||
@ -51,7 +53,6 @@ self: super: {
|
||||
transformers = null;
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
exceptions = null;
|
||||
|
||||
# https://github.com/tibbe/unordered-containers/issues/214
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
@ -453,6 +453,7 @@ broken-packages:
|
||||
- botpp
|
||||
- bottom
|
||||
- boundingboxes
|
||||
- bower-json
|
||||
- bowntz
|
||||
- bpath
|
||||
- braid
|
||||
@ -1318,6 +1319,7 @@ broken-packages:
|
||||
- ert
|
||||
- escape-artist
|
||||
- escoger
|
||||
- espial
|
||||
- esqueleto-pgcrypto
|
||||
- ess
|
||||
- essence-of-live-coding-gloss-example
|
||||
@ -1925,6 +1927,7 @@ broken-packages:
|
||||
- haquery
|
||||
- harchive
|
||||
- HARM
|
||||
- HarmTrace-Base
|
||||
- haroonga
|
||||
- harp
|
||||
- harpy
|
||||
@ -2108,6 +2111,7 @@ broken-packages:
|
||||
- heidi
|
||||
- hein
|
||||
- heist-async
|
||||
- heist-emanote
|
||||
- helic
|
||||
- helisp
|
||||
- hell
|
||||
@ -2733,6 +2737,7 @@ broken-packages:
|
||||
- json-extra
|
||||
- json-fu
|
||||
- json-litobj
|
||||
- jsonlogic
|
||||
- jsonnet
|
||||
- json-pointer
|
||||
- json-pointy
|
||||
@ -2953,6 +2958,7 @@ broken-packages:
|
||||
- lifetimes
|
||||
- lifted-protolude
|
||||
- lifter
|
||||
- lifx-lan
|
||||
- ligature
|
||||
- light
|
||||
- lilypond
|
||||
@ -4668,6 +4674,7 @@ broken-packages:
|
||||
- smtps-gmail
|
||||
- smuggler
|
||||
- smuggler2
|
||||
- snack
|
||||
- snake
|
||||
- snake-game
|
||||
- snap-accept
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Stackage LTS 19.1
|
||||
# Stackage LTS 19.2
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@ -33,7 +33,7 @@ default-package-overrides:
|
||||
- aeson-typescript ==0.3.0.1
|
||||
- aeson-yak ==0.1.1.3
|
||||
- aeson-yaml ==1.1.0.1
|
||||
- Agda ==2.6.2.1
|
||||
- Agda ==2.6.2.2
|
||||
- agda2lagda ==0.2021.6.1
|
||||
- al ==0.1.4.2
|
||||
- alarmclock ==0.7.0.6
|
||||
@ -121,15 +121,15 @@ default-package-overrides:
|
||||
- bank-holidays-england ==0.2.0.7
|
||||
- barbies ==2.0.3.1
|
||||
- barrier ==0.1.1
|
||||
- base16 ==0.3.1.0
|
||||
- base16 ==0.3.2.0
|
||||
- base16-bytestring ==1.0.2.0
|
||||
- base16-lens ==0.1.3.2
|
||||
- base32 ==0.2.1.0
|
||||
- base32 ==0.2.2.0
|
||||
- base32-lens ==0.1.1.1
|
||||
- base32string ==0.9.1
|
||||
- base58-bytestring ==0.1.0
|
||||
- base58string ==0.10.0
|
||||
- base64 ==0.4.2.3
|
||||
- base64 ==0.4.2.4
|
||||
- base64-bytestring ==1.2.1.0
|
||||
- base64-bytestring-type ==1.0.1
|
||||
- base64-lens ==0.3.1
|
||||
@ -224,7 +224,7 @@ default-package-overrides:
|
||||
- BoundedChan ==1.0.3.0
|
||||
- bounded-queue ==1.0.0
|
||||
- boxes ==0.1.5
|
||||
- brick ==0.68
|
||||
- brick ==0.68.1
|
||||
- brittany ==0.14.0.2
|
||||
- broadcast-chan ==0.2.1.2
|
||||
- bsb-http-chunked ==0.0.0.4
|
||||
@ -267,7 +267,7 @@ default-package-overrides:
|
||||
- cabal-file-th ==0.2.7
|
||||
- cabal-flatpak ==0.1.0.3
|
||||
- cabal-plan ==0.7.2.1
|
||||
- cabal-rpm ==2.0.11
|
||||
- cabal-rpm ==2.0.11.1
|
||||
- Cabal-syntax ==3.6.0.0
|
||||
- cache ==0.1.3.0
|
||||
- cached-json-file ==0.1.1
|
||||
@ -342,7 +342,7 @@ default-package-overrides:
|
||||
- climb ==0.3.3
|
||||
- Clipboard ==2.3.2.0
|
||||
- clock ==0.8.3
|
||||
- closed ==0.2.0.1
|
||||
- closed ==0.2.0.2
|
||||
- clumpiness ==0.17.0.2
|
||||
- ClustalParser ==1.3.0
|
||||
- cmark ==0.6
|
||||
@ -366,8 +366,8 @@ default-package-overrides:
|
||||
- comfort-array-shape ==0.0
|
||||
- comfort-fftw ==0.0
|
||||
- comfort-graph ==0.0.3.2
|
||||
- commonmark ==0.2.1.1
|
||||
- commonmark-extensions ==0.2.3
|
||||
- commonmark ==0.2.2
|
||||
- commonmark-extensions ==0.2.3.1
|
||||
- commonmark-pandoc ==0.2.1.2
|
||||
- commutative ==0.0.2
|
||||
- comonad ==5.0.8
|
||||
@ -680,7 +680,7 @@ default-package-overrides:
|
||||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.10
|
||||
- esqueleto ==3.5.3.1
|
||||
- esqueleto ==3.5.4.0
|
||||
- essence-of-live-coding ==0.2.6
|
||||
- essence-of-live-coding-gloss ==0.2.6
|
||||
- essence-of-live-coding-pulse ==0.2.6
|
||||
@ -722,7 +722,7 @@ default-package-overrides:
|
||||
- fakedata-quickcheck ==0.2.0
|
||||
- fakefs ==0.3.0.2
|
||||
- fakepull ==0.3.0.2
|
||||
- faktory ==1.1.2.1
|
||||
- faktory ==1.1.2.2
|
||||
- fast-builder ==0.1.3.0
|
||||
- fast-logger ==3.1.1
|
||||
- fast-math ==1.0.2
|
||||
@ -811,7 +811,7 @@ default-package-overrides:
|
||||
- functor-classes-compat ==2.0.0.2
|
||||
- functor-combinators ==0.4.1.0
|
||||
- fused-effects ==1.1.1.2
|
||||
- fusion-plugin ==0.2.3
|
||||
- fusion-plugin ==0.2.4
|
||||
- fusion-plugin-types ==0.1.0
|
||||
- fuzzcheck ==0.1.1
|
||||
- fuzzy ==0.1.0.1
|
||||
@ -942,10 +942,10 @@ default-package-overrides:
|
||||
- graph-core ==0.3.0.0
|
||||
- graphite ==0.10.0.1
|
||||
- graphs ==0.7.1
|
||||
- graphula ==2.0.1.0
|
||||
- graphula ==2.0.1.1
|
||||
- graphviz ==2999.20.1.0
|
||||
- graph-wrapper ==0.2.6.0
|
||||
- gravatar ==0.8.0
|
||||
- gravatar ==0.8.1
|
||||
- greskell ==2.0.0.0
|
||||
- greskell-core ==1.0.0.0
|
||||
- greskell-websocket ==1.0.0.0
|
||||
@ -966,7 +966,7 @@ default-package-overrides:
|
||||
- hadoop-streaming ==0.2.0.3
|
||||
- hakyll ==4.15.1.1
|
||||
- hakyll-convert ==0.3.0.4
|
||||
- hal ==0.4.10
|
||||
- hal ==0.4.10.1
|
||||
- half ==0.3.1
|
||||
- hall-symbols ==0.1.0.6
|
||||
- hamilton ==0.1.0.3
|
||||
@ -1050,7 +1050,7 @@ default-package-overrides:
|
||||
- hindent ==5.3.2
|
||||
- hinfo ==0.0.3.0
|
||||
- hinotify ==0.4.1
|
||||
- hint ==0.9.0.5
|
||||
- hint ==0.9.0.6
|
||||
- histogram-fill ==0.9.1.0
|
||||
- hjsmin ==0.2.0.4
|
||||
- hkd-default ==1.1.0.0
|
||||
@ -1087,12 +1087,12 @@ default-package-overrides:
|
||||
- hourglass ==0.2.12
|
||||
- hourglass-orphans ==0.1.0.0
|
||||
- hp2pretty ==0.10
|
||||
- hpack ==0.34.6
|
||||
- hpack ==0.34.7
|
||||
- hpack-dhall ==0.5.4
|
||||
- hpc-codecov ==0.3.0.0
|
||||
- HPDF ==1.6.0
|
||||
- hpp ==0.6.4
|
||||
- hpqtypes ==1.9.3.0
|
||||
- hpqtypes ==1.9.3.1
|
||||
- hprotoc ==2.4.17
|
||||
- hreader ==1.1.0
|
||||
- hreader-lens ==0.1.3.0
|
||||
@ -1135,7 +1135,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.5
|
||||
- hspec-expectations-json ==1.0.0.6
|
||||
- hspec-expectations-lifted ==0.10.0
|
||||
- hspec-expectations-pretty-diff ==0.7.2.6
|
||||
- hspec-golden ==0.2.0.0
|
||||
@ -1665,7 +1665,7 @@ default-package-overrides:
|
||||
- nonemptymap ==0.0.6.0
|
||||
- non-empty-sequence ==0.2.0.4
|
||||
- nonempty-vector ==0.2.1.0
|
||||
- nonempty-zipper ==1.0.0.3
|
||||
- nonempty-zipper ==1.0.0.4
|
||||
- non-negative ==0.1.2
|
||||
- normalization-insensitive ==2.0.2
|
||||
- not-gloss ==0.7.7.0
|
||||
@ -1746,7 +1746,7 @@ default-package-overrides:
|
||||
- pandoc-lua-marshal ==0.1.5.1
|
||||
- pandoc-plot ==1.4.1
|
||||
- pandoc-throw ==0.1.0.0
|
||||
- pandoc-types ==1.22.1
|
||||
- pandoc-types ==1.22.2
|
||||
- pantry ==0.5.4
|
||||
- parallel ==3.2.2.0
|
||||
- parallel-io ==0.3.5
|
||||
@ -2116,7 +2116,7 @@ default-package-overrides:
|
||||
- sandwich-quickcheck ==0.1.0.6
|
||||
- sandwich-slack ==0.1.0.6
|
||||
- say ==0.1.0.1
|
||||
- sbp ==4.1.1
|
||||
- sbp ==4.1.5
|
||||
- sbv ==8.17
|
||||
- scalpel ==0.6.2
|
||||
- scalpel-core ==0.6.2
|
||||
@ -2149,7 +2149,7 @@ default-package-overrides:
|
||||
- seqalign ==0.2.0.4
|
||||
- seqid ==0.6.2
|
||||
- seqid-streams ==0.7.2
|
||||
- sequence-formats ==1.6.3
|
||||
- sequence-formats ==1.6.6.1
|
||||
- sequenceTools ==1.5.2
|
||||
- serf ==0.1.1.0
|
||||
- serialise ==0.2.4.0
|
||||
@ -2439,7 +2439,7 @@ default-package-overrides:
|
||||
- tcp-streams ==1.0.1.1
|
||||
- tdigest ==0.2.1.1
|
||||
- teardown ==0.5.0.1
|
||||
- telegram-bot-simple ==0.4.4
|
||||
- telegram-bot-simple ==0.4.5
|
||||
- template-haskell-compat-v0208 ==0.1.7
|
||||
- temporary ==1.3
|
||||
- temporary-rc ==1.2.0.3
|
||||
@ -2460,8 +2460,8 @@ default-package-overrides:
|
||||
- texmath ==0.12.4
|
||||
- text-ansi ==0.1.1
|
||||
- text-binary ==0.2.1.1
|
||||
- text-builder ==0.6.6.4
|
||||
- text-builder-dev ==0.2
|
||||
- text-builder ==0.6.6.5
|
||||
- text-builder-dev ==0.2.0.1
|
||||
- text-conversions ==0.3.1
|
||||
- text-icu ==0.7.1.0
|
||||
- text-latin1 ==0.3.1
|
||||
@ -2627,7 +2627,7 @@ default-package-overrides:
|
||||
- universe-instances-extended ==1.1.3
|
||||
- universe-reverse-instances ==1.1.1
|
||||
- universe-some ==1.2.1
|
||||
- universum ==1.7.2
|
||||
- universum ==1.7.3
|
||||
- unix-bytestring ==0.3.7.6
|
||||
- unix-compat ==0.5.4
|
||||
- unix-time ==0.4.7
|
||||
@ -2841,11 +2841,11 @@ default-package-overrides:
|
||||
- yesod-gitrev ==0.2.2
|
||||
- yesod-markdown ==0.12.6.12
|
||||
- yesod-newsfeed ==1.7.0.0
|
||||
- yesod-page-cursor ==2.0.0.9
|
||||
- yesod-paginator ==1.1.1.0
|
||||
- yesod-page-cursor ==2.0.0.10
|
||||
- yesod-paginator ==1.1.2.1
|
||||
- yesod-persistent ==1.6.0.7
|
||||
- yesod-recaptcha2 ==1.0.2
|
||||
- yesod-routes-flow ==3.0.0.1
|
||||
- yesod-routes-flow ==3.0.0.2
|
||||
- yesod-sitemap ==1.6.0
|
||||
- yesod-static ==1.6.1.0
|
||||
- yesod-test ==1.6.12
|
||||
|
||||
@ -2249,6 +2249,7 @@ dont-distribute-packages:
|
||||
- hsx-xhtml
|
||||
- html-kure
|
||||
- html-presentation-text
|
||||
- htoml-parse
|
||||
- hts
|
||||
- htsn-import
|
||||
- http-client-auth
|
||||
@ -2426,6 +2427,7 @@ dont-distribute-packages:
|
||||
- json-togo
|
||||
- json-tokens
|
||||
- json2-hdbc
|
||||
- jsonlogic-aeson
|
||||
- jsons-to-schema
|
||||
- jspath
|
||||
- jvm
|
||||
@ -2526,6 +2528,7 @@ dont-distribute-packages:
|
||||
- language-python-colour
|
||||
- language-qux
|
||||
- language-spelling
|
||||
- large-anon
|
||||
- lat
|
||||
- latest-npm-version
|
||||
- latex-formulae-hakyll
|
||||
@ -3647,6 +3650,7 @@ dont-distribute-packages:
|
||||
- soundgen
|
||||
- source-code-server
|
||||
- spade
|
||||
- spago
|
||||
- sparkle
|
||||
- sparrow
|
||||
- sparsebit
|
||||
|
||||
@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super {
|
||||
sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio;
|
||||
|
||||
# avoid compiling twice by providing executable as a separate output (with small closure size)
|
||||
niv = enableSeparateBinOutput super.niv;
|
||||
niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv);
|
||||
ormolu = enableSeparateBinOutput super.ormolu;
|
||||
ghcid = enableSeparateBinOutput super.ghcid;
|
||||
|
||||
@ -998,4 +998,7 @@ self: super: builtins.intersectAttrs super {
|
||||
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
|
||||
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
|
||||
hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;
|
||||
|
||||
# Wants to execute cabal-install to (re-)build itself
|
||||
hint = dontCheck super.hint;
|
||||
}
|
||||
|
||||
1890
pkgs/development/haskell-modules/hackage-packages.nix
generated
1890
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -58,9 +58,6 @@
|
||||
, qtscript ? null
|
||||
, qscintilla ? null
|
||||
, qttools ? null
|
||||
# - JIT compiler for loops:
|
||||
, enableJIT ? false
|
||||
, llvm ? null
|
||||
, libiconv
|
||||
, darwin
|
||||
}:
|
||||
@ -114,12 +111,12 @@ let
|
||||
};
|
||||
|
||||
self = mkDerivation rec {
|
||||
version = "6.4.0";
|
||||
version = "7.1.0";
|
||||
pname = "octave";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-tI8z1Pzq85TPvqc6jIUAAJNtg6QXOaJPdWi1sKezms0=";
|
||||
sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -173,7 +170,6 @@ let
|
||||
texinfo
|
||||
]
|
||||
++ lib.optionals (sundials != null) [ sundials ]
|
||||
++ lib.optionals enableJIT [ llvm ]
|
||||
++ lib.optionals enableQt [
|
||||
qtscript
|
||||
qttools
|
||||
@ -199,7 +195,6 @@ let
|
||||
++ lib.optionals enableReadline [ "--enable-readline" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "--with-x=no" ]
|
||||
++ lib.optionals enableQt [ "--with-qt=5" ]
|
||||
++ lib.optionals enableJIT [ "--enable-jit" ]
|
||||
;
|
||||
|
||||
# Keep a copy of the octave tests detailed results in the output
|
||||
@ -220,7 +215,7 @@ let
|
||||
inherit portaudio;
|
||||
inherit jdk;
|
||||
inherit python;
|
||||
inherit enableQt enableJIT enableReadline enableJava;
|
||||
inherit enableQt enableReadline enableJava;
|
||||
buildEnv = callPackage ./build-env.nix {
|
||||
octave = self;
|
||||
inherit octavePackages wrapOctave;
|
||||
@ -236,8 +231,6 @@ let
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ raskin doronbehar ];
|
||||
description = "Scientific Programming Language";
|
||||
# https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
|
||||
broken = enableJIT;
|
||||
platforms = if overridePlatforms == null then
|
||||
(lib.platforms.linux ++ lib.platforms.darwin)
|
||||
else overridePlatforms;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "10.8.2";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "sha256-if3YmL9r/3X278OjAYF+Tt51K5qAkn+wfuNYsT41OSI=";
|
||||
sha256 = "sha256-f91PBBpiTNm/I8nYSYLZGI7HA1L6jqA0YanU2hFl8NM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
# the ngspice derivation.
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libngspice";
|
||||
version = "34";
|
||||
version = "36";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
|
||||
sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U=";
|
||||
sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
|
||||
@ -17,13 +17,13 @@ let
|
||||
blasIntSize = if blas64 then "64" else "32";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blis";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flame";
|
||||
repo = "blis";
|
||||
rev = version;
|
||||
sha256 = "sha256-D5T/itq9zyD5TkeJ4Ae1vS4yEWU51omyJoIkKQ2NLhY=";
|
||||
sha256 = "sha256-1aHIdt5wCDrT1hBPnaUVThwjwDkJQ0G0+tao2iFXYpM=";
|
||||
};
|
||||
|
||||
inherit blas64;
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml
|
||||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml
|
||||
, jsooSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
pname = "ocaml${ocaml.version}-ptime";
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
|
||||
sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27";
|
||||
sha256 = "sha256-gy/fUsfUHUZx1A/2sQMQIFMHl1V+QO3zHAsEnZT/lkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
@ -16,8 +18,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
||||
buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}";
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-client";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cnOW9Ey6WdL2bAqPop5noETn12OeeKsMkWHKGmYCjJU=";
|
||||
sha256 = "sha256-g/BlRRBImJihVlAfSMsPIPV0GJns0/pStF8TKSxpDI4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-gdacs";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-gdacs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sUHVmueu70ZnXP8KoJ2mDzzEedzXYHM2yeGC4oVsZZU=";
|
||||
sha256 = "sha256-6z0l0PcFTQgOBj8cBgBMPJIqWG53u7h4WbYkBqU4FNE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
43
pkgs/development/python-modules/asdf-standard/default.nix
Normal file
43
pkgs/development/python-modules/asdf-standard/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, importlib-resources
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf-standard";
|
||||
version = "1.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "asdf_standard";
|
||||
inherit version;
|
||||
hash = "sha256-HK8GceEm9K7DETreG1BjhYNpp2klXPu7vNLWfazFtZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
# Circular dependency on asdf
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asdf_standard"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standards document describing ASDF";
|
||||
homepage = "https://github.com/asdf-format/asdf-standard";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, asdf-standard
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, importlib-resources
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf-transform-schemas";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "asdf_transform_schemas";
|
||||
inherit version;
|
||||
hash = "sha256-9xqTCe0+vQmxk3roV8lM7JKIeHBEDrPphou77XJlaxU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asdf-standard
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
# Circular dependency on asdf
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asdf_transform_schemas"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ASDF schemas for validating transform tags";
|
||||
homepage = "https://github.com/asdf-format/asdf-transform-schemas";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +1,13 @@
|
||||
{ lib
|
||||
, asdf-standard
|
||||
, asdf-transform-schemas
|
||||
, astropy
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, importlib-resources
|
||||
, jmespath
|
||||
, jsonschema
|
||||
, lz4
|
||||
, numpy
|
||||
, packaging
|
||||
, pytest-astropy
|
||||
@ -17,18 +20,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf";
|
||||
version = "2.10.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "2.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9+Vp8ps3I5Oe/sgWTrLtcnS91ICwsoPXWDPw9Z0QhAk=";
|
||||
hash = "sha256-FEWXGSkneduhO9+YlzrZvpJHUsI7TeagVLwBdMEIRvw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asdf-standard
|
||||
asdf-transform-schemas
|
||||
jmespath
|
||||
jsonschema
|
||||
numpy
|
||||
@ -40,8 +48,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-astropy
|
||||
astropy
|
||||
lz4
|
||||
pytest-astropy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -49,11 +58,13 @@ buildPythonPackage rec {
|
||||
export PY_IGNORE_IMPORTMISMATCH=1
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "asdf" ];
|
||||
pythonImportsCheck = [
|
||||
"asdf"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python tools to handle ASDF files";
|
||||
homepage = "https://github.com/spacetelescope/asdf";
|
||||
homepage = "https://github.com/asdf-format/asdf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
|
||||
@ -3,17 +3,20 @@
|
||||
, fetchPypi
|
||||
, findutils
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "extension-helpers";
|
||||
version = "0.1";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc";
|
||||
sha256 = "ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -22,7 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
patches = [ ./permissions.patch ];
|
||||
|
||||
checkInputs = [ findutils pytestCheckHook ];
|
||||
checkInputs = [
|
||||
findutils
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# avoid import mismatch errors, as conftest.py is copied to build dir
|
||||
pytestFlagsArray = [
|
||||
@ -37,6 +43,6 @@ buildPythonPackage rec {
|
||||
description = "Utilities for building and installing packages in the Astropy ecosystem";
|
||||
homepage = "https://github.com/astropy/extension-helpers";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.rmcgibbo ];
|
||||
maintainers = with maintainers; [ rmcgibbo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,8 +6,12 @@
|
||||
, keyring
|
||||
, beautifulsoup4
|
||||
, html5lib
|
||||
, matplotlib
|
||||
, pillow
|
||||
, pytest
|
||||
, pytest-astropy
|
||||
, pytestCheckHook
|
||||
, pyvo
|
||||
, astropy-helpers
|
||||
, isPy3k
|
||||
}:
|
||||
@ -24,21 +28,39 @@ buildPythonPackage rec {
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];
|
||||
propagatedBuildInputs = [
|
||||
astropy
|
||||
requests
|
||||
keyring
|
||||
beautifulsoup4
|
||||
html5lib
|
||||
pyvo
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ astropy-helpers ];
|
||||
|
||||
# Tests disabled until pytest-astropy has been updated to include pytest-astropy-header
|
||||
doCheck = false;
|
||||
checkInputs = [ pytest pytest-astropy ];
|
||||
# Disable automatic update of the astropy-helper module
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
matplotlib
|
||||
pillow
|
||||
pytest
|
||||
pytest-astropy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests must be run in the build directory. The tests create files
|
||||
# in $HOME/.astropy so we need to set HOME to $TMPDIR.
|
||||
checkPhase = ''
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
cd build/lib
|
||||
HOME=$TMPDIR pytest
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "astroquery" ];
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "Functions and classes to access online data resources";
|
||||
homepage = "https://astroquery.readthedocs.io/";
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "doit";
|
||||
version = "0.34.2";
|
||||
version = "0.35.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM=";
|
||||
sha256 = "sha256-cVoyLIdMTLhiOU46DWn/MlcrUln1cDb7/cEFPEwB00g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ghapi";
|
||||
version = "0.1.19";
|
||||
version = "0.1.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "fastai";
|
||||
repo = "ghapi";
|
||||
rev = version;
|
||||
sha256 = "sha256-UV2cfotRad9jg/X3pOysKJyMi4/XKt24kf6F4aw4vcI=";
|
||||
sha256 = "sha256-Pry+qCHCt+c+uwkLaoTVUY1KblESj6kcNtMfGwK1rfk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,25 +15,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gremlinpython";
|
||||
version = "3.5.1";
|
||||
version = "3.6.0";
|
||||
|
||||
# pypi tarball doesn't include tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "tinkerpop";
|
||||
rev = version;
|
||||
sha256 = "1vlhxq0f2hanhkv6f17dxgbwr7gnbnh1kkkq0lxcwkbm2l0rdrlr";
|
||||
sha256 = "0gyf3a0zbh1grc1vr9zzpqm5yfcjvn0f1akw9l1arq36isqwvydn";
|
||||
};
|
||||
sourceRoot = "source/gremlin-python/src/main/python";
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'aenum>=1.4.5,<3.0.0' 'aenum' \
|
||||
--replace 'aiohttp>=3.7.0,<=3.7.4' 'aiohttp' \
|
||||
--replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \
|
||||
--replace 'radish-bdd==0.8.6' 'radish-bdd' \
|
||||
--replace 'mock>=3.0.5,<4.0.0' 'mock' \
|
||||
--replace 'pytest>=4.6.4,<5.0.0' 'pytest' \
|
||||
--replace 'importlib-metadata<3.0.0' 'importlib-metadata' \
|
||||
--replace 'pytest-runner==5.2' ' '
|
||||
'';
|
||||
|
||||
@ -59,6 +52,7 @@ buildPythonPackage rec {
|
||||
# disable custom pytest report generation
|
||||
preCheck = ''
|
||||
substituteInPlace setup.cfg --replace 'addopts' '#addopts'
|
||||
export TEST_TRANSACTIONS='false'
|
||||
'';
|
||||
|
||||
# many tests expect a running tinkerpop server
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.0.6";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-mqB6Sal+gt2i9h9HHZNVJ/HXPrF7Fe4MC7EKpJR3JMY=";
|
||||
sha256 = "sha256-qdOkF8Ob2vYzmIlFM7LbrcuvMWLk4Pd+DTSe3E+8Df8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "losant-rest";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Losant";
|
||||
repo = "losant-rest-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo=";
|
||||
sha256 = "sha256-mdSqGeVfZTSW65eQiYerjlq6afq2dyYjUi38DVsI6wQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
56
pkgs/development/python-modules/pyvo/default.nix
Normal file
56
pkgs/development/python-modules/pyvo/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, astropy
|
||||
, pillow
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pytest-astropy
|
||||
, requests
|
||||
, requests-mock
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvo";
|
||||
version = "1.3";
|
||||
|
||||
disabled = pythonOlder "3.8"; # according to setup.cfg
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "846a54a05a8ddb47a8c2cc3077434779b0e4ccc1b74a7a5408593cb673307d67";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astropy
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pillow
|
||||
pytestCheckHook
|
||||
pytest-astropy
|
||||
requests-mock
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# touches network
|
||||
"pyvo/dal/tests/test_datalink.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyvo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Astropy affiliated package for accessing Virtual Observatory data and services";
|
||||
homepage = "github.com/astropy/pyvo";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ smaret ];
|
||||
};
|
||||
}
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slixmpp";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QgTIC+4JtAD9nnS+fJKZwF0aJEIrFmPHkYg8cPgXmcA=";
|
||||
hash = "sha256-U7lD2iVy2gS5Ktop4PVKg+cUbIg4MJt+m6tH5aOb1Y4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -44,6 +44,7 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Exclude live tests
|
||||
"tests/live_test.py"
|
||||
"tests/test_xep_0454.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.332.1";
|
||||
version = "2.332.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
sha256 = "0xrrqdwfz19mr4wl4sdzk0qnq9rjdh65vd1386qsn6a4axwv652s";
|
||||
sha256 = "0z0igaq29nsxbkdzqfgrh10206a7ndsvz79bj8078hq8hqvl3an7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -4,13 +4,13 @@ let
|
||||
disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "tracy";
|
||||
version = "0.7.8";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfpld";
|
||||
repo = "tracy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hOeanY170vvn5W68cCDRUFApia/PW3ymPIgdWx3gwVw=";
|
||||
sha256 = "sha256-wsb2pOF8Y+cFHHSkDSJngTyWeLKCtFNK/mm+usyo+0k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
pname = "synadm";
|
||||
version = "0.33.1";
|
||||
version = "0.34";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-eIpRyx1iErZuB3n+Sl231BE47ckIXYzaelod7OtdSF8=";
|
||||
sha256 = "sha256-pM1nY8j7W1aeWv7/H+9Sz9jo4u1sax/fuKPtx0JKtL8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scaleway-cli";
|
||||
version = "2.4.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scaleway";
|
||||
repo = "scaleway-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "yYzcziEKPSiMvw9LWd60MkHmYFAvN7Qza6Z117NOOv0=";
|
||||
sha256 = "sha256-a8imZN3APQEb9ntQOzOKGBEiPKmb5ZYC9ZKnOuLiElc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "7cGVeja1YE96PEV1IRklyh6MeMDFAP+2TpYvvFkBYnQ=";
|
||||
vendorSha256 = "sha256-aaYS0WqNa8997kdV38blUsYovtUHHtEUXCTG9vwv2ko=";
|
||||
|
||||
# some tests require network access to scaleway's API, failing when sandboxed
|
||||
doCheck = false;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stripe-cli";
|
||||
version = "1.8.1";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stripe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R1w+dVBIPbmBOhtVWKfB4tS+Jp1/tahRk6rifPM53HA=";
|
||||
sha256 = "sha256-TP366SozSNfxUGYXIOObfIul0BhQtIGQYZLwH/TPFs0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KgoSJcVUtE4ryJLtQXNCdl51sgO94vyb682OdL5CYw8=";
|
||||
vendorSha256 = "sha256-1c+YtfRy1ey0z117YHHkrCnpb7g+DmM+LR1rjn1YwMQ=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/stripe"
|
||||
|
||||
@ -5,13 +5,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lrzip";
|
||||
version = "0.650";
|
||||
version = "0.651";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckolivas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rHjaTgNVGfnGio4geuWRfPds5BqcXJu7p8XJh83rRTs=";
|
||||
sha256 = "sha256-Mb324ojtLV0S10KhL7Vjf3DhSOtCy1pFMTzvLkTnpXM=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -33,7 +33,7 @@ xorg,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.31.0";
|
||||
version = "1.31.1";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
@ -82,7 +82,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-kzGBb8h03jPCqpwKPXeqB3yPTGgvVsl1DjIyCbNgjqM=";
|
||||
sha256 = "sha256-sC3ghtOA+Zp7LuAwry460WvyWXXw35aQESlaWznfZYk=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@ -16,11 +16,11 @@ let
|
||||
in
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "03.04.02";
|
||||
version = "04.00.00";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||
sha256 = "sha256-kjDcO0l39l2KJXo0elZesKZWDZoSoUXIu1Ua7IxWY4w=";
|
||||
sha256 = "sha256-I7bmsO3EAUnmo2KoIy5myxXuZB8tzs5kCEXpG550x8Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = tclLibraries;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nm-tray";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "palinek";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "08c86kd613wlvw9571q7a3lb7g6skyyasjw6h1g543rbl4jn2c2v";
|
||||
sha256 = "sha256-JTH1cmkgdW2aRWMYPRvOAvCJz0ClCIpjUtcWcqJQGSU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfortivpn";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrienverge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wSbE3vq9/o1r80zRT1rO9zAG6ws1nG18ALXYd9BAbLA=";
|
||||
sha256 = "sha256-pZcYbm1fWqGWYJzexph7i9nPAHH6HP+B8Y6uUkOCRk8=";
|
||||
};
|
||||
|
||||
# we cannot write the config file to /etc and as we don't need the file, so drop it
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zNK/OBDo6cL0uZHosulusdOviYZMD2TCusE+0Mn330g=";
|
||||
sha256 = "sha256-yp0mLHpBS23MUVOla7y3Rb2esM5J+Q8mZy1+mgdUtXo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-a6Tpz4jPQbtiWt6OyDKy+xbRx6EBwADyqTkvBnyusdQ=";
|
||||
vendorSha256 = "sha256-udEfjTdRcyjeUWb1d5gRBmoC0H0tl2+oSS7ac+ff5ew=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and multi-purpose HTTP toolkit";
|
||||
|
||||
@ -2,16 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "witness";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "testifysec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/35hIA6Wm/F5hwyLZbt4JXpwWISWbzVAWrX29r6pejY=";
|
||||
sha256 = "sha256-fkY3/UmHzggmysrae8VCY3NMBxC/LcWoQcXBELEzJlM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vXDsHHJknw9hsHx1mJA2c0CWwFbRXjCjitNWPh6V4yw=";
|
||||
vendorSha256 = "sha256-ajWIjQXLvFQB1AVYyGjyWMrWIyue/d1uU5HHNf4/UcU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -38,6 +37,14 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/witness completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/witness --help
|
||||
$out/bin/witness version | grep "v${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target";
|
||||
longDescription = ''
|
||||
|
||||
@ -13936,11 +13936,6 @@ with pkgs;
|
||||
python = python3;
|
||||
mkDerivation = stdenv.mkDerivation;
|
||||
};
|
||||
octave-jit = callPackage ../development/interpreters/octave {
|
||||
python = python3;
|
||||
enableJIT = true;
|
||||
mkDerivation = stdenv.mkDerivation;
|
||||
};
|
||||
octaveFull = libsForQt5.callPackage ../development/interpreters/octave {
|
||||
python = python3;
|
||||
enableQt = true;
|
||||
@ -32649,6 +32644,8 @@ with pkgs;
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
||||
cvc5 = callPackage ../applications/science/logic/cvc5 { };
|
||||
|
||||
drat-trim = callPackage ../applications/science/logic/drat-trim {};
|
||||
|
||||
ekrhyper = callPackage ../applications/science/logic/ekrhyper {
|
||||
@ -32812,6 +32809,8 @@ with pkgs;
|
||||
|
||||
symbiyosys = callPackage ../applications/science/logic/symbiyosys {};
|
||||
|
||||
symfpu = callPackage ../applications/science/logic/symfpu {};
|
||||
|
||||
mcy = callPackage ../applications/science/logic/mcy {};
|
||||
|
||||
lingeling = callPackage ../applications/science/logic/lingeling {};
|
||||
|
||||
@ -643,6 +643,10 @@ in {
|
||||
|
||||
asdf = callPackage ../development/python-modules/asdf { };
|
||||
|
||||
asdf-standard = callPackage ../development/python-modules/asdf-standard { };
|
||||
|
||||
asdf-transform-schemas = callPackage ../development/python-modules/asdf-transform-schemas { };
|
||||
|
||||
ase = callPackage ../development/python-modules/ase { };
|
||||
|
||||
asgi-csrf = callPackage ../development/python-modules/asgi-csrf { };
|
||||
@ -8492,6 +8496,8 @@ in {
|
||||
|
||||
pyvmomi = callPackage ../development/python-modules/pyvmomi { };
|
||||
|
||||
pyvo = callPackage ../development/python-modules/pyvo { };
|
||||
|
||||
pyvolumio = callPackage ../development/python-modules/pyvolumio { };
|
||||
|
||||
pyvoro = callPackage ../development/python-modules/pyvoro { };
|
||||
|
||||
@ -242,7 +242,15 @@ let
|
||||
zsh-git-prompt
|
||||
;
|
||||
|
||||
elmPackages.elm = pkgsPlatforms.elmPackages.elm;
|
||||
# Members of the elmPackages set that are Haskell derivations
|
||||
elmPackages = {
|
||||
inherit (pkgsPlatforms.elmPackages)
|
||||
elm
|
||||
elm-format
|
||||
elm-instrument
|
||||
elmi-to-json
|
||||
;
|
||||
};
|
||||
|
||||
# GHCs linked to musl.
|
||||
pkgsMusl.haskell.compiler = lib.recursiveUpdate
|
||||
|
||||
Loading…
Reference in New Issue
Block a user