Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
feb654493f
10
.github/workflows/check-by-name.yml
vendored
10
.github/workflows/check-by-name.yml
vendored
|
|
@ -8,7 +8,15 @@ name: Check pkgs/by-name
|
|||
# see pkgs/test/nixpkgs-check-by-name/scripts/README.md
|
||||
on:
|
||||
# Using pull_request_target instead of pull_request avoids having to approve first time contributors
|
||||
pull_request_target
|
||||
pull_request_target:
|
||||
# This workflow depends on the base branch of the PR,
|
||||
# but changing the base branch is not included in the default trigger events,
|
||||
# which would be `opened`, `synchronize` or `reopened`.
|
||||
# Instead it causes an `edited` event, so we need to add it explicitly here
|
||||
# While `edited` is also triggered when the PR title/body is changed,
|
||||
# this PR action is fairly quick, and PR's don't get edited that often,
|
||||
# so it shouldn't be a problem
|
||||
types: [opened, synchronize, reopened, edited]
|
||||
|
||||
permissions:
|
||||
# We need this permission to cancel the workflow run if there's a merge conflict
|
||||
|
|
|
|||
|
|
@ -38,8 +38,6 @@ The file system can be configured in NixOS via the usual [fileSystems](#opt-file
|
|||
Here's a typical setup:
|
||||
```nix
|
||||
{
|
||||
system.fsPackages = [ pkgs.sshfs ];
|
||||
|
||||
fileSystems."/mnt/my-dir" = {
|
||||
device = "my-user@example.com:/my-dir/";
|
||||
fsType = "sshfs";
|
||||
|
|
|
|||
|
|
@ -1519,6 +1519,7 @@
|
|||
./tasks/filesystems/nfs.nix
|
||||
./tasks/filesystems/ntfs.nix
|
||||
./tasks/filesystems/reiserfs.nix
|
||||
./tasks/filesystems/sshfs.nix
|
||||
./tasks/filesystems/squashfs.nix
|
||||
./tasks/filesystems/unionfs-fuse.nix
|
||||
./tasks/filesystems/vboxsf.nix
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ let
|
|||
"fwupd/fwupd.conf" = {
|
||||
source = format.generate "fwupd.conf" {
|
||||
fwupd = cfg.daemonSettings;
|
||||
} // lib.optionalAttrs (lib.length (lib.attrNames cfg.uefiCapsuleSettings) != 0) {
|
||||
uefi_capsule = cfg.uefiCapsuleSettings;
|
||||
};
|
||||
# fwupd tries to chmod the file if it doesn't have the right permissions
|
||||
|
|
|
|||
|
|
@ -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).
|
||||
|
|
|
|||
7
nixos/modules/tasks/filesystems/sshfs.nix
Normal file
7
nixos/modules/tasks/filesystems/sshfs.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config = lib.mkIf (lib.any (fs: fs == "sshfs" || fs == "fuse.sshfs") config.boot.supportedFilesystems) {
|
||||
system.fsPackages = [ pkgs.sshfs ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.14";
|
||||
version = "13.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-9Vq5CfZi58hqTKnIZSR5iQefXzNq0BErtZ8NoxLchxo=";
|
||||
hash = "sha256-+JxxJKHOCz1Ccii27II4L4owo/qvb7RQ6STqJ+PEEBA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iptsd";
|
||||
version = "1.4.0";
|
||||
version = "2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qBABt0qEePGrZH4khnikvStrSi/OVmP3yVMJZbEd36M=";
|
||||
hash = "sha256-zTXTyDgSa1akViDZlYLtJk1yCREGCSJKxzF+HZAWx0c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Userspace daemon for Intel Precise Touch & Stylus";
|
||||
homepage = "https://github.com/linux-surface/iptsd";
|
||||
license = licenses.gpl2Plus;
|
||||
mainProgram = "iptsd";
|
||||
maintainers = with maintainers; [ tomberek dotlambda ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,14 +6,35 @@
|
|||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
|
||||
# Doesn't work with latest urwid
|
||||
urwid = super.urwid.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "urwid";
|
||||
repo = "urwid";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "khal";
|
||||
version = "0.11.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pimutils";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "khal";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yI33pB/t+UISvSbLUzmsZqBxLF6r8R3j9iPNeosKcYw=";
|
||||
};
|
||||
|
||||
|
|
@ -21,12 +42,13 @@ python3.pkgs.buildPythonApplication rec {
|
|||
glibcLocales
|
||||
installShellFiles
|
||||
] ++ (with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
sphinx
|
||||
sphinxcontrib-newsfeed
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs;[
|
||||
propagatedBuildInputs = with py.pkgs;[
|
||||
atomicwrites
|
||||
click
|
||||
click-log
|
||||
|
|
@ -82,6 +104,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "CLI calendar application";
|
||||
homepage = "http://lostpackets.de/khal/";
|
||||
changelog = "https://github.com/pimutils/khal/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -48,11 +48,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mysql-workbench";
|
||||
version = "8.0.34";
|
||||
version = "8.0.36";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-ub/D6HRtXOvX+lai71t1UjMmMzBsz5ljCrJCuf9aq7U=";
|
||||
hash = "sha256-Y02KZrbCd3SRBYpgq6gYfpR+TEmg566D3zEvpwcUY3w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,10 +3,10 @@
|
|||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "121.0.1";
|
||||
version = "122.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "7810850a922cb4a274ced6556e14256d3ff518a96f10a0f86d1f8e40daa0a8b1a5cfcc9cbf1391029d920944e94a9149951ee107a0e718a294954bb50b6ced2e";
|
||||
sha512 = "619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
|
|
@ -94,11 +94,11 @@
|
|||
|
||||
firefox-esr-115 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-115";
|
||||
version = "115.6.0esr";
|
||||
version = "115.7.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "9fe23b5f715e35b788d9c8fefe6b7be8785789b4ae6f5649b05a54221934101c6e1b9580319145f9bcaebfbd00fcc33e97afb63f7d57ba102a6b02c874d324af";
|
||||
sha512 = "d468d8ef117d76e0660c5359c3becf0502354c61bdaaeb4137d86f52b50143abec2ac4578af69afa5670700b57efff1c7323ca23e3339a9eaaa888dee7e8e922";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S/D2qaXdBGEJS1/ihPJAEueUvD2bmqG1hpv+HTXCJSQ=";
|
||||
hash = "sha256-wEDxZtmC+SLIYbN+mGTmefcD6VZu87E9E0XhiJPGmK0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk=";
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "firewalld";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firewalld";
|
||||
repo = "firewalld";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nCCIi+UAQqvx+IqQDr6tQj42OHYamvCnKeBJOm6XjZE=";
|
||||
sha256 = "sha256-3kP8Z8YtIcLHOFj9gqspSClsxWiefOqZlJQ5OzNZPeY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -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 = ".";
|
||||
|
|
|
|||
|
|
@ -21,3 +21,23 @@ index 28c95ea9..790b0b73 100644
|
|||
namespace rtc {
|
||||
class BitBuffer;
|
||||
}
|
||||
--- a/src/rtc_base/third_party/base64/base64.h
|
||||
+++ b/src/rtc_base/third_party/base64/base64.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
#define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
--- a/src/modules/audio_processing/transient/file_utils.h
|
||||
+++ b/src/modules/audio_processing/transient/file_utils.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
|
||||
#define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
|
||||
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "rtc_base/system/file_wrapper.h"
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rclone";
|
||||
version = "1.65.1";
|
||||
version = "1.65.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wRksCRQR6JZjYtXgq3iARCoYck76O17Kd2Ht1XpA9KE=";
|
||||
hash = "sha256-P7VJ6pauZ7J8LvyYNi7ANsKrYOcmInZCfRO+X+K6LzI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kWaMo6ALieuwf53H05UdoI7xtH1LAnsD6Ak9bJTa6jc=";
|
||||
vendorHash = "sha256-budC8psvTtfVi3kYOaJ+dy/9H11ekJVkXMmeV9RhXVU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,45 +1,57 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
|
||||
, libX11, glfw, glew, fftwFloat, volk, AppKit
|
||||
, libX11, glfw, glew, fftwFloat, volk, zstd, AppKit
|
||||
# Sources
|
||||
, airspy_source ? true, airspy
|
||||
, airspyhf_source ? true, airspyhf
|
||||
, bladerf_source ? false, libbladeRF
|
||||
, bladerf_source ? true, libbladeRF
|
||||
, file_source ? true
|
||||
, hackrf_source ? true, hackrf
|
||||
, limesdr_source ? false, limesuite
|
||||
, sddc_source ? false
|
||||
, rtl_sdr_source ? true, rtl-sdr, libusb1
|
||||
, limesdr_source ? true, limesuite
|
||||
, perseus_source ? false # needs libperseus-sdr, not yet available in nixpks
|
||||
, plutosdr_source ? stdenv.isLinux, libiio, libad9361
|
||||
, rfspace_source ? true
|
||||
, rtl_sdr_source ? true, rtl-sdr-osmocom, libusb1 # osmocom better w/ rtlsdr v4
|
||||
, rtl_tcp_source ? true
|
||||
, sdrplay_source ? false, sdrplay
|
||||
, soapy_source ? true, soapysdr
|
||||
, spyserver_source ? true
|
||||
, plutosdr_source ? stdenv.isLinux, libiio, libad9361
|
||||
, usrp_source ? false, uhd, boost
|
||||
|
||||
# Sinks
|
||||
, audio_sink ? true, rtaudio
|
||||
, portaudio_sink ? false, portaudio
|
||||
, network_sink ? true
|
||||
, portaudio_sink ? false, portaudio
|
||||
|
||||
# Decoders
|
||||
, falcon9_decoder ? false
|
||||
, m17_decoder ? false, codec2
|
||||
, meteor_demodulator ? true
|
||||
, radio ? true
|
||||
, weather_sat_decoder ? true
|
||||
, weather_sat_decoder ? false # is missing some dsp/pll.h
|
||||
|
||||
# Misc
|
||||
, discord_presence ? true
|
||||
, frequency_manager ? true
|
||||
, recorder ? true
|
||||
, rigctl_server ? true
|
||||
, scanner ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sdrpp";
|
||||
version = "1.0.4";
|
||||
|
||||
# SDR++ uses a rolling release model.
|
||||
# Choose a git hash from head and use the date from that commit as
|
||||
# version qualifier
|
||||
git_hash = "27ab5bf3c194169ddf60ca312723fce96149cc8e";
|
||||
git_date = "2024-01-22";
|
||||
version = "1.1.0-unstable-" + git_date;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexandreRouma";
|
||||
repo = "SDRPlusPlus";
|
||||
rev = version;
|
||||
hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c=";
|
||||
rev = git_hash;
|
||||
hash = "sha256-R4xWeqdHEAaje37VQaGlg+L2iYIOH4tXMHvZkZq4SDU=";
|
||||
};
|
||||
|
||||
patches = [ ./runtime-prefix.patch ];
|
||||
|
|
@ -50,11 +62,14 @@ stdenv.mkDerivation rec {
|
|||
--replace "set(CMAKE_INSTALL_PREFIX" "#set(CMAKE_INSTALL_PREFIX"
|
||||
substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \
|
||||
--replace "codec2.h" "codec2/codec2.h"
|
||||
# Since the __TIME_ and __DATE__ is canonicalized in the build,
|
||||
# use our qualified version shown in the programs window title.
|
||||
substituteInPlace core/src/version.h --replace "1.1.0" "$version"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ glfw glew fftwFloat volk ]
|
||||
buildInputs = [ glfw glew fftwFloat volk zstd ]
|
||||
++ lib.optional stdenv.isDarwin AppKit
|
||||
++ lib.optional stdenv.isLinux libX11
|
||||
++ lib.optional airspy_source airspy
|
||||
|
|
@ -62,42 +77,52 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional bladerf_source libbladeRF
|
||||
++ lib.optional hackrf_source hackrf
|
||||
++ lib.optional limesdr_source limesuite
|
||||
++ lib.optionals rtl_sdr_source [ rtl-sdr libusb1 ]
|
||||
++ lib.optionals rtl_sdr_source [ rtl-sdr-osmocom libusb1 ]
|
||||
++ lib.optional sdrplay_source sdrplay
|
||||
++ lib.optional soapy_source soapysdr
|
||||
++ lib.optionals plutosdr_source [ libiio libad9361 ]
|
||||
++ lib.optionals usrp_source [ uhd boost ]
|
||||
++ lib.optional audio_sink rtaudio
|
||||
++ lib.optional portaudio_sink portaudio
|
||||
++ lib.optional m17_decoder codec2;
|
||||
|
||||
cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
|
||||
OPT_BUILD_AIRSPY_SOURCE = airspy_source;
|
||||
OPT_BUILD_AIRSPYHF_SOURCE = airspyhf_source;
|
||||
OPT_BUILD_BLADERF_SOURCE = bladerf_source;
|
||||
OPT_BUILD_FILE_SOURCE = file_source;
|
||||
OPT_BUILD_HACKRF_SOURCE = hackrf_source;
|
||||
OPT_BUILD_LIMESDR_SOURCE = limesdr_source;
|
||||
OPT_BUILD_SDDC_SOURCE = sddc_source;
|
||||
OPT_BUILD_RTL_SDR_SOURCE = rtl_sdr_source;
|
||||
OPT_BUILD_RTL_TCP_SOURCE = rtl_tcp_source;
|
||||
OPT_BUILD_SDRPLAY_SOURCE = sdrplay_source;
|
||||
OPT_BUILD_SOAPY_SOURCE = soapy_source;
|
||||
OPT_BUILD_SPYSERVER_SOURCE = spyserver_source;
|
||||
OPT_BUILD_PLUTOSDR_SOURCE = plutosdr_source;
|
||||
OPT_BUILD_AUDIO_SINK = audio_sink;
|
||||
OPT_BUILD_PORTAUDIO_SINK = portaudio_sink;
|
||||
OPT_BUILD_NETWORK_SINK = network_sink;
|
||||
OPT_BUILD_NEW_PORTAUDIO_SINK = portaudio_sink;
|
||||
OPT_BUILD_FALCON9_DECODER = falcon9_decoder;
|
||||
OPT_BUILD_M17_DECODER = m17_decoder;
|
||||
OPT_BUILD_METEOR_DEMODULATOR = meteor_demodulator;
|
||||
OPT_BUILD_RADIO = radio;
|
||||
OPT_BUILD_WEATHER_SAT_DECODER = weather_sat_decoder;
|
||||
OPT_BUILD_DISCORD_PRESENCE = discord_presence;
|
||||
OPT_BUILD_FREQUENCY_MANAGER = frequency_manager;
|
||||
OPT_BUILD_RECORDER = recorder;
|
||||
OPT_BUILD_RIGCTL_SERVER = rigctl_server;
|
||||
};
|
||||
cmakeFlags = [
|
||||
# Sources
|
||||
(lib.cmakeBool "OPT_BUILD_AIRSPYHF_SOURCE" airspyhf_source)
|
||||
(lib.cmakeBool "OPT_BUILD_AIRSPY_SOURCE" airspy_source)
|
||||
(lib.cmakeBool "OPT_BUILD_BLADERF_SOURCE" bladerf_source)
|
||||
(lib.cmakeBool "OPT_BUILD_FILE_SOURCE" file_source)
|
||||
(lib.cmakeBool "OPT_BUILD_HACKRF_SOURCE" hackrf_source)
|
||||
(lib.cmakeBool "OPT_BUILD_LIMESDR_SOURCE" limesdr_source)
|
||||
(lib.cmakeBool "OPT_BUILD_PERSEUS_SOURCE" perseus_source)
|
||||
(lib.cmakeBool "OPT_BUILD_PLUTOSDR_SOURCE" plutosdr_source)
|
||||
(lib.cmakeBool "OPT_BUILD_RFSPACE_SOURCE" rfspace_source)
|
||||
(lib.cmakeBool "OPT_BUILD_RTL_SDR_SOURCE" rtl_sdr_source)
|
||||
(lib.cmakeBool "OPT_BUILD_RTL_TCP_SOURCE" rtl_tcp_source)
|
||||
(lib.cmakeBool "OPT_BUILD_SDRPLAY_SOURCE" sdrplay_source)
|
||||
(lib.cmakeBool "OPT_BUILD_SOAPY_SOURCE" soapy_source)
|
||||
(lib.cmakeBool "OPT_BUILD_SPYSERVER_SOURCE" spyserver_source)
|
||||
(lib.cmakeBool "OPT_BUILD_USRP_SOURCE" usrp_source)
|
||||
|
||||
# Sinks
|
||||
(lib.cmakeBool "OPT_BUILD_AUDIO_SINK" audio_sink)
|
||||
(lib.cmakeBool "OPT_BUILD_NETWORK_SINK" network_sink)
|
||||
(lib.cmakeBool "OPT_BUILD_NEW_PORTAUDIO_SINK" portaudio_sink)
|
||||
|
||||
# Decoders
|
||||
(lib.cmakeBool "OPT_BUILD_FALCON9_DECODER" falcon9_decoder)
|
||||
(lib.cmakeBool "OPT_BUILD_M17_DECODER" m17_decoder)
|
||||
(lib.cmakeBool "OPT_BUILD_METEOR_DEMODULATOR" meteor_demodulator)
|
||||
(lib.cmakeBool "OPT_BUILD_RADIO" radio)
|
||||
(lib.cmakeBool "OPT_BUILD_WEATHER_SAT_DECODER" weather_sat_decoder)
|
||||
|
||||
# Misc
|
||||
(lib.cmakeBool "OPT_BUILD_DISCORD_PRESENCE" discord_presence)
|
||||
(lib.cmakeBool "OPT_BUILD_FREQUENCY_MANAGER" frequency_manager)
|
||||
(lib.cmakeBool "OPT_BUILD_RECORDER" recorder)
|
||||
(lib.cmakeBool "OPT_BUILD_RIGCTL_SERVER" rigctl_server)
|
||||
(lib.cmakeBool "OPT_BUILD_SCANNER" scanner)
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.1.47";
|
||||
version = "16.1.49";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-3hsH+RkPPoViKp1bc/88GDVSG8jf9hiPKPkUfe9PIkk=";
|
||||
hash = "sha256-rzW0dB6LkKnbqHMLII6u3a6iJ1nz6gys/TN0fZFcrBk=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "1.9.11";
|
||||
version = "1.9.12";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
|
|
@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-chPZ9nGhFcaExoJDJvFy8terIGZRU6S90RKBYkoWyGQ=";
|
||||
hash = "sha256-hPRp61m/XTXFacYkBOb4SsG4fcFvWrdMfc+sxLk5/sQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -256,9 +256,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
contrib/generate-man.py \
|
||||
po/test-deps
|
||||
|
||||
substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
|
||||
--replace "gdbus" ${glib.bin}/bin/gdbus
|
||||
|
||||
# tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found
|
||||
sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build
|
||||
sed -i 's/test(.*)//' plugins/mtd/meson.build
|
||||
|
|
@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
install -Dm444 -t $out/bin bin/jdtls.py
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/eclipse/eclipse.jdt.ls";
|
||||
description = "Java language server";
|
||||
21
pkgs/by-name/jd/jdt-language-server/update.sh
Normal file
21
pkgs/by-name/jd/jdt-language-server/update.sh
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
DRV_DIR="$PWD"
|
||||
|
||||
# scrape the downloads page for release info
|
||||
newver=$(curl -s 'https://download.eclipse.org/jdtls/milestones/' | xmllint --html - --xmlout 2>/dev/null | xq --raw-output '.html.body.main.div.div.div[0].div.table.tr | max_by(.td[3]).td[1].a.["#text"]')
|
||||
|
||||
prefix="https://download.eclipse.org/jdtls/milestones/$newver"
|
||||
|
||||
filename=$(curl -s "$prefix/latest.txt")
|
||||
newtimestamp=$(echo $filename | sed "s|^.*-$newver-||;s|\.tar\.gz$||")
|
||||
newhash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url "$prefix/$filename"))";
|
||||
|
||||
sed -i default.nix \
|
||||
-e "/^ version =/ s|\".*\"|\"$newver\"|" \
|
||||
-e "/^ timestamp =/ s|\".*\"|\"$newtimestamp\"|" \
|
||||
-e "/^ hash =/ s|\".*\"|\"$newhash\"|" \
|
||||
95
pkgs/by-name/li/live555/package.nix
Normal file
95
pkgs/by-name/li/live555/package.nix
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
{ lib
|
||||
, darwin
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, openssl
|
||||
, stdenv
|
||||
, vlc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "live555";
|
||||
version = "2023.11.30";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://www.live555.com/liveMedia/public/live.${finalAttrs.version}.tar.gz"
|
||||
"https://src.rrz.uni-hamburg.de/files/src/live555/live.${finalAttrs.version}.tar.gz"
|
||||
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-xue+9YtdAM2XkzAY6dU2PZ3n6bvPwlULIHqBqc8wuSU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "cflags-when-darwin.patch";
|
||||
url = "https://github.com/rgaufman/live555/commit/16701af5486bb3a2d25a28edaab07789c8a9ce57.patch?full_index=1";
|
||||
hash = "sha256-IDSdByBu/EBLsUTBe538rWsDwH61RJfAEhvT68Nb9rU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.cctools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# Since NIX_CFLAGS_COMPILE does not differentiate C and C++ toolchains, we
|
||||
# set CXXFLAGS directly
|
||||
env.CXXFLAGS = "-std=c++20";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config.macosx-catalina \
|
||||
--replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \
|
||||
--replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib"
|
||||
sed -i -e 's|/bin/rm|rm|g' genMakefiles
|
||||
sed -i \
|
||||
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
|
||||
config.linux
|
||||
''
|
||||
# condition from icu/base.nix
|
||||
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc"
|
||||
|| stdenv.hostPlatform.libc == "musl") ''
|
||||
substituteInPlace liveMedia/include/Locale.hh \
|
||||
--replace '<xlocale.h>' '<locale.h>'
|
||||
'';
|
||||
|
||||
configurePhase = let
|
||||
platform = if stdenv.isLinux
|
||||
then "linux"
|
||||
else if stdenv.isDarwin
|
||||
then "macosx-catalina"
|
||||
else throw "Unsupported platform: ${stdenv.hostPlatform.system}";
|
||||
in ''
|
||||
runHook preConfigure
|
||||
|
||||
./genMakefiles ${platform}
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
# Downstream dependency
|
||||
inherit vlc;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.live555.com/liveMedia/";
|
||||
description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
|
||||
changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
|
||||
license = with lib.licenses; [ lgpl21Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
189
pkgs/development/compilers/go/1.22.nix
Normal file
189
pkgs/development/compilers/go/1.22.nix
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, tzdata
|
||||
, substituteAll
|
||||
, iana-etc
|
||||
, Security
|
||||
, Foundation
|
||||
, xcbuild
|
||||
, mailcap
|
||||
, buildPackages
|
||||
, pkgsBuildTarget
|
||||
, threadsCross
|
||||
, testers
|
||||
, skopeo
|
||||
, buildGo122Module
|
||||
}:
|
||||
|
||||
let
|
||||
useGccGoBootstrap = stdenv.buildPlatform.isMusl;
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo122Module; };
|
||||
|
||||
goarch = platform: {
|
||||
"aarch64" = "arm64";
|
||||
"arm" = "arm";
|
||||
"armv5tel" = "arm";
|
||||
"armv6l" = "arm";
|
||||
"armv7l" = "arm";
|
||||
"i686" = "386";
|
||||
"mips" = "mips";
|
||||
"mips64el" = "mips64le";
|
||||
"mipsel" = "mipsle";
|
||||
"powerpc64le" = "ppc64le";
|
||||
"riscv64" = "riscv64";
|
||||
"s390x" = "s390x";
|
||||
"x86_64" = "amd64";
|
||||
}.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}");
|
||||
|
||||
# We need a target compiler which is still runnable at build time,
|
||||
# to handle the cross-building case where build != host == target
|
||||
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
|
||||
|
||||
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.22rc2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-0ZOofbgiOCHh7oke3+42yOrJugz4PkLt5keVp96Kfyc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
buildInputs = [ ]
|
||||
++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
|
||||
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
|
||||
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
|
||||
|
||||
depsBuildTarget = lib.optional isCross targetCC;
|
||||
|
||||
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./iana-etc-1.17.patch;
|
||||
iana = iana-etc;
|
||||
})
|
||||
# Patch the mimetype database location which is missing on NixOS.
|
||||
# but also allow static binaries built with NixOS to run outside nix
|
||||
(substituteAll {
|
||||
src = ./mailcap-1.17.patch;
|
||||
inherit mailcap;
|
||||
})
|
||||
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
|
||||
# that run outside a nix server
|
||||
(substituteAll {
|
||||
src = ./tzdata-1.19.patch;
|
||||
inherit tzdata;
|
||||
})
|
||||
./remove-tools-1.11.patch
|
||||
./go_no_vendor_checks-1.22.patch
|
||||
];
|
||||
|
||||
GOOS = stdenv.targetPlatform.parsed.kernel.name;
|
||||
GOARCH = goarch stdenv.targetPlatform;
|
||||
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
|
||||
# Go will nevertheless build a for host system that we will copy over in
|
||||
# the install phase.
|
||||
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
|
||||
GOHOSTARCH = goarch stdenv.buildPlatform;
|
||||
|
||||
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
|
||||
# to be different from CC/CXX
|
||||
CC_FOR_TARGET =
|
||||
if isCross then
|
||||
"${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
else
|
||||
null;
|
||||
CXX_FOR_TARGET =
|
||||
if isCross then
|
||||
"${targetCC}/bin/${targetCC.targetPrefix}c++"
|
||||
else
|
||||
null;
|
||||
|
||||
GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
|
||||
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
# this is compiled into the binary
|
||||
export GOROOT_FINAL=$out/share/go
|
||||
|
||||
export PATH=$(pwd)/bin:$PATH
|
||||
|
||||
${lib.optionalString isCross ''
|
||||
# Independent from host/target, CC should produce code for the building system.
|
||||
# We only set it when cross-compiling.
|
||||
export CC=${buildPackages.stdenv.cc}/bin/cc
|
||||
''}
|
||||
ulimit -a
|
||||
|
||||
pushd src
|
||||
./make.bash
|
||||
popd
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Contains the wrong perl shebang when cross compiling,
|
||||
# since it is not used for anything we can deleted as well.
|
||||
rm src/regexp/syntax/make_perl_groups.pl
|
||||
'' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''
|
||||
mv bin/*_*/* bin
|
||||
rmdir bin/*_*
|
||||
${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) ''
|
||||
rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
|
||||
''}
|
||||
'' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
|
||||
rm -rf bin/*_*
|
||||
${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) ''
|
||||
rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
|
||||
''}
|
||||
'');
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $GOROOT_FINAL
|
||||
cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL
|
||||
mkdir -p $out/bin
|
||||
ln -s $GOROOT_FINAL/bin/* $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
passthru = {
|
||||
inherit goBootstrap skopeoTest;
|
||||
tests = {
|
||||
skopeo = testers.testVersion { package = skopeoTest; };
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "go version";
|
||||
version = "go${finalAttrs.version}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
|
||||
description = "The Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
mainProgram = "go";
|
||||
};
|
||||
})
|
||||
23
pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch
Normal file
23
pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
Starting from go1.14, go verifes that vendor/modules.txt matches the requirements
|
||||
and replacements listed in the main module go.mod file, and it is a hard failure if
|
||||
vendor/modules.txt is missing.
|
||||
|
||||
Relax module consistency checks and switch back to pre go1.14 behaviour if
|
||||
vendor/modules.txt is missing regardless of go version requirement in go.mod.
|
||||
|
||||
This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
|
||||
See https://github.com/golang/go/issues/37948 for discussion.
|
||||
|
||||
diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go
|
||||
index b2cb44100e..05bf3829d5 100644
|
||||
--- a/src/cmd/go/internal/modload/vendor.go
|
||||
+++ b/src/cmd/go/internal/modload/vendor.go
|
||||
@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m
|
||||
panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes)))
|
||||
}
|
||||
index := indexes[0]
|
||||
- if gover.Compare(index.goVersion, "1.14") < 0 {
|
||||
+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
|
||||
// Go versions before 1.14 did not include enough information in
|
||||
// vendor/modules.txt to check for consistency.
|
||||
// If we know that we're on an earlier version, relax the consistency check.
|
||||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, darwin
|
||||
, openssl
|
||||
|
||||
# major and only downstream dependency
|
||||
, vlc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "live555";
|
||||
version = "2023.05.10";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://www.live555.com/liveMedia/public/live.${version}.tar.gz"
|
||||
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config.macosx-catalina \
|
||||
--replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \
|
||||
--replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib"
|
||||
sed -i -e 's|/bin/rm|rm|g' genMakefiles
|
||||
sed -i \
|
||||
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
|
||||
config.linux
|
||||
'' # condition from icu/base.nix
|
||||
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") ''
|
||||
substituteInPlace liveMedia/include/Locale.hh \
|
||||
--replace '<xlocale.h>' '<locale.h>'
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
./genMakefiles ${
|
||||
if stdenv.isLinux then
|
||||
"linux"
|
||||
else if stdenv.isDarwin then
|
||||
"macosx-catalina"
|
||||
else
|
||||
throw "Unsupported platform ${stdenv.hostPlatform.system}"}
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
"PREFIX="
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit vlc;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.live555.com/liveMedia/";
|
||||
description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
|
||||
changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "5.5.8";
|
||||
version = "5.5.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-C3A7mNsiTe50jKD98zjU37GL20zw5SNSVte+GtrvbFA=";
|
||||
hash = "sha256-yBB66H8l+kjVcpmt3gYzggRgfxjFvMPwy3rcYuKYqks=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "blurhash-python";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "woltapp";
|
||||
repo = "blurhash-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z7V2Ck8h12Vuj/5/s9ZP/uqQ4olo8xwg+ZR3iW4ca/M=";
|
||||
hash = "sha256-Cz+PkPp1knvT3U5ofyb1PstM9kzBOkgPbx03LgOLXgw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.25";
|
||||
version = "1.34.26";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-cyIZICHgSSIE0iOqyIDU0r39OQ8+fzh00enhmPgkg2c=";
|
||||
hash = "sha256-65EItCrdCs4ocQQr+0HToSRqHkR8tHp3EEIniopoSb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2,47 +2,44 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jsonschema
|
||||
, pytestCheckHook
|
||||
, unittestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cvss";
|
||||
version = "2.6";
|
||||
format = "setuptools";
|
||||
version = "3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedHatProductSecurity";
|
||||
repo = pname;
|
||||
repo = "cvss";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY=";
|
||||
hash = "sha256-xrkWpE13Y4KgQEZjitWE3Ka+IyfShqE2cj0/yzsAnX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
jsonschema
|
||||
pytestCheckHook
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cvss"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require additional data
|
||||
"test_calculator"
|
||||
"test_cvsslib"
|
||||
"test_json_ordering"
|
||||
"test_json_schema_repr"
|
||||
"test_random"
|
||||
"test_rh_vector"
|
||||
"test_simple"
|
||||
"test_simple_31"
|
||||
];
|
||||
preCheck = ''
|
||||
cd tests
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for CVSS2/3";
|
||||
description = "Library for CVSS2/3/4";
|
||||
homepage = "https://github.com/RedHatProductSecurity/cvss";
|
||||
changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}";
|
||||
license = with licenses; [ lgpl3Plus ];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = "dvc-data";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ycC6NWvU00yUEHu62H5VLKDEZEHyIo4+TBwj5XaswII=";
|
||||
hash = "sha256-i9pFdGMzUypUFZKtE4k1w116r+NjfIECg1a6xw9TpG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.41.0";
|
||||
version = "3.42.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -67,7 +67,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = "dvc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-j4UkPHav97s5GAuR9yYWaI1ObfKcsyozlTDC9jeBfK4=";
|
||||
hash = "sha256-NTviaNhGe3hisP32Ccp1wHTrKXHZZP7gJFwDy7BlI/M=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2024.1.7";
|
||||
version = "2024.1.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = "hahomematic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-98biJ/BXFZV55FMRvT8QexzWVB2rfF/YVa66+HU06mI=";
|
||||
hash = "sha256-ln+Dich2I503LA5nIWK9k3B83LjIBsRUmBv2xJmFRQI=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user