forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
41895efeb5
|
|
@ -7238,6 +7238,12 @@
|
|||
githubId = 623509;
|
||||
name = "Martijn Vermaat";
|
||||
};
|
||||
martinetd = {
|
||||
email = "f.ktfhrvnznqxacf@noclue.notk.org";
|
||||
github = "martinetd";
|
||||
githubId = 1729331;
|
||||
name = "Dominique Martinet";
|
||||
};
|
||||
martingms = {
|
||||
email = "martin@mg.am";
|
||||
github = "martingms";
|
||||
|
|
|
|||
|
|
@ -66,6 +66,15 @@
|
|||
<literal>enableParallelBuilding=false</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.claws-mail-gtk2</literal>, representing Claws
|
||||
Mail’s older release version three, was removed in order to
|
||||
get rid of Python 2. Please switch to
|
||||
<literal>claws-mail</literal>, which is Claws Mail’s latest
|
||||
release based on GTK+3 and Python 3.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
|
|
|||
|
|
@ -29,4 +29,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.
|
||||
|
||||
- `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.
|
||||
Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3.
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ config, lib, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
options.programs.bcc.enable = lib.mkEnableOption "bcc";
|
||||
|
||||
config = lib.mkIf config.programs.bcc.enable {
|
||||
environment.systemPackages = [ config.boot.kernelPackages.bcc ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.bcc ];
|
||||
environment.systemPackages = [ pkgs.bcc ];
|
||||
boot.extraModulePackages = [ pkgs.bcc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ in
|
|||
boot-stage1 = handleTest ./boot-stage1.nix {};
|
||||
borgbackup = handleTest ./borgbackup.nix {};
|
||||
botamusique = handleTest ./botamusique.nix {};
|
||||
bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};
|
||||
btrbk = handleTest ./btrbk.nix {};
|
||||
buildbot = handleTest ./buildbot.nix {};
|
||||
buildkite-agents = handleTest ./buildkite-agents.nix {};
|
||||
|
|
|
|||
25
nixos/tests/bpf.nix
Normal file
25
nixos/tests/bpf.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "bpf";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ martinetd ];
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
programs.bcc.enable = true;
|
||||
environment.systemPackages = with pkgs; [ bpftrace ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
## bcc
|
||||
# syscount -d 1 stops 1s after probe started so is good for that
|
||||
print(machine.succeed("syscount -d 1"))
|
||||
|
||||
## bpftrace
|
||||
# list probes
|
||||
machine.succeed("bpftrace -l")
|
||||
# simple BEGIN probe (user probe on bpftrace itself)
|
||||
print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'"))
|
||||
# tracepoint
|
||||
print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'"))
|
||||
# kprobe
|
||||
print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'"))
|
||||
'';
|
||||
})
|
||||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T4LZcdQHqykcv1HnTHMt5LE/1gwKPjN3f0ZmqSCID/A=";
|
||||
sha256 = "sha256-5mZbx9L7YDG2VwrF/iFhYCw8R/0FOnZz9cRkA5Wl9MA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vIm5PkRyh41jtvDrLDxFVzSkhFipYYYEEY0/qxbOXGE=";
|
||||
sha256 = "sha256-t4Im3/2qcKnDDcKWmUUa/lsZszDDlos+uTERKxd7x1c=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whatsapp-for-linux";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eneshecan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VdkCjzmZqP/ZVY1H9FxBGe5rN0nZEPZbMp3MVKL6WLc=";
|
||||
sha256 = "sha256-TX6fMuhe6VHbhWJSsPM0iOV4CuCfULD5McJyHuTW4lI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex
|
||||
, curl, gtk2, gtk3, pkg-config, python2, python3, shared-mime-info
|
||||
, curl, gtk3, pkg-config, python3, shared-mime-info
|
||||
, glib-networking, gsettings-desktop-schemas
|
||||
|
||||
# Selector between the GTK+ 3 and GTK+ 2 releases.
|
||||
, useGtk3
|
||||
|
||||
# Package compatibility: old parameters whose name were not directly derived
|
||||
, enablePgp ? true
|
||||
, enablePluginNotificationDialogs ? true
|
||||
|
|
@ -34,14 +31,14 @@
|
|||
, enablePluginBsfilter ? true
|
||||
, enablePluginClamd ? true
|
||||
, enablePluginDillo ? true
|
||||
, enablePluginFancy ? useGtk3, libsoup, webkitgtk
|
||||
, enablePluginFancy ? true, libsoup, webkitgtk
|
||||
, enablePluginFetchInfo ? true
|
||||
, enablePluginLibravatar ? enablePluginRavatar
|
||||
, enablePluginLitehtmlViewer ? true, gumbo
|
||||
, enablePluginMailmbox ? true
|
||||
, enablePluginManageSieve ? true
|
||||
, enablePluginNewMail ? true
|
||||
, enablePluginNotification ? (enablePluginNotificationDialogs || enablePluginNotificationSounds), libcanberra-gtk2, libcanberra-gtk3, libnotify
|
||||
, enablePluginNotification ? (enablePluginNotificationDialogs || enablePluginNotificationSounds), libcanberra-gtk3, libnotify
|
||||
, enablePluginPdfViewer ? enablePluginPdf, poppler
|
||||
, enablePluginPerl ? true, perl
|
||||
, enablePluginPython ? true
|
||||
|
|
@ -57,23 +54,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
# Last release and hash for both the GTK+ 3 and GTK+ 2 version.
|
||||
version = if useGtk3 then "4.0.0" else "3.18.0";
|
||||
|
||||
gtk2src = {
|
||||
sha256 = "1vsiy3xsppw4d8ylsz70wsyrvmgy88lp2hj7vrc353ckny80r9lh";
|
||||
};
|
||||
|
||||
gtk3src = {
|
||||
sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn";
|
||||
};
|
||||
|
||||
python = if useGtk3 then python3 else python2;
|
||||
pythonPkgs = if useGtk3
|
||||
then
|
||||
with python.pkgs; [ python wrapPython pygobject3 ]
|
||||
else
|
||||
with python.pkgs; [ python wrapPython pygtk pygobject2 ];
|
||||
pythonPkgs = with python3.pkgs; [ python3 wrapPython pygobject3 ];
|
||||
|
||||
features = [
|
||||
{ flags = [ "acpi_notifier-plugin" ]; enabled = enablePluginAcpiNotifier; }
|
||||
|
|
@ -99,7 +80,7 @@ let
|
|||
{ flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; }
|
||||
{ flags = [ "networkmanager" ]; enabled = enableNetworkManager; deps = [ networkmanager ]; }
|
||||
{ flags = [ "newmail-plugin" ]; enabled = enablePluginNewMail; }
|
||||
{ flags = [ "notification-plugin" ]; enabled = enablePluginNotification; deps = [ libnotify ] ++ [(if useGtk3 then libcanberra-gtk3 else libcanberra-gtk2)]; }
|
||||
{ flags = [ "notification-plugin" ]; enabled = enablePluginNotification; deps = [ libnotify ] ++ [libcanberra-gtk3]; }
|
||||
{ flags = [ "pdf_viewer-plugin" ]; enabled = enablePluginPdfViewer; deps = [ poppler ]; }
|
||||
{ flags = [ "perl-plugin" ]; enabled = enablePluginPerl; deps = [ perl ]; }
|
||||
{ flags = [ "pgpcore-plugin" "pgpinline-plugin" "pgpmime-plugin" ]; enabled = enablePluginPgp; deps = [ gnupg gpgme ]; }
|
||||
|
|
@ -115,12 +96,13 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "claws-mail";
|
||||
inherit version;
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchgit ({
|
||||
src = fetchgit {
|
||||
rev = version;
|
||||
url = "git://git.claws-mail.org/claws.git";
|
||||
} // (if useGtk3 then gtk3src else gtk2src));
|
||||
sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -140,7 +122,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
preConfigure = ''
|
||||
# autotools check tries to dlopen libpython as a requirement for the python plugin
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python3}/lib
|
||||
# generate version without .git
|
||||
[ -e version ] || echo "echo ${version}" > version
|
||||
'';
|
||||
|
|
@ -154,8 +136,7 @@ in stdenv.mkDerivation rec {
|
|||
propagatedBuildInputs = pythonPkgs;
|
||||
|
||||
buildInputs =
|
||||
[ curl gsettings-desktop-schemas glib-networking ]
|
||||
++ [(if useGtk3 then gtk3 else gtk2)]
|
||||
[ curl gsettings-desktop-schemas glib-networking gtk3 ]
|
||||
++ concatMap (f: optionals f.enabled f.deps) (filter (f: f ? deps) features)
|
||||
;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
"hledger-check-fancyassertions"
|
||||
{
|
||||
libraries = with haskellPackages; [
|
||||
base base-compat base-compat-batteries filepath hledger-lib_1_23
|
||||
base base-compat base-compat-batteries filepath hledger-lib_1_24
|
||||
megaparsec microlens optparse-applicative string-qq text time
|
||||
transformers
|
||||
];
|
||||
|
|
|
|||
|
|
@ -198,10 +198,10 @@ in stdenv.mkDerivation {
|
|||
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
# Need these tools on the build system when cross compiling,
|
||||
# hacky, but have found no other way.
|
||||
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
|
||||
CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
|
||||
cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
|
||||
|
||||
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
|
||||
CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
|
||||
cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ buildEnv {
|
|||
paths = [ kodi ] ++ addons;
|
||||
pathsToLink = [ "/share" ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
mkdir $out/bin
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l+Uq7aiXFrI+qbKSOZpYFIXz0VJBBR7ZZxlAJeGb7K4=";
|
||||
sha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, python2
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conway_polynomials";
|
||||
version = "0.5";
|
||||
|
||||
pythonEnv = python2.withPackages (ps: with ps; [ six ]);
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2";
|
||||
sha256 = "05zb1ly9x2bbscqv0jgc45g48xx77mfs7qdbqhn4ihmihn57iwnq";
|
||||
|
|
@ -16,8 +14,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Script that creates the "database" (nested python array) and pickles it
|
||||
spkg-install = fetchurl {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
sha256 = "0m12nfb37j3bn4bp06ddgnyp2d6z0hg5f83pbbjszxw7vxs33a82";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=9.2";
|
||||
sha256 = "1bwnqasnyv793hxg29viing4dnliz29grkhldsirq19d509yk1fs";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
export SAGE_SHARE="$out/share"
|
||||
export PYTHONPATH=$PWD
|
||||
|
||||
${pythonEnv.interpreter} ${spkg-install}
|
||||
${python3.interpreter} ${spkg-install}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, python2
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
export SAGE_SHARE="$out/share"
|
||||
export PYTHONPATH=$PWD
|
||||
|
||||
${python2.interpreter} ${spkg-install}
|
||||
${python3.interpreter} ${spkg-install}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "5ac4efab1c8e40b19b0bc4ba833477a4abc75358",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5ac4efab1c8e40b19b0bc4ba833477a4abc75358.tar.gz",
|
||||
"sha256": "0xnrdwmc646ghwzp61jp376s9fkpcd74slxc39law7akfp77v4ls",
|
||||
"msg": "Update from Hackage at 2021-11-18T20:32:52Z"
|
||||
"commit": "d859530d8342c52d09a73d1d125c144725b5945d",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d859530d8342c52d09a73d1d125c144725b5945d.tar.gz",
|
||||
"sha256": "0gjahsqqq99dc4bjcx9p3z8adpwy51w3mzrf57nib856jlvlfmv5",
|
||||
"msg": "Update from Hackage at 2021-12-02T21:05:02Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-maps";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-XtyUpXlHDO1HztKSxUq6Z8vnBIGOF0BsCQwB1Dlb4a0=";
|
||||
sha256 = "sha256-gYIbTK/GQc1QDXOzMMY85aBahPBDBxbWPoizyuqs/Qw=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-6gxxSExlzizBE3b5sB5iEfpKf/0zT0MH/FLJPw/d1Mc=";
|
||||
sha256 = "sha256-gnH8azPsJBileDBN0+V9Zl8NfMcGqZqXvkGYSGGP4kg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "41.0";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "R/ZHW2bIQ+fVPZC6Dns5SHYt8VFjSkNvaMK5u6BQVgo=";
|
||||
sha256 = "GTr79qMILaCjKncU8ejVKo20Vycpde0vNlQ2SjM5Gz8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp-xsl";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-yM1kwJO72MXV5H/TiGTpCDG1+c90A1MIcCBvqWY2pKU=";
|
||||
sha256 = "sha256-DW2zesLvgSSD4BBHA/H6nPAy6eCVal8cOvvMI3kfilQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aisleriot";
|
||||
version = "3.22.19";
|
||||
version = "3.22.20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-YY0/HkafcbbW0xuE9RmjYMHN50lM0o0zugOyTefT0bE=";
|
||||
sha256 = "sha256-5xFwlhT9qjtvNDQ8kfGd2BeK2KcJDzpfsEC8z4Ei3ns=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ self: super: {
|
|||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "06njg44840na3ps3s29kjhjba0962vdr2zpd12yvqf16rwgf4zmq";
|
||||
sha256 = "1x2d0gfqxxfygzigm34n0spaxh8bwipxs9317f6c5lkpj916p957";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
|
|
@ -852,8 +852,8 @@ self: super: {
|
|||
})
|
||||
super.hledger-lib;
|
||||
|
||||
# hledger-lib 1.23 depends on doctest >= 0.18
|
||||
hledger-lib_1_23 = super.hledger-lib_1_23.override {
|
||||
# hledger-lib 1.24 depends on doctest >= 0.18
|
||||
hledger-lib_1_24 = super.hledger-lib_1_24.override {
|
||||
doctest = self.doctest_0_18_2;
|
||||
};
|
||||
|
||||
|
|
@ -946,6 +946,12 @@ self: super: {
|
|||
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json);
|
||||
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
|
||||
dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml;
|
||||
# Too strict lower bound on base64-bytestring
|
||||
# https://github.com/dhall-lang/dhall-haskell/issues/2346
|
||||
dhall-nixpkgs = overrideCabal (drv: {
|
||||
revision = assert !(drv ? revision); "1";
|
||||
editedCabalFile = "0ld4z4d3gw9mxyhm5g2hgw4w68izjnwrcqd6j7yhwhrblhdmqrr4";
|
||||
}) (generateOptparseApplicativeCompletion "dhall-to-nixpkgs" super.dhall-nixpkgs);
|
||||
|
||||
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
|
||||
netrc = doJailbreak super.netrc;
|
||||
|
|
@ -1348,21 +1354,21 @@ self: super: {
|
|||
resource-pool = self.hasura-resource-pool;
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
ekg-json = self.hasura-ekg-json;
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_1;
|
||||
hspec = dontCheck self.hspec_2_9_2;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_2;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_2;
|
||||
tasty-hspec = self.tasty-hspec_1_2;
|
||||
}));
|
||||
hasura-ekg-core = doJailbreak (super.hasura-ekg-core.overrideScope (self: super: {
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_1;
|
||||
hspec = dontCheck self.hspec_2_9_2;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_2;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_2;
|
||||
}));
|
||||
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_1;
|
||||
hspec = dontCheck self.hspec_2_9_2;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_2;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_2;
|
||||
});
|
||||
pg-client = overrideCabal (drv: {
|
||||
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
|
||||
|
|
@ -1842,7 +1848,7 @@ self: super: {
|
|||
# https://github.com/enomsg/science-constants-dimensional/pull/1
|
||||
science-constants-dimensional = doJailbreak super.science-constants-dimensional;
|
||||
|
||||
# Tests are flaky on busy machines
|
||||
# Tests are flaky on busy machines, upstream doesn't intend to fix
|
||||
# https://github.com/merijn/paramtree/issues/4
|
||||
paramtree = dontCheck super.paramtree;
|
||||
|
||||
|
|
@ -1973,10 +1979,6 @@ EOT
|
|||
composite-aeson = assert super.composite-aeson.version == "0.7.5.0";
|
||||
doJailbreak super.composite-aeson;
|
||||
|
||||
# Too strict bounds on profunctors
|
||||
# https://github.com/google/proto-lens/issues/413
|
||||
proto-lens = doJailbreak super.proto-lens;
|
||||
|
||||
# 2021-06-20: Outdated upper bounds
|
||||
# https://github.com/Porges/email-validate-hs/issues/58
|
||||
email-validate = doJailbreak super.email-validate;
|
||||
|
|
@ -2006,7 +2008,7 @@ EOT
|
|||
ghcup = doJailbreak (super.ghcup.overrideScope (self: super: {
|
||||
hspec-golden-aeson = self.hspec-golden-aeson_0_9_0_0;
|
||||
optics = self.optics_0_4;
|
||||
streamly = self.streamly_0_8_0;
|
||||
streamly = self.streamly_0_8_1;
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
libyaml-streamly = markUnbroken super.libyaml-streamly;
|
||||
}));
|
||||
|
|
@ -2097,24 +2099,31 @@ EOT
|
|||
|
||||
# Jailbreak isn't sufficient, but this is ok as it's a leaf package.
|
||||
hadolint = super.hadolint.overrideScope (self: super: {
|
||||
language-docker = self.language-docker_10_3_0;
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck self.hspec-discover_2_9_1;
|
||||
language-docker = self.language-docker_10_4_0;
|
||||
hspec = dontCheck self.hspec_2_9_2;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_2;
|
||||
hspec-discover = dontCheck self.hspec-discover_2_9_2;
|
||||
colourista = doJailbreak super.colourista;
|
||||
});
|
||||
|
||||
# These should be updated in lockstep
|
||||
hledger_1_23 = super.hledger_1_23.override {
|
||||
hledger-lib = self.hledger-lib_1_23;
|
||||
hledger_1_24 = super.hledger_1_24.override {
|
||||
hledger-lib = self.hledger-lib_1_24;
|
||||
};
|
||||
|
||||
# Needs brick > 0.64
|
||||
nix-tree = super.nix-tree.override {
|
||||
brick = self.brick_0_64_2;
|
||||
brick = self.brick_0_65;
|
||||
};
|
||||
|
||||
# build newer version for `pkgs.shellcheck`
|
||||
ShellCheck_0_8_0 = doDistribute super.ShellCheck_0_8_0;
|
||||
|
||||
# test suite requires stack to run, https://github.com/dino-/photoname/issues/24
|
||||
photoname = dontCheck super.photoname;
|
||||
|
||||
# Too strict bounds on recursive-zipper
|
||||
# https://github.com/ChrisPenner/jet/issues/1
|
||||
jet = doJailbreak super.jet;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -250,11 +250,11 @@ self: super: ({
|
|||
c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc;
|
||||
|
||||
# streamly depends on Cocoa starting with 0.8.0
|
||||
streamly_0_8_0 = overrideCabal (drv: {
|
||||
streamly_0_8_1 = overrideCabal (drv: {
|
||||
libraryFrameworkDepends = [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
] ++ (drv.libraryFrameworkDepends or []);
|
||||
}) super.streamly_0_8_0;
|
||||
}) super.streamly_0_8_1;
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin
|
||||
|
||||
|
|
|
|||
|
|
@ -78,10 +78,10 @@ self: super: {
|
|||
# 2021-11-08: Fixed in autoapply-0.4.2
|
||||
autoapply = doJailbreak self.autoapply_0_4_1_1;
|
||||
|
||||
# Doesn't allow Dhall 1.39.*
|
||||
weeder_2_3_0 = super.weeder_2_3_0.override {
|
||||
dhall = self.dhall_1_40_1;
|
||||
};
|
||||
# Doesn't allow Dhall 1.39.*; forbids lens 5.1
|
||||
weeder_2_3_0 = doJailbreak (super.weeder_2_3_0.override {
|
||||
dhall = self.dhall_1_40_2;
|
||||
});
|
||||
|
||||
# Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130
|
||||
generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0;
|
||||
|
|
@ -129,27 +129,6 @@ self: super: {
|
|||
# 2021-09-18: Need semialign >= 1.2 for correct bounds
|
||||
semialign = super.semialign_1_2_0_1;
|
||||
|
||||
# Will probably be needed for brittany support
|
||||
# https://github.com/lspitzner/czipwith/pull/2
|
||||
#czipwith = appendPatch
|
||||
# (pkgs.fetchpatch {
|
||||
# url = "https://github.com/lspitzner/czipwith/commit/b6245884ae83e00dd2b5261762549b37390179f8.patch";
|
||||
# sha256 = "08rpppdldsdwzb09fmn0j55l23pwyls2dyzziw3yjc1cm0j5vic5";
|
||||
# }) super.czipwith;
|
||||
|
||||
# 2021-09-18: https://github.com/mokus0/th-extras/pull/8
|
||||
# Release is missing, but asked for in the above PR.
|
||||
th-extras = overrideCabal (old: {
|
||||
version = assert old.version == "0.0.0.4"; "unstable-2021-09-18";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "mokus0";
|
||||
repo = "th-extras";
|
||||
rev = "0d050b24ec5ef37c825b6f28ebd46787191e2a2d";
|
||||
sha256 = "045f36yagrigrggvyb96zqmw8y42qjsllhhx2h20q25sk5h44xsd";
|
||||
};
|
||||
libraryHaskellDepends = old.libraryHaskellDepends ++ [self.th-abstraction];
|
||||
}) super.th-extras;
|
||||
|
||||
# 2021-09-18: GHC 9 compat release is missing
|
||||
# Issue: https://github.com/obsidiansystems/dependent-sum/issues/65
|
||||
dependent-sum-template = dontCheck (appendPatch
|
||||
|
|
@ -173,6 +152,14 @@ self: super: {
|
|||
# Restrictive upper bound on ormolu
|
||||
hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin;
|
||||
|
||||
# Too strict bounds on base
|
||||
# https://github.com/lspitzner/multistate/issues/9
|
||||
multistate = doJailbreak super.multistate;
|
||||
# https://github.com/lspitzner/butcher/issues/7
|
||||
butcher = doJailbreak super.butcher;
|
||||
# Fixes a bug triggered on GHC 9.0.1
|
||||
text-short = self.text-short_0_1_4;
|
||||
|
||||
# 2021-09-18: The following plugins don‘t work yet on ghc9.
|
||||
haskell-language-server = appendConfigureFlags [
|
||||
"-f-tactic"
|
||||
|
|
@ -191,6 +178,6 @@ self: super: {
|
|||
|
||||
hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release
|
||||
hls-stylish-haskell-plugin = null; # No upstream support
|
||||
hls-brittany-plugin = null; # No upstream support, needs new brittany release
|
||||
hls-brittany-plugin = null; # Dependencies don't build with 9.0.1
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,12 +97,15 @@ self: super: {
|
|||
data-fix = doJailbreak super.data-fix;
|
||||
dec = doJailbreak super.dec;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
genvalidity = self.genvalidity_1_0_0_1;
|
||||
genvalidity-property = self.genvalidity-property_1_0_0_0;
|
||||
genvalidity-hspec = self.genvalidity-hspec_1_0_0_0;
|
||||
ghc-byteorder = doJailbreak super.ghc-byteorder;
|
||||
ghc-lib = self.ghc-lib_9_2_1_20211101;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_0_0;
|
||||
hashable = super.hashable_1_4_0_1;
|
||||
hashable-time = doJailbreak super.hashable-time_0_3;
|
||||
hedgehog = doJailbreak super.hedgehog;
|
||||
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
|
||||
|
|
@ -112,11 +115,13 @@ self: super: {
|
|||
lifted-async = doJailbreak super.lifted-async;
|
||||
lukko = doJailbreak super.lukko;
|
||||
network = super.network_3_1_2_5;
|
||||
ormolu = self.ormolu_0_4_0_0;
|
||||
OneTuple = super.OneTuple_0_3_1;
|
||||
parallel = doJailbreak super.parallel;
|
||||
path = doJailbreak super.path_0_9_1;
|
||||
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
|
||||
primitive = doJailbreak super.primitive;
|
||||
quickcheck-instances = super.quickcheck-instances_0_3_26_1;
|
||||
quickcheck-instances = super.quickcheck-instances_0_3_27;
|
||||
regex-posix = doJailbreak super.regex-posix;
|
||||
resolv = doJailbreak super.resolv;
|
||||
semialign = super.semialign_1_2_0_1;
|
||||
|
|
@ -147,6 +152,19 @@ self: super: {
|
|||
] ++ drv.testFlags or [];
|
||||
}) (doJailbreak super.hpack);
|
||||
|
||||
validity = pkgs.lib.pipe super.validity_0_12_0_0 [
|
||||
# head.hackage patch
|
||||
(appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/validity-0.11.0.1.patch";
|
||||
sha256 = "0qs6g1naqvcvklk78cadnpsfqnff1yflryi2ms6im203w75f2fsc";
|
||||
}))
|
||||
# head.hackage ignores test suite
|
||||
dontCheck
|
||||
# 0.12.0.0 disabled CPP in fetched file, breaks haddock
|
||||
(appendConfigureFlag "--ghc-option=-XCPP")
|
||||
dontHaddock
|
||||
];
|
||||
|
||||
# lens >= 5.1 supports 9.2.1
|
||||
lens = super.lens_5_1;
|
||||
|
||||
|
|
@ -175,7 +193,10 @@ self: super: {
|
|||
memory = appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch";
|
||||
sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl";
|
||||
}) super.memory_0_16_0;
|
||||
}) (overrideCabal {
|
||||
editedCabalFile = null;
|
||||
revision = null;
|
||||
} super.memory_0_16_0);
|
||||
|
||||
# GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
|
||||
# https://github.com/snoyberg/mono-traversable/issues/192
|
||||
|
|
|
|||
|
|
@ -1124,6 +1124,7 @@ broken-packages:
|
|||
- docopt
|
||||
- docrecords
|
||||
- doctest-discover-configurator
|
||||
- doctest-parallel
|
||||
- doctest-prop
|
||||
- docusign-example
|
||||
- docvim
|
||||
|
|
@ -3563,6 +3564,7 @@ broken-packages:
|
|||
- pandoc-filter-indent
|
||||
- pandoc-include
|
||||
- pandoc-lens
|
||||
- pandoc-lua-marshal
|
||||
- pandoc-markdown-ghci-filter
|
||||
- pandoc-placetable
|
||||
- pandoc-pyplot
|
||||
|
|
|
|||
|
|
@ -122,6 +122,10 @@ default-package-overrides:
|
|||
- gi-webkit2webextension < 4.0.27
|
||||
- gi-wnck < 3.0.11
|
||||
# gi-cogl, gi-coglpango, gi-clutter, gi-json, gi-rsvg are only available for haskell-gi >= 0.26
|
||||
# 1.2.1.0 needs opaleye >= 0.8 which stackage doesn't provide
|
||||
- rel8 < 1.2.1.0
|
||||
# 0.14.0.0 drops support for every GHC < 9.0.1
|
||||
- brittany < 0.14
|
||||
|
||||
extra-packages:
|
||||
- base16-bytestring < 1 # required for cabal-install etc.
|
||||
|
|
@ -155,6 +159,9 @@ extra-packages:
|
|||
- ghc-lib-parser == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version
|
||||
- ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.1 compatible version
|
||||
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
|
||||
- brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65
|
||||
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.1
|
||||
- ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.1
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Stackage LTS 18.17
|
||||
# Stackage LTS 18.18
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
|
|
@ -155,7 +155,7 @@ default-package-overrides:
|
|||
- appendmap ==0.1.5
|
||||
- apply-refact ==0.9.3.0
|
||||
- apportionment ==0.0.0.3
|
||||
- approximate ==0.3.4
|
||||
- approximate ==0.3.5
|
||||
- approximate-equality ==1.1.0.2
|
||||
- app-settings ==0.2.0.12
|
||||
- arbor-lru-cache ==0.1.1.1
|
||||
|
|
@ -200,7 +200,7 @@ default-package-overrides:
|
|||
- autoexporter ==1.1.20
|
||||
- auto-update ==0.1.6
|
||||
- avro ==0.5.2.0
|
||||
- aws-cloudfront-signed-cookies ==0.2.0.8
|
||||
- aws-cloudfront-signed-cookies ==0.2.0.10
|
||||
- aws-xray-client ==0.1.0.1
|
||||
- aws-xray-client-wai ==0.1.0.1
|
||||
- backprop ==0.2.6.4
|
||||
|
|
@ -551,7 +551,7 @@ default-package-overrides:
|
|||
- data-dword ==0.3.2
|
||||
- data-endian ==0.1.1
|
||||
- data-fix ==0.3.2
|
||||
- data-forest ==0.1.0.8
|
||||
- data-forest ==0.1.0.9
|
||||
- data-has ==0.4.0.0
|
||||
- data-hash ==0.2.0.1
|
||||
- data-interval ==2.1.1
|
||||
|
|
@ -624,7 +624,7 @@ default-package-overrides:
|
|||
- doctemplates ==0.9
|
||||
- doctest ==0.17
|
||||
- doctest-discover ==0.2.0.0
|
||||
- doctest-driver-gen ==0.3.0.4
|
||||
- doctest-driver-gen ==0.3.0.5
|
||||
- doctest-exitcode-stdio ==0.0
|
||||
- doctest-extract ==0.1
|
||||
- doctest-lib ==0.1
|
||||
|
|
@ -703,7 +703,7 @@ default-package-overrides:
|
|||
- error-or-utils ==0.1.1
|
||||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.9
|
||||
- ersatz ==0.4.10
|
||||
- esqueleto ==3.5.3.0
|
||||
- essence-of-live-coding ==0.2.5
|
||||
- essence-of-live-coding-gloss ==0.2.5
|
||||
|
|
@ -796,7 +796,7 @@ default-package-overrides:
|
|||
- fold-debounce ==0.2.0.9
|
||||
- fold-debounce-conduit ==0.2.0.6
|
||||
- foldl ==1.4.12
|
||||
- folds ==0.7.6
|
||||
- folds ==0.7.7
|
||||
- follow-file ==0.0.3
|
||||
- FontyFruity ==0.5.3.5
|
||||
- foreign-store ==0.2
|
||||
|
|
@ -829,7 +829,7 @@ default-package-overrides:
|
|||
- fuzzcheck ==0.1.1
|
||||
- fuzzy ==0.1.0.1
|
||||
- fuzzy-dates ==0.1.1.2
|
||||
- fuzzyset ==0.2.1
|
||||
- fuzzyset ==0.2.2
|
||||
- fuzzy-time ==0.1.0.0
|
||||
- gauge ==0.2.5
|
||||
- gd ==3000.7.3
|
||||
|
|
@ -919,7 +919,7 @@ default-package-overrides:
|
|||
- gi-gobject ==2.0.26
|
||||
- gi-graphene ==1.0.3
|
||||
- gi-gtk ==3.0.37
|
||||
- gi-gtk-hs ==0.3.10
|
||||
- gi-gtk-hs ==0.3.11
|
||||
- gi-harfbuzz ==0.0.4
|
||||
- ginger ==0.10.1.0
|
||||
- gingersnap ==0.3.1.0
|
||||
|
|
@ -938,7 +938,7 @@ default-package-overrides:
|
|||
- Glob ==0.10.2
|
||||
- gloss ==1.13.2.1
|
||||
- gloss-rendering ==1.13.1.1
|
||||
- GLURaw ==2.0.0.4
|
||||
- GLURaw ==2.0.0.5
|
||||
- GLUT ==2.7.0.16
|
||||
- gluturtle ==0.0.58.1
|
||||
- gnuplot ==0.5.6.1
|
||||
|
|
@ -1207,7 +1207,7 @@ default-package-overrides:
|
|||
- hxt-unicode ==9.0.2.4
|
||||
- hybrid-vectors ==0.2.2
|
||||
- hyper ==0.2.1.1
|
||||
- hyperloglog ==0.4.4
|
||||
- hyperloglog ==0.4.5
|
||||
- hyphenation ==0.8.2
|
||||
- iconv ==0.4.1.3
|
||||
- identicon ==0.2.2
|
||||
|
|
@ -1238,10 +1238,10 @@ default-package-overrides:
|
|||
- inj ==1.0
|
||||
- inline-c ==0.9.1.5
|
||||
- inline-c-cpp ==0.4.0.3
|
||||
- inline-r ==0.10.4
|
||||
- inline-r ==0.10.5
|
||||
- inliterate ==0.1.0
|
||||
- input-parsers ==0.2.3.1
|
||||
- insert-ordered-containers ==0.2.5
|
||||
- insert-ordered-containers ==0.2.5.1
|
||||
- inspection-testing ==0.4.6.0
|
||||
- instance-control ==0.1.2.0
|
||||
- int-cast ==0.2.0.0
|
||||
|
|
@ -1364,8 +1364,8 @@ default-package-overrides:
|
|||
- leapseconds-announced ==2017.1.0.1
|
||||
- learn-physics ==0.6.5
|
||||
- lens ==4.19.2
|
||||
- lens-action ==0.2.5
|
||||
- lens-aeson ==1.1.2
|
||||
- lens-action ==0.2.6
|
||||
- lens-aeson ==1.1.3
|
||||
- lens-csv ==0.1.1.0
|
||||
- lens-datetime ==0.3
|
||||
- lens-family ==2.0.0
|
||||
|
|
@ -1417,10 +1417,10 @@ default-package-overrides:
|
|||
- locators ==0.3.0.3
|
||||
- loch-th ==0.2.2
|
||||
- lockfree-queue ==0.2.3.1
|
||||
- log-domain ==0.13.1
|
||||
- log-domain ==0.13.2
|
||||
- logfloat ==0.13.4
|
||||
- logging ==3.0.5
|
||||
- logging-facade ==0.3.0
|
||||
- logging-facade ==0.3.1
|
||||
- logging-facade-syslog ==1
|
||||
- logict ==0.7.1.0
|
||||
- logstash ==0.1.0.1
|
||||
|
|
@ -1639,7 +1639,7 @@ default-package-overrides:
|
|||
- nonemptymap ==0.0.6.0
|
||||
- non-empty-sequence ==0.2.0.4
|
||||
- nonempty-vector ==0.2.1.0
|
||||
- nonempty-zipper ==1.0.0.2
|
||||
- nonempty-zipper ==1.0.0.3
|
||||
- non-negative ==0.1.2
|
||||
- not-gloss ==0.7.7.0
|
||||
- no-value ==1.0.0.0
|
||||
|
|
@ -1679,7 +1679,7 @@ default-package-overrides:
|
|||
- open-browser ==0.2.1.0
|
||||
- openexr-write ==0.1.0.2
|
||||
- OpenGL ==3.0.3.0
|
||||
- OpenGLRaw ==3.3.4.0
|
||||
- OpenGLRaw ==3.3.4.1
|
||||
- openpgp-asciiarmor ==0.1.2
|
||||
- opensource ==0.1.1.0
|
||||
- openssl-streams ==1.2.3.0
|
||||
|
|
@ -1848,7 +1848,7 @@ default-package-overrides:
|
|||
- primitive-addr ==0.1.0.2
|
||||
- primitive-extras ==0.10.1
|
||||
- primitive-unaligned ==0.1.1.1
|
||||
- primitive-unlifted ==0.1.3.0
|
||||
- primitive-unlifted ==0.1.3.1
|
||||
- prim-uniq ==0.2
|
||||
- print-console-colors ==0.1.0.0
|
||||
- probability ==0.2.7
|
||||
|
|
@ -1882,7 +1882,7 @@ default-package-overrides:
|
|||
- pureMD5 ==2.1.4
|
||||
- purescript-bridge ==0.14.0.0
|
||||
- pushbullet-types ==0.4.1.0
|
||||
- pusher-http-haskell ==2.1.0.6
|
||||
- pusher-http-haskell ==2.1.0.7
|
||||
- pvar ==1.0.0.0
|
||||
- PyF ==0.9.0.3
|
||||
- qchas ==1.1.0.1
|
||||
|
|
@ -1965,7 +1965,7 @@ default-package-overrides:
|
|||
- regex ==1.1.0.0
|
||||
- regex-applicative ==0.3.4
|
||||
- regex-applicative-text ==0.1.0.1
|
||||
- regex-base ==0.94.0.1
|
||||
- regex-base ==0.94.0.2
|
||||
- regex-compat ==0.95.2.1
|
||||
- regex-compat-tdfa ==0.95.1.4
|
||||
- regex-pcre ==0.95.0.0
|
||||
|
|
@ -2241,7 +2241,7 @@ default-package-overrides:
|
|||
- storable-record ==0.0.5
|
||||
- storable-tuple ==0.0.3.3
|
||||
- storablevector ==0.2.13.1
|
||||
- store ==0.7.12
|
||||
- store ==0.7.14
|
||||
- store-core ==0.4.4.4
|
||||
- store-streaming ==0.2.0.3
|
||||
- stratosphere ==0.59.1
|
||||
|
|
@ -2392,7 +2392,7 @@ default-package-overrides:
|
|||
- these-optics ==1.0.1.2
|
||||
- these-skinny ==0.7.4
|
||||
- th-expand-syns ==0.4.8.0
|
||||
- th-extras ==0.0.0.4
|
||||
- th-extras ==0.0.0.5
|
||||
- th-lift ==0.8.2
|
||||
- th-lift-instances ==0.1.18
|
||||
- th-nowq ==0.1.0.5
|
||||
|
|
@ -2451,7 +2451,7 @@ default-package-overrides:
|
|||
- tree-diff ==0.2.1
|
||||
- tree-fun ==0.8.1.0
|
||||
- tree-view ==0.5.1
|
||||
- trifecta ==2.1.1
|
||||
- trifecta ==2.1.2
|
||||
- triplesec ==0.2.2.1
|
||||
- trivial-constraint ==0.7.0.0
|
||||
- tsv2csv ==0.1.0.2
|
||||
|
|
@ -2462,7 +2462,7 @@ default-package-overrides:
|
|||
- tuples-homogenous-h98 ==0.1.1.0
|
||||
- tuple-sop ==0.3.1.0
|
||||
- tuple-th ==0.2.5
|
||||
- turtle ==1.5.22
|
||||
- turtle ==1.5.23
|
||||
- typecheck-plugin-nat-simple ==0.1.0.2
|
||||
- TypeCompose ==0.9.14
|
||||
- typed-process ==0.2.7.0
|
||||
|
|
@ -2498,7 +2498,7 @@ default-package-overrides:
|
|||
- unexceptionalio-trans ==0.5.1
|
||||
- unicode ==0.0.1.1
|
||||
- unicode-collation ==0.1.3.1
|
||||
- unicode-show ==0.1.0.5
|
||||
- unicode-show ==0.1.1.0
|
||||
- unicode-transforms ==0.3.7.1
|
||||
- unification-fd ==0.11.1
|
||||
- union-angle ==0.1.0.1
|
||||
|
|
@ -2543,7 +2543,7 @@ default-package-overrides:
|
|||
- utility-ht ==0.0.16
|
||||
- uuid ==1.3.15
|
||||
- uuid-types ==1.0.5
|
||||
- validation ==1.1.1
|
||||
- validation ==1.1.2
|
||||
- validation-selective ==0.1.0.1
|
||||
- validity ==0.11.0.1
|
||||
- validity-aeson ==0.2.0.4
|
||||
|
|
@ -2608,7 +2608,7 @@ default-package-overrides:
|
|||
- wai-slack-middleware ==0.2.0
|
||||
- wai-websockets ==3.0.1.2
|
||||
- wakame ==0.1.0.0
|
||||
- warp ==3.3.17
|
||||
- warp ==3.3.18
|
||||
- warp-tls ==3.3.2
|
||||
- warp-tls-uid ==0.2.0.6
|
||||
- wave ==0.2.0
|
||||
|
|
@ -2686,7 +2686,7 @@ default-package-overrides:
|
|||
- yaml ==0.11.7.0
|
||||
- yamlparse-applicative ==0.2.0.1
|
||||
- yesod ==1.6.1.2
|
||||
- yesod-auth ==1.6.10.4
|
||||
- yesod-auth ==1.6.10.5
|
||||
- yesod-auth-hashdb ==1.7.1.7
|
||||
- yesod-auth-oauth2 ==0.6.3.4
|
||||
- yesod-bin ==1.6.1
|
||||
|
|
@ -2719,7 +2719,7 @@ default-package-overrides:
|
|||
- zip ==1.7.2
|
||||
- zip-archive ==0.4.1
|
||||
- zipper-extra ==0.1.3.2
|
||||
- zippers ==0.3.1
|
||||
- zippers ==0.3.2
|
||||
- zip-stream ==0.2.1.0
|
||||
- zlib ==0.6.2.3
|
||||
- zlib-bindings ==0.1.1.5
|
||||
|
|
|
|||
|
|
@ -1112,7 +1112,6 @@ dont-distribute-packages:
|
|||
- fields
|
||||
- filepath-crypto
|
||||
- filepath-io-access
|
||||
- filepather
|
||||
- filesystem-enumerator
|
||||
- find-clumpiness
|
||||
- findhttp
|
||||
|
|
@ -1153,7 +1152,6 @@ dont-distribute-packages:
|
|||
- fortran-vars
|
||||
- foscam-directory
|
||||
- foscam-sort
|
||||
- fp-ieee
|
||||
- fplll
|
||||
- fpnla-examples
|
||||
- frame-markdown
|
||||
|
|
@ -2292,7 +2290,7 @@ dont-distribute-packages:
|
|||
- pairing
|
||||
- panda
|
||||
- pandoc-japanese-filters
|
||||
- pandoc_2_16_1
|
||||
- pandoc_2_16_2
|
||||
- papa
|
||||
- papa-base
|
||||
- papa-base-implement
|
||||
|
|
@ -2346,7 +2344,6 @@ dont-distribute-packages:
|
|||
- phonetic-languages-simplified-generalized-examples-array
|
||||
- phonetic-languages-simplified-lists-examples
|
||||
- phooey
|
||||
- photoname
|
||||
- pianola
|
||||
- pier
|
||||
- ping
|
||||
|
|
@ -2641,7 +2638,6 @@ dont-distribute-packages:
|
|||
- rose-trie
|
||||
- roshask
|
||||
- rosmsg-bin
|
||||
- rounded-hw
|
||||
- roundtrip-xml
|
||||
- route-generator
|
||||
- route-planning
|
||||
|
|
|
|||
4635
pkgs/development/haskell-modules/hackage-packages.nix
generated
4635
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -309,8 +309,8 @@ def _update_package(path, target):
|
|||
with open(path, 'r') as f:
|
||||
text = f.read()
|
||||
|
||||
# Determine pname.
|
||||
pname = _get_unique_value('pname', text)
|
||||
# Determine pname. Many files have more than one pname
|
||||
pnames = _get_values('pname', text)
|
||||
|
||||
# Determine version.
|
||||
version = _get_unique_value('version', text)
|
||||
|
|
@ -320,7 +320,18 @@ def _update_package(path, target):
|
|||
|
||||
extension = _determine_extension(text, fetcher)
|
||||
|
||||
new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target)
|
||||
# Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo
|
||||
successful_fetch = False
|
||||
for pname in pnames:
|
||||
try:
|
||||
new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target)
|
||||
successful_fetch = True
|
||||
break
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
if not successful_fetch:
|
||||
raise ValueError(f"Unable to find correct package using these pnames: {pnames}")
|
||||
|
||||
if new_version == version:
|
||||
logging.info("Path {}: no update available for {}.".format(path, pname))
|
||||
|
|
@ -331,7 +342,15 @@ def _update_package(path, target):
|
|||
raise ValueError("no file available for {}.".format(pname))
|
||||
|
||||
text = _replace_value('version', new_version, text)
|
||||
text = _replace_value('sha256', new_sha256, text)
|
||||
|
||||
# fetchers can specify a sha256, or a sri hash
|
||||
try:
|
||||
text = _replace_value('sha256', new_sha256, text)
|
||||
except ValueError:
|
||||
# hashes from pypi are 16-bit encoded sha256's, need translate to an sri hash if used with "hash"
|
||||
sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
|
||||
text = _replace_value('hash', sri_hash, text)
|
||||
|
||||
if fetcher == 'fetchFromGitHub':
|
||||
text = _replace_value('rev', f"{prefix}${{version}}", text)
|
||||
# incase there's no prefix, just rewrite without interpolation
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python3, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apfel";
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-szEtSC/NouYlHSjVoX9Hoh7yQ0W82rVccYEF1L2tXoU=";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran lhapdf python2 zlib ];
|
||||
buildInputs = [ gfortran lhapdf python3 zlib ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aprslib";
|
||||
version = "0.6.47";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rossengeorgiev";
|
||||
repo = "aprs-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1569v74ym2r8vxx3dnjcs5fr7rdrfb0i9sycny5frw2zgms4ag6b";
|
||||
sha256 = "sha256-QasyF0Ch4zdPoAgcqRavEENVGA/02/AgeWAgXYcSUjk=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-subscription";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "22f606f298419f466a8149811fc762686c93da00a7dc15d3b7cdbf22b96cf5db";
|
||||
sha256 = "70ec6e3395549c434bfd981f8f76cb8b6863339bad9b31924c1510af661dbf45";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.5.0";
|
||||
version = "1.0.0";
|
||||
pname = "filebrowser_safe";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5dcd31dd79684025139b43841f6515af1da5a4bb0de15bc4d88003db1970648e";
|
||||
sha256 = "1209a26abd5a085a6453e020513fd94e920bde3908a2bcf3fe0ad5e4292b943b";
|
||||
};
|
||||
|
||||
buildInputs = [ django ];
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-length";
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15frvccm1qx783jlx8fw811ks9jszln3agbb58lg4dhbmjaf2cxw";
|
||||
sha256 = "3536fee1d2a19c01f56ebb909c4d81f686f8181091a9bc3ddf3a5621c464760a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ buildPythonPackage, lib, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
|
||||
, protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub
|
||||
, protobuf, requests, args, gpapi, pyaxmlparser, setuptools, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ];
|
||||
propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser setuptools ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/matlink/gplaycli";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lc7001";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "NgnszlgmeUnfWs9onnboFRz3c4OibsNaZHjDINvoMPc=";
|
||||
sha256 = "sha256-1qObmGpu6mU3gdxS8stH+4Zc2NA7W1+pS7fOXALC0Ug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "numexpr";
|
||||
version = "2.7.3";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "43616529f9b7d1afc83386f943dc66c4da5e052f00217ba7e3ad8dd1b5f3a825";
|
||||
sha256 = "9fec076b76c90a5f3929373f548834bb203c6d23a81a895e60d0fe9cca075e99";
|
||||
};
|
||||
|
||||
# Remove existing site.cfg, use the one we built for numpy.
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "papis-python-rofi";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13k6mw2nq923zazs77hpmh2s96v6zv13g7p89510qqkvp6fiml1v";
|
||||
sha256 = "358e24f5fb0a86de6f15d5168753ad4cbb97e52b36b1bd7abbad4053aeb6f621";
|
||||
};
|
||||
|
||||
# No tests existing
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ let
|
|||
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
|
||||
in buildPythonPackage rec {
|
||||
pname = "pyopencl";
|
||||
version = "2021.2.9";
|
||||
version = "2021.2.10";
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
|
||||
|
|
@ -30,7 +30,7 @@ in buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "51425e65ec49c738eefe21b1eeb1f39245b01cc0ddfd495fbe1f8df33dbc6c9e";
|
||||
sha256 = "75a1f202741bace9606a8680bbbfac69bf8a73d4e7511fb1a6ce3e48185996ae";
|
||||
};
|
||||
|
||||
# py.test is not needed during runtime, so remove it from `install_requires`
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywbem";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8ef48185e0adbaeb9bd5181c4c5de951f6d58d54e2e1d7e87a9834e10eabe957";
|
||||
sha256 = "5e4b4cf4813da57a02ce999d5e2e97e7a9f1ec8014e6561a896ee8b14ae5fa4d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "1.2.1";
|
||||
version = "1.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-49dQgzYsEn5jmHWTJ3e3QOTqNeoTRMjUWxp+MaOYod4=";
|
||||
sha256 = "17ld1ciylfc8kmf5iazzrlqqdf434wi5dfjzm68nm5d539gccfss";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,19 @@
|
|||
{ lib, stdenv, fetchgit, cmake, elfutils, zlib }:
|
||||
{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pahole";
|
||||
version = "1.20";
|
||||
version = "1.22";
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "11q9dpfi4qj2v8z0nlf8c0079mlv10ljhh0d1yr0j4ds3saacd15";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-U1/i9WNlLphPIcNysC476sqil/q9tMYmu+Y6psga8I0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ elfutils zlib ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ elfutils zlib libbpf ];
|
||||
|
||||
# Put libraries in "lib" subdirectory, not top level of $out
|
||||
cmakeFlags = [ "-D__LIB=lib" ];
|
||||
cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/";
|
||||
|
|
@ -22,6 +21,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Only;
|
||||
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bosu ];
|
||||
maintainers = with maintainers; [ bosu martinetd ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "Y+sIyueLdREoq/NR6LwppyhWxB8s0iBjdFaDUSKnlRw=";
|
||||
sha256 = "sha256-b81xopCkAUo9m9FBgL4v7OT+eZu4PNcF5QO1jXHVMT0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "3oqmiHH9QU8uHs9q2CgE0uTvfyaRxV3rFBxkXxC5/Tw=";
|
||||
cargoSha256 = "sha256-3LFhUSg5cNtWPe8g43MsbGkmZR9BQdAT5m8k0eCBqIs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.13.5";
|
||||
version = "4.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ckcuA9jf8aFgcuts3VOE629WGkvBkdZP86PKXqzBvks=";
|
||||
sha256 = "sha256-4o38f5ltTH6ea0na919GnJMao8w5rgkDWMp2mkoKwcY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jlQ4TH5PiO/68ZFOzOVUTYKkVe9lQleVjZoP4adRrUI=";
|
||||
vendorSha256 = "sha256-PCDM1VbqUcAVXzCPWDZtCRLpRIu43sF1lGazAG2HZJ0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, perl, fetchurl, python2, fmt, libidn
|
||||
{ stdenv, lib, perl, fetchurl, python3, fmt, libidn
|
||||
, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
|
||||
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
|
||||
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2 perl pkg-config ];
|
||||
nativeBuildInputs = [ python3 perl pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
spidermonkey_78_6 boost icu libxml2 libpng libjpeg
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, makeWrapper, cmake, llvmPackages, kernel
|
||||
, makeWrapper, cmake, llvmPackages
|
||||
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
|
||||
, systemtap, bash
|
||||
, bash, libbpf, nixosTests
|
||||
}:
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -14,15 +14,14 @@ python.pkgs.buildPythonApplication rec {
|
|||
owner = "iovisor";
|
||||
repo = "bcc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4zfjr3VLg26uZ4xNKA1wayti7f2tqGvYSbwoZnr+Ygk=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE=";
|
||||
};
|
||||
format = "other";
|
||||
|
||||
buildInputs = with llvmPackages; [
|
||||
llvm llvm.dev libclang kernel
|
||||
llvm llvm.dev libclang
|
||||
elfutils luajit netperf iperf
|
||||
systemtap.stapBuild flex bash
|
||||
flex bash libbpf
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
@ -32,15 +31,14 @@ python.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [ python.pkgs.netaddr ];
|
||||
nativeBuildInputs = [ makeWrapper cmake flex bison llvmPackages.llvm.dev ]
|
||||
# libelf is incompatible with elfutils-libelf
|
||||
++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
|
||||
nativeBuildInputs = [ makeWrapper cmake flex bison llvmPackages.llvm.dev ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
|
||||
"-DBCC_KERNEL_MODULES_DIR=/run/booted-system/kernel-modules/lib/modules"
|
||||
"-DREVISION=${version}"
|
||||
"-DENABLE_USDT=ON"
|
||||
"-DENABLE_CPP_API=ON"
|
||||
"-DCMAKE_USE_LIBBPF_PACKAGE=ON"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -71,10 +69,14 @@ python.pkgs.buildPythonApplication rec {
|
|||
wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
bpf = nixosTests.bpf;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dynamic Tracing Tools for Linux";
|
||||
homepage = "https://iovisor.github.io/bcc/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ragge mic92 thoughtpolice ];
|
||||
maintainers = with maintainers; [ ragge mic92 thoughtpolice martinetd ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
39
pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch
Normal file
39
pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
diff -ur source/src/btf.cpp new/src/btf.cpp
|
||||
--- source/src/btf.cpp 1970-01-01 09:00:01.000000000 +0900
|
||||
+++ new/src/btf.cpp 2021-12-04 21:46:59.337023489 +0900
|
||||
@@ -225,7 +225,7 @@
|
||||
char err_buf[256];
|
||||
int err;
|
||||
|
||||
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
|
||||
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
|
||||
err = libbpf_get_error(dump);
|
||||
if (err)
|
||||
{
|
||||
@@ -496,7 +496,7 @@
|
||||
char err_buf[256];
|
||||
int err;
|
||||
|
||||
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
|
||||
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
|
||||
err = libbpf_get_error(dump);
|
||||
if (err)
|
||||
{
|
||||
@@ -554,7 +554,7 @@
|
||||
char err_buf[256];
|
||||
int err;
|
||||
|
||||
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
|
||||
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
|
||||
err = libbpf_get_error(dump);
|
||||
if (err)
|
||||
{
|
||||
@@ -648,7 +648,7 @@
|
||||
char err_buf[256];
|
||||
int err;
|
||||
|
||||
- dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
|
||||
+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
|
||||
err = libbpf_get_error(dump);
|
||||
if (err)
|
||||
{
|
||||
|
|
@ -1,38 +1,35 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, flex, bison
|
||||
, llvmPackages, kernel, elfutils
|
||||
, llvmPackages, elfutils
|
||||
, libelf, libbfd, libbpf, libopcodes, bcc
|
||||
, cereal, asciidoctor
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BKWBdFzj0j7rAfG30A0fwyYCpOG/5NFRPODW46EP1u0=";
|
||||
sha256 = "sha256-rlaajNfpoiMtU/4aNAnbQ0VixPz9/302TZMarGzsb58=";
|
||||
};
|
||||
|
||||
# libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of
|
||||
# btf_dump__new() but that's not valid c++.
|
||||
# see https://github.com/iovisor/bpftrace/issues/2068
|
||||
patches = [ ./btf-dump-new-0.6.0.patch ];
|
||||
|
||||
buildInputs = with llvmPackages;
|
||||
[ llvm libclang
|
||||
kernel elfutils libelf bcc
|
||||
elfutils libelf bcc
|
||||
libbpf libbfd libopcodes
|
||||
cereal asciidoctor
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config flex bison llvmPackages.llvm.dev ]
|
||||
# libelf is incompatible with elfutils-libelf
|
||||
++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
|
||||
|
||||
# patch the source, *then* substitute on @NIX_KERNEL_SRC@ in the result. we could
|
||||
# also in theory make this an environment variable around bpftrace, but this works
|
||||
# nicely without wrappers.
|
||||
patchPhase = ''
|
||||
patch -p1 < ${./fix-kernel-include-dir.patch}
|
||||
substituteInPlace ./src/utils.cpp \
|
||||
--subst-var-by NIX_KERNEL_SRC '${kernel.dev}/lib/modules/${kernel.modDirVersion}'
|
||||
'';
|
||||
nativeBuildInputs = [ cmake pkg-config flex bison llvmPackages.llvm.dev ];
|
||||
|
||||
# tests aren't built, due to gtest shenanigans. see:
|
||||
#
|
||||
|
|
@ -52,10 +49,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
passthru.tests = {
|
||||
bpf = nixosTests.bpf;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-level tracing language for Linux eBPF";
|
||||
homepage = "https://github.com/iovisor/bpftrace";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rvl thoughtpolice ];
|
||||
maintainers = with maintainers; [ rvl thoughtpolice martinetd ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
commit b6172952c0150d84912fa6f09bab782dd0549f1e
|
||||
Author: Austin Seipp <aseipp@pobox.com>
|
||||
Date: Fri May 3 00:47:12 2019 -0500
|
||||
|
||||
src: special case nix build directories for clang
|
||||
|
||||
Signed-off-by: Austin Seipp <aseipp@pobox.com>
|
||||
|
||||
diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp
|
||||
index b1db8ff..0cfb01f 100644
|
||||
--- a/src/utils.cpp
|
||||
+++ b/src/utils.cpp
|
||||
@@ -140,6 +140,9 @@ static bool is_dir(const std::string& path)
|
||||
// Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found.
|
||||
std::tuple<std::string, std::string> get_kernel_dirs(const struct utsname& utsname)
|
||||
{
|
||||
+ // NB (aseipp): special case the kernel directory for nix
|
||||
+ return { "@NIX_KERNEL_SRC@/source", "@NIX_KERNEL_SRC@/build" };
|
||||
+
|
||||
#ifdef KERNEL_HEADERS_DIR
|
||||
return {KERNEL_HEADERS_DIR, KERNEL_HEADERS_DIR};
|
||||
#endif
|
||||
|
|
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
# install linux's libbpf-compatible linux/btf.h
|
||||
install -Dm444 ../include/uapi/linux/btf.h -t $out/include/linux
|
||||
'';
|
||||
|
||||
# FIXME: Multi-output requires some fixes to the way the pkg-config file is
|
||||
# constructed (it gets put in $out instead of $dev for some reason, with
|
||||
# improper paths embedded). Don't enable it for now.
|
||||
|
|
@ -33,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Upstream mirror of libbpf";
|
||||
homepage = "https://github.com/libbpf/libbpf";
|
||||
license = with licenses; [ lgpl21 /* or */ bsd2 ];
|
||||
maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert ];
|
||||
maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert martinetd ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-mjolnir-antispam";
|
||||
version = "1.1.20";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "mjolnir";
|
||||
rev = "v${version}";
|
||||
sha256 = "06779z08qni1kgr292gpkxd2xvyg4apfnbhynli9qjp2vaf03wy9";
|
||||
sha256 = "0fvdzn5l1a6bhr1qzgs30a3kh6nj0byqichnl149sjgr0v4lpkz1";
|
||||
};
|
||||
|
||||
sourceRoot = "./source/synapse_antispam";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-weLzW1pyv9q9VKvFxno+f/L29wlpvxlVUZJUwx6Gn2A=";
|
||||
sha256 = "sha256-KxGG59H5EzIcYigvbQlrwpZLP4zMqErO3vDKhBOPc3w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1kQ2m8gFBHKznbjNPtYN0BVrRbxyCs2H1f7+XZqgVvc=";
|
||||
vendorSha256 = "sha256-lITzqPMsZk/G2nG4LcUdyTb3gE3rtlXET/c2UaYODvU=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, python3, exif, imagemagick }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "recoverjpeg";
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ python2 ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/sort-pictures \
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-outdated";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jg8KuIu1SaIRlEI9yvpLCESZfAyNgSThJ6pe7+IM6j0=";
|
||||
sha256 = "sha256-U6qElZkray4kjScv9X4I5m2z1ZWQzqcPYAuPzpyRpW0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jfZUtUVHEC8zK+FJHSOQxELWTG/Of2WSDoqdg/Sckws=";
|
||||
cargoSha256 = "sha256-0J02Uz184zx5xZYhqUmyaAFCQ0aogwy0fQTXbteBdV8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-release";
|
||||
version = "0.18.4";
|
||||
version = "0.18.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "cargo-release";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m+mLnlTBBS3DdxOmOi+NvoSSWgBZ9lI9tqIgq3GHnJI=";
|
||||
sha256 = "sha256-bbxOavpEVVRv5czl2UiV6brulvjod7X7n+j8/9bO+SE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-L6Izc8OrZ+RnGPpWKWBMpyyOthWzB0DjmQxf20R6dE4=";
|
||||
cargoSha256 = "sha256-E0Mo+hgI0uRaV2GAX52YtdNyZdd9wHVOBB3tJz36/8I=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{ lib, fetchFromGitHub, python2Packages }:
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "grin";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rkern";
|
||||
owner = "matthew-brett";
|
||||
repo = pname;
|
||||
rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f";
|
||||
sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd";
|
||||
rev = "1.3.0";
|
||||
sha256 = "057d05vzx4sf415vnh3qj2g351xhb3illjxjs9mdl3nsnb5r84kv";
|
||||
};
|
||||
|
||||
buildInputs = with python2Packages; [ nose ];
|
||||
buildInputs = with python3Packages; [ nose ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rkern/grin";
|
||||
homepage = "https://github.com/matthew-brett/grin";
|
||||
description = "A grep program configured the way I like it";
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.sjagoe ];
|
||||
|
|
|
|||
|
|
@ -3,85 +3,26 @@
|
|||
, buildPythonPackage
|
||||
, bash
|
||||
, bashInteractive
|
||||
, systemd
|
||||
, util-linux
|
||||
, boto
|
||||
, setuptools
|
||||
, distro
|
||||
, stdenv
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
let
|
||||
guest-configs = stdenv.mkDerivation rec {
|
||||
pname = "guest-configs";
|
||||
version = "20210702.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "guest-configs";
|
||||
rev = version;
|
||||
sha256 = "1965kdrb1ig3z4qwzvyzx1fb4282ak5vgxcvvg5k9c759pzbc5nn";
|
||||
};
|
||||
|
||||
buildInputs = [ bash ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# allows to install the package in `services.udev.packages` in NixOS
|
||||
mkdir -p $out/lib/udev $out/bin
|
||||
|
||||
cp -r "src/lib/udev/rules.d" $out/lib/udev
|
||||
cp "src/lib/udev/google_nvme_id" $out/bin
|
||||
|
||||
for rules in $out/lib/udev/*.rules; do
|
||||
substituteInPlace "$rules" \
|
||||
--replace /bin/sh "${bash}/bin/sh" \
|
||||
--replace /bin/umount "${util-linux}/bin/umount" \
|
||||
--replace /usr/bin/logger "${util-linux}/bin/logger"
|
||||
done
|
||||
|
||||
# sysctl snippets will be used by google-compute-config.nix
|
||||
cp -r "src/etc/sysctl.d" $out
|
||||
|
||||
patchShebangs $out/bin/*
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "google-compute-engine";
|
||||
version = "20200113.0";
|
||||
version = "20190124";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "compute-image-packages";
|
||||
rev = "506b9a0dbffec5620887660cd42c57b3cbbadba6";
|
||||
sha256 = "0lmc426mvrajghpavhs6hwl19mgnnh08ziqx5yi15fzpnvwmb8vz";
|
||||
rev = version;
|
||||
sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp";
|
||||
};
|
||||
|
||||
buildInputs = [ bash guest-configs ];
|
||||
propagatedBuildInputs = [ (if pythonOlder "3.7" then boto else distro) setuptools ];
|
||||
|
||||
preBuild = ''
|
||||
cd packages/python-google-compute-engine
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"testExtractInterfaceMetadata"
|
||||
"testCallDhclientIpv6"
|
||||
"testWriteConfig"
|
||||
"testCreateInterfaceMapNetifaces"
|
||||
"testCreateInterfaceMapSysfs"
|
||||
"testGetNetworkInterface"
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
buildInputs = [ bash ];
|
||||
propagatedBuildInputs = [ boto setuptools distro ];
|
||||
|
||||
postPatch = ''
|
||||
for file in $(find google_compute_engine -type f); do
|
||||
|
|
@ -91,15 +32,33 @@ buildPythonPackage rec {
|
|||
--replace /sbin/hwclock "${util-linux}/bin/hwclock"
|
||||
# SELinux tool ??? /sbin/restorecon
|
||||
done
|
||||
|
||||
substituteInPlace google_config/udev/64-gce-disk-removal.rules \
|
||||
--replace /bin/sh "${bash}/bin/sh" \
|
||||
--replace /bin/umount "${util-linux}/bin/umount" \
|
||||
--replace /usr/bin/logger "${util-linux}/bin/logger"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# allows to install the package in `services.udev.packages` in NixOS
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
cp -r google_config/udev/*.rules $out/lib/udev/rules.d
|
||||
|
||||
# sysctl snippets will be used by google-compute-config.nix
|
||||
mkdir -p $out/sysctl.d
|
||||
cp google_config/sysctl/*.conf $out/sysctl.d
|
||||
|
||||
patchShebangs $out/bin/*
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "google_compute_engine" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google Compute Engine tools and services";
|
||||
homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cpcloud zimbatm ];
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ mapAliases ({
|
|||
clangAnalyzer = clang-analyzer; # added 2015-02-20
|
||||
claws-mail-gtk3 = claws-mail; # added 2021-07-10
|
||||
clawsMail = claws-mail; # added 2016-04-29
|
||||
claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # added 2021-12-05
|
||||
clutter_gtk = clutter-gtk; # added 2018-02-25
|
||||
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05
|
||||
codimd = hedgedoc; # added 2020-11-29
|
||||
|
|
|
|||
|
|
@ -5945,7 +5945,7 @@ with pkgs;
|
|||
|
||||
google-clasp = callPackage ../development/misc/google-clasp { };
|
||||
|
||||
google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine;
|
||||
google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine;
|
||||
|
||||
google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { };
|
||||
|
||||
|
|
@ -14171,6 +14171,12 @@ with pkgs;
|
|||
|
||||
bpftools = callPackage ../os-specific/linux/bpftools { };
|
||||
|
||||
bcc = callPackage ../os-specific/linux/bcc {
|
||||
python = pkgs.python3;
|
||||
};
|
||||
|
||||
bpftrace = callPackage ../os-specific/linux/bpftrace { };
|
||||
|
||||
bpm-tools = callPackage ../tools/audio/bpm-tools { };
|
||||
|
||||
byacc = callPackage ../development/tools/parsing/byacc { };
|
||||
|
|
@ -24401,13 +24407,8 @@ with pkgs;
|
|||
|
||||
ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { };
|
||||
|
||||
claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail {
|
||||
inherit (xorg) libSM;
|
||||
useGtk3 = false;
|
||||
};
|
||||
claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
|
||||
inherit (xorg) libSM;
|
||||
useGtk3 = true;
|
||||
};
|
||||
|
||||
clfswm = callPackage ../applications/window-managers/clfswm { };
|
||||
|
|
|
|||
|
|
@ -250,6 +250,7 @@ in {
|
|||
inherit (kernel) kernelOlder kernelAtLeast;
|
||||
# Obsolete aliases (these packages do not depend on the kernel).
|
||||
inherit (pkgs) odp-dpdk pktgen; # added 2018-05
|
||||
inherit (pkgs) bcc bpftrace; # added 2021-12
|
||||
|
||||
acpi_call = callPackage ../os-specific/linux/acpi-call {};
|
||||
|
||||
|
|
@ -263,12 +264,6 @@ in {
|
|||
|
||||
batman_adv = callPackage ../os-specific/linux/batman-adv {};
|
||||
|
||||
bcc = callPackage ../os-specific/linux/bcc {
|
||||
python = pkgs.python3;
|
||||
};
|
||||
|
||||
bpftrace = callPackage ../os-specific/linux/bpftrace { };
|
||||
|
||||
bbswitch = callPackage ../os-specific/linux/bbswitch {};
|
||||
|
||||
chipsec = callPackage ../tools/security/chipsec {
|
||||
|
|
|
|||
Loading…
Reference in a new issue