mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-18 02:44:30 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
45b9a80f61
@ -764,7 +764,7 @@ and in this case the `python38` interpreter is automatically used.
|
||||
|
||||
### Interpreters {#interpreters}
|
||||
|
||||
Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as
|
||||
Versions 2.7, 3.7, 3.8 and 3.9 of the CPython interpreter are available as
|
||||
respectively `python27`, `python37`, `python38` and `python39`. The
|
||||
aliases `python2` and `python3` correspond to respectively `python27` and
|
||||
`python39`. The attribute `python` maps to `python2`. The PyPy interpreters
|
||||
|
||||
@ -3401,6 +3401,12 @@
|
||||
githubId = 103082;
|
||||
name = "Ed Brindley";
|
||||
};
|
||||
elliot = {
|
||||
email = "hack00mind@gmail.com";
|
||||
github = "Eliot00";
|
||||
githubId = 18375468;
|
||||
name = "Elliot Xu";
|
||||
};
|
||||
elliottvillars = {
|
||||
email = "elliottvillars@gmail.com";
|
||||
github = "elliottvillars";
|
||||
|
||||
@ -26,6 +26,6 @@ with lib;
|
||||
###### implementation
|
||||
config = mkIf config.programs.qt5ct.enable {
|
||||
environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct";
|
||||
environment.systemPackages = with pkgs; [ qt5ct ];
|
||||
environment.systemPackages = with pkgs; [ libsForQt5.qt5ct ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kid3";
|
||||
version = "3.8.7";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Dr+NLh5ajG42jRKt1Swq6mccPfuAXRvhhoTNuO8lnI0=";
|
||||
sha256 = "sha256-d0Y+swzzGk1FzQ3EK8sN8i1Nf6CRIPMAYgTUYN71FXU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qpwgraph";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "rncbc";
|
||||
repo = "qpwgraph";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VDLfOcIXM3+04tEvPzKDEKMperMhB5hDo1MlttS04yM=";
|
||||
sha256 = "sha256-r3FoAV0wah9fwnqyMyu8927c4Uj0zZoQNvLoXP5AP/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -91,6 +91,10 @@ let
|
||||
patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv
|
||||
|
||||
chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv
|
||||
|
||||
# fortify source breaks build since delve compiles with -O0
|
||||
wrapProgram $out/goland*/plugins/go/lib/dlv/linux/dlv \
|
||||
--prefix disableHardening " " fortify
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "charm";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "charm";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q5c2qka4srqj82f50iwmcj2j0yw2msz5dmrx2avqppp3fyi9jz3";
|
||||
sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1xycgzx706kyz37z3517p98129iy7py7zdizz34k38fvfpila5q5";
|
||||
vendorSha256 = "sha256-TncVMDeZ8+Wuv1o0Cjks3Ve1OsO+WXH9mClC6GNaSas=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver";
|
||||
version = "21.3.1"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.3.2"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "ePy3uS+LpyDzweLocSk3O/G2zFPISKbMbci9fdELrpE=";
|
||||
sha256 = "SifnnzuETFKtnEwLjJtB7CV2QZaToex3MjKGuiShlwo=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
dontFixup = true;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210=";
|
||||
outputHash = "grSFtkohTlLtK8qE4A4wVppC6UHcyaXRQlGnrOmQDC4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2,
|
||||
pango, gobject-introspection, wrapGAppsHook, gettext,
|
||||
# Optional packages:
|
||||
enableOSM ? true, osm-gps-map,
|
||||
enableOSM ? true, osm-gps-map, glib-networking,
|
||||
enableGraphviz ? true, graphviz,
|
||||
enableGhostscript ? true, ghostscript
|
||||
}:
|
||||
@ -15,7 +15,7 @@ in buildPythonApplication rec {
|
||||
nativeBuildInputs = [ wrapGAppsHook intltool gettext ];
|
||||
buildInputs = [ gtk3 gobject-introspection pango gexiv2 ]
|
||||
# Map support
|
||||
++ lib.optional enableOSM osm-gps-map
|
||||
++ lib.optionals enableOSM [ osm-gps-map glib-networking ]
|
||||
# Graphviz support
|
||||
++ lib.optional enableGraphviz graphviz
|
||||
# Ghostscript support
|
||||
|
||||
39
pkgs/applications/misc/inherd-quake/default.nix
Normal file
39
pkgs/applications/misc/inherd-quake/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, CoreServices
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "quake";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phodal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1f7k68g18g3dpnrsmhgmz753bly1i3f4lmsljiyp9ap0c6w8ahgg";
|
||||
};
|
||||
|
||||
cargoSha256 = "1yqj9rq770j116138bqn4ycggy13vvym1cz50myfddb9rjjzafrl";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
Security
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A knowledge management meta-framework for geeks";
|
||||
homepage = "https://github.com/phodal/quake";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.elliot ];
|
||||
};
|
||||
}
|
||||
25
pkgs/applications/misc/neo/default.nix
Normal file
25
pkgs/applications/misc/neo/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, stdenv, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neo";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/st3w/neo/releases/download/v${version}/neo-${version}.tar.gz";
|
||||
sha256 = "sha256-skXLT1td4dGdsu+wbX44Z2u5sDEOKXYVVys4Q6RayIk=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''Simulates the digital rain from "The Matrix"'';
|
||||
license = licenses.gpl3Plus;
|
||||
longDescription = ''
|
||||
neo recreates the digital rain effect from "The Matrix". Streams of random
|
||||
characters will endlessly scroll down your terminal screen.
|
||||
'';
|
||||
homepage = "https://github.com/st3w/neo";
|
||||
platforms = ncurses.meta.platforms;
|
||||
maintainers = [ maintainers.abbe ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "timew-sync-server";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timewarrior-synchronize";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "041j618c2bcryhgi2j2w5zlfcxcklgbir2xj3px4w7jxbbg6p68n";
|
||||
sha256 = "GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0wbd4cpswgbr839sk8qwly8gjq4lqmq448m624akll192mzm9wj7";
|
||||
vendorSha256 = "iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/timewarrior-synchronize/timew-sync-server";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.25.12";
|
||||
version = "0.25.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S+roKkAtiGJmp/MHFeB+8mLQDL9okzLuJW6DMz3dQDk=";
|
||||
sha256 = "sha256-iUhMPtFX7qFULegiyhlT4aG9q3deZ8aRqyEcbZ9jY/s=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
33
pkgs/applications/networking/cluster/kubergrunt/default.nix
Normal file
33
pkgs/applications/networking/cluster/kubergrunt/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ buildGoModule, lib, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.7.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1224ssqdz9ak0vylyfbr9c2w0yfdp4hw9jh99qmfi2j5nhw9kzcc";
|
||||
};
|
||||
|
||||
vendorSha256 = "1hbb3hn8mzz9h9p1rl35izz3l6c2rqsg8aq6dgpbpsf5krp3zs3v";
|
||||
|
||||
# Disable tests since it requires network access and relies on the
|
||||
# presence of certain AWS infrastructure
|
||||
doCheck = false;
|
||||
|
||||
runVend = true;
|
||||
|
||||
postInstall = ''
|
||||
# The binary is named kubergrunt
|
||||
mv $out/bin/cmd $out/bin/kubergrunt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of commands to fill in the gaps between Terraform, Helm, and Kubectl";
|
||||
homepage = "https://github.com/gruntwork-io/kubergrunt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ psibi ];
|
||||
};
|
||||
}
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "newsboat";
|
||||
version = "2.25";
|
||||
version = "2.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newsboat";
|
||||
repo = "newsboat";
|
||||
rev = "r${version}";
|
||||
sha256 = "sha256-TAnGDxTKYl4niouS6nYdJDaIngAPsPHr9Bw9L3cR2Xk=";
|
||||
hash = "sha256-VFeKj8X7gEyxsdsOK6UYJ6xB24gsuzb1Wm4GK5AJCHc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-MxoyYBLbrCuLVa0p8JrYKSKu2oFPnXMwab42lhhAu48=";
|
||||
cargoHash = "sha256-pr/Vzm321/uX4fIGt3kuWrtcgsnDRbeK3AvNO19NDwQ=";
|
||||
|
||||
# TODO: Check if that's still needed
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
@ -34,9 +34,6 @@ rustPlatform.buildRustPackage rec {
|
||||
make prefix="$out"
|
||||
'';
|
||||
|
||||
# TODO: Check if that's still needed
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set
|
||||
# these for all platforms, since upstream's gettext crate behavior might
|
||||
# change in the future.
|
||||
|
||||
@ -4,11 +4,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
|
||||
sha256 = "1l4g0y7kb569w1i3c1bq6m0p9wykrf7k6a59j5cvnkl1b9h8mj4p";
|
||||
sha256 = "sha256-sSSi8L5WXFAc9yRDZ2usWmh6F06/1RMbJInQ4/OORnI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "13.8.0";
|
||||
@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper zip ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,lib}
|
||||
|
||||
# log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html
|
||||
zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
|
||||
|
||||
install -m644 MediathekView.jar $out/lib
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/mediathek \
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sawfish";
|
||||
version = "1.12.90";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz";
|
||||
sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31";
|
||||
sha256 = "sha256-gWs8W/pMtQjbH8FEifzNAj3siZzxPd6xm8PmXXhyr10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
, graalvmXmx ? "-J-Xmx6g"
|
||||
# The GraalVM to use
|
||||
, graalvm ? graalvmCEPackages.graalvm11-ce
|
||||
, meta ? { }
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
@ -47,6 +48,10 @@ stdenv.mkDerivation (args // {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta.platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args;
|
||||
meta.mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args;
|
||||
meta = {
|
||||
# default to graalvm's platforms
|
||||
platforms = graalvm.meta.platforms;
|
||||
# default to executable name
|
||||
mainProgram = executable;
|
||||
} // meta;
|
||||
})
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "matcha-gtk-theme";
|
||||
version = "2021-11-29";
|
||||
version = "2021-12-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "10fgz09h25cmnvz0bzx5qadv7cqnl1bdd6hj7w0rcbsws4c2j17q";
|
||||
sha256 = "1wgq1aypm4cjv7yavlfmqcwahlddvh2gbg2f5ca0djgnpy9vha1g";
|
||||
};
|
||||
|
||||
buildInputs = [ gdk-pixbuf librsvg ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "theme-obsidian2";
|
||||
version = "2.19";
|
||||
version = "2.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
|
||||
sha256 = "sha256-GGnrix8utJ34pszuoxcMY5Yr0stwL17Y812FIiRZOUk=";
|
||||
sha256 = "0bbw8far4fjz7fiy205wnzp9ibnvqspfcjkinhjj8l0s272h7wjp";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qogir-theme";
|
||||
version = "2021-11-17";
|
||||
version = "2021-12-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ri2dh34vw2pfv0lxzk9f4755v0d4ilnr6fzj3raw9b5fp5zzi91";
|
||||
sha256 = "1h10yqz3i59bxhkk2r2p8as8g9ibx38bbpdxi7jgg2pxr581mn4f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whitesur-gtk-theme";
|
||||
version = "2021-12-04";
|
||||
version = "2021-12-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0fpq6xw2xq0fkmpg1la9q26nfbqhf0212s95v25256miz55p67ha";
|
||||
sha256 = "0i81aickccfp8fffilhi335hj5ijz2n38yj3zw2fnbwgm667i0fc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, fetchFromGitHub, crystal, openssl }:
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
version = "0.14.0";
|
||||
version = "0.15.1";
|
||||
pname = "mint";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mint-lang";
|
||||
repo = "mint";
|
||||
rev = version;
|
||||
sha256 = "1mf9d0jpdb21hkzaqvwyx2171dv3hr50zhl07p85wpf0d3n5wml8";
|
||||
sha256 = "sha256-naiZ51B5TBc88wH4Y7WcrkdFnZosEVCS5MlLAGVe8/E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -174,7 +174,7 @@ with python.pkgs; buildPythonApplication rec {
|
||||
--subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}'
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace "zeroconf==0.28.*" "zeroconf"
|
||||
--replace "zeroconf==0.37.*" "zeroconf"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gmp, mpfr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.14.2";
|
||||
@ -11,6 +11,28 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1p1xyws2s9h2c8hlkz1af4ix48qma160av24by6lcm8al1g44pca";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
# Pull upstream fix for c++17 (gcc-12):
|
||||
# https://github.com/CGAL/cgal/pull/6109
|
||||
(fetchpatch {
|
||||
name = "gcc-12-prereq.patch";
|
||||
url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch";
|
||||
sha256 = "1gzrvbrwxylv80v0m3j2s1znlysmr69lp3ggagnh38lp6423i6pq";
|
||||
# Upstream slightly reordered directory structure since.
|
||||
stripLen = 1;
|
||||
# Fill patch does not apply: touches too many parts of the source.
|
||||
includes = [ "include/CGAL/CORE/BigFloatRep.h" ];
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "gcc-12.patch";
|
||||
url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch";
|
||||
sha256 = "1c0h1lh8zng60yx78qc8wx714b517mil8mac87v6xr21q0b11wk7";
|
||||
# Upstream slightly reordered directory structure since.
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
# note: optional component libCGAL_ImageIO would need zlib and opengl;
|
||||
# there are also libCGAL_Qt{3,4} omitted ATM
|
||||
buildInputs = [ boost gmp mpfr ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgit2-glib";
|
||||
version = "0.99.0.1";
|
||||
version = "1.0.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0";
|
||||
sha256 = "RgpdaTaVDKCNLYUYv8kMErsYfPbmdN5xX3BV/FgQK1c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lyra";
|
||||
version = "1.5.1";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bfgroup";
|
||||
repo = "lyra";
|
||||
rev = version;
|
||||
sha256 = "0xil6b055csnrvxxmby5x9njf166bri472jxwzshc49cz7svhhpk";
|
||||
sha256 = "sha256-5k4b1JVrGDmT65tSWo6AkqvNpN+6n8wZgqEuXLL7stI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz
|
||||
, glib, dbus, gst_all_1, alsa-lib, ffmpeg_4, libjack2, udev, libva, xorg
|
||||
, sbc, SDL2, makeFontsConf
|
||||
}:
|
||||
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "lib" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config doxygen graphviz valgrind
|
||||
meson ninja pkg-config doxygen graphviz
|
||||
];
|
||||
buildInputs = [
|
||||
glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tdlib";
|
||||
version = "1.7.10";
|
||||
version = "1.7.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
repo = "td";
|
||||
# https://github.com/tdlib/td/issues/1790
|
||||
rev = "a53cb30e99f937cfd64e0266fa558785a184a553";
|
||||
sha256 = "FX+66JRsigauLq2JLx0InWiedGeQJ9+ox+D/Bqik9ik=";
|
||||
rev = "a69030239c53951db8a1b0af6408f24d63f5dcb7";
|
||||
sha256 = "tqytmjij79YzvBP1abbA/Oavx28mvEGESn39b3HYAMg=";
|
||||
};
|
||||
|
||||
buildInputs = [ gperf openssl readline zlib ];
|
||||
|
||||
@ -572,7 +572,7 @@ buildLuarocksPackage {
|
||||
propagatedBuildInputs = [ penlight markdown ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://stevedonovan.github.com/ldoc";
|
||||
homepage = "https://github.com/lunarmodules/LDoc";
|
||||
description = "A Lua Documentation Tool";
|
||||
license.fullName = "MIT/X11";
|
||||
};
|
||||
|
||||
@ -1,18 +1,44 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, nose, docutils, blockdiag, reportlab }:
|
||||
{ lib
|
||||
, blockdiag
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "actdiag";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0g51v9dmdq18z33v332f1f0cmb3hqgaga5minj0mc2sglark1s7h";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blockdiag";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pTWunoc6T1m+4SOe0ob0ac4ZwwXsYNZwkdwVtlMZrIo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ blockdiag docutils ];
|
||||
propagatedBuildInputs = [
|
||||
blockdiag
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [ nose reportlab ];
|
||||
checkInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"src/actdiag/tests/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"actdiag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
|
||||
|
||||
@ -1,43 +1,47 @@
|
||||
{ lib
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pytest
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, siosocks
|
||||
, trustme
|
||||
, async-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioftp";
|
||||
version = "0.19.0";
|
||||
disabled = isPy27;
|
||||
version = "0.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d1c2571764c48e6de1b02952022c3c3b3da1f10806cb342ec7b1fa9b109e9902";
|
||||
sha256 = "sha256-N8qiKsWPaFT/t5p1eSHS0BydoXv4AL6y8gP4z4P9fsE=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
trustme
|
||||
async-timeout
|
||||
propagatedBuildInputs = [
|
||||
siosocks
|
||||
];
|
||||
|
||||
doCheck = false; # requires siosocks, not packaged yet
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
checkInputs = [
|
||||
async-timeout
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
trustme
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioftp" ];
|
||||
pythonImportsCheck = [
|
||||
"aioftp"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ftp client/server for asyncio";
|
||||
description = "Python FTP client/server for asyncio";
|
||||
homepage = "https://github.com/aio-libs/aioftp";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, py
|
||||
, mock
|
||||
, glibcLocales
|
||||
, fetchpatch
|
||||
, iocapture
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -17,18 +16,27 @@ buildPythonPackage rec {
|
||||
sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest py mock glibcLocales iocapture ];
|
||||
patches = [
|
||||
# https://github.com/neithere/argh/issues/148
|
||||
(fetchpatch {
|
||||
name = "argh-0.26.2-fix-py3.9-msgs.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch?id=6f194f12a2e30aad7da347848f7b0187e188f983";
|
||||
sha256 = "nBmhF2PXVeS7cBNujzip6Bb601LRHrjmhlGKFr/++Oo=";
|
||||
})
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
export LANG="en_US.UTF-8"
|
||||
py.test
|
||||
'';
|
||||
checkInputs = [
|
||||
iocapture
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "argh" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/neithere/argh/";
|
||||
homepage = "https://github.com/neithere/argh";
|
||||
description = "An unobtrusive argparse wrapper with natural syntax";
|
||||
license = licenses.lgpl2;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -16,12 +16,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "b2sdk";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Q9B85c+WhazDeXsMR2S0aId32xLY8BAuYRj4QD21x1k=";
|
||||
sha256 = "900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,22 +1,60 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, setuptools, funcparserlib, pillow, webcolors, reportlab, docutils
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
, funcparserlib
|
||||
, nose
|
||||
, pillow
|
||||
, ephem
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, reportlab
|
||||
, setuptools
|
||||
, webcolors
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blockdiag";
|
||||
version = "2.0.1";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blockdiag";
|
||||
repo = "blockdiag";
|
||||
rev = version;
|
||||
sha256 = "1cvcl66kf4wdh2n4fdk37zk59lp58wd2fhf84n7pbn0lilyksk5x";
|
||||
sha256 = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools funcparserlib pillow webcolors reportlab docutils ];
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
funcparserlib
|
||||
pillow
|
||||
webcolors
|
||||
reportlab
|
||||
docutils
|
||||
];
|
||||
|
||||
# require network and fail
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
ephem
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"src/blockdiag/tests/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test require network access
|
||||
"test_app_cleans_up_images"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"blockdiag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate block-diagram image from spec-text file (similar to Graphviz)";
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fe25519";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-947DIkmg56mAegEgLKq8iqETWf2SCvtmeDZi5cxVSJA=";
|
||||
sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -29,12 +29,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "bitlist~=0.5.1" "bitlist>=0.5.1" \
|
||||
--replace "parts~=1.1.2" "parts>=1.1.2"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fe25519"
|
||||
];
|
||||
|
||||
@ -6,26 +6,24 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fountains";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fbf4e2cb11d60d3bafca5bb7c01c254d08a5541ed7ddfe00ef975eb173fb75a4";
|
||||
sha256 = "sha256-bea8EXw3b0CibhEREdY4FZouiiXP4y+UbbDXed7Ltwo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bitlist
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "bitlist~=0.5.1" "bitlist>=0.5.1"
|
||||
'';
|
||||
|
||||
# Project has no test
|
||||
# Module has no test
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "fountains" ];
|
||||
pythonImportsCheck = [
|
||||
"fountains"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for generating and embedding data for unit testing";
|
||||
|
||||
@ -1,25 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, python
|
||||
, isPy3k
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "funcparserlib";
|
||||
version = "0.3.6";
|
||||
version = "1.0.0a0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlasovskikh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-YfcboKjyc5ASzrp0duu2R6psf51MGZIeZ0owo5QNSnU=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
# Tests are Python 2.x only judging from SyntaxError
|
||||
doCheck = !(isPy3k);
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Support for poetry-core, https://github.com/vlasovskikh/funcparserlib/pull/73
|
||||
(fetchpatch {
|
||||
name = "support-poetry-core.patch";
|
||||
url = "https://github.com/vlasovskikh/funcparserlib/commit/61ed558fc146b7a30879919325dfa8aae77be556.patch";
|
||||
sha256 = "sha256-tqdR3r4/t7RWBYZeAabaN7oYf6VxkVVz006XICX9rYI=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"funcparserlib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Recursive descent parsing library based on functional combinators";
|
||||
@ -27,5 +49,4 @@ buildPythonPackage rec {
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ge25519";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-f7xvZ92zRO3GLSdfgEyhkWVwAFT2TvKHy6+iF+k43bI=";
|
||||
sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -31,12 +31,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "bitlist~=0.5.1" "bitlist>=0.5.1" \
|
||||
--replace "parts~=1.1.2" "parts>=1.1.2"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ge25519"
|
||||
];
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.0.17";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XUlg3zuLJwWJCi2qx1f8eBK3Li94QxXz82G0zEgUztc=";
|
||||
sha256 = "sha256-s3XdbkngdHApV4uE/Qudrr9TFf6gUvNHJKM3RA4UeN0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
voluptuous
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
@ -9,18 +9,33 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.12.0";
|
||||
version = "3.13.1";
|
||||
pname = "humanize";
|
||||
disabled = isPy27; # setup.py no longer compatible
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5ec1a66e230a3e31fb3f184aab9436ea13d4e37c168e0ffc345ae5bb57e58be6";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmoiron";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lgGBvYb3ciqETBOR31gxQVD7YyopTtmr++nCwvm63Zs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
checkInputs = [ pytestCheckHook freezegun ];
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python humanize utilities";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0J3P3RawafVAfOUhK9qSz5K8y0goMqTjMh5PL60sqME=";
|
||||
sha256 = "sha256-+kfIpmJ6Gnb33MZ7NZrE8oVSBbZLuRfIvfCbstxJFX0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, pytest
|
||||
, pytest-cov
|
||||
, nbval
|
||||
, jupyter-packaging
|
||||
, ipywidgets
|
||||
, numpy
|
||||
, six
|
||||
@ -22,6 +23,12 @@ buildPythonPackage rec {
|
||||
sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jupyter-packaging
|
||||
];
|
||||
|
||||
setupPyBuildFlags = [ "--skip-npm" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipywidgets
|
||||
numpy
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pytest
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, bokeh
|
||||
, ipython
|
||||
, matplotlib
|
||||
@ -13,23 +13,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "livelossplot";
|
||||
version = "0.5.0";
|
||||
version = "0.5.4";
|
||||
|
||||
disabled = isPy27;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# version number in source is wrong in this release
|
||||
postPatch = ''substituteInPlace ${pname}/version.py --replace "0.5.3" "0.5.4"'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stared";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "164v65qglgyg38q9ajnas99rp14mvrk5hn8x76b8iy81vszmx1c0";
|
||||
sha256 = "IV6YAidoqVoKvpy+LNNHTPpobiDoGX59bHqJcBtaydk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ bokeh ipython matplotlib numpy ];
|
||||
|
||||
checkInputs = [ pytest nbconvert nbformat ];
|
||||
checkPhase = ''
|
||||
pytest tests tests/external_test_examples.py
|
||||
'';
|
||||
checkInputs = [ nbconvert nbformat pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Live training loss plot in Jupyter for Keras, PyTorch, and others";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, dnspython
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -13,16 +14,22 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcstatus";
|
||||
version = "6.5.0";
|
||||
version = "7.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dinnerbone";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "00xi3452lap4zx38msx89vvhrzkzb2dvwis1fcmx24qngj9g3yfr";
|
||||
sha256 = "sha256-/EoVM3wEiA2suJHxMu2zZktQhO6T9grWcvWuzmUe6V0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asyncio-dgram
|
||||
click
|
||||
@ -36,7 +43,16 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mcstatus" ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'asyncio-dgram = "1.2.0"' 'asyncio-dgram = ">=1.2.0"' \
|
||||
--replace 'six = "1.14.0"' 'six = ">=1.14.0"' \
|
||||
--replace 'click = "7.1.2"' 'click = ">=7.1.2"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mcstatus"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for checking the status of Minecraft servers";
|
||||
|
||||
@ -1,22 +1,49 @@
|
||||
{ lib, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
|
||||
, blockdiag, setuptools
|
||||
{ lib
|
||||
, blockdiag
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nwdiag";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz";
|
||||
sha256 = "1qkl1lq7cblr6fra2rjw3zlcccragp8384hpm4n7dkc5c3yzmmsw";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blockdiag";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PWLFJhXQeuUQQpGkXN2pEJs/1WECpJpUqWbGH3150TI=";
|
||||
};
|
||||
|
||||
buildInputs = [ pep8 nose unittest2 docutils ];
|
||||
propagatedBuildInputs = [
|
||||
blockdiag
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ blockdiag setuptools ];
|
||||
checkInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# tests fail
|
||||
doCheck = false;
|
||||
pytestFlagsArray = [
|
||||
"src/nwdiag/tests/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# UnicodeEncodeError: 'latin-1' codec can't encode...
|
||||
"test_setup_inline_svg_is_true_with_multibytes"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nwdiag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
|
||||
|
||||
@ -19,7 +19,6 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "filcole";
|
||||
repo = pname;
|
||||
# release not tagged: https://github.com/filcole/pycarwings2/issues/33
|
||||
rev = "v${version}";
|
||||
sha256 = "04k1la7wix6sp668nqpwdhd3057b2bzcz7h2b9a57cxlifl8pjxf";
|
||||
};
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
let
|
||||
pname = "pydicom";
|
||||
version = "2.1.2";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "${pname}";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iExy+mUs1uqs/u9N6btlqyP6/TvoPVsuOuzs56zZAS8=";
|
||||
sha256 = "sha256-p5hJAUsactv6UEvbVaF+zk4iapx98eYkC9Zo+lzFATA=";
|
||||
};
|
||||
|
||||
# Pydicom needs pydicom-data to run some tests. If these files aren't downloaded
|
||||
@ -34,9 +34,15 @@ buildPythonPackage {
|
||||
inherit pname version src;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
propagatedBuildInputs = [ numpy pillow setuptools ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pillow
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Setting $HOME to prevent pytest to try to create a folder inside
|
||||
# /homeless-shelter which is read-only.
|
||||
@ -58,9 +64,13 @@ buildPythonPackage {
|
||||
"test_time_check"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pydicom"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package for working with DICOM files";
|
||||
homepage = "https://pydicom.github.io";
|
||||
description = "Pure-Python package for working with DICOM files";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
|
||||
@ -6,17 +6,21 @@
|
||||
, pyfakefs
|
||||
, pytestCheckHook
|
||||
, sqlalchemy
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetdicom";
|
||||
version = "1.5.7";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydicom";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wr6nh0xrhzwf05gnf3dwg5r3lhn9nfwch3l16zkbj6fli871brc";
|
||||
sha256 = "sha256-Kfcfk76au2ymbX+nl0PhuuCd+t6dYRbTurGlW6msv3Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -33,6 +37,7 @@ buildPythonPackage rec {
|
||||
# Some tests needs network capabilities
|
||||
"test_str_types_empty"
|
||||
"test_associate_reject"
|
||||
"TestAEGoodAssociation"
|
||||
"TestEchoSCP"
|
||||
"TestEchoSCPCLI"
|
||||
"TestFindSCP"
|
||||
@ -50,7 +55,9 @@ buildPythonPackage rec {
|
||||
"TestState"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pynetdicom" ];
|
||||
pythonImportsCheck = [
|
||||
"pynetdicom"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of the DICOM networking protocol";
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-doctestplus";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b7a0aeb79b85ee81a3c72c49019b4bfeb57fa920abaa6c17ba8be3be9c5290f1";
|
||||
sha256 = "f393adf659709a5f111d6ca190871c61808a6f3611bd0a132e27e93b24dd3448";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.21.0";
|
||||
version = "0.21.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = version;
|
||||
sha256 = "sha256-lUe79VHlK/2/1SZfC+Ha+27NUoIKoTlqn75XA/mPCNU=";
|
||||
hash = "sha256-zgiUXGso3bQ3pCD7r+VYHGBIihPwSfHibS2OZvPUb3Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytube";
|
||||
version = "11.0.1";
|
||||
version = "11.0.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "pytube";
|
||||
repo = "pytube";
|
||||
rev = "v${version}";
|
||||
sha256 = "04s4hganb6x0dlfyyg9gjah5z0vxd7bxzqwgvd28hqnf0iwc2byb";
|
||||
hash = "sha256-3HrkhlwV8OLqbzC6QgddLB1fQxWbwCQ6STCgUXlr5So=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "roombapy";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pschmitt";
|
||||
repo = "roombapy";
|
||||
rev = version;
|
||||
sha256 = "sha256-EN+em+lULAUplXlhcU409ZVPk9BfMmD2oNwO0ETuqoA=";
|
||||
sha256 = "sha256-Xjeh29U+FCzI5n/i5s6wC0B88Ktmb8pnNDdOzCiKWi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,25 +1,49 @@
|
||||
{ lib, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils
|
||||
{ lib
|
||||
, blockdiag
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "seqdiag";
|
||||
version = "2.0.0";
|
||||
disabled = isPy27;
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";
|
||||
sha256 = "0k7j4f9j3d0325piwvbv90nfh0wzfk2n6s73s6h6nsxmqshcgswk";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blockdiag";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Dh9JMx50Nexi0q39rYr9MpkKmQRAfT7lzsNOXoTuphg=";
|
||||
};
|
||||
|
||||
buildInputs = [ pep8 nose unittest2 docutils ];
|
||||
propagatedBuildInputs = [
|
||||
blockdiag
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ blockdiag ];
|
||||
checkInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests fail:
|
||||
# ...
|
||||
# ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/')
|
||||
doCheck = false;
|
||||
pytestFlagsArray = [
|
||||
"src/seqdiag/tests/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# UnicodeEncodeError: 'latin-1' codec can't encode...
|
||||
"test_setup_inline_svg_is_true_with_multibytes"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"seqdiag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";
|
||||
|
||||
43
pkgs/development/python-modules/siosocks/default.nix
Normal file
43
pkgs/development/python-modules/siosocks/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest-asyncio
|
||||
, pytest-trio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, trio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "siosocks";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-k2+qTtxkF0rT5LLPW8icePbf9jNopdo9uDp3NPA9SRo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
trio
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
pytest-trio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"siosocks"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python socks 4/5 client/server library/framework";
|
||||
homepage = "https://github.com/pohmelie/siosocks";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -4,25 +4,35 @@
|
||||
, sphinx
|
||||
, actdiag
|
||||
, blockdiag
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-actdiag";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PFXUVP/Due/nwg8q2vAiGZuCVhLTLyAL6KSXqofg+B8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx actdiag blockdiag ];
|
||||
propagatedBuildInputs = [
|
||||
actdiag
|
||||
blockdiag
|
||||
sphinx
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sphinxcontrib.actdiag" ];
|
||||
pythonImportsCheck = [
|
||||
"sphinxcontrib.actdiag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sphinx actdiag extension";
|
||||
homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag";
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,28 +1,38 @@
|
||||
{ lib
|
||||
, blockdiag
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, sphinx
|
||||
, blockdiag
|
||||
, nwdiag
|
||||
, pythonOlder
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-nwdiag";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bula1DutRv6NwfZRhciZfLHRZmXu42p+qvbeExN/+Fk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx blockdiag nwdiag ];
|
||||
propagatedBuildInputs = [
|
||||
blockdiag
|
||||
nwdiag
|
||||
sphinx
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sphinxcontrib.nwdiag" ];
|
||||
pythonImportsCheck = [
|
||||
"sphinxcontrib.nwdiag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sphinx nwdiag extension";
|
||||
homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag";
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,28 +1,38 @@
|
||||
{ lib
|
||||
, blockdiag
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, sphinx
|
||||
, blockdiag
|
||||
, pythonOlder
|
||||
, seqdiag
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-seqdiag";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QH5IeXZz9x2Ujp/6BHFsrB2ZqeyPYW3jdk1C0DNBZXQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx blockdiag seqdiag ];
|
||||
propagatedBuildInputs = [
|
||||
blockdiag
|
||||
seqdiag
|
||||
sphinx
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sphinxcontrib.seqdiag" ];
|
||||
pythonImportsCheck = [
|
||||
"sphinxcontrib.seqdiag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sphinx seqdiag extension";
|
||||
homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag";
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "splinter";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cobrateam";
|
||||
repo = "splinter";
|
||||
rev = version;
|
||||
sha256 = "sha256-b6zncEAPtKgBPLFRsCSGeBqiD4A/mHEhjQaEIsefc28=";
|
||||
hash = "sha256-7QhFz/qBh2ECyeyvjCyqOYy/YrUK7KVX13VC/gem5BQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1hnlymdi27rjxaivn5csqrj9ahk86cwvbpvdl29v7qal0y2bc433";
|
||||
sha256 = "sha256-oablQoumBiqDk7bz1BUpUWddxExoqOofrZzX7y618Hw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "total-connect-client";
|
||||
version = "2021.11.5";
|
||||
version = "2021.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "craigjmidwinter";
|
||||
repo = "total-connect-client";
|
||||
rev = version;
|
||||
sha256 = "sha256-6hyeU0jigQZsZtdb4E8/iD8YfQeNOKm6IK1CHBizZQs=";
|
||||
hash = "sha256-cgs6wIMSO8t8CPn6aR35sNcgfDaXDyFBldNEBOr850s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "youless-api";
|
||||
version = "0.15";
|
||||
version = "0.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "jongsoftdev";
|
||||
repo = "youless-python-bridge";
|
||||
rev = version;
|
||||
sha256 = "sha256-77uQUAPDCFQiCpNAI0feOtHq82sE0n70IV1Njn/W29M=";
|
||||
sha256 = "sha256-8pJeb3eWchMRrk8KLSI/EbHs1wQDqBoqlAQXm9ulyqs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.37.0";
|
||||
version = "0.38.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = version;
|
||||
sha256 = "sha256-KdcRG1YKtvhcqq/FNiOVQeXlyYepvPjRL5EZJA8Axyk=";
|
||||
sha256 = "sha256-8bJEH+m+83rkKdN5GjD4THs1CUy/wstoBFiXR7kHKtw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -46,13 +46,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.692";
|
||||
version = "2.0.693";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mzqSnddcZAVwgm8SJSkgcU8bYvEy2Rw+5vDl1uPTjbA=";
|
||||
sha256 = "sha256-xteBVQ+OXxLc2BOlhajGX+1wTc7BHGjPtpgU3IjA7g0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -1,23 +1,13 @@
|
||||
{ fetchFromGitHub, lib, python3Packages }:
|
||||
|
||||
let
|
||||
python3Packages2 = python3Packages.override {
|
||||
overrides = self: super: {
|
||||
arrow = self.callPackage ../../python-modules/arrow/2.nix { };
|
||||
};
|
||||
};
|
||||
in
|
||||
let
|
||||
python3Packages = python3Packages2; # two separate let … in to avoid infinite recursion
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "backblaze-b2";
|
||||
version = "3.0.3";
|
||||
version = "3.2.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "b2";
|
||||
sha256 = "sha256-asrhinANGlTsSBbtGToOxTRGGSCf+1c4VWnoE3ezoIA=";
|
||||
sha256 = "sha256-dE4eLTNU6O0DscwN8+m1UaG46dbI0DiWzeJK49GUvKA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-remote";
|
||||
version = "2.3.1";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aQsc2dBS1IWm1lpBPrrHx1CfrHXJYkDIObNHMqqVYn4=";
|
||||
sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mage";
|
||||
version = "1.11.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magefile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ghOk44VcQUAAYm9NCLsgYdky1KEpwOeChBNrgUKjnC8=";
|
||||
sha256 = "sha256-hfLclI9bzsvITwdo8LTqNcr25yZN82B0pqwlk559tRU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt";
|
||||
version = "1.5.8";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "sha256-WnT3UrfcIAs7HRxRUyfwHCH++DPpVzjeQsJC+3hA1Ik=";
|
||||
sha256 = "sha256-Y52xcPZRDQ+IX/QAVGRODshbuDb5oJA45r9OT2Jxusw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -18,7 +18,7 @@ buildGraalvmNativeImage rec {
|
||||
description = "A linter for Clojure code that sparks joy";
|
||||
homepage = "https://github.com/clj-kondo/clj-kondo";
|
||||
license = licenses.epl10;
|
||||
changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${versiont}/CHANGELOG.md";
|
||||
changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "0.14.62";
|
||||
version = "0.14.87";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = version;
|
||||
sha256 = "sha256-yNq3GRovFm0OlYNJJGjTe5AqKG9J4I+igJ/WVNLWdKI=";
|
||||
sha256 = "sha256-zoFWiqrKdTh6XDrKx2mQe3NqK03so6MqIX0sSQHQa5U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c=";
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "oq";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blacksmoke16";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oLy8Ts+wnI0LxtAH6vVqhS7nqNkaLs0/vK9GxfG4vU8=";
|
||||
sha256 = "sha256-La2oi+r9sCmnacgjQe+LcTQ7EXKorSoTTD4LhNtQsYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
# Poetry2nix version
|
||||
version = "1.23.0";
|
||||
version = "1.24.1";
|
||||
|
||||
inherit (poetryLib) isCompatible readTOML moduleName;
|
||||
|
||||
@ -261,6 +261,7 @@ lib.makeScope pkgs.newScope (self: {
|
||||
, python ? pkgs.python3
|
||||
, preferWheels ? false
|
||||
, editablePackageSources ? { }
|
||||
, extraPackages ? ps: [ ]
|
||||
}:
|
||||
let
|
||||
poetryPython = self.mkPoetryPackages {
|
||||
@ -270,7 +271,7 @@ lib.makeScope pkgs.newScope (self: {
|
||||
inherit (poetryPython) poetryPackages;
|
||||
|
||||
in
|
||||
poetryPython.python.withPackages (_: poetryPackages);
|
||||
poetryPython.python.withPackages (ps: poetryPackages ++ (extraPackages ps));
|
||||
|
||||
/* Creates a Python application from pyproject.toml and poetry.lock
|
||||
|
||||
|
||||
@ -202,14 +202,14 @@ self: super:
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
|
||||
CRYPTOGRAPHY_DONT_BUILD_RUST = "1";
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.5") rec {
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "35") rec {
|
||||
cargoDeps =
|
||||
let
|
||||
getCargoHash = version:
|
||||
if lib.versionOlder version "3.6.0" then "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI="
|
||||
else if lib.versionOlder version "3.6.1" then "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk="
|
||||
if lib.versionOlder version "36.0.0" then "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI="
|
||||
else if lib.versionOlder version "36.0.1" then "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk="
|
||||
# This hash could no longer be valid for cryptography versions
|
||||
# different from 3.6.1
|
||||
# different from 36.0.1
|
||||
else "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ=";
|
||||
in
|
||||
pkgs.rustPlatform.fetchCargoTarball {
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-msrv";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foresterre";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zc6jJqG7OGqfsPnb3VeKmEnz8AL2p1wHqgDvHQC5OX8=";
|
||||
sha256 = "sha256-zIUbPmSlobSC3iJ0ddto40Sa/1xzCYG6eaTjMuUnXNU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-SjgYkDDe11SVN6rRZTi/fYB8CgYhu2kfSXrIyimlhkk=";
|
||||
cargoSha256 = "sha256-GKU0ootG4fXUGErPplERMVjEBop/0+sfQCYpQwPPcXA=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
|
||||
@ -8,21 +8,23 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-spellcheck";
|
||||
version = "0.8.14";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drahnr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "11r4gzcsbqlflam2rdixc451qw69c46mkf7g0slq6f127is25fgz";
|
||||
sha256 = "0brrpcnsphvl1qn8myrzan0k87ph629gcj6zd54ym9f67qg2nri1";
|
||||
};
|
||||
|
||||
cargoSha256 = "1p4iirblk6idvfhn8954v8lbxlzj0gbd8fv4wq03hfrdqisjqcsn";
|
||||
cargoSha256 = "0d0adpgf0j8xvw0dm3gcd6lnksn6p5rz3limc038fg8k84zf7cdb";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
||||
preCheck = "HOME=$(mktemp -d)";
|
||||
|
||||
checkFlags = [
|
||||
"--skip checker::hunspell::tests::hunspell_binding_is_sane"
|
||||
];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
baseName = "scalafmt";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${baseName}-deps-${version}";
|
||||
buildCommand = ''
|
||||
@ -13,7 +13,7 @@ let
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "v1IODq88Wpjm7IxSKmD9Nub3r4XNP+jNT0A6ApX3Cas=";
|
||||
outputHash = "PlLQVNn2HomcR9grqGFgaXYWxg9EU7ihd28wXruZiBs=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddnet";
|
||||
version = "15.7";
|
||||
version = "15.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddnet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SrD2rwV/8RnE5HvYSN51fsjZ3lAJwmDiyr/ywDK1TT4=";
|
||||
sha256 = "sha256-segJVGH5ngSEhk0EpLHPORTNck4tIDCxJh9Ri6sa2dE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
|
||||
@ -22,7 +22,6 @@ let
|
||||
lsb-release
|
||||
# Errors in output without those
|
||||
pciutils
|
||||
python2
|
||||
# Games' dependencies
|
||||
xorg.xrandr
|
||||
which
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, kernel
|
||||
, date ? "2021-11-06"
|
||||
, commit ? "10669a2c540de3276c8d2fc0e43be62f2886f377"
|
||||
, diffHash ? "1rn72wd8jg919j74x8banl70b2bdd6r9fgvnw693j20dq96j5cnw"
|
||||
, date ? "2021-12-26"
|
||||
, commit ? "b034dfb24fece43a7677b9a29781495aeb62767f"
|
||||
, diffHash ? "0m7qrnfrcx3dki9lmsq3jk3mcrfm99djh83gwwjh401ql0cycx5p"
|
||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
@ -13,6 +13,7 @@
|
||||
(kernel.override ( args // {
|
||||
argsOverride = {
|
||||
version = "${kernel.version}-bcachefs-unstable-${date}";
|
||||
|
||||
extraMeta = {
|
||||
branch = "master";
|
||||
maintainers = with lib.maintainers; [ davidak chiiruno ];
|
||||
@ -21,12 +22,13 @@
|
||||
|
||||
kernelPatches = [ {
|
||||
name = "bcachefs-${commit}";
|
||||
|
||||
patch = fetchpatch {
|
||||
name = "bcachefs-${commit}.diff";
|
||||
url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}";
|
||||
sha256 = diffHash;
|
||||
};
|
||||
|
||||
extraConfig = "BCACHEFS_FS m";
|
||||
} ] ++ kernelPatches;
|
||||
|
||||
}))
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.12.5";
|
||||
version = "2021.12.6";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
||||
@ -265,7 +265,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.12.5";
|
||||
hassVersion = "2021.12.6";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -282,7 +282,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256:116qklmzvqh3hn3i6i7lvsnqydd2qclk612rwlxs3v56kzpks62n";
|
||||
hash = "sha256:0n01cjbbyb1i63z8zxkjlwssqpv6y41jzs7b7jk78w3qnbg15bk3";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
@ -320,6 +320,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
ciso8601
|
||||
cryptography
|
||||
httpx
|
||||
ifaddr
|
||||
jinja2
|
||||
pip
|
||||
pyjwt
|
||||
|
||||
@ -4,11 +4,11 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20211220.0";
|
||||
version = "20211227.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qhuTvHN0kjdPIIyfrtj+col1Ba3WSnypqVxGfia4dW4=";
|
||||
sha256 = "sha256-HdjkquxQM3Vxl+avM0fGanUkCMoTlBHodXIfNhW2lC4=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@ -15,16 +15,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2021-11-24T23-19-33Z";
|
||||
version = "2021-12-10T23-03-39Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-cYoeCjkCLnlp5BVp3BOj7okA1yX+rDp0Rbwcn+ji+Ak=";
|
||||
sha256 = "sha256-vu3p6LnmC2o7pX7T/x8SJ+Nr0G2GPIZqqOdPZ836puc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DdsLQ87tvh8gbiLh6uLCXiGmnkcE+LcLwvdgDJxXbc8=";
|
||||
vendorSha256 = "sha256-QxQPjjfCx0SVYquYVX5DOe8uzM16I2AYve0O2bj4y1k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, lib
|
||||
, go
|
||||
, pkgs
|
||||
, nodejs
|
||||
, nodejs-14_x
|
||||
, nodePackages
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
@ -24,11 +24,13 @@ let
|
||||
goPackagePath = "github.com/prometheus/prometheus";
|
||||
|
||||
codemirrorNode = import ./webui/codemirror-promql {
|
||||
inherit pkgs nodejs;
|
||||
inherit pkgs;
|
||||
nodejs = nodejs-14_x;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
};
|
||||
webuiNode = import ./webui/webui {
|
||||
inherit pkgs nodejs;
|
||||
inherit pkgs;
|
||||
nodejs = nodejs-14_x;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
};
|
||||
|
||||
@ -36,7 +38,7 @@ let
|
||||
name = "prometheus-webui-codemirror-promql";
|
||||
src = "${src}/web/ui/module/codemirror-promql";
|
||||
|
||||
buildInputs = [ nodejs nodePackages.typescript codemirrorNode.nodeDependencies ];
|
||||
buildInputs = [ nodejs-14_x nodePackages.typescript codemirrorNode.nodeDependencies ];
|
||||
|
||||
configurePhase = ''
|
||||
ln -s ${codemirrorNode.nodeDependencies}/lib/node_modules node_modules
|
||||
@ -56,7 +58,7 @@ let
|
||||
name = "prometheus-webui";
|
||||
src = "${src}/web/ui/react-app";
|
||||
|
||||
buildInputs = [ nodejs webuiNode.nodeDependencies ];
|
||||
buildInputs = [ nodejs-14_x webuiNode.nodeDependencies ];
|
||||
|
||||
# create `node_modules/.cache` dir (we need writeable .cache)
|
||||
# and then copy the rest over.
|
||||
@ -77,7 +79,7 @@ buildGoModule rec {
|
||||
|
||||
excludedPackages = [ "documentation/prometheus-mixin" ];
|
||||
|
||||
nativeBuildInputs = [ nodejs ];
|
||||
nativeBuildInputs = [ nodejs-14_x ];
|
||||
|
||||
postPatch = ''
|
||||
# we don't want this anyways, as we
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "redis_exporter";
|
||||
version = "1.32.0";
|
||||
version = "1.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oliver006";
|
||||
repo = "redis_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/WrkWhtLNqoLJP0FwPlWr4WmEYweEkyBZlv9NVmaozc=";
|
||||
sha256 = "sha256-3b0hlRjPXrMjFhXi8j4VvKJyRGicIk9FZUBRsBUp+Xo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MVDb4JN2QqZNxANDLUZywgoBc2NpcaPB8TkR1xrq+Yk=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oauth2-proxy";
|
||||
version = "7.2.0";
|
||||
version = "7.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "oauth2-proxy";
|
||||
sha256 = "1awqada8vwyz3aj1ip9jgmf84hb60jai16in6yhn4b42x9qj8m08";
|
||||
sha256 = "sha256-8hYsyHq0iyWzY/HHE4JWBtlaRcSTyM6BdAPcByThme8=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorSha256 = "1k6ak175z1qikicmqb6c8sc3dnwghpy9rv7ayl8mpq50y3ighwqi";
|
||||
vendorSha256 = "sha256-bmF38dj+ovVlSbTtv2TSXGLe/W1R4NUbeDrpgGlfPf4=";
|
||||
|
||||
# Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
|
||||
ldflags = [ "-X main.VERSION=${version}" ];
|
||||
|
||||
@ -16,14 +16,14 @@ let
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
hash = {
|
||||
x64-linux_hash = "sha256-aUmeZ/numcAkejfMm4kuXem5u9bwkn5jRz5PzTNq1tQ=";
|
||||
arm64-linux_hash = "sha256-8EwB52bNTxmoPcCC8Q5y77gM8M9pDqMXypwz7ukLDuE=";
|
||||
x64-osx_hash = "sha256-NnunLw9sZCBDMqrDMX+u/xt0owJT/NdsUv2rF6knnx4=";
|
||||
x64-linux_hash = "sha256-KPGE9Az98UOBEJ/mUH/RI0zrf1tf90yckAfURvC+lWM=";
|
||||
arm64-linux_hash = "sha256-seJJ2le7Y4x6G5s0ASbN3KzldD9kOmFamwaxnJV3T7c=";
|
||||
x64-osx_hash = "sha256-FA81l/IZWGoAlBUS3irPCdcf3ey9Df3XzDen+4UlZzc=";
|
||||
}."${arch}-${os}_hash";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "prowlarr";
|
||||
version = "0.1.6.1184";
|
||||
version = "0.1.8.1231";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "turbovnc";
|
||||
version = "2.2.6";
|
||||
version = "2.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TurboVNC";
|
||||
repo = "turbovnc";
|
||||
rev = version;
|
||||
sha256 = "sha256-HSppHPBBkTf+88ZBaYG6JK4A/5lOBCxPFv6898TD7PE=";
|
||||
sha256 = "sha256-mEdatfTBx4nNmMTgv1Z+xefPFEiE2rCrsxyB7Dd03rg=";
|
||||
};
|
||||
|
||||
# TODO:
|
||||
|
||||
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
|
||||
sed "/\.mk3/d" -i libschily/Targets.man
|
||||
substituteInPlace man/Makefile --replace "man4" ""
|
||||
substituteInPlace RULES/rules.prg --replace "/bin/" ""
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-cc.rul
|
||||
ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang.rul
|
||||
ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang64.rul
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bcachefs-tools";
|
||||
version = "unstable-2021-11-06";
|
||||
version = "unstable-2021-12-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "5b84952401146fec9a181a40877352f7faf9ee7b";
|
||||
sha256 = "09zs2h3vzqn163v4i9lrvgy9gcjlw24lld7715j3kyyxnc5vav32";
|
||||
rev = "07b18011cc885f0ef5cadc299d0321322f442388";
|
||||
sha256 = "0yvdbjasl05w1afiszygrfv7hn39fxx7kcy42vk39rb6fb3xpvzy";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mergerfs";
|
||||
version = "2.33.1";
|
||||
version = "2.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trapexit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-60jGW3aMBf1Ue+AbV/kHb8WoKBqCRMa0fgt6Id1Xt9w=";
|
||||
sha256 = "sha256-hZA7AkFEuSHp84Zn+m9+VVr4UewbbzeQL1n2bkUOX0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "agi";
|
||||
version = "2.1.0-dev-20210820";
|
||||
version = "2.1.0-dev-20210924";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
|
||||
sha256 = "sha256-XsjWrih+8D3z1I41N5ZoLar/+5FV9mPN9aMbyZK2m/0=";
|
||||
sha256 = "sha256-OX26qoyJMG54BA/62GbGRjqdYA7n56SUVVOcdyVAGmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,7 +20,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
argcomplete
|
||||
argh
|
||||
azure-identity
|
||||
azure-storage-blob
|
||||
boto3
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moreutils";
|
||||
version = "0.66";
|
||||
version = "0.67";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.joeyh.name/moreutils";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-y+imKvLbaegpI4GTVPuHFT43OGFGnzOnWP2J3LSX1BQ=";
|
||||
sha256 = "sha256-8Mu7L3KqOsW9OmidMkWB+q9TofHd1P1sbsNrtE4MUoA=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parallel";
|
||||
version = "20211122";
|
||||
version = "20211222";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-SLJWMixWpMsaeBj+CJT93lddqw4PklxqIolRe2vYli4=";
|
||||
sha256 = "sha256-BYSRz0xSpIVZd73oA8Y2iLLKnFmRvhDnuLDArt5G0Zw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "axel";
|
||||
version = "2.17.10";
|
||||
version = "2.17.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axel-download-accelerator";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp";
|
||||
sha256 = "sha256-yC4TL8IXWGEwRXAyeon6QnQa+rT1xL/McLsghjZ4ky4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive txt2man ];
|
||||
|
||||
@ -10,15 +10,15 @@ let
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
version = "7.32.1";
|
||||
version = "7.32.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "sha256-21xrnPP5uoGzVCBplNxzKUxFTjopDTjdVQqyvIEzIuo=";
|
||||
sha256 = "sha256-/vHNxcJQb0QHwFq6lxsSh9zc+Bkhb2SUymI5jEzkjm4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-j3A8Gqw3Erf6suK/TH9Ml2zb7tYDGNFqil5wSZRs79o=";
|
||||
vendorSha256 = "sha256-LyXveLSa+p9GEzcKifTXweY8nJwPISwhboi8zBeBrMo=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/agent"
|
||||
|
||||
33
pkgs/tools/networking/oonf-olsrd2/default.nix
Normal file
33
pkgs/tools/networking/oonf-olsrd2/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oonf-olsrd2";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OLSR";
|
||||
repo = "OONF";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7EH2K7gaBGD95WFlG6RRhKEWJm91Xv2GOHYQjZWuzl0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOONF_NO_WERROR=yes"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An adhoc wireless mesh routing daemon";
|
||||
license = licenses.bsd3;
|
||||
homepage = "http://olsr.org/";
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -4,11 +4,11 @@ with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pirate-get";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "07s5ss9dxccx1mip7pyga1fagywkqchxmzz55ng47ac9053ffxkq";
|
||||
sha256 = "0pr703fwinr2f4rba86zp57mpf5j2jgvp5n50rc5vy5g7yfwsddm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama veryprettytable pyperclip ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user