Merge staging-next into staging
This commit is contained in:
@@ -355,7 +355,6 @@
|
||||
./programs/xonsh.nix
|
||||
./programs/xss-lock.nix
|
||||
./programs/xwayland.nix
|
||||
./programs/yabar.nix
|
||||
./programs/yazi.nix
|
||||
./programs/ydotool.nix
|
||||
./programs/yubikey-touch-detector.nix
|
||||
|
||||
@@ -1,187 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.programs.yabar;
|
||||
|
||||
mapExtra =
|
||||
v:
|
||||
lib.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList (
|
||||
key: val:
|
||||
"${key} = ${if (builtins.isString val) then "\"${val}\"" else "${builtins.toString val}"};"
|
||||
) v
|
||||
);
|
||||
|
||||
listKeys = r: builtins.concatStringsSep "," (builtins.map (n: "\"${n}\"") (builtins.attrNames r));
|
||||
|
||||
configFile =
|
||||
let
|
||||
bars = lib.mapAttrsToList (name: cfg: ''
|
||||
${name}: {
|
||||
font: "${cfg.font}";
|
||||
position: "${cfg.position}";
|
||||
|
||||
${mapExtra cfg.extra}
|
||||
|
||||
block-list: [${listKeys cfg.indicators}]
|
||||
|
||||
${builtins.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList (name: cfg: ''
|
||||
${name}: {
|
||||
exec: "${cfg.exec}";
|
||||
align: "${cfg.align}";
|
||||
${mapExtra cfg.extra}
|
||||
};
|
||||
'') cfg.indicators
|
||||
)}
|
||||
};
|
||||
'') cfg.bars;
|
||||
in
|
||||
pkgs.writeText "yabar.conf" ''
|
||||
bar-list = [${listKeys cfg.bars}];
|
||||
${builtins.concatStringsSep "\n" bars}
|
||||
'';
|
||||
in
|
||||
{
|
||||
options.programs.yabar = {
|
||||
enable = lib.mkEnableOption "yabar, a status bar for X window managers";
|
||||
|
||||
package = lib.mkOption {
|
||||
default = pkgs.yabar-unstable;
|
||||
defaultText = lib.literalExpression "pkgs.yabar-unstable";
|
||||
example = lib.literalExpression "pkgs.yabar";
|
||||
type = lib.types.package;
|
||||
|
||||
# `yabar-stable` segfaults under certain conditions.
|
||||
# remember to update yabar.passthru.tests if nixos switches back to it!
|
||||
apply =
|
||||
x:
|
||||
if x == pkgs.yabar-unstable then
|
||||
x
|
||||
else
|
||||
lib.flip lib.warn x ''
|
||||
It's not recommended to use `yabar' with `programs.yabar', the (old) stable release
|
||||
tends to segfault under certain circumstances:
|
||||
|
||||
* https://github.com/geommer/yabar/issues/86
|
||||
* https://github.com/geommer/yabar/issues/68
|
||||
* https://github.com/geommer/yabar/issues/143
|
||||
|
||||
Most of them don't occur on master anymore, until a new release is published, it's recommended
|
||||
to use `yabar-unstable'.
|
||||
'';
|
||||
|
||||
description = ''
|
||||
The package which contains the `yabar` binary.
|
||||
|
||||
Nixpkgs offers both a stable (`yabar`) and unstable (`yabar-unstable`) version of Yabar.
|
||||
'';
|
||||
};
|
||||
|
||||
bars = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.submodule {
|
||||
options = {
|
||||
font = lib.mkOption {
|
||||
default = "sans bold 9";
|
||||
example = "Droid Sans, FontAwesome Bold 9";
|
||||
type = lib.types.str;
|
||||
|
||||
description = ''
|
||||
The font that will be used to draw the status bar.
|
||||
'';
|
||||
};
|
||||
|
||||
position = lib.mkOption {
|
||||
default = "top";
|
||||
example = "bottom";
|
||||
type = lib.types.enum [
|
||||
"top"
|
||||
"bottom"
|
||||
];
|
||||
|
||||
description = ''
|
||||
The position where the bar will be rendered.
|
||||
'';
|
||||
};
|
||||
|
||||
extra = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
|
||||
description = ''
|
||||
An attribute set which contains further attributes of a bar.
|
||||
'';
|
||||
};
|
||||
|
||||
indicators = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.submodule {
|
||||
options.exec = lib.mkOption {
|
||||
example = "YABAR_DATE";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
The type of the indicator to be executed.
|
||||
'';
|
||||
};
|
||||
|
||||
options.align = lib.mkOption {
|
||||
default = "left";
|
||||
example = "right";
|
||||
type = lib.types.enum [
|
||||
"left"
|
||||
"center"
|
||||
"right"
|
||||
];
|
||||
|
||||
description = ''
|
||||
Whether to align the indicator at the left or right of the bar.
|
||||
'';
|
||||
};
|
||||
|
||||
options.extra = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.attrsOf (lib.types.either lib.types.str lib.types.int);
|
||||
|
||||
description = ''
|
||||
An attribute set which contains further attributes of a indicator.
|
||||
'';
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
description = ''
|
||||
Indicators that should be rendered by yabar.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
description = ''
|
||||
List of bars that should be rendered by yabar.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.user.services.yabar = {
|
||||
description = "yabar service";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
|
||||
script = ''
|
||||
${cfg.package}/bin/yabar -c ${configFile}
|
||||
'';
|
||||
|
||||
serviceConfig.Restart = "always";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -75,6 +75,9 @@ in
|
||||
"way-cooler is abandoned by its author: "
|
||||
+ "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"
|
||||
))
|
||||
(mkRemovedOptionModule [ "programs" "yabar" ]
|
||||
"programs.yabar has been removed from NixOS. This is because the yabar repository has been archived upstream."
|
||||
)
|
||||
(mkRemovedOptionModule [ "security" "hideProcessInformation" ] ''
|
||||
The hidepid module was removed, since the underlying machinery
|
||||
is broken when using cgroups-v2.
|
||||
|
||||
@@ -22,6 +22,15 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
gracefulShutdownLimitSecs = lib.mkOption {
|
||||
type = lib.types.ints.positive;
|
||||
default = 60;
|
||||
description = ''
|
||||
Set the duration in seconds to wait for graceful shutdown after SIGINT or SIGTERM are received.
|
||||
After the duration has passed, Vector will force shutdown.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = (pkgs.formats.json { }).type;
|
||||
default = { };
|
||||
@@ -56,7 +65,7 @@ in
|
||||
'';
|
||||
in
|
||||
{
|
||||
ExecStart = "${lib.getExe cfg.package} --config ${validateConfig conf}";
|
||||
ExecStart = "${lib.getExe cfg.package} --config ${validateConfig conf} --graceful-shutdown-limit-secs ${builtins.toString cfg.gracefulShutdownLimitSecs}";
|
||||
DynamicUser = true;
|
||||
Restart = "always";
|
||||
StateDirectory = "vector";
|
||||
|
||||
@@ -1508,7 +1508,6 @@ in
|
||||
xss-lock = runTest ./xss-lock.nix;
|
||||
xterm = runTest ./xterm.nix;
|
||||
xxh = runTest ./xxh.nix;
|
||||
yabar = runTest ./yabar.nix;
|
||||
yarr = runTest ./yarr.nix;
|
||||
ydotool = handleTest ./ydotool.nix { };
|
||||
yggdrasil = runTest ./yggdrasil.nix;
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
name = "yabar";
|
||||
meta.maintainers = [ ];
|
||||
|
||||
nodes.machine = {
|
||||
imports = [
|
||||
./common/x11.nix
|
||||
./common/user-account.nix
|
||||
];
|
||||
|
||||
test-support.displayManager.auto.user = "bob";
|
||||
|
||||
programs.yabar.enable = true;
|
||||
programs.yabar.bars = {
|
||||
top.indicators.date.exec = "YABAR_DATE";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_x()
|
||||
|
||||
# confirm proper startup
|
||||
machine.wait_for_unit("yabar.service", "bob")
|
||||
machine.sleep(10)
|
||||
machine.wait_for_unit("yabar.service", "bob")
|
||||
|
||||
machine.screenshot("top_bar")
|
||||
'';
|
||||
}
|
||||
@@ -3,9 +3,9 @@
|
||||
vscode-utils,
|
||||
jq,
|
||||
moreutils,
|
||||
python311Packages,
|
||||
R,
|
||||
rPackages,
|
||||
radian,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
@@ -20,7 +20,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
moreutils
|
||||
];
|
||||
buildInputs = [
|
||||
python311Packages.radian
|
||||
radian
|
||||
R
|
||||
rPackages.languageserver
|
||||
];
|
||||
@@ -28,8 +28,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."r.rpath.mac".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rpath.linux".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe radian}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe radian}"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r/changelog";
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cairo,
|
||||
gdk-pixbuf,
|
||||
libconfig,
|
||||
pango,
|
||||
pkg-config,
|
||||
xcbutilwm,
|
||||
alsa-lib,
|
||||
wirelesstools,
|
||||
asciidoc,
|
||||
libxslt,
|
||||
makeWrapper,
|
||||
docbook_xsl,
|
||||
configFile ? null,
|
||||
lib,
|
||||
rev,
|
||||
sha256,
|
||||
version,
|
||||
patches ? [ ],
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "yabar";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev sha256;
|
||||
|
||||
owner = "geommer";
|
||||
repo = "yabar";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
asciidoc
|
||||
docbook_xsl
|
||||
libxslt
|
||||
makeWrapper
|
||||
libconfig
|
||||
pango
|
||||
];
|
||||
buildInputs = [
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
libconfig
|
||||
pango
|
||||
xcbutilwm
|
||||
alsa-lib
|
||||
wirelesstools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./Makefile \
|
||||
--replace "\$(shell git describe)" "${version}" \
|
||||
--replace "a2x" "a2x --no-xmllint"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"PREFIX=/"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/yabar/examples
|
||||
cp -v examples/*.config $out/share/yabar/examples
|
||||
|
||||
${lib.optionalString (configFile != null) ''
|
||||
wrapProgram "$out/bin/yabar" \
|
||||
--add-flags "-c ${configFile}"
|
||||
''}
|
||||
'';
|
||||
|
||||
#passthru.tests = { inherit (nixosTests) yabar; }; # nixos currently uses yabar-unstable
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern and lightweight status bar for X window managers";
|
||||
homepage = "https://github.com/geommer/yabar";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
mainProgram = "yabar";
|
||||
};
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
{
|
||||
callPackage,
|
||||
attrs ? { },
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
overrides = rec {
|
||||
version = "0.4.0";
|
||||
|
||||
rev = version;
|
||||
sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch";
|
||||
sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s";
|
||||
})
|
||||
];
|
||||
|
||||
} // attrs;
|
||||
in
|
||||
callPackage ./build.nix overrides
|
||||
@@ -1,44 +0,0 @@
|
||||
{
|
||||
fetchpatch,
|
||||
playerctl,
|
||||
libxkbcommon,
|
||||
callPackage,
|
||||
nixosTests,
|
||||
attrs ? { },
|
||||
}:
|
||||
|
||||
let
|
||||
pkg = callPackage ./build.nix (
|
||||
{
|
||||
version = "unstable-2018-01-18";
|
||||
|
||||
rev = "c516e8e78d39dd2b339acadc4c175347171150bb";
|
||||
sha256 = "1p9lx78cayyn7qc2q66id2xfs76jyddnqv2x1ypsvixaxwcvqgdb";
|
||||
}
|
||||
// attrs
|
||||
);
|
||||
in
|
||||
pkg.overrideAttrs (o: {
|
||||
buildInputs = o.buildInputs ++ [
|
||||
playerctl
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
makeFlags = o.makeFlags ++ [
|
||||
"PLAYERCTL=1"
|
||||
];
|
||||
|
||||
patches = (o.patches or [ ]) ++ [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch";
|
||||
sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = (o.passthru or { }) // {
|
||||
tests = (o.passthru.tests or { }) // {
|
||||
inherit (nixosTests) yabar;
|
||||
};
|
||||
};
|
||||
|
||||
})
|
||||
@@ -43,17 +43,17 @@ in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = binName;
|
||||
|
||||
version = "0.21.6";
|
||||
version = "0.22.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "toeverything";
|
||||
repo = "AFFiNE";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xiOfy3uskqYv5b0U2s1Zpc4/ydsRhhUd8M33IH0BJ10=";
|
||||
hash = "sha256-LTNJsW7ETIca3uADuoa0ROOOMQT8+LN8+B8VVUyDZSY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-1BTSvHaSPE55v6awnvRry1Exms+zeGug3PNldZ2v2HY=";
|
||||
hash = "sha256-kAhT2yXFbUuV34ukdUmLQbO00LSaYk7gpsp0nmO138o=";
|
||||
};
|
||||
yarnOfflineCache = stdenvNoCC.mkDerivation {
|
||||
name = "yarn-offline-cache";
|
||||
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
dontInstall = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-XpVygLwK/vjQJ5cDckIRM3Uo5hcahTz/XV1WjBQmOac=";
|
||||
outputHash = "sha256-fwvv3OXDorcyikixEoOMnu3dv24ClGBS6h3oWAk0uas=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals hostPlatform.isDarwin [
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.18.2";
|
||||
version = "0.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-deny";
|
||||
rev = version;
|
||||
hash = "sha256-u93x0w6gSPxDCrp9bNJDCxLBZfh8EhXU4qvhklI4GKY=";
|
||||
hash = "sha256-cFgc3bdNVLeuie4sVC+klmQ1/C6W3LkTgORMCfOte4Q=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-3fCACetvO9KRjoTh3V41+vhWFjwaNtoHZ/Zh+Zxmxlc=";
|
||||
cargoHash = "sha256-3TfyFsBSjo8VEDrUehoV2ccXh+xY+iQ9xihj1Bl2MhI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.97";
|
||||
version = "0.9.98";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-5UhmWewLj3bjtvqyb6FcC1qZQbAutRPXnBi7e/lyArM=";
|
||||
hash = "sha256-JQw3HWRtTFz1XsqyQLN/7YkePT0Th3QLj3D13au2IKc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-mTKcQ76A++LK+54ChmCUF/7dsubdz7GZpOZUp+afqfQ=";
|
||||
cargoHash = "sha256-rf89X1Y0OD4WmaKRwSV506XASo/te/dlC50iBNKNGAg=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
let
|
||||
pname = "daed";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daeuniverse";
|
||||
repo = "daed";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5olEPaS/6ag69KUwBG8qXpyr1B2qrLK+vf13ZljHH+c=";
|
||||
hash = "sha256-WaybToEcFrKOcJ+vfCTc9uyHkTPOrcAEw9lZFEIBPgY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -63,7 +63,7 @@ buildGoModule rec {
|
||||
|
||||
sourceRoot = "${src.name}/wing";
|
||||
|
||||
vendorHash = "sha256-qB2qcJ82mFcVvjlYp/N9sqzwPotTROgymSX5NfEQMuY=";
|
||||
vendorHash = "sha256-+uf8PJQvsJMUyQ6W+nDfdwrxBO2YRUL328ajTJpVDZk=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -61,6 +61,11 @@ stdenv.mkDerivation rec {
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p ${Applications}
|
||||
cp -a src/djview.app -t ${Applications}
|
||||
|
||||
mkdir -p $out/bin
|
||||
pushd $out/bin
|
||||
ln -sf ../Applications/djview.app/Contents/MacOS/djview
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "edusong";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
name = "edusong-${finalAttrs.version}";
|
||||
url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip";
|
||||
hash = "sha256-4NBnwMrYufeZbgSiD2fAhe4tuy0aAA5u9tWwjQQjEQk=";
|
||||
};
|
||||
@@ -28,4 +28,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
license = lib.licenses.cc-by-nd-30;
|
||||
maintainers = with lib.maintainers; [ ShamrockLee ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gleam";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = "gleam";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oxzFAqPZ+ZHd/+GwofDg0gA4NIFYWi2v8fOjMn8ixSU=";
|
||||
hash = "sha256-ZNDN9MRA9D+5xdVp3Lxt76bLzHRK7304O6WVPrlUq2U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9kk7w85imYIhywBuAgJS8wYAIEM3hXoHymGgMMmrgnI=";
|
||||
cargoHash = "sha256-TJqylGjXdkunE5mHkpFnvv3SENBFwtQehV0q2k3hNMY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtlsrpt";
|
||||
version = "0.5.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sys4";
|
||||
repo = "libtlsrpt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-h7bWxxllKFj8+/FfC4yHSmz+Qij1BcgV4OCQZr1OkA8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
meta = {
|
||||
description = "Low-level C Library to implement TLSRPT into a MTA";
|
||||
homepage = "https://github.com/sys4/libtlsrpt";
|
||||
changelog = "https://github.com/sys4/libtlsrpt/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "logdy";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "logdyhq";
|
||||
repo = "logdy-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hhmzTJn136J8DZ719WSu8tafRp8s4MBj6vDVWYTfFyc=";
|
||||
hash = "sha256-NV1vgHUeIH1k1E5hdO3fXrXl1+B30AUM2aexlxz5g8o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kFhcbBMymzlJ+2zw7l09LJfCdps26Id+VzOehqrLDWU=";
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "neonmodem";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrusme";
|
||||
repo = "neonmodem";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VLR6eicffA0IXVwEZMvgpm1kVmrLYVZOtq7MSy+vIw8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pESNARoUgfg5/cTlTvKF3i7dTMIu0gRG/oV4Ov6h2cY=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# Will otherwise panic if it can't open $HOME/{Library/Caches,.cache}/neonmodem.log
|
||||
# Upstream issue: https://github.com/mrusme/neonmodem/issues/53
|
||||
mkdir -p "$HOME/${if stdenv.buildPlatform.isDarwin then "Library/Caches" else ".cache"}"
|
||||
|
||||
installShellCompletion --cmd neonmodem \
|
||||
--bash <($out/bin/neonmodem completion bash) \
|
||||
--fish <($out/bin/neonmodem completion fish) \
|
||||
--zsh <($out/bin/neonmodem completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "BBS-style TUI client for Discourse, Lemmy, Lobsters, and Hacker News";
|
||||
homepage = "https://neonmodem.com";
|
||||
downloadPage = "https://github.com/mrusme/neonmodem/releases";
|
||||
changelog = "https://github.com/mrusme/neonmodem/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ acuteaangle ];
|
||||
mainProgram = "neonmodem";
|
||||
};
|
||||
})
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "okteto";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-xJdG5BHlVkK+wGn4ZNFfRoPimnlZrQOLbtKvCnBewqw=";
|
||||
hash = "sha256-ntRMh7sctnAxYN4XZRig/DmYZ/zC/jMyLFDwaH+F9LA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zfY/AfSo8f9LALf0FRAdd26Q9xGcKvVAnK3rnACCW4s=";
|
||||
vendorHash = "sha256-A3ZZcyms7XSEB7n3YBytrXhMcI4mWf2pPsLwkF+Z1aQ=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
|
||||
@@ -23,18 +23,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "packet";
|
||||
version = "0.3.4";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nozwock";
|
||||
repo = "packet";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-s3R/RDfQAQR6Jdehco5TD+2GpG4y9sEl0moWMxv3PZE=";
|
||||
hash = "sha256-MnDXwgzSnz8bLEAZE4PORKKIP8Ao5ZiImRqRzlQzYU8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-0Cbw5bSOK1bTq8ozZlRpZOelfak6N2vZOQPU4vsnepk=";
|
||||
hash = "sha256-LlqJoxAWHAQ47VlYB/sOtk/UkNa+E5CQS/3FQnAYFsI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
libmysqlclient,
|
||||
withSQLite ? false,
|
||||
sqlite,
|
||||
withTLSRPT ? true,
|
||||
libtlsrpt,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -48,6 +50,7 @@ let
|
||||
"-DHAS_LDAP"
|
||||
"-DUSE_LDAP_SASL"
|
||||
]
|
||||
++ lib.optional withTLSRPT "-DUSE_TLSRPT"
|
||||
);
|
||||
auxlibs = lib.concatStringsSep " " (
|
||||
[
|
||||
@@ -62,6 +65,7 @@ let
|
||||
++ lib.optional withMySQL "-lmysqlclient"
|
||||
++ lib.optional withSQLite "-lsqlite3"
|
||||
++ lib.optional withLDAP "-lldap"
|
||||
++ lib.optional withTLSRPT "-ltlsrpt"
|
||||
);
|
||||
|
||||
in
|
||||
@@ -90,7 +94,8 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional withPgSQL libpq
|
||||
++ lib.optional withMySQL libmysqlclient
|
||||
++ lib.optional withSQLite sqlite
|
||||
++ lib.optional withLDAP openldap;
|
||||
++ lib.optional withLDAP openldap
|
||||
++ lib.optional withTLSRPT libtlsrpt;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
+14
-27
@@ -1,31 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pyte,
|
||||
pexpect,
|
||||
ptyprocess,
|
||||
pythonOlder,
|
||||
jedi,
|
||||
git,
|
||||
lineedit,
|
||||
prompt-toolkit,
|
||||
pygments,
|
||||
rchitect,
|
||||
R,
|
||||
rPackages,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "radian";
|
||||
version = "0.6.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "randy3k";
|
||||
repo = "radian";
|
||||
@@ -38,7 +24,7 @@ buildPythonPackage rec {
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
@@ -48,25 +34,26 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
[
|
||||
(with python3Packages; [
|
||||
lineedit
|
||||
prompt-toolkit
|
||||
pygments
|
||||
rchitect
|
||||
]
|
||||
])
|
||||
++ (with rPackages; [
|
||||
reticulate
|
||||
askpass
|
||||
]);
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pyte
|
||||
pexpect
|
||||
ptyprocess
|
||||
jedi
|
||||
git
|
||||
];
|
||||
nativeCheckInputs =
|
||||
(with python3Packages; [
|
||||
pytestCheckHook
|
||||
pyte
|
||||
pexpect
|
||||
ptyprocess
|
||||
jedi
|
||||
])
|
||||
++ [ git ];
|
||||
|
||||
makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ];
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
fetchurl,
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-moegirl";
|
||||
version = "20250609";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml";
|
||||
hash = "sha256-Zry74q94cupBxHExTvUSS/sF6Vp8LbALhaEhiHEQ7UY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/rime-data
|
||||
cp $src $out/share/rime-data/moegirl.dict.yaml
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/outloudvi/mw2fcitx/releases/tag/${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ xddxdd ];
|
||||
description = "RIME dictionary file for entries from zh.moegirl.org.cn";
|
||||
homepage = "https://github.com/outloudvi/mw2fcitx/releases";
|
||||
license = with lib.licenses; [
|
||||
unlicense # the tool packaging dictionary
|
||||
cc-by-nc-sa-30 # moegirl wiki itself
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -21,17 +21,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ruffle";
|
||||
version = "0-nightly-2025-06-01";
|
||||
version = "0-nightly-2025-06-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ruffle-rs";
|
||||
repo = "ruffle";
|
||||
tag = lib.strings.removePrefix "0-" finalAttrs.version;
|
||||
hash = "sha256-7fkeQZHrzyKxga5wWkIA4uo0ka1pNfYrXIz250uJ1KI=";
|
||||
hash = "sha256-7r81iw5Mt+3EOwf28fn/26DjK7g1VazCvDEjngBYq9o=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-pCE70CP5+Rm28yokh88zP9Si2lmikCRxD7cRKFrz+o0=";
|
||||
cargoHash = "sha256-cCZrI0KyTH/HBmjVXmL5cR6c839gXGLPTBi3HHTEI24=";
|
||||
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
|
||||
|
||||
env =
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sanoid";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jimsalterjrs";
|
||||
repo = "sanoid";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qfRGZ10fhLL4tJL97VHrdOkO/4OVpa087AsL9t8LMmk=";
|
||||
sha256 = "sha256-s6MP3x4qSuuiJKq2V2oLAXp6zaMSqKRCs5O9UMSgcvE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
slang,
|
||||
ncurses,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slrn";
|
||||
version = "1.0.3a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2";
|
||||
sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e "s|-ltermcap|-lncurses|" configure
|
||||
sed -i autoconf/Makefile.in src/Makefile.in \
|
||||
-e "s|/bin/cp|cp|" \
|
||||
-e "s|/bin/rm|rm|"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-slang=${slang.dev}"
|
||||
"--with-ssl=${openssl.dev}"
|
||||
"--with-slrnpull"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
slang
|
||||
ncurses
|
||||
openssl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Slrn (S-Lang read news) newsreader";
|
||||
homepage = "https://slrn.sourceforge.net/index.html";
|
||||
license = licenses.gpl2;
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "srain";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SrainApp";
|
||||
repo = "srain";
|
||||
rev = version;
|
||||
hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY=";
|
||||
hash = "sha256-F7TFCPTAU856403QNUUyf+10s/Yr4xDN/CarJNcUv4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,20 +4,22 @@
|
||||
fetchFromGitLab,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook4,
|
||||
installShellFiles,
|
||||
libadwaita,
|
||||
meld,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "turtle";
|
||||
version = "0.11";
|
||||
version = "0.13.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "philippun1";
|
||||
repo = "turtle";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-st6Y2hIaMiApoAG7IFoyQC9hKXdvothkv+5toXsUdVA=";
|
||||
tag = version;
|
||||
hash = "sha256-bfoo2xWBr4jR5EX5H8hiXl6C6HSpNJ93icDg1gwWXqE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -29,6 +31,7 @@ python3Packages.buildPythonApplication rec {
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook4
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [ libadwaita ];
|
||||
@@ -44,6 +47,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
postInstall = ''
|
||||
python ./install.py install
|
||||
installManPage data/man/*
|
||||
'';
|
||||
|
||||
# Avoid wrapping two times
|
||||
@@ -67,6 +71,8 @@ python3Packages.buildPythonApplication rec {
|
||||
for nautilus_extensions in $out/share/nautilus-python/extensions/*.py; do
|
||||
patchPythonScript $nautilus_extensions
|
||||
done
|
||||
substituteInPlace $out/share/nautilus-python/extensions/turtle_nautilus_compare.py \
|
||||
--replace-fail 'Popen(["meld"' 'Popen(["${lib.getExe meld}"'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-oPBB3tCxLMogV3SEr7QHjFgOw8n7bfuwFSRdgWwSb9Y=",
|
||||
"version": "0.2025.05.28.08.11.stable_03"
|
||||
"hash": "sha256-xkrJqFLzKKEBPWr49JqpCC70CGEGpwrhb5GLCoGZiWI=",
|
||||
"version": "0.2025.06.04.08.11.stable_03"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-pVXmosjXXnSyOrLEUzZtLWs1KWkyDRXSjHV6rdvuK6U=",
|
||||
"version": "0.2025.05.28.08.11.stable_03"
|
||||
"hash": "sha256-OVS84RwWqspkE6Wfji/FuoaXvS2ZA2vWkI0kfQrEWSk=",
|
||||
"version": "0.2025.06.04.08.11.stable_03"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-LKFkJg5NEgtjvjK1gzo4ZQqQQbxmzRgP+CNznlgUfJo=",
|
||||
"version": "0.2025.05.28.08.11.stable_03"
|
||||
"hash": "sha256-K/RC1hYe7G+3symQVR8If/B1/VCACCTcq5JTSKLREIM=",
|
||||
"version": "0.2025.06.04.08.11.stable_03"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "approvaltests";
|
||||
version = "14.5.0";
|
||||
version = "14.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "approvals";
|
||||
repo = "ApprovalTests.Python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VWYl+8hS9XnvtqmokNntdKGHWSJVlGPomvAEwaBcjY8=";
|
||||
hash = "sha256-hoBT83p2PHZR5NtVChdWK5SMjLt8llj59K5ODaKtRhQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-hierarkey";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphaelm";
|
||||
repo = "django-hierarkey";
|
||||
tag = version;
|
||||
hash = "sha256-1LSH9GwoNF3NrDVNUIHDAVsktyKIprDgB5XlIHeM3fM=";
|
||||
hash = "sha256-GkCNVovo2bDCp6m2GBvusXsaBhcmJkPNu97OdtsYROY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,22 +9,19 @@
|
||||
phonenumbers,
|
||||
phonenumberslite,
|
||||
python,
|
||||
pythonOlder,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-phonenumber-field";
|
||||
version = "8.0.0";
|
||||
version = "8.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stefanfoulis";
|
||||
repo = "django-phonenumber-field";
|
||||
tag = version;
|
||||
hash = "sha256-l+BAh7QYGN0AgDHICvlQnBYAcpEn8acu+JBmoo85kF0=";
|
||||
hash = "sha256-KRi2rUx88NYoQhRChmNABP8KalMbf4HhWC8Wwnc/xB4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
@@ -60,7 +57,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Django model and form field for normalised phone numbers using python-phonenumbers";
|
||||
homepage = "https://github.com/stefanfoulis/django-phonenumber-field/";
|
||||
changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${version}";
|
||||
changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sephi ];
|
||||
};
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
pylibmc,
|
||||
pymemcache,
|
||||
python,
|
||||
pywatchman,
|
||||
pyyaml,
|
||||
pytz,
|
||||
redis,
|
||||
@@ -108,7 +107,6 @@ buildPythonPackage rec {
|
||||
pillow
|
||||
pylibmc
|
||||
pymemcache
|
||||
pywatchman
|
||||
pyyaml
|
||||
pytz
|
||||
redis
|
||||
@@ -117,11 +115,6 @@ buildPythonPackage rec {
|
||||
tzdata
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
doCheck =
|
||||
!stdenv.hostPlatform.isDarwin
|
||||
# pywatchman depends on folly which does not support 32bits
|
||||
&& !stdenv.hostPlatform.is32bit;
|
||||
|
||||
preCheck = ''
|
||||
# make sure the installed library gets imported
|
||||
rm -rf django
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
pylibmc,
|
||||
pymemcache,
|
||||
python,
|
||||
pywatchman,
|
||||
pyyaml,
|
||||
pytz,
|
||||
redis,
|
||||
@@ -101,7 +100,6 @@ buildPythonPackage rec {
|
||||
pillow
|
||||
pylibmc
|
||||
pymemcache
|
||||
pywatchman
|
||||
pyyaml
|
||||
pytz
|
||||
redis
|
||||
@@ -110,11 +108,6 @@ buildPythonPackage rec {
|
||||
tzdata
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
doCheck =
|
||||
!stdenv.hostPlatform.isDarwin
|
||||
# pywatchman depends on folly which does not support 32bits
|
||||
&& !stdenv.hostPlatform.is32bit;
|
||||
|
||||
preCheck = ''
|
||||
# make sure the installed library gets imported
|
||||
rm -rf django
|
||||
@@ -132,7 +125,8 @@ buildPythonPackage rec {
|
||||
runHook preCheck
|
||||
|
||||
pushd tests
|
||||
${python.interpreter} runtests.py --settings=test_sqlite
|
||||
# without --parallel=1, tests fail with an "unexpected error due to a database lock" on Darwin
|
||||
${python.interpreter} runtests.py --settings=test_sqlite ${lib.optionalString stdenv.hostPlatform.isDarwin "--parallel=1"}
|
||||
popd
|
||||
|
||||
runHook postCheck
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.69.0";
|
||||
version = "1.72.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
tag = "v${version}-stable";
|
||||
hash = "sha256-W2uql9fKzwAmSgeLTuESguh+dVn+b3JNTeGlCc9NP2A=";
|
||||
hash = "sha256-CGmdk5SjtmeqXLVWiBqvofQ4+C2gW4TJXFkQdaQqMEA=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
unittestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "standard-cgi";
|
||||
version = "3.13.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "youknowone";
|
||||
repo = "python-deadlib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cgi";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Python dead batteries. See PEP 594";
|
||||
homepage = "https://github.com/youknowone/python-deadlib";
|
||||
license = lib.licenses.psfl;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
setuptools,
|
||||
cython,
|
||||
certifi,
|
||||
cmake,
|
||||
openssl,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uamqp";
|
||||
version = "1.6.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-uamqp-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HTIOHheCrvyI7DwA/UcUXk/fbesd29lvUvJ9TAeG3CE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "fix-clang16-compatibility.patch";
|
||||
url = "https://github.com/Azure/azure-uamqp-python/commit/bd6d9ef5a8bca3873e1e66218fd09ca787b8064e.patch";
|
||||
hash = "sha256-xtnIVjB71EPJp/QjLQWctcSDds5s6n4ut+gnvp3VMlM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) ''
|
||||
# force darwin aarch64 to use openssl instead of applessl, removing
|
||||
# some quirks upstream thinks they need to use openssl on macos
|
||||
sed -i \
|
||||
-e '/^use_openssl =/cuse_openssl = True' \
|
||||
-e 's/\bazssl\b/ssl/' \
|
||||
-e 's/\bazcrypto\b/crypto/' \
|
||||
setup.py
|
||||
sed -i \
|
||||
-e '/#define EVP_PKEY_id/d' \
|
||||
src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c
|
||||
sed -z -i \
|
||||
-e 's/OpenSSL 3\nif(LINUX)/OpenSSL 3\nif(1)/' \
|
||||
src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
dependencies = [ certifi ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
preCheck = ''
|
||||
# remove src module, so tests use the installed module instead
|
||||
rm -r uamqp
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "uamqp" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AMQP 1.0 client library for Python";
|
||||
homepage = "https://github.com/Azure/azure-uamqp-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ maxwilson ];
|
||||
};
|
||||
}
|
||||
@@ -3,17 +3,15 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pythonAtLeast,
|
||||
setuptools,
|
||||
standard-cgi,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vat-moss";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
# uses the removed cgi battery
|
||||
disabled = pythonAtLeast "3.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphaelm";
|
||||
@@ -30,6 +28,10 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ standard-cgi ];
|
||||
|
||||
pythonImportsCheck = [ "vat_moss" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
nukeReferences,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rtl8852bu";
|
||||
version = "${kernel.version}-unstable-2024-05-25";
|
||||
version = "${kernel.version}-unstable-2025-05-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "morrownr";
|
||||
repo = pname;
|
||||
rev = "1acc7aa085bffec21a91fdc9e293378e06bf25e7";
|
||||
hash = "sha256-22vzAdzzM5YnfU8kRWSK3HXxw6BA4FOWXLdWEb7T5IE=";
|
||||
repo = "rtl8852bu-20240418";
|
||||
rev = "42de963695ffc7929a4905aed5c5d7da7c1c2715";
|
||||
hash = "sha256-BvOw9MU4eibeMJEOkifKFatCUNGdujNUZav+4D9bYKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
substituteInPlace ./Makefile \
|
||||
--replace-fail /sbin/depmod \# \
|
||||
--replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
|
||||
--replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" \
|
||||
--replace-fail 'cp -f $(MODULE_NAME).conf /etc/modprobe.d' \
|
||||
'mkdir -p $out/etc/modprobe.d && cp -f $(MODULE_NAME).conf $out/etc/modprobe.d' \
|
||||
--replace-fail "sh edit-options.sh" ""
|
||||
substituteInPlace ./platform/i386_pc.mk \
|
||||
--replace-fail /lib/modules "${kernel.dev}/lib/modules"
|
||||
'';
|
||||
@@ -54,13 +57,19 @@ stdenv.mkDerivation rec {
|
||||
nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-designated-init"; # Similar to 79c1cf6
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Driver for Realtek rtl8852bu and rtl8832bu chipsets, provides the 8852bu mod";
|
||||
homepage = "https://github.com/morrownr/rtl8852bu";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lonyelon ];
|
||||
homepage = "https://github.com/morrownr/rtl8852bu-20240418";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
broken = kernel.kernelOlder "6" && kernel.isHardened; # Similar to 79c1cf6
|
||||
maintainers = with lib.maintainers; [
|
||||
lonyelon
|
||||
thtrf
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -939,7 +939,7 @@ mapAliases {
|
||||
javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01
|
||||
jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
|
||||
jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
|
||||
jikespg = throw "'jikespg' has been removed due to of maintenance upstream."; # Added 2025-06-10
|
||||
jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
|
||||
jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07
|
||||
|
||||
# Julia
|
||||
@@ -1774,6 +1774,7 @@ mapAliases {
|
||||
slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
|
||||
slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06
|
||||
sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17
|
||||
slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
|
||||
slurm-llnl = slurm; # renamed July 2017
|
||||
sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
|
||||
smartgithg = smartgit; # renamed March 2025
|
||||
@@ -2120,6 +2121,8 @@ mapAliases {
|
||||
yandex-browser-beta = throw "'yandex-browser-beta' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
|
||||
yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
|
||||
youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
|
||||
yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
|
||||
yabar-unstable = yabar; # Added 2025-06-10
|
||||
yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
|
||||
yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
|
||||
yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
|
||||
|
||||
@@ -10128,7 +10128,6 @@ with pkgs;
|
||||
spatial
|
||||
survival
|
||||
];
|
||||
radian = python3Packages.radian;
|
||||
# Override this attribute to register additional libraries.
|
||||
packages = [ ];
|
||||
# Override this attribute if you want to expose R with the same set of
|
||||
@@ -14573,10 +14572,6 @@ with pkgs;
|
||||
|
||||
xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
|
||||
|
||||
yabar = callPackage ../applications/window-managers/yabar { };
|
||||
|
||||
yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };
|
||||
|
||||
ydiff = with python3.pkgs; toPythonApplication ydiff;
|
||||
|
||||
yokadi = python3Packages.callPackage ../applications/misc/yokadi { };
|
||||
|
||||
@@ -667,6 +667,7 @@ mapAliases ({
|
||||
qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30
|
||||
qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
|
||||
rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
|
||||
radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
|
||||
radicale_infcloud = radicale-infcloud; # added 2024-01-07
|
||||
radio_beam = radio-beam; # added 2023-11-04
|
||||
ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21
|
||||
@@ -792,6 +793,7 @@ mapAliases ({
|
||||
types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15
|
||||
types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
|
||||
types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
|
||||
uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
|
||||
ufoLib2 = ufolib2; # added 2024-01-07
|
||||
ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05
|
||||
unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02
|
||||
|
||||
@@ -15016,8 +15016,6 @@ self: super: with self; {
|
||||
|
||||
rachiopy = callPackage ../development/python-modules/rachiopy { };
|
||||
|
||||
radian = callPackage ../development/python-modules/radian { };
|
||||
|
||||
radicale-infcloud = callPackage ../development/python-modules/radicale-infcloud {
|
||||
radicale = pkgs.radicale.override { python3 = python; };
|
||||
};
|
||||
@@ -16880,6 +16878,9 @@ self: super: with self; {
|
||||
standard-aifc =
|
||||
if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-aifc { } else null;
|
||||
|
||||
standard-cgi =
|
||||
if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-cgi { } else null;
|
||||
|
||||
standard-chunk =
|
||||
if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-chunk { } else null;
|
||||
|
||||
@@ -18599,8 +18600,6 @@ self: super: with self; {
|
||||
|
||||
ua-parser-rs = callPackage ../development/python-modules/ua-parser-rs { };
|
||||
|
||||
uamqp = callPackage ../development/python-modules/uamqp { };
|
||||
|
||||
uarray = callPackage ../development/python-modules/uarray { };
|
||||
|
||||
uart-devices = callPackage ../development/python-modules/uart-devices { };
|
||||
|
||||
Reference in New Issue
Block a user