diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index c51d50fdc42b3..ebf4429b24131 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
- version = "1.50";
+ version = "1.51";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
- sha256 = "sha256-IZakhYVtVXmcKwUMl/v1w6Huu5XWQfaBCatTN4hQAbM=";
+ sha256 = "sha256-kTYtn68gPwEHZjJl/Vmr5lTtxyEB6r3EGQlVSlBpCZg=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix
index 942c411762b7d..eb430130104b3 100644
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
- version = "1.6.6";
+ version = "1.6.9";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-790/XBeFS1iM73WuBMXcEoB3gjBlU1dMPRwtQNB7taE=";
+ sha256 = "sha256-kN+/TQCc35iI8gr9pYlW4B3B6WasGyKQffkJ8rMffVk=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix
index 4dcbafb87d0e2..8112240c0b1cd 100644
--- a/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -31,8 +31,8 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.All";
- version = "1.3.12";
- sha256 = "005nl3sl3awdpwnvdsww8kg4ysj804459a5yip283fy7a29xagyh";
+ version = "1.3.13";
+ sha256 = "103isdymijx4bdpjs968dmfc26kdxjzvqlca2p7vxxzp8ww7yjcz";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Charge";
@@ -71,8 +71,8 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LNDhub";
- version = "1.0.2";
- sha256 = "1jyn0r9qm9r8szmzx0g0ja2k93r8adi1vn100c8d9wpnr83xwj03";
+ version = "1.0.3";
+ sha256 = "185b9b7h00w92mg5cgwfr94b8lz2xbg8wyhjbzkmb0588crv3y8k";
})
(fetchNuGet {
pname = "BuildBundlerMinifier";
@@ -1091,8 +1091,8 @@
})
(fetchNuGet {
pname = "Selenium.WebDriver.ChromeDriver";
- version = "103.0.5060.5300";
- sha256 = "1dr1d4nx2qb6is29p3rsmp254v1v6c24pdsx7kyj1yamh89sqd5k";
+ version = "104.0.5112.7900";
+ sha256 = "0mq6m5qmlxaq37nh1pzm13s1s4abdgamwwazdc53gf5ll0qwcyxb";
})
(fetchNuGet {
pname = "Selenium.WebDriver";
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index e903b77779d93..9eee028949df7 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
- version = "1.22.7";
+ version = "1.24.0";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
- sha256 = "sha256-A6nWH/WqFxTEIfOQcTRluAX0ORMNiyxfC/XLC8fmbdI=";
+ sha256 = "sha256-2yEUMD3FQ9JrecCnWSr0Fej4ngk7HVCZUgbRqmGbCK8=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/tasktimer/default.nix b/pkgs/applications/misc/tasktimer/default.nix
new file mode 100644
index 0000000000000..669fead0a0e88
--- /dev/null
+++ b/pkgs/applications/misc/tasktimer/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "tasktimer";
+ version = "1.9.4";
+
+ src = fetchFromGitHub {
+ owner = "caarlos0";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-M88JzcK9HwHeWbQ0McbCF1rIEiKnwh08oEoRck4A/Ho=";
+ };
+
+ vendorSha256 = "sha256-5OSAa7tGPtGyx0bet82FRoIozhhlFtakbPt6PtCTHd0=";
+
+ postInstall = ''
+ mv $out/bin/tasktimer $out/bin/tt
+ '';
+
+ meta = with lib; {
+ description = "Task Timer (tt) is a dead simple TUI task timer";
+ homepage = "https://github.com/caarlos0/tasktimer";
+ license = licenses.mit;
+ maintainers = with maintainers; [ abbe ];
+ mainProgram = "tt";
+ };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 5bd24faafe409..79a53fbfea470 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -3,7 +3,7 @@
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
-, lib
+, lib, libkrb5
# package customization
# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
@@ -169,13 +169,16 @@ in stdenv.mkDerivation {
# needed for XDG_ICON_DIRS
gnome.adwaita-icon-theme
+
+ # Needed for kerberos at runtime
+ libkrb5
];
outputs = ["out" "sandbox"];
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
- libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 ];
+ libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 libkrb5 ];
in with lib; ''
mkdir -p "$out/bin"
diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix
index cde1c27769b35..b71c0b50c1daf 100644
--- a/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/pkgs/applications/networking/cluster/arkade/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "arkade";
- version = "0.8.32";
+ version = "0.8.34";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
- sha256 = "sha256-Yat9RIsbMCGVwu7xqC2xNUPZACpMG+ATsQN7d2n0eFU=";
+ sha256 = "sha256-nGAR+CYVE2acXRRJCl6nWTrjpbX6HArsys9Df8D/hEE=";
};
CGO_ENABLED = 0;
diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix
index c8ce60c55debd..5db28a0ac859d 100644
--- a/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "glooctl";
- version = "1.12.6";
+ version = "1.12.7";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
- hash = "sha256-g2cKT3ZTLYFBCw3xlcuB2qZ6MTV7qBfN7sieenFUeMM=";
+ hash = "sha256-GFexXy/vH8rbtoxGo0Sy6cO+FxLTGaO67BkBPgaHuws=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix
index 48bd29ed7f9cf..df2379b6c704e 100644
--- a/pkgs/applications/radio/freedv/default.nix
+++ b/pkgs/applications/radio/freedv/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "freedv";
- version = "1.8.3";
+ version = "1.8.3.1";
src = fetchFromGitHub {
owner = "drowe67";
repo = "freedv-gui";
rev = "v${version}";
- hash = "sha256-hZcaA8ZAkNigWwcaU8K6R6atNi8pqIUUEwkje+3sW8A=";
+ hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
index 71c8bf179041f..19e3a58baf408 100644
--- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "git-delete-merged-branches";
- version = "7.0.0";
+ version = "7.2.0";
src = fetchFromGitHub {
owner = "hartwork";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-CPJhd3QXXNm4RGBEDnNOohVOYKVI6I8uc3cDiTrXKvc=";
+ sha256 = "sha256-pdP+DDJOSqr/fUQPtb84l/8J4EA81nlk/U8h24X8n+I=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix
index 22a8b96373325..fbaf0b18ffbe0 100644
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
- version = "0.2.13";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZI29kcGteyJWUfCC/DR92YqzfuVYqDx7FtedehVp+vs=";
+ sha256 = "sha256-WLT9dkaoPHusPBD6oZQSR1KGR1/Lt1jB4+BLhuAXo50=";
};
- cargoSha256 = "sha256-Njvf5+i54TLbcWtWiNefEWudtGsSjw+DJh+FP6OuLek=";
+ cargoSha256 = "sha256-aV0Cg4hbcGylQjx09rHvwHbre/OSALvekEifRYr89D8=";
# skip test due FHS dependency
doCheck = false;
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 0678176b571d1..2edec27046011 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
{
- "commit": "7a6596613e0d6549f329cb3c2862b035667e0fc3",
- "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7a6596613e0d6549f329cb3c2862b035667e0fc3.tar.gz",
- "sha256": "07sm18dn6lsi8xjhfhm7dyw62lpln9wyhafkigc6f3xaqblz3ap4",
- "msg": "Update from Hackage at 2022-08-07T14:05:30Z"
+ "commit": "eb862a59277fd86ad3138e9f25e793f0fe0364ba",
+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/eb862a59277fd86ad3138e9f25e793f0fe0364ba.tar.gz",
+ "sha256": "10agwlxzp76lnp4d6zncvjgv78hr3rss3j3i3bfpsn3i7af1qcw8",
+ "msg": "Update from Hackage at 2022-08-09T06:14:32Z"
}
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index efe46904ff967..5b0deb32032f6 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -147,6 +147,7 @@ stdenv.mkDerivation rec {
intltool
gtk-doc
perl
+ python3.pkgs.wrapPython
];
# use locales from cinnamon-translations (not using --localedir because datadir is used)
@@ -184,6 +185,17 @@ stdenv.mkDerivation rec {
patchShebangs src/data-to-c.pl
'';
+ preFixup = ''
+ # https://github.com/NixOS/nixpkgs/issues/101881
+ gappsWrapperArgs+=(
+ --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
+ )
+
+ # https://github.com/NixOS/nixpkgs/issues/129946
+ buildPythonPath "${python3.pkgs.xapp}"
+ patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+ '';
+
passthru = {
providedSessions = [ "cinnamon" "cinnamon2d" ];
};
diff --git a/pkgs/development/compilers/ghc/9.4.1.nix b/pkgs/development/compilers/ghc/9.4.1.nix
index e24f9fbb3767e..71921f5e76398 100644
--- a/pkgs/development/compilers/ghc/9.4.1.nix
+++ b/pkgs/development/compilers/ghc/9.4.1.nix
@@ -177,32 +177,27 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
stdenv.mkDerivation (rec {
- version = "9.4.0.20220721";
+ version = "9.4.1";
pname = "${targetPrefix}ghc${variantSuffix}";
src = fetchurl {
- url = "https://downloads.haskell.org/ghc/9.4.1-rc1/ghc-${version}-src.tar.xz";
- sha256 = "bca8c52f76d8747a66291181de2de7bdf9ff80093808fe39bf5cbff0f116c426";
+ url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+ sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM=";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
+
patches = [
- # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
- (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
- sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
- extraPrefix = "utils/haddock/";
- stripLen = 1;
- })
- # fix race condition in make build system
+ # add missing profiling targets in make build system
(fetchpatch {
- name = "ghc-hs-boot-copying-fix.patch";
- url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff";
- sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx";
+ name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";
+ sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";
})
+ ./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
];
postPatch = "patchShebangs .";
@@ -240,14 +235,6 @@ stdenv.mkDerivation (rec {
'' + ''
echo -n "${buildMK}" > mk/build.mk
- # GHC 9.4.1-rc1 tarball is not properly prepared, also the boot script has been renamed
- # https://gitlab.haskell.org/ghc/ghc/-/issues/21626#note_444654
- # TODO(@sternenseemann): make source-dist rules include all boot-generated files
- ./boot.source
-
- # Too restrictive upper bound on Cabal the make build system chokes on
- # XXX(@sternenseemann): this should be upstreamed
- substituteInPlace utils/ghc-cabal/ghc-cabal.cabal --replace "3.8" "3.9"
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
@@ -277,6 +264,13 @@ stdenv.mkDerivation (rec {
--replace '*-android*|*-gnueabi*)' \
'*-android*|*-gnueabi*|*-musleabi*)'
done
+ ''
+ # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have
+ # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian.
+ + ''
+ substituteInPlace configure --replace \
+ 'MinBootGhcVersion="9.0"' \
+ 'MinBootGhcVersion="8.10"'
'';
# TODO(@Ericson2314): Always pass "--target" and always prefix.
diff --git a/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch b/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
new file mode 100644
index 0000000000000..e10fb5cb280d4
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
@@ -0,0 +1,18 @@
+diff --git a/ghc.mk b/ghc.mk
+index dd65e7adfe..b91af56078 100644
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -509,11 +509,13 @@ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.o: libra
+ libraries/containers/containers/dist-install/build/Data/Graph.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+ libraries/containers/containers/dist-install/build/Data/Set/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+ libraries/containers/containers/dist-install/build/Data/IntSet/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
++libraries/containers/containers/dist-install/build/Data/Sequence/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+
+ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+ libraries/containers/containers/dist-install/build/Data/Graph.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+ libraries/containers/containers/dist-install/build/Data/Set/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+ libraries/containers/containers/dist-install/build/Data/IntSet/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
++libraries/containers/containers/dist-install/build/Data/Sequence/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+
+ ifeq "$(BIGNUM_BACKEND)" "gmp"
+ GMP_ENABLED = YES
diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix
new file mode 100644
index 0000000000000..b3b34aa8e8378
--- /dev/null
+++ b/pkgs/development/compilers/p4c/default.nix
@@ -0,0 +1,88 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, boehmgc
+, bison
+, flex
+, protobuf
+, gmp
+, boost
+, python3
+, doxygen
+, graphviz
+, libbpf
+, libllvm
+, enableDocumentation ? true
+, enableBPF ? true
+, enableDPDK ? true
+, enableBMV2 ? true
+, enableGraphBackend ? true
+, enableP4Tests ? true
+, enableGTests ? true
+, enableMultithreading ? false
+}:
+let
+ toCMakeBoolean = v: if v then "ON" else "OFF";
+in
+stdenv.mkDerivation rec {
+ pname = "p4c";
+ version = "1.2.2.1";
+
+ src = fetchFromGitHub {
+ owner = "p4lang";
+ repo = "p4c";
+ rev = "v${version}";
+ sha256 = "sha256-XIZ7Cm5zfr5XA+s0aSG1WwWHCPjAYv/YoBWTRaXi9rQ=";
+ fetchSubmodules = true;
+ };
+
+ postFetch = ''
+ rm -rf backends/ebpf/runtime/contrib/libbpf
+ rm -rf control-plane/p4runtime
+ '';
+
+ cmakeFlags = [
+ "-DENABLE_BMV2=${toCMakeBoolean enableBMV2}"
+ "-DENABLE_EBPF=${toCMakeBoolean enableBPF}"
+ "-DENABLE_UBPF=${toCMakeBoolean enableBPF}"
+ "-DENABLE_DPDK=${toCMakeBoolean enableDPDK}"
+ "-DENABLE_P4C_GRAPHS=${toCMakeBoolean enableGraphBackend}"
+ "-DENABLE_P4TEST=${toCMakeBoolean enableP4Tests}"
+ "-DENABLE_DOCS=${toCMakeBoolean enableDocumentation}"
+ "-DENABLE_GC=ON"
+ "-DENABLE_GTESTS=${toCMakeBoolean enableGTests}"
+ "-DENABLE_PROTOBUF_STATIC=ON"
+ "-DENABLE_MULTITHREAD=${toCMakeBoolean enableMultithreading}"
+ "-DENABLE_GMP=ON"
+ ];
+
+ checkTarget = "check";
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ bison
+ flex
+ cmake
+ python3
+ ]
+ ++ lib.optional enableDocumentation [ doxygen graphviz ]
+ ++ lib.optional enableBPF [ libllvm libbpf ];
+
+ buildInputs = [
+ protobuf
+ boost
+ boehmgc
+ gmp
+ flex
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/p4lang/p4c";
+ description = "Reference compiler for the P4 programming language";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ raitobezarius ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3db220ab901a4..7e4efcd72ce4c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -237,6 +237,11 @@ self: super: {
# base bound
digit = doJailbreak super.digit;
+ # matterhorn-50200.17.0 won't work with brick >= 0.71
+ matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
+ brick = self.brick_0_70_1;
+ }));
+
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
# 2022-06-17: Use hnix-store 0.5 until hnix 0.17
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck (
@@ -351,24 +356,6 @@ self: super: {
lensref = dontCheck super.lensref;
lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
matplotlib = dontCheck super.matplotlib;
-
- brick_0_73 = doDistribute (super.brick_0_73.overrideScope (self: super: {
- vty = self.vty_5_36;
- text-zipper = self.text-zipper_0_12;
- }));
-
- # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
- matterhorn = doJailbreak (appendPatches [
- # Fix build with brick 0.73
- (fetchpatch {
- name = "matterhorn-brick-0.72.patch";
- url = "https://github.com/matterhorn-chat/matterhorn/commit/d52df3342b8420e219095aad477205e47fbef11b.patch";
- sha256 = "1ifvv926g9m8niyc9nl1hy9bkx4kf12ciyv2v8vnrzz3njp4fsrz";
- })
- ] (super.matterhorn.overrideScope (self: super: {
- brick = self.brick_0_73;
- })));
-
memcache = dontCheck super.memcache;
metrics = dontCheck super.metrics;
milena = dontCheck super.milena;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index d0eb90da4b7d3..b9dfb671ef870 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -92,13 +92,15 @@ self: super: {
mime-string = disableOptimization super.mime-string;
# Older compilers need the latest ghc-lib to build this package.
- hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
- # Workaround for https://github.com/haskell/haskell-language-server/issues/2728
- postPatch = ''
- sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
- '';
- })
- super.hls-hlint-plugin);
+ # Fix build with ghc-lib >= 9.0 and ghc <= 8.10.7
+ # https://github.com/haskell/haskell-language-server/issues/2728
+ hls-hlint-plugin = addBuildDepend self.ghc-lib (appendPatch (pkgs.fetchpatch {
+ name = "hls-hlint-plugin-workaround.patch";
+ url = "https://github.com/haskell/haskell-language-server/pull/2854.patch";
+ hash = "sha256-bLGu0OQtXsmMF3rZM+R6k7bsZm4Vgf2r0ert5Wunong=";
+ stripLen = 2;
+ includes = ["src/Ide/Plugin/Hlint.hs"];
+ }) super.hls-hlint-plugin);
haskell-language-server = appendConfigureFlags [
"-f-stylishhaskell"
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 79cb323d1d4ff..21cb8cc51a4a8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -269,6 +269,7 @@ broken-packages:
- awesomium-raw
- aws-cloudfront-signer
- aws-ec2
+ - aws-ec2-knownhosts
- aws-general
- aws-lambda-haskell-runtime
- aws-lambda-runtime
@@ -550,6 +551,7 @@ broken-packages:
- cabal-upload
- cabalvchk
- cabin
+ - cabocha
- cached
- cache-polysemy
- caching
@@ -557,6 +559,7 @@ broken-packages:
- cafeteria-prelude
- caffegraph
- cairo-core
+ - cake3
- cal3d
- calamity
- caledon
@@ -1203,6 +1206,7 @@ broken-packages:
- dump-core
- dunai-core
- Dung
+ - duplo
- dura
- dvault
- dvdread
@@ -1957,6 +1961,7 @@ broken-packages:
- hashtables-plus
- hasim
- hask
+ - haskades
- haskanoid
- haskarrow
- haskbot-core
@@ -2138,6 +2143,7 @@ broken-packages:
- heterogeneous-list-literals
- hetris
- heukarya
+ - hevm
- HExcel
- hexchat
- hexif
@@ -2206,6 +2212,7 @@ broken-packages:
- hinter
- hinterface
- hipchat-hs
+ - hipe
- Hipmunk
- hipsql-api
- hircules
@@ -2551,6 +2558,7 @@ broken-packages:
- hylolib
- hyperdrive
- hyperfunctions
+ - hypergeomatrix
- hyper-haskell-server
- hyperion
- hyperloglogplus
@@ -2677,6 +2685,7 @@ broken-packages:
- ireal
- iri
- iridium
+ - iris
- iron-mq
- irt
- isdicom
@@ -2720,6 +2729,7 @@ broken-packages:
- jinquantities
- jml-web-service
- jni
+ - jobqueue
- join-api
- joinlist
- joint
@@ -2780,6 +2790,7 @@ broken-packages:
- Kalman
- kangaroo
- karabiner-config
+ - karps
- katip-datadog
- katip-elasticsearch
- katip-kafka
@@ -2824,6 +2835,7 @@ broken-packages:
- korea-holidays
- kraken
- krank
+ - krapsh
- Kriens
- krpc
- KSP
@@ -2887,6 +2899,7 @@ broken-packages:
- language-webidl
- LargeCardinalHierarchy
- Lastik
+ - latest-npm-version
- latex-formulae-image
- latex-svg-image
- LATS
@@ -3042,6 +3055,7 @@ broken-packages:
- lojbanParser
- lojbanXiragan
- lol
+ - lol-calculus
- longboi
- longshot
- lookup-tables
@@ -3201,6 +3215,7 @@ broken-packages:
- miconix-test
- microgroove
- microlens-each
+ - micrologger
- micro-recursion-schemes
- microsoft-translator
- mida
@@ -3477,6 +3492,7 @@ broken-packages:
- niagra
- nibblestring
- nice-html
+ - nicovideo-translator
- nitro
- nix-delegate
- nix-eval
@@ -3525,7 +3541,7 @@ broken-packages:
- numhask-histogram
- numhask-prelude
- Nutri
- - nvim-hs-contrib
+ - nvim-hs-ghcid
- NXTDSL
- nyan-interpolation-core
- nylas
@@ -3808,6 +3824,7 @@ broken-packages:
- phraskell
- Phsu
- phybin
+ - pia-forward
- pi-calculus
- picedit
- pickle
@@ -4065,6 +4082,7 @@ broken-packages:
- pushbullet-types
- pusher-haskell
- pusher-ws
+ - pushme
- push-notifications
- putlenses
- puzzle-draw
@@ -4496,6 +4514,7 @@ broken-packages:
- servant-static-th
- servant-streaming
- servant-streamly
+ - servant-util
- servant-wasm
- servant-yaml
- servant-zeppelin
@@ -5037,6 +5056,7 @@ broken-packages:
- tex2txt
- texbuilder
- text1
+ - text-all
- text-and-plots
- text-ascii
- text-builder-linear
@@ -5134,6 +5154,10 @@ broken-packages:
- tkhs
- tkyprof
- tmp-proc-example
+ - tmp-proc-postgres
+ - tmp-proc-rabbitmq
+ - tmp-proc-redis
+ - tmp-proc-zipkin
- todo
- tofromxml
- to-haskell
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index b0819a649e884..dfd932a074b77 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -91,58 +91,64 @@ default-package-overrides:
- reflex-dom-core < 0.7.0.2
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
- hasql-dynamic-statements < 0.3.1.2
+ # Its dependency brick >= 1.0 is not yet in stackage
+ - brick-skylighting < 1.0
extra-packages:
- - aeson < 2 # required by pantry-0.5.2
- - base16-bytestring < 1 # required for cabal-install etc.
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal-install etc.
- Cabal == 3.4.* # required for cabal-install etc.
+ - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
+ - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
+ - aeson < 2 # required by pantry-0.5.2
+ - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
+ - base16-bytestring < 1 # required for cabal-install etc.
+ - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
+ - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
+ - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- dhall == 1.29.0 # required for ats-pkg
- dhall == 1.38.1 # required for spago
- - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
+ - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
+ - fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
+ - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7
+ - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
+ - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
+ - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2
+ - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
+ - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2
+ - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
+ - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
+ - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1
- haddock == 2.23.* # required on GHC < 8.10.x
- haddock-api == 2.23.* # required on GHC < 8.10.x
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
- happy == 1.19.12 # for ghcjs
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
+ - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
+ - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
+ - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
+ - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
+ - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
+ - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
- language-javascript == 0.7.0.0 # required by purescript
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
- optparse-applicative < 0.16 # needed for niv-0.2.19
+ - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
- pantry == 0.5.2.1 # needed for stack-2.7.3
- - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
- - sbv == 7.13 # required for pkgs.petrinizer
- - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
- - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7
- - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
- - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
- - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
- - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1
- - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
- - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
- - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
- - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
- - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
- - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
- - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
- - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
+ - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
+ - sbv == 7.13 # required for pkgs.petrinizer
- tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format
- - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
- - fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
- - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
- - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
- vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1
+ - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
+ - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
+ - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
package-maintainers:
abbradar:
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 59b9f6ad5f7c6..08fd845a1b356 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 19.17
+# Stackage LTS 19.18
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -258,7 +258,7 @@ default-package-overrides:
- bytestring-mmap ==0.2.2
- bytestring-strict-builder ==0.4.5.6
- bytestring-to-vector ==0.3.0.1
- - bytestring-tree-builder ==0.2.7.9
+ - bytestring-tree-builder ==0.2.7.10
- bytestring-trie ==0.2.7
- bz2 ==1.0.1.0
- bzlib ==0.5.1.0
@@ -397,7 +397,7 @@ default-package-overrides:
- conduino ==0.2.2.0
- conduit ==1.3.4.2
- conduit-aeson ==0.1.0.1
- - conduit-algorithms ==0.0.12.0
+ - conduit-algorithms ==0.0.13.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.3
- conduit-connection ==0.1.0.5
@@ -442,7 +442,7 @@ default-package-overrides:
- crc32c ==0.0.0
- credential-store ==0.1.2
- criterion ==1.5.13.0
- - criterion-measurement ==0.1.3.0
+ - criterion-measurement ==0.1.4.0
- cron ==0.7.0
- crypto-api ==0.13.3
- crypto-api-tests ==0.3
@@ -604,7 +604,7 @@ default-package-overrides:
- doctest-exitcode-stdio ==0.0
- doctest-extract ==0.1
- doctest-lib ==0.1
- - doctest-parallel ==0.2.3
+ - doctest-parallel ==0.2.4
- doldol ==0.4.1.2
- do-list ==1.0.1
- domain ==0.1.1.3
@@ -683,7 +683,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.11
- - esqueleto ==3.5.5.0
+ - esqueleto ==3.5.6.1
- essence-of-live-coding ==0.2.6
- essence-of-live-coding-gloss ==0.2.6
- essence-of-live-coding-pulse ==0.2.6
@@ -992,8 +992,8 @@ default-package-overrides:
- hashtables ==1.2.4.2
- haskeline ==0.8.2
- haskell-awk ==1.2.0.1
- - haskell-gi ==0.26.0
- - haskell-gi-base ==0.26.0
+ - haskell-gi ==0.26.1
+ - haskell-gi-base ==0.26.1
- haskell-gi-overloading ==1.0
- haskell-lexer ==1.1
- haskell-lsp-types ==0.24.0.0
@@ -1007,7 +1007,7 @@ default-package-overrides:
- hasktags ==0.72.0
- hasql ==1.5.1
- hasql-migration ==0.3.0
- - hasql-notifications ==0.2.0.1
+ - hasql-notifications ==0.2.0.2
- hasql-optparse-applicative ==0.3.0.9
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
@@ -1176,7 +1176,7 @@ default-package-overrides:
- HTTP ==4000.3.16
- http-api-data ==0.4.3
- http-api-data-qq ==0.1.0.0
- - http-client ==0.7.12
+ - http-client ==0.7.13.1
- http-client-openssl ==0.3.3
- http-client-overrides ==0.1.1.0
- http-client-tls ==0.3.6.1
@@ -2229,7 +2229,7 @@ default-package-overrides:
- simple-affine-space ==0.1.1
- simple-cabal ==0.1.3
- simple-cmd ==0.2.7
- - simple-cmd-args ==0.1.7
+ - simple-cmd-args ==0.1.8
- simple-log ==0.9.12
- simple-media-timestamp ==0.2.0.0
- simple-media-timestamp-attoparsec ==0.1.0.0
@@ -2337,7 +2337,7 @@ default-package-overrides:
- storable-record ==0.0.6
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13.1
- - store ==0.7.15
+ - store ==0.7.16
- store-core ==0.4.4.4
- store-streaming ==0.2.0.3
- Stream ==0.4.7.2
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index d8a294a01307b..ce32dae48c365 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -1502,6 +1502,7 @@ dont-distribute-packages:
- gbu
- gdax
- gdiff-ig
+ - gedcom
- geek
- geek-server
- gelatin-freetype2
@@ -2544,6 +2545,7 @@ dont-distribute-packages:
- lol-cpp
- lol-repa
- lol-tests
+ - lol-typing
- loli
- loop-effin
- looper
@@ -2827,7 +2829,6 @@ dont-distribute-packages:
- numhask-hedgehog
- numhask-range
- numhask-test
- - nvim-hs-ghcid
- nyan
- nyan-interpolation
- nyan-interpolation-simple
@@ -3395,6 +3396,7 @@ dont-distribute-packages:
- servant-streaming-server
- servant-swagger-tags
- servant-to-elm
+ - servant-util-beam-pg
- servant-waargonaut
- servant-zeppelin-client
- servant-zeppelin-server
@@ -3634,6 +3636,7 @@ dont-distribute-packages:
- syntaxnet-haskell
- synthesizer-llvm
- sys-process
+ - systemstats
- t3-client
- ta
- tag-stream
@@ -3841,6 +3844,7 @@ dont-distribute-packages:
- urbit-airlock
- urbit-api
- ureader
+ - urembed
- uri-enumerator
- uri-enumerator-file
- usb
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2099bab820c3b..bdbf8803137fb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -22533,8 +22533,8 @@ self: {
({ mkDerivation, base, deepseq, random, simple-affine-space }:
mkDerivation {
pname = "Yampa";
- version = "0.13.5";
- sha256 = "1l7ykhcy7qqp4dysyp3qq3nx962zsdf47iqmsz28l4chr8dxfvnm";
+ version = "0.13.6";
+ sha256 = "0rgwvbp0jpl4pyxrhx2s29fnz8q8xyrbm9r4i2glrf89p29vpwxy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38244,6 +38244,8 @@ self: {
];
description = "Capture and manage AWS EC2 known_host pubkeys";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"aws-elastic-transcoder" = callPackage
@@ -39828,12 +39830,12 @@ self: {
broken = true;
}) {};
- "base_4_16_3_0" = callPackage
+ "base_4_17_0_0" = callPackage
({ mkDerivation, ghc-bignum, ghc-prim, rts }:
mkDerivation {
pname = "base";
- version = "4.16.3.0";
- sha256 = "1jgm0kpcn6b2xvnhh5l09c2khlqz85qj47il2wxalf904iw9262c";
+ version = "4.17.0.0";
+ sha256 = "1ma01nc34knldpp1mb0j5mv07sy28kih6529kfkm1w0c7apc0aiy";
libraryHaskellDepends = [ ghc-bignum ghc-prim rts ];
description = "Basic libraries";
license = lib.licenses.bsd3;
@@ -48065,7 +48067,7 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "brick_0_73" = callPackage
+ "brick_0_70_1" = callPackage
({ mkDerivation, base, bytestring, config-ini, containers
, contravariant, data-clist, deepseq, directory, dlist, exceptions
, filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -48074,8 +48076,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.73";
- sha256 = "17030aydkn9gkd8dwywhfc65lr3dnf6cib6kspfmmazh2w3qs73l";
+ version = "0.70.1";
+ sha256 = "18i1i06ll6pklzaazcl2bzbi3w5zdn43l9wvkclhfcmddjy19lp4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -48084,6 +48086,33 @@ self: {
microlens-th stm template-haskell text text-zipper transformers
unix vector vty word-wrap
];
+ testHaskellDepends = [
+ base containers microlens QuickCheck vector
+ ];
+ description = "A declarative terminal user interface library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "brick_1_0" = callPackage
+ ({ mkDerivation, base, bimap, bytestring, config-ini, containers
+ , contravariant, data-clist, deepseq, directory, dlist, exceptions
+ , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck
+ , stm, template-haskell, text, text-zipper, unix, vector, vty
+ , word-wrap
+ }:
+ mkDerivation {
+ pname = "brick";
+ version = "1.0";
+ sha256 = "00r0slc0yvzr789q71dr0cbixy4bw73qsiv5mldpc4f2q5sj10bk";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bimap bytestring config-ini containers contravariant
+ data-clist deepseq directory dlist exceptions filepath microlens
+ microlens-mtl microlens-th mtl stm template-haskell text
+ text-zipper unix vector vty word-wrap
+ ];
testHaskellDepends = [
base containers microlens QuickCheck vector vty
];
@@ -48148,6 +48177,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "brick-skylighting_1_0" = callPackage
+ ({ mkDerivation, base, brick, containers, skylighting-core, text
+ , vty
+ }:
+ mkDerivation {
+ pname = "brick-skylighting";
+ version = "1.0";
+ sha256 = "1nw2x9zn0jlvykm89v80fh4187bxgn8l4cljgnf4mp4ci7aqjmkr";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base brick containers skylighting-core text vty
+ ];
+ description = "Show syntax-highlighted text in your Brick UI";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"bricks" = callPackage
({ mkDerivation, base, bricks-internal, bricks-internal-test
, bricks-parsec, bricks-rendering, bricks-syntax, containers
@@ -49772,8 +49819,8 @@ self: {
}:
mkDerivation {
pname = "by-other-names";
- version = "1.2.0.0";
- sha256 = "1272d888x7x38nw0ffqjin8c1x5da59a5rwcy2r4znc2d9plij6z";
+ version = "1.2.0.1";
+ sha256 = "0lmk2nbj92kyi1h74v3f4k5zhf41zbnz8pari1rqxlf7a859c7k9";
libraryHaskellDepends = [
aeson base indexed-traversable template-haskell text
];
@@ -50512,27 +50559,6 @@ self: {
}) {};
"bytestring-tree-builder" = callPackage
- ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq
- , QuickCheck, quickcheck-instances, tasty, tasty-hunit
- , tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "bytestring-tree-builder";
- version = "0.2.7.9";
- sha256 = "0lmm52716b0qqnlpqgiscc92wk9n1fckydmp4vzi58h5majzpnyb";
- libraryHaskellDepends = [ base bytestring text ];
- testHaskellDepends = [
- base-prelude bytestring QuickCheck quickcheck-instances tasty
- tasty-hunit tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base-prelude bytestring criterion deepseq
- ];
- description = "A very efficient ByteString builder implementation based on the binary tree";
- license = lib.licenses.mit;
- }) {};
-
- "bytestring-tree-builder_0_2_7_10" = callPackage
({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq
, QuickCheck, quickcheck-instances, tasty, tasty-hunit
, tasty-quickcheck, text
@@ -50551,7 +50577,6 @@ self: {
];
description = "A very efficient ByteString builder implementation based on the binary tree";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"bytestring-trie" = callPackage
@@ -52539,6 +52564,8 @@ self: {
librarySystemDepends = [ cabocha ];
testHaskellDepends = [ base text-format ];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {cabocha = null;};
"cache" = callPackage
@@ -52965,6 +52992,8 @@ self: {
];
description = "Third cake the Makefile EDSL";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"cakyrespa" = callPackage
@@ -64884,41 +64913,6 @@ self: {
}) {};
"conduit-algorithms" = callPackage
- ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
- , conduit-combinators, conduit-extra, conduit-zstd, containers
- , criterion, deepseq, directory, exceptions, fingertree, HUnit
- , lzma-conduit, monad-control, mtl, QuickCheck, resourcet, stm
- , stm-conduit, streaming-commons, tasty, tasty-hunit
- , tasty-quickcheck, tasty-th, transformers, unliftio-core, vector
- }:
- mkDerivation {
- pname = "conduit-algorithms";
- version = "0.0.12.0";
- sha256 = "0zq1a3f64p5rqhlhk87vvpn3m8198m9ndxshj4wdq5b3lkylh89b";
- libraryHaskellDepends = [
- async base bytestring bzlib-conduit conduit conduit-combinators
- conduit-extra conduit-zstd containers deepseq exceptions fingertree
- lzma-conduit monad-control mtl resourcet stm stm-conduit
- streaming-commons transformers unliftio-core vector
- ];
- testHaskellDepends = [
- async base bytestring bzlib-conduit conduit conduit-combinators
- conduit-extra conduit-zstd containers deepseq directory exceptions
- fingertree HUnit lzma-conduit monad-control mtl QuickCheck
- resourcet stm stm-conduit streaming-commons tasty tasty-hunit
- tasty-quickcheck tasty-th transformers unliftio-core vector
- ];
- benchmarkHaskellDepends = [
- async base bytestring bzlib-conduit conduit conduit-combinators
- conduit-extra conduit-zstd containers criterion deepseq exceptions
- fingertree lzma-conduit monad-control mtl resourcet stm stm-conduit
- streaming-commons transformers unliftio-core vector
- ];
- description = "Conduit-based algorithms";
- license = lib.licenses.mit;
- }) {};
-
- "conduit-algorithms_0_0_13_0" = callPackage
({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
, conduit-combinators, conduit-extra, conduit-zstd, containers
, criterion, deepseq, directory, exceptions, fingertree, HUnit
@@ -64951,7 +64945,6 @@ self: {
];
description = "Conduit-based algorithms";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"conduit-audio" = callPackage
@@ -69650,21 +69643,6 @@ self: {
}) {};
"criterion-measurement" = callPackage
- ({ mkDerivation, aeson, base, base-compat, binary, containers
- , deepseq, vector
- }:
- mkDerivation {
- pname = "criterion-measurement";
- version = "0.1.3.0";
- sha256 = "1ffmjcpmdx2sx0sr3g5n2s8dhrbmh7606zfnymv2v9h1rf36xf3x";
- libraryHaskellDepends = [
- aeson base base-compat binary containers deepseq vector
- ];
- description = "Criterion measurement functionality and associated types";
- license = lib.licenses.bsd3;
- }) {};
-
- "criterion-measurement_0_1_4_0" = callPackage
({ mkDerivation, aeson, base, base-compat, binary, containers
, deepseq, vector
}:
@@ -69677,7 +69655,6 @@ self: {
];
description = "Criterion measurement functionality and associated types";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"criterion-plus" = callPackage
@@ -82877,6 +82854,32 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "dns_4_1_0" = callPackage
+ ({ mkDerivation, array, async, attoparsec, auto-update, base
+ , base16-bytestring, base64-bytestring, bytestring, containers
+ , cryptonite, doctest, hourglass, hspec, hspec-discover, iproute
+ , mtl, network, psqueues, QuickCheck, word8
+ }:
+ mkDerivation {
+ pname = "dns";
+ version = "4.1.0";
+ sha256 = "1l80y48s9ryqcap587w41wrr2jzwh55gi16k7yib58xpqarcxqs5";
+ libraryHaskellDepends = [
+ array async attoparsec auto-update base base16-bytestring
+ base64-bytestring bytestring containers cryptonite hourglass
+ iproute mtl network psqueues
+ ];
+ testHaskellDepends = [
+ base bytestring doctest hspec iproute network QuickCheck word8
+ ];
+ testToolDepends = [ hspec-discover ];
+ doHaddock = false;
+ testTarget = "spec";
+ description = "DNS library in Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"dns-patterns" = callPackage
({ mkDerivation, attoparsec, base, bytestring, HUnit
, parser-combinators, text
@@ -83708,36 +83711,6 @@ self: {
}) {};
"doctest-parallel" = callPackage
- ({ mkDerivation, base, base-compat, Cabal, code-page, containers
- , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths
- , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty
- , process, QuickCheck, random, setenv, silently, stringbuilder, syb
- , template-haskell, transformers, unordered-containers
- }:
- mkDerivation {
- pname = "doctest-parallel";
- version = "0.2.3";
- sha256 = "0sk1990ksqcgc13kppbh0xljakn3qsqaxi19990fixwakhzh229v";
- revision = "1";
- editedCabalFile = "1xk6d3b56y8lvngw6q9m5qhm1v59gyk48n4677p7vrr64x0mvmzx";
- libraryHaskellDepends = [
- base base-compat Cabal code-page containers deepseq directory
- exceptions extra filepath ghc ghc-paths Glob pretty process random
- syb template-haskell transformers unordered-containers
- ];
- testHaskellDepends = [
- base base-compat code-page containers deepseq directory exceptions
- filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit
- mockery process QuickCheck setenv silently stringbuilder syb
- transformers
- ];
- testToolDepends = [ hspec-discover ];
- doHaddock = false;
- description = "Test interactive Haskell examples";
- license = lib.licenses.mit;
- }) {};
-
- "doctest-parallel_0_2_4" = callPackage
({ mkDerivation, base, base-compat, Cabal, code-page, containers
, deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths
, Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty
@@ -83763,7 +83736,6 @@ self: {
doHaddock = false;
description = "Test interactive Haskell examples";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"doctest-prop" = callPackage
@@ -85836,7 +85808,9 @@ self: {
];
description = "Frontend development build tool";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "duplo";
+ broken = true;
}) {};
"dura" = callPackage
@@ -91489,34 +91463,6 @@ self: {
}) {};
"esqueleto" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
- , conduit, containers, exceptions, hspec, hspec-core, monad-logger
- , mtl, mysql, mysql-simple, persistent, persistent-mysql
- , persistent-postgresql, persistent-sqlite, postgresql-simple
- , QuickCheck, resourcet, tagged, text, time, transformers, unliftio
- , unordered-containers
- }:
- mkDerivation {
- pname = "esqueleto";
- version = "3.5.5.0";
- sha256 = "0ba90p3cqyr0l447dw2xzrk2fs6xv5b2c79rqsnj0bchpsigj8a0";
- libraryHaskellDepends = [
- aeson attoparsec base blaze-html bytestring conduit containers
- monad-logger persistent resourcet tagged text time transformers
- unliftio unordered-containers
- ];
- testHaskellDepends = [
- aeson attoparsec base blaze-html bytestring conduit containers
- exceptions hspec hspec-core monad-logger mtl mysql mysql-simple
- persistent persistent-mysql persistent-postgresql persistent-sqlite
- postgresql-simple QuickCheck resourcet tagged text time
- transformers unliftio unordered-containers
- ];
- description = "Type-safe EDSL for SQL queries on persistent backends";
- license = lib.licenses.bsd3;
- }) {};
-
- "esqueleto_3_5_6_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
, conduit, containers, exceptions, hspec, hspec-core, monad-logger
, mtl, mysql, mysql-simple, persistent, persistent-mysql
@@ -91542,7 +91488,6 @@ self: {
];
description = "Type-safe EDSL for SQL queries on persistent backends";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"esqueleto-pgcrypto" = callPackage
@@ -105389,6 +105334,7 @@ self: {
testHaskellDepends = [ base hspec megaparsec text-all ];
description = "Parser for the GEDCOM genealogy file format";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}) {};
"geek" = callPackage
@@ -107923,12 +107869,12 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "ghc-bignum_1_2" = callPackage
+ "ghc-bignum_1_3" = callPackage
({ mkDerivation }:
mkDerivation {
pname = "ghc-bignum";
- version = "1.2";
- sha256 = "0ldg53hirqz6yszacpajq6pf407bflyk46wjhx5g8n2cjz54vv3p";
+ version = "1.3";
+ sha256 = "0qchsli1aq9l2p220jpv2b4p4v7bivv59y1js07x6iqd0j9lnh5z";
description = "GHC BigNum library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -107945,14 +107891,15 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "ghc-boot_9_2_2" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, deepseq
- , directory, filepath, ghc-boot-th, unix
+ "ghc-boot_9_4_1" = callPackage
+ ({ mkDerivation, base, binary, bytestring, Cabal, containers
+ , deepseq, directory, filepath, ghc-boot-th, unix
}:
mkDerivation {
pname = "ghc-boot";
- version = "9.2.2";
- sha256 = "0wdyaj8w08r20j4if5v3d5wh3b1f5lwdvw3wk0lx7scxz7xzs9fq";
+ version = "9.4.1";
+ sha256 = "0jm28sisgc0sggf3jgbf7v387xllfv0fnm0bdb0m0lfrqr4w3xmc";
+ setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
base binary bytestring containers deepseq directory filepath
ghc-boot-th unix
@@ -107962,12 +107909,12 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
- "ghc-boot-th_9_2_2" = callPackage
+ "ghc-boot-th_9_4_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "ghc-boot-th";
- version = "9.2.2";
- sha256 = "06rgdq07fkkzhfkq29nxmqiiy9ndbzb5dgij7flz113bdskq88i3";
+ version = "9.4.1";
+ sha256 = "0qnhnyavbm44aiq8x0cf1q7rylpv6gv4bjfiir7s2g950vdab8il";
libraryHaskellDepends = [ base ];
description = "Shared functionality between GHC and the @template-haskell@ library";
license = lib.licenses.bsd3;
@@ -108460,12 +108407,12 @@ self: {
broken = true;
}) {};
- "ghc-heap_9_2_2" = callPackage
+ "ghc-heap_9_4_1" = callPackage
({ mkDerivation, base, containers, ghc-prim, rts }:
mkDerivation {
pname = "ghc-heap";
- version = "9.2.2";
- sha256 = "09m2kv4b3hbi5h3lm1vxfh5hwjjwzfnw22qd35ld6xq0mffz6a3f";
+ version = "9.4.1";
+ sha256 = "0zfz389vv7pwxivlvrf3ykij31saafk9vm32fa9xl2b4kvgc8my2";
libraryHaskellDepends = [ base containers ghc-prim rts ];
description = "Functions for walking GHC's heap";
license = lib.licenses.bsd3;
@@ -108659,6 +108606,28 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "ghc-lib_9_4_1_20220807" = callPackage
+ ({ mkDerivation, alex, array, base, binary, bytestring, containers
+ , deepseq, directory, exceptions, filepath, ghc-lib-parser
+ , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time
+ , transformers, unix
+ }:
+ mkDerivation {
+ pname = "ghc-lib";
+ version = "9.4.1.20220807";
+ sha256 = "0anaf36bgziqy8ajc5442qf06xv06p3x46dca29qdnplckjypc51";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory
+ exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty
+ process rts stm time transformers unix
+ ];
+ libraryToolDepends = [ alex happy ];
+ description = "The GHC API, decoupled from GHC versions";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-lib-parser_8_10_7_20220219" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-prim, happy, pretty, process
@@ -108720,6 +108689,27 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "ghc-lib-parser_9_4_1_20220807" = callPackage
+ ({ mkDerivation, alex, array, base, binary, bytestring, containers
+ , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec
+ , pretty, process, time, transformers, unix
+ }:
+ mkDerivation {
+ pname = "ghc-lib-parser";
+ version = "9.4.1.20220807";
+ sha256 = "0m297q39afy2dd2gya451lgwl8wjrzcz2f72102x69qbbp3r63q2";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory
+ exceptions filepath ghc-prim parsec pretty process time
+ transformers unix
+ ];
+ libraryToolDepends = [ alex happy ];
+ description = "The GHC API, decoupled from GHC versions";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-lib-parser-ex_8_10_0_24" = callPackage
({ mkDerivation, base, bytestring, containers, directory, extra
, filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate
@@ -108800,6 +108790,26 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "ghc-lib-parser-ex_9_4_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, extra
+ , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate
+ }:
+ mkDerivation {
+ pname = "ghc-lib-parser-ex";
+ version = "9.4.0.0";
+ sha256 = "06qrfg4icp66lyhzncvsaqdcmsijayrlgi91x65a2nd2l0wz6gyf";
+ libraryHaskellDepends = [
+ base bytestring containers ghc-lib-parser uniplate
+ ];
+ testHaskellDepends = [
+ base directory extra filepath ghc-lib-parser tasty tasty-hunit
+ uniplate
+ ];
+ description = "Algorithms on GHC parse trees";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-make" = callPackage
({ mkDerivation, base, process, shake, unordered-containers }:
mkDerivation {
@@ -109041,13 +109051,14 @@ self: {
broken = true;
}) {};
- "ghc-prim_0_8_0" = callPackage
- ({ mkDerivation, base, c, Cabal, rts }:
+ "ghc-prim_0_9_0" = callPackage
+ ({ mkDerivation, base, c, Cabal, directory, filepath, process, rts
+ }:
mkDerivation {
pname = "ghc-prim";
- version = "0.8.0";
- sha256 = "1nryf4smajnqxw29s5hbzmv7psjl6qrcvkk12zzh7x3nkf4qr8ss";
- setupHaskellDepends = [ base Cabal ];
+ version = "0.9.0";
+ sha256 = "1r2iwinvyv75g0iaki8qil5vbc8vn18pszp98bh210rw95jz1j0w";
+ setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [ rts ];
librarySystemDepends = [ c ];
description = "GHC primitives";
@@ -126230,7 +126241,9 @@ self: {
];
description = "Utility to generate bindings for BlackBerry Cascades";
license = "unknown";
+ hydraPlatforms = lib.platforms.none;
mainProgram = "haskades";
+ broken = true;
}) {};
"haskakafka" = callPackage
@@ -127057,28 +127070,6 @@ self: {
}) {};
"haskell-gi" = callPackage
- ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
- , cabal-doctest, containers, directory, doctest, filepath, glib
- , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
- , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit
- }:
- mkDerivation {
- pname = "haskell-gi";
- version = "0.26.0";
- sha256 = "0k8xpllviq67zm72dwnh5k05x8l42irzh7sdxi1jwjjm26sc3xm9";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- ansi-terminal attoparsec base bytestring Cabal containers directory
- filepath haskell-gi-base mtl pretty-show process regex-tdfa safe
- text transformers xdg-basedir xml-conduit
- ];
- libraryPkgconfigDepends = [ glib gobject-introspection ];
- testHaskellDepends = [ base doctest process ];
- description = "Generate Haskell bindings for GObject Introspection capable libraries";
- license = lib.licenses.lgpl21Only;
- }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
-
- "haskell-gi_0_26_1" = callPackage
({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
, cabal-doctest, containers, directory, doctest, filepath, glib
, gobject-introspection, haskell-gi-base, mtl, pretty-show, process
@@ -127098,22 +127089,9 @@ self: {
testHaskellDepends = [ base doctest process ];
description = "Generate Haskell bindings for GObject Introspection capable libraries";
license = lib.licenses.lgpl21Only;
- hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
"haskell-gi-base" = callPackage
- ({ mkDerivation, base, bytestring, containers, glib, text }:
- mkDerivation {
- pname = "haskell-gi-base";
- version = "0.26.0";
- sha256 = "1skxqs8vp8q42g59j7sa1zr25fnqjahbngpgrc2bqs6r5yj00mb7";
- libraryHaskellDepends = [ base bytestring containers text ];
- libraryPkgconfigDepends = [ glib ];
- description = "Foundation for libraries generated by haskell-gi";
- license = lib.licenses.lgpl21Only;
- }) {inherit (pkgs) glib;};
-
- "haskell-gi-base_0_26_1" = callPackage
({ mkDerivation, base, bytestring, containers, glib, text }:
mkDerivation {
pname = "haskell-gi-base";
@@ -127123,7 +127101,6 @@ self: {
libraryPkgconfigDepends = [ glib ];
description = "Foundation for libraries generated by haskell-gi";
license = lib.licenses.lgpl21Only;
- hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) glib;};
"haskell-gi-overloading" = callPackage
@@ -130758,26 +130735,6 @@ self: {
}) {};
"hasql-notifications" = callPackage
- ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec
- , postgresql-libpq, QuickCheck, text
- }:
- mkDerivation {
- pname = "hasql-notifications";
- version = "0.2.0.1";
- sha256 = "191591sif15khm3qhkkr2y4406fi9ikvhfchhq3jszqxhjmjwpkv";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring hasql hasql-pool postgresql-libpq text
- ];
- executableHaskellDepends = [ base hasql ];
- testHaskellDepends = [ base bytestring hasql hspec QuickCheck ];
- description = "LISTEN/NOTIFY support for Hasql";
- license = lib.licenses.bsd3;
- mainProgram = "hasql-notifications";
- }) {};
-
- "hasql-notifications_0_2_0_2" = callPackage
({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec
, postgresql-libpq, QuickCheck, text
}:
@@ -130794,7 +130751,6 @@ self: {
testHaskellDepends = [ base bytestring hasql hspec QuickCheck ];
description = "LISTEN/NOTIFY support for Hasql";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "hasql-notifications";
}) {};
@@ -135264,7 +135220,9 @@ self: {
testSystemDepends = [ secp256k1 ];
description = "Ethereum virtual machine evaluator";
license = lib.licenses.agpl3Only;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "hevm";
+ broken = true;
}) {inherit (pkgs) libff; inherit (pkgs) secp256k1;};
"hevolisa" = callPackage
@@ -137856,6 +137814,8 @@ self: {
];
description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hips" = callPackage
@@ -141579,8 +141539,8 @@ self: {
}:
mkDerivation {
pname = "hol";
- version = "1.3";
- sha256 = "067grmahi268xx8ajy032p43rcggksky6vi6hqxr82i2dzs217l6";
+ version = "1.4";
+ sha256 = "18jj3b04lk20k8s50bvp7p4qhqz0nl5b55sc3ai42l203rvdfc9f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -149061,6 +149021,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "hspec-tmp-proc_0_5_1_1" = callPackage
+ ({ mkDerivation, base, hspec, tmp-proc }:
+ mkDerivation {
+ pname = "hspec-tmp-proc";
+ version = "0.5.1.1";
+ sha256 = "1wd3pz9q7p8z7917qblzldzchvdfwp625bbysxbdi41186wfd0dh";
+ libraryHaskellDepends = [ base hspec tmp-proc ];
+ description = "Simplify use of tmp-proc from hspec tests";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hspec-wai" = callPackage
({ mkDerivation, base, base-compat, bytestring, case-insensitive
, hspec, hspec-core, hspec-expectations, http-types, QuickCheck
@@ -150876,35 +150848,6 @@ self: {
}) {};
"http-client" = callPackage
- ({ mkDerivation, array, async, base, base64-bytestring
- , blaze-builder, bytestring, case-insensitive, containers, cookie
- , deepseq, directory, exceptions, filepath, ghc-prim, hspec
- , hspec-discover, http-types, iproute, mime-types, monad-control
- , network, network-uri, random, stm, streaming-commons, text, time
- , transformers, zlib
- }:
- mkDerivation {
- pname = "http-client";
- version = "0.7.12";
- sha256 = "03mfkrf2zl3jga2hihx7aq7qymzgnk31ldvbk66y70c3i1jpgxb2";
- libraryHaskellDepends = [
- array async base base64-bytestring blaze-builder bytestring
- case-insensitive containers cookie deepseq exceptions filepath
- ghc-prim http-types iproute mime-types network network-uri random
- stm streaming-commons text time transformers
- ];
- testHaskellDepends = [
- async base blaze-builder bytestring case-insensitive containers
- cookie deepseq directory hspec http-types monad-control network
- network-uri streaming-commons text time transformers zlib
- ];
- testToolDepends = [ hspec-discover ];
- doCheck = false;
- description = "An HTTP client engine";
- license = lib.licenses.mit;
- }) {};
-
- "http-client_0_7_13_1" = callPackage
({ mkDerivation, array, async, base, base64-bytestring
, blaze-builder, bytestring, case-insensitive, containers, cookie
, deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -150931,7 +150874,6 @@ self: {
doCheck = false;
description = "An HTTP client engine";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"http-client-auth" = callPackage
@@ -155264,12 +155206,14 @@ self: {
}:
mkDerivation {
pname = "hypergeomatrix";
- version = "1.0.0.0";
- sha256 = "1i3ailplycpwsqcsyfsr783pi9fphd51dq1l008r2nx7im6ndmyx";
+ version = "1.1.0.0";
+ sha256 = "1463xpbm3q8ifnjsgddfplpsjnzzfksmpy8g21l2zqmcvghb64bn";
libraryHaskellDepends = [ array base containers cyclotomic ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Hypergeometric function of a matrix argument";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hypergeometric" = callPackage
@@ -159354,13 +159298,13 @@ self: {
broken = true;
}) {};
- "integer-gmp_1_0_3_0" = callPackage
- ({ mkDerivation, ghc-prim }:
+ "integer-gmp_1_1" = callPackage
+ ({ mkDerivation, base, ghc-bignum, ghc-prim }:
mkDerivation {
pname = "integer-gmp";
- version = "1.0.3.0";
- sha256 = "06302vwkc99l5gdbk3r25w84gi9cj18jcf8ipi189vpnmw42awwf";
- libraryHaskellDepends = [ ghc-prim ];
+ version = "1.1";
+ sha256 = "0fb34d8vw6lazg18imswprxn6v937d72cl09kvdd3419v13rakwk";
+ libraryHaskellDepends = [ base ghc-bignum ghc-prim ];
description = "Integer library based on GMP";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -161382,6 +161326,30 @@ self: {
broken = true;
}) {};
+ "iris" = callPackage
+ ({ mkDerivation, ansi-terminal, base, bytestring, colourista
+ , directory, hspec, mtl, optparse-applicative, process, text
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "iris";
+ version = "0.0.0.0";
+ sha256 = "15khmxdhc7mxlps2kgr82m29xy9b5nwcxsl3wfw6xiigjw1w2m0b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base bytestring directory mtl optparse-applicative
+ process text unliftio-core
+ ];
+ executableHaskellDepends = [ base colourista mtl ];
+ testHaskellDepends = [ base hspec text ];
+ description = "Haskell CLI framework";
+ license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "iris-example";
+ broken = true;
+ }) {};
+
"iron-mq" = callPackage
({ mkDerivation, aeson, base, http-client, lens, text, wreq }:
mkDerivation {
@@ -162689,6 +162657,21 @@ self: {
broken = true;
}) {};
+ "jackpolynomials" = callPackage
+ ({ mkDerivation, array, base, ilist, lens, math-functions
+ , mpolynomials, numeric-prelude
+ }:
+ mkDerivation {
+ pname = "jackpolynomials";
+ version = "1.0.0.0";
+ sha256 = "13marv1cl4c5xprwjn7yz3hbwln2cnmxski945saf3azs67ki824";
+ libraryHaskellDepends = [
+ array base ilist lens math-functions mpolynomials numeric-prelude
+ ];
+ description = "Jack, zonal, and Schur polynomials";
+ license = lib.licenses.gpl3Only;
+ }) {};
+
"jacobi-roots" = callPackage
({ mkDerivation, base, binary, bytestring, doctest, vector }:
mkDerivation {
@@ -163547,6 +163530,8 @@ self: {
];
description = "A job queue library";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"jobs-ui" = callPackage
@@ -166400,6 +166385,8 @@ self: {
];
description = "Haskell bindings for Spark Dataframes and Datasets";
license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"karver" = callPackage
@@ -168737,6 +168724,8 @@ self: {
];
description = "Haskell bindings for Spark Dataframes and Datasets";
license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"krpc" = callPackage
@@ -171899,7 +171888,9 @@ self: {
];
description = "Find the latest version of a package on npm";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "latest-npm-version";
+ broken = true;
}) {};
"latex" = callPackage
@@ -179856,7 +179847,9 @@ self: {
];
description = "Calculus for LOL (λω language)";
license = lib.licenses.gpl3Only;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "lol-calculus";
+ broken = true;
}) {};
"lol-cpp" = callPackage
@@ -179941,6 +179934,7 @@ self: {
];
description = "Type inferencer for LOL (λω language)";
license = lib.licenses.gpl3Only;
+ hydraPlatforms = lib.platforms.none;
}) {};
"loli" = callPackage
@@ -187555,6 +187549,8 @@ self: {
testHaskellDepends = [ aeson base hspec text ];
description = "A super simple logging module";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"microsoft-translator" = callPackage
@@ -197671,8 +197667,8 @@ self: {
({ mkDerivation, base, hspec, optics-core, text }:
mkDerivation {
pname = "nat-optics";
- version = "1.0.0.4";
- sha256 = "0r9disaj26f17k84zkkfxj1glin2vdgfk8ss5fyag6xr6imzp17s";
+ version = "1.0.1.0";
+ sha256 = "146q35ni26fq02f7pdzjp2h0kwp9593r2dzg4bxl1zvlrb850c1a";
libraryHaskellDepends = [ base optics-core text ];
testHaskellDepends = [ base hspec optics-core text ];
description = "Refinement types for natural numbers with an optics interface";
@@ -200964,7 +200960,9 @@ self: {
executableHaskellDepends = [ base ];
description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
license = lib.licenses.agpl3Only;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "nicovideo-translator";
+ broken = true;
}) {};
"nikepub" = callPackage
@@ -203782,8 +203780,8 @@ self: {
}:
mkDerivation {
pname = "nvim-hs-contrib";
- version = "2.0.0.0";
- sha256 = "0xqwvvhs2bpa146dnf4nkihx9lk9flwj3fyar2d4fchdfyszrbzr";
+ version = "2.0.0.1";
+ sha256 = "15ds92qxhax0y9d9zl1sz061ali1rj9vwvcjn415ph1cyqgr3ink";
libraryHaskellDepends = [
base bytestring data-default directory filepath messagepack mtl
nvim-hs prettyprinter prettyprinter-ansi-terminal text time
@@ -203795,8 +203793,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Haskell plugin backend for neovim";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"nvim-hs-ghcid" = callPackage
@@ -203819,6 +203815,7 @@ self: {
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
mainProgram = "nvim-hs-ghcid";
+ broken = true;
}) {};
"nvvm" = callPackage
@@ -216912,7 +216909,9 @@ self: {
];
description = "Set up port forwarding with the Private Internet Access VPN service";
license = lib.licenses.gpl3Only;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "pia-forward";
+ broken = true;
}) {};
"pianola" = callPackage
@@ -229472,7 +229471,9 @@ self: {
];
description = "Tool to synchronize directories with rsync, zfs or git-annex";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "pushme";
+ broken = true;
}) {};
"pushover" = callPackage
@@ -252774,7 +252775,9 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Servant servers utilities";
license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "servant-util-examples";
+ broken = true;
}) {};
"servant-util-beam-pg" = callPackage
@@ -252805,6 +252808,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Implementation of servant-util primitives for beam-postgres";
license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "servant-util-beam-pg-examples";
}) {};
@@ -256278,17 +256282,6 @@ self: {
}) {};
"simple-cmd-args" = callPackage
- ({ mkDerivation, base, optparse-applicative }:
- mkDerivation {
- pname = "simple-cmd-args";
- version = "0.1.7";
- sha256 = "0lf0pyiv02sg2yh9avj92fm75sni61qnaq3rmjw5vlczy03ksxpc";
- libraryHaskellDepends = [ base optparse-applicative ];
- description = "Simple command args parsing and execution";
- license = lib.licenses.bsd3;
- }) {};
-
- "simple-cmd-args_0_1_8" = callPackage
({ mkDerivation, base, optparse-applicative }:
mkDerivation {
pname = "simple-cmd-args";
@@ -256297,7 +256290,6 @@ self: {
libraryHaskellDepends = [ base optparse-applicative ];
description = "Simple command args parsing and execution";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"simple-conduit" = callPackage
@@ -267619,55 +267611,6 @@ self: {
}) {};
"store" = callPackage
- ({ mkDerivation, array, async, base, base-orphans
- , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
- , clock, containers, contravariant, criterion, cryptohash, deepseq
- , directory, filepath, free, ghc-prim, hashable, hspec
- , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base
- , monad-control, mono-traversable, nats, network, primitive
- , resourcet, safe, smallcheck, store-core, syb, template-haskell
- , text, th-lift, th-lift-instances, th-orphans, th-reify-many
- , th-utilities, time, transformers, unordered-containers, vector
- , vector-binary-instances, void, weigh
- }:
- mkDerivation {
- pname = "store";
- version = "0.7.15";
- sha256 = "0ws8gck230q2wcmgbpynvppd122ag1rksjjg67wcy62dfkzdk264";
- libraryHaskellDepends = [
- array async base base-orphans base64-bytestring bifunctors
- bytestring containers contravariant cryptohash deepseq directory
- filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
- lifted-base monad-control mono-traversable nats network primitive
- resourcet safe smallcheck store-core syb template-haskell text
- th-lift th-lift-instances th-orphans th-reify-many th-utilities
- time transformers unordered-containers vector void
- ];
- testHaskellDepends = [
- array async base base-orphans base64-bytestring bifunctors
- bytestring clock containers contravariant cryptohash deepseq
- directory filepath free ghc-prim hashable hspec hspec-smallcheck
- integer-gmp lifted-base monad-control mono-traversable nats network
- primitive resourcet safe smallcheck store-core syb template-haskell
- text th-lift th-lift-instances th-orphans th-reify-many
- th-utilities time transformers unordered-containers vector void
- ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [
- array async base base-orphans base64-bytestring bifunctors
- bytestring cereal cereal-vector containers contravariant criterion
- cryptohash deepseq directory filepath free ghc-prim hashable hspec
- hspec-smallcheck integer-gmp lifted-base monad-control
- mono-traversable nats network primitive resourcet safe smallcheck
- store-core syb template-haskell text th-lift th-lift-instances
- th-orphans th-reify-many th-utilities time transformers
- unordered-containers vector vector-binary-instances void weigh
- ];
- description = "Fast binary serialization";
- license = lib.licenses.mit;
- }) {};
-
- "store_0_7_16" = callPackage
({ mkDerivation, array, async, base, base-orphans
, base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
, clock, containers, contravariant, criterion, cryptohash, deepseq
@@ -267714,7 +267657,6 @@ self: {
];
description = "Fast binary serialization";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"store-core" = callPackage
@@ -273969,6 +273911,7 @@ self: {
];
description = "An application that regularly logs system stats for later analysis";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "systemstats";
}) {};
@@ -277267,13 +277210,15 @@ self: {
broken = true;
}) {};
- "template-haskell_2_18_0_0" = callPackage
- ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }:
+ "template-haskell_2_19_0_0" = callPackage
+ ({ mkDerivation, base, filepath, ghc-boot-th, ghc-prim, pretty }:
mkDerivation {
pname = "template-haskell";
- version = "2.18.0.0";
- sha256 = "0mcb7psdkyx9ddwkny0ymvadrsy2dnj82d6jdm23c63zv99z3g1r";
- libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ];
+ version = "2.19.0.0";
+ sha256 = "1zdg1bivfhi9imcs1z38f71f7cpy2sy7bqpnzly7550g3w55p0q5";
+ libraryHaskellDepends = [
+ base filepath ghc-boot-th ghc-prim pretty
+ ];
description = "Support library for Template Haskell";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -279188,6 +279133,8 @@ self: {
];
description = "Everything Data.Text related in one package";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"text-and-plots" = callPackage
@@ -284062,6 +284009,31 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "tmp-proc_0_5_1_1" = callPackage
+ ({ mkDerivation, async, base, bytestring, connection, data-default
+ , hspec, http-client, http-client-tls, http-types, mtl, network
+ , process, req, text, unliftio, wai, warp, warp-tls
+ }:
+ mkDerivation {
+ pname = "tmp-proc";
+ version = "0.5.1.1";
+ sha256 = "1z1pk3c5d021hy2jpcfg246ydvk62k6x5103qjis4rl82s6yy89y";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ async base bytestring mtl network process text unliftio wai warp
+ warp-tls
+ ];
+ testHaskellDepends = [
+ base bytestring connection data-default hspec http-client
+ http-client-tls http-types req text wai warp warp-tls
+ ];
+ description = "Run 'tmp' processes in integration tests";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"tmp-proc-example" = callPackage
({ mkDerivation, aeson, base, bytestring, exceptions, hedis, hspec
, hspec-tmp-proc, http-client, http-client-tls, monad-logger, mtl
@@ -284072,8 +284044,8 @@ self: {
}:
mkDerivation {
pname = "tmp-proc-example";
- version = "0.5.0.0";
- sha256 = "00cpx35z3s8pk8jn53kkxmkcwmrslyaw0xnr7hgbmh1f1nadbc05";
+ version = "0.5.1.1";
+ sha256 = "1ilvyj511yh2hk3blaqbk7djchidfbrpgqckh7563k1kx7i6vkn0";
libraryHaskellDepends = [
aeson base bytestring exceptions hedis hspec hspec-tmp-proc
http-client http-client-tls monad-logger mtl persistent
@@ -284094,8 +284066,8 @@ self: {
}:
mkDerivation {
pname = "tmp-proc-postgres";
- version = "0.5.0.0";
- sha256 = "15jfmh7g6nslnvwdn24hrsgd0rs5ikvc1fid33i2a2am89myf8x0";
+ version = "0.5.1.1";
+ sha256 = "0nwcxzny8xkbq5lpd6mf0dhr45s26ysyg7saa2zdbvf8d7a79hlh";
libraryHaskellDepends = [
base bytestring postgresql-simple text tmp-proc
];
@@ -284105,6 +284077,8 @@ self: {
];
description = "Shows how to run a PostgreSQL database as a tmp proc";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"tmp-proc-rabbitmq" = callPackage
@@ -284113,14 +284087,16 @@ self: {
}:
mkDerivation {
pname = "tmp-proc-rabbitmq";
- version = "0.5.0.0";
- sha256 = "0nl05a1zycrs955lnv1skq00bpkj776z9mbllax8zswskkd5ggn8";
+ version = "0.5.1.1";
+ sha256 = "0fp412v2n2sgysr17ih591xn8cip6v86kdvgqbpsw4bcasbw154d";
libraryHaskellDepends = [ amqp base bytestring text tmp-proc ];
testHaskellDepends = [
amqp base bytestring hspec hspec-tmp-proc text tmp-proc
];
description = "Shows how to run RabbitMQ as a tmp proc";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"tmp-proc-redis" = callPackage
@@ -284129,14 +284105,16 @@ self: {
}:
mkDerivation {
pname = "tmp-proc-redis";
- version = "0.5.0.1";
- sha256 = "15ggm9624nijnm9xwnw8pla347f7qwfxibmnk39xixxdh2g034qn";
+ version = "0.5.1.1";
+ sha256 = "0wx734zdxbr3674254d440dvf78nd2ckscy0n6gkkal9xggs92cz";
libraryHaskellDepends = [ base bytestring hedis text tmp-proc ];
testHaskellDepends = [
base bytestring hedis hspec hspec-tmp-proc text tmp-proc
];
description = "Shows how to run redis as a tmp proc";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"tmp-proc-zipkin" = callPackage
@@ -284145,8 +284123,8 @@ self: {
}:
mkDerivation {
pname = "tmp-proc-zipkin";
- version = "0.5.0.0";
- sha256 = "0lcxggzh550xlk65dsl94mk0y72szk63wxn23mg5xwbj4xzn6j9s";
+ version = "0.5.1.1";
+ sha256 = "1gy09qpvlzqdpcbnz2dq3dira6s9d3ndshch2fw7raxyk9dzrnmf";
libraryHaskellDepends = [
base bytestring http-client text tmp-proc tracing
];
@@ -284155,6 +284133,8 @@ self: {
];
description = "Shows how to run redis as a tmp proc";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"tmpl" = callPackage
@@ -287687,6 +287667,8 @@ self: {
pname = "ttc";
version = "1.2.0.0";
sha256 = "0x5xq00ls290s3ivzzlg4dq0rgzx1x6nzkch49ylwvb5xicmzgm5";
+ revision = "1";
+ editedCabalFile = "181lvsk3j5jp4249dcbvqksn5hkmnal3x3cllmi3a7nf4a8g4pwp";
libraryHaskellDepends = [ base bytestring template-haskell text ];
testHaskellDepends = [
base bytestring tasty tasty-hunit template-haskell text
@@ -293885,6 +293867,7 @@ self: {
];
description = "Ur/Web static content generator";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "urembed";
}) {};
@@ -297009,8 +296992,8 @@ self: {
pname = "vector-th-unbox";
version = "0.2.2";
sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a";
- revision = "1";
- editedCabalFile = "1kwjmjmp5pk9n9hps2y8kzjz4p42mcmzki8mypfhc0360n97r0wn";
+ revision = "2";
+ editedCabalFile = "088588xdqdm9y7r04l74fkckhrvmfhgsx6iv0wq36yff05dij630";
libraryHaskellDepends = [ base template-haskell vector ];
testHaskellDepends = [ base data-default vector ];
description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -299837,6 +299820,35 @@ self: {
broken = true;
}) {};
+ "wai-middleware-delegate_0_1_3_1" = callPackage
+ ({ mkDerivation, async, base, blaze-builder, bytestring
+ , bytestring-lexing, case-insensitive, conduit, conduit-extra
+ , connection, data-default, hspec, http-client, http-client-tls
+ , http-conduit, http-types, network, random, resourcet
+ , streaming-commons, text, vault, wai, wai-conduit, warp, warp-tls
+ }:
+ mkDerivation {
+ pname = "wai-middleware-delegate";
+ version = "0.1.3.1";
+ sha256 = "05lrkcg1xkf0ci9nvzdvnrjmqnygqxs3yrvrjfwbml9p003cp33p";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ async base blaze-builder bytestring case-insensitive conduit
+ conduit-extra data-default http-client http-conduit http-types
+ streaming-commons text wai wai-conduit
+ ];
+ testHaskellDepends = [
+ async base blaze-builder bytestring bytestring-lexing
+ case-insensitive conduit conduit-extra connection data-default
+ hspec http-client http-client-tls http-conduit http-types network
+ random resourcet text vault wai wai-conduit warp warp-tls
+ ];
+ description = "WAI middleware that delegates handling of requests";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"wai-middleware-etag" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
, filepath, http-date, http-types, unix-compat
@@ -300944,6 +300956,41 @@ self: {
license = lib.licenses.mit;
}) {};
+ "warp_3_3_22" = callPackage
+ ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+ , bytestring, case-insensitive, containers, directory, gauge
+ , ghc-prim, hashable, hspec, hspec-discover, http-client, http-date
+ , http-types, http2, HUnit, iproute, network, process, QuickCheck
+ , simple-sendfile, stm, streaming-commons, text, time, time-manager
+ , unix, unix-compat, unliftio, vault, wai, word8, x509
+ }:
+ mkDerivation {
+ pname = "warp";
+ version = "3.3.22";
+ sha256 = "0gjgy2ilsldzqvv4gnaapvg1ijf5ri8wav240j6vr1igl5pkh9pa";
+ libraryHaskellDepends = [
+ array auto-update base bsb-http-chunked bytestring case-insensitive
+ containers ghc-prim hashable http-date http-types http2 iproute
+ network simple-sendfile stm streaming-commons text time-manager
+ unix unix-compat unliftio vault wai word8 x509
+ ];
+ testHaskellDepends = [
+ array async auto-update base bsb-http-chunked bytestring
+ case-insensitive containers directory ghc-prim hashable hspec
+ http-client http-date http-types http2 HUnit iproute network
+ process QuickCheck simple-sendfile stm streaming-commons text time
+ time-manager unix unix-compat unliftio vault wai word8 x509
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ auto-update base bytestring containers gauge hashable http-date
+ http-types network time-manager unix unix-compat unliftio x509
+ ];
+ description = "A fast, light-weight web server for WAI applications";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"warp-dynamic" = callPackage
({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
mkDerivation {
@@ -309076,8 +309123,8 @@ self: {
}:
mkDerivation {
pname = "yampa-test";
- version = "0.13.5";
- sha256 = "1dc2cicrd6w1y5z14xp0h1zd1xwkj8sm5ihqlpwyvikqnzlvvi7z";
+ version = "0.13.6";
+ sha256 = "0zcfq6g2jd6qwrr0ar99b57wnphbfvmdpgnnl62mvmgarvmgkgs6";
libraryHaskellDepends = [
base normaldistribution QuickCheck Yampa
];
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 2bc86edef70ac..e7290d54c0b8d 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, cmake, fetchFromGitHub }:
+{ lib, stdenv, cmake, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.1.5";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
};
+ patches = [
+ # Add pkgconfig fix from https://github.com/nanomsg/nanomsg/pull/1085
+ (fetchpatch {
+ url = "https://github.com/nanomsg/nanomsg/commit/e3323f19579529d272cb1d55bd6b653c4f34c064.patch";
+ sha256 = "URz7TAqqpKxqjgvQqNX4WNSShwiEzAvO2h0hCZ2NhVY=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix
new file mode 100644
index 0000000000000..617afec140eb4
--- /dev/null
+++ b/pkgs/development/python-modules/amarna/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, lark
+, pydot
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "amarna";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "crytic";
+ repo = "amarna";
+ rev = "v${version}";
+ sha256 = "sha256-ohR6VJFIvUCMkppqdCV/kJwEmh1fP0QhfQfNu3RoMeU=";
+ };
+
+ propagatedBuildInputs = [
+ lark
+ pydot
+ ];
+ checkInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "amarna" ];
+
+ meta = with lib; {
+ description = "Amarna is a static-analyzer and linter for the Cairo programming language.";
+ homepage = "https://github.com/crytic/amarna";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ raitobezarius ];
+ };
+}
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index a9ca9833a55f6..1efe4661d6fb6 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
- version = "0.10.1";
+ version = "0.10.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = "refs/tags/${version}";
- hash = "sha256-RgF9uQREFOLvAUtoXixywSfQExu6W3qw0JCqVw9Nl9w=";
+ hash = "sha256-DcjkS0tbNZkmU787c+ECW3UntEHeKzOThvbFS4ketzA=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index 248ca673fab47..5adf527a9c7d0 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
- version = "1.8.0";
+ version = "1.10.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
- hash = "sha256-wtzZ94nHfVtX8YakMLGxhqvn95v93qL2Qz9OeBRB520=";
+ hash = "sha256-cdPFyuDRdZJZ/HQq9xO3TojnNS34F+2JiwTIcxQWONM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
new file mode 100644
index 0000000000000..5e4f9c87a43a4
--- /dev/null
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, bluetooth-sensor-state-data
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pycryptodomex
+, pytestCheckHook
+, pythonOlder
+, sensor-state-data
+}:
+
+buildPythonPackage rec {
+ pname = "bthome-ble";
+ version = "0.2.2";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchFromGitHub {
+ owner = "Bluetooth-Devices";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-p1ySTp+/gMUo8XWox2s+M7ees6GlxpGCZxNNEJpQbj8=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ bluetooth-sensor-state-data
+ sensor-state-data
+ pycryptodomex
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace " --cov=bthome_ble --cov-report=term-missing:skip-covered" ""
+ '';
+
+ pythonImportsCheck = [
+ "bthome_ble"
+ ];
+
+ meta = with lib; {
+ description = "Library for BThome BLE devices";
+ homepage = "https://github.com/Bluetooth-Devices/bthome-ble";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 29e45201e01ae..eb849e9785eca 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -58,6 +58,10 @@ buildPythonPackage rec {
hash = "sha256-QE7QnfYAK74wvK8gDJ15FtQ+BCIWRQKAVvM7v1FzwlE=";
excludes = [ "docs/releases/4.1.1.txt" ];
})
+ (substituteAll {
+ src = ./django_4_set_zoneinfo_dir.patch;
+ zoneinfo = tzdata + "/share/zoneinfo";
+ })
] ++ lib.optionals withGdal [
(substituteAll {
src = ./django_4_set_geos_gdal_lib.patch;
diff --git a/pkgs/development/python-modules/django/django_4_set_zoneinfo_dir.patch b/pkgs/development/python-modules/django/django_4_set_zoneinfo_dir.patch
new file mode 100644
index 0000000000000..d9848772b85af
--- /dev/null
+++ b/pkgs/development/python-modules/django/django_4_set_zoneinfo_dir.patch
@@ -0,0 +1,13 @@
+diff --git a/django/conf/__init__.py b/django/conf/__init__.py
+index cb70a71791..5156f7dd73 100644
+--- a/django/conf/__init__.py
++++ b/django/conf/__init__.py
+@@ -227,7 +227,7 @@ class Settings:
+ if hasattr(time, "tzset") and self.TIME_ZONE:
+ # When we can, attempt to validate the timezone. If we can't find
+ # this file, no check happens and it's harmless.
+- zoneinfo_root = Path("/usr/share/zoneinfo")
++ zoneinfo_root = Path("@zoneinfo@")
+ zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/"))
+ if zoneinfo_root.exists() and not zone_info_file.exists():
+ raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 1662366eb1889..0ad2e2b55babd 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
- version = "5.4.3";
+ version = "5.10.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-WeAYa1Iggog5VX1oiANZCeVpuEF5JdabdUjQ+fkAwxE=";
+ hash = "sha256-Ua3yDPxZEa4F66knhSfu4hxCNVJTUy/4BO/+a8GqOB0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix
index 84c5756689fdb..5f279cd730691 100644
--- a/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/pkgs/development/python-modules/pyhaversion/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyhaversion";
- version = "22.4.1";
+ version = "22.8.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-adM6LUo8ycD/3G19JIl4DcuVK/f0/9V8AG82qgYO0uM=";
+ sha256 = "sha256-30UHbxs0WZyIVyq0ai2PsoPTkvoYawS1OBhVbV0JVN8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix
index e6ca92f0e2e48..ca0598e27a094 100644
--- a/pkgs/development/python-modules/pymicrobot/default.nix
+++ b/pkgs/development/python-modules/pymicrobot/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pymicrobot";
- version = "0.0.3";
+ version = "0.0.4";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyMicroBot";
inherit version;
- hash = "sha256-lXBL1G/rZrQah/zcVH1dFyKXO5jGB9XhmXmiKKIAbT4=";
+ hash = "sha256-lNrohVQruFAtrzTxJ6qEZ8tVM5fgrCRAG7WXJSKMRFs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 2c0c38daccb0c..f43397fb4b7b2 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
- version = "2.4.1";
+ version = "2.4.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-YkutsaxPxspIclRlcr5dzk7JKvlX6IXbccca3NLFtSo=";
+ sha256 = "sha256-WVyMYmuezTS3GNcIY9Uh+/0+lcgdmoLL6o5d1SFMfvE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix
index fe533ab5ea3c6..a74673b05518e 100644
--- a/pkgs/development/python-modules/types-pytz/default.nix
+++ b/pkgs/development/python-modules/types-pytz/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-pytz";
- version = "2022.1.2";
+ version = "2022.2.1.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-GoslwiXF5r2EaKqetF3dOzN/ZxbUByrQqk7x5BR47rw=";
+ sha256 = "sha256-R8+xnFK591iWRAVB2zkv0xKjWyecYwelMdtxFS6mPis=";
};
# Modules doesn't have tests
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index f8b663abe6feb..12b38156473b5 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.28.8";
+ version = "2.28.9";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-ep97FS1ZShwY3UkyzdJZa4777t/XPKpOSrs3VYBbRoU=";
+ sha256 = "sha256-/q9YG9WASXpH/oRdUG+juRtITPcG/yd3TodlmDfemWI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index b84e1059c2eb0..6fefdd792a3ed 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
- version = "64.0.1";
+ version = "65.1.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-gpC2vx2RbmsAd4TVy80RKhr5otdjQyMfzOClUYU0NwI=";
+ sha256 = "sha256-V/fYnqpSpAzLl/LL5heMatkPhDr7Z2gJM/jvFHLaU/g=";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix
index b17d83a351906..0d4700d225bf2 100644
--- a/pkgs/development/python-modules/types-urllib3/default.nix
+++ b/pkgs/development/python-modules/types-urllib3/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
- version = "1.26.22";
+ version = "1.26.23";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-sFr5DnOInmiAlACKl8qVeI24vzc24ndv1D+2sXFIXZQ=";
+ hash = "sha256-t46Bnw41AiHQaJpWZhYuRnujkQc3uv2hS1wshem7HlY=";
};
# Module doesn't have tests
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 6eace485507a3..2f8963ea0964f 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
- version = "1.12.0";
+ version = "1.12.2";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-RWVD6tngFE3i8JDB9b0JZz8Bd+u97b4ilmEF0N8Pm4Y=";
+ sha256 = "sha256-VgAhZZ5ZIkdAYIs/UqOkogROMIR2UToE4+xPXGR1erE=";
};
- vendorSha256 = "sha256-6rJa/c5uCnBQh0VVlzefXXPuJNFi+R8X2r+o7GBLIiE=";
+ vendorSha256 = "sha256-JPNcHEd56ypI4OgGmBnIasE7xxW+8pHMXk7t8w1M40A=";
doCheck = false;
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index ad792a17913f7..9bc6a58b253d6 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "qbs";
- version = "1.23.0";
+ version = "1.23.1";
src = fetchFromGitHub {
owner = "qbs";
repo = "qbs";
rev = "v${version}";
- sha256 = "sha256-F8dfSMim4OVGjBEGtIA4bGTNSLwZSwpHWI0J2e7pKCw=";
+ sha256 = "sha256-ZAMWPvTzramhIuafYw+lV7Tm3fQKm+nbRdAFdjYDMhs=";
};
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 38a8e2ad2b063..0c529800cce69 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gosec";
- version = "2.12.0";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "securego";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Y4QL6vYCTZUCh+HF86QI+ENel/pK16XpLd6CF4RWcK0=";
+ sha256 = "sha256-U4nP812du71wcU/OPSDpZePHO9/vSdTL5s58VdA4UvY=";
};
- vendorSha256 = "sha256-5rA2C3nyvSUiBQ/Nk5OJ9e9tf8CKHQB+6rLUJXESK/0=";
+ vendorSha256 = "sha256-D4wWofYz63c0yXIg4xnolXzWudG17dRqdjUHYhMrtt4=";
subPackages = [
"cmd/gosec"
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 4a84823141089..d371472531805 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -24,4 +24,9 @@ buildEnv {
fi
done
'';
+ meta = {
+ # ihaskell has an indirect dependency on the Python package mistune, which
+ # is marked insecure.
+ hydraPlatforms = lib.platforms.none;
+ };
}
diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix
index efebf39984d0a..7ea0b6abcab69 100644
--- a/pkgs/development/tools/kdash/default.nix
+++ b/pkgs/development/tools/kdash/default.nix
@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "kdash";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "kdash-rs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-u5Qa1rStWeFku3VA2ljg+RQxh12byfyBHXC+NQJTr0w=";
+ sha256 = "sha256-xKrgRUU0ENJ8CIQUaU/6dMbmxN9RX4jksQnBfgcsRYE=";
};
nativeBuildInputs = [ perl python3 pkg-config ];
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl xorg.xcbutil ]
++ lib.optional stdenv.isDarwin AppKit;
- cargoSha256 = "sha256-rSPe7kkeHEYDqF80oO+Z+bGkWewtjnKut13EP6tmUIc=";
+ cargoSha256 = "sha256-7RQvd9zx6iXKmgYLp8N8hGDfq9IX0LoNf2jXwv+iOkM=";
meta = with lib; {
description = "A simple and fast dashboard for Kubernetes";
diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix
index d352622d53b4d..fb646d395955c 100644
--- a/pkgs/development/tools/memray/default.nix
+++ b/pkgs/development/tools/memray/default.nix
@@ -8,14 +8,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "memray";
- version = "1.2.0";
+ version = "1.3.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "bloomberg";
repo = pname;
rev = "v${version}";
- hash = "sha256-MZOKo0VaCJM/YyvCByM5Yg7H/8onDKNSufBzr+GsFlo=";
+ hash = "sha256-8uFAWcf9ookmFAnCdA97+oade+fECt58DuDSk1uTMQI=";
};
buildInputs = [
@@ -33,6 +33,8 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = with python3.pkgs; [
pytestCheckHook
+ ] ++ lib.optionals (pythonOlder "3.11") [
+ greenlet
];
pythonImportsCheck = [
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index 2cf8c91d3bf9d..1e15c6ab0f2f0 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,5 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
-, libmysqlclient, libaio
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libmysqlclient
+, libaio
+, luajit
+# For testing:
+, testers
+, sysbench
}:
stdenv.mkDerivation rec {
@@ -7,7 +16,7 @@ stdenv.mkDerivation rec {
version = "1.0.20";
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ libmysqlclient libaio ];
+ buildInputs = [ libmysqlclient luajit ] ++ lib.optionals stdenv.isLinux [ libaio ];
src = fetchFromGitHub {
owner = "akopytov";
@@ -18,10 +27,30 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ configureFlags = [
+ # The bundled version does not build on aarch64-darwin:
+ # https://github.com/akopytov/sysbench/issues/416
+ "--with-system-luajit"
+ ];
+
+ passthru.tests = {
+ versionTest = testers.testVersion {
+ package = sysbench;
+ };
+ };
+
meta = {
description = "Modular, cross-platform and multi-threaded benchmark tool";
+ longDescription = ''
+ sysbench is a scriptable multi-threaded benchmark tool based on LuaJIT.
+ It is most frequently used for database benchmarks, but can also be used
+ to create arbitrarily complex workloads that do not involve a database
+ server.
+ '';
homepage = "https://github.com/akopytov/sysbench";
+ downloadPage = "https://github.com/akopytov/sysbench/releases/tag/${version}";
+ changelog = "https://github.com/akopytov/sysbench/blob/${version}/ChangeLog";
license = lib.licenses.gpl2;
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix
index c116cd929f537..47de8a0f534a4 100644
--- a/pkgs/development/tools/okteto/default.nix
+++ b/pkgs/development/tools/okteto/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "okteto";
- version = "2.5.2";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
- sha256 = "sha256-VNtlH8Syj3myVEE4WAZpBnP10rl0e73cFg7TgCFh0EY=";
+ sha256 = "sha256-6Iqgj5KPE6oy2mSdTdnlAgVuFafh/INbDsNs+Y4XAcs=";
};
vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig=";
diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix
new file mode 100644
index 0000000000000..1112ae8cb0364
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-tauri/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, glibc
+, libsoup
+, cairo
+, gtk3
+, webkitgtk
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "tauri";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "tauri-apps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-mp9U46H03NTMumUkx5kjsh9LnbPBrvlhh3yCH6FYdbE=";
+ };
+
+ # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
+ # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
+ sourceRoot = "source/tooling/cli";
+
+ cargoSha256 = "sha256-iFXuVrxE/QmM+TAZmN8Ivt6Le19NWYIfVn1PNPvmhZo=";
+
+ buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ];
+ nativeBuildInputs = [ pkg-config ];
+
+ meta = with lib; {
+ description = "Build smaller, faster, and more secure desktop applications with a web frontend";
+ homepage = "https://tauri.app/";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ dit7ya ];
+ };
+}
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 7ea8257e192a8..9d23b94f6c668 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -107,5 +107,8 @@ stdenv.mkDerivation rec {
all movement on the battlefield has ceased).'';
maintainers = with maintainers; [ kragniz fpletz ];
inherit (fpc.meta) platforms;
+ # https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584
+ broken = true;
+ hydraPlatforms = platforms.none;
};
}
diff --git a/pkgs/misc/kitty-themes/default.nix b/pkgs/misc/kitty-themes/default.nix
index 7c794122e9b45..ad6cdf9bfa64a 100644
--- a/pkgs/misc/kitty-themes/default.nix
+++ b/pkgs/misc/kitty-themes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kitty-themes";
- version = "unstable-2022-05-04";
+ version = "unstable-2022-08-11";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = pname;
- rev = "fb48041b0ff5ce60e8f10e7067a407ad99a4862e";
- sha256 = "/JCLty73YHsTkNxZP6EwhhoiHi2HjtyMZphAPhHe5h0=";
+ rev = "72cf0dc4338ab1ad85f5ed93fdb13318916cae14";
+ sha256 = "d9mO2YqA7WD2dTPsmNeQg2dUR/iv2T/l7yxrt6WKX60=";
};
installPhase = ''
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 53b00b93358ab..e38db853ff450 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -5,20 +5,23 @@ let
ltsVariant = {
version = "5.15.60";
hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs=";
+ variant = "lts";
};
edgeVariant = {
version = "5.19.1";
hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ=";
+ variant = "edge";
};
ttVariant = {
version = "5.15.54";
suffix = "xanmod1-tt";
hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis=";
+ variant = "tt";
};
- xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec {
+ xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec {
inherit version;
modDirVersion = "${version}-${suffix}";
@@ -30,11 +33,6 @@ let
};
structuredExtraConfig = with lib.kernel; {
- # removed options
- CFS_BANDWIDTH = lib.mkForce (option no);
- RT_GROUP_SCHED = lib.mkForce (option no);
- SCHED_AUTOGROUP = lib.mkForce (option no);
-
# AMD P-state driver
X86_AMD_PSTATE = yes;
@@ -43,13 +41,6 @@ let
NTFS3_LZX_XPRESS = yes;
NTFS3_FS_POSIX_ACL = yes;
- # Preemptive Full Tickless Kernel at 500Hz
- SCHED_CORE = lib.mkForce (option no);
- PREEMPT_VOLUNTARY = lib.mkForce no;
- PREEMPT = lib.mkForce yes;
- NO_HZ_FULL = yes;
- HZ_500 = yes;
-
# Google's BBRv2 TCP congestion Control
TCP_CONG_BBR2 = yes;
DEFAULT_BBR2 = yes;
@@ -67,6 +58,12 @@ let
# WineSync driver for fast kernel-backed Wine
WINESYNC = module;
+ } // lib.optionalAttrs (variant == "tt") {
+ # removed options
+ CFS_BANDWIDTH = lib.mkForce (option no);
+ RT_GROUP_SCHED = lib.mkForce (option no);
+ SCHED_AUTOGROUP = lib.mkForce (option no);
+ SCHED_CORE = lib.mkForce (option no);
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index aeed100fd84c4..25bdce3b902f9 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "rdma-core";
- version = "41.0";
+ version = "42.0";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${version}";
- sha256 = "sha256-D6pgWdJKA6ZL+atFChqSW7hI6/dYfDBRzvb6hu1wxPg=";
+ sha256 = "sha256-MtvrKdo6Lkt064ol7+hlU7b1r+Dt5236bmE21wM5aDo=";
};
strictDeps = true;
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index db306490bd9c3..5f673e47131c5 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "headscale";
- version = "0.16.2";
+ version = "0.16.3";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
- sha256 = "sha256-RgRRBz9i12mavzCBtZN8QLlIjMjG7GfkGMRJGKMJosw=";
+ sha256 = "sha256-J6OO52AT7YHW5e5LxT8c+Id/+0VZ+/ISI9wkfcBrLWk=";
};
vendorSha256 = "sha256-RzmnAh81BN4tbzAGzJbb6CMuws8kuPJDw7aPkRRnSS8=";
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 632e6a919d05f..d7e2a582e03b3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2022.8.5";
+ version = "2022.8.6";
components = {
"abode" = ps: with ps; [
abodepy
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index aa37f8833bed4..6b0e704df52ad 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -307,7 +307,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.8.5";
+ hassVersion = "2022.8.6";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -325,7 +325,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256-cPoXL9YQolU5o/R9XhxfTDAwutzgksrsonitwjvxGM0=";
+ hash = "sha256-SRvdBHVGFlbRWiaZJ1gN0C4uOdHmWaAmwGAgihpkUL0=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/portunus/default.nix b/pkgs/servers/portunus/default.nix
index c0ee915c7bbe7..a59df99c8d183 100644
--- a/pkgs/servers/portunus/default.nix
+++ b/pkgs/servers/portunus/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "portunus";
- version = "1.1.0-beta.2";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "majewsky";
repo = "portunus";
rev = "v${version}";
- sha256 = "sha256-hGOMbaEWecgQvpk/2E8mcJZ9QMjllIhS3RBr7PKnbjQ=";
+ sha256 = "sha256-+sq5Wja0tVkPZ0Z++K2A6my9LfLJ4twxtoEAS6LHqzE=";
};
vendorSha256 = null;
diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix
index fec77cfcc36c7..e849d6c86addd 100644
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@@ -16,14 +16,14 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
- x64-linux_hash = "sha256-NTkb6E0GRofd63TozLPxyNZ6GxO4pAc+MWsUDKWLZDY=";
- arm64-linux_hash = "sha256-eB1Izvf/E0iOGkWt6fSc4oAt1sJ7XTxn/iwDNYz7WkA=";
- x64-osx_hash = "sha256-TAphdcbzbNUZpWYVaHBkhI+RsgxWmI8n8Z6VwYxHXWg=";
+ x64-linux_hash = "sha256-VUJgf0gxOJH6RKUN5pODxoT6MM4fX43CSApRCDvPjjU=";
+ arm64-linux_hash = "sha256-rZM9r9CCcB0Q468w4Q5CuTeQS6hmFPCSv/DJ/SPm4Tw=";
+ x64-osx_hash = "sha256-RjeuINFgtqKcKF6I8K+l9CbYTRKagepZGT3fOLXDtJE=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "prowlarr";
- version = "0.2.0.1448";
+ version = "0.4.4.1947";
src = fetchurl {
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
index e36f1416456a4..cc5a8501fa040 100644
--- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
@@ -14,6 +14,7 @@ in
discourse-ldap-auth = callPackage ./discourse-ldap-auth {};
discourse-math = callPackage ./discourse-math {};
discourse-migratepassword = callPackage ./discourse-migratepassword {};
+ discourse-oauth2-basic = callPackage ./discourse-oauth2-basic {};
discourse-openid-connect = callPackage ./discourse-openid-connect {};
discourse-prometheus = callPackage ./discourse-prometheus {};
discourse-saved-searches = callPackage ./discourse-saved-searches {};
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile
new file mode 100644
index 0000000000000..7da32ec039493
--- /dev/null
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+group :development do
+ gem 'rubocop-discourse'
+end
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock
new file mode 100644
index 0000000000000..6a91a08c0e865
--- /dev/null
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock
@@ -0,0 +1,37 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ ast (2.4.2)
+ parallel (1.22.1)
+ parser (3.1.1.0)
+ ast (~> 2.4.1)
+ rainbow (3.1.1)
+ regexp_parser (2.2.1)
+ rexml (3.2.5)
+ rubocop (1.26.1)
+ parallel (~> 1.10)
+ parser (>= 3.1.0.0)
+ rainbow (>= 2.2.2, < 4.0)
+ regexp_parser (>= 1.8, < 3.0)
+ rexml
+ rubocop-ast (>= 1.16.0, < 2.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (>= 1.4.0, < 3.0)
+ rubocop-ast (1.16.0)
+ parser (>= 3.1.1.0)
+ rubocop-discourse (2.5.0)
+ rubocop (>= 1.1.0)
+ rubocop-rspec (>= 2.0.0)
+ rubocop-rspec (2.9.0)
+ rubocop (~> 1.19)
+ ruby-progressbar (1.11.0)
+ unicode-display_width (2.1.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ rubocop-discourse
+
+BUNDLED WITH
+ 2.1.4
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix
new file mode 100644
index 0000000000000..a013383d1a2f2
--- /dev/null
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
+
+mkDiscoursePlugin rec {
+ name = "discourse-oauth2-basic";
+ bundlerEnvArgs.gemdir = ./.;
+ src = fetchFromGitHub {
+ owner = "discourse";
+ repo = name;
+ rev = "06ba5daa9aabd0487f2f30b944b6500f1f481308";
+ sha256 = "sha256-T08Q36k2hb9wVimKIa4O5mWcrr6VBTfHvhRJiLBiRPY=";
+ };
+ meta = with lib; {
+ homepage = "https://github.com/discourse/${name}";
+ maintainers = with maintainers; [ ehmry ];
+ license = licenses.mit;
+ description = "A basic OAuth2 plugin for use with Discourse";
+ };
+}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix
new file mode 100644
index 0000000000000..bbb35327787b2
--- /dev/null
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix
@@ -0,0 +1,127 @@
+{
+ ast = {
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
+ type = "gem";
+ };
+ version = "2.4.2";
+ };
+ parallel = {
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
+ type = "gem";
+ };
+ version = "1.22.1";
+ };
+ parser = {
+ dependencies = ["ast"];
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
+ type = "gem";
+ };
+ version = "3.1.1.0";
+ };
+ rainbow = {
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
+ type = "gem";
+ };
+ version = "3.1.1";
+ };
+ regexp_parser = {
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ rexml = {
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+ type = "gem";
+ };
+ version = "3.2.5";
+ };
+ rubocop = {
+ dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";
+ type = "gem";
+ };
+ version = "1.26.1";
+ };
+ rubocop-ast = {
+ dependencies = ["parser"];
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
+ type = "gem";
+ };
+ version = "1.16.0";
+ };
+ rubocop-discourse = {
+ dependencies = ["rubocop" "rubocop-rspec"];
+ groups = ["development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g";
+ type = "gem";
+ };
+ version = "2.5.0";
+ };
+ rubocop-rspec = {
+ dependencies = ["rubocop"];
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6";
+ type = "gem";
+ };
+ version = "2.9.0";
+ };
+ ruby-progressbar = {
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
+ type = "gem";
+ };
+ version = "1.11.0";
+ };
+ unicode-display_width = {
+ groups = ["default" "development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
+}
diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix
index c0ed0e60f1f29..3343980474c8c 100644
--- a/pkgs/tools/admin/colmena/default.nix
+++ b/pkgs/tools/admin/colmena/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "colmena";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "zhaofengli";
repo = "colmena";
rev = "v${version}";
- sha256 = "sha256-aGpMiY9pS2616AfAVWA87tULKatDYF2kCKxwYstK8V0=";
+ sha256 = "sha256-kXc5YD3u+4lLWnih6s5ZjOYT+p0TvC2I7GT9eBAK2Jk=";
};
- cargoSha256 = "sha256-ckCArDFjVwVWWK0Ffj0AYe411b9xU33CBc1zeCh2kns=";
+ cargoSha256 = "sha256-B8gO2m+i3BOsMyB/KHlA4MO+a5UT+ZAN1XJ92X1suec=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index e2504ccec35d6..cd58c8a728460 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "exoscale-cli";
- version = "1.58.0";
+ version = "1.59.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-+sofCsjx1PDuol9MjyRS2Bmppkv/1yrAo8Hzl+3ackc=";
+ sha256 = "sha256-QLIxoCV+QL+uXmT0IdeztzefiOpW9xNVf0XuZPVpp/Y=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 64a1f901be790..21e00f7ec2ed0 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -1,20 +1,19 @@
{ lib
-, stdenv
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "trivy";
- version = "0.30.4";
+ version = "0.31.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-sdGRZ0ljNnb5esXKqtheHbsEimCbN9JPaY8nNNdQhg4=";
+ sha256 = "sha256-4QNnZHFPyAAQOGRKse4cCc34FgMpelHj+MFTuHLUodE=";
};
- vendorSha256 = "sha256-GJobvLi73Ucpi8iO8vJxiRBFB3/OouZUKhmY/VkQjNY=";
+ vendorSha256 = "sha256-IO8QOUKTHXeinOW1Wrg2gl2z0u1/TCcPOHmX0G3ONrc=";
excludedPackages = "misc";
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 66f5b695287ac..dfe42f7666bff 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,6 +4,7 @@
, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib
, runCommand, btrfs-progs
, gitUpdater
+, udevSupport ? true
}:
stdenv.mkDerivation rec {
@@ -31,7 +32,8 @@ stdenv.mkDerivation rec {
install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
'';
- configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
+ configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"
+ ++ lib.optional (!udevSupport) "--disable-libudev";
makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index 618d627921ba1..abca61358d99b 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -1,16 +1,25 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }:
buildGoModule rec {
pname = "git-town";
- version = "7.7.0";
+ version = "7.8.0";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
rev = "v${version}";
- sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc=";
+ sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI=";
};
+ patches = [
+ # Fix "go vet" when building using Go 1.18.
+ (fetchpatch {
+ name = "fix-go-vet-in-go-1.18.patch";
+ url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch";
+ sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc=";
+ })
+ ];
+
vendorSha256 = null;
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/networking/rathole/default.nix b/pkgs/tools/networking/rathole/default.nix
new file mode 100644
index 0000000000000..74eb894f0d0f3
--- /dev/null
+++ b/pkgs/tools/networking/rathole/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, openssl
+, CoreServices
+}:
+rustPlatform.buildRustPackage rec {
+ pname = "rathole";
+ version = "0.4.3";
+
+ src = fetchFromGitHub {
+ owner = "rapiz1";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-gqWgx03mUk6+9K4Yw5PHEBwFxsOR+48wvngT+wQnN1k=";
+ };
+
+ cargoSha256 = "sha256-dafOgZtiszkoi97PpAVMtdvJd5O3EK9hDVNLJ32FYzE=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin [ CoreServices ];
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = with lib; {
+ description = "A lightweight and high-performance reverse proxy for NAT traversal, written in Rust";
+ homepage = "https://github.com/rapiz1/rathole";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dit7ya ];
+ };
+}
diff --git a/pkgs/tools/networking/sockdump/default.nix b/pkgs/tools/networking/sockdump/default.nix
new file mode 100644
index 0000000000000..1a9186646651f
--- /dev/null
+++ b/pkgs/tools/networking/sockdump/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, python3, bcc }:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "sockdump";
+ version = "unstable-2022-05-27";
+
+ src = fetchFromGitHub {
+ owner = "mechpen";
+ repo = pname;
+ rev = "4bb689933f253d4f58c8bb81b992cc883068e873";
+ hash = "sha256-B2ob4k29kgPA4JMtwr0Ma7vQeDRHL/vTFAJxhdS8ShA=";
+ };
+
+ propagatedBuildInputs = [ bcc ];
+
+ format = "other"; # none
+
+ installPhase = "install -D ${pname}.py $out/bin/${pname}";
+
+ meta = src.meta // {
+ description = "Dump unix domain socket traffic with bpf";
+ license = lib.licenses.unlicense;
+ maintainers = with lib.maintainers; [ ehmry ];
+ };
+}
diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/tools/system/gopsuinfo/default.nix
new file mode 100644
index 0000000000000..47d9500bf600e
--- /dev/null
+++ b/pkgs/tools/system/gopsuinfo/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "gopsuinfo";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "nwg-piotr";
+ repo = "gopsuinfo";
+ rev = "v${version}";
+ sha256 = "sha256-lEc5k89L0ViihcbYh6I5m+Z6Q/rhLFGwftc3WD2EJ/M=";
+ };
+
+ vendorSha256 = "sha256-RsplFwUL4KjWaXE6xvURX+4wkNG+i+1oyBXwLyVcb2Q=";
+
+ # Remove installing of binary from the Makefile (already taken care of by
+ # `buildGoModule`)
+ patches = [
+ ./no_bin_install.patch
+ ];
+
+ # Fix absolute path of icons in the code
+ postPatch = ''
+ substituteInPlace gopsuinfo.go \
+ --replace "/usr/share/gopsuinfo" "$out/usr/share/gopsuinfo"
+ '';
+
+ # Install icons
+ postInstall = '' make install DESTDIR=$out '';
+
+ meta = with lib; {
+ description = "A gopsutil-based command to display system usage info";
+ homepage = "https://github.com/nwg-piotr/gopsuinfo";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ otini ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/system/gopsuinfo/no_bin_install.patch b/pkgs/tools/system/gopsuinfo/no_bin_install.patch
new file mode 100644
index 0000000000000..ffbc31e340689
--- /dev/null
+++ b/pkgs/tools/system/gopsuinfo/no_bin_install.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index d33866c..e0aafb4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,6 @@ install:
+ mkdir -p "${DESTDIR}/usr/share/gopsuinfo" "${DESTDIR}/usr/bin"
+ cp -R icons_light "${DESTDIR}/usr/share/gopsuinfo"
+ cp -R icons_dark "${DESTDIR}/usr/share/gopsuinfo"
+- cp bin/gopsuinfo "${DESTDIR}/usr/bin/"
+
+ uninstall:
+ rm -r "${DESTDIR}/usr/share/gopsuinfo"
diff --git a/pkgs/tools/text/sgrep/default.nix b/pkgs/tools/text/sgrep/default.nix
new file mode 100644
index 0000000000000..f3d23d1666968
--- /dev/null
+++ b/pkgs/tools/text/sgrep/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, sgrep, fetchurl, runCommand, lib, m4, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ pname = "sgrep";
+ version = "1.94a";
+
+ src = fetchurl {
+ url = "https://www.cs.helsinki.fi/pub/Software/Local/Sgrep/sgrep-${version}.tar.gz";
+ sha256 = "sha256-1bFkeOOrRHNeJCg9LYldLJyAE5yVIo3zvbKsRGOV+vk=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram $out/bin/sgrep \
+ --prefix PATH : ${lib.makeBinPath [ m4 ]}
+ '';
+
+ passthru.tests.smokeTest = runCommand "test-sgrep" { } ''
+ expr='"" __ ""'
+ data="12"
+ ${sgrep}/bin/sgrep "$expr" <<<$data >$out
+ read result <$out
+ [[ $result = 1 ]]
+ '';
+
+ meta = with lib; {
+ homepage = "https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html";
+ description = "A grep for structured text formats such as XML";
+ longDescription = ''
+ sgrep (structured grep) is a tool for searching and indexing text,
+ SGML, XML and HTML files and filtering text streams using
+ structural criteria.
+ '';
+ platforms = platforms.unix;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ eigengrau ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3cd6698fb809..f8360461dacf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1300,6 +1300,8 @@ with pkgs;
sdlookup = callPackage ../tools/security/sdlookup { };
+ sgrep = callPackage ../tools/text/sgrep { };
+
smbscan = callPackage ../tools/security/smbscan { };
spectre-cli = callPackage ../tools/security/spectre-cli { };
@@ -1449,6 +1451,8 @@ with pkgs;
goldberg-emu = callPackage ../applications/emulators/goldberg-emu { };
+ gopsuinfo = callPackage ../tools/system/gopsuinfo { };
+
gxemul = callPackage ../applications/emulators/gxemul { };
hatari = callPackage ../applications/emulators/hatari { };
@@ -9555,6 +9559,8 @@ with pkgs;
p3x-onenote = callPackage ../applications/office/p3x-onenote { };
+ p4c = callPackage ../development/compilers/p4c { };
+
p7zip = callPackage ../tools/archivers/p7zip { };
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_8; };
@@ -10865,6 +10871,8 @@ with pkgs;
jdk = jdk11;
};
+ sockdump = callPackage ../tools/networking/sockdump { };
+
spglib = callPackage ../development/libraries/spglib {
inherit (llvmPackages) openmp;
};
@@ -14379,6 +14387,9 @@ with pkgs;
cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
+
+ cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { };
+
cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { };
cargo-wasi = callPackage ../development/tools/rust/cargo-wasi {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -16663,6 +16674,10 @@ with pkgs;
ran = callPackage ../servers/http/ran { };
+ rathole = callPackage ../tools/networking/rathole {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
+
retry = callPackage ../tools/system/retry { };
rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
@@ -30859,6 +30874,8 @@ with pkgs;
tasknc = callPackage ../applications/misc/tasknc { };
+ tasktimer = callPackage ../applications/misc/tasktimer { };
+
taskwarrior = callPackage ../applications/misc/taskwarrior { };
taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 744ddcb879e6e..b38853008757b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -157,10 +157,19 @@ in {
};
ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix {
bootPkgs =
- # TODO(@sternenseemann): Package 9.0.2 bindist or wait for upstream fix
- # Need to use 902 due to
+ # Building with 9.2 is broken due to
# https://gitlab.haskell.org/ghc/ghc/-/issues/21914
- packages.ghc902;
+ # Use 8.10 as a workaround where possible to keep bootstrap path short.
+
+ # On ARM text won't build with GHC 8.10.*
+ if stdenv.hostPlatform.isAarch then
+ # TODO(@sternenseemann): package bindist
+ packages.ghc902
+ # No suitable bindists for powerpc64le
+ else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
+ packages.ghc902
+ else
+ packages.ghc8107Binary;
inherit (buildPackages.python3Packages) sphinx;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8bdc48ac92429..38692196950e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -522,6 +522,8 @@ in {
altair = callPackage ../development/python-modules/altair { };
+ amarna = callPackage ../development/python-modules/amarna { };
+
amazon-ion = callPackage ../development/python-modules/amazon-ion { };
amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
@@ -1501,6 +1503,8 @@ in {
btchip = callPackage ../development/python-modules/btchip { };
+ bthome-ble = callPackage ../development/python-modules/bthome-ble { };
+
bt-proximity = callPackage ../development/python-modules/bt-proximity { };
BTrees = callPackage ../development/python-modules/btrees { };