Merge branch 'master' into haskell-updates
This commit is contained in:
maralorn
commit
5e811b3a0b
125 changed files with 4997 additions and 3299 deletions
|
|
@ -11044,6 +11044,16 @@
|
|||
githubId = 34162313;
|
||||
name = "Jason Wing";
|
||||
};
|
||||
netfox = {
|
||||
name = "netfox";
|
||||
email = "say-hi@netfox.rip";
|
||||
matrix = "@netfox:catgirl.cloud";
|
||||
github = "0xnetfox";
|
||||
githubId = 97521402;
|
||||
keys = [{
|
||||
fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7";
|
||||
}];
|
||||
};
|
||||
netixx = {
|
||||
email = "dev.espinetfrancois@gmail.com";
|
||||
github = "netixx";
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `libxcrypt`, the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, Dovecot, and [many other packages](https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20libxcrypt&type=code).
|
||||
|
||||
- `boot.bootspec.enable` (internal option) is now enabled by default because [RFC-0125](https://github.com/NixOS/rfcs/pull/125) was merged. This means you will have a bootspec document called `boot.json` generated for each system and specialisation in the top-level. This is useful to enable advanced boot usecases in NixOS such as SecureBoot.
|
||||
|
||||
## New Services {#sec-release-23.05-new-services}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
@ -282,7 +284,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- `services.openssh.ciphers` to `services.openssh.settings.Ciphers`
|
||||
- `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts`
|
||||
|
||||
- `netbox` was updated to 3.4. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's [breaking changes](https://github.com/netbox-community/netbox/releases/tag/v3.4.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
|
||||
- `netbox` was updated to 3.5. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's breaking changes [for 3.4.0](https://github.com/netbox-community/netbox/releases/tag/v3.4.0) and [for 3.5.0](https://github.com/netbox-community/netbox/releases/tag/v3.5.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
|
||||
|
||||
- `services.netbox` now support RFC42-style options, through `services.netbox.settings`.
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in {
|
|||
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
"${lib.getExe pkgs.auto-cpufreq} --config ${cfgFile}"
|
||||
"${lib.getExe pkgs.auto-cpufreq} --daemon --config ${cfgFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
#V1: {
|
||||
import "struct"
|
||||
|
||||
#BootspecV1: {
|
||||
system: string
|
||||
init: string
|
||||
initrd?: string
|
||||
|
|
@ -7,12 +9,23 @@
|
|||
kernelParams: [...string]
|
||||
label: string
|
||||
toplevel: string
|
||||
specialisation?: {
|
||||
[=~"^"]: #V1
|
||||
}
|
||||
extensions?: {...}
|
||||
}
|
||||
|
||||
Document: {
|
||||
v1: #V1
|
||||
// A restricted document does not allow any official specialisation
|
||||
// information in it to avoid "recursive specialisations".
|
||||
#RestrictedDocument: struct.MinFields(1) & {
|
||||
"org.nixos.bootspec.v1": #BootspecV1
|
||||
[=~"^"]: #BootspecExtension
|
||||
}
|
||||
|
||||
// Specialisations are a hashmap of strings
|
||||
#BootspecSpecialisationV1: [string]: #RestrictedDocument
|
||||
|
||||
// Bootspec extensions are defined by the extension author.
|
||||
#BootspecExtension: {...}
|
||||
|
||||
// A "full" document allows official specialisation information
|
||||
// in the top-level with a reserved namespaced key.
|
||||
Document: #RestrictedDocument & {
|
||||
"org.nixos.specialisation.v1"?: #BootspecSpecialisationV1
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,20 +16,20 @@ let
|
|||
filename = "boot.json";
|
||||
json =
|
||||
pkgs.writeText filename
|
||||
(builtins.toJSON
|
||||
(builtins.toJSON
|
||||
# Merge extensions first to not let them shadow NixOS bootspec data.
|
||||
(cfg.extensions //
|
||||
{
|
||||
v1 = {
|
||||
"org.nixos.bootspec.v1" = {
|
||||
system = config.boot.kernelPackages.stdenv.hostPlatform.system;
|
||||
kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
|
||||
kernelParams = config.boot.kernelParams;
|
||||
label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
|
||||
|
||||
inherit (cfg) extensions;
|
||||
} // lib.optionalAttrs config.boot.initrd.enable {
|
||||
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
|
||||
initrdSecrets = "${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets";
|
||||
};
|
||||
});
|
||||
}));
|
||||
|
||||
generator =
|
||||
let
|
||||
|
|
@ -42,8 +42,8 @@ let
|
|||
toplevelInjector = lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
''
|
||||
.v1.toplevel = $toplevel |
|
||||
.v1.init = $init
|
||||
."org.nixos.bootspec.v1".toplevel = $toplevel |
|
||||
."org.nixos.bootspec.v1".init = $init
|
||||
''
|
||||
"--sort-keys"
|
||||
"--arg" "toplevel" "${placeholder "out"}"
|
||||
|
|
@ -62,14 +62,10 @@ let
|
|||
lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
"--sort-keys"
|
||||
".v1.specialisation = ($ARGS.named | map_values(. | first | .v1))"
|
||||
''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))''
|
||||
] + " ${lib.concatStringsSep " " specialisationLoader}";
|
||||
in
|
||||
''
|
||||
mkdir -p $out/bootspec
|
||||
|
||||
${toplevelInjector} | ${specialisationInjector} > $out/${filename}
|
||||
'';
|
||||
"${toplevelInjector} | ${specialisationInjector} > $out/${filename}";
|
||||
|
||||
validator = pkgs.writeCueValidator ./bootspec.cue {
|
||||
document = "Document"; # Universal validator for any version as long the schema is correctly set.
|
||||
|
|
@ -79,10 +75,17 @@ let
|
|||
in
|
||||
{
|
||||
options.boot.bootspec = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Enable generation of RFC-0125 bootspec in $system/bootspec, e.g. /run/current-system/bootspec");
|
||||
enable = lib.mkEnableOption (lib.mdDoc "the generation of RFC-0125 bootspec in $system/boot.json, e.g. /run/current-system/boot.json")
|
||||
// { default = true; internal = true; };
|
||||
enableValidation = lib.mkEnableOption (lib.mdDoc ''the validation of bootspec documents for each build.
|
||||
This will introduce Go in the build-time closure as we are relying on [Cuelang](https://cuelang.org/) for schema validation.
|
||||
Enable this option if you want to ascertain that your documents are correct.
|
||||
''
|
||||
);
|
||||
|
||||
extensions = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.attrs; # <namespace>: { ...namespace-specific fields }
|
||||
# NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation.
|
||||
type = lib.types.attrsOf lib.types.anything; # <namespace>: { ...namespace-specific fields }
|
||||
default = { };
|
||||
description = lib.mdDoc ''
|
||||
User-defined data that extends the bootspec document.
|
||||
|
|
@ -112,15 +115,4 @@ in
|
|||
default = schemas.v1.filename;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (cfg.enable) {
|
||||
warnings = [
|
||||
''RFC-0125 is not merged yet, this is a feature preview of bootspec.
|
||||
The schema is not definitive and features are not guaranteed to be stable until RFC-0125 is merged.
|
||||
See:
|
||||
- https://github.com/NixOS/nixpkgs/pull/172237 to track merge status in nixpkgs.
|
||||
- https://github.com/NixOS/rfcs/pull/125 to track RFC status.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,7 +82,8 @@ let
|
|||
|
||||
${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) ''
|
||||
${config.boot.bootspec.writer}
|
||||
${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}"
|
||||
${optionalString config.boot.bootspec.enableValidation
|
||||
''${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}"''}
|
||||
''}
|
||||
|
||||
${config.system.extraSystemBuilderCmds}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ in
|
|||
|
||||
machine.succeed("test -e /run/current-system/boot.json")
|
||||
|
||||
bootspec = json.loads(machine.succeed("jq -r '.v1' /run/current-system/boot.json"))
|
||||
bootspec = json.loads(machine.succeed("jq -r '.\"org.nixos.bootspec.v1\"' /run/current-system/boot.json"))
|
||||
|
||||
assert all(key in bootspec for key in ('initrd', 'initrdSecrets')), "Bootspec should contain initrd or initrdSecrets field when initrd is enabled"
|
||||
'';
|
||||
|
|
@ -136,10 +136,10 @@ in
|
|||
machine.succeed("test -e /run/current-system/boot.json")
|
||||
machine.succeed("test -e /run/current-system/specialisation/something/boot.json")
|
||||
|
||||
sp_in_parent = json.loads(machine.succeed("jq -r '.v1.specialisation.something' /run/current-system/boot.json"))
|
||||
sp_in_parent = json.loads(machine.succeed("jq -r '.\"org.nixos.specialisation.v1\".something' /run/current-system/boot.json"))
|
||||
sp_in_fs = json.loads(machine.succeed("cat /run/current-system/specialisation/something/boot.json"))
|
||||
|
||||
assert sp_in_parent == sp_in_fs['v1'], "Bootspecs of the same specialisation are different!"
|
||||
assert sp_in_parent['org.nixos.bootspec.v1'] == sp_in_fs['org.nixos.bootspec.v1'], "Bootspecs of the same specialisation are different!"
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -152,7 +152,9 @@ in
|
|||
imports = [ standard ];
|
||||
environment.systemPackages = [ pkgs.jq ];
|
||||
boot.bootspec.extensions = {
|
||||
osRelease = config.environment.etc."os-release".source;
|
||||
"org.nix-tests.product" = {
|
||||
osRelease = config.environment.etc."os-release".source;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -161,7 +163,7 @@ in
|
|||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
current_os_release = machine.succeed("cat /etc/os-release")
|
||||
bootspec_os_release = machine.succeed("cat $(jq -r '.v1.extensions.osRelease' /run/current-system/boot.json)")
|
||||
bootspec_os_release = machine.succeed("cat $(jq -r '.\"org.nix-tests.product\".osRelease' /run/current-system/boot.json)")
|
||||
|
||||
assert current_os_release == bootspec_os_release, "Filename referenced by extension has unexpected contents"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, clangStdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, flac
|
||||
}:
|
||||
|
||||
# gcc only supports objc on darwin
|
||||
buildGoModule.override { stdenv = clangStdenv; } rec {
|
||||
buildGoModule rec {
|
||||
pname = "go-musicfox";
|
||||
version = "4.0.5";
|
||||
|
||||
|
|
@ -45,6 +43,6 @@ buildGoModule.override { stdenv = clangStdenv; } rec {
|
|||
homepage = "https://github.com/anhoder/go-musicfox";
|
||||
license = licenses.mit;
|
||||
mainProgram = "musicfox";
|
||||
maintainers = with maintainers; [ zendo Ruixi-rebirth ];
|
||||
maintainers = with maintainers; [ zendo Ruixi-rebirth aleksana ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmmp";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo=";
|
||||
hash = "sha256-+bHnvwXUmdBbQcO3Unybqou/MZgcf6CXhlAcBjNFCNQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "7.6.3";
|
||||
version = "7.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cNR4Ffn9HvgL5KV4FUSnbzEh6VfoKaIbfpb18/qKEns=";
|
||||
hash = "sha256-xMUQ2LabxuvCdd7dsoXPN3tjkDxfXIQ8UrJcsGQ+EEU=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
|||
|
|
@ -2,22 +2,54 @@
|
|||
, fetchFromGitHub
|
||||
, lib
|
||||
, rustPlatform
|
||||
, IOKit
|
||||
, Security
|
||||
, AppKit
|
||||
, pkg-config
|
||||
, darwin
|
||||
, udev
|
||||
, zlib
|
||||
, protobuf
|
||||
, libcxx
|
||||
, rocksdb
|
||||
, pkg-config
|
||||
, openssl
|
||||
, nix-update-script
|
||||
# Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84
|
||||
, solanaPkgs ? [
|
||||
"solana"
|
||||
"solana-bench-tps"
|
||||
"solana-faucet"
|
||||
"solana-gossip"
|
||||
"solana-install"
|
||||
"solana-keygen"
|
||||
"solana-log-analyzer"
|
||||
"solana-net-shaper"
|
||||
"solana-sys-tuner"
|
||||
"rbpf-cli"
|
||||
"solana-validator"
|
||||
"solana-ledger-tool"
|
||||
"cargo-build-bpf"
|
||||
"cargo-test-bpf"
|
||||
"solana-dos"
|
||||
"solana-install-init"
|
||||
"solana-stake-accounts"
|
||||
"solana-test-validator"
|
||||
"solana-tokens"
|
||||
"solana-watchtower"
|
||||
"cargo-test-sbf"
|
||||
"cargo-build-sbf"
|
||||
] ++ [
|
||||
# XXX: Ensure `solana-genesis` is built LAST!
|
||||
# See https://github.com/solana-labs/solana/issues/5826
|
||||
"solana-genesis"
|
||||
]
|
||||
}:
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
version = pinData.version;
|
||||
sha256 = pinData.sha256;
|
||||
cargoSha256 = pinData.cargoSha256;
|
||||
version = "1.14.17";
|
||||
sha256 = "sha256-pYbnEF8MgF7fCBf/MOPT//UCeOQj9tuIkDj8UIVFz3E=";
|
||||
cargoSha256 = "sha256-n9nuBiKV3FCgq5fJ5BuqIIAp1yZ6IO+zHjrMaUBfgzs=";
|
||||
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "solana-testnet-cli";
|
||||
pname = "solana-cli";
|
||||
inherit version cargoSha256;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -27,35 +59,52 @@ rustPlatform.buildRustPackage rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "cli";
|
||||
strictDeps = true;
|
||||
verifyCargoDeps = true;
|
||||
cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ protobuf pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ udev zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit Security AppKit ];
|
||||
|
||||
# check phase fails
|
||||
# on darwin with missing framework System. This framework is not available in nixpkgs
|
||||
# on linux with some librocksdb-sys compilation error
|
||||
# Even tho the tests work, a shit ton of them try to connect to a local RPC
|
||||
# or access internet in other ways, eventually failing due to Nix sandbox.
|
||||
# Maybe we could restrict the check to the tests that don't require an RPC,
|
||||
# but judging by the quantity of tests, that seems like a lengthty work and
|
||||
# I'm not in the mood ((ΦωΦ))
|
||||
doCheck = false;
|
||||
|
||||
# all the following are needed for the checkphase
|
||||
# nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ];
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
# OPENSSL_NO_VENDOR = 1;
|
||||
# OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
|
||||
# OPENSSL_DIR="${lib.getDev openssl}";
|
||||
# LLVM_CONFIG_PATH="${llvm}/bin/llvm-config";
|
||||
# LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
|
||||
nativeBuildInputs = [ protobuf pkg-config ];
|
||||
buildInputs = [ openssl rustPlatform.bindgenHook ]
|
||||
++ lib.optionals stdenv.isLinux [ udev ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libcxx
|
||||
IOKit
|
||||
Security
|
||||
AppKit
|
||||
System
|
||||
Libsystem ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin/sdk/bpf
|
||||
cp -a ./sdk/bpf/* $out/bin/sdk/bpf/
|
||||
'';
|
||||
|
||||
# Used by build.rs in the rocksdb-sys crate. If we don't set these, it would
|
||||
# try to build RocksDB from source.
|
||||
# ROCKSDB_INCLUDE_DIR="${rocksdb}/include";
|
||||
# ROCKSDB_LIB_DIR="${rocksdb}/lib";
|
||||
ROCKSDB_LIB_DIR="${rocksdb}/lib";
|
||||
|
||||
# Require this on darwin otherwise the compiler starts rambling about missing
|
||||
# cmath functions
|
||||
CPPFLAGS=lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1";
|
||||
LDFLAGS=lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib";
|
||||
|
||||
# If set, always finds OpenSSL in the system, even if the vendored feature is enabled.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. ";
|
||||
homepage = "https://solana.com";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
maintainers = with maintainers; [ netfox happysalada ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"version": "1.10.9",
|
||||
"sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=",
|
||||
"cargoSha256": "sha256-7EULmmztt+INvSdluvvX5xbE2hWKAmHiW0MEYIPNPw4="
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
|
||||
|
||||
# TODO set to `verbose` or `extdebug` once implemented in oil
|
||||
shopt --set xtrace
|
||||
# we need failures inside of command subs to get the correct cargoSha256
|
||||
shopt --unset inherit_errexit
|
||||
|
||||
const directory = $(dirname $0 | xargs realpath)
|
||||
const owner = "solana-labs"
|
||||
const repo = "solana"
|
||||
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
|
||||
jq -r '.tag_name')
|
||||
const latest_version = $(echo $latest_rev | sd 'v' '')
|
||||
const current_version = $(jq -r '.version' $directory/pin.json)
|
||||
if ("$latest_version" === "$current_version") {
|
||||
echo "solana is already up-to-date"
|
||||
return 0
|
||||
} else {
|
||||
const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
|
||||
const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
|
||||
|
||||
jq ".version = \"$latest_version\" | \
|
||||
.\"sha256\" = \"$tarball_hash\" | \
|
||||
.\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
|
||||
|
||||
const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \
|
||||
tail -n 2 | \
|
||||
head -n 1 | \
|
||||
sd '\s+got:\s+' '')
|
||||
|
||||
jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, git
|
||||
, pkg-config
|
||||
, gperf
|
||||
, libmicrohttpd
|
||||
, openssl
|
||||
|
|
@ -12,25 +13,22 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ton";
|
||||
version = "2023.01";
|
||||
version = "2023.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ton-blockchain";
|
||||
repo = "ton";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wb96vh0YcTBFE8EzBItdTf88cvRMLW2XxcGJpNetOi8=";
|
||||
sha256 = "sha256-3HQF0wKk0iRV5fKzuCTv7X7MC+snMDrodgqScCZQVY4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# without this fails on aarch64-darwin with clang-11: error: the clang compiler does not support '-mcpu=apple-m1'
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'set(TON_ARCH "apple-m1")' ""
|
||||
'';
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -44,6 +42,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A fully decentralized layer-1 blockchain designed by Telegram";
|
||||
homepage = "https://ton.org/";
|
||||
changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md";
|
||||
license = licenses.lgpl2Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ misuzu ];
|
||||
|
|
|
|||
|
|
@ -2975,14 +2975,14 @@ final: prev:
|
|||
|
||||
feline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "feline.nvim";
|
||||
version = "2022-12-22";
|
||||
version = "2023-03-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "famiu";
|
||||
owner = "freddiehaddad";
|
||||
repo = "feline.nvim";
|
||||
rev = "d48b6f92c6ccdd6654c956f437be49ea160b5b0c";
|
||||
sha256 = "1d3sj499mj63djy2bjp7yx5qyrzsq8gphzy3wl9fnfnni1bzwg4g";
|
||||
rev = "a02bcdde649cdfca0e25d2dd693ba140233b5c3e";
|
||||
sha256 = "0s646hd3pbzv5i8vpsk019hwgyqnrd3qhm6lzilqlydrz3yx3b87";
|
||||
};
|
||||
meta.homepage = "https://github.com/famiu/feline.nvim/";
|
||||
meta.homepage = "https://github.com/freddiehaddad/feline.nvim/";
|
||||
};
|
||||
|
||||
fennel-vim = buildVimPluginFrom2Nix {
|
||||
|
|
@ -14315,6 +14315,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/mattn/webapi-vim/";
|
||||
};
|
||||
|
||||
wgsl-vim = buildVimPluginFrom2Nix {
|
||||
pname = "wgsl.vim";
|
||||
version = "2023-04-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DingDean";
|
||||
repo = "wgsl.vim";
|
||||
rev = "b72cb2c28ec9554be240113bceb34198f88484e6";
|
||||
sha256 = "1l1y9dwp33g5gp5mvyq4vkw8q8369r493i0qfn81nmwnmc09rsbn";
|
||||
};
|
||||
meta.homepage = "https://github.com/DingDean/wgsl.vim/";
|
||||
};
|
||||
|
||||
which-key-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "which-key.nvim";
|
||||
version = "2023-04-18";
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ https://github.com/fenetikm/falcon/,,
|
|||
https://github.com/brooth/far.vim/,,
|
||||
https://github.com/konfekt/fastfold/,,
|
||||
https://github.com/lilydjwg/fcitx.vim/,fcitx5,
|
||||
https://github.com/feline-nvim/feline.nvim/,,
|
||||
https://github.com/freddiehaddad/feline.nvim/,,
|
||||
https://github.com/bakpakin/fennel.vim/,,
|
||||
https://github.com/lambdalisue/fern.vim/,,
|
||||
https://github.com/wincent/ferret/,,
|
||||
|
|
@ -1202,6 +1202,7 @@ https://github.com/navicore/vissort.vim/,,
|
|||
https://github.com/liuchengxu/vista.vim/,,
|
||||
https://github.com/dylanaraps/wal.vim/,,
|
||||
https://github.com/mattn/webapi-vim/,,
|
||||
https://github.com/DingDean/wgsl.vim/,HEAD,
|
||||
https://github.com/folke/which-key.nvim/,,
|
||||
https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD,
|
||||
https://github.com/gelguy/wilder.nvim/,,
|
||||
|
|
|
|||
|
|
@ -59,6 +59,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "cli" true)
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gstreamer
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "6.16.0";
|
||||
version = "6.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-2Lhp9PBZ19svq26PoldJ1H8tmt95MwY0l7+g6mPUvFI=";
|
||||
hash = "sha256-HKSruKXYUMH1lj43CA3Rp3lXNlONXE1P9gFLaH16No4=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elfx86exts";
|
||||
version = "0.5.0";
|
||||
version = "unstable-2023-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkgw";
|
||||
repo = pname;
|
||||
rev = "${pname}@${version}";
|
||||
sha256 = "sha256-SDBs5/jEvoKEVKCHQLz2z+CZSSmESP7LoIITRN4qJWA=";
|
||||
rev = "26bf98cf1fc773196e594c48bfe808d7151076f6";
|
||||
hash = "sha256-xNmaKGbMN92CPIQQRbdmeePk5Wt9XcIsB/2vbk5NJzg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-fYtFRdH6U8uWshdD1Pb1baE8slo6qajx10tDK3Ukknw=";
|
||||
cargoHash = "sha256-NH7QK8a+ndhZGlLa3gWlnQdBQil1pi2AAi5TtFgkVf0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Decode x86 binaries and print out which instruction set extensions they use.";
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flowtime";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Diego-Ivan";
|
||||
repo = "Flowtime";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-op643yU7KdkTO9hT0iYTIqBP4oPe0MT1R5I3FAtN0/I=";
|
||||
hash = "sha256-aXGdHFj9P8+33VuR8YBi+YYN/vBn94drmtKzNDc4SAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "jetbrains-toolbox";
|
||||
version = "1.27.3.14493";
|
||||
version = "1.28.0.15158";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
|
||||
sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY=";
|
||||
sha256 = "sha256-IHs3tQtFXGS9xa5lKwSEWvp8aNffrCjNcoVE4tGX9ak=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core, rbw }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rofi-rbw";
|
||||
|
|
@ -21,6 +21,10 @@ buildPythonApplication rec {
|
|||
|
||||
pythonImportsCheck = [ "rofi_rbw" ];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ rbw ]})
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rofi frontend for Bitwarden";
|
||||
homepage = "https://github.com/fdw/rofi-rbw";
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "113.0.5672.53",
|
||||
"sha256": "0k91xx3fm0kywjn00s9b7p776882b1mfajf2ig0iz3jac6rprh56",
|
||||
"sha256bin64": "1pzpigz8l6hsddb7v2g9m5d32hlq979l1cpj2yfnc6dixjs8x053",
|
||||
"version": "113.0.5672.63",
|
||||
"sha256": "07pf28yy5c4xw1xkycgzq53zbj14zvhh00sv601nggisq4fw3kkn",
|
||||
"sha256bin64": "1n1bcim5wfafa3bl9grp3ckmnbi1mzhdxz8pim408wz892da34zl",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-03-18",
|
||||
|
|
@ -32,15 +32,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "114.0.5720.4",
|
||||
"sha256": "1q9r4m1gda1mq0nwi00yfpxsqdghd0qb3k7a0xa9py8l6jcv8ifa",
|
||||
"sha256bin64": "15ss5xix773yn4g24ww9bw38g7wxgwhdqbgmwy44yvp0yl824czb",
|
||||
"version": "114.0.5735.6",
|
||||
"sha256": "0wxlfqxrawk77yzm00hb1fbssrycl4mha53wm4y5mlb8warqs5jk",
|
||||
"sha256bin64": "0vlb6zr50kn7i0rfvy3yvwzcffpg5ki7is8i3ck43b1gr1bsmgmb",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-04-07",
|
||||
"version": "2023-04-19",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "ffeea1b1fd070cb6a8d47154a03f8523486b50a7",
|
||||
"sha256": "0xpwh06a82nb4j9ifr878rij97dikfcjfbc08cnkmxrx7hs1sjdw"
|
||||
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
|
||||
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K/RUEr9WJU1tocESvBF48F890vMgCRANM0lqn644eeg=";
|
||||
sha256 = "sha256-E/14YYX4EFakzBsaUxy1SZAaBCIKmgpWlY/9EazWWFI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kn";
|
||||
version = "1.7.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knative";
|
||||
repo = "client";
|
||||
rev = "knative-v${version}";
|
||||
sha256 = "sha256-rcjAdujiK6urn14eG27Lnq/6g+O0n2KmrL7k8A5ONjg=";
|
||||
sha256 = "sha256-LkjE3GMHoD+PmB4J09xf71nBrY1KPvh13l2O3QN9EH0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "cmd/kn" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "stable";
|
||||
version = "2.13.1";
|
||||
sha256 = "1qsf2d4haqs93qf88f2vvjsgm5a5gnmivkdpdbvpwy0q8bd8rfnj";
|
||||
version = "2.13.2";
|
||||
sha256 = "0pcb4f8s8l156y0zd9g9f0pyydvp52n02krjy2giajp00gaqx3s3";
|
||||
vendorSha256 = "sha256-6KuXEKuQJvRNUM+6Uo+J9D3eHI+1tt62C5XZsEDwkTc=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rke";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2qqEpH3Lkd7Ok+KBcRpRWiaUp0kN6j0YGURsX/qe3No=";
|
||||
hash = "sha256-ldN0Fqh0V6JziTy5ml/i/un4/1o8MSeIAvrH5EyOeiw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wuEsG2VKU4F/phSqpzUN3wChD93V4AE7poVLJu6kpF0=";
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@
|
|||
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-6PStzU5YBhFDGtQOWUZ8Iyo9miRCTMgDsuJX0rNCYMQ=",
|
||||
"hash": "sha256-8jtZ+uhCpktt1e99j2I1C/sE69uOv911qbuaKTjv2DM=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.203.0",
|
||||
"rev": "v1.204.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -128,11 +128,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-tStlnMSlkkL+X/DP0SBmnm7xL6dH8HfyiaKY/McuMQE=",
|
||||
"hash": "sha256-1K+uM8uRpFigr9scvBL/FDoqc7TKh4ZnppEHnl8i8EA=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.53.0",
|
||||
"rev": "v3.54.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -164,22 +164,22 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-2JTJF+zYuf9ZKaEMSOxxjODbmIBXnhpwE8LJUdRIkYY=",
|
||||
"hash": "sha256-lm/BNxfB5ZosyFYihJ6kh8oro+tCP6pRFNnWrvzeKgk=",
|
||||
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
|
||||
"owner": "DrFaust92",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.31.0",
|
||||
"rev": "v2.32.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mnG2CZ/ko4p4CTs0YskJP41sQD9lmEz4dRQLiklim34="
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-e4WvQKtf6zVEZ74c+lE3ZkbX24rPazp8MrJCNQDTz2c=",
|
||||
"hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=",
|
||||
"homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
|
||||
"owner": "brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v3.3.0",
|
||||
"rev": "v3.4.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI="
|
||||
"vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-/LTUDnE5XB8Gwbs+CroJW+3pM7opNSVQFWvRQWQjFqc=",
|
||||
|
|
@ -539,11 +539,11 @@
|
|||
"vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg="
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-VK/b74pGB8vjaWmUi8Zz4K5utIUYlfeYk18YZF8J1jI=",
|
||||
"hash": "sha256-8ilj+9aCZAlNhQ3OMF6uWFfAAVtISfS6eahywmPAb98=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.47.1",
|
||||
"rev": "v1.48.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -737,13 +737,13 @@
|
|||
"vendorHash": "sha256-Mdy9uXYb7MH9XHqSNkG0QqTVzjvTy4+/Mr6VHXJBEZE="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-Ek7dIKWlyyAoEoMMTHx3DOBNuCoOtXP0CJHAsC04xy0=",
|
||||
"hash": "sha256-NvKthj+rVT23v/V1C8w8CMTfOy3yNsMjg2knXECzay4=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.8.2",
|
||||
"rev": "v1.9.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Eq5qsGKJnP+NOJKinDjHUeTLoeQc/BnK+e9d/O7ie7U="
|
||||
"vendorHash": "sha256-E/1w1FVLHV5X3We3NxKG7INwQtME9FCgFW1uM/6eE38="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
|
||||
|
|
@ -764,13 +764,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-/q1kKXdeVjxliE1HeGiusscLM4pYylgik88nxk5gPcs=",
|
||||
"hash": "sha256-+awQtvyJBLSm+WYH2gp+VM2uNbWeEfIbwqw7VsikQEA=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.20.2",
|
||||
"rev": "v3.21.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WF4AdTu6lxoNSCsFKLMeQbHgH6j+hM0VNBRsue+azJA="
|
||||
"vendorHash": "sha256-fqO3hlDUPY8/9SSMpNVD81pyaQE12zwNKDLSI54UF3M="
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",
|
||||
|
|
@ -1235,11 +1235,11 @@
|
|||
"vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
|
||||
},
|
||||
"vultr": {
|
||||
"hash": "sha256-cHMD4/jlXTIQ9ppTFJsUTHVQ3R9Qoe0I3me7zz2bxus=",
|
||||
"hash": "sha256-QZYuxtY89ldGUPNz/DJlFU6HWUJgeJC2TM6cSDoeaYc=",
|
||||
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
|
||||
"owner": "vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v2.14.0",
|
||||
"rev": "v2.14.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.45.4";
|
||||
version = "0.45.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rqMi+rBWOWoJeoOBpBPKp1lFKzZlWQJfShN5Uyxb5eM=";
|
||||
hash = "sha256-Azf9A/ZHb8wFRsd7iv9Y4jr9xs8R7vNUffz9ky07SVk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y=";
|
||||
vendorHash = "sha256-V7+N+vEOS4DXHglErD5YoUzu6EN4YRljV581kFnjK2M=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,28 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nali";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zu1k";
|
||||
repo = "nali";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZJnQiTcfvxHFgRNytQANs/lF4hy0S0cXOy8IuGECYi0=";
|
||||
sha256 = "sha256-tIn5ty7faM9BBmUWCvok94QOAMVtz5daCPpZkDGOJfo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TLij88IksL0+pARKVhEhPg6qUPAXMlL2DWJk4ynahUs=";
|
||||
vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd nali \
|
||||
--bash <($out/bin/nali completion bash) \
|
||||
--fish <($out/bin/nali completion fish) \
|
||||
--zsh <($out/bin/nali completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An offline tool for querying IP geographic information and CDN provider";
|
||||
homepage = "https://github.com/zu1k/nali";
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.14.0";
|
||||
version = "1.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O1Miy0GV34YbE1UrLUWZsatpWyfzFLGvX6fQUJnwbuE=";
|
||||
hash = "sha256-QpSp+8gsFApp4i4PajAQHHYZgwej/gusAw4J3Zetk4M=";
|
||||
};
|
||||
|
||||
# Use specific package versions required by paperless-ngx
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bedtools";
|
||||
version = "2.30.0";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arq5x";
|
||||
repo = "bedtools2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ=";
|
||||
sha256 = "sha256-LBD3z0+zGbQJ67oyPRFPgbiMY9EP17vSk1EKz3DrkEc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -39,17 +39,17 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "1.19.1-0";
|
||||
version = "1.19.2-0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "forgejo";
|
||||
repo = "forgejo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0FmqLxQvr3bbgdzKFeAhRMvJp/xdRPW40WLH6eKNY9s=";
|
||||
hash = "sha256-JRCEHaqRzJNRTu5OS43UmCg+vW8G/1Xwweuo5vuFO+s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g8QJSewQFfyE/34A2JxrVnwk5vmiIRSbwrVE9LqYJrM=";
|
||||
vendorHash = "sha256-bnLcHmwOh/fw6ecgsndX2BmVf11hJWllE+f2J8YSzec=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-cinnabar";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glandium";
|
||||
repo = "git-cinnabar";
|
||||
rev = version;
|
||||
sha256 = "IV7K/49IN2HMek247GWr5ybZRozHsnCm8RItC9sqFXc=";
|
||||
sha256 = "VvfoMypiFT68YJuGpEyPCxGOjdbDoF6FXtzLWlw0uxY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sha256 = "YWhGAp64GAlySgUvDrD6qaNlc09swe1xCkvEpFR1ytg=";
|
||||
sha256 = "GApYgE7AezKmcGWNY+dF1Yp1TZmEeUdq3CsjvMvo/Rw=";
|
||||
};
|
||||
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitoxide";
|
||||
version = "0.22.1";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "gitoxide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PetU/cUWFZWl1OoSObI7wwqJLexWPTP6ynNSyPXjvMc=";
|
||||
sha256 = "sha256-HmynsnlTj08vwYwckFdq+0u1nquC7bDOGcq2vCeqdhA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A7gwC9EQ+5GVciGsL9uPbZ6nThPfku3ZNH8qQwfI0QQ=";
|
||||
cargoHash = "sha256-5JvDqp3dZ9rcOS17YzwgNwJYQGQ021cpd0ClrR+1+5Y=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ curl ] ++ (if stdenv.isDarwin
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PfzBxvGroHgjEz4OchnECSfcb1Ds8xbE28yxneaiPuo=";
|
||||
sha256 = "sha256-97/9UYXOsg8v7QoRqo5rh0UGhjjS85K9OvUwtlG249c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libopenshot-audio";
|
||||
version = "0.3.0";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenShot";
|
||||
repo = "libopenshot-audio";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b3BZ275oJTxWfBWtdZetUQw0t7QznL0Q0lP7cKy/avg=";
|
||||
sha256 = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-screen-recorder";
|
||||
version = "5.11.23";
|
||||
version = "5.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yKBF/MmhlgwO5GLwfGgs13ERuzOg8EYjc3bXZ8TvcBU=";
|
||||
sha256 = "sha256-43jqgiBa77UAes0ekMES6IqVOPVXfzfQQjePdxFkNDM=";
|
||||
};
|
||||
|
||||
patches = [ ./dont_use_libPath.diff ];
|
||||
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ]}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chez-scheme";
|
||||
version = "9.5.8";
|
||||
version = "9.5.8a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cisco";
|
||||
repo = "ChezScheme";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-esCWEzny/I+Ors6+upKlt4h13oN0bRLWN9OTKuSqdl8=";
|
||||
sha256 = "sha256-d8DgHATZzZbOYODHFKTqg4oWg/wja8jQgcCVpj8j6yQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmrpflash";
|
||||
version = "0.9.19";
|
||||
version = "0.9.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jclehner";
|
||||
repo = "nmrpflash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bXxJiIbMk8JG0nbWOgINUAb8zaGBN3XUdA3JZev4Igs=";
|
||||
sha256 = "sha256-xfKZXaKzSTnCOC8qt6Zc/eidc1bnrKZOJPw/wwMoCaM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk=";
|
||||
};
|
||||
|
||||
# fix reported version
|
||||
patches = [ ./fix-version.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=OFF"
|
||||
"-DCPP_JWT_BUILD_EXAMPLES=OFF"
|
||||
|
|
|
|||
12
pkgs/development/libraries/cpp-jwt/fix-version.patch
Normal file
12
pkgs/development/libraries/cpp-jwt/fix-version.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2f35431..f08eb22 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.5.0)
|
||||
-project(cpp-jwt VERSION 1.2.0)
|
||||
+project(cpp-jwt VERSION 1.4.0)
|
||||
|
||||
option(CPP_JWT_BUILD_EXAMPLES "build examples" ON)
|
||||
option(CPP_JWT_BUILD_TESTS "build tests" ON)
|
||||
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fb303";
|
||||
version = "2023.02.20.00";
|
||||
version = "2023.04.24.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "fb303";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cGJz7ArifkB6c5ukU9hoTqngZDTLZfSpdQ2Vx1gWntw=";
|
||||
sha256 = "sha256-dhqHv+A4uak1FxKNqIsYlQl2WiP5+Y9I83pumpFbJDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3
|
||||
, mklSupport ? true, mkl
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -14,13 +15,18 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
./fix-cmake.patch # cannot find mkl libraries without this
|
||||
(substituteAll {
|
||||
src = ./fix-cmake.patch; # cannot find mkl libraries without this
|
||||
so = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On"
|
||||
++ lib.optional mklSupport "-DMKLROOT=${mkl}"
|
||||
;
|
||||
|
||||
env.CXXFLAGS = lib.optionalString stdenv.isLinux "-include cstring";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
PATHS ${${libDir}} NO_DEFAULT_PATH)
|
||||
else()
|
||||
- find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a
|
||||
+ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}.so lib${ARGV3}.so lib${ARGV4}.so lib${ARGV5}.so lib${ARGV6}.so
|
||||
+ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}@so@ lib${ARGV3}@so@ lib${ARGV4}@so@ lib${ARGV5}@so@ lib${ARGV6}@so@
|
||||
PATHS ${${libDir}} NO_DEFAULT_PATH)
|
||||
endif()
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ index 2d644005f..7261ba923 100644
|
|||
find_library(MKL_OMP_LIB
|
||||
- NAMES iomp5 iomp5md libiomp5md.lib
|
||||
- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
|
||||
+ NAMES libiomp5.so libiomp5 iomp5 iomp5md libiomp5md.lib
|
||||
+ NAMES libiomp5@so@ libiomp5 iomp5 iomp5md libiomp5md.lib
|
||||
+ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
|
||||
PATH_SUFFIXES "intel64" "intel32"
|
||||
NO_DEFAULT_PATH
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "httplib";
|
||||
version = "0.12.2";
|
||||
|
||||
|
|
@ -14,13 +16,8 @@ stdenvNoCC.mkDerivation rec {
|
|||
hash = "sha256-mpHw9fzGpYz04rgnfG/qTNrXIf6q+vFfIsjb56kJsLg=";
|
||||
};
|
||||
|
||||
# Header-only library.
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/include"
|
||||
cp -r httplib.h "$out/include"
|
||||
'';
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A C++ header-only HTTP/HTTPS server and client library";
|
||||
|
|
|
|||
|
|
@ -16,13 +16,14 @@
|
|||
, geocode-glib_2
|
||||
, vala
|
||||
, gnome
|
||||
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgweather";
|
||||
version = "4.2.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
|
|
@ -45,10 +46,12 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
vala
|
||||
glib
|
||||
(python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ]))
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gi-docgen
|
||||
gobject-introspection
|
||||
(python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ]))
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -61,8 +64,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
|
||||
"-Denable_vala=true"
|
||||
"-Dgtk_doc=true"
|
||||
(lib.mesonBool "introspection" withIntrospection)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmtp";
|
||||
version = "1.1.20";
|
||||
version = "1.1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libmtp";
|
||||
repo = "libmtp";
|
||||
rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}";
|
||||
sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA=";
|
||||
sha256 = "sha256-m9QFVD8udQ3SdGwn276BnIKqGeATA5QuokOK29Ykc1k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, rpmextract
|
||||
, undmg
|
||||
, _7zz
|
||||
, darwin
|
||||
, validatePkgConfig
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
|
|
@ -19,49 +19,47 @@ let
|
|||
# https://registrationcenter.intel.com/en/products/
|
||||
version = "${mklVersion}.${rel}";
|
||||
|
||||
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
|
||||
# https://github.com/matthewbauer/undmg/issues/4
|
||||
mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2023.0.0";
|
||||
rel = if stdenvNoCC.isDarwin then "199" else "25398";
|
||||
mklVersion = "2023.1.0";
|
||||
rel = if stdenvNoCC.isDarwin then "43558" else "46342";
|
||||
|
||||
# Intel openmp uses its own versioning.
|
||||
openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "2023.0.0";
|
||||
openmpRel = "25370";
|
||||
openmpVersion = "2023.1.0";
|
||||
openmpRel = "46305";
|
||||
|
||||
# Thread Building Blocks release.
|
||||
tbbVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.8.0";
|
||||
tbbRel = "25334";
|
||||
tbbVersion = "2021.9.0";
|
||||
tbbRel = "43484";
|
||||
|
||||
shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
oneapi-mkl = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
|
||||
hash = "sha256-fiL5TDmQHB+OQb1ERcoDQFpUutpsPe+AqIbMoa85nEk=";
|
||||
hash = "sha256-BeI5zB0rrE6C21dezNc7/WSKmTWpjsZbpg0/y0Y87VQ=";
|
||||
};
|
||||
|
||||
oneapi-mkl-common = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
|
||||
hash = "sha256-AFayUxybi48SgR2mX6mxkNECconIXm1/TWelvE4aqX0=";
|
||||
hash = "sha256-NjIqTeFppwjXFlPYHPHfZa/bWBiHJru3atC4fIMXN0w=";
|
||||
};
|
||||
|
||||
oneapi-mkl-common-devel = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
|
||||
hash = "sha256-riyIO2xWuvTSzfXgB+K6NSKqWLRmxKSnGZaH5nYTYPk=";
|
||||
hash = "sha256-GX19dlvBWRgwSOCmWcEOrnbmp4S2j0448fWpx+iPVWw=";
|
||||
};
|
||||
|
||||
oneapi-mkl-devel = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
|
||||
hash = "sha256-2IK0t47FaPNp7Oq9LJ5ZdLmlFFjQluWrh+nhvi8MCd8=";
|
||||
hash = "sha256-F4XxtSPAjNaShEL/l44jJK+JdOOkYI19X/njRB6FkNw=";
|
||||
};
|
||||
|
||||
oneapi-openmp = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm";
|
||||
hash = "sha256-grzVFWqt3Vpwb5K3Bur+sJz8pdKxZ4ISJXF5YAPrwmk=";
|
||||
hash = "sha256-1SlkI01DxFvwGPBJ73phs86ka0SmCrniwiXQ9DJwIXw=";
|
||||
};
|
||||
|
||||
oneapi-tbb = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm";
|
||||
hash = "sha256-8hIoRfV36XVElKCqP9UmCkjLCs3l0ZKCHxg+yxNIHc0=";
|
||||
hash = "sha256-wIktdf1p1SS1KrnUlc8LPkm0r9dhZE6cQNr4ZKTWI6A=";
|
||||
};
|
||||
|
||||
in stdenvNoCC.mkDerivation ({
|
||||
|
|
@ -70,16 +68,22 @@ in stdenvNoCC.mkDerivation ({
|
|||
|
||||
dontUnpack = stdenvNoCC.isLinux;
|
||||
|
||||
unpackPhase = if stdenvNoCC.isDarwin then ''
|
||||
7zz x $src
|
||||
'' else null;
|
||||
|
||||
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
|
||||
then
|
||||
[ undmg darwin.cctools ]
|
||||
[ _7zz darwin.cctools ]
|
||||
else
|
||||
[ rpmextract ]);
|
||||
|
||||
buildPhase = if stdenvNoCC.isDarwin then ''
|
||||
for f in Contents/Resources/pkg/*.tgz; do
|
||||
tar xzvf $f
|
||||
for f in bootstrapper.app/Contents/Resources/packages/*/cupPayload.cup; do
|
||||
tar -xf $f
|
||||
done
|
||||
mkdir -p opt/intel
|
||||
mv _installdir opt/intel/oneapi
|
||||
'' else ''
|
||||
rpmextract ${oneapi-mkl}
|
||||
rpmextract ${oneapi-mkl-common}
|
||||
|
|
@ -89,32 +93,7 @@ in stdenvNoCC.mkDerivation ({
|
|||
rpmextract ${oneapi-tbb}
|
||||
'';
|
||||
|
||||
installPhase = if stdenvNoCC.isDarwin then ''
|
||||
for f in $(find . -name 'mkl*.pc') ; do
|
||||
bn=$(basename $f)
|
||||
substituteInPlace $f \
|
||||
--replace "prefix=<INSTALLDIR>/mkl" "prefix=$out" \
|
||||
--replace $\{MKLROOT} "$out" \
|
||||
--replace "lib/intel64_lin" "lib" \
|
||||
--replace "lib/intel64" "lib"
|
||||
done
|
||||
for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
|
||||
substituteInPlace $f \
|
||||
--replace "../compiler/lib" "lib"
|
||||
done
|
||||
|
||||
mkdir -p $out/lib
|
||||
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
|
||||
|
||||
cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig
|
||||
'' else ''
|
||||
installPhase = ''
|
||||
for f in $(find . -name 'mkl*.pc') ; do
|
||||
bn=$(basename $f)
|
||||
substituteInPlace $f \
|
||||
|
|
@ -133,9 +112,9 @@ in stdenvNoCC.mkDerivation ({
|
|||
|
||||
# Dynamic libraries
|
||||
mkdir -p $out/lib
|
||||
cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
|
||||
cp -a opt/intel/oneapi/compiler/${mklVersion}/linux/compiler/lib/intel64_lin/*.so* $out/lib
|
||||
cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/intel64/gcc4.8/*.so* $out/lib
|
||||
cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib
|
||||
cp -a opt/intel/oneapi/compiler/${mklVersion}/${if stdenvNoCC.isDarwin then "mac" else "linux"}/compiler/lib/${lib.optionalString stdenvNoCC.isLinux "intel64_lin"}/*${shlibExt}* $out/lib
|
||||
cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib
|
||||
|
||||
# Headers
|
||||
cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
|
||||
|
|
@ -144,10 +123,10 @@ in stdenvNoCC.mkDerivation ({
|
|||
cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib
|
||||
'' +
|
||||
(if enableStatic then ''
|
||||
install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a
|
||||
install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*.a
|
||||
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/tools/pkgconfig/*.pc
|
||||
'' else ''
|
||||
cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
|
||||
cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib
|
||||
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc
|
||||
'') + ''
|
||||
# Setup symlinks for blas / lapack
|
||||
|
|
@ -170,8 +149,8 @@ in stdenvNoCC.mkDerivation ({
|
|||
install_name_tool -id $out/lib/$(basename $f) $f || true
|
||||
done
|
||||
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib
|
||||
install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib
|
||||
install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib
|
||||
install_name_tool -change @rpath/libtbb.12.dylib $out/lib/libtbb.12.dylib $out/lib/libmkl_tbb_thread.dylib
|
||||
install_name_tool -change @rpath/libtbbmalloc.2.dylib $out/lib/libtbbmalloc.2.dylib $out/lib/libtbbmalloc_proxy.dylib
|
||||
'';
|
||||
|
||||
# Per license agreement, do not modify the binary
|
||||
|
|
@ -201,7 +180,7 @@ in stdenvNoCC.mkDerivation ({
|
|||
};
|
||||
} // lib.optionalAttrs stdenvNoCC.isDarwin {
|
||||
src = fetchurl {
|
||||
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg";
|
||||
sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f";
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/087a9190-9d96-4b8c-bd2f-79159572ed89/m_onemkl_p_${mklVersion}.${rel}_offline.dmg";
|
||||
hash = "sha256-bUaaJPSaLr60fw0DzDCjPvY/UucHlLbCSLyQxyiAi04=";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
41
pkgs/development/libraries/vkd3d-proton/default.nix
Normal file
41
pkgs/development/libraries/vkd3d-proton/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, wine, glslang }:
|
||||
|
||||
let
|
||||
# these are both embedded in the output files
|
||||
rev = "83308675078e9ea263fa8c37af95afdd15b3ab71";
|
||||
# git describe --tags
|
||||
shortRev = builtins.substring 0 8 rev;
|
||||
realVersion = "v2.8-302-g${shortRev}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkd3d-proton";
|
||||
version = "unstable-2023-04-21";
|
||||
|
||||
nativeBuildInputs = [ meson ninja wine glslang ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HansKristian-Work";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-iLpVvYmWhqy0rbbyJoT+kxzIqp68Vsb/TkihGtQQucU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "vkd3d_build = vcs_tag(" \
|
||||
"vkd3d_build = vcs_tag( fallback : '${shortRev}'", \
|
||||
--replace "vkd3d_version = vcs_tag(" \
|
||||
"vkd3d_version = vcs_tag( fallback : '${realVersion}'",
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
|
||||
description =
|
||||
"A fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
26
pkgs/development/libraries/vkd3d/default.nix
Normal file
26
pkgs/development/libraries/vkd3d/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, wine, flex, bison
|
||||
, vulkan-headers, spirv-headers, vulkan-loader }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkd3d";
|
||||
version = "1.7";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ];
|
||||
buildInputs = [ vulkan-loader vulkan-headers spirv-headers ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-s5YNA+CjWoYk1tkBYYGfOsI2eXtXPtd1oHVeFFJIWn8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.winehq.org/wine/vkd3d";
|
||||
description = "A 3D graphics library with an API very similar, but not identical, to Direct3D 12";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
, "@microsoft/rush"
|
||||
, "@nerdwallet/shepherd"
|
||||
, "@nestjs/cli"
|
||||
, "@shopify/cli"
|
||||
, "@squoosh/cli"
|
||||
, "@tailwindcss/aspect-ratio"
|
||||
, "@tailwindcss/forms"
|
||||
|
|
|
|||
6932
pkgs/development/node-packages/node-packages.nix
generated
6932
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
pname = "psysh";
|
||||
version = "0.11.10";
|
||||
version = "0.11.16";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
|
||||
sha256 = "sha256-2U9HMA3OAA9Nl9JVJjepB2vi0O483xGpr8nQUGhOrpI=";
|
||||
sha256 = "sha256-4FEjMtp7MRTjpdb1ZpKqCa0erxrW90JyGy1ZmMBVdZE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,12 @@ buildPythonPackage rec {
|
|||
sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
|
||||
};
|
||||
|
||||
# setuptools.extern.packaging.version.InvalidVersion: Invalid version: '1.7.7-SNAPSHOT'
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "1.7.7-SNAPSHOT" "1.7.7"
|
||||
'';
|
||||
|
||||
doCheck = false; # No such file or directory: './run_tests.py
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "2.9.0";
|
||||
version = "2.10.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qVPlrj6EVTPJ/HiwynIg6iuJzUGb6Lan/QKC29C2YNk=";
|
||||
hash = "sha256-pwhq8MAy2FueddEZgAYgsDs7eCrK/bStUhNDhfa+zqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,24 +3,39 @@
|
|||
, fetchFromGitHub
|
||||
, mac_alias
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ds_store";
|
||||
version = "1.3.0";
|
||||
pname = "ds-store";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "al45tair";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zmhnz110dvisydp5h6s0ry2v9qf4rgr60xhhlak0c66zpvlkkl0";
|
||||
repo = "ds_store";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-45lmkE61uXVCBUMyVVzowTJoALY1m9JI68s7Yb0vCks=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mac_alias ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [
|
||||
mac_alias
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ds_store" ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ds_store"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/al45tair/ds_store";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dtschema";
|
||||
version = "2022.12";
|
||||
version = "2023.04";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "devicetree-org";
|
||||
repo = "dt-schema";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-+wF6WdonZrkZEnlq/P6QeT3X7CMinxbapLa7q0t2zUc=";
|
||||
sha256 = "sha256-w9TsRdiDTdExft7rdb2hYcvxP6hxOFZKI3hITiNSwgw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.33";
|
||||
version = "0.5.34";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-td4baHAtBuNqUpe11HBtsMl6fW9n5w12U+KUUc1SmIQ=";
|
||||
hash = "sha256-gnNncWhrqGTWq8cNVmNMzkgqW0hoglzVGrLjqyUvOIc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.4.4";
|
||||
version = "2023.4.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5wUx0S3Wg30Kn6RAkybAOMQqRvVDt9HeIJyTPCVHqRc=";
|
||||
hash = "sha256-svXjBWiybJk3RzQtWGzFsvWJX0imhqQmPk9UmdeoIuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.13.8";
|
||||
version = "8.13.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-S6kqkX+49uP+M/0EudhCmYUs4jcokSnuTtpHoEOlxsQ=";
|
||||
hash = "sha256-PjJ02IyrNgm1X/W5NBcHXbyi0TBk8QP79WLg6h3aD5o=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-synologydsm-api";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "mib1185";
|
||||
repo = "py-synologydsm-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L+i6PpN+3CgPp1X/EUQTXz1IUW3S0BJuuPPT4LKBtWs=";
|
||||
hash = "sha256-lSNdwM+b91XWILKjGsi73Tu29spOdnFznuE7ELg+mhw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, isPyPy
|
||||
, pkgs
|
||||
|
|
@ -32,6 +33,14 @@ buildPythonPackage rec {
|
|||
|
||||
patches = [
|
||||
./fix-test-pythonpath.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dcantrell/pyparted/commit/07ba882d04fa2099b53d41370416b97957d2abcb.patch";
|
||||
hash = "sha256-yYfLdy+TOKfN3gtTMgOWPebPTRYyaOYh/yFTowCbdjg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dcantrell/pyparted/commit/a01b4eeecf63b0580c192c7c2db7a5c406a7ad6d.patch";
|
||||
hash = "sha256-M/8hYiKUBzaTOxPYDFK5BAvCm6WJGx+693qwj3HzdRA=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ buildPythonPackage rec {
|
|||
-e test_finite_diff_uks_eph \
|
||||
-e test_pipek \
|
||||
-e test_n3_cis_ewald \
|
||||
-e test_veff \
|
||||
-I test_kuccsd_supercell_vs_kpts\.py \
|
||||
-I test_kccsd_ghf\.py \
|
||||
-I test_h_.*\.py \
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytenable";
|
||||
version = "1.4.12";
|
||||
version = "1.4.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "tenable";
|
||||
repo = "pyTenable";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vuwD9NVomxwG1IQioy6TzEHnibCdpg+VyCXjnjnmw54=";
|
||||
hash = "sha256-UY3AFnPplmU0jrV4LIKH4+2tcJEFkKMqO2GWVkgaHYE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
45
pkgs/development/python-modules/python-lsp-ruff/default.nix
Normal file
45
pkgs/development/python-modules/python-lsp-ruff/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ruff
|
||||
, lsprotocol
|
||||
, python-lsp-server
|
||||
, tomli
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lsp-ruff";
|
||||
version = "1.4.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "python-lsp-ruff";
|
||||
sha256 = "sha256-TqTeQc/lT5DcPcJbZXbEiUGbYjFP8idpzdSZlXD59Y4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# ruff binary is used directly, the ruff python package is not needed
|
||||
sed -i '/"ruff>=/d' pyproject.toml
|
||||
sed -i 's|sys.executable, "-m", "ruff"|"${ruff}/bin/ruff"|' pylsp_ruff/plugin.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lsprotocol
|
||||
python-lsp-server
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/python-lsp/python-lsp-ruff";
|
||||
description = "Ruff linting plugin for pylsp";
|
||||
changelog = "https://github.com/python-lsp/python-lsp-ruff/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skl2onnx";
|
||||
version = "1.13";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XzUva5uFX/rGMFpwfwLH1Db0Nok47pBJCSqVo1ZcJz0=";
|
||||
hash = "sha256-gF+XOgAILSlM+hU1s3Xz+zD7nPtwW9a0mOHp8rxthnY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
47
pkgs/development/python-modules/sonos-websocket/default.nix
Normal file
47
pkgs/development/python-modules/sonos-websocket/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sonos-websocket";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jjlawren";
|
||||
repo = "sonos-websocket";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Pb+L+823Clka0IjVMVEx4A0tJsI1IUhrFbx5Jy+xkgg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sonos_websocket"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to communicate with Sonos devices over websockets";
|
||||
homepage = "https://github.com/jjlawren/sonos-websocket";
|
||||
changelog = "https://github.com/jjlawren/sonos-websocket/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-inline-tabs";
|
||||
version = "2022.01.02.beta11";
|
||||
version = "2023.04.21";
|
||||
format = "flit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pradyunsg";
|
||||
repo = "sphinx-inline-tabs";
|
||||
rev = version;
|
||||
hash = "sha256-k2nOidUk87EZbFsqQ7zr/4eHk+T7wUOYimjbllfneUM=";
|
||||
hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spsdk";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NXPmicro";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UBiylZB6/0n1FQMMg0coXkYh9S6gLz2LaoKk2HoWu7c=";
|
||||
hash = "sha256-KJUtAWENS3+VAs3Iai1aKYzMYtfetMeI0MHeQ6NraNY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tldextract";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eK7xOsFFnVGbRXoD8fdMG/HCgIEiprzA5oQPgbpVrXM=";
|
||||
hash = "sha256-+p5QxKA77eKh2V3KYg1mFnhIRiaFjM84jPlnGg3Ul6Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamllint";
|
||||
version = "1.29.0";
|
||||
version = "1.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZqdV1fvLuIMfGpVoZ2MptbrILDeZW8ya/QSLZFn5+kg=";
|
||||
hash = "sha256-LYPx0S9zPhYqh+BrF2FJ17ucW65Knl/OHHcdf3A/emU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.58.0";
|
||||
version = "0.58.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yUf5X124jtUip5hGbZrdbSQzO8WJp9BJ96/QtdMBFvM=";
|
||||
hash = "sha256-phwGnAosPuH9zj3lS8o78bQohGAllICpbn1cNgRmh0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "algolia-cli";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algolia";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tz05j2XkA3Dh1RlQf8KHuPSqGhbFc0fxSe0LC2d5FYU=";
|
||||
hash = "sha256-SNQhDmiRz0J3MlJbYUAQgiXeLv3oZVAMnavkAeRrnEA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QgNL7pp0KH1RUV69BFVtHpaLHrPp4UQhEtOEiRmfAi0=";
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.202";
|
||||
version = "2.3.205";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cJGHby6g4ndz031vxLFmQ9yUAB6lsyGff3eM8vjxUbc=";
|
||||
hash = "sha256-vs7gUYIw7n6PO5hjHFFtfM3gxjUxlmSOEJr8uJmeI6g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -116,7 +116,7 @@ buildPythonApplication rec {
|
|||
# Tests are comparing console output
|
||||
"cli"
|
||||
"console"
|
||||
# Starting to fail after 2.3.202
|
||||
# Starting to fail after 2.3.205
|
||||
"test_non_multiline_pair"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.204.0";
|
||||
version = "0.205.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-263ZbEDGiZI/2dSLxs966+wtSHG2QMnTtzJ7hPQ4Ix8=";
|
||||
sha256 = "sha256-+F0NmE9BN8eSmyLnXkgdYy3qdyBvKfRM+hVgYmLvzOg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto
|
||||
, cmake, pkg-config, which, makeWrapper
|
||||
, libpfm, zlib, python3Packages, procps, gdb, capnproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -38,11 +39,11 @@ stdenv.mkDerivation rec {
|
|||
# See also https://github.com/NixOS/nixpkgs/pull/110846
|
||||
preConfigure = ''substituteInPlace CMakeLists.txt --replace "-flto" ""'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config which ];
|
||||
nativeBuildInputs = [ cmake pkg-config which makeWrapper ];
|
||||
buildInputs = [
|
||||
libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto
|
||||
libpfm zlib python3Packages.python python3Packages.pexpect procps capnproto
|
||||
];
|
||||
propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
|
||||
cmakeFlags = [
|
||||
"-Ddisable32bit=ON"
|
||||
];
|
||||
|
|
@ -57,6 +58,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preCheck = "export HOME=$TMPDIR";
|
||||
|
||||
# needs GDB to replay programs at runtime
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/rr" \
|
||||
--prefix PATH ":" "${lib.makeBinPath [
|
||||
gdb
|
||||
]}";
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://rr-project.org/";
|
||||
description = "Records nondeterministic executions and debugs them deterministically";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "cvise";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marxin";
|
||||
repo = "cvise";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-j4s1xH0vO+/NNafQf1Jei7fgebSQ53WJKA+kYxuG2zQ=";
|
||||
hash = "sha256-9HFCFgpRXqefFJLulwvi6nx0fl0G6IXI9gSinekJXRU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "grcov";
|
||||
version = "0.8.13";
|
||||
version = "0.8.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fyITsOlkBY1f9AjQqUII7G1Onm0i0FIqNspPi8J+eOM=";
|
||||
sha256 = "sha256-IC5ROi4kwZLCX7/kFb7VgOzQtsj74hujQ5IrrFneFTA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qbxJJGwJ7hRNIujud10AYnM2NaNwjBB5zhOxXp/5z/k=";
|
||||
cargoHash = "sha256-DcPidu3WFyVWBS4EVavxFhy9wwqP4rGmaALKnfxua2E=";
|
||||
|
||||
# tests do not find grcov path correctly
|
||||
checkFlags = let
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "14.27.0";
|
||||
version = "15.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aOUhKETwrPJWPvxkuLdpmSbD38RxMeQywmKq6j617Dk=";
|
||||
hash = "sha256-xrSMR16KvS97/pfQPwOfETvVvTxqZMdNR7xG9QxuelA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MM6WwEs2BMkfpTsDFIqwpIROMs8zbbT5OsP6FXwRvy8=";
|
||||
vendorHash = "sha256-4exLY24baDjgGIDS1P7BIK38O4b+KeqNTMzA6wap05k=";
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-entgrpc";
|
||||
version = "0.3.0";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ent";
|
||||
repo = "contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hK4I2LVvw7hkbUKRuDoaRuNX3nwlwipYucnXwzOCcXs=";
|
||||
sha256 = "sha256-5gFdfMSAb0DWCMCzG0nVGU+VWam6yC26QYUPF1YjekM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bAM+NxD7mNd2fFxRDHCAzJTD7PVfT/9XHF88v9RHKwE=";
|
||||
vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y=";
|
||||
|
||||
subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.17";
|
||||
version = "0.5.19";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kU8Wq0BRE/Tajmi/PV6dja9HJy0lbZwzGuMIXDnFUw0=";
|
||||
sha256 = "sha256-5xHDjNFQDmi+SnhxfoCxoBdCqHpZEk/87r2sBKsT+W4=";
|
||||
};
|
||||
cargoSha256 = "sha256-Zv6CkUhMTMqGM8PH+ciDV20vq88tU5THSw0NByO1v70=";
|
||||
cargoSha256 = "sha256-0fj5GJ/gjVBAdfYPHnT33kbnXBIE5+VRONcNBgBSoPc=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trunk-io";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trunk.io/releases/launcher/${version}/trunk";
|
||||
hash = "sha256-arWege61fb7NiYSIL3ZaDQr75QEbDDJ7rVgdRUKqP4A=";
|
||||
hash = "sha256-ylQ4tcPVO367PtLtBkw+MKxoIY7b14Gse3IxnIxMtqc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.6.5";
|
||||
version = "4.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-+PXRNVLGCJmxIZSwuuRA4f1v0AxxPYesxby/wEOWR8Q=";
|
||||
hash = "sha256-aaCGo/vogi5HV0hM0Lz4Gw/IRbLp5U7eqAhfL7ztDos=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wesnoth";
|
||||
version = "1.16.8";
|
||||
version = "1.16.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
owner = "wesnoth";
|
||||
repo = "wesnoth";
|
||||
hash = "sha256-P7OUiKJxJZ0rGdesnxpQMbRBgCHsLpyt8+pRDh27JYQ=";
|
||||
hash = "sha256-KtAPc2nsqSoHNsLTLom/yaUECn+IWBdBFpiMclrUHxM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,49 +1,74 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, fetchFromGitHub
|
||||
, dart
|
||||
, buf
|
||||
, callPackage
|
||||
, runtimeShell
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
let
|
||||
embedded-protocol = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "embedded-protocol";
|
||||
rev = "refs/tags/1.2.0";
|
||||
hash = "sha256-OHOWotI+cXjDhEYUNXa36FpMEW7hSIu8gVX3gVRvw2Y=";
|
||||
};
|
||||
|
||||
libExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dart-sass-embedded";
|
||||
version = "1.62.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "dart-sass-embedded";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-GpSus5/QItbzCrOImMvrO6DTAQeODABRNiSYHJlLlIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
|
||||
nativeBuildInputs = [
|
||||
buf
|
||||
dart
|
||||
(callPackage ../../build-support/dart/fetch-dart-deps { } {
|
||||
buildDrvArgs = finalAttrs;
|
||||
vendorHash = "sha256-aEBE+z8M5ivMR9zL7kleBJ8c9T+4PGXoec56iwHVT+c=";
|
||||
})
|
||||
];
|
||||
|
||||
src = let base = "https://github.com/sass/dart-sass-embedded/releases/download/${version}/sass_embedded-${version}"; in
|
||||
fetchurl {
|
||||
"x86_64-linux" = {
|
||||
url = "${base}-linux-x64.tar.gz";
|
||||
hash = "sha256-NXTadacyKlOQNGSLj/hP8syhYuuSTXK2Y9cYzTk28HU=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
url = "${base}-linux-arm64.tar.gz";
|
||||
hash = "sha256-DX29U1AjmqVhKFgzP+71vsdoMjQ13IS93PZ1JLOA7bA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
url = "${base}-macos-x64.tar.gz";
|
||||
hash = "sha256-0oyb9YBKoPNaWFLbIUZOJc5yK11uDYyAKKW4urkmRJQ=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
url = "${base}-macos-arm64.tar.gz";
|
||||
hash = "sha256-dkBcdVbxolK8xXYaOHot0s9FxGmfhMNAEoZqo+2LRfk=";
|
||||
};
|
||||
}."${stdenvNoCC.hostPlatform.system}" or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
strictDeps = true;
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
dart pub get --offline
|
||||
mkdir build
|
||||
ln -s ${embedded-protocol} build/embedded-protocol
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
UPDATE_SASS_PROTOCOL=false HOME="$TMPDIR" dart run grinder protobuf
|
||||
dart run grinder pkg-compile-native
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -r * $out
|
||||
ln -s $out/dart-sass-embedded $out/bin/dart-sass-embedded
|
||||
runHook preInstall
|
||||
mkdir -p "$out/lib" "$out/bin"
|
||||
cp build/dart-sass-embedded.native "$out/lib/dart-sass-embedded${libExt}"
|
||||
echo '#!${runtimeShell}' > "$out/bin/dart-sass-embedded"
|
||||
echo "exec ${dart}/bin/dartaotruntime $out/lib/dart-sass-embedded${libExt} \"\$@\"" >> "$out/bin/dart-sass-embedded"
|
||||
chmod +x "$out/bin/dart-sass-embedded"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A wrapper for Dart Sass that implements the compiler side of the Embedded Sass protocol";
|
||||
homepage = "https://github.com/sass/dart-sass-embedded";
|
||||
changelog = "https://github.com/sass/dart-sass-embedded/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/sass/dart-sass-embedded/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ shyim ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -421,13 +421,6 @@ in {
|
|||
|
||||
ubootQemuRiscv64Smode = buildUBoot {
|
||||
defconfig = "qemu-riscv64_smode_defconfig";
|
||||
extraPatches = [
|
||||
# https://patchwork.ozlabs.org/project/uboot/patch/20220128134713.2322800-1-alexandre.ghiti@canonical.com/
|
||||
(fetchpatch {
|
||||
url = "https://patchwork.ozlabs.org/series/283391/mbox/";
|
||||
sha256 = "sha256-V0jDpx6O4bFzuaOQejdrRnLiWb5LBTx47T0TZqNtMXk=";
|
||||
})
|
||||
];
|
||||
extraMeta.platforms = ["riscv64-linux"];
|
||||
filesToInstall = ["u-boot.bin"];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,31 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "can-utils";
|
||||
# There are no releases (source archives or git tags), so use the date of the
|
||||
# latest commit in git master as version number.
|
||||
version = "20170830";
|
||||
version = "2023.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-can";
|
||||
repo = "can-utils";
|
||||
rev = "5b518a0a5fa56856f804372a6b99b518dedb5386";
|
||||
sha256 = "1ygzp8rjr8f1gs48mb1pz7psdgbfhlvr6kjdnmzbsqcml06zvrpr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FaopviBJOmO0lXoJcdKNdtsoaJ8JrFEJGyO1aNBv+Pg=";
|
||||
};
|
||||
|
||||
# Fixup build with newer Linux headers.
|
||||
postPatch = ''
|
||||
sed '1i#include <linux/sockios.h>' -i \
|
||||
slcanpty.c cansniffer.c canlogserver.c isotpdump.c isotpsniffer.c isotpperf.c
|
||||
'';
|
||||
|
||||
preConfigure = ''makeFlagsArray+=(PREFIX="$out")'';
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CAN userspace utilities and tools (for use with Linux SocketCAN)";
|
||||
homepage = "https://github.com/linux-can/can-utils";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
maintainers = with maintainers; [ bjornfor Luflosi ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pscircle";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mildlyparallel";
|
||||
repo = "pscircle";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sm99423hh90kr4wdjqi9sdrrpk65j2vz2hzj65zcxfxyr6khjci";
|
||||
sha256 = "sha256-bqbQBNscNfoqXprhoFUnUQO88YQs9xDhD4d3KHamtG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ assert withImportd -> withCompression;
|
|||
assert withCoredump -> withCompression;
|
||||
assert withHomed -> withCryptsetup;
|
||||
assert withHomed -> withPam;
|
||||
assert withUkify -> withEfi;
|
||||
|
||||
let
|
||||
wantCurl = withRemote || withImportd;
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001
|
||||
From: Lana Black <lana@illuminati.industries>
|
||||
Date: Sat, 11 Feb 2023 11:53:21 +0000
|
||||
Subject: [PATCH] Fix test.
|
||||
|
||||
---
|
||||
tests/tests.bats | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/tests.bats b/tests/tests.bats
|
||||
index c542b7a..98520ee 100644
|
||||
--- a/tests/tests.bats
|
||||
+++ b/tests/tests.bats
|
||||
@@ -196,7 +196,7 @@ xen_expect_abort() {
|
||||
run test_hello/test_hello.hvt
|
||||
case "${CONFIG_HOST}" in
|
||||
Linux)
|
||||
- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]]
|
||||
+ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]])
|
||||
;;
|
||||
FreeBSD)
|
||||
# XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not
|
||||
--
|
||||
2.39.0
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
, pkg-config, qemu, syslinux, util-linux }:
|
||||
|
||||
let
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
# list of all theoretically available targets
|
||||
targets = [
|
||||
"genode"
|
||||
|
|
@ -21,11 +21,9 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
|
||||
sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw=";
|
||||
sha256 = "sha256-t80VOZ8Tr1Dq+mJfRPVLGqYprCaqegcQtDqdoHaSXW0=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Fix-test.patch ];
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frr";
|
||||
version = "8.5";
|
||||
version = "8.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FRRouting";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-v3mmTkNQQLUmnkgcEV/hYLtc4FbhDFz/SW67w7C/zZA=";
|
||||
hash = "sha256-dK6eVYj9OIVChnR90FDTB7ow93nLLNRaOG8YEXxh8UQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "20.0.3";
|
||||
version = "20.0.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
sha256 = "sha256-dDB3jG3k3ZkAzsG4p3VHpMBM8nxvxQ2sxGeRXWI1Wm0=";
|
||||
hash = "sha256-4h3q9J1+KufMaSuzbX9qaBwXPR8zhVpxQAXDBY3uPjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "prometheus-nats-exporter";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+qMhHmsvlUWjDhmSXv2TytuOPmJcXdSGBd7c5PdE9xI=";
|
||||
sha256 = "sha256-v8Afdz1X1s5P/soXB+9M4C01HbvPNlEXo7Hdf1o9NdM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hlC/s0pYhNHMv3i7Nmu4r6jnXGpc6raScv5dO32+tfQ=";
|
||||
vendorHash = "sha256-YpiwRkujjuqfNH1Mmv6mtm6nNXx6kp272+6fzsK97xw=";
|
||||
|
||||
preCheck = ''
|
||||
# Fix `insecure algorithm SHA1-RSA` problem
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_cron";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "citusdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EBmydzzT0GB1TaGpnxwj1Cq1vvnDlZ+wqJ5Dc3KDT38=";
|
||||
hash = "sha256-+quVWbKJy6wXpL/zwTk5FF7sYwHA7I97WhWmPO/HSZ4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ let
|
|||
./rubyEnv/sass-embedded-static.patch
|
||||
];
|
||||
postPatch = ''
|
||||
export SASS_EMBEDDED=${dart-sass-embedded}
|
||||
export SASS_EMBEDDED=${dart-sass-embedded}/bin
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ in
|
|||
};
|
||||
|
||||
netbox = callPackage generic {
|
||||
version = "3.4.7";
|
||||
hash = "sha256-pWHGyzLc0tqfehWbCMF1l96L1pewb5FXBUkw9EqPtP8=";
|
||||
version = "3.5.0";
|
||||
hash = "sha256-LsUitX/e+ec/9mRBw+cbGOG2Idl9ZQwf/vxIC3YS5LU=";
|
||||
extraPatches = [
|
||||
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
|
||||
./config.patch
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
, version
|
||||
, hash
|
||||
|
|
@ -13,6 +14,23 @@
|
|||
py = python3 // {
|
||||
pkgs = python3.pkgs.overrideScope (self: super: {
|
||||
django = super.django_4;
|
||||
drf-nested-routers = super.drf-nested-routers.overridePythonAttrs (_oldAttrs: {
|
||||
patches = [
|
||||
# all for django 4 compat
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff";
|
||||
hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff";
|
||||
hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff";
|
||||
hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0=";
|
||||
})
|
||||
];
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -35,6 +53,7 @@
|
|||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
bleach
|
||||
boto3
|
||||
django_4
|
||||
django-cors-headers
|
||||
django-debug-toolbar
|
||||
|
|
@ -49,8 +68,12 @@
|
|||
django-taggit
|
||||
django-timezone-field
|
||||
djangorestframework
|
||||
drf-spectacular
|
||||
drf-spectacular-sidecar
|
||||
drf-yasg
|
||||
dulwich
|
||||
swagger-spec-validator # from drf-yasg[validation]
|
||||
feedparser
|
||||
graphene-django
|
||||
jinja2
|
||||
markdown
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.138.0";
|
||||
version = "0.139.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hZnNb6tsgllJUo3lz+qF/d3MQJJ6IauqVl5nG5J3aok=";
|
||||
hash = "sha256-KIg5A1fR1AmdSPUrYXrWRNj1Vdi1LPbS1MwV77SRskA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZjA89x+B0pT5jShr1Iv/geBYtH/bYnk/TIQZWLObAck=";
|
||||
vendorHash = "sha256-ea1MXllg3i0UmikzVoFNuki+5QvJret2+cBcN3kekBY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue