Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-02-13 00:36:15 +00:00 committed by GitHub
commit c4d734932d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
90 changed files with 2517 additions and 1444 deletions

View file

@ -1 +1 @@
21.03
21.05

View file

@ -306,6 +306,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "GNU Free Documentation License v1.1 only";
};
fdl11Plus = spdx {
spdxId = "GFDL-1.1-or-later";
fullName = "GNU Free Documentation License v1.1 or later";
};
fdl12Only = spdx {
spdxId = "GFDL-1.2-only";
fullName = "GNU Free Documentation License v1.2 only";

View file

@ -9433,6 +9433,12 @@
fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B";
}];
};
tmountain = {
email = "tinymountain@gmail.com";
github = "tmountain";
githubId = 135297;
name = "Travis Whitton";
};
tmplt = {
email = "tmplt@dragons.rocks";
github = "tmplt";

View file

@ -8,7 +8,7 @@
This section lists the release notes for each stable version of NixOS and
current unstable revision.
</para>
<xi:include href="rl-2103.xml" />
<xi:include href="rl-2105.xml" />
<xi:include href="rl-2009.xml" />
<xi:include href="rl-2003.xml" />
<xi:include href="rl-1909.xml" />

View file

@ -6,7 +6,9 @@
<title>Release 20.09 (“Nightingale”, 2020.10/27)</title>
<para>
Support is planned until the end of April 2021, handing over to 21.03.
Support is planned until the end of June 2021, handing over to 21.05.
(Plans <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md#core-changes">
have shifted</link> by two months since release of 20.09.)
</para>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
@ -1538,7 +1540,7 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
<listitem>
<para>
Specifying <link linkend="opt-services.dovecot2.mailboxes">mailboxes</link> in the <package>dovecot2</package> module
as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the <literal>name</literal>
as a list is deprecated and will break eval in 21.05. Instead, an attribute-set should be specified where the <literal>name</literal>
should be the key of the attribute.
</para>
<para>

View file

@ -2,14 +2,14 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-21.03">
<title>Release 21.03 (“Okapi”, 2021.03/??)</title>
xml:id="sec-release-21.05">
<title>Release 21.05 (“Okapi”, 2021.05/??)</title>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-21.03-highlights">
xml:id="sec-release-21.05-highlights">
<title>Highlights</title>
<para>
@ -20,7 +20,7 @@
<itemizedlist>
<listitem>
<para>
Support is planned until the end of October 2021, handing over to 21.09.
Support is planned until the end of December 2021, handing over to 21.11.
</para>
</listitem>
<listitem>
@ -46,7 +46,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-21.03-new-services">
xml:id="sec-release-21.05-new-services">
<title>New Services</title>
<para>
@ -82,7 +82,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-21.03-incompatibilities">
xml:id="sec-release-21.05-incompatibilities">
<title>Backward Incompatibilities</title>
<para>
@ -501,7 +501,7 @@ self: super:
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-21.03-notable-changes">
xml:id="sec-release-21.05-notable-changes">
<title>Other Notable Changes</title>
<itemizedlist>

View file

@ -463,7 +463,7 @@ in
environment.systemPackages = [ dovecotPkg ];
warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [
"Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration."
"Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.05! See the release notes for more info for migration."
];
assertions = [

View file

@ -140,7 +140,7 @@ in {
# Try cleaning up the previously default location of cache file.
# Note that /var/cache/* should always be safe to remove.
# TODO: remove later, probably between 20.09 and 21.03
# TODO: remove later, probably between 20.09 and 21.05
systemd.tmpfiles.rules = [ "R /var/cache/kresd" ];
};
}

View file

@ -5,6 +5,10 @@ with lib;
let
cfg = config.services.hedgedoc;
# 21.03 will not be an official release - it was instead 21.05. This
# versionAtLeast statement remains set to 21.03 for backwards compatibility.
# See https://github.com/NixOS/nixpkgs/pull/108899 and
# https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
name = if versionAtLeast config.system.stateVersion "21.03"
then "hedgedoc"
else "codimd";

View file

@ -367,6 +367,7 @@ in {
'' else "") + ''
EOF
'';
environment = env;
serviceConfig = {
Type = "oneshot";
User = cfg.user;

View file

@ -368,7 +368,7 @@ in {
'')
++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03"))
++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09"))
++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.03"));
++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05"));
services.nextcloud.package = with pkgs;
mkDefault (
@ -380,6 +380,10 @@ in {
''
else if versionOlder stateVersion "20.03" then nextcloud17
else if versionOlder stateVersion "20.09" then nextcloud18
# 21.03 will not be an official release - it was instead 21.05.
# This versionOlder statement remains set to 21.03 for backwards compatibility.
# See https://github.com/NixOS/nixpkgs/pull/108899 and
# https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
else if versionOlder stateVersion "21.03" then nextcloud19
else nextcloud20
);

View file

@ -40,5 +40,6 @@ mkDerivation rec {
license = licenses.gpl2Only;
platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ];
broken = stdenv.isDarwin;
};
}

View file

@ -1,7 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }:
stdenv.mkDerivation rec {
pname = "ncpamixer";
version = "1.3.3.1";
@ -12,15 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z";
};
buildInputs = [ ncurses libpulseaudio ];
nativeBuildInputs = [ cmake pkg-config ];
configurePhase = ''
make PREFIX=$out build/Makefile
'';
buildInputs = [ ncurses libpulseaudio ];
buildPhase = ''
make build
configurePhase = ''
make PREFIX=$out USE_WIDE=1 RELEASE=1 build/Makefile
'';
meta = with lib; {
@ -28,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/fulhax/ncpamixer";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ StijnDW ];
maintainers = with maintainers; [ StijnDW SuperSandro2000 ];
};
}

View file

@ -0,0 +1,53 @@
{ lib
, fetchurl
, appimageTools
, tor
, trezord
}:
let
pname = "trezor-suite";
version = "21.2.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-linux-x86_64.AppImage";
sha256 = "0dj3azx9jvxchrpm02w6nkcis6wlnc6df04z7xc6f66fwn6r3kkw";
};
appimageContents = appimageTools.extractType2 {
inherit name src;
};
in
appimageTools.wrapType2 rec {
inherit name src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources
cp -a ${appimageContents}/locales/ $out/share/${pname}
cp -a ${appimageContents}/resources/app*.* $out/share/${pname}/resources
cp -a ${appimageContents}/resources/images/ $out/share/${pname}/resources
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/trezor-suite.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
# symlink system binaries instead bundled ones
mkdir -p $out/share/${pname}/resources/bin/{bridge,tor}
ln -sf ${trezord}/bin/trezord-go $out/share/${pname}/resources/bin/bridge/trezord
ln -sf ${tor}/bin/tor $out/share/${pname}/resources/bin/tor/tor
'';
meta = with lib; {
description = "Trezor Suite - Desktop App for managing crypto";
homepage = "https://suite.trezor.io";
license = licenses.unfree;
maintainers = with maintainers; [ prusnak ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -610,7 +610,7 @@ let
};
# Deprecated legacy aliases for backwards compat
aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) {
aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.05, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) {
"auto-complete-clang-async" = "emacsClangCompleteAsync";
"vterm" = "emacs-libvterm";
"0xc" = "_0xc";

View file

@ -1,12 +1,8 @@
{ lib, fetchFromGitHub, python3Packages, file, less, highlight
, imagePreviewSupport ? true, w3m ? null}:
with lib;
assert imagePreviewSupport -> w3m != null;
, imagePreviewSupport ? true, w3m }:
python3Packages.buildPythonApplication rec {
name = "ranger-${version}";
pname = "ranger";
version = "1.9.3";
src = fetchFromGitHub {
@ -18,14 +14,10 @@ python3Packages.buildPythonApplication rec {
LC_ALL = "en_US.UTF-8";
checkInputs = with python3Packages; [ pytest ];
checkInputs = with python3Packages; [ pytestCheckHook ];
propagatedBuildInputs = [ file ]
++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ];
checkPhase = ''
py.test tests
'';
preConfigure = ''
${lib.optionalString (highlight != null) ''
sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \
@ -45,7 +37,7 @@ python3Packages.buildPythonApplication rec {
# give file previews out of the box
substituteInPlace ranger/config/rc.conf \
--replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
'' + optionalString imagePreviewSupport ''
'' + lib.optionalString imagePreviewSupport ''
substituteInPlace ranger/ext/img_display.py \
--replace /usr/lib/w3m ${w3m}/libexec/w3m
@ -57,8 +49,8 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "File manager with minimalistic curses interface";
homepage = "http://ranger.github.io/";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.toonn maintainers.magnetophon ];
maintainers = with maintainers; [ toonn magnetophon ];
};
}

View file

@ -0,0 +1,25 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "ssh-tools";
version = "1.6";
src = fetchFromGitHub {
owner = "vaporup";
repo = pname;
rev = "v${version}";
sha256 = "0m0x9383p9ab4hdirncmrfha130iasa0v4cbif2y5nbxnxgh101r";
};
installPhase = ''
mkdir -p $out/bin
cp ssh-* $out/bin/
'';
meta = with lib; {
description = "Collection of various tools using ssh";
homepage = "https://github.com/vaporup/ssh-tools/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "wtf";
version = "0.34.0";
version = "0.35.0";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr";
sha256 = "sha256-xzMXbF0M7asZtyo8DmM5yyNoHKy0H6amRDhu6hjHgq4=";
};
vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a";
vendorSha256 = "sha256-6ij0NQMjDnZJhuqkUR7MdBLAMS5Xa2HKIgQjegKJyvc=";
doCheck = false;

View file

@ -16,14 +16,14 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
version = "29.0.0";
version = "29.0.1";
src = fetchFromGitHub {
githubBase = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
sha256 = "1v870kxbl7b0kazd6krjiarvbjwmv13hgwkzpi054i9cf8z7pyiv";
sha256 = "18flr64041cvffj6jbzx0njnynvyk3k5yljb446a4lwmksvd3nmq";
fetchSubmodules = true;
};

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxcd";
version = "0.7.6";
version = "0.8.0";
src = fetchFromGitHub {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
sha256 = "1bngsm2z02w9chbd65dvd1k21y16rapx6i84ac2icmc9wwpsfnls";
sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky";
};
vendorSha256 = "0pl1llj4bfxxxp49v3190vpvplv0wbw5ahj6l2045pic5yyxwrma";
vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx";
nativeBuildInputs = [ installShellFiles ];

View file

@ -13,19 +13,26 @@ buildGoModule rec {
vendorSha256 = null;
doCheck = false;
buildFlagsArray = [
"-ldflags="
"-s"
"-w"
"-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}"
];
nativeBuildInputs = [ installShellFiles ];
buildPhase = ''
make bin/tkn
# third_party/VENDOR-LICENSE breaks build/check as go files are still included
# docs is a tool for generating docs
excludedPackages = "\\(third_party\\|cmd/docs\\)";
preCheck = ''
# Change the golden files to match our desired version
sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden
'';
installPhase = ''
install bin/tkn -Dt $out/bin
mkdir -p "$out/share/man/man1"
cp docs/man/man1/* "$out/share/man/man1"
postInstall = ''
installManPage docs/man/man1/*
installShellCompletion --cmd tkn \
--bash <($out/bin/tkn completion bash) \
@ -34,14 +41,14 @@ buildGoModule rec {
'';
meta = with lib; {
description = "The Tekton Pipelines cli project provides a CLI for interacting with Tekton";
homepage = "https://tekton.dev";
changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
description = "Provides a CLI for interacting with Tekton";
longDescription = ''
The Tekton Pipelines cli project provides a CLI for interacting with Tekton!
For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines.
'';
license = licenses.asl20;
maintainers = with maintainers; [ jk mstrangfeld ];
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ jk mstrangfeld vdemeester ];
};
}

View file

@ -5,12 +5,12 @@
mkDerivation rec {
pname = "ripcord";
version = "0.4.26";
version = "0.4.28";
src = let
appimage = fetchurl {
url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage";
sha256 = "0i9l21gyqga27ainzqp6icn8vbc22v1knq01pglgg1lg3p504ikq";
sha256 = "0bczqp4kny7jlp06f4bh1xg0x17g8980dj6pk4waqc7qk88i6sfv";
name = "${pname}-${version}.AppImage";
};
in appimageTools.extract {

View file

@ -21,7 +21,7 @@
}:
let
version = "1.6.3";
version = "1.6.4";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
sha256 = "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m";
sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb";
};
nativeBuildInputs = [

View file

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Command-line tool to delete merged Git branches";
homepage = "https://pypi.org/project/git-delete-merged-branches/";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchzip, unixtools, which }:
{ lib, stdenv, fetchFromGitHub, unixtools, which }:
stdenv.mkDerivation rec {
pname = "git-extras";
version = "6.1.0";
src = fetchzip {
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
src = fetchFromGitHub {
owner = "tj";
repo = "git-extras";
rev = version;
sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz";
};
@ -29,6 +31,6 @@ stdenv.mkDerivation rec {
description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.spwhitt maintainers.cko ];
maintainers = with maintainers; [ spwhitt cko ];
};
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tig";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b";
sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk=";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
# those files are inherently impure, we'll handle the corresponding dependencies.
postPatch = ''
rm -f contrib/config.make-*
rm contrib/config.make-*
'';
enableParallelBuilding = true;
@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://jonas.github.io/tig/";
description = "Text-mode interface for git";
maintainers = with maintainers; [ bjornfor domenkozar qknight globin ];
license = licenses.gpl2;
maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}

View file

@ -3,11 +3,11 @@
i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}";
version = "4.19";
version = "4.19.1";
src = fetchurl {
url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz";
sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h";
sha256 = "sha256-+yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0=";
};
meta = with lib; {

View file

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f8773aba1736a7929a7262fdd6217be67f679c98.tar.gz";
sha256 = "1flmp0r1isgp8mf85iwiwps6sa3wczb6k0zphprhnvbi2dzg9x87";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c0fe8e827d5ec71141700f5d5a90a6f6616ecbc5.tar.gz";
sha256 = "16is1cipkfiabbh01i247vqfviwzjpfhgf6pkli61wwlhnk0q95s";
}

View file

@ -0,0 +1,264 @@
{ lib, stdenv, pkgsBuildTarget, targetPackages
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
, # GHC can be built with system libffi or a bundled one.
libffi ? null
, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
# aarch64 outputs otherwise exceed 2GB limit
, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # 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)
(if useLLVM then "perf-cross" else "perf-cross-ncg")
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
}:
assert !enableIntegerSimple -> gmp != null;
let
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
inherit (bootPkgs) ghc;
# TODO(@Ericson2314) Make unconditional
targetPrefix = lib.optionalString
(targetPlatform != hostPlatform)
"${targetPlatform.config}-";
buildMK = ''
BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk
endif
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'' + lib.optionalString (targetPlatform != hostPlatform) ''
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
CrossCompilePrefix = ${targetPrefix}
HADDOCK_DOCS = NO
BUILD_SPHINX_HTML = NO
BUILD_SPHINX_PDF = NO
'' + lib.optionalString (!enableProfiledLibs) ''
GhcLibWays = "v dyn"
'' + lib.optionalString enableRelocatedStaticLibs ''
GhcLibHcOpts += -fPIC
GhcRtsHcOpts += -fPIC
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
'';
# Splicer will pull out correct variations
libDeps = platform: lib.optional enableTerminfo ncurses
++ [libffi]
++ lib.optional (!enableIntegerSimple) gmp
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
# ld.gold is disabled for 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;
in
stdenv.mkDerivation (rec {
version = "8.10.4";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
patches = [
# See upstream patch at
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
# from source distributions, the auto-generated configure script needs to be
# patched as well, therefore we use an in-tree patch instead of pulling the
# upstream patch. Don't forget to check backport status of the upstream patch
# when adding new GHC releases in nixpkgs.
./respect-ar-path.patch
] ++ lib.optionals stdenv.isDarwin [
# Make Block.h compile with c++ compilers. Remove with the next release
(fetchpatch {
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
})
];
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
preConfigure = ''
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
export "''${env#TARGET_}=''${!env}"
done
# GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
'' + lib.optionalString targetPlatform.isMusl ''
echo "patching llvm-targets for musl targets..."
echo "Cloning these existing '*-linux-gnu*' targets:"
grep linux-gnu llvm-targets | sed 's/^/ /'
echo "(go go gadget sed)"
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
echo "llvm-targets now contains these '*-linux-musl*' targets:"
grep linux-musl llvm-targets | sed 's/^/ /'
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
for x in configure aclocal.m4; do
substituteInPlace $x \
--replace '*-android*|*-gnueabi*)' \
'*-android*|*-gnueabi*|*-musleabi*)'
done
'';
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ]
++ lib.optional (targetPlatform != hostPlatform) "target";
# `--with` flags for libraries needed for RTS linker
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ lib.optionals (libffi != null) [
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include"
"--with-iconv-libraries=${libiconv}/lib"
] ++ lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ lib.optionals useLdGold [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
];
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ lib.optional useLLVM llvmPackages.llvm;
depsTargetTarget = map lib.getDev (libDeps targetPlatform);
depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
checkTarget = "test";
hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
postInstall = ''
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
# Patch scripts to include "readelf" and "cat" in $PATH.
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
done
'';
passthru = {
inherit bootPkgs targetPrefix;
inherit llvmPackages;
inherit enableShared;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};
} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
dontStrip = true;
dontPatchELF = true;
noAuditTmpdir = true;
})

View file

@ -1410,10 +1410,16 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server;
# 2021-01-20
# apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
# https://github.com/haskell/haskell-language-server/issues/1240
apply-refact = super.apply-refact_0_8_2_1;
# 2021-02-08: Jailbreaking because of
# https://github.com/haskell/haskell-language-server/issues/1329
hls-tactics-plugin = doJailbreak super.hls-tactics-plugin;
# 2021-02-11: Jailbreaking because of syntax error on bound revision
hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
# 2021-02-08: Overrides because nightly is to old for hls 0.9.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7);
haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0;
haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0;
# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
@ -1567,4 +1573,12 @@ self: super: {
# Allow building with older versions of http-client.
http-client-restricted = doJailbreak super.http-client-restricted;
# 2020-02-11: https://github.com/ekmett/lens/issues/969
# A change in vector 0.2.12 broke the lens doctests.
# This is fixed on lens master. Remove this override on assert fail.
lens = assert super.lens.version == "4.19.2"; doJailbreak (dontCheck super.lens);
# Test suite fails, upstream not reachable for simple fix (not responsive on github)
vivid-osc = dontCheck super.vivid-osc;
vivid-supercollider = dontCheck super.vivid-supercollider;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -98,5 +98,8 @@ self: super: {
# Older compilers need the latest ghc-lib to build this package.
hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
# vector 0.12.2 indroduced doctest checks that dont work on older compilers
vector = dontCheck super.vector;
mmorph = super.mmorph_1_1_3;
}

View file

@ -127,4 +127,6 @@ self: super: {
# Older compilers need the latest ghc-lib to build this package.
hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
# vector 0.12.2 indroduced doctest checks that dont work on older compilers
vector = dontCheck super.vector;
}

View file

@ -84,7 +84,7 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch";
sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh";
});
doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_17)) (pkgs.fetchpatch {
doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/doctest-0.17.patch";
sha256 = "16s2jcbk9hsww38i2wzxghbf0zpp5dc35hp6rd2n7d4z5xfavp62";
});

View file

@ -1,6 +1,6 @@
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
compiler: ghc-8.10.3
compiler: ghc-8.10.4
core-packages:
- array-0.5.4.0
@ -13,17 +13,17 @@ core-packages:
- directory-1.3.6.0
- exceptions-0.10.4
- filepath-1.4.2.1
- ghc-8.10.3
- ghc-boot-8.10.3
- ghc-boot-th-8.10.3
- ghc-8.10.4
- ghc-boot-8.10.4
- ghc-boot-th-8.10.4
- ghc-compact-0.1.0.0
- ghc-heap-8.10.3
- ghc-heap-8.10.4
- ghc-prim-0.6.1
- ghci-8.10.3
- ghci-8.10.4
- haskeline-0.8.0.1
- hpc-0.6.1.0
- integer-gmp-1.0.3.0
- libiserv-8.10.3
- libiserv-8.10.4
- mtl-2.2.2
- parsec-3.1.14.0
- pretty-1.1.3.6
@ -73,12 +73,10 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- hls-plugin-api == 0.6.0.0 # Needed for hls 0.8.0
- hls-eval-plugin == 0.1.0.0 # Needed for hls 0.8.0
- hls-hlint-plugin == 0.1.0.0 # Needed for hls 0.8.0
- ghcide == 0.7.0.0 # Needed for hls 0.8.0
- ghcide < 0.7.4 # for hls 0.9.0
- hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0
# Stackage Nightly 2021-02-02
# Stackage Nightly 2021-02-10
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@ -107,6 +105,7 @@ default-package-overrides:
- aeson-with ==0.1.2.0
- aeson-yak ==0.1.1.3
- aeson-yaml ==1.1.0.0
- Agda ==2.6.1.3
- agda2lagda ==0.2020.11.1
- al ==0.1.4.2
- alarmclock ==0.7.0.5
@ -235,14 +234,14 @@ default-package-overrides:
- arithmoi ==0.11.0.1
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- ascii ==1.0.1.0
- ascii ==1.0.1.2
- ascii-case ==1.0.0.2
- ascii-char ==1.0.0.6
- asciidiagram ==1.3.3.3
- ascii-group ==1.0.0.2
- ascii-predicates ==1.0.0.2
- ascii-progress ==0.3.3.0
- ascii-superset ==1.0.1.0
- ascii-superset ==1.0.1.2
- ascii-th ==1.0.0.2
- asif ==6.0.4
- asn1-encoding ==0.9.6
@ -271,7 +270,7 @@ default-package-overrides:
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
- autoexporter ==1.1.19
- autoexporter ==1.1.20
- auto-update ==0.1.6
- avers ==0.0.17.1
- avro ==0.5.2.0
@ -358,13 +357,13 @@ default-package-overrides:
- bordacount ==0.1.0.0
- boring ==0.1.3
- both ==0.1.1.1
- bound ==2.0.2
- bound ==2.0.3
- BoundedChan ==1.0.3.0
- bounded-queue ==1.0.0
- boundingboxes ==0.2.3
- bower-json ==1.0.0.1
- boxes ==0.1.5
- brick ==0.59
- brick ==0.60.2
- broadcast-chan ==0.2.1.1
- bsb-http-chunked ==0.0.0.4
- bson ==0.4.0.1
@ -373,8 +372,8 @@ default-package-overrides:
- buffer-pipe ==0.0
- bugsnag-haskell ==0.0.4.1
- bugsnag-hs ==0.2.0.3
- bugzilla-redhat ==0.3.0
- burrito ==1.2.0.0
- bugzilla-redhat ==0.3.1
- burrito ==1.2.0.1
- butcher ==1.3.3.2
- bv ==0.5
- bv-little ==1.1.1
@ -397,6 +396,7 @@ default-package-overrides:
- bzlib-conduit ==0.3.0.2
- c14n ==0.1.0.1
- c2hs ==0.28.7
- cabal-appimage ==0.3.0.2
- cabal-debian ==5.1
- cabal-doctest ==1.0.8
- cabal-file ==0.1.1
@ -477,7 +477,7 @@ default-package-overrides:
- cmdargs ==0.10.20
- codec-beam ==0.2.0
- codec-rpm ==0.2.2
- code-page ==0.2
- code-page ==0.2.1
- co-log ==0.4.0.1
- co-log-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1
@ -493,6 +493,7 @@ default-package-overrides:
- comonad ==5.0.8
- comonad-extras ==4.0.1
- compactmap ==0.1.4.2.1
- compdata ==0.12.1
- compensated ==0.8.1
- compiler-warnings ==0.1.0
- composable-associations ==0.1.0.0
@ -603,7 +604,7 @@ default-package-overrides:
- data-accessor-mtl ==0.2.0.4
- data-accessor-template ==0.2.1.16
- data-accessor-transformers ==0.2.1.7
- data-ascii ==1.0.0.2
- data-ascii ==1.0.0.4
- data-binary-ieee754 ==0.4.4
- data-bword ==0.1.0.1
- data-checked ==0.3
@ -618,7 +619,7 @@ default-package-overrides:
- datadog ==0.2.5.0
- data-dword ==0.3.2
- data-endian ==0.1.1
- data-fix ==0.3.0
- data-fix ==0.3.1
- data-forest ==0.1.0.8
- data-has ==0.4.0.0
- data-hash ==0.2.0.1
@ -656,7 +657,7 @@ default-package-overrides:
- derive-topdown ==0.0.2.2
- deriving-aeson ==0.2.6
- deriving-compat ==0.5.10
- derulo ==1.0.9
- derulo ==1.0.10
- dhall ==1.38.0
- dhall-bash ==1.0.36
- dhall-json ==1.7.5
@ -843,7 +844,7 @@ default-package-overrides:
- flexible-defaults ==0.0.3
- FloatingHex ==0.5
- floatshow ==0.2.4
- flow ==1.0.21
- flow ==1.0.22
- flush-queue ==1.0.0
- fmlist ==0.9.4
- fmt ==0.6.1.2
@ -897,6 +898,7 @@ default-package-overrides:
- generic-data ==0.9.2.0
- generic-data-surgery ==0.3.0.0
- generic-deriving ==1.13.1
- generic-functor ==0.2.0.0
- generic-lens ==2.0.0.0
- generic-lens-core ==2.0.0.0
- generic-monoid ==0.1.0.1
@ -939,9 +941,9 @@ default-package-overrides:
- ghcid ==0.8.7
- ghci-hexcalc ==0.1.1.0
- ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.3.20201220
- ghc-lib-parser ==8.10.3.20201220
- ghc-lib-parser-ex ==8.10.0.17
- ghc-lib ==8.10.4.20210206
- ghc-lib-parser ==8.10.4.20210206
- ghc-lib-parser-ex ==8.10.0.19
- ghc-parser ==0.2.2.0
- ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.7
@ -975,7 +977,7 @@ default-package-overrides:
- gi-pango ==1.0.23
- githash ==0.1.5.0
- github ==0.26
- github-release ==1.3.5
- github-release ==1.3.6
- github-rest ==1.0.3
- github-types ==0.2.1
- github-webhooks ==0.15.0
@ -1015,7 +1017,7 @@ default-package-overrides:
- hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.9.0
- hadolint ==1.21.0
- hadolint ==1.22.1
- hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.3
- half ==0.3.1
@ -1067,7 +1069,7 @@ default-package-overrides:
- hebrew-time ==0.1.2
- hedgehog ==1.0.4
- hedgehog-corpus ==0.2.0
- hedgehog-fakedata ==0.0.1.3
- hedgehog-fakedata ==0.0.1.4
- hedgehog-fn ==1.0
- hedgehog-quickcheck ==0.1.1
- hedis ==0.14.2
@ -1119,7 +1121,7 @@ default-package-overrides:
- hourglass ==0.2.12
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.9
- hpack ==0.34.3
- hpack ==0.34.4
- hpack-dhall ==0.5.2
- hpc-codecov ==0.2.0.1
- hpc-lcov ==1.0.1
@ -1237,13 +1239,13 @@ default-package-overrides:
- hw-string-parse ==0.0.0.4
- hw-succinct ==0.1.0.1
- hw-xml ==0.5.1.0
- hxt ==9.3.1.18
- hxt-charproperties ==9.4.0.0
- hxt ==9.3.1.21
- hxt-charproperties ==9.5.0.0
- hxt-css ==0.1.0.3
- hxt-curl ==9.1.1.1
- hxt-expat ==9.1.1
- hxt-http ==9.1.5.2
- hxt-regex-xmlschema ==9.2.0.3
- hxt-regex-xmlschema ==9.2.0.7
- hxt-tagsoup ==9.1.4
- hxt-unicode ==9.0.2.4
- hybrid-vectors ==0.2.2
@ -1336,7 +1338,7 @@ default-package-overrides:
- js-dgtable ==0.5.2
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json-feed ==1.0.11
- json-feed ==1.0.12
- jsonpath ==0.2.0.0
- json-rpc ==1.0.3
- json-rpc-generic ==0.2.1.5
@ -1403,7 +1405,7 @@ default-package-overrides:
- lens-family-core ==2.0.0
- lens-family-th ==0.5.1.0
- lens-misc ==0.0.2.0
- lens-process ==0.3.0.2
- lens-process ==0.4.0.0
- lens-properties ==4.11.1
- lens-regex ==0.1.1
- lens-regex-pcre ==1.1.0.0
@ -1432,7 +1434,7 @@ default-package-overrides:
- ListLike ==4.7.4
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==1.0.0.4
- list-singleton ==1.0.0.5
- list-t ==1.0.4
- ListTree ==0.2.3
- little-logger ==0.3.1
@ -1545,7 +1547,7 @@ default-package-overrides:
- mock-time ==0.1.0
- mod ==0.1.2.1
- model ==0.5
- modern-uri ==0.3.3.0
- modern-uri ==0.3.3.1
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.2.3
@ -1610,7 +1612,7 @@ default-package-overrides:
- mwc-random ==0.14.0.0
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- mysql ==0.1.7.2
- mysql ==0.1.7.3
- mysql-simple ==0.4.5
- n2o ==0.11.1
- nagios-check ==0.3.2
@ -1644,9 +1646,9 @@ default-package-overrides:
- network-simple-tls ==0.4
- network-transport ==0.5.4
- network-transport-composed ==0.2.1
- network-uri ==2.6.3.0
- network-uri ==2.6.4.1
- newtype ==0.2.2.0
- newtype-generics ==0.5.4
- newtype-generics ==0.6
- nicify-lib ==1.0.1
- NineP ==0.0.2.1
- nix-paths ==1.0.1
@ -1741,8 +1743,8 @@ default-package-overrides:
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- partial-semigroup ==0.5.1.8
- password ==2.1.0.0
- password-instances ==2.0.0.1
- password ==2.1.1.0
- password-instances ==2.0.0.2
- path ==0.7.0
- path-binary-instance ==0.1.0.1
- path-extensions ==0.1.1.0
@ -1764,6 +1766,7 @@ default-package-overrides:
- peano ==0.1.0.1
- pem ==0.2.4
- percent-format ==0.0.1
- peregrin ==0.3.1
- perfect-hash-generator ==0.2.0.6
- perfect-vector-shuffle ==0.1.1.1
- persist ==0.1.1.5
@ -1776,7 +1779,7 @@ default-package-overrides:
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.11.0.1
- persistent-qq ==2.9.2.1
- persistent-sqlite ==2.11.0.0
- persistent-sqlite ==2.11.1.0
- persistent-template ==2.9.1.0
- persistent-test ==2.0.3.5
- persistent-typed-db ==0.1.0.2
@ -1861,7 +1864,7 @@ default-package-overrides:
- probability ==0.2.7
- process-extras ==0.7.4
- product-isomorphic ==0.0.3.3
- product-profunctors ==0.11.0.1
- product-profunctors ==0.11.0.2
- profiterole ==0.1
- profunctors ==5.5.2
- projectroot ==0.2.0.1
@ -1895,7 +1898,7 @@ default-package-overrides:
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==2.0.0.3
- pvar ==1.0.0.0
- PyF ==0.9.0.2
- PyF ==0.9.0.3
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qrcode-core ==0.9.4
@ -1916,12 +1919,12 @@ default-package-overrides:
- quickcheck-transformer ==0.3.1.1
- quickcheck-unicode ==1.0.1.0
- quiet ==0.2
- quote-quot ==0.1.0.0
- quote-quot ==0.2.0.0
- radius ==0.7.1.0
- rainbow ==0.34.2.2
- rainbox ==0.26.0.0
- ral ==0.1
- rampart ==1.1.0.1
- rampart ==1.1.0.2
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.1
@ -1937,9 +1940,9 @@ default-package-overrides:
- rank2classes ==1.4.1
- Rasterific ==0.7.5.3
- rasterific-svg ==0.3.3.2
- ratel ==1.0.12
- ratel ==1.0.13
- rate-limit ==1.4.2
- ratel-wai ==1.1.3
- ratel-wai ==1.1.4
- rattle ==0.2
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
@ -2019,10 +2022,10 @@ default-package-overrides:
- rocksdb-haskell-jprupp ==2.1.3
- rocksdb-query ==0.4.2
- roles ==0.2.0.0
- rope-utf16-splay ==0.3.1.0
- rope-utf16-splay ==0.3.2.0
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.3.1
- rpmbuild-order ==0.4.3.2
- RSA ==2.4.1
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
@ -2039,7 +2042,7 @@ default-package-overrides:
- salak ==0.3.6
- salak-yaml ==0.3.5.3
- saltine ==0.1.1.1
- salve ==1.0.10
- salve ==1.0.11
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.5
@ -2188,7 +2191,7 @@ default-package-overrides:
- speedy-slice ==0.3.1
- Spintax ==0.3.5
- splice ==0.6.1.1
- splint ==1.0.1.2
- splint ==1.0.1.3
- split ==0.2.3.4
- splitmix ==0.1.0.3
- spoon ==0.3.1
@ -2254,7 +2257,7 @@ default-package-overrides:
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
- stripe-tests ==2.6.2
- strive ==5.0.12
- strive ==5.0.13
- structs ==0.1.4
- structured ==0.1
- structured-cli ==2.6.0.0
@ -2293,7 +2296,7 @@ default-package-overrides:
- tardis ==0.4.1.0
- tasty ==1.2.3
- tasty-ant-xml ==1.1.7
- tasty-bench ==0.1
- tasty-bench ==0.2.1
- tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.2
@ -2334,7 +2337,7 @@ default-package-overrides:
- test-framework-smallcheck ==0.2
- test-fun ==0.1.0.0
- testing-type-modifiers ==0.1.0.1
- texmath ==0.12.1
- texmath ==0.12.1.1
- text-ansi ==0.1.1
- text-binary ==0.2.1.1
- text-builder ==0.6.6.1
@ -2358,7 +2361,7 @@ default-package-overrides:
- tf-random ==0.5
- th-abstraction ==0.4.2.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1
- th-compat ==0.1.1
- th-constraint-compat ==0.0.1.0
- th-data-compat ==0.1.0.0
- th-desugar ==1.11
@ -2406,7 +2409,7 @@ default-package-overrides:
- tinylog ==0.15.0
- titlecase ==1.0.1
- tldr ==0.9.0
- tls ==1.5.4
- tls ==1.5.5
- tls-debug ==0.4.8
- tls-session-manager ==0.0.4
- tlynx ==0.5.0.1
@ -2428,6 +2431,7 @@ default-package-overrides:
- traverse-with-class ==1.0.1.0
- tree-diff ==0.1
- tree-fun ==0.8.1.0
- tree-view ==0.5
- trifecta ==2.1
- triplesec ==0.2.2.1
- tsv2csv ==0.1.0.2
@ -2453,7 +2457,7 @@ default-package-overrides:
- type-level-numbers ==0.1.1.1
- type-map ==0.1.6.0
- type-natural ==1.0.0.0
- type-of-html ==1.6.1.2
- type-of-html ==1.6.2.0
- type-of-html-static ==0.1.0.2
- type-operators ==0.2.0.0
- typerep-map ==0.3.3.0
@ -2497,6 +2501,7 @@ default-package-overrides:
- unliftio ==0.2.14
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
- unlit ==0.4.0.0
- unordered-containers ==0.2.13.0
- unsafe ==0.0
@ -2530,12 +2535,13 @@ default-package-overrides:
- valor ==0.1.0.0
- vault ==0.3.1.4
- vec ==0.3
- vector ==0.12.1.2
- vector ==0.12.2.0
- vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.8
- vector-bytes-instances ==0.1.1
- vector-circular ==0.1.3
- vector-instances ==3.4
- vector-mmap ==0.0.3
- vector-rotcev ==0.1.0.0
@ -2573,7 +2579,7 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-websockets ==3.0.1.2
- wakame ==0.1.0.0
- warp ==3.3.13
- warp ==3.3.14
- warp-tls ==3.3.0
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0
@ -2595,7 +2601,7 @@ default-package-overrides:
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.0.0.4
- witch ==0.0.0.5
- witherable-class ==0
- within ==0.2.0.1
- with-location ==0.1.0
@ -2610,12 +2616,12 @@ default-package-overrides:
- word-wrap ==0.4.1
- world-peace ==1.0.2.0
- wrap ==0.0.0
- wreq ==0.5.3.2
- wreq ==0.5.3.3
- writer-cps-exceptions ==0.1.0.1
- writer-cps-mtl ==0.1.1.6
- writer-cps-transformers ==0.5.6.1
- wss-client ==0.3.0.0
- wuss ==1.1.17
- wuss ==1.1.18
- X11 ==1.9.2
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
@ -2661,7 +2667,7 @@ default-package-overrides:
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.2
- yesod-page-cursor ==2.0.0.3
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.5
- yesod-sitemap ==1.6.0
@ -2697,6 +2703,7 @@ default-package-overrides:
extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal-install etc.
- dhall == 1.29.0 # required for ats-pkg
- dhall == 1.37.1 # required for spago 0.19.0.
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
@ -2711,8 +2718,10 @@ extra-packages:
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
- apply-refact == 0.8.2.1 # Needed for hls 0.8.0
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
- haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08
package-maintainers:
peti:
@ -5127,6 +5136,7 @@ broken-packages:
- fay-websockets
- fb-persistent
- fbmessenger-api
- fbrnch
- fca
- fcache
- fcd
@ -8286,9 +8296,6 @@ broken-packages:
- nested-sequence
- NestedFunctor
- nestedmap
- net-mqtt
- net-mqtt-lens
- net-mqtt-rpc
- net-spider
- net-spider-cli
- net-spider-pangraph
@ -11031,6 +11038,7 @@ broken-packages:
- unix-fcntl
- unix-handle
- unix-process-conduit
- unix-simple
- unlifted-list
- unliftio-streams
- unm-hip
@ -11201,9 +11209,6 @@ broken-packages:
- visual-prof
- visualize-cbn
- vitrea
- vivid
- vivid-osc
- vivid-supercollider
- vk-aws-route53
- VKHS
- voicebase

File diff suppressed because it is too large Load diff

View file

@ -2,11 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.1.763";
version = "1.10.2.774";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "042d5bk59wv145fvjrk72g4hvaq7j2p4a2d1pg13b433qfkchgia";
sha256 = "0z3j8m9k7prmx6n3kpyhj04pjdg7y0plyxv4kp7789shanr6y4qp";
};
nativeBuildInputs = [
@ -20,6 +21,8 @@ stdenv.mkDerivation rec {
binPath = lib.makeBinPath [ rlwrap jdk ];
in
''
runHook preInstall
clojure_lib_dir=$out
bin_dir=$out/bin
@ -38,6 +41,8 @@ stdenv.mkDerivation rec {
wrapProgram $bin_dir/clj --prefix PATH : $out/bin:${binPath}
installManPage clj.1 clojure.1
runHook postInstall
'';
doInstallCheck = true;

View file

@ -47,9 +47,8 @@ stdenv.mkDerivation rec {
gtkModule = "/lib/gtk-2.0/";
};
meta = {
meta = with lib; {
description = "An implementation of the XDG Sound Theme and Name Specifications";
longDescription = ''
libcanberra is an implementation of the XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops
@ -57,12 +56,12 @@ stdenv.mkDerivation rec {
PulseAudio, OSS, GStreamer, null) and is designed to be
portable.
'';
homepage = "http://0pointer.de/lennart/projects/libcanberra/";
license = lib.licenses.lgpl2Plus;
license = licenses.lgpl2Plus;
maintainers = [ ];
platforms = lib.platforms.unix;
platforms = platforms.unix;
# canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found
# #include <gdk/gdkx.h>
broken = stdenv.isDarwin;
};
}

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "libgdata";
version = "0.17.13";
version = "0.18.0";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga";
sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA=";
};
patches = [

View file

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libjcat";
version = "0.1.5";
version = "0.1.6";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libjcat";
rev = version;
sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc=";
sha256 = "sha256-X+mFl0YZpnt6zzvVTGZN7PROVUaQ8ZmU3T0EgyoZX6g=";
};
patches = [

View file

@ -1,20 +1,21 @@
{ lib, fetchurl, buildDunePackage, opaline, ocaml
, alcotest
, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, odoc, ocaml_lwt, pandoc, re }:
, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp
, pandoc}:
buildDunePackage rec {
pname = "mdx";
version = "1.8.0";
version = "1.8.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
sha256 = "1p2ip73da271as0x1gfbajik3mf1bkc8l54276vgacn1ja3saj52";
sha256 = "1szik1lyg2vs8jrisnvjdc29n0ifls8mghimff4jcz6f48haa3cv";
};
nativeBuildInputs = [ cppo ];
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version odoc re ];
propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc re ];
checkInputs = [ alcotest ocaml_lwt pandoc ];
doCheck = true;

View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
version = "1.31.0";
version = "1.32.0";
src = fetchPypi {
inherit pname version;
sha256 = "3a1d73d098161e60966b0d53bb310c98e4f66101688cce3d1697903643782d79";
sha256 = "jL+sAlKbeXA1QeJVQbAcgIaPEbD/Ko+QMrI1Ew2dVq4=";
};
# Tests are not included in the PyPI package
@ -26,9 +26,9 @@ buildPythonPackage rec {
six
] ++ lib.optionals (pythonOlder "3.4") [ enum34 ];
meta = {
meta = with lib; {
homepage = "https://github.com/awslabs/serverless-application-model";
description = "Python library to transform SAM templates into AWS CloudFormation templates";
license = lib.licenses.asl20;
license = licenses.asl20;
};
}

View file

@ -26,6 +26,9 @@ buildPythonPackage rec {
export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
'';
# no tests
doCheck = false;
meta = with lib; {
description = "Board and connector definitions for nMigen";
homepage = "https://github.com/nmigen/nmigen-boards";

View file

@ -0,0 +1,45 @@
{ lib
, aiohttp
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, pytest-aiohttp
, poetry
, pytest-asyncio
, pytest-cov
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyairnow";
version = "1.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "asymworks";
repo = pname;
rev = "v${version}";
sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c";
};
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [ aiohttp ];
checkInputs = [
aioresponses
pytest-asyncio
pytest-aiohttp
pytest-cov
pytestCheckHook
];
pythonImportsCheck = [ "pyairnow" ];
meta = with lib; {
description = "Python wrapper for EPA AirNow Air Quality API";
homepage = "https://github.com/asymworks/pyairnow";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -35,6 +35,9 @@ buildPythonPackage {
--replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'"
'';
# hangs on darwin + sandbox
doCheck = !stdenv.isDarwin;
meta = with lib; {
homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit";
description = "Python XMP Toolkit for working with metadata";

View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyvesync";
version = "1.3.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "02fpbyg46mlpc2c1j4zylw9a1h6bacxvigrl3cndsf6fxlhfx15z";
};
propagatedBuildInputs = [ requests ];
# Test are not available (not in PyPI tarball and there are no GitHub releases)
doCheck = false;
pythonImportsCheck = [ "pyvesync" ];
meta = with lib; {
description = "Python library to manage Etekcity Devices and Levoit Air Purifier";
homepage = "https://github.com/webdjoe/pyvesync";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,53 @@
{ lib
, asynctest
, bleak
, click
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytest-cov
, pytest-mock
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyzerproc";
version = "0.4.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "emlove";
repo = pname;
rev = version;
sha256 = "1qlxvvy9fyff56dvc46nsd5ngkxqhdi7s4gwfndj7dn76j81srpq";
};
# Remove pytest-runner, https://github.com/emlove/pyzerproc/pull/1
patchPhase = ''
substituteInPlace setup.py --replace "'pytest-runner'," ""
'';
propagatedBuildInputs = [
bleak
click
];
checkInputs = [
asynctest
pytest-asyncio
pytest-cov
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "pyzerproc" ];
meta = with lib; {
description = "Python library to control Zerproc Bluetooth LED smart string lights";
homepage = "https://github.com/emlove/pyzerproc";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
platforms = platforms.linux;
};
}

View file

@ -4,25 +4,13 @@
buildPythonPackage rec {
pname = "todoist-python";
version = "8.1.2";
version = "8.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498";
sha256 = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U=";
};
patches = [
# From https://github.com/Doist/todoist-python/pull/80
(fetchpatch {
url = "https://github.com/Doist/todoist-python/commit/605443c67a8e2f105071e0da001c9f6f2a89ef19.patch";
sha256 = "0ah0s5by783kqlaimsbxz11idz0bhc2428aw9vdjpngmzb7ih1pa";
})
(fetchpatch {
url = "https://github.com/Doist/todoist-python/commit/f2f8e1e5b3ab1674ad9f0dff885702a25d1d18e9.patch";
sha256 = "1kp63yk9kj87zvvgfl60m6lxdm5sx3dny4g0s67ap1jbz350wifn";
})
];
propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing;
meta = with lib; {

View file

@ -15,10 +15,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
# no tests
doCheck = false;
meta = with lib; {
description = "Python implementation of the Transmission bittorent client RPC protocol";
homepage = "https://pypi.python.org/pypi/transmissionrpc/";
license = licenses.mit;
};
}

View file

@ -3,16 +3,11 @@
, buildPythonPackage
, fetchPypi
, substituteAll
, pkgs
, argcomplete
, pyyaml
, xmltodict
# Test inputs
, coverage
, flake8
, jq
, pytest
, toml
, pytestCheckHook
}:
buildPythonPackage rec {
@ -27,12 +22,13 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./jq-path.patch;
jq = "${lib.getBin pkgs.jq}/bin/jq";
jq = "${lib.getBin jq}/bin/jq";
})
];
postPatch = ''
substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
substituteInPlace test/test.py \
--replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
'';
propagatedBuildInputs = [
@ -41,16 +37,11 @@ buildPythonPackage rec {
argcomplete
];
doCheck = true;
checkInputs = [
pytest
coverage
flake8
toml
pytestCheckHook
];
checkPhase = "pytest ./test/test.py";
pytestFlagsArray = [ "test/test.py" ];
pythonImportsCheck = [ "yq" ];
@ -59,7 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Command-line YAML processor - jq wrapper for YAML documents";
homepage = "https://github.com/kislyuk/yq";
license = [ licenses.asl20 ];
maintainers = [ maintainers.womfoo ];
license = licenses.asl20;
maintainers = with maintainers; [ womfoo SuperSandro2000 ];
};
}

View file

@ -4,75 +4,33 @@
, enableTelemetry ? false
}:
let
py = python3.override {
packageOverrides = self: super: {
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
version = "1.0.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92";
};
});
aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec {
version = "1.27.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ=";
};
});
dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec {
version = "0.7.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y=";
};
});
cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec {
version = "1.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk";
};
});
};
};
in
with py.pkgs;
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli";
version = "1.6.2";
version = "1.14.0";
src = fetchPypi {
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "0scnymhhiiqrs2j0jaypxgq2wg1qf1w8f55qfay0b3nf51y6mh8y";
sha256 = "E+xIS0Z3M/ilBswH8XwXWnGb9gbDRuuKKE39qau9fFc=";
};
# Tests are not included in the PyPI package
doCheck = false;
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
aws-lambda-builders
aws-sam-translator
chevron
click
cookiecutter
dateparser
python-dateutil
docker
flask
idna
jmespath
pathlib2
requests
serverlessrepo
six
tomlkit
watchdog
];
postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else ''
@ -83,13 +41,12 @@ buildPythonApplication rec {
# fix over-restrictive version bounds
postPatch = ''
substituteInPlace requirements/base.txt \
--replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \
--replace "docker~=4.2.0" "docker~=4.3" \
--replace "jmespath~=0.9.5" "jmespath~=0.10.0" \
--replace "boto3~=1.14.23" "boto3~=1.14" \
--replace "dateparser~=0.7" "dateparser>=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \
--replace "requests==2.23.0" "requests~=2.24" \
--replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \
--replace "tomlkit==0.5.8" "tomlkit~=0.7.0"
--replace "watchdog==0.10.3" "watchdog"
'';
meta = with lib; {

View file

@ -0,0 +1,43 @@
{ lib, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, lvm2 }:
buildGoModule rec {
pname = "dockle";
version = "0.3.1";
src = fetchFromGitHub {
owner = "goodwithtech";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Zc2ZlyeWdRvyuJLDDTONfh0/q+HKR4lNtSFMjgJWrRY=";
};
vendorSha256 = "sha256-4IJKXcnMXBqoEjsV4Xg2QYvKwxDDUjcZtrj9IRuT6i4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ];
buildFlagsArray = [
"-ldflags="
"-s"
"-w"
"-X main.version=${version}"
];
preCheck = ''
# Remove tests that use networking
rm pkg/scanner/scan_test.go pkg/utils/fetch_test.go
'';
meta = with lib; {
homepage = "https://containers.goodwith.tech";
changelog = "https://github.com/goodwithtech/dockle/releases/tag/v${version}";
description = "Container Image Linter for Security";
longDescription = ''
Container Image Linter for Security.
Helping build the Best-Practice Docker Image.
Easy to start.
'';
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
};
}

View file

@ -1,20 +1,25 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
buildGoModule rec {
pname = "gron";
version = "0.6.1";
owner = "tomnomnom";
repo = "gron";
goPackagePath = "github.com/${owner}/${repo}";
src = fetchFromGitHub {
inherit owner repo;
owner = "tomnomnom";
repo = "gron";
rev = "v${version}";
sha256 = "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m";
};
goDeps = ./deps.nix;
patches = [
(fetchpatch {
name = "fix-inconsistent-vendoring.patch";
url = "https://github.com/tomnomnom/gron/pull/85/commits/d549a6cb68ed0e0ec7cc81d8275353acfe218725.patch";
sha256 = "1461v4f7w6q75l3988br0g1ynfhzsh34z38pd2w8fp57vrgkcfi5";
})
];
vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy";
meta = with lib; {
description = "Make JSON greppable!";
@ -26,7 +31,7 @@ buildGoPackage rec {
'';
homepage = "https://github.com/tomnomnom/gron";
license = licenses.mit;
maintainers = [ maintainers.fgaz ];
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ fgaz SuperSandro2000 ];
platforms = platforms.unix;
};
}

View file

@ -1,57 +0,0 @@
[
rec {
owner = "fatih";
repo = "color";
goPackagePath = "github.com/${owner}/${repo}";
fetch = {
type = "git";
url = "https://github.com/${owner}/${repo}";
rev = "v1.7.0";
sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
};
}
rec {
owner = "nwidger";
repo = "jsoncolor";
goPackagePath = "github.com/${owner}/${repo}";
fetch = {
type = "git";
url = "https://github.com/${owner}/${repo}";
rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40";
sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki";
};
}
rec {
owner = "pkg";
repo = "errors";
goPackagePath = "github.com/${owner}/${repo}";
fetch = {
type = "git";
url = "https://github.com/${owner}/${repo}";
rev = "v0.8.0";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
rec {
owner = "mattn";
repo = "go-colorable";
goPackagePath = "github.com/${owner}/${repo}";
fetch = {
type = "git";
url = "https://github.com/${owner}/${repo}";
rev = "v0.0.9";
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
rec {
owner = "mattn";
repo = "go-isatty";
goPackagePath = "github.com/${owner}/${repo}";
fetch = {
type = "git";
url = "https://github.com/${owner}/${repo}";
rev = "v0.0.4";
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
]

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "tokei";
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994=";
buildInputs = lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
libiconv Security
];
# enable all output formats

View file

@ -1,21 +1,22 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "pup";
version = "0.4.0";
rev = "v${version}";
version = "unstable-2019-09-19";
goPackagePath = "github.com/ericchiang/pup";
src = fetchgit {
inherit rev;
url = "https://${goPackagePath}";
sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz";
src = fetchFromGitHub {
owner = "ericchiang";
repo = "pup";
rev = "681d7bb639334bf485476f5872c5bdab10931f9a";
sha256 = "1hx1k0qlc1bq6gg5d4yprn4d7kvqzagg6mi5mvb39zdq6c4y17vr";
};
vendorSha256 = null;
meta = with lib; {
description = "Streaming HTML processor/selector";
description = "Parsing HTML at the command line";
homepage = "https://github.com/ericchiang/pup";
license = licenses.mit;
maintainers = with maintainers; [ yegortimoshenko ];
maintainers = with maintainers; [ yegortimoshenko SuperSandro2000 ];
};
}

View file

@ -20,12 +20,12 @@ in
mkDerivation rec {
pname = "qtcreator";
version = "4.11.0";
version = "4.14.0";
baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
src = fetchurl {
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
@ -54,16 +54,14 @@ mkDerivation rec {
preConfigure = ''
substituteInPlace src/plugins/plugins.pro \
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
substituteInPlace src/libs/libs.pro \
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
'' + optionalString withClangPlugins ''
# Fix paths for llvm/clang includes directories.
substituteInPlace src/shared/clang/clang_defines.pri \
--replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \
--replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin'
# Fix include path to find clang and clang-c include directories.
substituteInPlace src/plugins/clangtools/clangtools.pro \
--replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}'
# Fix paths to libclang library.
substituteInPlace src/shared/clang/clang_installation.pri \
--replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \

View file

@ -1,15 +1,22 @@
{ lib, stdenv, fetchurl }:
let arch = if stdenv.isx86_64 then "x86-64" else
with lib;
let
# The x86-64-modern may need to be refined further in the future
# but stdenv.hostPlatform CPU flags do not currently work on Darwin
# https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745
archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "x86-64";
arch = if stdenv.isDarwin then archDarwin else
if stdenv.isx86_64 then "x86-64" else
if stdenv.isi686 then "x86-32" else
"unknown";
version = "12";
nnueFile = "nn-82215d0fd0df.nnue";
nnue = fetchurl {
name = nnueFile;
url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2";
};
in
@ -23,18 +30,24 @@ stdenv.mkDerivation {
sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i";
};
# This addresses a linker issue with Darwin
# https://github.com/NixOS/nixpkgs/issues/19098
preBuild = optionalString stdenv.isDarwin ''
sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile
'';
postUnpack = ''
sourceRoot+=/src
echo ${nnue}
cp "${nnue}" "$sourceRoot/${nnueFile}"
'';
makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ];
makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" "CXX=${stdenv.cc.targetPrefix}c++" ];
buildFlags = [ "build" ];
enableParallelBuilding = true;
meta = with lib; {
meta = {
homepage = "https://stockfishchess.org/";
description = "Strong open source chess engine";
longDescription = ''
@ -42,7 +55,7 @@ stdenv.mkDerivation {
much stronger than the best human chess grandmasters.
'';
maintainers = with maintainers; [ luispedro peti ];
platforms = ["x86_64-linux" "i686-linux"];
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
license = licenses.gpl2;
};

View file

@ -1,64 +0,0 @@
{ stdenv, lib, fetchFromGitHub, python2, python2Packages, file, makeWrapper, cups }:
# Setup instructions can be found at https://github.com/simoncadman/CUPS-Cloud-Print#configuration
# So the nix version is something like:
# nix run nixpkgs.cups-googlecloudprint -c sudo setupcloudprint
# nix run nixpkgs.cups-googlecloudprint -c sudo listcloudprinters
let pythonEnv = python2.buildEnv.override {
extraLibs = with python2Packages; [
six
httplib2
pycups
];
};
in stdenv.mkDerivation rec {
pname = "cups-googlecloudprint";
version = "20160502";
src = fetchFromGitHub {
owner = "simoncadman";
repo = "CUPS-Cloud-Print";
rev = version;
sha256 = "0760i12w7jrhq7fsgyz3yqla5cvpjb45n6m2jz96wsy3p3xf6dzz";
};
buildInputs = [ cups makeWrapper ];
cupsgroup = "nonexistantgroup";
NOPERMS = 1;
postConfigure = ''
substituteInPlace Makefile --replace "${cups}" "$out"
'';
postInstall = ''
pushd "$out"
for s in lib/cups/backend/gcp lib/cups/driver/cupscloudprint
do
echo "Wrapping $s..."
wrapProgram "$out/$s" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups"
done
mkdir bin
for s in share/cloudprint-cups/*.py
do
if [ -x "$s" ] # Only wrapping those Python scripts marked as executable
then
o="bin/$(echo $s | sed 's,share/cloudprint-cups/\(.*\).py,\1,')"
echo "Wrapping $o -> $s..."
makeWrapper "$out/$s" "$o" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups"
fi
done
popd
'';
meta = with lib; {
description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print";
homepage = "http://ccp.niftiestsoftware.com";
platforms = platforms.linux;
license = licenses.gpl3;
};
}

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.24";
version = "1.1.25";
src = fetchurl {
# To find new versions, visit
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
"https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
"https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
"https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
];
sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co=";
sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw=";
};
patches = [ ./cups-filter-ppd-dirs.patch ];

View file

@ -1,27 +1,32 @@
{ lib, stdenv, fetchgit }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "flashbench";
version = "2012-06-06";
pname = "flashbench-unstable";
version = "2020-01-23";
src = fetchgit {
url = "https://github.com/bradfa/flashbench.git";
rev = "2e30b1968a66147412f21002ea844122a0d5e2f0";
sha256 = "037rhd2alwfip9qk78cy8fwwnc2kdyzccsyc7v2zpmvl4vvpvnhg";
src = fetchFromGitHub {
owner = "bradfa";
repo = "flashbench";
rev = "d783b1bd2443812c6deadc31b081f043e43e4c1a";
sha256 = "045j1kpay6x2ikz8x54ph862ymfy1nzpbmmqpf3nkapiv32fjqw5";
};
installPhase = ''
runHook preInstall
install -d -m755 $out/bin $out/share/doc/flashbench
install -v -m755 flashbench $out/bin
install -v -m755 erase $out/bin/flashbench-erase
install -v -m644 README $out/share/doc/flashbench
runHook postInstall
'';
meta = with lib; {
description = "Testing tool for flash based memory devices";
homepage = "https://github.com/bradfa/flashbench";
platforms = platforms.linux;
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = [ maintainers.rycee ];
};
}

View file

@ -91,5 +91,5 @@ in rec {
locale = "en_UK";
};
wordnet = callPackage ./dictd-wordnet.nix {};
wiktionary = callPackage ./dictd-wiktionary.nix {};
wiktionary = callPackage ./wiktionary {};
}

View file

@ -1,31 +0,0 @@
{lib, stdenv, fetchurl, python, dict, glibcLocales, writeScript}:
stdenv.mkDerivation rec {
version = "20161001";
pname = "dict-db-wiktionary";
data = fetchurl {
url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m";
};
convert = ./wiktionary2dict.py;
buildInputs = [python dict glibcLocales];
builder = writeScript "wiktionary-builder.sh" ''
source $stdenv/setup
mkdir -p $out/share/dictd/
cd $out/share/dictd
python -O ${convert} ${data}
dictzip wiktionary-en.dict
echo en_US.UTF-8 > locale
'';
meta = {
description = "DICT version of English Wiktionary";
homepage = "http://en.wiktionary.org/";
maintainers = [ ];
platforms = lib.platforms.all;
};
}

View file

@ -0,0 +1,8 @@
source $stdenv/setup
mkdir -p $out/share/dictd/
cd $out/share/dictd
python -O "$convert" "$src"
dictzip wiktionary-en.dict
echo en_US.UTF-8 > locale

View file

@ -0,0 +1,25 @@
{ lib, stdenv, fetchurl, python, dict, glibcLocales }:
stdenv.mkDerivation rec {
version = "20210201";
pname = "dict-db-wiktionary";
src = fetchurl {
url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs";
};
convert = ./wiktionary2dict.py;
buildInputs = [ python dict glibcLocales ];
builder = ./builder.sh;
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "DICT version of English Wiktionary";
homepage = "http://en.wiktionary.org/";
maintainers = with maintainers; [ qyliss ];
platforms = platforms.all;
license = with licenses; [ cc-by-sa-30 fdl11Plus ];
};
}

View file

@ -0,0 +1,42 @@
import subprocess
from html.parser import HTMLParser
from os.path import abspath, dirname
from urllib.request import urlopen
class WiktionaryLatestVersionParser(HTMLParser):
def __init__(self, current_version, *args, **kwargs):
self.latest_version = current_version
super().__init__(*args, **kwargs)
def handle_starttag(self, tag, attrs):
if tag != 'a':
return
href = dict(attrs)['href'][0:-1]
if href == 'latest':
return
self.latest_version = max(self.latest_version, href)
def nix_prefetch_url(url, algo='sha256'):
"""Prefetches the content of the given URL."""
print(f'nix-prefetch-url {url}')
out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
return out.decode('utf-8').rstrip()
current_version = subprocess.check_output([
'nix', 'eval', '--raw',
'-f', dirname(abspath(__file__)) + '/../../../..',
'dictdDBs.wiktionary.version',
]).decode('utf-8')
parser = WiktionaryLatestVersionParser(current_version)
with urlopen('https://dumps.wikimedia.org/enwiktionary/') as resp:
parser.feed(resp.read().decode('utf-8'))
print(parser.latest_version)

View file

@ -0,0 +1,7 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p common-updater-scripts python3
set -ueo pipefail
version="$(python "$(dirname "${BASH_SOURCE[0]}")"/latest_version.py)"
update-source-version dictdDBs.wiktionary "$version"

View file

@ -1,17 +1,19 @@
{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }:
rustPlatform.buildRustPackage rec {
pname = "agate";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AojemBU3BUuMqokLH9mhYf+sH5Q+zSYeoGmuI5/6vPw=";
sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ=";
};
cargoSha256 = "sha256-TFSD+G0i5EAu7D7gOtRzwFxO214CBPdh2Y6rRt39FVo=";
cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate";

View file

@ -16,7 +16,7 @@
"agent_dvr" = ps: with ps; [ agent-py ];
"air_quality" = ps: with ps; [ ];
"airly" = ps: with ps; [ airly ];
"airnow" = ps: with ps; [ ]; # missing inputs: pyairnow
"airnow" = ps: with ps; [ pyairnow ];
"airvisual" = ps: with ps; [ pyairvisual ];
"aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect
"alarm_control_panel" = ps: with ps; [ ];
@ -901,7 +901,7 @@
"verisure" = ps: with ps; [ jsonpath vsure ];
"versasense" = ps: with ps; [ ]; # missing inputs: pyversasense
"version" = ps: with ps; [ pyhaversion ];
"vesync" = ps: with ps; [ ]; # missing inputs: pyvesync
"vesync" = ps: with ps; [ pyvesync ];
"viaggiatreno" = ps: with ps; [ ];
"vicare" = ps: with ps; [ ]; # missing inputs: PyViCare
"vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client
@ -965,7 +965,7 @@
"zamg" = ps: with ps; [ ];
"zengge" = ps: with ps; [ ]; # missing inputs: zengge
"zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
"zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc
"zerproc" = ps: with ps; [ pyzerproc ];
"zestimate" = ps: with ps; [ xmltodict ];
"zha" = ps: with ps; [ bellows pyserial-asyncio pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac

View file

@ -3,16 +3,14 @@
with python3Packages; buildPythonApplication rec {
pname = "isso";
# Can not use 0.12.2 because of:
# https://github.com/posativ/isso/issues/617
version = "unstable-2020-09-14";
version = "0.12.4";
# no tests on PyPI
src = fetchFromGitHub {
owner = "posativ";
repo = pname;
rev = "f4d2705d4f1b51f444d0629355a6fcbcec8d57b5";
sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr";
rev = version;
sha256 = "16wjpz8r74fzjvzhl6by3sjc2g1riz8lh59ccgp14bns1yhsh2yi";
};
propagatedBuildInputs = [

View file

@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3";
buildFlagsArray = [ "-ldflags=-X main.GitSha=${src.rev}" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ];
doCheck = false;

View file

@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i";
buildFlagsArray = [ "-ldflags=" "-s -w -X=main.Version=${version}" ];
buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ];
meta = with lib; {
homepage = "https://github.com/muesli/duf/";

View file

@ -8,11 +8,11 @@ rustPlatform.buildRustPackage rec {
owner = "bootandy";
repo = "dust";
rev = "v${version}";
sha256 = "sha256-JwGa1icwV1yqxy90Psd9bzM7VzM7HPA6kONkI3Y745Q=";
sha256 = "1knl7kwngmq598bnlvlq9x8sqp914sv1abfm55kw9f7mja2d6pw0";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
rm -rf $out/src/test_dir3/
rm -r $out/tests/test_dir_unicode/
'';
};
@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec {
description = "du + rust = dust. Like du but more intuitive";
homepage = "https://github.com/bootandy/dust";
license = licenses.asl20;
maintainers = [ maintainers.infinisil ];
maintainers = with maintainers; [ infinisil SuperSandro2000 ];
};
}

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib
, darwin, libiconv, installShellFiles
, Security, libiconv, installShellFiles
}:
with rustPlatform;
@ -28,9 +28,7 @@ buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config perl installShellFiles ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security ]
;
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
outputs = [ "out" "man" ];

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }:
stdenv.mkDerivation rec {
version = "5.45.4";
pname = "expect";
version = "5.45.4";
src = fetchurl {
url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz";
@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A tool for automating interactive applications";
homepage = "http://expect.sourceforge.net/";
license = "Expect";
license = licenses.publicDomain;
platforms = platforms.unix;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -2,7 +2,7 @@
, fetchFromGitHub
, fetchpatch
, rustPlatform
, darwin
, Security
, libiconv
}:
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs";
};
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
doInstallCheck = true;
installCheckPhase = ''

View file

@ -14,8 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4=";
buildInputs = with stdenv;
lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ];
meta = with lib; {
description = "Git repository summary on your terminal";

View file

@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Upgrade all the things";
homepage = "https://github.com/r-darwish/topgrade";
license = licenses.gpl3;
maintainers = with maintainers; [ Br1ght0ne hugoreeves ];
license = licenses.gpl3Only;
maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ];
};
}

View file

@ -4,7 +4,6 @@
, rustPlatform
, withFzf ? true
, fzf
# checkInputs
, fish
, powershell
@ -13,12 +12,10 @@
, xonsh
, zsh
}:
let
version = "0.5.0";
in
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "zoxide";
inherit version;
version = "0.5.0";
src = fetchFromGitHub {
owner = "ajeetdsouza";
@ -55,6 +52,6 @@ rustPlatform.buildRustPackage {
description = "A fast cd command that learns your habits";
homepage = "https://github.com/ajeetdsouza/zoxide";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ysndr cole-h ];
maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ];
};
}

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config
, makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion
, libutempter ? null, withUtempter ? stdenv.isLinux }:
, withUtempter ? stdenv.isLinux, libutempter }:
stdenv.mkDerivation rec {
pname = "mosh";
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
meta = {
meta = with lib; {
homepage = "https://mosh.org/";
description = "Mobile shell (ssh replacement)";
longDescription = ''
@ -56,8 +56,8 @@ stdenv.mkDerivation rec {
Mosh is a replacement for SSH. It's more robust and responsive,
especially over Wi-Fi, cellular, and long-distance links.
'';
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [viric];
platforms = lib.platforms.unix;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ viric ];
platforms = platforms.unix;
};
}

View file

@ -1,17 +1,15 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config
, libcap, ncurses
, withGtk ? false, gtk3 ? null }:
assert withGtk -> gtk3 != null;
, withGtk ? false, gtk3 }:
stdenv.mkDerivation rec {
pname = "mtr${lib.optionalString withGtk "-gui"}";
version = "0.94";
src = fetchFromGitHub {
owner = "traviscross";
repo = "mtr";
rev = "v${version}";
owner = "traviscross";
repo = "mtr";
rev = "v${version}";
sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6";
};
@ -38,9 +36,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A network diagnostics tool";
homepage = "https://www.bitwizard.nl/mtr/";
license = licenses.gpl2;
homepage = "https://www.bitwizard.nl/mtr/";
license = licenses.gpl2;
maintainers = with maintainers; [ koral orivej raskin globin ];
platforms = platforms.unix;
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,59 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, perl, file }:
buildGoModule rec {
pname = "holo-build";
version = "1.6.1";
src = fetchFromGitHub {
owner = "holocm";
repo = pname;
rev = "v${version}";
sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0";
};
postPatch = ''
substituteInPlace Makefile \
--replace 'VERSION :=' 'VERSION ?='
substituteInPlace src/holo-build.sh \
--replace '/usr/lib/holo/holo-build' '${placeholder "out"}/lib/holo/holo-build'
'';
vendorSha256 = null;
nativeBuildInputs = [ installShellFiles perl ];
subPackages = [ "src/holo-build" ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ];
postBuild = ''
make build/man/holo-build.8 VERSION=${version}
'';
checkInputs = [ file ];
checkPhase = ''
ln -s ../../go/bin/holo-build build/holo-build
go build -ldflags "-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" -o build/dump-package ./src/dump-package
bash test/compiler/run_tests.sh
bash test/interface/run_tests.sh
'';
postInstall = ''
installManPage build/man/*
installShellCompletion --bash --name holo-build util/autocomplete.bash
installShellCompletion --zsh --name _holo-build util/autocomplete.zsh
# install wrapper script
mkdir -p $out/lib/holo
mv $out/bin/holo-build $out/lib/holo/holo-build
cp src/holo-build.sh $out/bin/holo-build
'';
meta = with lib; {
description = "Cross-distribution system package compiler";
homepage = "http://holocm.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "facter";
version = "3.14.15";
version = "3.14.16";
src = fetchFromGitHub {
sha256 = "sha256-vRtDctiulR5YmcwNCZtSU/tsRjs1+DP07NFVSL1TSuI=";
sha256 = "sha256-VZIeyLJBlh5/r0EHinSiPiQyCNUBFBYjDZ6nTVnZBbE=";
rev = version;
repo = pname;
owner = "puppetlabs";

View file

@ -1,26 +1,36 @@
{ lib, stdenv, fetchurl, perl /*, xmlto */}:
{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }:
stdenv.mkDerivation rec {
name = "colordiff-1.0.19";
pname = "colordiff";
version = "1.0.19";
src = fetchurl {
urls = [
"https://www.colordiff.org/${name}.tar.gz"
"http://www.colordiff.org/archive/${name}.tar.gz"
];
sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26";
src = fetchFromGitHub {
owner = "daveewart";
repo = "colordiff";
rev = "v${version}";
sha256 = "1v7s1yn0qvn08iwm5js8mxn442392qyr7s9ij506byfd497ag7qk";
};
buildInputs = [ perl /* xmlto */ ];
nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ];
dontBuild = 1; # do not build doc yet.
buildInputs = [ perl ];
installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install'';
postPatch = ''
substituteInPlace Makefile \
--replace 'TMPDIR=colordiff-''${VERSION}' ""
'';
installFlags = [
"INSTALL_DIR=/bin"
"MAN_DIR=/share/man/man1"
"DESTDIR=${placeholder "out"}"
];
meta = with lib; {
description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting";
homepage = "https://www.colordiff.org/";
license = licenses.gpl3;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -1,14 +1,11 @@
{ lib, stdenv, fetchurl, boost }:
let
name = "source-highlight";
stdenv.mkDerivation rec {
pname = "source-highlight";
version = "3.1.9";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
url = "mirror://gnu/src-highlite/${pname}-${version}.tar.gz";
sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs";
};
@ -26,15 +23,15 @@ stdenv.mkDerivation {
enableParallelBuilding = false;
meta = {
meta = with lib; {
description = "Source code renderer with syntax highlighting";
longDescription = ''
GNU Source-highlight, given a source file, produces a document
with syntax highlighting.
'';
homepage = "https://www.gnu.org/software/src-highlite/";
license = lib.licenses.gpl3Plus;
platforms = with lib.platforms; linux ++ darwin;
longDescription =
''
GNU Source-highlight, given a source file, produces a document
with syntax highlighting.
'';
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, texinfo, which }:
stdenv.mkDerivation rec {
name = "wdiff-1.2.2";
pname = "wdiff";
version = "1.2.2";
src = fetchurl {
url = "mirror://gnu/wdiff/${name}.tar.gz";
url = "mirror://gnu/wdiff/${pname}-${version}.tar.gz";
sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl";
};
@ -12,11 +13,11 @@ stdenv.mkDerivation rec {
checkInputs = [ which ];
meta = {
meta = with lib; {
homepage = "https://www.gnu.org/software/wdiff/";
description = "Comparing files on a word by word basis";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.unix;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ eelco SuperSandro2000 ];
platforms = platforms.unix;
};
}

View file

@ -115,6 +115,7 @@ mapAliases ({
cpp-gsl = microsoft_gsl; # added 2019-05-24
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15
cv = progress; # added 2015-09-06
d1x_rebirth = dxx-rebirth; # added 2018-04-25
@ -846,7 +847,7 @@ mapAliases ({
todolist = throw "todolist is now ultralist."; # added 2020-12-27
/* Cleanup before 21.03 */
/* Cleanup before 21.05 */
riot-desktop = throw "riot-desktop is now element-desktop!";
riot-web = throw "riot-web is now element-web";

View file

@ -297,6 +297,8 @@ in
docker-sync = callPackage ../tools/misc/docker-sync { };
dockle = callPackage ../development/tools/dockle { };
docui = callPackage ../tools/misc/docui { };
dotfiles = callPackage ../applications/misc/dotfiles { };
@ -705,7 +707,9 @@ in
afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { };
agate = callPackage ../servers/gemini/agate { };
agate = callPackage ../servers/gemini/agate {
inherit (darwin.apple_sdk.frameworks) Security;
};
agda-pkg = callPackage ../development/tools/agda-pkg { };
@ -1333,7 +1337,9 @@ in
gremlin-console = callPackage ../applications/misc/gremlin-console { };
grex = callPackage ../tools/misc/grex { };
grex = callPackage ../tools/misc/grex {
inherit (darwin.apple_sdk.frameworks) Security;
};
gcsfuse = callPackage ../tools/filesystems/gcsfuse { };
@ -3992,7 +3998,9 @@ in
eva = callPackage ../tools/misc/eva { };
exa = callPackage ../tools/misc/exa { };
exa = callPackage ../tools/misc/exa {
inherit (darwin.apple_sdk.frameworks) Security;
};
exempi = callPackage ../development/libraries/exempi {
stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv;
@ -8379,7 +8387,9 @@ in
toilet = callPackage ../tools/misc/toilet { };
tokei = callPackage ../development/tools/misc/tokei { };
tokei = callPackage ../development/tools/misc/tokei {
inherit (darwin.apple_sdk.frameworks) Security;
};
toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { };
@ -8429,6 +8439,8 @@ in
trezor_agent = with python3Packages; toPythonApplication trezor_agent;
trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
tthsum = callPackage ../applications/misc/tthsum { };
chaps = callPackage ../tools/security/chaps { };
@ -10057,7 +10069,7 @@ in
# Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this:
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103;
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104;
inherit (haskellPackages) ghc;
@ -10191,6 +10203,8 @@ in
inherit (emacs.pkgs.melpaStablePackages) irony;
};
holo-build = callPackage ../tools/package-management/holo-build { };
hugs = callPackage ../development/interpreters/hugs { };
openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
@ -12657,7 +12671,7 @@ in
pyrseas = callPackage ../development/tools/database/pyrseas { };
qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { };
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };
qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ;
@ -28579,8 +28593,6 @@ in
cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { };
cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { };
# this driver ships with pre-compiled 32-bit binary libraries
cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
@ -29386,6 +29398,8 @@ in
ssh-audit = callPackage ../tools/security/ssh-audit { };
ssh-tools = callPackage ../applications/misc/ssh-tools { };
auto-cpufreq = callPackage ../tools/system/auto-cpufreq { };
thermald = callPackage ../tools/system/thermald { };

View file

@ -114,6 +114,16 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_9;
llvmPackages = pkgs.llvmPackages_9;
};
ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix {
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal
else
packages.ghc865Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_9;
llvmPackages = pkgs.llvmPackages_9;
};
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
bootPkgs = packages.ghc8102Binary;
inherit (buildPackages.python3Packages) sphinx;
@ -221,6 +231,11 @@ in {
ghc = bh.compiler.ghc8103;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
};
ghc8104 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8104;
ghc = bh.compiler.ghc8104;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
};
ghc901 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc901;
ghc = bh.compiler.ghc901;

View file

@ -5204,6 +5204,8 @@ in {
pyahocorasick = callPackage ../development/python-modules/pyahocorasick { };
pyairnow = callPackage ../development/python-modules/pyairnow { };
pyairvisual = callPackage ../development/python-modules/pyairvisual { };
pyalgotrade = callPackage ../development/python-modules/pyalgotrade { };
@ -6539,6 +6541,8 @@ in {
pyvera = callPackage ../development/python-modules/pyvera { };
pyvesync = callPackage ../development/python-modules/pyvesync { };
pyvex = callPackage ../development/python-modules/pyvex { };
pyviz-comms = callPackage ../development/python-modules/pyviz-comms { };
@ -6603,6 +6607,8 @@ in {
pyyaml = callPackage ../development/python-modules/pyyaml { };
pyzerproc = callPackage ../development/python-modules/pyzerproc { };
pyzmq = callPackage ../development/python-modules/pyzmq { };
pyzufall = callPackage ../development/python-modules/pyzufall { };
@ -8488,7 +8494,9 @@ in {
yowsup = callPackage ../development/python-modules/yowsup { };
yq = callPackage ../development/python-modules/yq { };
yq = callPackage ../development/python-modules/yq {
inherit (pkgs) jq;
};
yt = callPackage ../development/python-modules/yt { };