cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-01-05 00:02:56 +00:00 committed by GitHub
commit 0c98bf3e85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 867 additions and 1801 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nixos/modules/services/monitoring/apcupsd.nix
View file

@ -62,6 +62,21 @@ let
);
# Ensure the CLI uses our generated configFile
wrappedBinaries = pkgs.runCommandLocal "apcupsd-wrapped-binaries"
{ nativeBuildInputs = [ pkgs.makeWrapper ]; }
''
for p in "${lib.getBin pkgs.apcupsd}/bin/"*; do
bname=$(basename "$p")
makeWrapper "$p" "$out/bin/$bname" --add-flags "-f ${configFile}"
done
'';
apcupsdWrapped = pkgs.symlinkJoin {
name = "apcupsd-wrapped";
# Put wrappers first so they "win"
paths = [ wrappedBinaries pkgs.apcupsd ];
};
in
{
@ -138,7 +153,7 @@ in
} ];
# Give users access to the "apcaccess" tool
environment.systemPackages = [ pkgs.apcupsd ];
environment.systemPackages = [ apcupsdWrapped ];
# NOTE 1: apcupsd runs as root because it needs permission to run
# "shutdown"

1
nixos/tests/all-tests.nix
View file

@ -78,6 +78,7 @@ in {
allTerminfo = handleTest ./all-terminfo.nix {};
alps = handleTest ./alps.nix {};
amazon-init-shell = handleTest ./amazon-init-shell.nix {};
apcupsd = handleTest ./apcupsd.nix {};
apfs = handleTest ./apfs.nix {};
apparmor = handleTest ./apparmor.nix {};
atd = handleTest ./atd.nix {};

41
nixos/tests/apcupsd.nix Normal file
View file

@ -0,0 +1,41 @@
let
# arbitrary address
ipAddr = "192.168.42.42";
in
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "apcupsd";
meta.maintainers = with lib.maintainers; [ bjornfor ];
nodes = {
machine = {
services.apcupsd = {
enable = true;
configText = ''
UPSTYPE usb
BATTERYLEVEL 42
# Configure NISIP so that the only way apcaccess can work is to read
# this config.
NISIP ${ipAddr}
'';
};
networking.interfaces.eth1 = {
ipv4.addresses = [{
address = ipAddr;
prefixLength = 24;
}];
};
};
};
# Check that the service starts, that the CLI (apcaccess) works and that it
# uses the config (ipAddr) defined in the service config.
testScript = ''
start_all()
machine.wait_for_unit("apcupsd.service")
machine.wait_for_open_port(3551, "${ipAddr}")
res = machine.succeed("apcaccess")
expect_line="MBATTCHG : 42 Percent"
assert "MBATTCHG : 42 Percent" in res, f"expected apcaccess output to contain '{expect_line}' but got '{res}'"
machine.shutdown()
'';
})

37
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -4665,6 +4665,43 @@ final: prev:
meta.homepage = "https://github.com/chentoast/marks.nvim/";
};
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
pname = "mason-lspconfig.nvim";
version = "2022-07-25";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
rev = "ad3b109cff22af979ab3d15564cd63dc3ae2f0f0";
sha256 = "0jvnc9zlr5cazdrhjm1v0bjkrz5lb2z8dzlkq59b433f52qv9zrf";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
mason-tool-installer-nvim = buildVimPluginFrom2Nix {
pname = "mason-tool-installer.nvim";
version = "2022-07-26";
src = fetchFromGitHub {
owner = "WhoIsSethDaniel";
repo = "mason-tool-installer.nvim";
rev = "6d9276655c09ef2358ddb105cac4a34cfa8853c0";
sha256 = "0j5k9fhjffkx3b5asnwxzj22fvncs69vs0rkx13ii3gdvwczbc5w";
};
meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
};
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
version = "2022-07-27";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "269ee222f76e705619da2c0130c0a06e76419b88";
sha256 = "1bngr68gfv33p989dqhz6xmhips7i2yjni96qgnqwhdjczfw865v";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
matchit-zip = buildVimPluginFrom2Nix {
pname = "matchit.zip";
version = "2010-10-18";

8
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -598,6 +598,14 @@ self: super: {
'';
});
mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: {
dependencies = with self; [ mason-nvim nvim-lspconfig ];
});
mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs (old: {
dependencies = with self; [ mason-nvim ];
});
meson = buildVimPluginFrom2Nix {
inherit (meson) pname version src;
preInstall = "cd data/syntax-highlighting/vim";

3
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -391,6 +391,9 @@ https://github.com/rktjmp/lush.nvim/,,
https://github.com/mkasa/lushtags/,,
https://github.com/iamcco/markdown-preview.nvim/,,
https://github.com/chentoast/marks.nvim/,,
https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
https://github.com/williamboman/mason.nvim/,HEAD,
https://github.com/vim-scripts/matchit.zip/,,
https://github.com/marko-cerovac/material.nvim/,,
https://github.com/kaicataldo/material.vim/,HEAD,

6
pkgs/applications/misc/limesctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "limesctl";
version = "3.1.1";
version = "3.1.3";
src = fetchFromGitHub {
owner = "sapcc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/CYZMuW5/YoZszTOaQZLRhJdZAGGMY+s7vMK01hyMvg=";
sha256 = "sha256-fi36jsQr/Mn1FyOlle/WSpREQgZU6+h4IJzd3ZfItvI=";
};
vendorSha256 = "sha256-BwhbvCUOOp5ZeY/22kIZ58e+iPH0pVgiNOyoD6O2zPo=";
vendorSha256 = "sha256-gcIPASIk4Zq8y+KppYNRkf/9guCsYv9XskFANrqOCts=";
subPackages = [ "." ];

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "109.0.5414.61",
"sha256": "1dk832ishjhba0rnf57w7vqrr8dyqga6zsgw9945i7zz997fpjyi",
"sha256bin64": "1s1d7h9ygzpa5b39pdivn5vvpm7fpnhw5p3lz8blrgn61m8h6jg6",
"version": "109.0.5414.74",
"sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd",
"sha256bin64": "1ihjjf8x5080p9bizhqrrr0rcjf0l1nps9xq9naa2f48y5zfshkd",
"deps": {
"gn": {
"version": "2022-11-10",

4
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -168,8 +168,8 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.3.6";
sha256 = "sha256-aETsvcHoHSwqWCAdn9JPJLcX1Wi1umUghSjkq37OYDU=";
version = "1.3.7";
sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ";
vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k=";
patches = [ ./provider-path-0_15.patch ];
passthru = {

32
pkgs/applications/networking/instant-messengers/keet/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib, appimageTools, fetchurl }:
let
pname = "keet";
version = "1.2.1";
src = fetchurl {
url = "https://keet.io/downloads/${version}/Keet.AppImage";
sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in appimageTools.wrapType2 {
inherit src pname version;
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "Peer-to-Peer Chat";
homepage = "https://keet.io";
license = licenses.unfree;
maintainers = with maintainers; [ extends ];
platforms = [ "x86_64-linux" ];
};
}

10
pkgs/applications/networking/seaweedfs/default.nix
View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.34";
version = "3.38";
src = fetchFromGitHub {
owner = "chrislusf";
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-lOCZHkLJCDvaT3CcHUBbsybdy0H6BfKKGpd/73cxcWA=";
hash = "sha256-LYMGkv1rgUtA/TwulBhgw0w+8kbICtEgr7/K6exalxM=";
};
vendorHash = "sha256-1RUWONkXArXYg8gQogKUhMSGdIYyT3lq5qWuUQBsFig=";
vendorHash = "sha256-mwfs/tdq1Qq2auEwz24emf7pjpIJAncI78oxhAn2WkI=";
subPackages = [ "weed" ];
@ -49,7 +49,7 @@ buildGoModule rec {
meta = with lib; {
description = "Simple and highly scalable distributed file system";
homepage = "https://github.com/chrislusf/seaweedfs";
maintainers = with maintainers; [ azahi cmacrae ];
maintainers = with maintainers; [ azahi cmacrae wozeparrot ];
mainProgram = "weed";
license = licenses.asl20;
};

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6.tar.gz",
"sha256": "19pgh69fj3p1glqyjikpsvn5j4bax6yw5qxf9qaaap19hksgn85p",
"msg": "Update from Hackage at 2022-12-28T16:35:05Z"
"commit": "78541d36393ac3dd0ffa32b4a9af15fecdefb5d1",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78541d36393ac3dd0ffa32b4a9af15fecdefb5d1.tar.gz",
"sha256": "1qwjkjlz9sw1jnsarin6803vj68bfm3iyysfwxaifga5w4dsrqcs",
"msg": "Update from Hackage at 2022-12-30T22:03:31Z"
}

33
pkgs/development/compilers/blueprint/default.nix
View file

@ -1,14 +1,13 @@
{ gtk4
, python3
, stdenv
, fetchFromGitLab
{ fetchFromGitLab
, gobject-introspection
, gtk4
, lib
, meson
, ninja
, python3
, stdenv
, testers
}:
stdenv.mkDerivation (finalAttrs: {
pname = "blueprint-compiler";
version = "0.6.0";
@ -21,31 +20,27 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0=";
};
doCheck = true;
nativeBuildInputs = [
meson
ninja
];
buildInputs = [
python3
gtk4
] ++ (with python3.pkgs; [
pygobject3
wrapPython
]);
(python3.withPackages (ps: with ps; [
pygobject3
]))
];
propagatedBuildInputs = [
# For setup hook, so that the compiler can find typelib files
gobject-introspection
];
postFixup = ''
makeWrapperArgs="\
--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
--prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3})\""
wrapPythonPrograms
'';
doCheck = true;
checkInputs = [
gtk4
];
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;

8
pkgs/development/compilers/emscripten/default.nix
View file

@ -3,6 +3,7 @@
, llvmPackages
, symlinkJoin, makeWrapper, substituteAll
, mkYarnModules
, emscripten
}:
stdenv.mkDerivation rec {
@ -116,6 +117,13 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
# HACK: Make emscripten look more like a cc-wrapper to GHC
# when building the javascript backend.
targetPrefix = "em";
bintools = emscripten;
};
meta = with lib; {
homepage = "https://github.com/emscripten-core/emscripten";
description = "An LLVM-to-JavaScript Compiler";

4
pkgs/development/compilers/ghc/8.10.7.nix
View file

@ -21,7 +21,9 @@
, # 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.meta.availableOn stdenv.hostPlatform gmp), gmp
enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform

4
pkgs/development/compilers/ghc/8.8.4.nix
View file

@ -20,7 +20,9 @@
, # 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.meta.availableOn stdenv.hostPlatform gmp), gmp
enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform

3
pkgs/development/compilers/ghc/9.0.2.nix
View file

@ -23,7 +23,8 @@
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.

3
pkgs/development/compilers/ghc/9.2.4.nix
View file

@ -23,7 +23,8 @@
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.

3
pkgs/development/compilers/ghc/9.2.5.nix
View file

@ -23,7 +23,8 @@
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.

3
pkgs/development/compilers/ghc/9.4.2.nix
View file

@ -25,7 +25,8 @@
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.

3
pkgs/development/compilers/ghc/9.4.3.nix
View file

@ -25,7 +25,8 @@
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.

3
pkgs/development/compilers/ghc/9.4.4.nix
View file

@ -25,7 +25,8 @@
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
, gmp
, # If enabled, use -fPIC when compiling static libs.

42
pkgs/development/compilers/ghc/common-hadrian.nix
View file

@ -39,7 +39,8 @@
, useLLVM ? !(stdenv.targetPlatform.isx86
|| stdenv.targetPlatform.isPower
|| stdenv.targetPlatform.isSparc
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)
|| stdenv.targetPlatform.isGhcjs)
, # 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.
@ -48,7 +49,9 @@
, # If enabled, GHC will be built with the GPL-free but slightly slower native
# bignum backend instead of the faster but GPLed gmp backend.
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)
enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
&& lib.meta.availableOn stdenv.targetPlatform gmp)
|| stdenv.targetPlatform.isGhcjs
, gmp
, # If enabled, use -fPIC when compiling static libs.
@ -62,7 +65,8 @@
enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
enableTerminfo ? !(stdenv.targetPlatform.isWindows
|| stdenv.targetPlatform.isGhcjs)
, # Libdw.c only supports x86_64, i686 and s390x as of 2022-08-04
enableDwarf ? (stdenv.targetPlatform.isx86 ||
@ -156,12 +160,6 @@
assert !enableNativeBignum -> gmp != null;
assert stdenv.hostPlatform == stdenv.targetPlatform || throw ''
hadrian doesn't support building an installable GHC cross-compiler at the moment.
Consider using GHC 9.4 or lower which support this via the make build system.
See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090
'';
let
src = (if rev != null then fetchgit else fetchurl) ({
inherit url sha256;
@ -201,17 +199,19 @@ let
# Splicer will pull out correct variations
libDeps = platform: lib.optional enableTerminfo ncurses
++ [libffi]
++ lib.optionals (!targetPlatform.isGhcjs) [libffi]
# Bindist configure script fails w/o elfutils in linker search path
# https://gitlab.haskell.org/ghc/ghc/-/issues/22081
++ lib.optional enableDwarf elfutils
++ lib.optional (!enableNativeBignum) gmp
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows && !targetPlatform.isGhcjs) libiconv;
# TODO(@sternenseemann): is buildTarget LLVM unnecessary?
# GHC doesn't seem to have {LLC,OPT}_HOST
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
(if targetPlatform.isGhcjs
then pkgsBuildTarget.emscripten
else pkgsBuildTarget.targetPackages.stdenv.cc)
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
@ -251,7 +251,7 @@ in
# C compiler, bintools and LLVM are used at build time, but will also leak into
# the resulting GHC's settings file and used at runtime. This means that we are
# currently only able to build GHC if hostPlatform == buildPlatform.
assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc;
assert !targetPlatform.isGhcjs -> targetCC == pkgsHostTarget.targetPackages.stdenv.cc;
assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
@ -334,6 +334,13 @@ stdenv.mkDerivation ({
'*-android*|*-gnueabi*|*-musleabi*)'
done
''
# Need to make writable EM_CACHE for emscripten
# https://gitlab.haskell.org/ghc/ghc/-/wikis/javascript-backend#configure-fails-with-sub-word-sized-atomic-operations-not-available
+ lib.optionalString targetPlatform.isGhcjs ''
export EM_CACHE="$(mktemp -d emcache.XXXXXXXXXX)"
cp -Lr ${targetCC /* == emscripten */}/share/emscripten/cache/* "$EM_CACHE/"
chmod u+rwX -R "$EM_CACHE"
''
# Create bash array hadrianFlagsArray for use in buildPhase. Do it in
# preConfigure, so overrideAttrs can be used to modify it effectively.
# hadrianSettings are passed via the command line so they are more visible
@ -345,6 +352,8 @@ stdenv.mkDerivation ({
)
'';
${if targetPlatform.isGhcjs then "configureScript" else null} = "emconfigure ./configure";
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ]
++ lib.optional (targetPlatform != hostPlatform) "target";
@ -353,7 +362,7 @@ stdenv.mkDerivation ({
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ lib.optionals (libffi != null) [
] ++ lib.optionals (libffi != null && !targetPlatform.isGhcjs) [
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
@ -392,6 +401,9 @@ stdenv.mkDerivation ({
autoSignDarwinBinariesHook
] ++ lib.optionals enableDocs [
sphinx
] ++ lib.optionals targetPlatform.isGhcjs [
# emscripten itself is added via depBuildTarget / targetCC
python3
];
# For building runtime libs
@ -450,7 +462,7 @@ stdenv.mkDerivation ({
preInstall = ''
pushd _build/bindist/*
./configure $configureFlags "''${configureFlagsArray[@]}"
$configureScript $configureFlags "''${configureFlagsArray[@]}"
'';
postInstall = ''

6
pkgs/development/compilers/ghc/head.nix
View file

@ -1,5 +1,5 @@
import ./common-hadrian.nix {
version = "9.5.20220921";
rev = "2463df2fe21b5b37ecada3df8c6726c534d24590";
sha256 = "1k2h4myqbs31fdzw5n4iw0qn44mp7d33kjwrr15ix4r54r8yskzs";
version = "9.7.20221224";
rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19";
sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi";
}

4
pkgs/development/compilers/openjdk/19.nix
View file

@ -4,7 +4,9 @@
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap
, ensureNewerSourcesForZipFilesHook
, setJavaClassPath
, headless ? false
# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
# which should be fixable, this is a no-rebuild workaround for GHC.
, headless ? stdenv.targetPlatform.isGhcjs
, enableJavaFX ? openjfx.meta.available, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:

4
pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
View file

@ -20,7 +20,9 @@
# runtime dependencies
, cups
# runtime dependencies for GTK+ Look and Feel
, gtkSupport ? true
# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
# which should be fixable, this is a no-rebuild workaround for GHC.
, gtkSupport ? !stdenv.targetPlatform.isGhcjs
, cairo
, glib
, gtk3

50
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -216,10 +216,6 @@ self: super: {
# https://github.com/haskell-nix/hnix-store/issues/180
hnix-store-core = doJailbreak super.hnix-store-core;
# Too strict upper bound on bytestring
# https://github.com/wangbj/hashing/issues/3
hashing = doJailbreak super.hashing;
# Fails for non-obvious reasons while attempting to use doctest.
focuslist = dontCheck super.focuslist;
search = dontCheck super.search;
@ -1460,16 +1456,6 @@ self: super: {
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
hercules-ci-agent = lib.pipe super.hercules-ci-agent [
(appendPatches [
# haskell-updates branch, will be merged in 0.9.10
(fetchpatch2 {
name = "hercules-ci-agent-cachix-1.1";
url = "https://github.com/hercules-ci/hercules-ci-agent/commit/b76d888548da37a96ae47f1be871de6605d38edd.patch";
sha256 = "sha256-kqEkDHbatcYS8LuQlGV/1j/6LXWviQoDQAHDr6DBbDU=";
stripLen = 1;
includes = [ "*.hs" ];
})
])
(self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
];
@ -1913,18 +1899,6 @@ self: super: {
# 2022-12-30: Restrictive upper bound on optparse-applicative
retrie = doJailbreak super.retrie;
# Fixes https://github.com/NixOS/nixpkgs/issues/140613
# https://github.com/recursion-schemes/recursion-schemes/issues/128
recursion-schemes = overrideCabal (drv: {
patches = drv.patches or [] ++ [
./patches/recursion-schemes-128.patch
];
# make sure line endings don't break the patch
prePatch = drv.prePatch or "" + ''
"${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
'';
}) super.recursion-schemes;
# 2022-08-30 Too strict bounds on finite-typelits
# https://github.com/jumper149/blucontrol/issues/1
blucontrol = doJailbreak super.blucontrol;
@ -2003,12 +1977,6 @@ self: super: {
"--skip" "/toJsonSerializer/should generate valid JSON/"
] ++ drv.testFlags or [];
}) super.hschema-aeson;
# https://gitlab.com/k0001/xmlbf/-/issues/32
xmlbf = overrideCabal (drv: {
testFlags = [
"-p" "!/xml: <x b=\"\" a=\"y\"><\\/x>/&&!/xml: <x b=\"z\" a=\"y\"><\\/x>/"
] ++ drv.testFlags or [];
}) super.xmlbf;
# https://github.com/ssadler/aeson-quick/issues/3
aeson-quick = overrideCabal (drv: {
testFlags = [
@ -2142,12 +2110,6 @@ self: super: {
# https://github.com/zellige/hs-geojson/issues/29
geojson = dontCheck super.geojson;
# Doesn't support aeson >= 2.0
# https://github.com/channable/vaultenv/issues/118
vaultenv = super.vaultenv.overrideScope (self: super: {
aeson = self.aeson_1_5_6_0;
});
# Support network >= 3.1.2
# https://github.com/erebe/wstunnel/pull/107
wstunnel = appendPatch (fetchpatch {
@ -2363,4 +2325,16 @@ self: super: {
} super.postgrest));
html-charset = dontCheck super.html-charset;
# true-name-0.1.0.4 has been tagged, but has not been released to Hackage.
# Also, beyond 0.1.0.4 an additional patch is required to make true-name
# compatible with current versions of template-haskell
# https://github.com/liyang/true-name/pull/4
true-name = appendPatch (fetchpatch {
url = "https://github.com/liyang/true-name/compare/0.1.0.3...nuttycom:true-name:update_template_haskell.patch";
hash = "sha256-ZMBXGGc2X5AKXYbqgkLXkg5BhEwyj022E37sUEWahtc=";
}) (overrideCabal (drv: {
revision = null;
editedCabalFile = null;
}) super.true-name);
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

2
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -60,8 +60,6 @@ in {
# consequences of doctest breakage follow:
double-conversion = markBroken super.double-conversion;
blaze-textual = checkAgainAfter super.double-conversion "2.0.4.1" "double-conversion fails to build; required for testsuite" (dontCheck super.blaze-textual);
ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen);
lucid = jailbreakForCurrentVersion super.lucid "2.11.1";

10
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -1485,6 +1485,7 @@ broken-packages:
- Feval
- fez-conf
- ffeed
- fft
- ffunctor
- fgl-extras-decompositions
- fib
@ -2217,7 +2218,6 @@ broken-packages:
- heterogeneous-list-literals
- hetris
- heukarya
- hevm
- HExcel
- hexchat
- hexif
@ -2323,6 +2323,7 @@ broken-packages:
- HLogger
- hlongurl
- hls-brittany-plugin
- hls-call-hierarchy-plugin
- hls-haddock-comments-plugin
- hls-selection-range-plugin
- hls-stan-plugin
@ -3667,6 +3668,7 @@ broken-packages:
- OddWord
- oden-go-packages
- oeis2
- OGDF
- OGL
- ogma-language-c
- ogma-language-cocospec
@ -3702,6 +3704,7 @@ broken-packages:
- open-adt
- OpenAFP
- openai-hs
- openapi3
- openapi3-code-generator
- openapi-petstore
- openapi-typed
@ -4269,6 +4272,7 @@ broken-packages:
- QuickAnnotate
- quickbooks
- quickcheck-arbitrary-template
- quickcheck-monoid-subclasses
- quickcheck-property-comb
- quickcheck-property-monad
- quickcheck-rematch
@ -4895,6 +4899,7 @@ broken-packages:
- SNet
- snipcheck
- snorkels
- snowchecked
- snowtify
- socket-activation
- socketed
@ -5009,6 +5014,7 @@ broken-packages:
- stm-firehose
- stm-incremental
- stm-promise
- stm-queue
- stm-stats
- stochastic
- Stomp
@ -5426,7 +5432,6 @@ broken-packages:
- trivia
- tropical
- tropical-geometry
- true-name
- tsession
- tslib
- tsparse
@ -5547,6 +5552,7 @@ broken-packages:
- unix-recursive
- unlift
- unlifted-list
- unliftio-messagebox
- unlift-stm
- unm-hip
- unordered-containers-rematch

123
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View file

@ -1,4 +1,4 @@
# Stackage LTS 20.4
# Stackage LTS 20.5
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -15,7 +15,7 @@ default-package-overrides:
- ad-delcont ==0.3.0.0
- adjunctions ==4.4.2
- adler32 ==0.1.2.0
- advent-of-code-api ==0.2.8.2
- advent-of-code-api ==0.2.8.4
- aern2-mp ==0.2.11.0
- aern2-real ==0.2.11.0
- aeson ==2.0.3.0
@ -61,7 +61,7 @@ default-package-overrides:
- annotated-exception ==0.2.0.4
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.11.4
- ansi-terminal-game ==1.8.0.1
- ansi-terminal-game ==1.8.1.0
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- aos-signature ==0.1.1
@ -86,11 +86,11 @@ default-package-overrides:
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
- ascii ==1.2.3.0
- ascii-case ==1.0.0.11
- ascii-char ==1.0.0.15
- ascii ==1.2.4.0
- ascii-case ==1.0.1.1
- ascii-char ==1.0.0.16
- asciidiagram ==1.3.3.3
- ascii-group ==1.0.0.13
- ascii-group ==1.0.0.14
- ascii-numbers ==1.1.0.0
- ascii-predicates ==1.0.1.0
- ascii-progress ==0.3.3.0
@ -136,7 +136,7 @@ default-package-overrides:
- aws-xray-client-wai ==0.1.0.2
- backtracking ==0.1.0
- bank-holidays-england ==0.2.0.8
- barbies ==2.0.3.1
- barbies ==2.0.4.0
- base16 ==0.3.2.1
- base16-bytestring ==1.0.2.0
- base32 ==0.2.2.0
@ -171,7 +171,7 @@ default-package-overrides:
- bench-show ==0.3.2
- bencode ==0.6.1.1
- bencoding ==0.4.5.4
- benri-hspec ==0.1.0.0
- benri-hspec ==0.1.0.1
- between ==0.11.0.0
- bhoogle ==0.1.4.2
- bibtex ==0.1.0.6
@ -221,14 +221,14 @@ default-package-overrides:
- bm ==0.1.0.2
- bmp ==1.2.6.3
- bnb-staking-csvs ==0.2.1.0
- BNFC ==2.9.4
- BNFC ==2.9.4.1
- BNFC-meta ==0.6.1
- bodhi ==0.1.0
- boltzmann-samplers ==0.1.1.0
- bookkeeping ==0.4.0.1
- Boolean ==0.2.4
- boolsimplifier ==0.1.8
- boomerang ==1.4.8
- boomerang ==1.4.8.1
- boots ==0.2.0.1
- bordacount ==0.1.0.0
- boring ==0.2
@ -267,7 +267,7 @@ default-package-overrides:
- bytes ==0.17.2
- byteset ==0.1.1.0
- byteslice ==0.2.7.0
- bytesmith ==0.3.9.0
- bytesmith ==0.3.9.1
- bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.2
- bytestring-lexing ==0.5.0.9
@ -341,7 +341,7 @@ default-package-overrides:
- check-email ==1.0.2
- checkers ==0.6.0
- checksum ==0.0
- chimera ==0.3.2.0
- chimera ==0.3.3.0
- choice ==0.2.2
- chronologique ==0.3.1.3
- chunked-data ==0.3.1
@ -372,6 +372,7 @@ default-package-overrides:
- code-page ==0.2.1
- cointracking-imports ==0.1.0.2
- collect-errors ==0.1.5.0
- co-log-core ==0.3.2.0
- Color ==0.3.3
- colorful-monoids ==0.2.1.3
- colorize-haskell ==1.0.1
@ -394,9 +395,9 @@ default-package-overrides:
- componentm ==0.0.0.2
- componentm-devel ==0.0.0.2
- composable-associations ==0.1.0.0
- composite-base ==0.8.2.0
- composite-binary ==0.8.2.0
- composite-ekg ==0.8.2.0
- composite-base ==0.8.2.1
- composite-binary ==0.8.2.1
- composite-ekg ==0.8.2.1
- composite-tuple ==0.1.2.0
- composite-xstep ==0.1.0.0
- composition ==1.0.2.2
@ -529,7 +530,7 @@ default-package-overrides:
- data-dword ==0.3.2.1
- data-endian ==0.1.1
- data-fix ==0.3.2
- data-forest ==0.1.0.9
- data-forest ==0.1.0.10
- data-functor-logistic ==0.0
- data-has ==0.4.0.0
- data-hash ==0.2.0.1
@ -567,7 +568,7 @@ default-package-overrides:
- dejafu ==2.4.0.4
- dense-linear-algebra ==0.1.0.0
- dependent-map ==0.4.0.0
- dependent-sum ==0.7.1.0
- dependent-sum ==0.7.2.0
- dependent-sum-template ==0.1.1.1
- depq ==0.4.2
- deque ==0.4.4
@ -597,7 +598,7 @@ default-package-overrides:
- dictionary-sharing ==0.1.0.0
- di-df1 ==1.2.1
- Diff ==0.4.1
- digest ==0.0.1.3
- digest ==0.0.1.4
- digits ==0.3.1
- di-handle ==1.0.1
- dimensional ==1.5
@ -616,7 +617,7 @@ default-package-overrides:
- dl-fedora ==0.9.3
- dlist ==1.0
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- dlist-nonempty ==0.1.2
- dns ==4.1.0
- docker ==0.7.0.1
- dockerfile ==0.2.0
@ -624,10 +625,10 @@ default-package-overrides:
- doctemplates ==0.10.0.2
- doctest ==0.20.1
- doctest-discover ==0.2.0.0
- doctest-driver-gen ==0.3.0.5
- doctest-driver-gen ==0.3.0.6
- doctest-exitcode-stdio ==0.0
- doctest-lib ==0.1
- doctest-parallel ==0.2.5
- doctest-parallel ==0.2.6
- doldol ==0.4.1.2
- do-list ==1.0.1
- domain ==0.1.1.4
@ -637,10 +638,9 @@ default-package-overrides:
- domain-optics ==0.1.0.3
- do-notation ==0.1.0.2
- dot ==0.3
- dotenv ==0.9.0.3
- dotgen ==0.4.3
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.4.1
- double-conversion ==2.0.4.2
- download ==0.3.2.7
- download-curl ==0.1.4
- DPutils ==0.1.1.0
@ -651,7 +651,7 @@ default-package-overrides:
- dual ==0.1.1.1
- dual-tree ==0.2.3.1
- dublincore-xml-conduit ==0.1.0.2
- dunai ==0.9.1
- dunai ==0.9.2
- duration ==0.2.0.0
- dvorak ==0.1.0.0
- dynamic-state ==0.3.1
@ -714,18 +714,18 @@ default-package-overrides:
- errors-ext ==0.4.2
- ersatz ==0.4.13
- esqueleto ==3.5.8.1
- essence-of-live-coding ==0.2.6
- essence-of-live-coding-gloss ==0.2.6
- essence-of-live-coding-pulse ==0.2.6
- essence-of-live-coding-quickcheck ==0.2.6
- essence-of-live-coding-warp ==0.2.6
- essence-of-live-coding ==0.2.7
- essence-of-live-coding-gloss ==0.2.7
- essence-of-live-coding-pulse ==0.2.7
- essence-of-live-coding-quickcheck ==0.2.7
- essence-of-live-coding-warp ==0.2.7
- event-list ==0.1.2
- eventstore ==1.4.2
- every ==0.0.1
- evm-opcodes ==0.1.2
- exact-combinatorics ==0.2.0.11
- exact-pi ==0.5.0.2
- exception-hierarchy ==0.1.0.7
- exception-hierarchy ==0.1.0.8
- exception-mtl ==0.4.0.1
- exception-transformers ==0.4.0.11
- executable-hash ==0.2.0.4
@ -789,9 +789,9 @@ default-package-overrides:
- fitspec ==0.4.10
- fixed ==0.3
- fixed-length ==0.2.3.1
- fixed-vector ==1.2.1.0
- fixed-vector ==1.2.2.1
- fixed-vector-hetero ==0.6.1.1
- fix-whitespace ==0.0.10
- fix-whitespace ==0.0.11
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.3
@ -1031,7 +1031,7 @@ default-package-overrides:
- haskell-gi ==0.26.2
- haskell-gi-base ==0.26.3
- haskell-gi-overloading ==1.0
- haskell-lexer ==1.1
- haskell-lexer ==1.1.1
- HaskellNet ==0.6.0.1
- HaskellNet-SSL ==0.3.4.4
- haskell-src ==1.0.4
@ -1069,7 +1069,7 @@ default-package-overrides:
- heatshrink ==0.1.0.0
- hebrew-time ==0.1.2
- hedgehog ==1.1.2
- hedgehog-classes ==0.2.5.3
- hedgehog-classes ==0.2.5.4
- hedgehog-corpus ==0.2.0
- hedgehog-fakedata ==0.0.1.5
- hedgehog-fn ==1.0
@ -1131,7 +1131,7 @@ default-package-overrides:
- hourglass ==0.2.12
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.10
- hpack ==0.35.0
- hpack ==0.35.1
- hpack-dhall ==0.5.7
- hpc-codecov ==0.3.0.0
- hpc-lcov ==1.1.0
@ -1169,7 +1169,7 @@ default-package-overrides:
- hslua-packaging ==2.2.1
- hsndfile ==0.8.0
- hsndfile-vector ==0.5.2
- HsOpenSSL ==0.11.7.2
- HsOpenSSL ==0.11.7.4
- HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0
- hspec ==2.9.7
@ -1258,7 +1258,7 @@ default-package-overrides:
- hw-int ==0.0.2.0
- hw-ip ==2.4.2.1
- hw-json ==1.3.2.3
- hw-json-simd ==0.1.1.1
- hw-json-simd ==0.1.1.2
- hw-json-simple-cursor ==0.1.1.1
- hw-json-standard-cursor ==0.2.3.2
- hwk ==0.6
@ -1270,7 +1270,7 @@ default-package-overrides:
- hw-prim ==0.6.3.2
- hw-rankselect ==0.13.4.1
- hw-rankselect-base ==0.3.4.1
- hw-simd ==0.1.2.1
- hw-simd ==0.1.2.2
- hw-streams ==0.0.1.0
- hw-string-parse ==0.0.0.5
- hw-succinct ==0.1.0.1
@ -1531,7 +1531,7 @@ default-package-overrides:
- markov-chain ==0.0.3.4
- markov-chain-usage-model ==0.0.0
- mason ==0.2.5
- massiv ==1.0.2.0
- massiv ==1.0.3.0
- massiv-io ==1.0.0.1
- massiv-persist ==1.0.0.3
- massiv-serialise ==1.0.0.2
@ -1571,12 +1571,12 @@ default-package-overrides:
- microaeson ==0.1.0.1
- microlens ==0.4.12.0
- microlens-aeson ==2.5.0
- microlens-contra ==0.1.0.2
- microlens-contra ==0.1.0.3
- microlens-ghc ==0.4.13.2
- microlens-mtl ==0.2.0.2
- microlens-mtl ==0.2.0.3
- microlens-platform ==0.4.2.1
- microlens-process ==0.2.0.2
- microlens-th ==0.4.3.10
- microlens-th ==0.4.3.11
- microspec ==0.2.1.3
- microstache ==1.0.2.2
- midair ==0.2.0.1
@ -1644,7 +1644,7 @@ default-package-overrides:
- monad-time ==0.3.1.0
- mongoDB ==2.7.1.2
- monoidal-containers ==0.6.3.0
- monoid-extras ==0.6.1
- monoid-extras ==0.6.2
- monoid-subclasses ==1.1.3
- monoid-transformer ==0.0.4
- monomer ==1.5.0.0
@ -1726,7 +1726,7 @@ default-package-overrides:
- network-simple ==0.4.5
- network-simple-tls ==0.4
- network-transport ==0.5.6
- network-uri ==2.6.4.1
- network-uri ==2.6.4.2
- network-wait ==0.2.0.0
- newtype ==0.2.2.0
- newtype-generics ==0.6.2
@ -1762,9 +1762,9 @@ default-package-overrides:
- NumInstances ==1.4
- numtype-dk ==0.5.0.3
- nuxeo ==0.3.2
- nvim-hs ==2.3.1.0
- nvim-hs ==2.3.2.0
- nvim-hs-contrib ==2.0.0.1
- nvim-hs-ghcid ==2.0.0.0
- nvim-hs-ghcid ==2.0.1.0
- oauthenticated ==0.3.0.0
- ObjectName ==1.1.0.2
- oblivious-transfer ==0.1.0
@ -1781,7 +1781,7 @@ default-package-overrides:
- oo-prototypes ==0.1.0.0
- opaleye ==0.9.6.1
- OpenAL ==1.7.0.5
- openapi3 ==3.2.2
- openapi3 ==3.2.3
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
@ -1939,7 +1939,7 @@ default-package-overrides:
- polysemy-fs ==0.1.0.0
- polysemy-kvstore ==0.1.3.0
- polysemy-methodology ==0.2.2.0
- polysemy-plugin ==0.4.3.1
- polysemy-plugin ==0.4.4.0
- polysemy-several ==0.1.1.0
- polysemy-webserver ==0.2.1.1
- polysemy-zoo ==0.8.1.0
@ -2098,7 +2098,7 @@ default-package-overrides:
- record-dot-preprocessor ==0.2.15
- record-hasfield ==1.0
- rec-smallarray ==0.1.0.0
- recursion-schemes ==5.2.2.2
- recursion-schemes ==5.2.2.3
- recv ==0.0.0
- redact ==0.4.0.0
- reddit-scrape ==0.0.1
@ -2279,7 +2279,7 @@ default-package-overrides:
- servant-multipart ==0.12.1
- servant-multipart-api ==0.12.1
- servant-multipart-client ==0.12.1
- servant-openapi3 ==2.0.1.5
- servant-openapi3 ==2.0.1.6
- servant-pipes ==0.15.3
- servant-rate-limit ==0.2.0.0
- servant-rawm ==1.0.0.0
@ -2352,10 +2352,11 @@ default-package-overrides:
- skein ==1.0.9.4
- skews ==0.1.0.3
- skip-var ==0.1.1.0
- skylighting ==0.13.1.2
- skylighting-core ==0.13.1.2
- skylighting ==0.13.2
- skylighting-core ==0.13.2
- skylighting-format-ansi ==0.1
- skylighting-format-blaze-html ==0.1.1
- skylighting-format-context ==0.1.0.1
- skylighting-format-latex ==0.1
- slack-progressbar ==0.1.0.1
- slave-thread ==1.1.0.2
@ -2366,7 +2367,7 @@ default-package-overrides:
- socket ==0.8.3.0
- socks ==0.6.1
- solana-staking-csvs ==0.1.2.0
- some ==1.0.3
- some ==1.0.4.1
- some-dict-of ==0.1.0.2
- sop-core ==0.5.0.2
- sort ==1.0.0.0
@ -2459,7 +2460,7 @@ default-package-overrides:
- string-combinators ==0.6.0.5
- string-conv ==0.2.0
- string-conversions ==0.4.0.1
- string-interpolate ==0.3.1.2
- string-interpolate ==0.3.2.0
- stringprep ==1.0.0
- string-qq ==0.0.4
- string-random ==0.1.4.3
@ -2526,7 +2527,7 @@ default-package-overrides:
- tar ==0.5.1.1
- tar-conduit ==0.3.2
- tardis ==0.4.4.0
- tasty ==1.4.2.3
- tasty ==1.4.3
- tasty-ant-xml ==1.1.8
- tasty-autocollect ==0.3.2.0
- tasty-bench ==0.3.2
@ -2559,7 +2560,7 @@ default-package-overrides:
- tcp-streams ==1.0.1.1
- tdigest ==0.2.1.1
- teardown ==0.5.0.1
- telegram-bot-simple ==0.6
- telegram-bot-simple ==0.6.1
- template ==0.2.0.10
- template-haskell-compat-v0208 ==0.1.9.1
- temporary ==1.3
@ -2587,7 +2588,7 @@ default-package-overrides:
- text-ansi ==0.2.1
- text-binary ==0.2.1.1
- text-builder ==0.6.7
- text-builder-dev ==0.3.3
- text-builder-dev ==0.3.3.2
- text-conversions ==0.3.1.1
- text-icu ==0.8.0.2
- text-latin1 ==0.3.1
@ -2601,7 +2602,7 @@ default-package-overrides:
- text-rope ==0.2
- text-short ==0.1.5
- text-show ==3.10
- text-show-instances ==3.9.2
- text-show-instances ==3.9.3
- text-zipper ==0.12
- tfp ==1.0.2
- tf-random ==0.5
@ -2822,7 +2823,7 @@ default-package-overrides:
- vector-builder ==0.3.8.4
- vector-bytes-instances ==0.1.1
- vector-circular ==0.1.4
- vector-extras ==0.2.7.1
- vector-extras ==0.2.8
- vector-instances ==3.4
- vector-mmap ==0.0.3
- vector-rotcev ==0.1.0.1
@ -2895,7 +2896,7 @@ default-package-overrides:
- webrtc-vad ==0.1.0.3
- websockets ==0.12.7.3
- weigh ==0.0.16
- wide-word ==0.1.3.0
- wide-word ==0.1.4.0
- Win32 ==2.12.0.1
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1

17
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -239,6 +239,7 @@ dont-distribute-packages:
- JsContracts
- JsonGrammar
- JuPyTer-notebook
- JuicyPixels-scale-dct
- JunkDB-driver-gdbm
- JunkDB-driver-hashtables
- KiCS
@ -694,6 +695,7 @@ dont-distribute-packages:
- audiovisual
- aura
- authoring
- autodocodec-openapi3
- automata
- autonix-deps-kf5
- avers
@ -1357,15 +1359,11 @@ dont-distribute-packages:
- essence-of-live-coding-PortMidi
- essence-of-live-coding-gloss
- essence-of-live-coding-gloss-example
- essence-of-live-coding-gloss_0_2_7
- essence-of-live-coding-pulse
- essence-of-live-coding-pulse-example
- essence-of-live-coding-pulse_0_2_7
- essence-of-live-coding-quickcheck
- essence-of-live-coding-quickcheck_0_2_7
- essence-of-live-coding-vivid
- essence-of-live-coding-warp
- essence-of-live-coding-warp_0_2_7
- estimators
- estreps
- eternity
@ -1404,7 +1402,6 @@ dont-distribute-packages:
- exinst-serialise
- exist
- exist-instances
- exon
- expand
- expat-enumerator
- expiring-containers
@ -2427,6 +2424,8 @@ dont-distribute-packages:
- jmacro-rpc-happstack
- jmacro-rpc-snap
- join
- jordan-openapi
- jordan-servant-openapi
- jot
- jsaddle-hello
- jsc
@ -2875,6 +2874,7 @@ dont-distribute-packages:
- nakadi-client
- named-servant-client
- named-servant-server
- named-text
- nats-queue
- natural-number
- nemesis-titan
@ -3349,6 +3349,7 @@ dont-distribute-packages:
- remotion
- repa-array
- repa-convert
- repa-fftw
- repa-flow
- repa-plugin
- repa-stream
@ -3394,6 +3395,7 @@ dont-distribute-packages:
- ribosome-root
- ribosome-test
- ridley-extras
- rio-process-pool
- riot
- ripple
- ripple-federation
@ -3535,6 +3537,7 @@ dont-distribute-packages:
- servant-matrix-param
- servant-oauth2
- servant-oauth2-examples
- servant-openapi3
- servant-postgresql
- servant-pushbullet-client
- servant-rate-limit
@ -3547,6 +3550,8 @@ dont-distribute-packages:
- servant-streamly
- servant-swagger-tags
- servant-to-elm
- servant-util
- servant-util-beam-pg
- servant-waargonaut
- servant-zeppelin-client
- servant-zeppelin-server
@ -3721,6 +3726,7 @@ dont-distribute-packages:
- statsd-client
- statsdi
- stern-brocot
- stm-actor
- stm-supply
- stmcontrol
- storablevector-carray
@ -4133,6 +4139,7 @@ dont-distribute-packages:
- webcloud
- webcrank-wai
- webdriver-w3c
- webgear-openapi
- webify
- webserver
- websockets-rpc

6
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -723,10 +723,8 @@ self: super: builtins.intersectAttrs super {
'';
}) super.haskell-language-server;
# NOTE: this patch updates the hevm code to work with the latest packages that broke the build
# it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1
# tests depend on a specific version of solc
hevm = dontCheck (appendPatch ./patches/hevm-update-deps.patch super.hevm);
# there are three very heavy test suites that need external repos, one requires network access
hevm = dontCheck super.hevm;
# hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
# https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b

1700
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

129
pkgs/development/haskell-modules/patches/hevm-update-deps.patch
View file

@ -1,129 +0,0 @@
diff --git a/hevm.cabal b/hevm.cabal
index cf36961e..3b31f595 100644
--- a/hevm.cabal
+++ b/hevm.cabal
@@ -71,6 +71,10 @@ library
-Wall -Wno-deprecations
extra-libraries:
secp256k1, ff
+ if os(darwin)
+ extra-libraries: c++
+ else
+ extra-libraries: stdc++
c-sources:
ethjet/tinykeccak.c, ethjet/ethjet.c
cxx-sources:
@@ -88,7 +92,7 @@ library
transformers >= 0.5.6 && < 0.6,
tree-view >= 0.5 && < 0.6,
abstract-par >= 0.3.3 && < 0.4,
- aeson >= 1.5.6 && < 1.6,
+ aeson >= 2.0 && < 2.1,
bytestring >= 0.10.8 && < 0.11,
scientific >= 0.3.6 && < 0.4,
binary >= 0.8.6 && < 0.9,
@@ -97,7 +101,7 @@ library
vector >= 0.12.1 && < 0.13,
ansi-wl-pprint >= 0.6.9 && < 0.7,
base16-bytestring >= 1.0.0 && < 2.0,
- brick >= 0.58 && < 0.63,
+ brick >= 0.58 && < 0.69,
megaparsec >= 9.0.0 && < 10.0,
mtl >= 2.2.2 && < 2.3,
directory >= 1.3.3 && < 1.4,
@@ -105,13 +109,13 @@ library
vty >= 5.25.1 && < 5.34,
cereal >= 0.5.8 && < 0.6,
cryptonite >= 0.27 && <= 0.29,
- memory >= 0.14.18 && < 0.16,
+ memory >= 0.14.18 && < 0.20,
data-dword >= 0.3.1 && < 0.4,
fgl >= 5.7.0 && < 5.8,
free >= 5.1.3 && < 5.2,
haskeline >= 0.8.0 && < 0.9,
process >= 1.6.5 && < 1.7,
- lens >= 4.17.1 && < 4.20,
+ lens >= 4.17.1 && < 5.1,
lens-aeson >= 1.0.2 && < 1.2,
monad-par >= 0.3.5 && < 0.4,
multiset >= 0.3.4 && < 0.4,
@@ -124,7 +128,6 @@ library
sbv >= 8.9,
semver-range >= 0.2.7 && < 0.3,
temporary >= 1.3 && < 1.4,
- text-format >= 0.3.2 && < 0.4,
witherable >= 0.3.5 && < 0.5,
wreq >= 0.5.3 && < 0.6,
regex-tdfa >= 1.2.3 && < 1.4,
@@ -190,7 +193,6 @@ executable hevm
sbv,
temporary,
text,
- text-format,
unordered-containers,
vector,
vty
diff --git a/src/EVM/Solidity.hs b/src/EVM/Solidity.hs
index b7d0f36b..4e9d6892 100644
--- a/src/EVM/Solidity.hs
+++ b/src/EVM/Solidity.hs
@@ -70,6 +70,7 @@ import Control.Monad
import Control.Lens hiding (Indexed, (.=))
import qualified Data.String.Here as Here
import Data.Aeson hiding (json)
+import qualified Data.Aeson.KeyMap as KeyMap
import Data.Aeson.Types
import Data.Aeson.Lens
import Data.Scientific
@@ -714,8 +715,8 @@ astIdMap = foldMap f
f :: Value -> Map Int Value
f (Array x) = foldMap f x
f v@(Object x) =
- let t = foldMap f (HMap.elems x)
- in case HMap.lookup "id" x of
+ let t = foldMap f (KeyMap.elems x)
+ in case KeyMap.lookup "id" x of
Nothing -> t
Just (Number i) -> t <> Map.singleton (round i) v
Just _ -> t
diff --git a/src/EVM/SymExec.hs b/src/EVM/SymExec.hs
index 5bbf1c03..b828098e 100644
--- a/src/EVM/SymExec.hs
+++ b/src/EVM/SymExec.hs
@@ -40,8 +40,8 @@ type EquivalenceResult = ProofResult ([VM], [VM]) VM ()
-- | Convenience functions for generating large symbolic byte strings
sbytes32, sbytes128, sbytes256, sbytes512, sbytes1024 :: Query ([SWord 8])
-sbytes32 = toBytes <$> freshVar_ @ (WordN 256)
-sbytes128 = toBytes <$> freshVar_ @ (WordN 1024)
+sbytes32 = toBytes <$> freshVar_ @(WordN 256)
+sbytes128 = toBytes <$> freshVar_ @(WordN 1024)
sbytes256 = liftA2 (++) sbytes128 sbytes128
sbytes512 = liftA2 (++) sbytes256 sbytes256
sbytes1024 = liftA2 (++) sbytes512 sbytes512
diff --git a/src/EVM/Types.hs b/src/EVM/Types.hs
index fdd2368d..1dc29e83 100644
--- a/src/EVM/Types.hs
+++ b/src/EVM/Types.hs
@@ -434,17 +434,17 @@ readN s = fromIntegral (read s :: Integer)
readNull :: Read a => a -> String -> a
readNull x = fromMaybe x . Text.Read.readMaybe
-wordField :: JSON.Object -> Text -> JSON.Parser W256
+wordField :: JSON.Object -> Key -> JSON.Parser W256
wordField x f = ((readNull 0) . Text.unpack)
<$> (x .: f)
-addrField :: JSON.Object -> Text -> JSON.Parser Addr
+addrField :: JSON.Object -> Key -> JSON.Parser Addr
addrField x f = (read . Text.unpack) <$> (x .: f)
-addrFieldMaybe :: JSON.Object -> Text -> JSON.Parser (Maybe Addr)
+addrFieldMaybe :: JSON.Object -> Key -> JSON.Parser (Maybe Addr)
addrFieldMaybe x f = (Text.Read.readMaybe . Text.unpack) <$> (x .: f)
-dataField :: JSON.Object -> Text -> JSON.Parser ByteString
+dataField :: JSON.Object -> Key -> JSON.Parser ByteString
dataField x f = hexText <$> (x .: f)
toWord512 :: W256 -> Word512

24
pkgs/development/haskell-modules/patches/recursion-schemes-128.patch
View file

@ -1,24 +0,0 @@
diff --git a/recursion-schemes.cabal b/recursion-schemes.cabal
index c35f2c6..e692ade 100644
--- a/recursion-schemes.cabal
+++ b/recursion-schemes.cabal
@@ -93,6 +93,7 @@ library
Paths_recursion_schemes
ghc-options: -Wall
+ ghc-prof-options: -DPROFILING_ENABLED
if impl(ghc >= 8.6)
ghc-options: -Wno-star-is-type
default-language: Haskell2010
diff --git a/src/Data/Functor/Foldable/TH.hs b/src/Data/Functor/Foldable/TH.hs
index b3d5ac8..d4ef0e4 100644
--- a/src/Data/Functor/Foldable/TH.hs
+++ b/src/Data/Functor/Foldable/TH.hs
@@ -1,4 +1,7 @@
{-# LANGUAGE CPP, PatternGuards, Rank2Types #-}
+#if defined(PROFILING_ENABLED)
+{-# OPTIONS_GHC -O0 #-}
+#endif
module Data.Functor.Foldable.TH
( MakeBaseFunctor(..)
, BaseRules

18
pkgs/development/libraries/libbluray/default.nix
View file

@ -11,27 +11,13 @@
stdenv.mkDerivation rec {
pname = "libbluray";
version = "1.3.2";
version = "1.3.4";
src = fetchurl {
url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-RWgU258Hwe7N736ED8uyCXbvgU34dUKL+4Hs9FhR8XA=";
hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys=";
};
patches = [
./BDJ-JARFILE-path.patch
(fetchpatch {
name = "Initial-support-for-Java-18.patch";
url = "https://code.videolan.org/videolan/libbluray/-/commit/3187c3080096e107f0a27eed1843232b58342577.patch";
hash = "sha256-2TSciAoPzELkgmFGB38h1RgynOCJueyCL8hIADxAPHo=";
})
(fetchpatch {
name = "bd-j-BDJSecurityManager-Change-setSecurityManager-de.patch";
url = "https://code.videolan.org/videolan/libbluray/-/commit/9a2d23d049760ef9cc9661ff90011a84d90368f1.patch";
hash = "sha256-xCc2h5ocXCqnpVMPQaybT2Ncs2YOzifQ0mlCCUhYlc8=";
})
];
nativeBuildInputs = [ pkg-config autoreconfHook ]
++ lib.optionals withJava [ ant ];

9
pkgs/development/python-modules/ansible-lint/default.nix
View file

@ -22,13 +22,14 @@
buildPythonPackage rec {
pname = "ansible-lint";
version = "6.10.0";
version = "6.10.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9ezsWOvntr/El2vn1uQAQRqK8FsOGhnxXyX1nzQBNIw=";
hash = "sha256-JPFbYa9SvCKwXQCPnrdmLxz0KrdACNqfia9x/FQMz6Q=";
};
postPatch = ''
@ -91,15 +92,15 @@ buildPythonPackage rec {
"test_run_inside_role_dir"
"test_run_multiple_role_path_no_trailing_slash"
"test_runner_exclude_globs"
"test_discover_lintables_umlaut"
];
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ];
meta = with lib; {
homepage = "https://github.com/ansible/ansible-lint";
description = "Best practices checker for Ansible";
homepage = "https://github.com/ansible/ansible-lint";
changelog = "https://github.com/ansible/ansible-lint/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ sengaya ];
};

2
pkgs/development/python-modules/cachecontrol/default.nix
View file

@ -18,6 +18,8 @@ buildPythonPackage rec {
disabled = pythonOlder "3.6";
__darwinAllowLocalNetworking = true;
src = fetchFromGitHub {
owner = "ionrock";
repo = pname;

12
pkgs/development/python-modules/ghrepo-stats/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, beautifulsoup4
, buildPythonPackage
, fetchFromGitHub
, matplotlib
@ -8,7 +9,7 @@
buildPythonPackage rec {
pname = "ghrepo-stats";
version = "0.4.0";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,10 +18,17 @@ buildPythonPackage rec {
owner = "mrbean-bremen";
repo = pname;
rev = "v${version}";
hash = "sha256-KFjqHrN0prcqu3wEPZpa7rLfuD0X/DN7BMo4zcHNmYo=";
hash = "sha256-rTW6wADpkP9GglNmQNVecHfA2yJZuzYhJfsLfucbcgY=";
};
postPatch = ''
# https://github.com/mrbean-bremen/ghrepo-stats/pull/1
substituteInPlace setup.py \
--replace "bs4" "beautifulsoup4"
'';
propagatedBuildInputs = [
beautifulsoup4
matplotlib
PyGithub
];

4
pkgs/development/python-modules/meross-iot/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
version = "0.4.5.2";
version = "0.4.5.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = "MerossIot";
rev = "refs/tags/${version}";
hash = "sha256-gT4HxdmyX7oOQFBo1frkmmoXrNfGOcqL0hPZ40kRZeo=";
hash = "sha256-HPA3oeanFHx+g0nt/nsTzG3RTCdsjNSvDCXILR271P4=";
};
propagatedBuildInputs = [

7
pkgs/development/python-modules/pypck/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pypck";
version = "0.7.15";
version = "0.7.16";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "alengwenus";
repo = pname;
rev = version;
hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g=";
rev = "refs/tags/${version}";
hash = "sha256-OcXMVgG62JUH28BGvfO/rpnC++/klhBLJ2HafDu9R40=";
};
checkInputs = [
@ -45,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "LCN-PCK library written in Python";
homepage = "https://github.com/alengwenus/pypck";
changelog = "https://github.com/alengwenus/pypck/releases/tag/${version}";
license = with licenses; [ epl20 ];
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/python-fsutil/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "python-fsutil";
version = "0.8.0";
version = "0.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-J5B5THfB/yPG1JSCpO2HTHTH0jn0nbKFzXpZMGJ/dKA=";
hash = "sha256-rMQjsGqdiXe8zS18hZQAro3UWyHPjNJYyQ/NAoxbE7k=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/python-ipmi/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "python-ipmi";
version = "0.5.2";
version = "0.5.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kontron";
repo = pname;
rev = version;
sha256 = "sha256-VXWSoVRfgJWf9rOT4SE1mTJdeNmzR3TRc2pc6Pp1M5U=";
sha256 = "sha256-Y8HJ7MXYHJRUWPTcw8p+GGSFswuRI7u+/bIaJpKy7lY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/roonapi/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "roonapi";
version = "0.1.2";
version = "0.1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pavoni";
repo = "pyroon";
rev = version;
hash = "sha256-HcHs9UhRbSKTxW5qEvmMrQ+kWIBAqVpyldapx635uNM=";
hash = "sha256-QOFBNTz8g3f6C8Vjkblrd3QFCRrA1WqOCv6xS4GbFC4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/skodaconnect/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "skodaconnect";
version = "1.2.5";
version = "1.3.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "lendy007";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Re6ECMaDmg007XHw9Kpa46+oEs+01CzOZzszKzKS4WA=";
hash = "sha256-1x1TQNhKL3RgoeYSB8l607mHt0VrHwOU1CFemoaTCt8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

7
pkgs/development/python-modules/socialscan/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "socialscan";
version = "1.4.2";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iojw";
repo = pname;
rev = "v${version}";
sha256 = "rT+/j6UqDOzuNBdN3I74YIxS6qkhd7BjHCGX+gGjprc=";
rev = "refs/tags/v${version}";
sha256 = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs=";
};
propagatedBuildInputs = [
@ -37,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library and CLI for accurately querying username and email usage on online platforms";
homepage = "https://github.com/iojw/socialscan";
changelog = "https://github.com/iojw/socialscan/releases/tag/v${version}";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ fab ];
};

25
pkgs/development/python-modules/tubeup/default.nix
View file

@ -4,29 +4,39 @@
, fetchPypi
, yt-dlp
, docopt
, isPy27
, pythonOlder
, urllib3
}:
buildPythonPackage rec {
pname = "tubeup";
version = "0.0.34";
version = "0.0.35";
format = "setuptools";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "ae1e606b243fd70742f8b5871c497628d258ee9f416caa46544aca9a5fbfbca0";
sha256 = "006aea68bb8d967a7427c58ee7862e3f2481dae667c2bbcfb1a1f2fd80e665d1";
};
postPatch = ''
substituteInPlace setup.py \
--replace "internetarchive==3.0.2" "internetarchive" \
--replace "urllib3==1.26.13" "urllib3" \
--replace "docopt==0.6.2" "docopt"
'';
propagatedBuildInputs = [ internetarchive docopt yt-dlp ];
propagatedBuildInputs = [
internetarchive
docopt
urllib3
yt-dlp
];
pythonImportsCheck = [ "tubeup" ];
pythonImportsCheck = [
"tubeup"
];
# Tests failing upstream
doCheck = false;
@ -34,7 +44,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Youtube (and other video site) to Internet Archive Uploader";
homepage = "https://github.com/bibanon/tubeup";
changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}";
license = licenses.gpl3Only;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

17
pkgs/development/tools/build-managers/tup/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, pcre }:
{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre }:
let
fuse = if stdenv.isDarwin then macfuse-stubs else fuse3;
@ -15,13 +15,24 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fuse pcre ];
buildInputs = [ fuse pcre sqlite ];
patches = [ ./fusermount-setuid.patch ];
configurePhase = ''
substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}'
substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre'
for f in Tupfile Tuprules.tup src/tup/server/Tupfile build.sh; do
substituteInPlace "$f" \
--replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \
--replace "pcre-config" "${stdenv.cc.targetPrefix}pkg-config libpcre"
done
cat << EOF > tup.config
CONFIG_CC=${stdenv.cc.targetPrefix}cc
CONFIG_AR=${stdenv.cc.targetPrefix}ar
CONFIG_TUP_USE_SYSTEM_SQLITE=y
EOF
'';
# Regular tup builds require fusermount to have suid, which nix cannot

10
pkgs/development/tools/haskell/vaultenv/default.nix
View file

@ -19,6 +19,7 @@
, parser-combinators
, retry
, lib
, quickcheck-instances
, text
, unix
, unordered-containers
@ -28,13 +29,13 @@
}:
mkDerivation rec {
pname = "vaultenv";
version = "0.14.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "channable";
repo = "vaultenv";
rev = "v${version}";
sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI=";
sha256 = "sha256-yoYkAypH+HQSVTvd/qKNFkL5krbB5mZw3ec9ojvy+Pw=";
};
buildTools = [ hpack ];
@ -86,6 +87,7 @@ mkDerivation rec {
optparse-applicative
parser-combinators
retry
quickcheck-instances
text
unix
unordered-containers
@ -96,8 +98,4 @@ mkDerivation rec {
description = "Runs processes with secrets from HashiCorp Vault";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ lnl7 manveru ];
# Does not compile on ghc92
hydraPlatforms = lib.platforms.none;
broken = true;
}

15
pkgs/os-specific/linux/systemd/default.nix
View file

@ -70,9 +70,16 @@
# the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to be available during build time.
# Only libbpf should be a runtime dependency.
# Note: llvmPackages is explicitly taken from buildPackages instead of relying
# on splicing. Splicing will evaluate the adjacent (pkgsHostTarget) llvmPackages
# which is sometimes problematic: llvmPackages.clang looks at targetPackages.stdenv.cc
# which, in the unfortunate case of pkgsCross.ghcjs, `throw`s. If we explicitly
# take buildPackages.llvmPackages, this is no problem because
# `buildPackages.targetPackages.stdenv.cc == stdenv.cc` relative to us. Working
# around this is important, because systemd is in the dependency closure of
# GHC via emscripten and jdk.
, bpftools
, libbpf
, llvmPackages
, withAnalyze ? true
, withApparmor ? true
@ -86,7 +93,7 @@
, withHostnamed ? true
, withHwdb ? true
, withImportd ? !stdenv.hostPlatform.isMusl
, withLibBPF ? lib.versionAtLeast llvmPackages.clang.version "10.0"
, withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0"
, withLocaled ? true
, withLogind ? true
, withMachined ? true
@ -368,8 +375,8 @@ stdenv.mkDerivation {
]
++ lib.optionals withLibBPF [
bpftools
llvmPackages.clang
llvmPackages.libllvm
buildPackages.llvmPackages.clang
buildPackages.llvmPackages.libllvm
]
;

3
pkgs/servers/apcupsd/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, systemd, util-linux, coreutils, wall, hostname, man
, enableCgiScripts ? true, gd
, nixosTests
}:
assert enableCgiScripts -> gd != null;
@ -52,6 +53,8 @@ stdenv.mkDerivation rec {
done
'';
passthru.tests.smoke = nixosTests.apcupsd;
meta = with lib; {
description = "Daemon for controlling APC UPSes";
homepage = "http://www.apcupsd.com/";

2
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.12.8";
version = "2022.12.9";
components = {
"3_day_blinds" = ps: with ps; [
];

4
pkgs/servers/home-assistant/default.nix
View file

@ -190,7 +190,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.12.8";
hassVersion = "2022.12.9";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -208,7 +208,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-oJwA0YELlgMbnf1XiLDGlMLrvFaLP7WMv9/0KOI4XDI=";
hash = "sha256-tf2H4+79CGTmbKZtJpzYOzAgi90RpSy89hoDNS24m0Q=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

23
pkgs/tools/filesystems/gcsfuse/default.nix
View file

@ -1,21 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "gcsfuse";
version = "0.41.9";
version = "0.41.10";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
sha256 = "sha256-hfdQa0e1S1cIF4V2XPFBl4jzzTWlIxZIJ99PRxCP55s=";
rev = "refs/tags/${version}";
hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc=";
};
vendorSha256 = null;
subPackages = [ "." "tools/mount_gcsfuse" ];
subPackages = [
"."
"tools/mount_gcsfuse"
];
ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ];
ldflags = [
"-s"
"-w"
"-X main.gcsfuseVersion=${version}"
];
preCheck =
let skippedTests = [
@ -35,6 +45,7 @@ buildGoModule rec {
meta = with lib;{
description = "A user-space file system for interacting with Google Cloud Storage";
homepage = "https://cloud.google.com/storage/docs/gcs-fuse";
changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ aaronjheng ];

14
pkgs/tools/misc/broot/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, rustPlatform
, fetchCrate
, fetchFromGitHub
, installShellFiles
, makeWrapper
, pkg-config
@ -15,14 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.18.0";
version = "1.19.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-GR0a5NDJBcRLoNOeG6S+fP3Fr7r5fVB9oEcjANRYJt4=";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
hash = "sha256-pg+eHmClDd04tWljQUS0IRyMzkHnkpkofuhz/KyQbWo=";
};
cargoHash = "sha256-Hk9bc1mo8GxcPICKXc9zDq18S5TZElDncxJ+w2fC2do=";
cargoHash = "sha256-+RUYC39L7yyh1xYPfZn7tDIf1cmmBuGcqTNibFk7s6M=";
nativeBuildInputs = [
installShellFiles

8
pkgs/tools/networking/iwgtk/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "iwgtk";
version = "0.8";
version = "0.9";
src = fetchFromGitHub {
owner = "j-lentz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-89rzDxalZtQkwAKS6hKPVY87kOWPySwDeZrPs2rGs/k=";
sha256 = "sha256-/Nxti4PfYVLnIiBgtAuR3KGI8dULszuSdTp+2DzBfbs=";
};
# patch systemd service to pass necessary environments and use absolute paths
@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk4 qrencode ];
postInstall = ''
mv $out/share/lib/systemd $out/share
rmdir $out/share/lib
substituteInPlace $out/share/systemd/user/iwgtk.service --subst-var out
substituteInPlace $out/lib/systemd/user/iwgtk.service --subst-var out
'';
meta = with lib; {

43
pkgs/tools/networking/nfdump/default.nix
View file

@ -1,22 +1,40 @@
{ lib, stdenv, fetchFromGitHub
, autoconf, automake, libtool, pkg-config
, bzip2, libpcap, flex, bison }:
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, automake
, libtool
, pkg-config
, bzip2
, libpcap
, flex
, bison
}:
let version = "1.7.0.1"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "nfdump";
inherit version;
version = "1.7.1";
src = fetchFromGitHub {
owner = "phaag";
repo = "nfdump";
rev = "v${version}";
sha256 = "sha256-yD/NFGw38ishqQmKhlnHYodXmJuezI09hxNsyObZ1QE=";
rev = "refs/tags/v${version}";
hash = "sha256-oCaJPx6+C0NQSuUcsP54sycNLt/zaqe5c81dwHNBcnQ=";
};
nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ];
buildInputs = [ bzip2 libpcap ];
nativeBuildInputs = [
autoconf
automake
flex
libtool
pkg-config
bison
];
buildInputs = [
bzip2
libpcap
];
preConfigure = ''
# The script defaults to glibtoolize on darwin, so we pass the correct
@ -37,8 +55,9 @@ stdenv.mkDerivation {
nfdump is a set of tools for working with netflow data.
'';
homepage = "https://github.com/phaag/nfdump";
changelog = "https://github.com/phaag/nfdump/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = [ maintainers.takikawa ];
maintainers = with maintainers; [ takikawa ];
platforms = platforms.unix;
};
}

4
pkgs/tools/security/mitmproxy2swagger/default.nix
View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "mitmproxy2swagger";
version = "0.7.1";
version = "0.7.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "alufers";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-morBtuRZZ/d3ye8aB+m2dSwWoaF3JJ92c+CgF71MqH4=";
hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA=";
};
nativeBuildInputs = with python3.pkgs; [

60
pkgs/tools/security/trufflehog/default.nix
View file

@ -1,43 +1,33 @@
{ lib
, python3Packages
, fetchFromGitHub
, buildGoModule
}:
let
truffleHogRegexes = python3Packages.buildPythonPackage rec {
pname = "truffleHogRegexes";
version = "0.0.7";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405";
};
buildGoModule rec {
pname = "trufflehog";
version = "3.21.0";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-rse5uyQ7EUBhs0IyC92B/Z7YCeNIXTlZEqrlcjFekgA=";
};
in
python3Packages.buildPythonApplication rec {
pname = "truffleHog";
version = "2.2.1";
src = python3Packages.fetchPypi {
inherit pname version;
hash = "sha256-fw0JyM2iqQrkL4FAXllEozJdkKWELS3eAURx5NZcceQ=";
};
vendorHash = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk=";
# Relax overly restricted version constraint
postPatch = ''
substituteInPlace setup.py --replace "GitPython ==" "GitPython >= "
'';
# Test cases run git clone and require network access
doCheck = false;
propagatedBuildInputs = [
python3Packages.gitpython
truffleHogRegexes
];
postInstall = ''
rm $out/bin/{generate,snifftest}
'';
# Test cases run git clone and require network access
doCheck = false;
meta = with lib; {
homepage = "https://github.com/dxa4481/truffleHog";
description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history";
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ bhipple ];
};
}
meta = with lib; {
description = "Find credentials all over the place";
homepage = "https://github.com/trufflesecurity/trufflehog";
changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/v${version}";
license = with licenses; [ agpl3 ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -30192,6 +30192,8 @@ with pkgs;
kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
keet = callPackage ../applications/networking/instant-messengers/keet { };
kepubify = callPackage ../tools/misc/kepubify { };
kermit = callPackage ../tools/misc/kermit { };

6
pkgs/top-level/haskell-packages.nix
View file

@ -277,9 +277,9 @@ in {
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# 2022-08-04: Support range >= 10 && < 14
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
# 2022-08-04: Support range >= 10 && < 15
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14;
llvmPackages = pkgs.llvmPackages_14;
};
ghcjs = compiler.ghcjs810;