gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #136797 from ncfavier/unbreak-lambdabot

Browse Source 
haskellPackages.lambdabot-social-plugins,lambdabot: unbreak, add myself as maintainer
This commit is contained in:
maralorn
2021-09-05 19:01:02 +02:00
committed by GitHub
parent 6b93b667b2 9380d8464b
commit 828f92acea
63 changed files with 415 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/sonic-pi/default.nix
+6 -1
View File
@@ -102,7 +102,12 @@ mkDerivation rec {
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \
--prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2}/bin \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \
--set AUBIO_LIB "${aubio}/lib/libaubio.so"
makeWrapper \
$out/app/server/ruby/bin/sonic-pi-server.rb \
$out/bin/sonic-pi-server \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \
--set AUBIO_LIB "${aubio}/lib/libaubio.so"
'';
pkgs/applications/editors/android-studio/default.nix
+2 -2
View File
@@ -9,8 +9,8 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
version = "2020.3.1.23"; # "Android Studio Arctic Fox (2020.3.1)"
sha256Hash = "06xjdibb5lxiga3jg9akmvbazjwk11akyhy3g4pc562hcifsa5sk";
version = "2020.3.1.24"; # "Android Studio Arctic Fox (2020.3.1)"
sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l";
};
betaVersion = {
version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1"
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+25
View File
@@ -78,6 +78,31 @@
};
};
# may be part of MELPA in the future, see
# https://github.com/mlochbaum/BQN/issues/10#issuecomment-912982874
bqn-mode = self.trivialBuild {
pname = "bqn-mode";
version = "unstable-2021-09-04";
src = pkgs.fetchFromGitHub {
owner = "mlochbaum";
repo = "BQN";
rev = "e623a2fcafdf5fd6c8d31570175284805c4f34d9";
sha256 = "1a2lpxy3bak4724r0ns4la5d0j6484ngi73kcwp82vgbbpk7lcrp";
};
postUnpack = ''
sourceRoot="$sourceRoot/editors/emacs"
'';
meta = {
description = "Emacs mode for BQN";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sternenseemann ];
homepage = "https://mlochbaum.github.io/BQN/editors/index.html";
};
};
ghc-mod = melpaBuild {
pname = "ghc";
version = pkgs.haskellPackages.ghc-mod.version;
pkgs/applications/graphics/fig2dev/default.nix
+2 -12
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, ghostscript
, libpng
, makeWrapper
@@ -14,22 +13,13 @@
stdenv.mkDerivation rec {
pname = "fig2dev";
version = "3.2.8a";
version = "3.2.8b";
src = fetchurl {
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3";
sha256 = "1jv8rg71dsy00lpg434r5zqs5qrg8mxqvv2gpcjjvmzsm551d2j1";
};
patches = [
(fetchpatch {
name = "CVE-2021-3561.patch";
# Using Debian patch since it is not possible to download it directly from Sourceforge
url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch";
sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs";
})
];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpng ];
pkgs/applications/misc/prusa-slicer/super-slicer.nix
+4 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
let
appname = "SuperSlicer";
version = "2.3.56.5";
version = "2.3.56.8";
pname = "super-slicer";
description = "PrusaSlicer fork with more features and faster development cycle";
override = super: {
@@ -10,13 +10,15 @@ let
src = fetchFromGitHub {
owner = "supermerill";
repo = "SuperSlicer";
sha256 = "sha256-Gg+LT1YKyUGNJE9XvWE1LSlIQ6Vq5GfVBTUw/A7Qx7E=";
sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo=";
rev = version;
fetchSubmodules = true;
};
# We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.
postInstall = null;
dontStrip = true;
separateDebugInfo = true;
# See https://github.com/supermerill/SuperSlicer/issues/432
cmakeFlags = super.cmakeFlags ++ [
pkgs/applications/misc/reddsaver/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "reddsaver";
version = "0.3.3";
version = "0.4.0";
src = fetchFromGitHub {
owner = "manojkarthick";
repo = "reddsaver";
rev = "v${version}";
sha256 = "1czsy1bb0ja650sndwzq9rcbbhcci7s7ablw0agaynhi403shavv";
sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
};
cargoSha256 = "0wr6y7mfffaqdh6i5nqhx692dih159121sm6k0i37wcdvxhvd51z";
cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
pkgs/applications/misc/xplr/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.14.5";
version = "0.14.7";
src = fetchCrate {
inherit pname version;
sha256 = "00kgxc4pn07p335dl3d53shiyw4f4anw64qc8axz9nspdq734nj5";
sha256 = "sha256-rGU9Jf+MHDs3pnuddqxLaWc8YqL+Ka7Rex+fTuU62sM=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "1wmc4frjllj8dgcg4yw4cigm4mhq807pmp3l3ysi70q490g24gwh";
cargoSha256 = "sha256-GwepsY7PcWjKZpJ7H4D9vtXwd2XGFgG1c+QvinMAG4Q=";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";
pkgs/applications/networking/cluster/fluxcd/default.nix
+8 -4
View File
@@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.16.2";
version = "0.17.0";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
sha256 = "05khmpbv42wjpkdb4n51pnq678la6hjfhkyy49d0j2kcnvfd1m5p";
sha256 = "15ffb8damn935sfnqpshiyaazpldjcq411xrcfngpp7ncl9vbgwm";
stripRoot = false;
};
in
@@ -19,10 +19,10 @@ buildGoModule rec {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
sha256 = "sha256-hP2HQI9Oc7IlzVS5r7yqGAgSgqECOSZVe2B3vO2sgKA=";
sha256 = "1pw558d64c6ynqnnadhg8vbi4ql6f5y81l9hpxi0ki5myj2kx6an";
};
vendorSha256 = "sha256-6ABnX0GV3HmhpUpPWS0bigubRqpXGoikEeQ/LqO6Ybs=";
vendorSha256 = "sha256-FUASe7EQ8YVv3R6fPPLtsvMibe00Ox596GoTyKt0S+E=";
nativeBuildInputs = [ installShellFiles ];
@@ -34,6 +34,10 @@ buildGoModule rec {
cp -r ${manifests} source/cmd/flux/manifests
'';
# Required to workaround test error:
# panic: mkdir /homeless-shelter: permission denied
HOME="$TMPDIR";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/flux --version | grep ${version} > /dev/null
pkgs/applications/office/qownnotes/default.nix
+6 -4
View File
@@ -1,15 +1,17 @@
{ mkDerivation, lib, stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets, qtx11extras
, qtwayland }:
{ mkDerivation, lib, stdenv, fetchurl
, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets
, qtx11extras, qtwayland
}:
mkDerivation rec {
pname = "qownnotes";
version = "21.7.4";
version = "21.8.12";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "3957dc623b419582ef7ccc5cb04b8f97bed4e96e8ecc2e99bef9dca7ce255b8e";
sha256 = "85fbfb6288411ed585de85dd2cfcf3b3308eb4634824b96c5842d091da4cd476";
};
nativeBuildInputs = [ qmake qttools ];
pkgs/applications/office/timetable/default.nix
-63
View File
@@ -1,63 +0,0 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
, glib
, gtk3
, vala
, json-glib
, libgee
, meson
, ninja
, pkg-config
, pantheon
, python3
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "timetable";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "12c8kdrbz6x2mlrvr0nq9y5khj0qiiwlxf7aqc2z3dnrawjgy1rb";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
python3
wrapGAppsHook
];
buildInputs = [
glib
gtk3
json-glib
libgee
pantheon.granite
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Plot out your own timetable for the week and organize it";
homepage = "https://github.com/lainsce/timetable";
maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers;
license = licenses.gpl2Plus;
};
}
pkgs/applications/terminal-emulators/foot/default.nix
+34 -17
View File
@@ -2,7 +2,6 @@
, lib
, fetchFromGitea
, fetchurl
, fetchpatch
, runCommand
, fcft
, freetype
@@ -28,7 +27,7 @@
}:
let
version = "1.8.2";
version = "1.9.0";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@@ -89,6 +88,8 @@ let
# using a compiler which foot's PGO build supports (clang or gcc)
doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform)
&& compilerName != "unknown";
terminfoDir = "${placeholder "terminfo"}/share/terminfo";
in
stdenv.mkDerivation rec {
pname = "foot";
@@ -99,18 +100,9 @@ stdenv.mkDerivation rec {
owner = "dnkl";
repo = pname;
rev = version;
sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h";
sha256 = "0mkzq5lbgl5qp5nj8sk5gyg9hrrklmbjdqzlcr2a6rlmilkxlhwm";
};
patches = [
# Fixes PGO builds with clang
(fetchpatch {
url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch";
sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s";
includes = [ "pgo/pgo.c" ];
})
];
depsBuildBuild = [
pkg-config
];
@@ -154,7 +146,15 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Db_lto=true"
"-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo"
# Prevent foot from installing its terminfo file into a custom location,
# we need to do this manually in postInstall.
# See https://codeberg.org/dnkl/foot/pulls/673,
# https://codeberg.org/dnkl/foot/src/tag/1.9.0/INSTALL.md#options
"-Dterminfo=disabled"
# Ensure TERM=foot is used
"-Ddefault-terminfo=foot"
# Tell foot what to set TERMINFO to
"-Dcustom-terminfo-install-location=${terminfoDir}"
];
# build and run binary generating PGO profiles,
@@ -174,11 +174,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "terminfo" ];
# make sure nix-env and buildEnv also include the
# terminfo output when the package is installed
postInstall = ''
mkdir -p "$out/nix-support"
echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages"
# build and install foot's terminfo to the standard location
# instead of its custom location
mkdir -p "${terminfoDir}"
tic -o "${terminfoDir}" -x -e foot,foot-direct "$NIX_BUILD_TOP/$sourceRoot/foot.info"
'';
passthru.tests = {
@@ -189,6 +189,10 @@ stdenv.mkDerivation rec {
clang-latest-compilation = foot.override {
inherit (llvmPackages_latest) stdenv;
};
noPgo = foot.override {
allowPgo = false;
};
};
meta = with lib; {
@@ -198,5 +202,18 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = [ maintainers.sternenseemann ];
platforms = platforms.linux;
# From (presumably) ncurses version 6.3, it will ship a foot
# terminfo file. This however won't include some non-standard
# capabilities foot's bundled terminfo file contains. Unless we
# want to have some features in e. g. vim or tmux stop working,
# we need to make sure that the foot terminfo overwrites ncurses'
# one. Due to <nixpkgs/nixos/modules/config/system-path.nix>
# ncurses is always added to environment.systemPackages on
# NixOS with its priority increased by 3, so we need to go
# one bigger.
# This doesn't matter a lot for local use since foot sets
# TERMINFO to a store path, but allows installing foot.terminfo
# on remote systems for proper foot terminfo support.
priority = (ncurses.meta.priority or 5) + 3 + 1;
};
}
pkgs/applications/version-management/mercurial/default.nix
+3 -16
View File
@@ -13,26 +13,13 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial";
version = "5.8";
version = "5.9.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw";
sha256 = "09wzyhyajy1dbp5kxkmvs9x8jk964wri19p5jgf83mv27i1zkvrj";
};
patches = [
# https://phab.mercurial-scm.org/D10638, needed for below patch to apply
(fetchpatch {
url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84";
sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g";
})
# https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514
(fetchpatch {
url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea";
sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn";
})
];
format = "other";
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
@@ -40,7 +27,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd";
sha256 = "1f7q0kmp46rphw38rlzh1yvpn3rdjdnzzbxzjkrjks8n1gm8baca";
sourceRoot = "${pname}-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
pkgs/applications/version-management/tortoisehg/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
python3Packages.buildPythonApplication rec {
pname = "tortoisehg";
version = "5.8";
version = "5.9";
src = fetchurl {
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a";
};
# Extension point for when thg's mercurial is lagging behind mainline.
pkgs/development/compilers/gcc/10/default.nix
+1
View File
@@ -147,6 +147,7 @@ stdenv.mkDerivation ({
else "")
+ lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'-s' # workaround for hitting hydra log limit
'LIMITS_H_TEST=false'
)
'';
pkgs/development/compilers/gcc/11/default.nix
+1
View File
@@ -152,6 +152,7 @@ stdenv.mkDerivation ({
else "")
+ lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'-s' # workaround for hitting hydra log limit
'LIMITS_H_TEST=false'
)
'';
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
-1
View File
@@ -2664,7 +2664,6 @@ broken-packages:
- lagrangian
- lambda2js
- lambdaBase
- lambdabot-social-plugins
- lambdabot-utils
- lambda-bridge
- lambda-canvas
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+2
View File
@@ -242,6 +242,8 @@ package-maintainers:
- streamly
- taskwarrior
- witch
ncfavier:
- lambdabot
pacien:
- ldgallery-compiler
peti:
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
-1
View File
@@ -1865,7 +1865,6 @@ dont-distribute-packages:
- lambda-options
- lambdaFeed
- lambdaLit
- lambdabot
- lambdabot-xmpp
- lambdabot-zulip
- lambdacms-media
pkgs/development/haskell-modules/hackage-packages.nix
Generated
-3
View File
@@ -159535,7 +159535,6 @@ self: {
];
description = "Lambdabot is a development tool and advanced IRC bot";
license = "GPL";
hydraPlatforms = lib.platforms.none;
}) {};
"lambdabot-core" = callPackage
@@ -159673,8 +159672,6 @@ self: {
];
description = "Social plugins for Lambdabot";
license = "GPL";
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"lambdabot-trusted" = callPackage
pkgs/development/interpreters/lua-5/default.nix
-5
View File
@@ -54,9 +54,4 @@ rec {
inherit callPackage;
};
luajit_openresty = import ../luajit/openresty.nix {
self = luajit_openresty;
inherit callPackage;
};
}
pkgs/development/interpreters/luajit/2.0.nix
+4 -6
View File
@@ -1,14 +1,12 @@
{ self, callPackage, lib }:
callPackage ./default.nix {
inherit self;
owner = "LuaJIT";
repo = "LuaJIT";
version = "2.0.5-2021-06-08";
rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46";
version = "2.0.5-2021-07-27";
rev = "3a654999c6f00de4cb9e61232d23579442e544a0";
isStable = true;
sha256 = "1pdmhk5syp0nir80xcnkf6xy2w5rwslak8hgmjpgaxzlnrjcgs7p";
sha256 = "0q187vn6bspn9i33hrvfy59mh83nd8jjmik5qkkkc3vls13jxr6z";
extraMeta = { # this isn't precise but it at least stops the useless Hydra build
platforms = with lib; filter (p: p != "aarch64-linux")
platforms = with lib; filter (p: !hasPrefix "aarch64-" p)
(platforms.linux ++ platforms.darwin);
};
}
pkgs/development/interpreters/luajit/2.1.nix
+3 -5
View File
@@ -1,10 +1,8 @@
{ self, callPackage }:
callPackage ./default.nix {
inherit self;
owner = "LuaJIT";
repo = "LuaJIT";
version = "2.1.0-2021-06-25";
rev = "e957737650e060d5bf1c2909b741cc3dffe073ac";
version = "2.1.0-2021-08-12";
rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597";
isStable = false;
sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj";
sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr";
}
pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/src/Makefile b/src/Makefile
index 2538503f..7e6380da 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -320,7 +320,9 @@ ifeq (Darwin,$(TARGET_SYS))
$(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
endif
TARGET_STRIP+= -x
+ ifneq (arm64,$(shell uname -m))
TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
+ endif
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
TARGET_DYNXLDOPTS=
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
pkgs/development/interpreters/luajit/default.nix
+31 -22
View File
@@ -1,15 +1,16 @@
{ lib, stdenv, fetchFromGitHub, buildPackages
{ lib
, stdenv
, fetchFromGitHub
, buildPackages
, name ? "luajit-${version}"
, isStable
, owner
, repo
, sha256
, rev
, version
, extraMeta ? {}
, extraMeta ? { }
, callPackage
, self
, packageOverrides ? (self: super: {})
, packageOverrides ? (self: super: { })
, enableFFI ? true
, enableJIT ? true
, enableJITDebugModule ? enableJIT
@@ -26,28 +27,34 @@ assert enableJITDebugModule -> enableJIT;
assert enableGDBJITSupport -> enableJIT;
assert enableValgrindSupport -> valgrind != null;
let
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
luaPackages = callPackage ../../lua-modules { lua = self; overrides = packageOverrides; };
XCFLAGS = with lib;
optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64"
++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC"
++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND"
++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT"
++ optional enableAPICheck "-DLUAJIT_USE_APICHECK"
++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT"
optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64"
++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC"
++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND"
++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT"
++ optional enableAPICheck "-DLUAJIT_USE_APICHECK"
++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT"
;
in
stdenv.mkDerivation rec {
inherit name version;
src = fetchFromGitHub {
inherit owner repo sha256 rev;
owner = "LuaJIT";
repo = "LuaJIT";
inherit sha256 rev;
};
luaversion = "5.1";
# Fix for pcall on aarch64-darwin.
# Upstream issue: https://github.com/LuaJIT/LuaJIT/issues/698
patches = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./aarch64-darwin-disable-unwind-external.patch ];
postPatch = ''
substituteInPlace Makefile --replace ldconfig :
if test -n "''${dontStrip-}"; then
@@ -82,8 +89,10 @@ stdenv.mkDerivation rec {
'';
LuaPathSearchPaths = [
"lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua"
"share/lua/${luaversion}/?/init.lua" "lib/lua/${luaversion}/?/init.lua"
"lib/lua/${luaversion}/?.lua"
"share/lua/${luaversion}/?.lua"
"share/lua/${luaversion}/?/init.lua"
"lib/lua/${luaversion}/?/init.lua"
"share/${name}/?.lua"
];
LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ];
@@ -94,16 +103,16 @@ stdenv.mkDerivation rec {
lua = self;
inherit (luaPackages) requiredLuaModules;
};
withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages;};
withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages; };
pkgs = luaPackages;
interpreter = "${self}/bin/lua";
};
meta = with lib; {
description = "High-performance JIT compiler for Lua 5.1";
homepage = "http://luajit.org";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
homepage = "http://luajit.org";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ thoughtpolice smironov vcunat andir lblasc ];
} // extraMeta;
}
pkgs/development/interpreters/luajit/openresty.nix
-10
View File
@@ -1,10 +0,0 @@
{ self, callPackage }:
callPackage ./default.nix rec {
inherit self;
owner = "openresty";
repo = "luajit2";
version = "2.1-20210510";
rev = "v${version}";
isStable = true;
sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd";
}
pkgs/development/libraries/intel-gmmlib/default.nix
+7 -5
View File
@@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
@@ -7,9 +9,9 @@ stdenv.mkDerivation rec {
version = "21.2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v";
};
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
and buffer management for the Intel(R) Graphics Compute Runtime for
OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
'';
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ primeos ];
};
}
pkgs/development/python-modules/cogapp/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cogapp";
version = "3.0.0";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "5e5da2bcfc4e4750c66cecb80ea4eaed1ef4fddd3787c989d4f5bfffb1152d6a";
sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6";
};
# there are no tests
pkgs/development/python-modules/deprecated/default.nix
+1 -2
View File
@@ -1,5 +1,4 @@
{ lib, fetchPypi, buildPythonPackage,
wrapt, pytest, tox }:
{ lib, fetchPypi, buildPythonPackage, wrapt, pytest }:
buildPythonPackage rec {
pname = "Deprecated";
pkgs/development/python-modules/exchangelib/default.nix
+2 -2
View File
@@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "4.5.0";
version = "4.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MtWcqsbKls9I7Oj0UlJzWtHsNfAxk4+ojSgK50ljEfs=";
sha256 = "0pj6rcink4awjyq1v30camilqr03kd0sb2p03fk9v4lm63d8w28f";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-bigquery/default.nix
+2 -2
View File
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.25.1";
version = "2.26.0";
src = fetchPypi {
inherit pname version;
sha256 = "5ecf7c802cc6cf9cd79e79924616d8b7d35ba026f3313a4d90b8b4a28c72d93d";
sha256 = "15ca1f9c8165b584c2d593620354cd3b17c007e87cfd1abd1eebd2c08eb5d109";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-firestore/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "2.3.0";
version = "2.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8=";
sha256 = "8f8e513cae105ba17c4d3949091bd816cbf6075c6ac91b1f7acb4d40359f8a5a";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-kms/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "2.5.0";
version = "2.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM=";
sha256 = "44be4673ad0a327ea6447967216e124fcd4c7487ca886f000446f6db209988af";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-monitoring/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.4.2";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-PQjTAqSzjCBPH58nZHAc6Oa12NSDVvt2E0ZHewTFZfY=";
sha256 = "d3d436fab7f50f69bdd47655871ac923e4dcbaf8538808bbe31cf0a3cbdf3514";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
pkgs/development/python-modules/google-cloud-os-config/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.3.2";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-sC80RGY4lDVebpoz2hDGH5WfyrAjaOKTSDp/BhGmZS0=";
sha256 = "d12622901fb2ef5b736606fd00e77900105944c35d737ff794a59fd9a3d71325";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-spanner/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.8.0";
version = "3.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ=";
sha256 = "53fe3d903363fb17db155fd05f5356d9b310a519fbebd53903aa426a31cad706";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-speech/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.7.0";
version = "2.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "3c2d533a524d35c036d0387e8b2e0c7ce6aa7cdaa80392ec7fe68bce6cd2f152";
sha256 = "3750fd988082b880ed1ec6f3d59c4f29f4cd0df3804a58d6c151d4bf15d3a597";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
pkgs/development/python-modules/google-cloud-translate/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.3.2";
version = "3.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XkHNIu7KWPUpgBceIBqzWgYPCay+Ud1/nM0KbeRnHk0=";
sha256 = "7da158734db646867deb125c144a7a1692a48a134692c4dc54ba420f89db64ae";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-resumable-media/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
version = "2.0.0";
version = "2.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc=";
sha256 = "cac55be7802e3424b8f022d8a572a8349327e7ce8494eee5e0f4df02458b1813";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];
pkgs/development/python-modules/hg-commitsigs/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ lib
, fetchhg
, stdenv
, python3
}:
stdenv.mkDerivation rec {
pname = "hg-commitsigs";
# Latest tag is 11 years old.
version = "unstable-2021-01-08";
src = fetchhg {
url = "https://foss.heptapod.net/mercurial/commitsigs";
rev = "b53eb6862bff";
sha256 = "sha256-PS1OhC9MiVFD7WYlIn6FavD5TyhM50WoV6YagI2pLxU=";
};
# Not sure how the tests are supposed to be run, and they 10 years old...
doCheck = false;
dontBuild = true;
installPhase = ''
mkdir -p $out/lib/${python3.libPrefix}/site-packages/hgext3rd/
install -D $src/commitsigs.py \
$out/lib/${python3.libPrefix}/site-packages/hgext3rd/
'';
meta = with lib; {
description = "Automatic signing of changeset hashes";
longDescription = ''
This packages provides a Mercurial extension that lets you sign
the changeset hash when you commit. The signature is embedded
directly in the changeset itself; there wont be any extra
commits. Either GnuPG or OpenSSL can be used to sign the hashes.
'';
homepage = "https://foss.heptapod.net/mercurial/commitsigs";
maintainers = with maintainers; [ yoctocell ];
license = licenses.gpl2Plus;
platforms = platforms.unix; # same as Mercurial
};
}
pkgs/development/python-modules/numpy-stl/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "numpy-stl";
version = "2.16.0";
version = "2.16.2";
src = fetchPypi {
inherit pname version;
sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742";
sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77";
};
checkInputs = [ pytest pytest-runner ];
pkgs/development/python-modules/python-nomad/default.nix
+4 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-nomad";
version = "1.2.1";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ivkfdrmb4wpyawvwrgm3jvx6hn49vqjpwbkmkmamigghqqwacx3";
sha256 = "67731d050472923581c43a39a8f01567468e8b3c8e83465b762c99eb0e5e23bc";
};
propagatedBuildInputs = [ requests ];
@@ -14,6 +14,8 @@ buildPythonPackage rec {
# Tests require nomad agent
doCheck = false;
pythonImportsCheck = [ "nomad" ];
meta = with lib; {
description = "Python client library for Hashicorp Nomad";
homepage = "https://github.com/jrxFive/python-nomad";
pkgs/development/python-modules/uproot/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "uproot";
version = "4.0.8";
version = "4.1.1";
# fetch from github for tests
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "uproot4";
rev = version;
sha256 = "sha256-E9BRgyMz+3Xl8Q1zsnVtvW44FXTqs29U1oK4te0myq4=";
sha256 = "sha256-qh/rtZDE6L1IQJjzE+ns0eSG1BKbES7s3A/35hc+tXg=";
};
propagatedBuildInputs = [
pkgs/misc/emulators/wine/sources.nix
+2 -2
View File
@@ -75,8 +75,8 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20210206";
sha256 = "sha256-tnwownY9A05nYlkYaoCQZjeGGHuE+kJYzA7MPE2bXnQ=";
version = "20210825";
sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8=";
owner = "Winetricks";
repo = "winetricks";
rev = version;
pkgs/misc/screensavers/pipes-rs/default.nix
+33
View File
@@ -0,0 +1,33 @@
{ rustPlatform, fetchFromGitHub, lib }:
rustPlatform.buildRustPackage rec {
pname = "pipes-rs";
version = "1.4.4";
src = fetchFromGitHub {
owner = "lhvy";
repo = pname;
rev = "v${version}";
sha256 = "drqoKkju1EkcWGNnliEah37wVhtU2ddJSOZ5MnCNbuo=";
};
cargoSha256 = "0j6b5697ichw4ly7lsj3nbm0mw6bvjma81nd0fl7v1ra9kbmsysk";
doInstallCheck = true;
installCheckPhase = ''
if [[ "$("$out/bin/${pname}" --version)" == "${pname} ${version}" ]]; then
echo '${pname} smoke check passed'
else
echo '${pname} smoke check failed'
return 1
fi
'';
meta = with lib; {
description = "An over-engineered rewrite of pipes.sh in Rust";
homepage = "https://github.com/lhvy/pipes-rs";
license = with licenses; [ asl20 mit ];
maintainers = [ maintainers.vanilla ];
};
}
pkgs/misc/vim-plugins/generated.nix
+12
View File
@@ -1000,6 +1000,18 @@ final: prev:
meta.homepage = "https://github.com/nixprime/cpsm/";
};
crates-nvim = buildVimPluginFrom2Nix {
pname = "crates.nvim";
version = "2021-09-03";
src = fetchFromGitHub {
owner = "saecki";
repo = "crates.nvim";
rev = "ffec425ab2052850f93e9617f308b26d625e85fc";
sha256 = "06qjyqpbfv0dj7gpqdrx7dzm3j554n90ic6i7ljb4nh16v17k0dz";
};
meta.homepage = "https://github.com/saecki/crates.nvim/";
};
csapprox = buildVimPluginFrom2Nix {
pname = "csapprox";
version = "2013-07-27";
pkgs/misc/vim-plugins/vim-plugin-names
+1
View File
@@ -627,6 +627,7 @@ rust-lang/rust.vim
ryanoasis/vim-devicons
ryvnf/readline.vim
saadparwaiz1/cmp_luasnip
saecki/crates.nvim
sainnhe/edge
sainnhe/gruvbox-material
sainnhe/sonokai
pkgs/os-specific/linux/cramfsprogs/default.nix
+4
View File
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
# So patch the "missing include" bug ourselves.
patches = [ ./include-sysmacros.patch ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];
installPhase = ''
install --target $out/bin -D cramfsck mkcramfs
'';
pkgs/os-specific/linux/pax-utils/default.nix
+3 -3
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pax-utils";
version = "1.2.8";
version = "1.3.3";
src = fetchurl {
url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
sha256 = "sha256-urTIhG4dLMNmnPqSMdIdszWEHX1Y+eGc0Jn+bOYmsVc=";
sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ=";
};
makeFlags = [ "PREFIX=$(out)" ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
binary files.
'';
homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice joachifm ];
};
pkgs/servers/heisenbridge/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "heisenbridge";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "hifi";
repo = "heisenbridge";
rev = "v${version}";
sha256 = "sha256-DmYGP50GsthxvhXUMkwV+mvcfCjCMu90VMe5woNvf1w=";
sha256 = "sha256-PaLOFZTeX7HxBiOc94x5sHuJYKRF1fR9ShmQN7IPuuo=";
};
propagatedBuildInputs = with python3Packages; [
pkgs/servers/jibri/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ lib, stdenv, fetchurl, dpkg, jre_headless, makeWrapper }:
stdenv.mkDerivation rec {
pname = "jibri";
version = "8.0-93-g51fe7a2";
src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "1w78aa3rfdc4frb68ymykrbazxqrcv8mcdayqmcb72q1aa854c7j";
};
dontBuild = true;
nativeBuildInputs = [ dpkg makeWrapper ];
unpackCmd = "dpkg-deb -x $src debcontents";
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,opt/jitsi/jibri,etc/jitsi/jibri}
mv etc/jitsi/jibri/* $out/etc/jitsi/jibri/
mv opt/jitsi/jibri/* $out/opt/jitsi/jibri/
makeWrapper ${jre_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar"
runHook postInstall
'';
meta = with lib; {
description = "JItsi BRoadcasting Infrastructure";
longDescription = ''
Jibri provides services for recording or streaming a Jitsi Meet conference.
It works by launching a Chrome instance rendered in a virtual framebuffer and capturing and
encoding the output with ffmpeg. It is intended to be run on a separate machine (or a VM), with
no other applications using the display or audio devices. Only one recording at a time is
supported on a single jibri.
'';
homepage = "https://github.com/jitsi/jibri";
license = licenses.asl20;
maintainers = teams.jitsi.members;
platforms = platforms.linux;
};
}
pkgs/servers/tracing/tempo/default.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
version = "1.0.1";
version = "1.1.0";
pname = "tempo";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "tempo";
sha256 = "sha256-4QrCoz4taNXV13g+Pi0j7pTWy0hLY/qAdTOIMMuDWIA=";
sha256 = "sha256-qKsgcc62HTwl7Usmp8zk4vKDo4XEJnwL+A3hoLhgBkk=";
};
vendorSha256 = null;
pkgs/tools/admin/google-cloud-sdk/default.nix
+1
View File
@@ -125,5 +125,6 @@ in stdenv.mkDerivation rec {
homepage = "https://cloud.google.com/sdk/";
maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
mainProgram = "gcloud";
};
}
pkgs/tools/filesystems/rdfind/default.nix
+3 -3
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rdfind";
version = "1.4.1";
version = "1.5.0";
src = fetchurl {
url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih";
sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21";
};
buildInputs = [ nettle ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://rdfind.pauldreik.se/";
description = "Removes or hardlinks duplicate files very swiftly";
license = lib.licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = [ maintainers.wmertens ];
platforms = platforms.all;
};
pkgs/tools/filesystems/sasquatch/default.nix
+6 -1
View File
@@ -48,7 +48,12 @@ stdenv.mkDerivation rec {
installFlags = [ "INSTALL_DIR=\${out}/bin" ];
makeFlags = [ "XZ_SUPPORT=1" ]
makeFlags = [
"XZ_SUPPORT=1"
"CC=${stdenv.cc.targetPrefix}cc"
"CXX=${stdenv.cc.targetPrefix}c++"
"AR=${stdenv.cc.targetPrefix}ar"
]
++ lib.optional lz4Support "LZ4_SUPPORT=1";
meta = with lib; {
pkgs/tools/misc/kak-lsp/default.nix
+4 -4
View File
@@ -2,22 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
version = "10.0.0";
version = "11.0.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-SmK4G9AoKGqKGbXucn5AO5DTOeVNq3gCBGvDTIJQgRU=";
sha256 = "198y2k3vi8dh9kfqgl7vpgkxvjlfvryi9c8hmb43m0lpwsja0010";
};
cargoSha256 = "sha256-iY5xT8e/gRN/mBT9v5LhMcl9g1/SyrH/glPBP+toZ9o=";
cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y";
buildInputs = lib.optional stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Kakoune Language Server Protocol Client";
homepage = "https://github.com/ul/kak-lsp";
homepage = "https://github.com/kak-lsp/kak-lsp";
license = with licenses; [ unlicense /* or */ mit ];
maintainers = [ maintainers.spacekookie ];
};
pkgs/tools/misc/tfk8s/default.nix
+2 -2
View File
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tfk8s";
version = "0.1.6";
version = "0.1.7";
tag = "v${version}";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = tag;
sha256 = "sha256-pjgacKyOAlaFqHCKcLmjTl/uWpjMzkHH0UcaIEb+IZI=";
sha256 = "0mkfggwjrsp0rzh7ll6nmp9kqcw4fl8q81vk67z5mbd276dkyxrb";
};
vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I=";
pkgs/tools/misc/zellij/default.nix
+7 -6
View File
@@ -6,20 +6,21 @@
, pkg-config
, libiconv
, openssl
, expect
}:
rustPlatform.buildRustPackage rec {
pname = "zellij";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "zellij-org";
repo = "zellij";
rev = "v${version}";
sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc=";
sha256 = "sha256-2DYNgPURQzHaR8wHKEzuXSzubrxsQHpl3H3ko4okY7M=";
};
cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw=";
cargoSha256 = "sha256-AxtXWBfOzdLCpRchaQJbBBs+6rIyF+2ralOflRvkY4k=";
nativeBuildInputs = [ installShellFiles pkg-config ];
@@ -31,9 +32,9 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
installShellCompletion --cmd $pname \
--bash <($out/bin/zellij setup --generate-completion bash) \
--fish <($out/bin/zellij setup --generate-completion fish) \
--zsh <($out/bin/zellij setup --generate-completion zsh)
--bash <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion bash) \
--fish <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion fish) \
--zsh <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion zsh)
'';
meta = with lib; {
pkgs/tools/networking/sstp/default.nix
+11 -11
View File
@@ -2,18 +2,17 @@
stdenv.mkDerivation rec {
pname = "sstp-client";
version = "1.0.13";
version = "1.0.15";
src = fetchurl {
url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz";
sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln";
sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ=";
};
patchPhase =
''
sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c
sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c
'';
postPatch = ''
sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c
sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c
'';
configureFlags = [
"--with-openssl=${openssl.dev}"
@@ -22,13 +21,14 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevent openssl ppp ];
meta = {
meta = with lib; {
description = "SSTP client for Linux";
homepage = "http://sstp-client.sourceforge.net/";
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.ktosiek ];
license = lib.licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ ktosiek ];
license = licenses.gpl2Plus;
};
}
pkgs/tools/security/cowpatty/default.nix
+36 -14
View File
@@ -1,26 +1,48 @@
{ lib, stdenv, fetchurl, openssl, libpcap
{ lib
, stdenv
, clang
, fetchFromGitHub
, installShellFiles
, openssl
, libpcap
}:
with lib;
stdenv.mkDerivation rec {
pname = "cowpatty";
version = "4.6";
version = "4.8";
buildInputs = [ openssl libpcap ];
src = fetchurl {
url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz";
sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd";
src = fetchFromGitHub {
owner = "joswr1ght";
repo = pname;
rev = version;
sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s";
};
installPhase = "make DESTDIR=$out BINDIR=/bin install";
nativeBuildInputs = [
clang
installShellFiles
];
meta = {
buildInputs = [
openssl
libpcap
];
makeFlags = [
"DESTDIR=$(out)"
"BINDIR=/bin"
];
postInstall = ''
installManPage cowpatty.1
installManPage genpmk.1
'';
meta = with lib; {
description = "Offline dictionary attack against WPA/WPA2 networks";
license = licenses.gpl2;
homepage = "https://www.willhackforsushi.com/?page_id=50";
maintainers = with maintainers; [ nico202 ];
homepage = "https://github.com/joswr1ght/cowpatty";
license = licenses.bsd3;
maintainers = with maintainers; [ nico202 fab ];
platforms = platforms.linux;
};
}
pkgs/tools/text/hck/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "hck";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "sstadick";
repo = pname;
rev = "v${version}";
sha256 = "1l1v02rvb30bcq13ww56k04nc231f7q73zgf281974d6s2qwjdwh";
sha256 = "1xjp56asfn37kr0fsrjkil20nf372q70cijqb5ll2sq2zwjnyyzn";
};
cargoSha256 = "1isgbzi8afbr2xkw70nxakwcb5zjzw28rgp4p7ammhfxjjxw7y93";
cargoSha256 = "12n33gwxcym5z5n762wmzcck4zmmn42kh04nwpdb3az4apghdp3z";
nativeBuildInputs = [ cmake ];
pkgs/top-level/aliases.nix
+1
View File
@@ -893,6 +893,7 @@ mapAliases ({
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03
timescale-prometheus = promscale; # added 2020-09-29
timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05
tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11
pkgs/top-level/all-packages.nix
+6 -9
View File
@@ -9483,8 +9483,6 @@ with pkgs;
timetrap = callPackage ../applications/office/timetrap { };
timetable = callPackage ../applications/office/timetable { };
timekeeper = callPackage ../applications/office/timekeeper { };
timezonemap = callPackage ../development/libraries/timezonemap { };
@@ -12728,7 +12726,7 @@ with pkgs;
### LUA interpreters
luaInterpreters = callPackage ./../development/interpreters/lua-5 {};
inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0;
inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0;
lua5 = lua5_2_compat;
lua = lua5;
@@ -19959,6 +19957,8 @@ with pkgs;
jetty = callPackage ../servers/http/jetty { };
jibri = callPackage ../servers/jibri { };
jicofo = callPackage ../servers/jicofo { };
jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { };
@@ -22026,6 +22026,8 @@ with pkgs;
pipes = callPackage ../misc/screensavers/pipes { };
pipes-rs = callPackage ../misc/screensavers/pipes-rs { };
pipework = callPackage ../os-specific/linux/pipework { };
pktgen = callPackage ../os-specific/linux/pktgen { };
@@ -28110,12 +28112,7 @@ with pkgs;
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
neovim-unwrapped = callPackage ../applications/editors/neovim {
# See:
# - https://github.com/NixOS/nixpkgs/issues/129099
# - https://github.com/NixOS/nixpkgs/issues/128959
lua =
if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else
luajit;
lua = luajit;
};
neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };
pkgs/top-level/python-packages.nix
+2
View File
@@ -3319,6 +3319,8 @@ in {
heudiconv = callPackage ../development/python-modules/heudiconv { };
hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { };
hg-evolve = callPackage ../development/python-modules/hg-evolve { };
hglib = callPackage ../development/python-modules/hglib { };