mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
Merge master into staging-next
This commit is contained in:
commit
e6218aa1be
24 changed files with 402 additions and 107 deletions
|
@ -16,6 +16,7 @@
|
||||||
- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
|
- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
|
||||||
|
|
||||||
- `base16-builder` node package has been removed due to lack of upstream maintenance.
|
- `base16-builder` node package has been removed due to lack of upstream maintenance.
|
||||||
|
- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
|
||||||
|
|
||||||
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
|
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
|
||||||
|
|
||||||
|
|
|
@ -2652,6 +2652,11 @@
|
||||||
githubId = 9315;
|
githubId = 9315;
|
||||||
name = "Zhong Jianxin";
|
name = "Zhong Jianxin";
|
||||||
};
|
};
|
||||||
|
b-fein = {
|
||||||
|
github = "b-fein";
|
||||||
|
githubId = 64250573;
|
||||||
|
name = "Benedikt Fein";
|
||||||
|
};
|
||||||
b-m-f = {
|
b-m-f = {
|
||||||
email = "maximilian@sodawa.com";
|
email = "maximilian@sodawa.com";
|
||||||
github = "b-m-f";
|
github = "b-m-f";
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
gentium
|
gentium
|
||||||
];
|
];
|
||||||
fonts.fontconfig.defaultFonts = {
|
fonts.fontconfig.defaultFonts = {
|
||||||
serif = [ "Gentium Plus" ];
|
serif = [ "Gentium" ];
|
||||||
sansSerif = [ "Cantarell" ];
|
sansSerif = [ "Cantarell" ];
|
||||||
monospace = [ "Source Code Pro" ];
|
monospace = [ "Source Code Pro" ];
|
||||||
emoji = [ "Twitter Color Emoji" ];
|
emoji = [ "Twitter Color Emoji" ];
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
machine.succeed("fc-match serif | grep '\"Gentium Plus\"'")
|
machine.succeed("fc-match serif | grep '\"Gentium\"'")
|
||||||
machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'")
|
machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'")
|
||||||
machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'")
|
machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'")
|
||||||
machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'")
|
machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'")
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
programs.dconf.enable = true;
|
||||||
|
|
||||||
# for better OCR
|
# for better OCR
|
||||||
environment.etc."icewm/prefoverride".text = ''
|
environment.etc."icewm/prefoverride".text = ''
|
||||||
|
|
|
@ -90,6 +90,7 @@ builtins.listToAttrs (
|
||||||
|
|
||||||
server.wait_for_unit("nginx")
|
server.wait_for_unit("nginx")
|
||||||
server.wait_for_open_port(443)
|
server.wait_for_open_port(443)
|
||||||
|
client.wait_for_unit("network-online.target")
|
||||||
|
|
||||||
# Check http connections
|
# Check http connections
|
||||||
client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")
|
client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")
|
||||||
|
|
|
@ -1,68 +0,0 @@
|
||||||
{
|
|
||||||
stdenv,
|
|
||||||
lib,
|
|
||||||
fetchzip,
|
|
||||||
mkDerivation,
|
|
||||||
appimageTools,
|
|
||||||
autoPatchelfHook,
|
|
||||||
desktop-file-utils,
|
|
||||||
imagemagick,
|
|
||||||
qtmultimedia,
|
|
||||||
}:
|
|
||||||
|
|
||||||
mkDerivation rec {
|
|
||||||
pname = "soulseekqt";
|
|
||||||
version = "2018-1-30";
|
|
||||||
|
|
||||||
src = fetchzip {
|
|
||||||
url = "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz";
|
|
||||||
sha256 = "16ncnvv8h33f161mgy7qc0wjvvqahsbwvby65qhgfh9pbbgb4xgg";
|
|
||||||
};
|
|
||||||
|
|
||||||
appextracted = appimageTools.extractType2 {
|
|
||||||
inherit pname version;
|
|
||||||
src = "${src}/SoulseekQt-2018-1-30-64bit.AppImage";
|
|
||||||
};
|
|
||||||
|
|
||||||
dontBuild = true;
|
|
||||||
dontConfigure = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
imagemagick
|
|
||||||
autoPatchelfHook
|
|
||||||
desktop-file-utils
|
|
||||||
];
|
|
||||||
buildInputs = [
|
|
||||||
qtmultimedia
|
|
||||||
stdenv.cc.cc
|
|
||||||
];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
binary="$(realpath ${appextracted}/AppRun)"
|
|
||||||
install -Dm755 $binary -t $out/bin
|
|
||||||
|
|
||||||
# fixup and install desktop file
|
|
||||||
desktop-file-install --dir $out/share/applications \
|
|
||||||
--set-key Exec --set-value SoulseekQt \
|
|
||||||
--set-key Terminal --set-value false \
|
|
||||||
--set-key Comment --set-value "${meta.description}" \
|
|
||||||
--set-key Categories --set-value Network ${appextracted}/default.desktop
|
|
||||||
mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop
|
|
||||||
#TODO: write generic code to read icon path from $binary.desktop
|
|
||||||
icon="$(realpath ${appextracted}/.DirIcon)"
|
|
||||||
for size in 16 32 48 64 72 96 128 192 256 512 1024; do
|
|
||||||
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
|
||||||
convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$(basename $icon)
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Official Qt SoulSeek client";
|
|
||||||
homepage = "https://www.slsknet.org";
|
|
||||||
mainProgram = "SoulseekQt";
|
|
||||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
|
||||||
license = licenses.unfree;
|
|
||||||
maintainers = [ ];
|
|
||||||
platforms = [ "x86_64-linux" ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -134,8 +134,8 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||||
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
||||||
'')
|
'')
|
||||||
+ (lib.optionalString hipSupport ''
|
+ (lib.optionalString hipSupport ''
|
||||||
substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
|
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
|
||||||
substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
|
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
|
||||||
'');
|
'');
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
|
env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
|
||||||
|
|
53
pkgs/by-name/ge/gentium-book/package.nix
Normal file
53
pkgs/by-name/ge/gentium-book/package.nix
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenvNoCC,
|
||||||
|
fetchzip,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
|
pname = "gentium-book";
|
||||||
|
version = "7.000";
|
||||||
|
|
||||||
|
src = fetchzip {
|
||||||
|
url = "http://software.sil.org/downloads/r/gentium/GentiumBook-${finalAttrs.version}.zip";
|
||||||
|
hash = "sha256-A/QZX8OYrifaxChC08SNOaspdnSr8PxOtYgFAwUc5WY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||||
|
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
|
||||||
|
cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://software.sil.org/gentium/";
|
||||||
|
description = "High-quality typeface family for Latin, Cyrillic, and Greek";
|
||||||
|
longDescription = ''
|
||||||
|
Gentium is a typeface family designed to enable the diverse ethnic groups
|
||||||
|
around the world who use the Latin, Cyrillic and Greek scripts to produce
|
||||||
|
readable, high-quality publications. It supports a wide range of Latin and
|
||||||
|
Cyrillic-based alphabets.
|
||||||
|
|
||||||
|
The design is intended to be highly readable, reasonably compact, and
|
||||||
|
visually attractive. The additional ‘extended’ Latin letters are designed
|
||||||
|
to naturally harmonize with the traditional 26 ones. Diacritics are
|
||||||
|
treated with careful thought and attention to their use. Gentium also
|
||||||
|
supports both polytonic and monotonic Greek.
|
||||||
|
|
||||||
|
This package contains the regular and italic styles for the Gentium Book
|
||||||
|
font family, along with documentation.
|
||||||
|
'';
|
||||||
|
downloadPage = "https://software.sil.org/gentium/download/";
|
||||||
|
maintainers = with lib.maintainers; [
|
||||||
|
b-fein
|
||||||
|
raskin
|
||||||
|
rycee
|
||||||
|
];
|
||||||
|
license = lib.licenses.ofl;
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
};
|
||||||
|
})
|
52
pkgs/by-name/ge/gentium-plus/package.nix
Normal file
52
pkgs/by-name/ge/gentium-plus/package.nix
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenvNoCC,
|
||||||
|
fetchzip,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
|
pname = "gentium-plus";
|
||||||
|
version = "6.200";
|
||||||
|
|
||||||
|
src = fetchzip {
|
||||||
|
url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${finalAttrs.version}.zip";
|
||||||
|
hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||||
|
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
|
||||||
|
cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://software.sil.org/gentium/";
|
||||||
|
description = "High-quality typeface family for Latin, Cyrillic, and Greek";
|
||||||
|
longDescription = ''
|
||||||
|
Gentium is a typeface family designed to enable the diverse ethnic groups
|
||||||
|
around the world who use the Latin, Cyrillic and Greek scripts to produce
|
||||||
|
readable, high-quality publications. It supports a wide range of Latin and
|
||||||
|
Cyrillic-based alphabets.
|
||||||
|
|
||||||
|
The design is intended to be highly readable, reasonably compact, and
|
||||||
|
visually attractive. The additional ‘extended’ Latin letters are designed
|
||||||
|
to naturally harmonize with the traditional 26 ones. Diacritics are
|
||||||
|
treated with careful thought and attention to their use. Gentium Plus also
|
||||||
|
supports both polytonic and monotonic Greek.
|
||||||
|
|
||||||
|
This package contains the regular and italic styles for the Gentium Plus
|
||||||
|
font family, along with documentation.
|
||||||
|
'';
|
||||||
|
downloadPage = "https://software.sil.org/gentium/download/";
|
||||||
|
maintainers = with lib.maintainers; [
|
||||||
|
raskin
|
||||||
|
rycee
|
||||||
|
];
|
||||||
|
license = lib.licenses.ofl;
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
};
|
||||||
|
})
|
|
@ -4,26 +4,26 @@
|
||||||
fetchzip,
|
fetchzip,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
pname = "gentium";
|
pname = "gentium";
|
||||||
version = "6.200";
|
version = "7.000";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip";
|
url = "http://software.sil.org/downloads/r/gentium/Gentium-${finalAttrs.version}.zip";
|
||||||
hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg=";
|
hash = "sha256-RBBecFdi/yyFfBk1CcQebOuAdKNUczpwOP52zVtbc2o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||||
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version}
|
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
|
||||||
cp -r documentation $out/share/doc/${pname}-${version}
|
cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://software.sil.org/gentium/";
|
homepage = "https://software.sil.org/gentium/";
|
||||||
description = "High-quality typeface family for Latin, Cyrillic, and Greek";
|
description = "High-quality typeface family for Latin, Cyrillic, and Greek";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
@ -35,18 +35,19 @@ stdenvNoCC.mkDerivation rec {
|
||||||
The design is intended to be highly readable, reasonably compact, and
|
The design is intended to be highly readable, reasonably compact, and
|
||||||
visually attractive. The additional ‘extended’ Latin letters are designed
|
visually attractive. The additional ‘extended’ Latin letters are designed
|
||||||
to naturally harmonize with the traditional 26 ones. Diacritics are
|
to naturally harmonize with the traditional 26 ones. Diacritics are
|
||||||
treated with careful thought and attention to their use. Gentium Plus also
|
treated with careful thought and attention to their use. Gentium also
|
||||||
supports both polytonic and monotonic Greek.
|
supports both polytonic and monotonic Greek.
|
||||||
|
|
||||||
This package contains the regular and italic styles for the Gentium Plus
|
This package contains the regular and italic styles for the Gentium font
|
||||||
font family, along with documentation.
|
family, along with documentation.
|
||||||
'';
|
'';
|
||||||
downloadPage = "https://software.sil.org/gentium/download/";
|
downloadPage = "https://software.sil.org/gentium/download/";
|
||||||
maintainers = with maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
|
b-fein
|
||||||
raskin
|
raskin
|
||||||
rycee
|
rycee
|
||||||
];
|
];
|
||||||
license = licenses.ofl;
|
license = lib.licenses.ofl;
|
||||||
platforms = platforms.all;
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
buildNimPackage,
|
buildNimPackage,
|
||||||
fetchFromSourcehut,
|
fetchFromSourcehut,
|
||||||
gentium,
|
gentium-plus,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ buildNimPackage (finalAttrs: {
|
||||||
|
|
||||||
lockFile = ./lock.json;
|
lockFile = ./lock.json;
|
||||||
|
|
||||||
HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
|
HOTTEXT_FONT_PATH = "${gentium-plus}/share/fonts/truetype/GentiumPlus-Regular.ttf";
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
categories = [ "Utility" ];
|
categories = [ "Utility" ];
|
||||||
|
|
|
@ -9,17 +9,17 @@
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "mini-calc";
|
pname = "mini-calc";
|
||||||
version = "3.4.2";
|
version = "4.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vanilla-extracts";
|
owner = "vanilla-extracts";
|
||||||
repo = "calc";
|
repo = "calc";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-iLKW0ibsHZyAMYvux+CrOeJZCVMPE1HtWi0VBg96hr0=";
|
hash = "sha256-601BmecY+jbiD39buN68MeJKd5wguH0hahHquHadsL4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-DMfk0F2HSFGoGM1+JCeDlPMOYBjRumc8KXzt0xsSbh0=";
|
cargoHash = "sha256-9Ug6lyDvacj47FnLzJo4fwpXeMYxgSlMB7+2fIv5oxo=";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "nom";
|
pname = "nom";
|
||||||
version = "2.8.1";
|
version = "2.8.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "guyfedwards";
|
owner = "guyfedwards";
|
||||||
repo = "nom";
|
repo = "nom";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-PqoTpy+Pz5OS+7pzzdxNKeqIZRipOvHKMs9o67XzdqY=";
|
hash = "sha256-SkmY3eFEAC4EJtFpe6FwRmECIZJa/Oyb1yov75ySSH0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
|
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
|
||||||
|
|
5
pkgs/by-name/ru/rucio/package.nix
Normal file
5
pkgs/by-name/ru/rucio/package.nix
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{ python3Packages }:
|
||||||
|
|
||||||
|
with python3Packages;
|
||||||
|
|
||||||
|
toPythonApplication rucio
|
|
@ -20,7 +20,7 @@
|
||||||
libiconv,
|
libiconv,
|
||||||
# FONTCONFIG_FILE
|
# FONTCONFIG_FILE
|
||||||
makeFontsConf,
|
makeFontsConf,
|
||||||
gentium,
|
gentium-plus,
|
||||||
|
|
||||||
# passthru.tests
|
# passthru.tests
|
||||||
runCommand,
|
runCommand,
|
||||||
|
@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
FONTCONFIG_FILE = makeFontsConf {
|
FONTCONFIG_FILE = makeFontsConf {
|
||||||
fontDirectories = [
|
fontDirectories = [
|
||||||
gentium
|
gentium-plus
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
php.buildComposerProject2 (finalAttrs: {
|
php.buildComposerProject2 (finalAttrs: {
|
||||||
pname = "grumphp";
|
pname = "grumphp";
|
||||||
version = "2.12.0";
|
version = "2.13.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "phpro";
|
owner = "phpro";
|
||||||
repo = "grumphp";
|
repo = "grumphp";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-uA+s3ZOZIlgO2yD5jsjJUKPy3u66K/8kazDL3TUVyF8=";
|
hash = "sha256-tPMmvauFQooXYQvS5BCZN/pJzywXeiOqqmnwy64jBaA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-F+9/Avu+36pN0U9meUJppo4YqyCKEblQx2rCJ7uD8PU=";
|
vendorHash = "sha256-TRK/xDrVvjJOWOh8JwKvffEV3kyR2VpveKbFn6rjGkI=";
|
||||||
|
|
||||||
doInstallCheck = true;
|
doInstallCheck = true;
|
||||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
|
|
|
@ -13,12 +13,12 @@
|
||||||
}:
|
}:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "gfal2-python";
|
pname = "gfal2-python";
|
||||||
version = "1.12.2";
|
version = "1.13.0";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cern-fts";
|
owner = "cern-fts";
|
||||||
repo = "gfal2-python";
|
repo = "gfal2-python";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-Xk+gLTrqfWb0kGB6QhnM62zAHVFb8rRAqCIBxn0V824=";
|
hash = "sha256-TF8EwT1UEtB9lhfq8Jkn9rrSkSxMSLzuAywfB23K1kE=";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
|
@ -44,8 +44,5 @@ buildPythonPackage rec {
|
||||||
homepage = "https://github.com/cern-fts/gfal2-python";
|
homepage = "https://github.com/cern-fts/gfal2-python";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ ShamrockLee ];
|
maintainers = with maintainers; [ ShamrockLee ];
|
||||||
# It currently fails to build against Python 3.12 or later,
|
|
||||||
# complaining CMake faililng to find Python include path, library path and site package path.
|
|
||||||
broken = pythonAtLeast "3.12";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
68
pkgs/development/python-modules/oic/default.nix
Normal file
68
pkgs/development/python-modules/oic/default.nix
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
buildPythonPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
|
||||||
|
# build-system
|
||||||
|
setuptools,
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
requests,
|
||||||
|
pycryptodomex,
|
||||||
|
pydantic-settings,
|
||||||
|
pyjwkest,
|
||||||
|
mako,
|
||||||
|
cryptography,
|
||||||
|
defusedxml,
|
||||||
|
|
||||||
|
# tests
|
||||||
|
pytestCheckHook,
|
||||||
|
freezegun,
|
||||||
|
responses,
|
||||||
|
testfixtures,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "oic";
|
||||||
|
version = "1.7.0";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "CZ-NIC";
|
||||||
|
repo = "pyoidc";
|
||||||
|
tag = version;
|
||||||
|
hash = "sha256-7qEK1HWLEGCKu+gDAfbyT1a+sM9fVOfjtkqZ33GWv6U=";
|
||||||
|
};
|
||||||
|
|
||||||
|
build-system = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
requests
|
||||||
|
pycryptodomex
|
||||||
|
pydantic-settings
|
||||||
|
pyjwkest
|
||||||
|
mako
|
||||||
|
cryptography
|
||||||
|
defusedxml
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
freezegun
|
||||||
|
responses
|
||||||
|
testfixtures
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "oic" ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "OpenID Connect implementation in Python";
|
||||||
|
homepage = "https://github.com/CZ-NIC/pyoidc";
|
||||||
|
changelog = "https://github.com/CZ-NIC/pyoidc/releases/tag/${version}";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
maintainers = with lib.maintainers; [ veprbl ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -15,12 +15,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "osprofiler";
|
pname = "osprofiler";
|
||||||
version = "4.2.0";
|
version = "4.3.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-bdHEviZFqPJBIQVdpbtGFojcr8fmtNS6vA7xumaQJ4E=";
|
hash = "sha256-d6jaKyO7X5BIBUvVzMRdCshFdMqKiO8SC4+sbohk4kw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
114
pkgs/development/python-modules/rucio/default.nix
Normal file
114
pkgs/development/python-modules/rucio/default.nix
Normal file
|
@ -0,0 +1,114 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
buildPythonPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
|
||||||
|
# build-system
|
||||||
|
setuptools,
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
alembic,
|
||||||
|
argcomplete,
|
||||||
|
boto3,
|
||||||
|
dogpile-cache,
|
||||||
|
flask,
|
||||||
|
geoip2,
|
||||||
|
gfal2-python,
|
||||||
|
google-auth,
|
||||||
|
jsonschema,
|
||||||
|
oic,
|
||||||
|
paramiko,
|
||||||
|
prometheus-client,
|
||||||
|
pymemcache,
|
||||||
|
python-dateutil,
|
||||||
|
python-magic,
|
||||||
|
redis,
|
||||||
|
requests,
|
||||||
|
sqlalchemy,
|
||||||
|
statsd,
|
||||||
|
stomp-py,
|
||||||
|
tabulate,
|
||||||
|
urllib3,
|
||||||
|
|
||||||
|
# tests
|
||||||
|
pytestCheckHook,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "rucio";
|
||||||
|
version = "32.8.6";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "rucio";
|
||||||
|
repo = "rucio";
|
||||||
|
tag = version;
|
||||||
|
hash = "sha256-VQQ4gy9occism1WDrlcHnB7b7D5/G68wKct2PhD59FA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
pythonRelaxDeps = [
|
||||||
|
"alembic"
|
||||||
|
"argcomplete"
|
||||||
|
"boto3"
|
||||||
|
"dogpile.cache"
|
||||||
|
"flask"
|
||||||
|
"geoip2"
|
||||||
|
"google-auth"
|
||||||
|
"jsonschema"
|
||||||
|
"oic"
|
||||||
|
"paramiko"
|
||||||
|
"prometheus_client"
|
||||||
|
"python-dateutil"
|
||||||
|
"redis"
|
||||||
|
"requests"
|
||||||
|
"sqlalchemy"
|
||||||
|
"stomp.py"
|
||||||
|
"urllib3"
|
||||||
|
];
|
||||||
|
|
||||||
|
build-system = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
alembic
|
||||||
|
argcomplete
|
||||||
|
boto3
|
||||||
|
dogpile-cache
|
||||||
|
flask
|
||||||
|
geoip2
|
||||||
|
gfal2-python # needed for rucio download
|
||||||
|
google-auth
|
||||||
|
jsonschema
|
||||||
|
oic
|
||||||
|
paramiko
|
||||||
|
prometheus-client
|
||||||
|
pymemcache
|
||||||
|
python-dateutil
|
||||||
|
python-magic
|
||||||
|
redis
|
||||||
|
requests
|
||||||
|
sqlalchemy
|
||||||
|
statsd
|
||||||
|
stomp-py
|
||||||
|
tabulate
|
||||||
|
urllib3
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = false; # needs a rucio.cfg
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "rucio" ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Tool for Scientific Data Management";
|
||||||
|
homepage = "http://rucio.cern.ch/";
|
||||||
|
changelog = "https://github.com/rucio/rucio/releases/tag/${version}";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
maintainers = with lib.maintainers; [ veprbl ];
|
||||||
|
};
|
||||||
|
}
|
54
pkgs/development/python-modules/stomp-py/default.nix
Normal file
54
pkgs/development/python-modules/stomp-py/default.nix
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
buildPythonPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
|
||||||
|
# build-system
|
||||||
|
poetry-core,
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
docopt,
|
||||||
|
websocket-client,
|
||||||
|
|
||||||
|
# tests
|
||||||
|
pytestCheckHook,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "stomp-py";
|
||||||
|
version = "8.2.0";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jasonrbriggs";
|
||||||
|
repo = "stomp.py";
|
||||||
|
tag = "v${version}";
|
||||||
|
hash = "sha256-UkNmE0+G9d3k1OhkNl98Jy5sP6MAywynzBmBtK9mZ90=";
|
||||||
|
};
|
||||||
|
|
||||||
|
build-system = [
|
||||||
|
poetry-core
|
||||||
|
];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
docopt
|
||||||
|
websocket-client
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = false; # needs external services setup
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "stomp" ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Client library for accessing messaging servers (such as ActiveMQ or RabbitMQ) using the STOMP protocol";
|
||||||
|
homepage = "https://github.com/jasonrbriggs/stomp.py";
|
||||||
|
changelog = "https://github.com/jasonrbriggs/stomp.py/releases/tag/${version}";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
maintainers = with lib.maintainers; [ veprbl ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1769,6 +1769,7 @@ mapAliases {
|
||||||
snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
|
snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
|
||||||
snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
|
snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
|
||||||
soldat-unstable = opensoldat; # Added 2022-07-02
|
soldat-unstable = opensoldat; # Added 2022-07-02
|
||||||
|
soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
|
||||||
soundOfSorting = sound-of-sorting; # Added 2023-07-07
|
soundOfSorting = sound-of-sorting; # Added 2023-07-07
|
||||||
SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
|
SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
|
||||||
SPAdes = spades; # Added 2024-06-12
|
SPAdes = spades; # Added 2024-06-12
|
||||||
|
|
|
@ -4344,6 +4344,12 @@ with pkgs;
|
||||||
pythonPackages = python3Packages;
|
pythonPackages = python3Packages;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
rucio = callPackage ../by-name/ru/rucio/package.nix {
|
||||||
|
# Pinned to python 3.12 while python313Packages.future does not evaluate and
|
||||||
|
# until https://github.com/CZ-NIC/pyoidc/issues/649 is resolved
|
||||||
|
python3Packages = python312Packages;
|
||||||
|
};
|
||||||
|
|
||||||
rubocop = rubyPackages.rubocop;
|
rubocop = rubyPackages.rubocop;
|
||||||
|
|
||||||
ruby-lsp = rubyPackages.ruby-lsp;
|
ruby-lsp = rubyPackages.ruby-lsp;
|
||||||
|
@ -13985,8 +13991,6 @@ with pkgs;
|
||||||
|
|
||||||
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
|
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
|
||||||
|
|
||||||
soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { };
|
|
||||||
|
|
||||||
spek = callPackage ../applications/audio/spek {
|
spek = callPackage ../applications/audio/spek {
|
||||||
autoreconfHook = buildPackages.autoreconfHook269;
|
autoreconfHook = buildPackages.autoreconfHook269;
|
||||||
};
|
};
|
||||||
|
|
|
@ -10408,6 +10408,8 @@ self: super: with self; {
|
||||||
|
|
||||||
ohme = callPackage ../development/python-modules/ohme { };
|
ohme = callPackage ../development/python-modules/ohme { };
|
||||||
|
|
||||||
|
oic = callPackage ../development/python-modules/oic { };
|
||||||
|
|
||||||
okonomiyaki = callPackage ../development/python-modules/okonomiyaki { };
|
okonomiyaki = callPackage ../development/python-modules/okonomiyaki { };
|
||||||
|
|
||||||
okta = callPackage ../development/python-modules/okta { };
|
okta = callPackage ../development/python-modules/okta { };
|
||||||
|
@ -15576,6 +15578,8 @@ self: super: with self; {
|
||||||
|
|
||||||
rubymarshal = callPackage ../development/python-modules/rubymarshal { };
|
rubymarshal = callPackage ../development/python-modules/rubymarshal { };
|
||||||
|
|
||||||
|
rucio = callPackage ../development/python-modules/rucio { };
|
||||||
|
|
||||||
ruff = callPackage ../development/python-modules/ruff { inherit (pkgs) ruff; };
|
ruff = callPackage ../development/python-modules/ruff { inherit (pkgs) ruff; };
|
||||||
|
|
||||||
ruff-api = callPackage ../development/python-modules/ruff-api { };
|
ruff-api = callPackage ../development/python-modules/ruff-api { };
|
||||||
|
@ -16946,6 +16950,8 @@ self: super: with self; {
|
||||||
|
|
||||||
stm32loader = callPackage ../development/python-modules/stm32loader { };
|
stm32loader = callPackage ../development/python-modules/stm32loader { };
|
||||||
|
|
||||||
|
stomp-py = callPackage ../development/python-modules/stomp-py { };
|
||||||
|
|
||||||
stone = callPackage ../development/python-modules/stone { };
|
stone = callPackage ../development/python-modules/stone { };
|
||||||
|
|
||||||
stookalert = callPackage ../development/python-modules/stookalert { };
|
stookalert = callPackage ../development/python-modules/stookalert { };
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue