Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -11527,6 +11527,12 @@
|
||||
githubId = 1538622;
|
||||
name = "Michael Reilly";
|
||||
};
|
||||
onedragon = {
|
||||
name = "YiLong Liu";
|
||||
email = "18922251299@163.com";
|
||||
github = "jackyliu16";
|
||||
githubId = 50787361;
|
||||
};
|
||||
onixie = {
|
||||
email = "onixie@gmail.com";
|
||||
github = "onixie";
|
||||
|
||||
@@ -58,6 +58,7 @@ sed -r \
|
||||
-e '/ distribution-nixpkgs /d' \
|
||||
-e '/ jailbreak-cabal /d' \
|
||||
-e '/ language-nix /d' \
|
||||
-e '/ hackage-db /d' \
|
||||
-e '/ cabal-install /d' \
|
||||
-e '/ lsp /d' \
|
||||
-e '/ lsp-types /d' \
|
||||
|
||||
@@ -15,8 +15,29 @@
|
||||
# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.)
|
||||
# Those fields are specified under `upload` on the `cabal` man page.
|
||||
|
||||
if test -z "$CABAL_DIR"; then
|
||||
dirs=(
|
||||
"$HOME/.cabal"
|
||||
"${XDG_CONFIG_HOME:-$HOME/.config}/cabal"
|
||||
)
|
||||
missing=true
|
||||
|
||||
for dir in "${dirs[@]}"; do
|
||||
if test -d "$dir"; then
|
||||
export CABAL_DIR="$dir"
|
||||
missing=false
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if $missing; then
|
||||
echo "Could not find the cabal configuration directory in any of: ${dirs[@]}" >&2
|
||||
exit 101
|
||||
fi
|
||||
fi
|
||||
|
||||
package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
|
||||
username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //")
|
||||
password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //")
|
||||
username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //")
|
||||
password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //")
|
||||
curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv
|
||||
echo
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "4.4.8";
|
||||
version = "4.4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-qdqRvCmp6Q7lcTdOIEHeQKAAOLtJxs867gapopyeHuc=";
|
||||
sha256 = "sha256-gtQ1mhXk0AqGidZk5TCzSR58pD1JJoELMBmELtqyb4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HAA5YRShLzxVP9aIP1RdDH09cZqjiZhZOxxc2EVGvx8=";
|
||||
sha256 = "sha256-guvOs/HsSuj5QOMTzmKxMaC8iUyTkVgEpp8pQ63aIIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yEd";
|
||||
version = "3.22";
|
||||
version = "3.23.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
|
||||
sha256 = "sha256-GHYdvWie2k9YarS9DaA4bExswV3UQ26O8+7K/6yvtac=";
|
||||
sha256 = "sha256-MboljULek5vCcHpRFL9kdT4AROTD774AOBYeOTzcdig=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "netmaker";
|
||||
version = "0.17.1";
|
||||
version = "0.18.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8uxPPhy1/FqPGouqzUxY2lGnO/giqH9bJbAqQ9rZI0g=";
|
||||
hash = "sha256-IUicsTgw6i6a9glgbUtt2sEPHIj/qQFJ3xnCJm9igdk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI=";
|
||||
vendorHash = "sha256-E4LjfKovOoXIru0PMEidOCpEYMNf1wSDP4lWiqRigI4=";
|
||||
|
||||
inherit subPackages;
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
perl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -44,12 +45,12 @@ stdenv.mkDerivation rec {
|
||||
enchant
|
||||
wv
|
||||
libjpeg
|
||||
perl
|
||||
boost
|
||||
libxslt
|
||||
goffice
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -21,11 +21,11 @@ let
|
||||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.4.1";
|
||||
version = "6.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "sha256-BbBZoMx/TnJhm+Vz56yunU15YU1HID0geNIXCsBH8K4=";
|
||||
sha256 = "sha256-W59qPDX05GlchU73FCjPlGHKGlKfaRwG3G97SOe7MzU=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@@ -35,7 +35,7 @@ let
|
||||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "mercurial-${version}";
|
||||
sha256 = "sha256-1enrXgQbf2aoBmM8WeAZg1259pR0OhdZnEB4Ax5k2K8=";
|
||||
sha256 = "sha256-dRajIqM91fESEm4EEa9qvS8h6/HlLZIJZztVGoS/G+M=";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a88deb396b19367026b858afe79fa1d0e0c1bc4f.tar.gz",
|
||||
"sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4",
|
||||
"msg": "Update from Hackage at 2023-04-07T21:49:23Z"
|
||||
"commit": "88252bfad2741817b521acc02a424b878264bf9f",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88252bfad2741817b521acc02a424b878264bf9f.tar.gz",
|
||||
"sha256": "00nc417r9xrknhmyjh3rfxlsbchizxicnbp98q63yb5czdapg4bm",
|
||||
"msg": "Update from Hackage at 2023-04-13T09:45:26Z"
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-arcmenu";
|
||||
version = "43";
|
||||
version = "44";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arcmenu";
|
||||
repo = "ArcMenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Mb3C2H7jq+zVcLjb0iaiIdO6zmU54vhuYxhN6oBCyP8=";
|
||||
rev = "v44.1";
|
||||
sha256 = "sha256-+aPBRxjL5lgdm96SbRZnp+9o9nl2N8Rb3dehMAv883c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
--- a/extension.js
|
||||
+++ b/extension.js
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
const Me = imports.misc.extensionUtils.getCurrentExtension();
|
||||
@@ -20,6 +20,8 @@
|
||||
const ExtensionUtils = imports.misc.extensionUtils;
|
||||
const Me = ExtensionUtils.getCurrentExtension();
|
||||
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@');
|
||||
+
|
||||
const {GLib, Gio, St} = imports.gi;
|
||||
const Constants = Me.imports.constants;
|
||||
const Controller = Me.imports.controller;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-dash-to-dock";
|
||||
version = "79";
|
||||
version = "80";
|
||||
|
||||
# Temporarily switched to commit hash because stable version is buggy.
|
||||
src = fetchFromGitHub {
|
||||
owner = "micheleg";
|
||||
repo = "dash-to-dock";
|
||||
rev = "extensions.gnome.org-v${version}";
|
||||
sha256 = "sha256-vqQ9nAa/avae2+0xJ5gApbAU07pawi+R6IEQ9O6DTjs=";
|
||||
sha256 = "sha256-b9XdLd4tcgp+B8HDlJZXjpJI3x5KE/YwckKd9+VA2Sk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-pop-shell";
|
||||
version = "unstable-2022-10-11";
|
||||
version = "unstable-2023-04-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "shell";
|
||||
rev = "886a069c0582b371e90ac3602b1747ea5fba616c";
|
||||
hash = "sha256-DwJ3IFhYuEW0LQrmN/mOspEiudj4X5BCLhdOyP74EVs=";
|
||||
rev = "a3a1b7bb832838fec2ea875954d33443fc680912";
|
||||
hash = "sha256-B82UKtJRDDejBX1UBBIjPRO8rzHNapJRi8wv6dT7oJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "libfm-qt";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "libfm-qt";
|
||||
rev = version;
|
||||
sha256 = "CrCLwAdkSIhEKJtVJdtHvwEUNKhcvF22p3OOWOuxBAk=";
|
||||
sha256 = "MK1QMYfr0T/cE46IUWarG9a/PJUSSskk1W3y2+kvEwg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "liblxqt";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "x1gzqmTHDnpAdLxacKyl+gDob1M7toTDUufaM0y+AHA=";
|
||||
sha256 = "Ug6LmDxynSDLWykZhnih2F9lT34aOlU0ewM88PX+5Ms=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "libqtxdg";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "Lynm6Qxy02Os69YQ1cb2W0hV7sq9kBhbACqjHTGj7Tw=";
|
||||
sha256 = "b3XR0Tn/roiCjNGb3EMf4ilECNaUjGYi11ykVBppBuc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lximage-qt";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "T/LvxnHi0094wvxjB+6W7Ztg2lxkSu5yzjGx/jSzM8Y=";
|
||||
sha256 = "afCW3VeXAq2HYc4fjSrd+7j6cGoHmGlO8jCiNq6/F3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-about";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "aOGbT8DwDAfp8odcOkNsZkuI/guSRbQnETii5o24jcU=";
|
||||
sha256 = "Dm4WFtF0O7MgAvwYBI/1DkY9MhneI+QSM+wRp4JlD+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-admin";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0b6I45O4hUSnhP+IJJV8jesJgWpg3Y53TEaROhGQctY=";
|
||||
sha256 = "glSxrSCr56lpdWca9q8hgnMcW22DNdsIyBzxPmQXQOY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-archiver";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-archiver";
|
||||
rev = version;
|
||||
sha256 = "aHN17sugIoH5UfbOn11mDofq2EY7KByYCWE5NJRJWbo=";
|
||||
sha256 = "C38c/jCyRur7jQSgU2ByasCQnollHgy3/mUoNv61OCU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
@@ -14,13 +12,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-build-tools";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "18+xSHBjYmtENGJuTf8yJh4C4QTNYttr8ucRU8KK1HU=";
|
||||
sha256 = "4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,26 +21,15 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-config";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24=";
|
||||
sha256 = "Gm/Y/5i7Abob9eRdLZHpRma2+Mdh2LBZUGKM4mMZMFk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: backport Plasma 5.27 build fix, remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lxqt/lxqt-config/commit/6add4e4f0040693e7c4242fbae48c9d32007686c.diff";
|
||||
hash = "sha256-Tir4KeGhBnD9dYmB1FAjuf4R4V+rn12MOxsRwTdE0Sc=";
|
||||
})
|
||||
];
|
||||
|
||||
# FIXME: required to build with Plasma 5.27, which uses std::optional
|
||||
cmakeFlags = ["-DCMAKE_CXX_STANDARD=17"];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-globalkeys";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "GZ5E8OAx7Wb1bEwqwmYdOVcOXFaTxD1SibADgTWhdbg=";
|
||||
sha256 = "lo5FG6+kQTm15MEh+CZO2DvywsLrmX4sKzs4Rka6GSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-notificationd";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "RbOkMsz3jejoij/GnRbGuoA7vW4GTZxPnkIfbhq64qI=";
|
||||
sha256 = "zfoTc+O8eYpUc13vzHUuk71q+MATNGEGtiYhQmFldtw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-openssh-askpass";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1uBgP4cOKypZZbMVYdvgM7GyZI2Ef3XmuAfs0nPzHd0=";
|
||||
sha256 = "6S+x8Az9e7rZ8i5p6+F3PZjx7k8fJcM1b/55dJdkuOM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-panel";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "TwVM0JY+BMvw6e/mzy82AH5E6pPsffE6oadd0BuCZk0=";
|
||||
sha256 = "tSj7GGIvneYapkyqqgSMJtPGApC1fdpiId2XgQF5xf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-policykit";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "SvJ4XN0JZs2VAt5H9CJXrJhThxnQnlbsLP44CW7zpGM=";
|
||||
sha256 = "ZcftMdMBj/7OhxRZ34AB0IW5CfDYTT8JZLJejTb0XVg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-powermanagement";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "yUQYvAWAsbaa2acwzIqnlFt5bsFLT63/RQdvWUsopqc=";
|
||||
sha256 = "lnEi3Emwx3ykIx1ZlRMjRP3FAaYgIhsVpY9r0dT3DEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-qtplugin";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "oxETofSxje7fNEI8AahSUCaT+k/flfU6XJroMhtdiCw=";
|
||||
sha256 = "/phBrpSru/4m+mcAkn4C6hKm5H2BAXNkbTgU2HmoyBg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-runner";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "fJHTw7xPn7rWVd+H1cDnNmeu3BPlE/ta0VOfJsUfSNs=";
|
||||
sha256 = "iC0XTdgB1+hwMfc/45JiEfAhwadbFOgTTJj9Kvxx+l4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-session";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "EmaMIoVouC1/B/WrLwynynx3F9A1Ae5kT3uhl5HVQg8=";
|
||||
sha256 = "jhz1OHnPvjZMSo8+X/pf8rVLjPPSEiE7BDLnhUp/Vbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-sudo";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "oa6q85iPOrhou1ii7/CsdIWnf5VNkxs55QMtiQWRM2c=";
|
||||
sha256 = "S+NWoF1l0HPOwceWwhfmGo7Xrm+6GeoMpJbGpK16rZs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-themes";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "c7SGsnF2t2IrQFZODVmZS0ijJ7G1KiLWOLm7Rs2hehs=";
|
||||
sha256 = "bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "pavucontrol-qt";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "OCMdfwbvgjb+7IYDp/NKF/gI4luJGFfFRKZH64JsPP8=";
|
||||
sha256 = "cXYJ9EMmZ1LHBvjRWM1TEv7ADdG69DTyb5DZN7q3NIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "pcmanfm-qt";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "HzA6+dOxXyeKrzYaR5Xwqj91rivc66ObjTLKHUay61A=";
|
||||
sha256 = "qqvjsZRG+ImKHr+XLNNHhnAe1kBWh47/nFcKB1MTSJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -39,7 +39,6 @@ mkDerivation rec {
|
||||
qtx11extras
|
||||
qtimageformats # add-on module to support more image file formats
|
||||
libfm-qt
|
||||
libfm-qt
|
||||
menu-cache
|
||||
lxmenu-data
|
||||
];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qps";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "A0JIZNNv/6lUlKnEp8MbBe+3lIQzyjqSPjlYcwbpENk=";
|
||||
sha256 = "70mANEnui/orN+8eIBzCCSsh5wvPXuPUAAwRcXtHsaY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qterminal";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "7fsMJdObNjXSXfmS2TxXtbErnRCZCJZb7WitE6y1xjg=";
|
||||
sha256 = "/R/fv8UAOeCVvXXBAXjturTTmN/LeqLKFJjAmEry2WU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qtermwidget";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "utQC0CNZtwHD0yAaV9Tr0iEUBa8DcrEMNKmWyuhj6GQ=";
|
||||
sha256 = "eir9PvJXzAQYwRqoUf0Nc4SfkVGa7bohbJVdKPCoyNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qtxdg-tools";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8jrb1Mdn9dhQzIEu6E0kz5F8eEnKAREwjXuypqfhw60=";
|
||||
sha256 = "sha256-iUvjLZbTDBsQw7PIA0LUAvhoq6FrdbLhjbMwKdE01Hc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "screengrab";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "QEe1vOAeUDOlQfTh5/BvwBv9+v40NsuoMbC77+U6GCA=";
|
||||
sha256 = "ySC5bCOnen2bjhmLY4GnwiFaUrvGx93LJrLQo0pBUc4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-lxqt";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "oEcFRBIYb/ZJQo9W+yIiq3l3eU1GqUzfDdF/Rvq5SKs=";
|
||||
sha256 = "gH4L6cjx3DjGWcgoqUSnsx4Bn+T9t03AXPB5ZNDa0Nw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -247,6 +247,9 @@ self: super: {
|
||||
ghcjs-base = null;
|
||||
ghcjs-prim = null;
|
||||
|
||||
# 2023-04-17: https://gitlab.haskell.org/ghc/ghc-debug/-/issues/20
|
||||
ghc-debug-brick = doJailbreak super.ghc-debug-brick;
|
||||
|
||||
# Needs older QuickCheck version
|
||||
attoparsec-varword = dontCheck super.attoparsec-varword;
|
||||
|
||||
@@ -1423,12 +1426,21 @@ self: super: {
|
||||
});
|
||||
};
|
||||
|
||||
jsaddle-webkit2gtk = overrideCabal (old: {
|
||||
postPatch = old.postPatch or "" + ''
|
||||
sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal
|
||||
'';
|
||||
}) super.jsaddle-webkit2gtk;
|
||||
|
||||
# 2023-04-16: https://github.com/ghcjs/jsaddle/pull/137
|
||||
jsaddle-webkit2gtk = lib.pipe super.jsaddle-webkit2gtk
|
||||
[
|
||||
(appendPatch (fetchpatch {
|
||||
url = "https://github.com/ghcjs/jsaddle/commit/f990366f19d23a8008d482572d52351c1a6f7215.patch";
|
||||
hash = "sha256-IbkJrlyG6q5rqMIhn//Dt3u6T314Pug+mQMwwe0LK5w=";
|
||||
relative = "jsaddle-webkit2gtk";
|
||||
}))
|
||||
(overrideCabal (old: {
|
||||
postPatch = old.postPatch or "" + ''
|
||||
sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal
|
||||
'';
|
||||
}))
|
||||
];
|
||||
|
||||
# 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19
|
||||
jsaddle-dom = overrideCabal (old: {
|
||||
|
||||
@@ -473,6 +473,7 @@ broken-packages:
|
||||
- brick-dropdownmenu
|
||||
- brick-filetree
|
||||
- brick-list-search # failure in job https://hydra.nixos.org/build/211236614 at 2023-03-13
|
||||
- brick-list-skip # failure in job https://hydra.nixos.org/build/215850872 at 2023-04-17
|
||||
- bricks-internal
|
||||
- brick-tabular-list
|
||||
- brillig
|
||||
@@ -1404,7 +1405,6 @@ broken-packages:
|
||||
- eved
|
||||
- event
|
||||
- event-driven
|
||||
- eventlog2html # failure in job https://hydra.nixos.org/build/214597490 at 2023-04-07
|
||||
- eventsource-api
|
||||
- eventsourced
|
||||
- eventstore
|
||||
@@ -1744,7 +1744,6 @@ broken-packages:
|
||||
- ghc-clippy-plugin
|
||||
- ghc-core-smallstep
|
||||
- ghc-datasize
|
||||
- ghc-debug-client
|
||||
- ghc-dump-tree
|
||||
- ghc-dup
|
||||
- ghc-events-analyze
|
||||
@@ -3465,6 +3464,7 @@ broken-packages:
|
||||
- monoidplus
|
||||
- monoids
|
||||
- monoid-statistics
|
||||
- monomer-flatpak-example # failure in job https://hydra.nixos.org/build/215851035 at 2023-04-17
|
||||
- monopati
|
||||
- monus
|
||||
- monzo
|
||||
@@ -3742,6 +3742,7 @@ broken-packages:
|
||||
- opaleye-trans
|
||||
- open-adt
|
||||
- OpenAFP
|
||||
- openai-hs # failure building library in job https://hydra.nixos.org/build/215850908 at 2023-04-17
|
||||
- openapi3
|
||||
- openapi3-code-generator
|
||||
- openapi-petstore
|
||||
@@ -3985,6 +3986,7 @@ broken-packages:
|
||||
- pg-store
|
||||
- pgstream
|
||||
- pg-transact
|
||||
- pgvector # failure in job https://hydra.nixos.org/build/215851675 at 2023-04-17
|
||||
- phasechange
|
||||
- phaser
|
||||
- phoityne
|
||||
|
||||
@@ -46,6 +46,8 @@ default-package-overrides:
|
||||
- pandoc-crossref < 0.3.15.0
|
||||
# Needs to match hspec which is tracked in stackage
|
||||
- hspec-api < 2.10
|
||||
# 2023-04-13: latest version requires ghc-events >= 0.19 but it's not on LTS yet
|
||||
- eventlog2html < 0.10
|
||||
|
||||
extra-packages:
|
||||
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
||||
@@ -269,7 +271,10 @@ package-maintainers:
|
||||
- clay
|
||||
- ema
|
||||
- emanote
|
||||
- eventlog2html
|
||||
- generic-optics
|
||||
- ghc-debug-brick
|
||||
- ghc-debug-stub
|
||||
- ghcid
|
||||
- graphql-client
|
||||
- haskell-language-server
|
||||
|
||||
@@ -1002,7 +1002,6 @@ default-package-overrides:
|
||||
- gtk-strut ==0.1.3.2
|
||||
- guarded-allocation ==0.0.1
|
||||
- hackage-cli ==0.0.3.6
|
||||
- hackage-db ==2.1.2
|
||||
- hackage-security ==0.6.2.3
|
||||
- haddock-library ==1.10.0
|
||||
- hakyll ==4.15.1.1
|
||||
|
||||
@@ -933,6 +933,7 @@ dont-distribute-packages:
|
||||
- categorical-algebra
|
||||
- category
|
||||
- category-extras
|
||||
- cattrap
|
||||
- cctools-workqueue
|
||||
- cef3-simple
|
||||
- ceilometer-common
|
||||
|
||||
+684
-198
File diff suppressed because it is too large
Load Diff
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
buildInputs = [ libGLU libepoxy libX11 libdrm mesa ];
|
||||
|
||||
nativeBuildInputs = [ cmake meson ninja pkg-config python3 ];
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitHub
|
||||
, stdlib-shims
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "bdd";
|
||||
version = "unstable-2022-07-14";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "backtracking";
|
||||
repo = "ocaml-bdd";
|
||||
rev = "6d1b1d3c24e5784b87e599a00230ce652acb2dcc";
|
||||
hash = "sha256-3mJZlAFQsI7AgrNQOe6N94CDfX5gXYqQBooV0jcoYEA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Quick implementation of a Binary Decision Diagrams (BDD) library for OCaml";
|
||||
homepage = "https://github.com/backtracking/ocaml-bdd";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, alcotest, qcheck
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "dates_calc";
|
||||
version = "0.0.4";
|
||||
|
||||
minimalOCamlVersion = "4.11";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catalalang";
|
||||
repo = "dates-calc";
|
||||
rev = version;
|
||||
sha256 = "sha256-tpKOoPVXkg/k+NW5R8A4fGAKhdMn9UcqMogCjafJuw4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
qcheck
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A date calculation library";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.niols ];
|
||||
homepage = "https://github.com/catalalang/dates-calc";
|
||||
};
|
||||
}
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mdx";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
|
||||
hash = "sha256-8J7XM/5EYWBfApdzdIpjU9Ablb5l65hrzOF9bdr1Cdg=";
|
||||
hash = "sha256-MqCDmBAK/S0ueYi8O0XJtplxJx96twiFHe04Q8lHBmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, ppxlib
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ppx_monad";
|
||||
version = "0.2.0";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niols";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cbguAddSlUxBK7pmT7vNmtJW9TrVZZjdSJRMT3lqxOA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ppxlib
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "An OCaml Syntax Extension for all Monadic Syntaxes";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ lib.maintainers.niols ];
|
||||
homepage = "https://github.com/niols/${pname}";
|
||||
};
|
||||
}
|
||||
@@ -9,26 +9,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aqualogic";
|
||||
version = "3.3";
|
||||
version = "3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swilson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs=";
|
||||
hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pyserial
|
||||
websockets
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# With 3.3 the event loop is not terminated after the first test
|
||||
# With 3.4 the event loop is not terminated after the first test
|
||||
# https://github.com/swilson/aqualogic/issues/9
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.32";
|
||||
version = "0.5.33";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YX0v1i8PuVDq1+LPxV2Fs76N4PLxAQrKCAIeabmzNwc=";
|
||||
hash = "sha256-td4baHAtBuNqUpe11HBtsMl6fW9n5w12U+KUUc1SmIQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -5,18 +5,23 @@
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, atpublic
|
||||
, click
|
||||
, bidict
|
||||
, black
|
||||
, clickhouse-cityhash
|
||||
, clickhouse-driver
|
||||
, dask
|
||||
, datafusion
|
||||
, db-dtypes
|
||||
, duckdb
|
||||
, duckdb-engine
|
||||
, filelock
|
||||
, geoalchemy2
|
||||
, geopandas
|
||||
, google-cloud-bigquery
|
||||
, google-cloud-bigquery-storage
|
||||
, graphviz-nox
|
||||
, hypothesis
|
||||
, importlib-resources
|
||||
, lz4
|
||||
, multipledispatch
|
||||
, numpy
|
||||
@@ -24,83 +29,100 @@
|
||||
, pandas
|
||||
, parsy
|
||||
, poetry-core
|
||||
, poetry-dynamic-versioning
|
||||
, polars
|
||||
, pooch
|
||||
, psycopg2
|
||||
, pyarrow
|
||||
, pydantic
|
||||
, pydata-google-auth
|
||||
, pydruid
|
||||
, pymysql
|
||||
, pyspark
|
||||
, pytest-benchmark
|
||||
, pytest-httpserver
|
||||
, pytest-mock
|
||||
, pytest-randomly
|
||||
, pytest-snapshot
|
||||
, pytest-xdist
|
||||
, python
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, regex
|
||||
, rich
|
||||
, rsync
|
||||
, shapely
|
||||
, snowflake-connector-python
|
||||
, snowflake-sqlalchemy
|
||||
, sqlalchemy
|
||||
, sqlalchemy-views
|
||||
, sqlglot
|
||||
, sqlite
|
||||
, toolz
|
||||
, trino-python-client
|
||||
, typing-extensions
|
||||
}:
|
||||
let
|
||||
testBackends = [
|
||||
"datafusion"
|
||||
"duckdb"
|
||||
"pandas"
|
||||
"sqlite"
|
||||
];
|
||||
testBackends = [ "datafusion" "duckdb" "pandas" "sqlite" ];
|
||||
|
||||
ibisTestingData = fetchFromGitHub {
|
||||
name = "ibis-testing-data";
|
||||
owner = "ibis-project";
|
||||
repo = "testing-data";
|
||||
rev = "3c39abfdb4b284140ff481e8f9fbb128b35f157a";
|
||||
hash = "sha256-BZWi4kEumZemQeYoAtlUSw922p+R6opSWp/bmX0DjAo=";
|
||||
rev = "8a59df99c01fa217259554929543e71c3bbb1761";
|
||||
hash = "sha256-NbgEe0w/qf9hCr9rRfIpyaH9pv25I8x0ykY7EJxDOuk=";
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibis-framework";
|
||||
version = "4.1.0";
|
||||
version = "5.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "ibis-source";
|
||||
repo = "ibis";
|
||||
owner = "ibis-project";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ipnMymf+BOpG9iGWO47no47m4nLIBbqLdbzlevuxeBw=";
|
||||
hash = "sha256-u3BBGdhWajZ5WtoBvNxmx76+orfHY6LX3IWAq/x2/9A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes a small bug in the datafusion backend to reorder predicates
|
||||
(fetchpatch {
|
||||
name = "fix-datafusion-compilation.patch";
|
||||
url = "https://github.com/ibis-project/ibis/commit/009230421b2bc1f86591e8b850d37a489e8e4f06.patch";
|
||||
hash = "sha256-5NHkgc8d2bkOMpbY1vme1XgNfyHSr0f7BrR3JTTjjPI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
atpublic
|
||||
bidict
|
||||
multipledispatch
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
parsy
|
||||
poetry-dynamic-versioning
|
||||
pydantic
|
||||
pooch
|
||||
python-dateutil
|
||||
pytz
|
||||
regex
|
||||
rich
|
||||
sqlglot
|
||||
toolz
|
||||
];
|
||||
typing-extensions
|
||||
] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]
|
||||
++ pooch.optional-dependencies.progress
|
||||
++ pooch.optional-dependencies.xxhash;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
click
|
||||
filelock
|
||||
hypothesis
|
||||
pytest-benchmark
|
||||
pytest-httpserver
|
||||
pytest-mock
|
||||
pytest-randomly
|
||||
pytest-snapshot
|
||||
@@ -112,15 +134,13 @@ buildPythonPackage rec {
|
||||
"--dist=loadgroup"
|
||||
"-m"
|
||||
"'${lib.concatStringsSep " or " testBackends} or core'"
|
||||
# these will be fixed in ibis-framework 5.0.0
|
||||
"--deselect=ibis/backends/tests/test_string.py::test_string"
|
||||
"--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema"
|
||||
"--deselect=ibis/backends/tests/test_client.py::test_list_databases"
|
||||
# sqlalchemy2 breakage
|
||||
"--deselect=ibis/tests/sql/test_sqlalchemy.py::test_tpc_h17"
|
||||
# tries to download duckdb extensions
|
||||
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite"
|
||||
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite"
|
||||
];
|
||||
|
||||
# remove when sqlalchemy backend no longer uses deprecated methods
|
||||
SQLALCHEMY_SILENCE_UBER_WARNING = 1;
|
||||
|
||||
# patch out tests that check formatting with black
|
||||
postPatch = ''
|
||||
find ibis/tests -type f -name '*.py' -exec sed -i \
|
||||
@@ -131,8 +151,8 @@ buildPythonPackage rec {
|
||||
preCheck = ''
|
||||
set -eo pipefail
|
||||
|
||||
export IBIS_TEST_DATA_DIRECTORY
|
||||
IBIS_TEST_DATA_DIRECTORY="ci/ibis-testing-data"
|
||||
HOME="$TMPDIR"
|
||||
export IBIS_TEST_DATA_DIRECTORY="ci/ibis-testing-data"
|
||||
|
||||
mkdir -p "$IBIS_TEST_DATA_DIRECTORY"
|
||||
|
||||
@@ -150,23 +170,30 @@ buildPythonPackage rec {
|
||||
|
||||
passthru = {
|
||||
optional-dependencies = {
|
||||
clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 sqlglot ];
|
||||
dask = [ dask pyarrow ];
|
||||
bigquery = [ db-dtypes google-cloud-bigquery google-cloud-bigquery-storage pydata-google-auth ];
|
||||
clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 sqlalchemy ];
|
||||
dask = [ dask pyarrow regex ];
|
||||
datafusion = [ datafusion ];
|
||||
duckdb = [ duckdb duckdb-engine pyarrow sqlalchemy sqlglot ];
|
||||
druid = [ pydruid sqlalchemy ];
|
||||
duckdb = [ duckdb duckdb-engine packaging pyarrow sqlalchemy sqlalchemy-views ];
|
||||
geospatial = [ geoalchemy2 geopandas shapely ];
|
||||
mysql = [ sqlalchemy pymysql sqlglot ];
|
||||
pandas = [ ];
|
||||
postgres = [ psycopg2 sqlalchemy sqlglot ];
|
||||
pyspark = [ pyarrow pyspark ];
|
||||
sqlite = [ sqlalchemy sqlite sqlglot ];
|
||||
mysql = [ sqlalchemy pymysql sqlalchemy-views ];
|
||||
pandas = [ regex ];
|
||||
polars = [ polars pyarrow ];
|
||||
postgres = [ psycopg2 sqlalchemy sqlalchemy-views ];
|
||||
pyspark = [ pyarrow pyspark sqlalchemy ];
|
||||
snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views ];
|
||||
sqlite = [ regex sqlalchemy sqlite sqlalchemy-views ];
|
||||
trino = [ trino-python-client sqlalchemy sqlalchemy-views ];
|
||||
visualization = [ graphviz-nox ];
|
||||
decompiler = [ black ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Productivity-centric Python Big Data Framework";
|
||||
homepage = "https://github.com/ibis-project/ibis";
|
||||
changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ costrouc cpcloud ];
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcstatus";
|
||||
version = "10.0.2";
|
||||
version = "10.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "py-mine";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8RdJarRoBOkHZfFAKnDgqu8dANQLwKAoY2g8SwbuDeE=";
|
||||
hash = "sha256-LHcLqP9IGqi0YmjgFoTwojyS+IZmBOBujYWMPuqNc6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meraki";
|
||||
version = "1.30.0";
|
||||
version = "1.32.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s26xGwWSWB+qpOTUe8IYo53ywYOaaUWjDznFqpmRlak=";
|
||||
hash = "sha256-3iZ9/d78nAnK2+Kv0+0tuvZcfSV6ZF6QRF3xYL3NqV4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -27,6 +27,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Provides all current Meraki dashboard API calls to interface with the Cisco Meraki cloud-managed platform";
|
||||
homepage = "https://github.com/meraki/dashboard-api-python";
|
||||
changelog = "https://github.com/meraki/dashboard-api-python/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dylanmtaylor ];
|
||||
};
|
||||
|
||||
@@ -5,20 +5,31 @@
|
||||
, nose
|
||||
, pyserial
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylacrosse";
|
||||
version = "0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hthiery";
|
||||
repo = "python-lacrosse";
|
||||
rev = version;
|
||||
sha256 = "0g5hqm8lq0gsnvhcydjk54rjf7lpxzph8k7w1nnvnqfbhf31xfcf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyserial ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version = version," "version = '${version}',"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyserial
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
@@ -26,7 +37,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pylacrosse" ];
|
||||
pythonImportsCheck = [
|
||||
"pylacrosse"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Jeelink LaCrosse";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.5.12";
|
||||
version = "0.5.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HMuMoJFiI/zmFGuhoj9jtE073MvIZRA8bvUNIYlBvOY=";
|
||||
hash = "sha256-jIdKNOYj+ahqfMqTPYwf5fCwHVRn+CLecqlQCXslVG4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ddosify";
|
||||
version = "0.15.4";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-83/NZ/DcB7+jHFm1i3ru/vdUOhCP68xAkhrX4ekL8Uo=";
|
||||
sha256 = "sha256-AieMl5/S+ywX29Xu510YqeFKV9IyDZYepO1r/kHklSo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg=";
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
, nix-update-script
|
||||
, testers
|
||||
, powertop
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
|
||||
substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"
|
||||
substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "${lib.getExe xorg.xset}"
|
||||
substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool"
|
||||
'';
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "icingaweb2-ipl";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Icinga";
|
||||
repo = "icinga-php-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zeKI8D9anPYYvNTNyl1Ej9NT7eoM4KgX5Oto783kYoI=";
|
||||
hash = "sha256-3Vf3jT+/jh1YxJrnOFuGkhNIOyioZavSAHMmmkgA2gg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -15,13 +15,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janus-gateway";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meetecho";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-32xl/dVMuT9olC0fuN9dZFz1c6N9sLA5V9qaSjqkfo4=";
|
||||
sha256 = "sha256-2UlIpxixTl16VG6lgcfk+9LXSWn0jV1IfIkCeV/SO5w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
|
||||
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "General purpose WebRTC server";
|
||||
homepage = "https://janus.conf.meetecho.com/";
|
||||
changelog = "https://github.com/meetecho/janus-gateway/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exportarr";
|
||||
version = "1.2.6";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onedr0p";
|
||||
repo = "exportarr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iiMfPqXUdmSAkzeRHZ3ZQHeQGtWxpiYCF0K7gZYly94=";
|
||||
sha256 = "sha256-QZI3tYh2HXBDlZJWHQUAl/Yeyc/qCZGcfyFHbjCHlbU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c09aWDxD11XEoR3sLlhteZXAK/Bd6DnJXmGEBofUl7s=";
|
||||
vendorHash = "sha256-2Eb8FhbRu5M5u8HGa2bgAvZZkwHycBu8UiNKHG5/fFw=";
|
||||
|
||||
subPackages = [ "cmd/exportarr" ];
|
||||
|
||||
|
||||
@@ -1,22 +1,25 @@
|
||||
{ lib, stdenv, fetchurl, autoPatchelfHook, rpmextract, libX11, libXext }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, rpmextract
|
||||
, libX11
|
||||
, libXext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "realvnc-vnc-viewer";
|
||||
version = "6.22.515";
|
||||
version = "7.1.0";
|
||||
|
||||
src = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
|
||||
sha256 = "1l9kfmb1695pv2v9hm8z5yr7y5yhadbbs61s4yf9ksvvfypzwrpn";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm";
|
||||
sha256 = "15fi1siwbsxmy7qi6f8r8ym346a8mx3kqcp9mvwvx39wm3ija6dh";
|
||||
url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
|
||||
sha256 = "sha256-Mn4K2HICK7owHcXH85IJUncnpPZ56zNybkHZNiqYkHY=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook rpmextract ];
|
||||
buildInputs = [ libX11 libXext ];
|
||||
buildInputs = [ libX11 libXext stdenv.cc.cc.libgcc or null ];
|
||||
|
||||
unpackPhase = ''
|
||||
rpmextract $src
|
||||
@@ -47,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf";
|
||||
free = false;
|
||||
};
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ emilytrau onedragon ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
|
||||
assert lib.elem historyType [ "editline" "readline" "internal" ];
|
||||
assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" ];
|
||||
stdenv.mkDerivation (self: {
|
||||
assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" "" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gavin-bc";
|
||||
version = "6.2.4";
|
||||
version = "6.5.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.gavinhoward.com";
|
||||
owner = "gavin";
|
||||
repo = "bc";
|
||||
rev = self.version;
|
||||
hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-V0L5OmpcI0Zu5JvESjuhp4wEs5Bu/CvjF6B5WllTEqo=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@@ -27,17 +27,20 @@ stdenv.mkDerivation (self: {
|
||||
|
||||
configureFlags = [
|
||||
"--disable-nls"
|
||||
"--predefined-build-type=${historyType}"
|
||||
]
|
||||
++ (lib.optional (predefinedBuildType != "") "--predefined-build-type=${predefinedBuildType}")
|
||||
++ (lib.optional (historyType == "editline") "--enable-editline")
|
||||
++ (lib.optional (historyType == "readline") "--enable-readline");
|
||||
++ (lib.optional (historyType == "readline") "--enable-readline")
|
||||
++ (lib.optional (historyType == "internal") "--enable-internal-history");
|
||||
|
||||
meta = {
|
||||
homepage = "https://git.gavinhoward.com/gavin/bc";
|
||||
description = "Gavin Howard's BC calculator implementation";
|
||||
changelog = "https://git.gavinhoward.com/gavin/bc/raw/tag/${finalAttrs.version}/NEWS.md";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
})
|
||||
# TODO: cover most of configure settings
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parallel";
|
||||
version = "20230222";
|
||||
version = "20230322";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-bTal6gl2aN23gOdOL/ACUtoWOZWkselu9jOpmyCcmA4=";
|
||||
sha256 = "sha256-5cexum0MvJ1NxYqj4hyJcMWuSbD9D69Or4vb1gAre8o=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfox";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BishopFox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7xU99BqohfvUT23uW1l5thm20ZgeAPteR9xThuLR1AI=";
|
||||
hash = "sha256-XLn2GwoVNPoGTgXZx/q9dEmWigKB1BNylzxO9dBT3Zg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-v8rEsp2mDgfjCO2VvWNIxex8F350MDnZ40bR4szv+3o=";
|
||||
|
||||
@@ -66,6 +66,8 @@ let
|
||||
|
||||
batteries = callPackage ../development/ocaml-modules/batteries { };
|
||||
|
||||
bdd = callPackage ../development/ocaml-modules/bdd { };
|
||||
|
||||
benchmark = callPackage ../development/ocaml-modules/benchmark { };
|
||||
|
||||
bheap = callPackage ../development/ocaml-modules/bheap { };
|
||||
@@ -289,6 +291,8 @@ let
|
||||
|
||||
data-encoding = callPackage ../development/ocaml-modules/data-encoding { };
|
||||
|
||||
dates_calc = callPackage ../development/ocaml-modules/dates_calc { };
|
||||
|
||||
dbf = callPackage ../development/ocaml-modules/dbf { };
|
||||
|
||||
decompress = callPackage ../development/ocaml-modules/decompress { };
|
||||
@@ -1345,6 +1349,8 @@ let
|
||||
|
||||
ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { };
|
||||
|
||||
ppx_monad = callPackage ../development/ocaml-modules/ppx_monad { };
|
||||
|
||||
ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { };
|
||||
|
||||
ppx_tools =
|
||||
|
||||
Reference in New Issue
Block a user