forked from mirrors/nixpkgs
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/libraries/libunwind/default.nix
This commit is contained in:
Alyssa Ross
commit
0a95fd24f0
|
|
@ -44,6 +44,7 @@ let
|
|||
++ [ (sec_list_fa "id" nix_def "template") ]
|
||||
++ [ (sec_list_fa "domain" nix_def "zone") ]
|
||||
++ [ (sec_plain nix_def "include") ]
|
||||
++ [ (sec_plain nix_def "clear") ]
|
||||
);
|
||||
|
||||
# A plain section contains directly attributes (we don't really check that ATM).
|
||||
|
|
|
|||
|
|
@ -185,6 +185,14 @@ let
|
|||
monA.succeed(
|
||||
"ceph osd pool create multi-node-test 32 32",
|
||||
"ceph osd pool ls | grep 'multi-node-test'",
|
||||
|
||||
# We need to enable an application on the pool, otherwise it will
|
||||
# stay unhealthy in state POOL_APP_NOT_ENABLED.
|
||||
# Creating a CephFS would do this automatically, but we haven't done that here.
|
||||
# See: https://docs.ceph.com/en/reef/rados/operations/pools/#associating-a-pool-with-an-application
|
||||
# We use the custom application name "nixos-test" for this.
|
||||
"ceph osd pool application enable multi-node-test nixos-test",
|
||||
|
||||
"ceph osd pool rename multi-node-test multi-node-other-test",
|
||||
"ceph osd pool ls | grep 'multi-node-other-test'",
|
||||
)
|
||||
|
|
|
|||
|
|
@ -145,6 +145,14 @@ let
|
|||
monA.succeed(
|
||||
"ceph osd pool create single-node-test 32 32",
|
||||
"ceph osd pool ls | grep 'single-node-test'",
|
||||
|
||||
# We need to enable an application on the pool, otherwise it will
|
||||
# stay unhealthy in state POOL_APP_NOT_ENABLED.
|
||||
# Creating a CephFS would do this automatically, but we haven't done that here.
|
||||
# See: https://docs.ceph.com/en/reef/rados/operations/pools/#associating-a-pool-with-an-application
|
||||
# We use the custom application name "nixos-test" for this.
|
||||
"ceph osd pool application enable single-node-test nixos-test",
|
||||
|
||||
"ceph osd pool rename single-node-test single-node-other-test",
|
||||
"ceph osd pool ls | grep 'single-node-other-test'",
|
||||
)
|
||||
|
|
|
|||
|
|
@ -145,6 +145,14 @@ let
|
|||
monA.succeed(
|
||||
"ceph osd pool create single-node-test 32 32",
|
||||
"ceph osd pool ls | grep 'single-node-test'",
|
||||
|
||||
# We need to enable an application on the pool, otherwise it will
|
||||
# stay unhealthy in state POOL_APP_NOT_ENABLED.
|
||||
# Creating a CephFS would do this automatically, but we haven't done that here.
|
||||
# See: https://docs.ceph.com/en/reef/rados/operations/pools/#associating-a-pool-with-an-application
|
||||
# We use the custom application name "nixos-test" for this.
|
||||
"ceph osd pool application enable single-node-test nixos-test",
|
||||
|
||||
"ceph osd pool rename single-node-test single-node-other-test",
|
||||
"ceph osd pool ls | grep 'single-node-other-test'",
|
||||
)
|
||||
|
|
@ -182,19 +190,16 @@ let
|
|||
monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
|
||||
monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
|
||||
|
||||
# This test has been commented out due to the upstream issue with pyo3
|
||||
# that has broken this dashboard
|
||||
# Reference: https://www.spinics.net/lists/ceph-users/msg77812.html
|
||||
# Enable the dashboard and recheck health
|
||||
# monA.succeed(
|
||||
# "ceph mgr module enable dashboard",
|
||||
# "ceph config set mgr mgr/dashboard/ssl false",
|
||||
# # default is 8080 but it's better to be explicit
|
||||
# "ceph config set mgr mgr/dashboard/server_port 8080",
|
||||
# )
|
||||
# monA.wait_for_open_port(8080)
|
||||
# monA.wait_until_succeeds("curl -q --fail http://localhost:8080")
|
||||
# monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
|
||||
monA.succeed(
|
||||
"ceph mgr module enable dashboard",
|
||||
"ceph config set mgr mgr/dashboard/ssl false",
|
||||
# default is 8080 but it's better to be explicit
|
||||
"ceph config set mgr mgr/dashboard/server_port 8080",
|
||||
)
|
||||
monA.wait_for_open_port(8080)
|
||||
monA.wait_until_succeeds("curl -q --fail http://localhost:8080")
|
||||
monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
|
||||
'';
|
||||
in {
|
||||
name = "basic-single-node-ceph-cluster";
|
||||
|
|
|
|||
|
|
@ -5,23 +5,25 @@
|
|||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "ledfx";
|
||||
version = "2.0.86";
|
||||
version = "2.0.89";
|
||||
pyproject= true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-miOGMsrvK3A3SYnd+i/lqB+9GOHtO4F3RW8NkxDgFqU=";
|
||||
hash = "sha256-PBOj6u0TukT6wRKMQML4+XNQQZvsGyRzXBk9YsISst4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \
|
||||
--replace "sentry-sdk==1.38.0" "sentry-sdk" \
|
||||
--replace "~=" ">="
|
||||
'';
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# not packaged
|
||||
"rpi-ws281x"
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
cython
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -29,8 +31,8 @@ python3.pkgs.buildPythonPackage rec {
|
|||
aiohttp-cors
|
||||
aubio
|
||||
certifi
|
||||
cython
|
||||
flux-led
|
||||
python-dotenv
|
||||
icmplib
|
||||
mss
|
||||
multidict
|
||||
|
|
@ -52,6 +54,7 @@ python3.pkgs.buildPythonPackage rec {
|
|||
sentry-sdk
|
||||
setuptools
|
||||
sounddevice
|
||||
stupidartnet
|
||||
uvloop
|
||||
voluptuous
|
||||
zeroconf
|
||||
|
|
|
|||
|
|
@ -13,11 +13,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SunVox";
|
||||
version = "2.1c";
|
||||
version = "2.1.1c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
|
||||
sha256 = "sha256-yPVcbtlAVbO9uMsFlfZ51T408hA1VPJAI+R+Jdjcyjw=";
|
||||
urls = [
|
||||
"https://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"
|
||||
# Upstream removes downloads of older versions, please save bumped versions to archive.org
|
||||
"https://web.archive.org/web/20231204012052/https://www.warmplace.ru/soft/sunvox/sunvox-2.1.1c.zip"
|
||||
];
|
||||
sha256 = "sha256-LfBQ/f2X75bcqLp39c2tdaSlDm+E73GUvB68XFqiicw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
3041
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
3041
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,15 +11,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot-sdk";
|
||||
# NOTE: temporary tag with fix for building with nix
|
||||
# `-nix` suffix should be removed in the next release
|
||||
rev = "polkadot-v${version}-nix";
|
||||
hash = "sha256-pjny1aw9l2m9t8VyUB+EaQaPtYPypC6WqOwAco1kxNU=";
|
||||
rev = "polkadot-v${version}";
|
||||
hash = "sha256-myQ1TIkytEGdaR3KZOMXK7JK83/Qx46UVhp2GFG7LiA=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
|
|
@ -43,9 +41,11 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ark-secret-scalar-0.0.2" = "sha256-ytwKeUkiXIcwJLo9wpWSIjL4LBZJDbeED5Yqxso9l74=";
|
||||
"common-0.1.0" = "sha256-9vTJNKsL6gK8MM8dUKrShEvL9Ac9YQg1q8iVE9+deak=";
|
||||
"fflonk-0.1.0" = "sha256-PC7eJEOo/RN9Gk27CcTIyGMA9XZeFAJkO2FK02JVzN0=";
|
||||
"amcl-0.3.0" = "sha256-EWXQddOskhc07ufRDihn91YRk1fdrLw20N/IoppiWyo=";
|
||||
"ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc=";
|
||||
"common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o=";
|
||||
"ethabi-decode-1.4.0" = "sha256-4sDCsr7OPaaDTs2phA5fdGKqSReYf2HD2IUUh7B43GU=";
|
||||
"fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
|
||||
"simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w=";
|
||||
"sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
|
||||
"sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@
|
|||
|
||||
let
|
||||
pname = "typora";
|
||||
version = "1.7.6";
|
||||
version = "1.8.6";
|
||||
src = fetchurl {
|
||||
url = "https://download.typora.io/linux/typora_${version}_amd64.deb";
|
||||
hash = "sha256-o91elUN8sFlzVfIQj29amsiUdSBjZc51tLCO+Qfar6c=";
|
||||
hash = "sha256-5hA9wEP3Hf3RxYC6KKe6JCiMEYKIHk9YhcA9tnSvirc=";
|
||||
};
|
||||
|
||||
typoraBase = stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, ffmpeg
|
||||
, discord-rpc
|
||||
, libedit
|
||||
, libelf
|
||||
, libepoxy
|
||||
, libsForQt5
|
||||
, libzip
|
||||
, lua5_4
|
||||
, lua
|
||||
, minizip
|
||||
, pkg-config
|
||||
, libsForQt5
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
, enableDiscordRpc ? false
|
||||
}:
|
||||
|
||||
let
|
||||
lua = lua5_4;
|
||||
inherit (libsForQt5)
|
||||
qtbase
|
||||
qtmultimedia
|
||||
|
|
@ -25,27 +26,25 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mgba";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgba-emu";
|
||||
repo = "mgba";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-+AwIYhnqp984Banwb7zmB5yzenExfLLU1oGJSxeTl/M=";
|
||||
hash = "sha256-wSt3kyjRxKBnDOVY10jq4cpv7uIaBUIcsZr6aU7XnMA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" "lib" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
SDL2
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
ffmpeg
|
||||
|
|
@ -58,9 +57,22 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
qtbase
|
||||
qtmultimedia
|
||||
qttools
|
||||
]
|
||||
++ lib.optionals enableDiscordRpc [ discord-rpc ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
strictDeps = true;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://mgba.io";
|
||||
description = "A modern GBA emulator with a focus on accuracy";
|
||||
longDescription = ''
|
||||
|
|
@ -77,10 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runners, and a modern feature set for emulators that older emulators may
|
||||
not support.
|
||||
'';
|
||||
changelog = "https://github.com/mgba-emu/mgba/blob/${finalAttrs.version}/CHANGES";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ MP2E AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES";
|
||||
license = with lib.licenses; [ mpl20 ];
|
||||
mainProgram = "mgba";
|
||||
maintainers = with lib.maintainers; [ MP2E AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = enableDiscordRpc; # Some obscure `ld` error
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gitUpdater
|
||||
, cmake
|
||||
, SDL2
|
||||
|
|
@ -17,6 +18,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-Pe+TSu9FBUhxtACq+6jMbrUxiwKLOJgQbEcmUrcrjMs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when version > 1.2
|
||||
(fetchpatch {
|
||||
name = "0001-nuked-md-Fix-missing-string-h-include.patch";
|
||||
url = "https://github.com/nukeykt/Nuked-MD/commit/b875cd79104217af581131b22f4111409273617a.patch";
|
||||
hash = "sha256-Mx3jmrlBbxdz3ZBr4XhmBk1S04xB0uaxzPXpXSlipV4=";
|
||||
})
|
||||
];
|
||||
|
||||
# Interesting detail about our SDL2 packaging:
|
||||
# Because we build it with the configure script instead of CMake, we ship sdl2-config.cmake instead of SDL2Config.cmake
|
||||
# The former doesn't set SDL2_FOUND while the latter does (like CMake config scripts should), which causes this issue:
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "saga";
|
||||
version = "9.3.0";
|
||||
version = "9.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
|
||||
sha256 = "sha256-zBdp4Eyzpc21zhA2+UD6LrXNH+sSfb0avOscxCbGxjE=";
|
||||
sha256 = "sha256-QrpEbb8zN003Afnu9UZUanWE0lIiy95POSWd1jB8EtA=";
|
||||
};
|
||||
|
||||
sourceRoot = "saga-${version}/saga-gis";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "printrun";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kliment";
|
||||
repo = "Printrun";
|
||||
rev = "printrun-${version}";
|
||||
hash = "sha256-ijJc0CVPiYW5VjTqhY1kO+Fy3dfuPoMn7KRhvcsdAZw=";
|
||||
rev = "refs/tags/printrun-${version}";
|
||||
hash = "sha256-GmTA/C45MuptN/Y0KjpFjaLV3sWoM4rHz8AMfV9sf4U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtscript
|
||||
|
|
@ -14,15 +14,17 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vym";
|
||||
version = "2.8.42";
|
||||
version = "2.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "insilmaril";
|
||||
repo = "vym";
|
||||
rev = "89f50bcba953c410caf459b0a4bfbd09018010b7"; # not tagged yet (why??)
|
||||
hash = "sha256-xMXvc8gt3nfKWbU+WoS24wCUTGDQRhG0Q9m7yDhY5/w=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./000-fix-zip-paths.diff;
|
||||
|
|
@ -43,11 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
qtsvg
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ unzip zip ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://www.insilmaril.de/vym/";
|
||||
description = "A mind-mapping software";
|
||||
longDescription = ''
|
||||
|
|
@ -61,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
drawn by hand or any drawing software vym offers much more features to
|
||||
work with such maps.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -236,6 +236,18 @@ let
|
|||
commit = "b9bef8e9555645fc91fab705bec697214a39dbc1";
|
||||
hash = "sha256-CJ1v/qc8+nwaHQR9xsx08EEcuVRbyBfCZCm/G7hRY+4=";
|
||||
})
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "121") [
|
||||
# M121 is the first version to require the new rust toolchain.
|
||||
# But we don't have that ready yet.
|
||||
# So we have to revert the singular commit that requires rust toolchain.
|
||||
# This works, because the code in question, the QR code generator, is present in
|
||||
# two variants: c++ and rust. This workaround will not last.
|
||||
# The c++ variant in question is deemed to be removed in a month (give or take).
|
||||
(githubPatch {
|
||||
revert = true;
|
||||
commit = "bcf739b95713071687ff25010683248de0092f6a";
|
||||
hash = "sha256-1ZPe45cc2bjnErcF3prbLMlYpU7kpuwDVcjewINQr+Q=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-20OgLWrtw2QwyfoehoU7WjmH3IoOG4k3dAya5U5c7Qc=";
|
||||
hash_darwin = "sha256-IDPdjq3FpLy6Y9xkR15mzbIal8wjeQzzWtWuZ4uKmzA=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-7aI141Ndtun3HglNKiW4+TTVgOVASnz98Rn1trgUgpo=";
|
||||
hash_linux = "sha256-gJ6xXhW87URDvpFP88KgLKmwoFDlqMN1Vj6L+bDdbSc=";
|
||||
version = "120.0.6099.109";
|
||||
"sha256-3Mol45MrvrSqrpkKy2Trt0JFNfV4ekXTxEveUUGmJm4=";
|
||||
hash_linux = "sha256-O8U4pZ76/N7q9bV7d0A+wlIqqaoz6WyfZQO4cIV2CIM=";
|
||||
version = "121.0.6167.85";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=";
|
||||
rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b";
|
||||
hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s=";
|
||||
rev = "7367b0df0a0aa25440303998d54045bda73935a5";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-10-23";
|
||||
version = "2023-11-28";
|
||||
};
|
||||
};
|
||||
hash = "sha256-HFQ7QAL4hcux3jmMmLYFNym3sfWR1o1hWV75bokID4I=";
|
||||
hash_deb_amd64 = "sha256-dFllEHRYH3yAPg3uaaCzdpiZxSLENEwmtIb/gg53/ZU=";
|
||||
version = "120.0.6099.224";
|
||||
hash = "sha256-2TMTLCqoCxdy9PDlZIUa/5oXjmim1T2/LJu+3/Kf4fQ=";
|
||||
hash_deb_amd64 = "sha256-9vPQAiZPw60oILm0He4Iz9lOc+WvtHCBE9CHA1ejc7s=";
|
||||
version = "121.0.6167.85";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ in stdenv.mkDerivation {
|
|||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do
|
||||
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary}}; do
|
||||
patchelf --set-rpath $rpath $elf
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
|
||||
done
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ let
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.7";
|
||||
version = "13.0.9";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
|
|
@ -102,7 +102,7 @@ let
|
|||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-8x0Qa+NasMq1JdrVnCWlCyPb+5UpJXK1VLFoY9lx+8Q=";
|
||||
hash = "sha256-TAtBlSkfpqsROq3bV9kwDYIJQAXSVkwxQwj3wIYEI7k=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
|
|||
allowSubstitutes = false;
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
name = "mullvadbrowser";
|
||||
name = "mullvad-browser";
|
||||
exec = "mullvad-browser %U";
|
||||
icon = "mullvad-browser";
|
||||
desktopName = "Mullvad Browser";
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.8";
|
||||
version = "13.0.9";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
|
|
@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-eD+c4ACgWajmfMiqqk5HC30uJiqfNqvASepVoO7ox2w=";
|
||||
hash = "sha256-qcB3DLVt2J4WNJLunDSnZdyflMY9/NIsGrj+TkQeJEg=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
|
@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-ZQ0tSPyfzBWy27lX5+zI3Nuqqz5ZUv1T6lzapvYHc7A=";
|
||||
hash = "sha256-aq2WffQ3ZUL0vopbDU5n9bWb8MC7rHoaz54kz2oaXz8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.160.0";
|
||||
version = "0.161.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helmfile";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sPHEYhKiKzB5MYylWeHKpVjjXbDsWbg99TKqT/d3uJ0=";
|
||||
sha256 = "sha256-SoXpUAISYgB0qrw0urnVjPFfBc4jtkfDl41MmzfRG/g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LkmPytmXrense/M0erBkxeQ7XXGlHDLY1yedsOxk4+E=";
|
||||
vendorHash = "sha256-piGbC9cljBjJ0X2kzNqNnpFmcjnu6DdKizSRGrw/+2c=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@ rec {
|
|||
};
|
||||
|
||||
kops_1_28 = mkKops rec {
|
||||
version = "1.28.2";
|
||||
sha256 = "sha256-l8budNU+sXZY/hA6jluM+s5pA43j0stQM5vmkwDPuio=";
|
||||
version = "1.28.3";
|
||||
sha256 = "sha256-pkHTVAssNDjMHpdRxqPCNwG2of8TKIzZN0uqk+hPZSA=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lXGDt9UWIk3T+Zp5sdAftStEnd3RmdevTjkvfuZtNf0=";
|
||||
sha256 = "sha256-2wyqCiP+hb5dLdaS322eo2yMSTjcQb+eBvr3HRnaTD0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0=";
|
||||
vendorHash = "sha256-cr3VVS+ASg3vmppvTYpaOLJNHDN0b+C9uSln7jeqTX4=";
|
||||
|
||||
# Disable tests since it requires network access and relies on the
|
||||
# presence of certain AWS infrastructure
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kyverno";
|
||||
version = "1.11.3";
|
||||
version = "1.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aFogX7cBf5SF1nSyQ/L8uY/xwvZxXHaWGHe3gWHGHQQ=";
|
||||
sha256 = "sha256-6Qrd7/h9G8KvzUxPNXUV/RnWImFrxm1FILeik8bWLnA=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-jZAylCLmEWpAflxrtrh1jhVuctVlUqfC5rxqcho2GcE=";
|
||||
vendorHash = "sha256-Vw8f2+b5UNc7DqCmu2cN2De1mrONe0M6F68H9SPrD3w=";
|
||||
|
||||
subPackages = [ "cmd/cli/kubectl-kyverno" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
|
|||
downloadPage = "https://github.com/ArmCord/ArmCord";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.osl3;
|
||||
maintainers = with maintainers; [ ludovicopiero wrmilling ];
|
||||
maintainers = with maintainers; [ wrmilling ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
mainProgram = "armcord";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "teamspeak5-client";
|
||||
version = "5.0.0-beta70";
|
||||
version = "5.0.0-beta77";
|
||||
|
||||
src = fetchurl {
|
||||
# check https://teamspeak.com/en/downloads/#ts5 for version and checksum
|
||||
url = "https://files.teamspeak-services.com/pre_releases/client/${version}/teamspeak-client.tar.gz";
|
||||
sha256 = "44f1a29b915c3930e7385ce32b13e363a7be04c1e341226d0693600818411c6e";
|
||||
sha256 = "6f3bf97b120d3c799cefc90c448e45836708a826d7caa07ad32b5c868eb9181b";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, codec2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, boost, codec2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "m17-cxx-demod";
|
||||
|
|
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull fix pending upstream inclusion for `gcc-13` support:
|
||||
# https://github.com/mobilinkd/m17-cxx-demod/pull/34
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/mobilinkd/m17-cxx-demod/commit/2e2aaf95eeac456a2e8795e4363518bb4d797ac0.patch";
|
||||
hash = "sha256-+XRzHStJ/7XI5JDoBeNwbifsTOw8il3GyFwlbw07wyk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ codec2 boost ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igv";
|
||||
version = "2.17.0";
|
||||
version = "2.17.1";
|
||||
src = fetchzip {
|
||||
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
|
||||
sha256 = "sha256-nOwaeVIvqfHrvykfTyOdnMN6+QpsvNN14jXBQx7THsE=";
|
||||
sha256 = "sha256-EXI1jVr8cJPYLLe81hzqLpP3IypHBZ0cb6z+WrDeFKQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stacks";
|
||||
version = "2.65";
|
||||
version = "2.66";
|
||||
src = fetchurl {
|
||||
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-/9a9PWKVq5yJzEUfOF03zR1Hp3AZw9MF8xICoriV4uo=";
|
||||
sha256 = "sha256-9pHmcLYMdn9xy3vhlOU42Io/4L61auoncfpZNRPUN/I=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ let
|
|||
});
|
||||
};
|
||||
|
||||
# matches src/sage/repl/ipython_kernel/install.py:kernel_spec
|
||||
jupyter-kernel-definition = {
|
||||
displayName = "SageMath ${sage-src.version}";
|
||||
argv = [
|
||||
|
|
@ -42,7 +43,7 @@ let
|
|||
"-f"
|
||||
"{connection_file}"
|
||||
];
|
||||
language = "sagemath";
|
||||
language = "sage";
|
||||
# just one 16x16 logo is available
|
||||
logo32 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png";
|
||||
logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py
|
||||
index 0070705f78..ac19818f1b 100644
|
||||
index 2deb533f7f..663ff2cd13 100644
|
||||
--- a/src/sage/graphs/generic_graph.py
|
||||
+++ b/src/sage/graphs/generic_graph.py
|
||||
@@ -6699,12 +6699,6 @@ class GenericGraph(GenericGraph_pyx):
|
||||
@@ -6953,12 +6953,6 @@ class GenericGraph(GenericGraph_pyx):
|
||||
sage: G = DiGraph(d6, format='dig6')
|
||||
sage: G.edge_connectivity()
|
||||
5
|
||||
- sage: G.edge_disjoint_spanning_trees(5) # long time
|
||||
- sage: G.edge_disjoint_spanning_trees(5) # long time # needs sage.numerical.mip
|
||||
- [Digraph on 28 vertices,
|
||||
- Digraph on 28 vertices,
|
||||
- Digraph on 28 vertices,
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
diff --git a/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py b/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py
|
||||
index aa153fd4cd..eebbe87aff 100644
|
||||
--- a/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py
|
||||
+++ b/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py
|
||||
@@ -134,11 +134,11 @@ Sage example in ./graphique.tex, line 1120::
|
||||
sage: t = srange(0, 5, 0.1); p = Graphics()
|
||||
sage: for k in srange(0, 10, 0.15):
|
||||
....: y = integrate.odeint(f, k, t)
|
||||
- ....: p += line(zip(t, flatten(y)))
|
||||
+ ....: p += line(zip(t, y.flatten()))
|
||||
sage: t = srange(0, -5, -0.1); q = Graphics()
|
||||
sage: for k in srange(0, 10, 0.15):
|
||||
....: y = integrate.odeint(f, k, t)
|
||||
- ....: q += line(zip(t, flatten(y)))
|
||||
+ ....: q += line(zip(t, y.flatten()))
|
||||
sage: y = var('y')
|
||||
sage: v = plot_vector_field((1, -cos(x*y)), (x,-5,5), (y,-2,11))
|
||||
sage: g = p + q + v; g.show()
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, sage-src
|
||||
, cython
|
||||
, cython_3
|
||||
, jinja2
|
||||
, pkgconfig # the python module, not the pkg-config alias
|
||||
}:
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
pname = "sage-setup";
|
||||
src = sage-src;
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
nativeBuildInputs = [ cython_3 ];
|
||||
buildInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ jinja2 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
# This file is responsible for fetching the sage source and adding necessary patches.
|
||||
|
|
@ -9,14 +10,23 @@
|
|||
# all get the same sources with the same patches applied.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.0";
|
||||
version = "10.2";
|
||||
pname = "sage-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagemath";
|
||||
repo = "sage";
|
||||
rev = version;
|
||||
sha256 = "sha256-zN/Lo/GBCjYGemuaYpgG3laufN8te3wPjXMQ+Me9zgY=";
|
||||
sha256 = "sha256-VXnPdJhtw5Y/anecrVpevJDCyBVfnjksyuuZslNipm4=";
|
||||
};
|
||||
|
||||
# contains essential files (e.g., setup.cfg) generated by the bootstrap script.
|
||||
# TODO: investigate https://github.com/sagemath/sage/pull/35950
|
||||
configure-src = fetchurl {
|
||||
# the hash below is the tagged commit's _parent_. it can also be found by looking for
|
||||
# the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version}
|
||||
url = "mirror://sageupstream/configure/configure-b2813506039143e6f0abe859ab67a343abf72c2e.tar.gz";
|
||||
sha256 = "sha256-a1v0XyoKI+zO6Sjm8DzEwItRHbIgRDbpj4UfwVH+/hw=";
|
||||
};
|
||||
|
||||
# Patches needed because of particularities of nix or the way this is packaged.
|
||||
|
|
@ -52,99 +62,6 @@ stdenv.mkDerivation rec {
|
|||
# should come from or be proposed to upstream. This list will probably never
|
||||
# be empty since dependencies update all the time.
|
||||
packageUpgradePatches = [
|
||||
# https://github.com/sagemath/sage/pull/35584, landed in 10.1.beta1
|
||||
(fetchpatch {
|
||||
name = "networkx-3.1-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/be0aab74fd7e399e146988ef27260d2837baebae.diff";
|
||||
sha256 = "sha256-xBGrylNaiF7CpfmX9/4lTioP2LSYKoRCkKlKSGZuv9U=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35612, landed in 10.1.beta1
|
||||
(fetchpatch {
|
||||
name = "linbox-1.7-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/35cbd2f2a2c4c355455d39b1424f05ea0aa4349b.diff";
|
||||
sha256 = "sha256-/TpvIQZUqmbUuz6wvp3ni9oRir5LBA2FKDJcmnHI1r4=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35619, landed in 10.1.beta1
|
||||
(fetchpatch {
|
||||
name = "maxima-5.46.0-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/4ddf9328e7598284d4bc03cd2ed890f0be6b6399.diff";
|
||||
sha256 = "sha256-f6YaZiLSj+E0LJMsMZHDt6vecWffSAuUHYVkegBEhno=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35635, landed in 10.1.beta1
|
||||
(fetchpatch {
|
||||
name = "sympy-1.12-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/1a73b3bbbfa0f4a297e05d49305070e1ed5ae598.diff";
|
||||
sha256 = "sha256-k8Oam+EiRcfXC7qCdLacCx+7vpUAw2K1wsjKcQbeGb4=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35826, landed in 10.1.beta5
|
||||
(fetchpatch {
|
||||
name = "numpy-1.25.0-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/ecfe06b8f1fe729b07e885f0de55244467e5c137.diff";
|
||||
sha256 = "sha256-G0xhl+LyNdDYPzRqSHK3fHaepcIzpuwmqRiussraDf0=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35826#issuecomment-1658569891
|
||||
./patches/numpy-1.25-deprecation.patch
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35842, landed in 10.1.beta5
|
||||
(fetchpatch {
|
||||
name = "scipy-1.11-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/90ece168c3c61508baa36659b0027b7dd8b43add.diff";
|
||||
sha256 = "sha256-Y5TmuJcUJR+veb2AuSVODGs+xkVV+pTM8fWTm4q+NDs=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35825, landed in 10.1.beta6
|
||||
(fetchpatch {
|
||||
name = "singular-4.3.2p2-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/1a1b49f814cdf4c4c8d0ac8930610f3fef6af5b0.diff";
|
||||
sha256 = "sha256-GqMgoi0tsP7zcCcPumhdsbvhPB6fgw1ufx6gHlc6iSc=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36006, landed in 10.2.beta2
|
||||
(fetchpatch {
|
||||
name = "gmp-6.3-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/5e841de46c3baa99cd1145b36ff9163e9340a55c.diff";
|
||||
sha256 = "sha256-fJPDryLtGBQz9qHDiCkBwjiW2lN6v7HiHgxY7CTeHcs=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36279, landed in 10.2.beta4
|
||||
(fetchpatch {
|
||||
name = "matplotlib-3.8-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/0fcf88935908440930c5f79202155aca4ad57518.diff";
|
||||
sha256 = "sha256-mvqAHaTCXsxPv901L8HSTnrfghfXYdq0wfLoP/cYQZI=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/35658, landed in 10.1.beta2
|
||||
(fetchpatch {
|
||||
name = "sphinx-7-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/cacd9a89b5c4fdcf84a8dd2b7d5bdc10cc78109a.diff";
|
||||
sha256 = "sha256-qJvliTJjR3XBc5pH6Q0jtm8c4bhtZcTcF3O04Ro1uaU=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36296, landed in 10.2.beta4
|
||||
(fetchpatch {
|
||||
name = "duplicate-args-region_plot.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/461727b453712550a2c5dc0ae11933523255aaed.diff";
|
||||
sha256 = "sha256-mC8084VQoUBk4hocALF+Y9Cwb38Zt360eldi/SSjna8=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36218, landed in 10.2.beta3
|
||||
(fetchpatch {
|
||||
name = "sageenv-disable-file-validation.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/31a764f4a9ec54d3ea970aa9514a088c4e603ebd.diff";
|
||||
sha256 = "sha256-NhYUTTmYlyjss3eS8HZXP8U11TElQY0cv6KW4wBOaJY=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36235, landed in 10.2.beta3
|
||||
(fetchpatch {
|
||||
name = "ecl-23.9.9.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/b6b50a80e9660c002d069019f5b8f04e9324a423.diff";
|
||||
sha256 = "sha256-nF+5oKad1VYms6Dxr1t9/V0XBkoMfhy0KCY/ZPddrm0=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
|
@ -158,11 +75,17 @@ stdenv.mkDerivation rec {
|
|||
sed -i \
|
||||
"s|var(\"SAGE_ROOT\".*|var(\"SAGE_ROOT\", \"$out\")|" \
|
||||
src/sage/env.py
|
||||
|
||||
# sage --docbuild unsets JUPYTER_PATH, which breaks our docbuilding
|
||||
# https://trac.sagemath.org/ticket/33650#comment:32
|
||||
sed -i "/export JUPYTER_PATH/d" src/bin/sage
|
||||
'';
|
||||
|
||||
buildPhase = "# do nothing";
|
||||
|
||||
installPhase = ''
|
||||
cp -r . "$out"
|
||||
tar xkzf ${configure-src} -C "$out"
|
||||
rm "$out/configure"
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
# for patchShebangs below
|
||||
python3
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
export SAGE_DOC_OVERRIDE="$PWD/share/doc/sage"
|
||||
export SAGE_DOC_SRC_OVERRIDE="$PWD/docsrc"
|
||||
|
|
@ -29,18 +24,6 @@ stdenv.mkDerivation rec {
|
|||
export HOME="$TMPDIR/sage_home"
|
||||
mkdir -p "$HOME"
|
||||
|
||||
# run bootstrap script to generate Sage spkg docs, because unfortunately some unrelated doc
|
||||
# pages link to them. it needs a few ugly (but self-contained) hacks for a standalone run.
|
||||
cp -r "${src}/build" "$HOME"
|
||||
chmod -R 755 "$HOME/build"
|
||||
sed -i "/assert/d" "$HOME/build/sage_bootstrap/env.py"
|
||||
sed -i "s|sage-bootstrap-python|python3|" "$HOME/build/bin/sage-package"
|
||||
patchShebangs "$HOME/build/bin/sage-package"
|
||||
pushd "$SAGE_DOC_SRC_OVERRIDE"
|
||||
sed -i "s|OUTPUT_DIR=\"src/doc/|OUTPUT_DIR=\"$SAGE_DOC_SRC_OVERRIDE/|" bootstrap
|
||||
PATH="$HOME/build/bin:$PATH" SAGE_ROOT="${src}" ./bootstrap
|
||||
popd
|
||||
|
||||
# adapted from src/doc/Makefile (doc-src target), which tries to call Sage from PATH
|
||||
mkdir -p $SAGE_DOC_SRC_OVERRIDE/en/reference/repl
|
||||
${sage-with-env}/bin/sage -advanced > $SAGE_DOC_SRC_OVERRIDE/en/reference/repl/options.txt
|
||||
|
|
@ -51,12 +34,10 @@ stdenv.mkDerivation rec {
|
|||
# jupyter-sphinx calls the sagemath jupyter kernel during docbuild
|
||||
export JUPYTER_PATH=${jupyter-kernel-specs}
|
||||
|
||||
# sage --docbuild unsets JUPYTER_PATH, so we call sage_docbuild directly
|
||||
# https://trac.sagemath.org/ticket/33650#comment:32
|
||||
${sage-with-env}/bin/sage --python3 -m sage_docbuild \
|
||||
${sage-with-env}/bin/sage --docbuild \
|
||||
--mathjax \
|
||||
--no-pdf-links \
|
||||
all html < /dev/null
|
||||
all html
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -80,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
# sagemath_doc_html tests assume sage tests are being run, so we
|
||||
# compromise: we run standard tests, but only on files containing
|
||||
# relevant tests. as of Sage 9.6, there are only 4 such files.
|
||||
grep -PRl "#.*optional.*sagemath_doc_html" ${src}/src/sage{,_docbuild} | \
|
||||
grep -PRl "#.*(optional|needs).*sagemath_doc_html" ${src}/src/sage{,_docbuild} | \
|
||||
xargs ${sage-with-env}/bin/sage -t --optional=sage,sagemath_doc_html
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
, cvxopt
|
||||
, cypari2
|
||||
, cysignals
|
||||
, cython
|
||||
, cython_3
|
||||
, fpylll
|
||||
, gmpy2
|
||||
, importlib-metadata
|
||||
|
|
@ -152,7 +152,7 @@ buildPythonPackage rec {
|
|||
cvxopt
|
||||
cypari2
|
||||
cysignals
|
||||
cython
|
||||
cython_3
|
||||
fpylll
|
||||
gmpy2
|
||||
importlib-metadata
|
||||
|
|
@ -202,29 +202,13 @@ buildPythonPackage rec {
|
|||
mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython"
|
||||
mkdir -p "var/lib/sage/installed"
|
||||
|
||||
cd build/pkgs/sagelib
|
||||
|
||||
# some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg
|
||||
# are generated by the bootstrap script using m4. these can fetch data from
|
||||
# build/pkgs, either directly or via sage-get-system-packages.
|
||||
sed -i '/sage_conf/d' src/setup.cfg.m4
|
||||
sed -i '/sage_conf/d' src/requirements.txt.m4
|
||||
|
||||
# version lower bounds are useful, but upper bounds are a hassle because
|
||||
# Sage tests already catch any relevant API breakage.
|
||||
# according to the discussion at https://trac.sagemath.org/ticket/33520,
|
||||
# upper bounds will be less noisy starting from Sage 9.6.
|
||||
sed -i 's/==0.5.1/>=0.5.1/' ../ptyprocess/install-requires.txt
|
||||
sed -i 's/, <[^, ]*//' ../*/install-requires.txt
|
||||
sed -i 's/, <[^, ]*//' build/pkgs/*/install-requires.txt
|
||||
|
||||
for infile in src/*.m4; do
|
||||
if [ -f "$infile" ]; then
|
||||
outfile="src/$(basename $infile .m4)"
|
||||
m4 "$infile" > "$outfile"
|
||||
fi
|
||||
done
|
||||
|
||||
cd src
|
||||
cd build/pkgs/sagelib/src
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nnpdf";
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NNPDF";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-J5l+ZO+5pfxKlpFuy4PEQynbqs1QIqMK6hhMFvmb/zs=";
|
||||
hash = "sha256-hGCA2K/fD6UZa9WD42IDmZV1oxNgjFaXkjOZKGgGSBg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ let
|
|||
cutter = callPackage ./cutter.nix { };
|
||||
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
|
||||
mpris = callPackage ./mpris.nix { };
|
||||
mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { };
|
||||
mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { };
|
||||
mpv-webm = callPackage ./mpv-webm.nix { };
|
||||
mpvacious = callPackage ./mpvacious.nix { };
|
||||
|
|
|
|||
42
pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix
Normal file
42
pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib, fetchFromGitHub, nodePackages, stdenvNoCC }:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mpv-cheatsheet";
|
||||
version = "0.30.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ento";
|
||||
repo = "mpv-cheatsheet";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MWK0CYto3zgn3fivmL43tvgZn6XrjPxKLp0lgTFdplM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodePackages.browserify
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
make dist/${finalAttrs.passthru.scriptName}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D dist/${finalAttrs.passthru.scriptName} $out/share/mpv/scripts/${finalAttrs.passthru.scriptName}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
passthru.scriptName = "cheatsheet.js";
|
||||
|
||||
meta = with lib; {
|
||||
description = "mpv script for looking up keyboard shortcuts";
|
||||
homepage = "https://github.com/ento/mpv-cheatsheet";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ambroisie ];
|
||||
};
|
||||
})
|
||||
145
pkgs/by-name/an/anyk/package.nix
Normal file
145
pkgs/by-name/an/anyk/package.nix
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, openjdk
|
||||
, writeScript
|
||||
, runCommandLocal
|
||||
, bash
|
||||
, unzip
|
||||
, makeWrapper
|
||||
, libredirect
|
||||
, xsettingsd
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, python3
|
||||
}:
|
||||
let
|
||||
# Downloads can be found here: https://nav.gov.hu/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava
|
||||
# There are no versioned download URLs but archive.org can be used to preserve them.
|
||||
# The original download URL is: https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava
|
||||
# You can put the URL here to create a fresh archive URL: https://web.archive.org/save
|
||||
abevjavaSrc = fetchzip {
|
||||
url = "https://web.archive.org/web/20231106112510if_/https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava";
|
||||
sha256 = "sha256-qt0mHv3HI6C8OltFjSR47+RLSnmB2Si5U8rXEvdN4/c=";
|
||||
extension = "zip";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
# ÁNYK uses some SOAP stuff that's not shipped with OpenJDK any more.
|
||||
# We don't really want to use openjdk8 because it's unusable on HiDPI
|
||||
# and people are more likely to have a modern OpenJDK installed.
|
||||
extraClasspath = [
|
||||
(fetchurl {
|
||||
url = "mirror://maven/org/glassfish/metro/webservices-rt/2.4.10/webservices-rt-2.4.10.jar";
|
||||
sha256 = "sha256-lHclIZn3HR2B2lMttmmQGIV67qJi5KhL5jT2WNUQpPI=";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
url = "mirror://maven/org/glassfish/metro/webservices-api/2.4.10/webservices-api-2.4.10.jar";
|
||||
sha256 = "sha256-1jiabjPkRnh+l/fmTt8aKE5hpeLreYOiLH9sVIcLUQE=";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
url = "mirror://maven/com/sun/activation/jakarta.activation/2.0.1/jakarta.activation-2.0.1.jar";
|
||||
sha256 = "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=";
|
||||
})
|
||||
|
||||
# Patch one of the classes so it works with the packages above by removing .internal. from the package names.
|
||||
(runCommandLocal "anyk-patch" {} ''
|
||||
mkdir $out
|
||||
cd $out
|
||||
${unzip}/bin/unzip ${abevjavaSrc}/application/abevjava.jar hu/piller/enykp/niszws/ClientStubBuilder.class
|
||||
${python3}/bin/python ${./patch_paths.py} hu/piller/enykp/niszws/ClientStubBuilder.class
|
||||
'')
|
||||
];
|
||||
|
||||
# This script can be used to run template installation jars (or use the Szervíz -> Telepítés menu)
|
||||
anyk-java = writeScript "anyk-java" ''
|
||||
if [ -f ~/.abevjava/abevjavapath.cfg ]
|
||||
then
|
||||
if ABEVJAVA_PATH_CFG=$(grep abevjava.path ~/.abevjava/abevjavapath.cfg)
|
||||
then
|
||||
ABEVJAVA_PATH=''${ABEVJAVA_PATH_CFG#abevjava.path = }
|
||||
echo "Determined abevjava path as $ABEVJAVA_PATH"
|
||||
else
|
||||
echo "Could not determine abevjava path from ~/.abevjava/abevjavapath.cfg"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
ABEVJAVA_PATH=~/abevjava
|
||||
mkdir -p ~/.abevjava
|
||||
echo "abevjava.path = $ABEVJAVA_PATH" > ~/.abevjava/abevjavapath.cfg
|
||||
echo "Initialized abevjava path as $ABEVJAVA_PATH"
|
||||
fi
|
||||
|
||||
# Sync help files.
|
||||
mkdir -p "$ABEVJAVA_PATH/segitseg/"
|
||||
cp -sRf --no-preserve=all @out@/opt/segitseg/. "$ABEVJAVA_PATH/segitseg"
|
||||
|
||||
export LD_PRELOAD=${libredirect}/lib/libredirect.so:$LD_PRELOAD
|
||||
# Look for form templates in ABEVJAVA_PATH instead of the install dir.
|
||||
export NIX_REDIRECTS=@out@/opt/nyomtatvanyok=$ABEVJAVA_PATH/nyomtatvanyok:@out@/opt/segitseg=$ABEVJAVA_PATH/segitseg:@out@/opt/setenv=$ABEVJAVA_PATH/setenv:/bin/bash=${bash}/bin/bash:$NIX_REDIRECTS
|
||||
if WINDOW_SCALING_FACTOR=$(${xsettingsd}/bin/dump_xsettings | awk '/Gdk\/WindowScalingFactor/{print $NF}' | grep .); then
|
||||
# Fix scaling on HiDPI.
|
||||
SCALING_PROP="-Dsun.java2d.uiScale=''${WINDOW_SCALING_FACTOR}"
|
||||
fi
|
||||
# ÁNYK crashes with NullPointerException with the GTK look and feel so use the cross-platform one.
|
||||
exec ${openjdk}/bin/java -Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel $SCALING_PROP "$@"
|
||||
'';
|
||||
in stdenv.mkDerivation {
|
||||
pname = "anyk";
|
||||
version = "3.26.0";
|
||||
|
||||
src = abevjavaSrc;
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
desktopName = "ÁNYK";
|
||||
name = "anyk";
|
||||
exec = "anyk";
|
||||
icon = "anyk";
|
||||
categories = [ "Office" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r application $out/opt
|
||||
|
||||
mkdir $out/bin
|
||||
substituteAll ${anyk-java} $out/bin/anyk-java
|
||||
chmod +x $out/bin/anyk-java
|
||||
|
||||
# ÁNYK has some old school dependencies that are no longer bundled with Java, put them on the classpath.
|
||||
makeWrapper $out/bin/anyk-java $out/bin/anyk --add-flags "-cp ${lib.concatStringsSep ":" extraClasspath}:$out/opt/abevjava.jar hu.piller.enykp.gui.framework.MainFrame"
|
||||
|
||||
mkdir -p $out/share/applications $out/share/pixmaps $out/share/icons
|
||||
|
||||
copyDesktopItems
|
||||
|
||||
ln -s $out/opt/abevjava.png $out/share/pixmaps/anyk.png
|
||||
ln -s $out/opt/abevjava.png $out/share/icons/anyk.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for filling forms for the Hungarian government,";
|
||||
longDescription = ''
|
||||
Official tool for filling Hungarian government forms.
|
||||
|
||||
Use `anyk-java` to install form templates/help files like this: `anyk-java -jar NAV_IGAZOL.jar`
|
||||
'';
|
||||
homepage = "https://nav.gov.hu/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/javakitolto";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ chpatrick ];
|
||||
platforms = openjdk.meta.platforms;
|
||||
sourceProvenance = [ sourceTypes.binaryBytecode ];
|
||||
mainProgram = "anyk";
|
||||
};
|
||||
}
|
||||
|
||||
35
pkgs/by-name/an/anyk/patch_paths.py
Normal file
35
pkgs/by-name/an/anyk/patch_paths.py
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
from pathlib import Path
|
||||
from struct import pack
|
||||
import sys
|
||||
|
||||
def to_java_string(string) -> bytes:
|
||||
string_bytes = string.encode("utf-8")
|
||||
# Java constant pool string entries are prefixed by 0x01 and 16-bit big-endian string length.
|
||||
return pack(">BH", 1, len(string_bytes)) + string_bytes
|
||||
|
||||
class_file = Path(sys.argv[1])
|
||||
|
||||
clazz = class_file.read_bytes()
|
||||
|
||||
# We want to fix these package names so they work with the open-source Java EE releases instead of OpenJDK 8.
|
||||
patches = [
|
||||
( "com/sun/xml/internal/ws/developer/WSBindingProvider", "com/sun/xml/ws/developer/WSBindingProvider" ),
|
||||
( "com/sun/xml/internal/ws/api/message/Header", "com/sun/xml/ws/api/message/Header" ),
|
||||
( "com.sun.xml.internal.ws.transport.http.client.streaming.chunk.size", "com.sun.xml.ws.transport.http.client.streaming.chunk.size" ),
|
||||
( "com/sun/xml/internal/ws/api/message/Headers", "com/sun/xml/ws/api/message/Headers" ),
|
||||
( "(Lorg/w3c/dom/Element;)Lcom/sun/xml/internal/ws/api/message/Header;", "(Lorg/w3c/dom/Element;)Lcom/sun/xml/ws/api/message/Header;" ),
|
||||
( "([Lcom/sun/xml/internal/ws/api/message/Header;)V", "([Lcom/sun/xml/ws/api/message/Header;)V" ),
|
||||
]
|
||||
|
||||
for old, new in patches:
|
||||
old_java = to_java_string(old)
|
||||
new_java = to_java_string(new)
|
||||
assert old_java in clazz
|
||||
clazz = clazz.replace(old_java, new_java)
|
||||
assert old_java not in clazz
|
||||
assert new_java in clazz
|
||||
|
||||
assert b".internal." not in clazz
|
||||
|
||||
class_file.write_bytes(clazz)
|
||||
|
||||
|
|
@ -13,10 +13,10 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-vr/c7kYXoKlZh7+f1ZPHcmIGw0nB8x1wJt/iR2F9bQI=";
|
||||
aarch64-linux = "sha256-mKLbxj5LSztjHtLWdZFlW4T6S+kN56SZnJNxKZDQIQ4=";
|
||||
x86_64-darwin = "sha256-AllKEadf+1s3XGCXD0PRycvDUyYNL6HLaViBwwaYswU=";
|
||||
aarch64-darwin = "sha256-6Pik3uYLfbeAW4Q4ZxJFt90IH+jhXWKY6kpDA6NAmaA=";
|
||||
x86_64-linux = "sha256-6ki5sIzypyBhCFhUDXlD3mT13o9A4OQ4cFFfCWTFPaA=";
|
||||
aarch64-linux = "sha256-LoFDQDsQDRZZiyEpWmGTfEWE/kJDk4GNKA8AsoqxXmY=";
|
||||
x86_64-darwin = "sha256-o13H5phQ0aWCchizRpIWuy1nO/19qoRRZNq52QHbINY=";
|
||||
aarch64-darwin = "sha256-N7N1y3/C5Q4NT0fISjjUuU3a9IV1Ur5VEa/Z4wVoApU=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
|
|
@ -24,7 +24,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.6.23";
|
||||
version = "1.6.26";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fleng";
|
||||
version = "17";
|
||||
version = "19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-mZ0JDt1wDWUUvK5FNvGRkz1BEunmZAzHAuhURA1P89Q=";
|
||||
hash = "sha256-xYMNGS3avZ9JsR8kJlSHz+C2XsLmhsDO/KTr5JquRK8=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "free42";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasokken";
|
||||
repo = "free42";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-v7Qi0ZRLXEoZqnbIiHTkvsftwMi9vUhgH7wOtHN84nU=";
|
||||
hash = "sha256-bOW5OyWaWblH2/2O3jNxaTjJEPZw86dTFJdexdlVLPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,31 +4,28 @@
|
|||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunar-client";
|
||||
version = "3.1.3";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
hash = "sha512-VV6UH0mEv+bABljDKZUOZXBjM1Whf2uacUQI8AnyLDBYI7pH0fkdjsBfjhQhFL0p8nHOwPAQflA+8vRFLH/uZw==";
|
||||
hash = "sha512-ZW+SFIZ5+xxgesaZ7ZQbUnv7H5U92SZdfAU7GhJR1H0mhkrIb5Go6GWrIXaWYZLrmOlD98LSLihYi7SemJp+Yg==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/{${pname}-${version},${pname}}
|
||||
source "${makeWrapper}/nix-support/setup-hook"
|
||||
wrapProgram $out/bin/${pname} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
install -Dm444 ${appimageContents}/launcher.desktop $out/share/applications/lunar-client.desktop
|
||||
install -Dm444 ${appimageContents}/launcher.png $out/share/pixmaps/lunar-client.png
|
||||
substituteInPlace $out/share/applications/lunar-client.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \
|
||||
--replace 'Icon=launcher' 'Icon=lunar-client'
|
||||
'';
|
||||
extraInstallCommands =
|
||||
let contents = appimageTools.extract { inherit pname version src; };
|
||||
in ''
|
||||
mv $out/bin/{lunar-client-*,lunar-client}
|
||||
source "${makeWrapper}/nix-support/setup-hook"
|
||||
wrapProgram $out/bin/lunar-client \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
install -Dm444 ${contents}/launcher.desktop $out/share/applications/lunar-client.desktop
|
||||
install -Dm444 ${contents}/launcher.png $out/share/pixmaps/lunar-client.png
|
||||
substituteInPlace $out/share/applications/lunar-client.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \
|
||||
--replace 'Icon=launcher' 'Icon=lunar-client'
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ target="$(dirname "$(readlink -f "$0")")/package.nix"
|
|||
host="https://launcherupdates.lunarclientcdn.com"
|
||||
metadata=$(curl "$host/latest-linux.yml")
|
||||
version=$(echo "$metadata" | yq .version -r)
|
||||
sha512=$(echo "$metadata" | yq .sha512 -r)
|
||||
hash=$(echo "$metadata" | yq .sha512 -r)
|
||||
|
||||
sed -i "s@version = .*;@version = \"$version\";@g" "$target"
|
||||
sed -i "s@hash.* = .*;@hash = \"sha512-$sha512\";@g" "$target"
|
||||
sed -i "s@hash.* = .*;@hash = \"sha512-$hash\";@g" "$target"
|
||||
|
|
|
|||
|
|
@ -6,30 +6,39 @@
|
|||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lune";
|
||||
version = "0.7.11";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filiptibell";
|
||||
repo = "lune";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5agoAXeO16/CihsgvUHt+pgA+/ph6PualTY6xqDQbeU=";
|
||||
hash = "sha256-ZVETw+GdkrR2V8RrHAWBR+avAuN0158DlJkYBquju8E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kPBPxlsicoFDyOsuJWhvQHDC2uwYQqpd7S+kQPRd8DY=";
|
||||
cargoHash = "sha256-zOjDT8Sn/p3YaG+dWyYxSWUOo11p9/WG3EyNagZRtQQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# these all require internet access
|
||||
# require internet access
|
||||
"--skip=tests::net_request_codes"
|
||||
"--skip=tests::net_request_compression"
|
||||
"--skip=tests::net_request_methods"
|
||||
|
|
@ -40,15 +49,17 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=tests::roblox_instance_custom_async"
|
||||
"--skip=tests::serde_json_decode"
|
||||
|
||||
# this tries to use the root directory as the CWD
|
||||
# uses root as the CWD
|
||||
"--skip=tests::process_spawn_cwd"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A standalone Luau script runtime";
|
||||
homepage = "https://github.com/filiptibell/lune";
|
||||
changelog = "https://github.com/filiptibell/lune/blob/${src.rev}/CHANGELOG.md";
|
||||
homepage = "https://github.com/lune-org/lune";
|
||||
changelog = "https://github.com/lune-org/lune/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ lammermann ];
|
||||
# note: Undefined symbols for architecture x86_64
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hpp-fcl";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "humanoid-path-planner";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-qeAO1FV28L2nbQ/2mDeLMuWS2+FexQ1ORCtt+ztWHj0=";
|
||||
hash = "sha256-Suow6dvDZI0uS/CkzfkWIxYjn+i4Fbyd2EnqlxM2gMY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Without latex2man, no man pages are installed despite being
|
||||
# prebuilt in the source tarball.
|
||||
configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ];
|
||||
configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ]
|
||||
# See https://github.com/libunwind/libunwind/issues/693
|
||||
++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl) [
|
||||
"CFLAGS=-mno-outline-atomics"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ xz ];
|
||||
|
||||
|
|
@ -40,7 +44,19 @@ stdenv.mkDerivation rec {
|
|||
description = "A portable and efficient API to determine the call-chain of a program";
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
# https://github.com/libunwind/libunwind#libunwind
|
||||
platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "loongarch64-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ];
|
||||
platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ];
|
||||
# libunwind relies on getcontext/setcontext,
|
||||
# and only has a musl implementation for some platforms
|
||||
# https://github.com/libunwind/libunwind/issues/33
|
||||
# https://github.com/libunwind/libunwind/issues/69
|
||||
badPlatforms = [ {
|
||||
isAarch64 = false;
|
||||
isRiscV64 = false;
|
||||
isS390x = false;
|
||||
isx86_64 = false;
|
||||
isMusl = true;
|
||||
parsed = {};
|
||||
} ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" "intel-nullhw" ] # No Vulkan support on Darwin
|
||||
, OpenGL, Xplugin
|
||||
, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light
|
||||
, withLibunwind ? lib.meta.availableOn stdenv.hostPlatform libunwind
|
||||
, enableGalliumNine ? stdenv.isLinux
|
||||
, enableOSMesa ? stdenv.isLinux
|
||||
, enableOpenCL ? stdenv.isLinux && stdenv.isx86_64
|
||||
|
|
@ -217,6 +218,8 @@ self = stdenv.mkDerivation {
|
|||
"-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib"
|
||||
] ++ lib.optionals (!withValgrind) [
|
||||
"-Dvalgrind=disabled"
|
||||
] ++ lib.optionals (!withLibunwind) [
|
||||
"-Dlibunwind=disabled"
|
||||
] ++ lib.optional enablePatentEncumberedCodecs
|
||||
"-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
|
||||
++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}";
|
||||
|
|
@ -226,7 +229,10 @@ self = stdenv.mkDerivation {
|
|||
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
|
||||
libffi libvdpau libelf libXvMC
|
||||
libpthreadstubs openssl /*or another sha1 provider*/
|
||||
zstd libunwind
|
||||
zstd
|
||||
] ++ lib.optionals withLibunwind [
|
||||
libunwind
|
||||
] ++ [
|
||||
python3Packages.python # for shebang
|
||||
] ++ lib.optionals haveWayland [ wayland wayland-protocols ]
|
||||
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ]
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ let
|
|||
|
||||
nyxt-gtk = build-asdf-system {
|
||||
pname = "nyxt";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
|
||||
lispLibs = (with super; [
|
||||
alexandria
|
||||
|
|
@ -470,8 +470,8 @@ let
|
|||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "nyxt";
|
||||
rev = "3.11.0";
|
||||
hash = "sha256-Nw2r3FdqwxHlq8CrZo7Z423xe0rR5zu+U4dDPdG880M=";
|
||||
rev = "3.11.1";
|
||||
hash = "sha256-7qnelRTZBJ+1CbZv5Bpzd3uOjcSr/VLkcyo2yK/U/4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, callPackage
|
||||
, cargo
|
||||
, cffi
|
||||
, cryptography-vectors ? (callPackage ./vectors.nix { })
|
||||
, fetchPypi
|
||||
, hypothesis
|
||||
, iso8601
|
||||
|
|
@ -24,9 +25,6 @@
|
|||
, setuptoolsRustBuildHook
|
||||
}:
|
||||
|
||||
let
|
||||
cryptography-vectors = callPackage ./vectors.nix { };
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "cryptography";
|
||||
version = "41.0.7"; # Also update the hash in vectors.nix
|
||||
|
|
|
|||
|
|
@ -5,24 +5,24 @@
|
|||
, fetchPypi
|
||||
, pari
|
||||
, gmp
|
||||
, cython
|
||||
, cython_3
|
||||
, cysignals
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cypari2";
|
||||
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17beb467d3cb39fffec3227c468f0dd8db8a09129faeb95a6bb4c84b2b6c6683";
|
||||
sha256 = "sha256-76SkTZb2k8sRVtof1vzMEw2vz5wZr0GFz3cL9E0A2/w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# patch to avoid some segfaults in sage's totallyreal.pyx test.
|
||||
# (https://trac.sagemath.org/ticket/27267). depends on Cython patch.
|
||||
# (https://trac.sagemath.org/ticket/27267).
|
||||
(fetchpatch {
|
||||
name = "use-trashcan-for-gen.patch";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch";
|
||||
|
|
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
cysignals
|
||||
cython
|
||||
cython_3
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ lib
|
||||
, autoreconfHook
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, cython_3
|
||||
, pariSupport ? true, pari # for interfacing with the PARI/GP signal handler
|
||||
}:
|
||||
|
||||
|
|
@ -19,14 +18,6 @@ buildPythonPackage rec {
|
|||
hash = "sha256-Dx4yHlWgf5AchqNqHkSX9v+d/nAGgdATCjjDbk6yOMM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/sagemath/cysignals/pull/193
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sagemath/cysignals/commit/474179c87ab0ff562fdfd2471b02797e4bdd3148.diff";
|
||||
sha256 = "sha256-qEAmf4kU+QDI/JPFNjQMZIjMBk8dnaLmOpagIBMsh7w=";
|
||||
})
|
||||
];
|
||||
|
||||
# explicit check:
|
||||
# build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
|
||||
hardeningDisable = [
|
||||
|
|
@ -43,7 +34,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cython
|
||||
cython_3
|
||||
] ++ lib.optionals pariSupport [
|
||||
# When cysignals is built with pari, including cysignals into the
|
||||
# buildInputs of another python package will cause cython to link against
|
||||
|
|
|
|||
|
|
@ -8,29 +8,36 @@
|
|||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, structlog
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dlms-cosem";
|
||||
version = "21.3.2";
|
||||
format = "setuptools";
|
||||
version = "24.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwitab";
|
||||
repo = pname;
|
||||
repo = "dlms-cosem";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BrLanP+SIRRof15yzqwcDOxw92phbW7m9CfORz0xo7I=";
|
||||
hash = "sha256-NeTaU8i18Zb39Y2JnYzr87Ozt7Rj074xusL4xaNe0q0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
attrs
|
||||
cryptography
|
||||
pyserial
|
||||
python-dateutil
|
||||
structlog
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
|
|
@ -45,6 +52,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module to parse DLMS/COSEM";
|
||||
homepage = "https://github.com/pwitab/dlms-cosem";
|
||||
changelog = "https://github.com/pwitab/dlms-cosem/blob/${version}/HISTORY.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
|
||||
# build-system
|
||||
, cysignals
|
||||
, cython
|
||||
, cython_3
|
||||
, pkgconfig
|
||||
, setuptools
|
||||
|
||||
|
|
@ -21,31 +20,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fpylll";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fplll";
|
||||
repo = "fpylll";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EyReCkVRb3CgzIRal5H13OX/UdwWi+evDe7PoS1qP4A=";
|
||||
hash = "sha256-M3ZnDL0Ui3UAa5Jn/Wr5pAHhghP7EAaQD/sx5QZ58ZQ=";
|
||||
};
|
||||
|
||||
# temporarily revert to cython 0.29
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fplll/fpylll/commit/528243c6fa6491c8e9652b99bdf9758766273d66.diff";
|
||||
revert = true;
|
||||
sha256 = "sha256-IRppkESy0CRwARhxBAsZxP6JkTe0M91apG4CTSSYNUU=";
|
||||
excludes = ["requirements.txt"];
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt --replace "Cython>=3.0" "Cython"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
cython_3
|
||||
cysignals
|
||||
pkgconfig
|
||||
setuptools
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "indexed_gzip";
|
||||
version = "1.8.5";
|
||||
version = "1.8.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h9JgYq9KxmknaRuMgq+5YWA8tUaFk+lclkqdNAnr/cI=";
|
||||
hash = "sha256-dryq1LLC+lVHj/i+m60ubGGItlX5/clCnwNGrexI92I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, setuptools
|
||||
, importlib-metadata
|
||||
, numpy
|
||||
, rpyc
|
||||
, rpyc4
|
||||
, scipy
|
||||
, appdirs
|
||||
, callPackage
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
importlib-metadata
|
||||
numpy
|
||||
rpyc
|
||||
rpyc4
|
||||
scipy
|
||||
appdirs
|
||||
];
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "lsprotocol";
|
||||
version = "2023.0.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pname;
|
||||
repo = "lsprotocol";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PHjLKazMaT6W4Lve1xNxm6hEwqE3Lr2m5L7Q03fqb68=";
|
||||
};
|
||||
|
|
@ -70,6 +70,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python implementation of the Language Server Protocol";
|
||||
homepage = "https://github.com/microsoft/lsprotocol";
|
||||
changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,20 +5,25 @@
|
|||
, fetchPypi
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lupupy";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mij5WGIl60D7ya1SdIvZ8TEgIZhJ9Xd2kcUnnbO1dD4=";
|
||||
hash = "sha256-A92Jk6WlRKep3dkbqLiYYHklEh0pyncipRW6swq0mvo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorlog
|
||||
pyyaml
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, cython_3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
hash = "sha256-E4BcKuHAG3SJ+rXo6sk2FmK08sAkEuNlLuzkj/aVMWI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cython ];
|
||||
propagatedBuildInputs = [ cython_3 ];
|
||||
|
||||
pythonImportsCheck = [ "memory_allocator" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openstacksdk";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aXy2JRXFSNO3/Fyz+GXiebkw05433OsR2HH4H5+lkeg=";
|
||||
hash = "sha256-dsm3QKLNYl/MbpJBYU7vKgk0y3I1SlxYcWj4+t7y5nQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,17 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, alembic
|
||||
, debtcollector
|
||||
, oslo-config
|
||||
, oslo-context
|
||||
, oslo-i18n
|
||||
, oslo-utils
|
||||
, oslotest
|
||||
, pbr
|
||||
, psycopg2
|
||||
, setuptools
|
||||
, sqlalchemy
|
||||
, sqlalchemy-migrate
|
||||
, stevedore
|
||||
, stestr
|
||||
, testresources
|
||||
, testscenarios
|
||||
|
|
@ -33,18 +36,21 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
alembic
|
||||
debtcollector
|
||||
oslo-config
|
||||
oslo-context
|
||||
oslo-i18n
|
||||
oslo-utils
|
||||
sqlalchemy
|
||||
sqlalchemy-migrate
|
||||
testresources
|
||||
testscenarios
|
||||
stevedore
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
oslo-context
|
||||
oslotest
|
||||
stestr
|
||||
psycopg2
|
||||
testresources
|
||||
testscenarios
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, numpy
|
||||
, pyyaml
|
||||
, python-dateutil
|
||||
|
|
@ -18,12 +20,15 @@ buildPythonPackage rec {
|
|||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "pinecone_client";
|
||||
inherit version;
|
||||
hash = "sha256-F2mWUpFMn2ipopa3UjvzrmNZsHtdRrUwfkuHbDYBElo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -38,12 +43,20 @@ buildPythonPackage rec {
|
|||
loguru
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"urllib3"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pinecone"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.pinecone.io/";
|
||||
description = "The Pinecone python client";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [happysalada];
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, mpfr
|
||||
, libmpc
|
||||
, ppl
|
||||
, cython
|
||||
, cython_3
|
||||
, cysignals
|
||||
, gmpy2
|
||||
, sphinx
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cython
|
||||
cython_3
|
||||
cysignals
|
||||
gmpy2
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, primecount
|
||||
, cython
|
||||
, cython_3
|
||||
, cysignals
|
||||
}:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ primecount ];
|
||||
|
||||
propagatedBuildInputs = [ cython cysignals ];
|
||||
propagatedBuildInputs = [ cython_3 cysignals ];
|
||||
|
||||
# depends on pytest-cython for "pytest --doctest-cython"
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pudb";
|
||||
version = "2023.1";
|
||||
version = "2024.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Fd88YDq6h6kYpmbvjhv2P3ZCOMw1ids8W3pfGwHqLwM=";
|
||||
hash = "sha256-/J1ql2pZtZB2TIN57CAP7NR/qoQlm2Tv2M2GBmoK8zg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, lsprotocol
|
||||
, typeguard
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, typeguard
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygls";
|
||||
version = "1.2.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -24,8 +26,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-ARez9fs50kScfMp/W/aFIOcJonpFrcfyrzJuVwou7fk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# https://github.com/openlawlibrary/pygls/pull/432
|
||||
"lsprotocol"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -33,6 +41,12 @@ buildPythonPackage rec {
|
|||
typeguard
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
ws = [
|
||||
websockets
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
|
|
@ -46,12 +60,14 @@ buildPythonPackage rec {
|
|||
ulimit -n 1024
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pygls" ];
|
||||
pythonImportsCheck = [
|
||||
"pygls"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pythonic generic implementation of the Language Server Protocol";
|
||||
homepage = "https://github.com/openlawlibrary/pygls";
|
||||
changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
let
|
||||
pname = "pynitrokey";
|
||||
version = "0.4.44";
|
||||
version = "0.4.45";
|
||||
mainProgram = "nitropy";
|
||||
in
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SWLxiUAE8AVa+EYjOk0kzOcW65TJbvUe627VmJY7nFY=";
|
||||
hash = "sha256-iY4ThrmXP7pEjTYYU4lePVAbuJGTdHX3iKswXzuf7W8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
74
pkgs/development/python-modules/rpyc4/default.nix
Normal file
74
pkgs/development/python-modules/rpyc4/default.nix
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, hatchling
|
||||
, plumbum
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rpyc4";
|
||||
# Pinned version for linien, see also:
|
||||
# https://github.com/linien-org/pyrp3/pull/10#discussion_r1302816237
|
||||
version = "4.1.5";
|
||||
format = "pyproject";
|
||||
|
||||
# Since this is an outdated version, upstream might have fixed the
|
||||
# compatibility issues with Python3.12, but we can't enjoy them yet.
|
||||
disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomerfiliba";
|
||||
repo = "rpyc";
|
||||
rev = version;
|
||||
hash = "sha256-8NOcXZDR3w0TNj1+LZ7lzQAt7yDgspjOp2zk1bsbVls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
plumbum
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Disable tests that requires network access
|
||||
"test_api"
|
||||
"test_close_timeout"
|
||||
"test_deploy"
|
||||
"test_listing"
|
||||
"test_pruning"
|
||||
"test_rpyc"
|
||||
# Test is outdated
|
||||
# ssl.SSLError: [SSL: NO_CIPHERS_AVAILABLE] no ciphers available (_ssl.c:997)
|
||||
"test_ssl_conenction"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
"tests/test_ssh.py"
|
||||
"tests/test_teleportation.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rpyc"
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
|
||||
homepage = "https://rpyc.readthedocs.org";
|
||||
changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.199.0";
|
||||
version = "2.204.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zAYO8zf3FpEI1sr6Iv9WP56NFmwYGH2dtRTSJhsSYC8=";
|
||||
hash = "sha256-Bku13l4CPz1SYNpqnnteE97jX+X9sv6ea9X2tiZzeXY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "schwifty";
|
||||
version = "2023.11.2";
|
||||
version = "2024.1.1.post0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lyyAx8VDIRO72xW64gjcsZw2C31hV3YCLIGSmdlIJeI=";
|
||||
hash = "sha256-ZFDu+stuKdsVc8bTuSZ4LZX8BuQhORjyEMosnrk1rX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
42
pkgs/development/python-modules/stupidartnet/default.nix
Normal file
42
pkgs/development/python-modules/stupidartnet/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stupidartnet";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpvalente";
|
||||
repo = "stupidArtnet";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2LfK63FJcdnXfDLuUzYNlspj1jmtw00S6el49cH+RRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"stupidArtnet"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library implementation of the Art-Net protocol";
|
||||
homepage = "https://github.com/cpvalente/stupidArtnet";
|
||||
changelog = "https://github.com/cpvalente/stupidArtnet/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,6 +7,8 @@
|
|||
, pbr
|
||||
, python-dateutil
|
||||
, stestr
|
||||
, testresources
|
||||
, testscenarios
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -29,6 +31,8 @@ buildPythonPackage rec {
|
|||
mock
|
||||
oslo-concurrency
|
||||
stestr
|
||||
testresources
|
||||
testscenarios
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
@ -52,5 +56,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://opendev.org/opendev/subunit2sql";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.openstack.members;
|
||||
# version 1.10.0 is incomptaible with oslo-db 14.0.0
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppcheck";
|
||||
version = "2.13.1";
|
||||
version = "2.13.2";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "danmar";
|
||||
repo = "cppcheck";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-X2HMC0Mij4odyyl79bgCyaw3qRMjEQBbHO3Q2kE9YLE=";
|
||||
hash = "sha256-jmfZ0OwDdG3s2f5a5UXc1U3utKiSYwUORXfXeZL+LFg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
pname = "drone-cli";
|
||||
revision = "v${version}";
|
||||
|
||||
|
|
@ -12,10 +12,10 @@ buildGoModule rec {
|
|||
owner = "harness";
|
||||
repo = "drone-cli";
|
||||
rev = revision;
|
||||
hash = "sha256-PZ0M79duSctPepD5O+NdJZKhkyR21g/4P6loJtoWZiU=";
|
||||
hash = "sha256-moxsGlm7Q9E0q9SZ2gZotn3tRbnbtwhDc9UNCCSb3pY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JC7OR4ySDsVWmrBBTjpwZrkJlM8RJehbsvXW/VtA4VA=";
|
||||
vendorHash = "sha256-rKZq2vIXvw4bZ6FXPqOip9dLiV5rSb1fWDJe3oxOBjw=";
|
||||
|
||||
# patch taken from https://patch-diff.githubusercontent.com/raw/harness/drone-cli/pull/179.patch
|
||||
# but with go.mod changes removed due to conflict
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "djhtml";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -13,8 +13,8 @@ buildPythonApplication rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "rtts";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-m13lw1x+URAYuDc0gXRIxfRnd6kQxeAuLDqYXeOgQE0=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3bviLyTLpHcAUWAaAmNZukWBDwFs8yFOAxl2bSk9GNY=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "djhtml" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.14.0";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-enkWLhE6rsToL2bTElT+7ZMyQin0Go5FT8uDn79euKY=";
|
||||
sha256 = "sha256-0Fwn62VORPmaufd7RqTkXjlXygXPVVixf8WwHgE57Lg=";
|
||||
};
|
||||
vendorHash = "sha256-F3z6gowVkei782qaSIOh7Ymeq1SFGxBaHM9fTSPG6qI=";
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fzf-make";
|
||||
version = "0.18.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyu08";
|
||||
repo = "fzf-make";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6ijvj37BFPlFxd2SSe+X8hbYBGgex9IlpIhh1eQZUtM=";
|
||||
hash = "sha256-wQ39qysRu5i5Po7G3uC/qHcssUhhIWwBdRwPiWgA004=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-d2O4H9gKQIDH8jhBP36Ra/hOi7SDSoJRI28lJj/PG3U=";
|
||||
cargoHash = "sha256-Kjr5lWEX1iki1C+r8OziCgu0WAvPcNk7U4uhQzCAWLA=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsass";
|
||||
version = "0.28.0";
|
||||
version = "0.28.8";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "rsass-cli";
|
||||
inherit version;
|
||||
hash = "sha256-hBYZB/Jyzd89dylZn2tYdHr0IXCFgJi9TnvuoVqCR1A=";
|
||||
hash = "sha256-eloTe7UHcPPmHEsGnfj3nIbZbBxSMFZdaSm5LpOh1S4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nVTYTjmHB/z5M5AyojbsuZNCa3JCiADWrgV5eb3bcUE=";
|
||||
cargoHash = "sha256-57vqVKqwQOEB33cSzGiZwadTDi7EyBBRAS4X9Euwp5Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sass reimplemented in rust with nom";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "scip";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "scip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lZ3W2Z69P5QQN+PgF9+Apj/uEXWaTS+5QOg17m1mGPU=";
|
||||
hash = "sha256-aSApi6fEKQP5bpuda2Zz6i/5xkyH+mxch803toJsZm8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3Tq2cexcxHjaH6WIz2hneE1QeBSGoMINBncKbqxODxQ=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.24.0";
|
||||
version = "2.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-DnhUqnz+0VfZk5KCbVrQcQpsAI2ojVFMHw83UN2DzwQ=";
|
||||
hash = "sha256-AM92VtkTRR4QSEg0mrki8UzOxVx7g+IsKUDHTE62d08=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vSvHjQZFLzUIC9u+myI6Xi4YhetVkiQxBIkm5/RoV2U=";
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-crev";
|
||||
version = "0.25.4";
|
||||
version = "0.25.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crev-dev";
|
||||
repo = "cargo-crev";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cXGZhTLIxR9VHrQT+unbl69AviiQ6FCOJTdOP/4fRYI=";
|
||||
sha256 = "sha256-kMbbUXiU549JwblLzcP4X5rs6Qu8vaLKB5rnZSpKHKQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-H/5OZCnshGOUKVaBTbFAiMpYdsNC/96gV+rOgiuwDYc=";
|
||||
cargoHash = "sha256-gUHy8yXTiQd3/7IyVmiq0QqXKF4ZVhF+riryEj/w2NI=";
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sem";
|
||||
version = "0.28.5";
|
||||
version = "0.28.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "semaphoreci";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XprWg6JZBBqHQmbdNyKaNLFyxTGkaGzMPLanISYIjYY=";
|
||||
sha256 = "sha256-8zGgqa0z3KYSYVaYlSnTET7QJ+Mdp+FVJ5MD2pyh7Ns=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74=";
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snazy";
|
||||
version = "0.52.1";
|
||||
version = "0.52.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-OoUu42vRe4wPaunb2vJ9ITd0Q76pBI/yC8FI0J+J+ts=";
|
||||
hash = "sha256-NUDKTJtSzzY+kaqreHroJDW18lta9AcnL94t/jdEOlY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gUeKZNSo/zJ4Nqy4Fpk5JuvFylGBlKJu+Nw9XWXVx0g=";
|
||||
cargoHash = "sha256-raDkfP7EeyXbMr2puR+dHUKVqguVvkV7noNuLw/KttI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stylua";
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnnymorganz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bw9+BUvZC4sRLFyU5K6FHsWVZ3PTlMAonRmTSwV5AwU=";
|
||||
sha256 = "sha256-bqUmLtJLjImWqe06CeIWIU4FP+/Vxszp2yKMosVeyZM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-bainEM4eRMNyecSBi5k1ifjDULWdXed6GP6i10IVA+w=";
|
||||
cargoHash = "sha256-EMHt9oskPJCeAu/5VG6PaMt/4NTmNOaFTM5TMOy0BV8=";
|
||||
|
||||
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uftrace";
|
||||
version = "0.15";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namhyung";
|
||||
repo = "uftrace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VK2lERzwsdXVOxgxRAA2RxeqBtOeINJDnsafnn461VQ=";
|
||||
sha256 = "sha256-5P8CshSCK1Ugkg9+MJB8G31n4iyhZF0oVayouQU0CaA=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "1.0.24";
|
||||
version = "1.0.25";
|
||||
pname = "bun";
|
||||
|
||||
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
|
|
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
|
|||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
||||
hash = "sha256-emp0SXua/XdgVfbEemahRabl9K1MV2HfY/j4iInCUu4=";
|
||||
hash = "sha256-Upgh45aYCNmW1we/+2VsNbJl718HKQNFoAg0zDmHSwA=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
||||
hash = "sha256-92el7Z80IA37CJfj9XckG4JstAKI+36Z8/rA3SgukZg=";
|
||||
hash = "sha256-RhHJ3H6tA8te1sk0eMEb5jBHFoAvfBTUWQo6O3ycMCs=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
|
||||
hash = "sha256-Gpa+wgKoDKKuVO8ZkwucBs1yfVw+34L8Qhv3FuyK8go=";
|
||||
hash = "sha256-TSnZ727ERoglVxJQ/Ve+YkZNezYD1YxwJRw2sC1F0ro=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
||||
hash = "sha256-8uHTAGCJ6fZ2CdN8GUSfOrSUyu1lIUXAL73ezx/7tV8=";
|
||||
hash = "sha256-vg8YtbhW122EU/oBuMoh5kPVqA6YRbRxrDZWnoJmdYQ=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromBitbucket
|
||||
, fetchpatch
|
||||
, p7zip
|
||||
, cmake
|
||||
, SDL2
|
||||
|
|
@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull fix pending upstream inclusion for `gcc-13` support:
|
||||
# https://bitbucket.org/linuxwolf6/lzwolf/pull-requests/5
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://bitbucket.org/soturi/lzwolf/commits/41f212026dff4f089d1c0921cb49ab1a2b81e0d6/raw";
|
||||
hash = "sha256-EgSdDaZovD7DyZ0BkuX8ZdsrX7J7v8/D6y5P1NWGJew=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# SDL2_net-2.2.0 changed CMake component name slightly.
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minesweep-rs";
|
||||
version = "6.0.47";
|
||||
version = "6.0.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6BrFWJ7YGALdKaPAX8Z1W2Eyyj0kbegybmwdnNUmOYo=";
|
||||
hash = "sha256-+Rtg4IUDhFqOIVBr+9qXY/vpoRt4mevAF+HwNQLyLmY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ju4tIie0Jrm9hh5Xoy4dqfPS8mqdN9Y0J1Nw4T9aN3Y=";
|
||||
cargoHash = "sha256-1mDGKonR+cX619W4xVmCilWzVhsJGPc9PtN/RhkyowI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sweep some mines for fun, and probably not for profit";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "M33-Linux";
|
||||
|
|
@ -11,6 +11,16 @@ stdenv.mkDerivation {
|
|||
sha256 = "1bvbclkyfcv23vxb4s1zssvygklks1nhp4iwi4v90c1fvyz0356f";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull the `gcc-13` build fix pending upstream inclusion:
|
||||
# https://github.com/donovan6000/M33-Linux/pull/6
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/donovan6000/M33-Linux/commit/272e4488ef05cfd95fcc952becfc0ac982306d0c.patch";
|
||||
hash = "sha256-ubdCwXFVljvOCzYrWVJgU6PY1j6Ei6aaclhXaGwZT2w=";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 m33-linux $out/bin/m33-linux
|
||||
install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "23.35.27191.9";
|
||||
version = "23.43.27642.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
hash = "sha256-yyuP9erK3bQ5oegLXPM+of6x7fslUXHPlX2q71lnGWA=";
|
||||
hash = "sha256-AXHNIWCezPYTzc+SXp1B4BzhfSfM2GUCpWLtCT1SE7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ unpackFile() {
|
|||
|
||||
|
||||
buildPhase() {
|
||||
runHook preBuild
|
||||
|
||||
if [ -n "$bin" ]; then
|
||||
# Create the module.
|
||||
echo "Building linux driver against kernel: $kernel";
|
||||
|
|
@ -23,10 +25,14 @@ buildPhase() {
|
|||
|
||||
cd ..
|
||||
fi
|
||||
|
||||
runHook postBuild
|
||||
}
|
||||
|
||||
|
||||
installPhase() {
|
||||
runHook preInstall
|
||||
|
||||
# Install libGL and friends.
|
||||
|
||||
# since version 391, 32bit libraries are bundled in the 32/ sub-directory
|
||||
|
|
@ -214,6 +220,8 @@ installPhase() {
|
|||
# FIXME: needs PATH and other fixes
|
||||
# install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh
|
||||
fi
|
||||
|
||||
runHook postInstall
|
||||
}
|
||||
|
||||
genericBuild
|
||||
|
|
|
|||
|
|
@ -117,6 +117,14 @@ rec {
|
|||
persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns=";
|
||||
|
||||
broken = kernel.kernelAtLeast "6.2";
|
||||
|
||||
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
|
||||
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
|
||||
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
|
||||
postInstall = ''
|
||||
mv $out/lib/tls/* $out/lib
|
||||
rmdir $out/lib/tls
|
||||
'';
|
||||
};
|
||||
|
||||
legacy_340 = let
|
||||
|
|
@ -154,5 +162,13 @@ rec {
|
|||
|
||||
broken = kernel.kernelAtLeast "6.7";
|
||||
patches = map (patch: "${aurPatches}/${patch}") patchset;
|
||||
|
||||
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
|
||||
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
|
||||
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
|
||||
postInstall = ''
|
||||
mv $out/lib/tls/* $out/lib
|
||||
rmdir $out/lib/tls
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,10 +19,12 @@
|
|||
, useFabricmanager ? false
|
||||
, ibtSupport ? false
|
||||
|
||||
, prePatch ? ""
|
||||
, prePatch ? null
|
||||
, postPatch ? null
|
||||
, patchFlags ? null
|
||||
, patches ? [ ]
|
||||
, preInstall ? null
|
||||
, postInstall ? null
|
||||
, broken ? false
|
||||
, brokenOpen ? broken
|
||||
}@args:
|
||||
|
|
@ -145,6 +147,7 @@ let
|
|||
|
||||
patches = if libsOnly then null else patches;
|
||||
inherit prePatch postPatch patchFlags;
|
||||
inherit preInstall postInstall;
|
||||
inherit version useGLVND useProfiles;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
inherit i686bundled;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
hash = "sha256-z6pO9+fQ+0jeYM3wCG8T/1C5aSeSZITj+f8TmGxR+Gw=";
|
||||
hash = "sha256-zfJZUDR6GJlJbnLIXa5duq8VOG0WUN+FP5BLQ4EgPKM=";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
|
|
@ -26,7 +26,7 @@ buildGoModule rec {
|
|||
# has a split module structure in one repo
|
||||
subPackages = ["." "connect/certgen"];
|
||||
|
||||
vendorHash = "sha256-Xt7azJS65B53jYPWLytNaGQv3Poy+3j4ak1Jq68vZRI=";
|
||||
vendorHash = "sha256-bKiKfLq/kbZYziUyD2v1o9X2Gs6uiqzPSYWE4cpeU9Q=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "aab40aab2acd735c500f296bacaa5c84ff0488221a4068ce9946e973beacc5ae";
|
||||
sha256 = "2a771b43ce96b6b48d53b29f2086528732e6ac067bc71a3be934f859d1302fc0";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
@ -46,9 +46,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
CFLAGS = [ "-O2" "-DNDEBUG" ]
|
||||
# https://gitlab.nic.cz/knot/knot-dns/-/issues/909
|
||||
++ lib.optional stdenv.isDarwin "-D__APPLE_USE_RFC_3542";
|
||||
CFLAGS = [ "-O2" "-DNDEBUG" ];
|
||||
|
||||
doCheck = true;
|
||||
checkFlags = [ "V=1" ]; # verbose output in case some test fails
|
||||
|
|
|
|||
|
|
@ -5,4 +5,5 @@
|
|||
scim-keycloak-user-storage-spi = callPackage ./scim-keycloak-user-storage-spi {};
|
||||
keycloak-discord = callPackage ./keycloak-discord {};
|
||||
keycloak-metrics-spi = callPackage ./keycloak-metrics-spi {};
|
||||
keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{ maven, lib, fetchFromGitHub }:
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "keycloak-restrict-client-auth";
|
||||
version = "23.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sventorben";
|
||||
repo = "keycloak-restrict-client-auth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JA3DvLdBKyn2VE1pYSCcRV9Cl7ZAWsRG5MAp548Rl+g=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-W1YvX1P/mshGYoTUO5XMlOcpu2KiujwLludaC3miak4=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm444 -t "$out" target/keycloak-restrict-client-auth.jar
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sventorben/keycloak-restrict-client-auth";
|
||||
description = "A Keycloak authenticator to restrict authorization on clients";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ leona ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "maddy";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foxcpp";
|
||||
repo = "maddy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EMw07yTFP0aBSuGDWivB8amuxWLFHhYV6J9faTEW5z4=";
|
||||
sha256 = "sha256-jVlIjeBvxc82GQn8vW2RqcAErxZqftGj32d+IbBxQxY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LyfkETZPkhJKN8CEivNp7Se4IBpzyAtmCM1xil4n2po=";
|
||||
vendorHash = "sha256-bSBk68w6T/Wy5klj5oC/ZW5TqDESG3mW9cIQ3auNmCk=";
|
||||
|
||||
tags = [ "libpam" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mediamtx";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluenviron";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bACcjqFHaF7nLT/6bvekdJezPZZoTasGLgR3fshHKkc=";
|
||||
hash = "sha256-g4z6UMTdg5Vjrn6h/t42GpHiAgZtTEi3AdS3X8Ho3fI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-H2ykDu54omxIkztZlcKUmRrJniFQitDEKviOCbJs1K0=";
|
||||
vendorHash = "sha256-/TvKx0xUI6XktkvPoZFWINQXf2hckfOn4QxYpGfEPl4=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue