mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
729bc54b00
@ -8725,6 +8725,12 @@
|
||||
githubId = 1472826;
|
||||
name = "Max Smolin";
|
||||
};
|
||||
maxux = {
|
||||
email = "root@maxux.net";
|
||||
github = "maxux";
|
||||
githubId = 4141584;
|
||||
name = "Maxime Daniel";
|
||||
};
|
||||
maxxk = {
|
||||
email = "maxim.krivchikov@gmail.com";
|
||||
github = "maxxk";
|
||||
|
||||
@ -1,29 +1,26 @@
|
||||
{ pkgs, stdenv, lib, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, nodejs, electron, python3, ... }:
|
||||
{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3 }:
|
||||
|
||||
let
|
||||
nodeComposition = import ./node-composition.nix {
|
||||
inherit pkgs nodejs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
};
|
||||
in
|
||||
|
||||
nodeComposition.package.override rec {
|
||||
buildNpmPackage rec {
|
||||
pname = "open-stage-control";
|
||||
version = "1.18.3";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jean-emmanuel";
|
||||
repo = "open-stage-control";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AXdPxTauy2rMRMdfUjkfTjbNDgOKmoiGUeeLak0wu84=";
|
||||
hash = "sha256-XgwlRdwUSl4gIRKqk6BnMAKarVvp291zk8vmNkuRWKo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
patches = [
|
||||
# Use generated package-lock.json since upstream does not provide one in releases
|
||||
./package-lock.json.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-UF3pZ+SlrgDLqntciXRNbWfpPMtQw1DXl41x9r37QN4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeBinaryWrapper
|
||||
nodejs
|
||||
python3
|
||||
];
|
||||
|
||||
@ -33,14 +30,19 @@ nodeComposition.package.override rec {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
preRebuild = ''
|
||||
# remove electron to prevent building since nixpkgs electron is used instead
|
||||
rm -r node_modules/electron
|
||||
'';
|
||||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
postInstall = ''
|
||||
# build assets
|
||||
npm run build
|
||||
# Override installPhase so we can copy the only folders that matter (app and node_modules)
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# prune unused deps
|
||||
npm prune --omit dev $npmFlags
|
||||
|
||||
# copy built app and node_modules directories
|
||||
mkdir -p $out/lib/node_modules/open-stage-control
|
||||
cp -r app node_modules $out/lib/node_modules/open-stage-control/
|
||||
|
||||
# copy icon
|
||||
install -Dm644 resources/images/logo.png $out/share/icons/hicolor/256x256/apps/open-stage-control.png
|
||||
@ -52,6 +54,8 @@ nodeComposition.package.override rec {
|
||||
--add-flags $out/lib/node_modules/open-stage-control/app \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--prefix PATH : '${lib.makeBinPath [ python3 ]}'
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
in
|
||||
import ./node-packages.nix {
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
||||
9220
pkgs/applications/audio/open-stage-control/node-packages.nix
generated
9220
pkgs/applications/audio/open-stage-control/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
18247
pkgs/applications/audio/open-stage-control/package-lock.json.patch
Normal file
18247
pkgs/applications/audio/open-stage-control/package-lock.json.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,25 +1,63 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p common-updater-scripts jq nodePackages.node2nix
|
||||
#! nix-shell -i bash -p common-updater-scripts jq nodejs
|
||||
set -euo pipefail
|
||||
|
||||
# Find nixpkgs repo
|
||||
nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
|
||||
|
||||
# Get latest release tag
|
||||
tag="$(curl -s https://api.github.com/repos/jean-emmanuel/open-stage-control/releases/latest | jq -r .tag_name)"
|
||||
stripwhitespace() {
|
||||
sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
|
||||
}
|
||||
|
||||
nixeval() {
|
||||
nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r .
|
||||
}
|
||||
|
||||
vendorhash() {
|
||||
(nix --extra-experimental-features nix-command build --impure -f "$nixpkgs" --no-link "$1" 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true
|
||||
}
|
||||
|
||||
findpath() {
|
||||
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
|
||||
outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
|
||||
|
||||
if [ -n "$outpath" ]; then
|
||||
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
|
||||
fi
|
||||
|
||||
echo "$path"
|
||||
}
|
||||
|
||||
attr="${UPDATE_NIX_ATTR_PATH:-open-stage-control}"
|
||||
version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)"
|
||||
|
||||
pkgpath="$(findpath "$attr")"
|
||||
pkgdir="$(dirname "$pkgpath")"
|
||||
|
||||
updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)"
|
||||
|
||||
if [ "$updated" -eq 0 ]; then
|
||||
echo 'update.sh: Package version not updated, nothing to do.'
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Download package.json from the latest release
|
||||
curl -sSL https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/"$tag"/package.json | grep -v '"electron"\|"electron-installer-debian"' >"$nixpkgs"/pkgs/applications/audio/open-stage-control/package.json
|
||||
curl -sSL https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/v"$version"/package.json | grep -v '"electron"\|"electron-installer-debian"' >"$pkgdir"/package.json
|
||||
|
||||
# Lock dependencies with node2nix
|
||||
node2nix \
|
||||
--node-env "$nixpkgs"/pkgs/development/node-packages/node-env.nix \
|
||||
--nodejs-16 \
|
||||
--input "$nixpkgs"/pkgs/applications/audio/open-stage-control/package.json \
|
||||
--output "$nixpkgs"/pkgs/applications/audio/open-stage-control/node-packages.nix \
|
||||
--composition "$nixpkgs"/pkgs/applications/audio/open-stage-control/node-composition.nix
|
||||
# Lock dependencies with npm
|
||||
(cd "$pkgdir" && npm install --package-lock-only --ignore-scripts --legacy-peer-deps)
|
||||
|
||||
rm -f "$nixpkgs"/pkgs/applications/audio/open-stage-control/package.json
|
||||
# Turn lock file into patch file
|
||||
(cd "$pkgdir" && (diff -u /dev/null ./package-lock.json || [ $? -eq 1 ])) >"$pkgdir"/package-lock.json.patch
|
||||
|
||||
# Update hash
|
||||
(cd "$nixpkgs" && update-source-version "${UPDATE_NIX_ATTR_PATH:-open-stage-control}" "${tag#v}")
|
||||
rm -f "$pkgdir"/{package.json,package-lock.json}
|
||||
|
||||
# Update FOD hash
|
||||
curhash="$(nixeval "$attr.npmDeps.outputHash")"
|
||||
newhash="$(vendorhash "$attr.npmDeps")"
|
||||
|
||||
if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then
|
||||
sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
|
||||
else
|
||||
echo 'update.sh: New npmDepsHash same as old npmDepsHash, nothing to do.'
|
||||
fi
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pocket-casts";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/felicianotech/pocket-casts-desktop-app/releases/download/v${version}/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-frBtIxwRO/6k6j0itqN10t+9AyNadqXm8vC1YP960ts=";
|
||||
sha256 = "sha256-nHdF9RDOkM9HwwmK/axiIPM4nmKrWp/FHNC/EI1vTTc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -18,31 +18,32 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ alsa-lib gtk3 libXScrnSaver libXtst mesa nss ];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
unpackCmd = ''
|
||||
# If unpacking using -x option, there is a permission error
|
||||
dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner;
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
mv "$out/opt/Pocket Casts" $out/opt/pocket-casts
|
||||
mv $out/share/icons/hicolor/0x0 $out/share/icons/hicolor/256x256
|
||||
mkdir -p $out
|
||||
mv bin $out
|
||||
mv lib $out
|
||||
mv share $out
|
||||
|
||||
cp $out/lib/pocket-casts/resources/app/icon.png $out/share/pixmaps/pocket-casts.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/share/applications/pocket-casts.desktop \
|
||||
--replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts \
|
||||
--replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts"
|
||||
--replace Name=pocket-casts "Name=Pocket Casts" \
|
||||
--replace GenericName=pocket-casts "GenericName=Podcasts App" \
|
||||
--replace Exec=pocket-casts Exec=$out/bin/pocket-casts
|
||||
makeWrapper ${electron}/bin/electron \
|
||||
$out/bin/pocket-casts \
|
||||
--add-flags $out/opt/pocket-casts/resources/app.asar
|
||||
--add-flags $out/lib/pocket-casts/resources/app/main.js
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -34,15 +34,28 @@ let
|
||||
# or for all grammars:
|
||||
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
|
||||
withPlugins =
|
||||
grammarFn: self.nvim-treesitter.overrideAttrs (_: {
|
||||
postPatch =
|
||||
let
|
||||
grammars = tree-sitter.withPlugins (ps: grammarFn (ps // builtGrammars));
|
||||
in
|
||||
''
|
||||
rm -r parser
|
||||
ln -s ${grammars} parser
|
||||
'';
|
||||
f: self.nvim-treesitter.overrideAttrs (_: {
|
||||
passthru.dependencies = map
|
||||
(grammar:
|
||||
let
|
||||
name = lib.pipe grammar [
|
||||
lib.getName
|
||||
|
||||
# added in buildGrammar
|
||||
(lib.removeSuffix "-grammar")
|
||||
|
||||
# grammars from tree-sitter.builtGrammars
|
||||
(lib.removePrefix "tree-sitter-")
|
||||
(lib.replaceStrings [ "-" ] [ "_" ])
|
||||
];
|
||||
in
|
||||
|
||||
runCommand "nvim-treesitter-${name}-grammar" { } ''
|
||||
mkdir -p $out/parser
|
||||
ln -s ${grammar}/parser $out/parser/${name}.so
|
||||
''
|
||||
)
|
||||
(f (tree-sitter.builtGrammars // builtGrammars));
|
||||
});
|
||||
|
||||
withAllGrammars = withPlugins (_: allGrammars);
|
||||
@ -79,4 +92,3 @@ in
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ figsoda ];
|
||||
}
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, alsa-lib
|
||||
, libX11
|
||||
, libevdev
|
||||
@ -11,6 +12,7 @@
|
||||
, SDL2
|
||||
, libzip
|
||||
, miniupnpc
|
||||
, vulkan-loader
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -28,6 +30,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -41,6 +44,10 @@ stdenv.mkDerivation rec {
|
||||
miniupnpc
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/flycast --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/flyinghead/flycast";
|
||||
changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}";
|
||||
|
||||
@ -112,13 +112,13 @@
|
||||
"version": "2.24.1"
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-ZVRzWOw0QwRS931UCJf7gYUZ18SiAEvpkxzCHj/fgQc=",
|
||||
"hash": "sha256-xI+hH6al6zOYzgmpoOjKNy5QgVVFhnqiGm9OIUWevSk=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.39.0",
|
||||
"vendorHash": "sha256-h4J35T9Yl3RfdVIhAFq5lw1eKgvwgg9ir8RuGDFObYQ=",
|
||||
"version": "4.39.0"
|
||||
"rev": "v4.40.0",
|
||||
"vendorHash": "sha256-OScGmmFaGq7JD9+GmX3c9t/s4BqplMt7UNa2RXq5HKE=",
|
||||
"version": "4.40.0"
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=",
|
||||
@ -130,13 +130,13 @@
|
||||
"version": "2.30.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-7GqKlFFxcxJBFYhTaWGn1VCgn1DiK4aAoiwjIZsa+zI=",
|
||||
"hash": "sha256-zLNlT2CK2Rbvpxftsi6WlMQoHn8S11l/5ySIKsfQ8no=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.31.0",
|
||||
"rev": "v3.32.0",
|
||||
"vendorHash": null,
|
||||
"version": "3.31.0"
|
||||
"version": "3.32.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
|
||||
@ -167,13 +167,13 @@
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-7Xxu3Q+pAaZdvRvfIFQFx3pfH8N0gk2waoxW//zh2dA=",
|
||||
"hash": "sha256-eU8vA2fxtdsObgh2dTExGLzzBnfSc2DSGdFHrLXR3SA=",
|
||||
"owner": "DrFaust92",
|
||||
"provider-source-address": "registry.terraform.io/DrFaust92/bitbucket",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.21.4",
|
||||
"vendorHash": "sha256-VFh86MFKzgN7LvSYG7TooYapOZOJbDC8sntPzGVaNs8=",
|
||||
"version": "2.21.4"
|
||||
"rev": "v2.22.0",
|
||||
"vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=",
|
||||
"version": "2.22.0"
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=",
|
||||
@ -367,13 +367,13 @@
|
||||
"version": "1.10.0"
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-d+CMg3wYHsOYow8LG7P+qcszUBiCbNwEp1zCJN7yZKo=",
|
||||
"hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=",
|
||||
"owner": "exoscale",
|
||||
"provider-source-address": "registry.terraform.io/exoscale/exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.41.0",
|
||||
"rev": "v0.41.1",
|
||||
"vendorHash": null,
|
||||
"version": "0.41.0"
|
||||
"version": "0.41.1"
|
||||
},
|
||||
"external": {
|
||||
"hash": "sha256-o9vCr3ayqg9Ehi39FgR6vJFZYF1iTcVD4QfYHcs+YbQ=",
|
||||
@ -742,22 +742,22 @@
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-9UZbFTMH6QOcNyBkqnGA3dSDl8Tmhe6oggwJC0yJTAw=",
|
||||
"hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=",
|
||||
"owner": "aminueza",
|
||||
"provider-source-address": "registry.terraform.io/aminueza/minio",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.9.0",
|
||||
"vendorHash": "sha256-586ekznHNm442LjQ33azbswrOOZ1Z5KNuJEXMrwQ1SM=",
|
||||
"version": "1.9.0"
|
||||
"rev": "v1.9.1",
|
||||
"vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=",
|
||||
"version": "1.9.1"
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-xyKBhIsTawksKruRPXBJ3pEo+ssK7Gol3xCCdNPOes8=",
|
||||
"hash": "sha256-rHT/x3Wpd7b4u7v1/g6DY85TwRkf5A7KaOiqoWeN05Y=",
|
||||
"owner": "mongodb",
|
||||
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.5.0",
|
||||
"vendorHash": "sha256-zaILkt1uuw21r/ZHeSUWcfgPP2gCNRJYfn4DHUtVC2Q=",
|
||||
"version": "1.5.0"
|
||||
"rev": "v1.6.0",
|
||||
"vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=",
|
||||
"version": "1.6.0"
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
|
||||
@ -814,13 +814,13 @@
|
||||
"version": "3.2.9"
|
||||
},
|
||||
"null": {
|
||||
"hash": "sha256-2YM3btZInUlIwp1VkasuugZZ8FervpRviUlx60vhVak=",
|
||||
"hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/null",
|
||||
"repo": "terraform-provider-null",
|
||||
"rev": "v3.2.0",
|
||||
"vendorHash": "sha256-rbZ7t5hcHkbbmqy+htYL7Ij8ZNILRsvUgLwwVObnZGg=",
|
||||
"version": "3.2.0"
|
||||
"rev": "v3.2.1",
|
||||
"vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=",
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"nutanix": {
|
||||
"deleteVendor": true,
|
||||
@ -860,13 +860,13 @@
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"opennebula": {
|
||||
"hash": "sha256-QD/JU1sk1uEdgyOxvU+vDDqlYe5uoRxHx6nB0fCi6ds=",
|
||||
"hash": "sha256-jm7k0k28TSfnUA6P2RjSfF36o/nznvDWcDmJz/MAMXU=",
|
||||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v1.0.1",
|
||||
"vendorHash": "sha256-iT3c0CBSP+FKM4CFsTopY4W41ZCaC8E3Iz1o+THI/fQ=",
|
||||
"version": "1.0.1"
|
||||
"rev": "v1.0.2",
|
||||
"vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=",
|
||||
"version": "1.0.2"
|
||||
},
|
||||
"openstack": {
|
||||
"hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=",
|
||||
@ -1004,13 +1004,13 @@
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"selectel": {
|
||||
"hash": "sha256-2PwqVzwl8UIO+334lp9zkwkr2zAdI8S/rO+6iqTLu+I=",
|
||||
"hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=",
|
||||
"owner": "selectel",
|
||||
"provider-source-address": "registry.terraform.io/selectel/selectel",
|
||||
"repo": "terraform-provider-selectel",
|
||||
"rev": "v3.8.5",
|
||||
"vendorHash": "sha256-/7YQa84hOrOAGQSW1kVE27aM2253IB4pvA0ASAJe8VQ=",
|
||||
"version": "3.8.5"
|
||||
"rev": "v3.9.0",
|
||||
"vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=",
|
||||
"version": "3.9.0"
|
||||
},
|
||||
"sentry": {
|
||||
"hash": "sha256-D6w2HfgIcNFfDXeqzuerK8msrFF7vajk80MUxbUxA+A=",
|
||||
@ -1049,13 +1049,13 @@
|
||||
"version": "0.15.1"
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-ED8Sjtimt+9Lg62ZZARtvNNIHePcfLCyxrjQCCpxU9U=",
|
||||
"hash": "sha256-V2N9Lq425fdjlJ+lCVQzMAYfEiS2/Oqevz1dIve//FA=",
|
||||
"owner": "Snowflake-Labs",
|
||||
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.51.0",
|
||||
"rev": "v0.52.0",
|
||||
"vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=",
|
||||
"version": "0.51.0"
|
||||
"version": "0.52.0"
|
||||
},
|
||||
"sops": {
|
||||
"hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=",
|
||||
@ -1112,13 +1112,13 @@
|
||||
"version": "0.13.5"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-eTHI5T2RZawwb7PsrnTm5Bglhc28A7pKcX2Lq8flAcY=",
|
||||
"hash": "sha256-HSZP6O9s6KkvaJK3xpy7uT3sjBlhBYEOu5k7VYW8MdU=",
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.78.11",
|
||||
"rev": "v1.78.12",
|
||||
"vendorHash": null,
|
||||
"version": "1.78.11"
|
||||
"version": "1.78.12"
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
|
||||
|
||||
@ -1,27 +1,35 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fonts ? []
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "google-fonts";
|
||||
version = "unstable-2022-02-26";
|
||||
version = "unstable-2022-11-14";
|
||||
|
||||
# Adobe Blank is split out in a seperate output,
|
||||
# because it causes crashes with `libfontconfig`.
|
||||
# It has an absurd number of symbols
|
||||
outputs = [ "out" "adobeBlank" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "fonts";
|
||||
rev = "2fba0d68602b7eb3374d030c1c34939de56023f9";
|
||||
sha256 = "sha256-IFkKwRRyZeOXD8/9n8UDrruUKK6oQK4BD9wYN2dmSAc=";
|
||||
rev = "83e116a566eda04a2469a11ee562cef1d7b33e4f";
|
||||
sha256 = "sha256-sSabk+VWkoXj1Nzv9ufgIU/nkfKf4XkZU1SO+j+eSPA=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
# These directories need to be removed because they contain
|
||||
# older or duplicate versions of fonts also present in other
|
||||
# directories. This causes non-determinism in the install since
|
||||
# the installation order of font files with the same name is not
|
||||
# fixed.
|
||||
rm -rv ofl/cabincondensed \
|
||||
ofl/signikanegative \
|
||||
ofl/signikanegativesc
|
||||
ofl/signikanegative \
|
||||
ofl/signikanegativesc \
|
||||
axisregistry/tests/data
|
||||
|
||||
if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
|
||||
echo "error: duplicate font names"
|
||||
@ -31,13 +39,26 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
# The font files are in the fonts directory and use two naming schemes:
|
||||
# FamilyName-StyleName.ttf and FamilyName[param1,param2,...].ttf
|
||||
# This installs all fonts if fonts is empty and otherwise only
|
||||
# the specified fonts by FamilyName. To do this, it invokes
|
||||
# `find` 2 times for every font, anyone is free to do this
|
||||
# in a more efficient way.
|
||||
fonts = map (font: builtins.replaceStrings [" "] [""] font) fonts;
|
||||
installPhase = ''
|
||||
adobeBlankDest=$adobeBlank/share/fonts/truetype
|
||||
install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf
|
||||
rm -r ofl/adobeblank
|
||||
dest=$out/share/fonts/truetype
|
||||
'' + (if fonts == [] then ''
|
||||
find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
|
||||
'';
|
||||
'' else ''
|
||||
for font in $fonts; do
|
||||
find . -name "$font-*.ttf" -exec install -m 444 -Dt $dest '{}' +
|
||||
find . -name "$font[*.ttf" -exec install -m 444 -Dt $dest '{}' +
|
||||
done
|
||||
'');
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://fonts.google.com";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catch2";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l/bqW32c1vAzE3jN01VystZXuH2ZiOQGgXkh/Mcq2eI=";
|
||||
hash = "sha256-duUafkOy0pxhRj84pm7nkfhJnLIygVnFmFAJIyx0JEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "heimdal";
|
||||
version = "7.7.0";
|
||||
version = "7.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "heimdal";
|
||||
repo = "heimdal";
|
||||
rev = "heimdal-${version}";
|
||||
sha256 = "099qn9b8q20invvi5r8d8q9rnwpcm3nr89hx5rj7gj2ah2x5vgxs";
|
||||
sha256 = "sha256-iXOaar1S3y0xHdL0S+vS0uxoFQjy43kABxqE+KEhxjU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" "info" ];
|
||||
|
||||
39
pkgs/development/python-modules/clip/default.nix
Normal file
39
pkgs/development/python-modules/clip/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ftfy
|
||||
, lib
|
||||
, regex
|
||||
, torch
|
||||
, torchvision
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clip";
|
||||
version = "unstable-2022-11-17";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = pname;
|
||||
rev = "d50d76daa670286dd6cacf3bcd80b5e4823fc8e1";
|
||||
hash = "sha256-GAitNBb5CzFVv2+Dky0VqSdrFIpKKtoAoyqeLoDaHO4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ftfy
|
||||
regex
|
||||
torch
|
||||
torchvision
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "clip" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Contrastive Language-Image Pretraining";
|
||||
homepage = "https://github.com/openai/CLIP";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gspread";
|
||||
version = "5.6.2";
|
||||
version = "5.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-07v/S3qtD8LJhkWOFIU3oC/ntG5xYvQfOkI5K/oq24k=";
|
||||
hash = "sha256-XznXohg0O2UU8G4iUODEE+tOgU3eaqv0hdrLaqMcqrA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huggingface-hub";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "huggingface_hub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iQ8c48lDn9jLZ8GPzJ5b+9OaRRLte/md5UuwxgYtWVo=";
|
||||
hash = "sha256-d+X4hGt4K6xmRFw8mevKpZ6RDv+U1PJ8WbmdKGDbVNs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -43,8 +43,8 @@ buildPythonPackage rec {
|
||||
# https://github.com/pganssle/pytz-deprecation-shim/issues/27
|
||||
doCheck = pythonAtLeast "3.9";
|
||||
|
||||
disabledTests = [
|
||||
"test_localize_explicit_is_dst"
|
||||
disabledTestPaths = [
|
||||
"tests/test_pytz_equivalent.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-httpdomain";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2059cfabd0cca8fcc3455cc8ffad92f0915a7d3bb03bfddba078a6a0f35beec5";
|
||||
sha256 = "sha256-bC3+bKKC119m3zM4absM5zMcAbR122gJ/50Qe3zf4Es=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx ];
|
||||
|
||||
32
pkgs/development/python-modules/termgraph/default.nix
Normal file
32
pkgs/development/python-modules/termgraph/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ buildPythonPackage
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "termgraph";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkaz";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0J9mEpDIdNEYwO+A+HBOaSw+Ct+HsbSPwGQYuYH6NN8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "termgraph" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A python command-line tool which draws basic graphs in the terminal";
|
||||
homepage = "https://github.com/mkaz/termgraph";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.15.13";
|
||||
version = "0.15.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iQei9YSJIKnqsWK26Eh6l3yafvRKPZ2YdHhQqybsfVg=";
|
||||
sha256 = "sha256-RcXVynR/dHI0Wn9gTQsYVjxqzAfeiI52Ph+hfpM9RhU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
pname = "sccache";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "sccache";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-z4pLtSx1mg53AHPhT8P7BOEMCWHsieoS3rI0kEyJBcY=";
|
||||
sha256 = "sha256-SjGtFkFyHJRnFg3QwXksrV+T08oku80vcivLzFWt94g=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4YF1fqthnWY6eu6J4SMwFG655KXdFCXmA9wxLyOOAw4=";
|
||||
cargoSha256 = "sha256-cd/4otvrneOqntBzNZP1/RY0jg/NYeugiblr1tatITI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.36.2";
|
||||
version = "0.36.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QhXBlGt8PFAsweYHxqk6y/BRsOURXUHU7QWQpNcFMyk=";
|
||||
sha256 = "sha256-9P5LoS8wdzJA8vGj9dRxKJYBXaSSzxplpvRc2aqRWlY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-JUdzgHSlCCelPFXdeUCrt8LntsnrgjuLah0+m5ll1oo=";
|
||||
cargoSha256 = "sha256-NgjBGoJTJNF4HwhDtBDWxcLHfpM6Jk4D9cbKLvojnaI=";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-release";
|
||||
version = "0.23.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "cargo-release";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-11u6y4w7Ah4SNgfNeVpanIZ5bWz1K0TkMGCxDtomKMM=";
|
||||
sha256 = "sha256-C5m1mRpkMCeR4TCbaFvH+5Jyko9RGP9OMi+HJx5AIZg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-oXTuLWH8nSH1XZ+Zwu2jEi3yY+0SeR+N/b0s5gKVORQ=";
|
||||
cargoSha256 = "sha256-Nuc/kJdAOX1SDynZQNTvq7QJq1kYD/6TuEYonUhPVuU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-91nrxCqX4BJVP9gKcrWrEgjVkTnwkVKxFA8KjcFjaOs=";
|
||||
sha256 = "sha256-PhcCYdc865682UZMSjwj0WWh+6pJeEaYyjX+v1XZqVk=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoSha256 = "sha256-nWhqYvji53KurLGECsgE13Bwxng8CZUfdkv3mhHSl7Y=";
|
||||
cargoSha256 = "sha256-WQYiYxbSr4fOlaI5LaBllk21I7U9sL2Xq7hMBIGCL7M=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.sentry.io/cli/";
|
||||
|
||||
@ -58,7 +58,6 @@ in rec {
|
||||
"--offline"
|
||||
"--frozen-lockfile"
|
||||
"--ignore-engines"
|
||||
"--ignore-scripts"
|
||||
];
|
||||
|
||||
mkYarnModules = {
|
||||
@ -70,6 +69,7 @@ in rec {
|
||||
yarnNix ? mkYarnNix { inherit yarnLock; },
|
||||
offlineCache ? importOfflineCache yarnNix,
|
||||
yarnFlags ? [ ],
|
||||
ignoreScripts ? true,
|
||||
pkgConfig ? {},
|
||||
preBuild ? "",
|
||||
postBuild ? "",
|
||||
@ -141,7 +141,7 @@ in rec {
|
||||
|
||||
${workspaceDependencyLinks}
|
||||
|
||||
yarn install ${lib.escapeShellArgs (defaultYarnFlags ++ yarnFlags)}
|
||||
yarn install ${lib.escapeShellArgs (defaultYarnFlags ++ lib.optional ignoreScripts "--ignore-scripts" ++ yarnFlags)}
|
||||
|
||||
${lib.concatStringsSep "\n" postInstall}
|
||||
|
||||
@ -413,7 +413,7 @@ in rec {
|
||||
# we import package.json from the unfiltered source
|
||||
packageJSON = ./package.json;
|
||||
|
||||
yarnFlags = defaultYarnFlags ++ ["--production=true"];
|
||||
yarnFlags = defaultYarnFlags ++ [ "--ignore-scripts" "--production=true" ];
|
||||
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
|
||||
|
||||
@ -17,15 +17,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.28.0";
|
||||
version = "1.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u5qlHIzPaAKLOoNSmfcPr+iNug3ZPyAm5kkfI7IO45U=";
|
||||
sha256 = "sha256-pphXLH81xous4C/mTkay9mfk3PgIT7HcY+br9uckJlQ=";
|
||||
};
|
||||
cargoSha256 = "sha256-+jc/k7YDk/MySJhuOWlas9KQSeqkwFrvRGGd9tDFEkc=";
|
||||
cargoSha256 = "sha256-DEWLIGskfvuEZhLvtdPprlmncZRcJBBBjYRuk4oFVkk=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@ -1,58 +1,28 @@
|
||||
{ stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }:
|
||||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, openssl, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipmitool";
|
||||
version = "1.8.18";
|
||||
version = "1.8.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "IPMITOOL_${lib.replaceStrings ["."] ["_"] version}";
|
||||
hash = "sha256-VVYvuldRIHhaIUibed9cLX8Avfy760fdBLNO8MoUKCk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/i/ipmitool/1.8.18-6/debian/patches/0120-openssl1.1.patch";
|
||||
sha256 = "1xvsjxb782lzy72bnqqnsk3r5h4zl3na95s4pqn2qg7cic2mnbfk";
|
||||
})
|
||||
# Fix build on non-linux systems
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ipmitool/ipmitool/commit/5db314f694f75c575cd7c9ffe9ee57aaf3a88866.patch";
|
||||
sha256 = "01niwrgajhrdhl441gzmw6v1r1yc3i8kn98db4b6smfn5fwdp1pa";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2020-5208.patch";
|
||||
url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch";
|
||||
sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY=";
|
||||
})
|
||||
# Pull upstream patch to support upstream gcc-10:
|
||||
# https://github.com/ipmitool/ipmitool/pull/180
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/ipmitool/ipmitool/commit/51c7e0822f531469cf860dfa5d010c87b284b747.patch";
|
||||
sha256 = "sha256-5UszUdVw3s2S5RCm5Exq4mqDqiYcN62in1O5+TZu9YA=";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ openssl readline ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
configureFlags = [
|
||||
"--infodir=${placeholder "out"}/share/info"
|
||||
"--mandir=${placeholder "out"}/share/man"
|
||||
] ++ lib.optionals static [
|
||||
"LDFLAGS=-static"
|
||||
"--enable-static"
|
||||
"--disable-shared"
|
||||
] ++ lib.optionals (!static) [
|
||||
"--enable-shared"
|
||||
];
|
||||
|
||||
makeFlags = lib.optional static "AM_LDFLAGS=-all-static";
|
||||
dontDisableStatic = static;
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace 'AC_MSG_WARN([** Neither wget nor curl could be found.])' 'AM_CONDITIONAL([DOWNLOAD], [false])'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line interface to IPMI-enabled devices";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://sourceforge.net/projects/ipmitool/";
|
||||
homepage = "https://github.com/ipmitool/ipmitool";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruplacer";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TankerHQ";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1uukn1juFZB7lLZwGBmTc78h1p1GYhZxWMJqvpvIWpA=";
|
||||
sha256 = "sha256-7qVjJLw90SUtXkfp40u/X84trnJzgCV6mp7b/yNmcPk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-SeQ0E/8m6Rxg7oOHbNliVoc+Vh5Yb1E9/n8TJO2rY80=";
|
||||
cargoSha256 = "sha256-AV6wxD2KZN53rlJofsDISL6p2dfgw+5F+GiP5u9/2/w=";
|
||||
|
||||
buildInputs = (lib.optional stdenv.isDarwin Security);
|
||||
|
||||
|
||||
@ -4770,9 +4770,7 @@ with pkgs;
|
||||
|
||||
pn = callPackage ../tools/text/pn { };
|
||||
|
||||
pocket-casts = callPackage ../applications/audio/pocket-casts {
|
||||
electron = electron_14;
|
||||
};
|
||||
pocket-casts = callPackage ../applications/audio/pocket-casts { };
|
||||
|
||||
pouf = callPackage ../tools/misc/pouf { };
|
||||
|
||||
@ -31066,10 +31064,7 @@ with pkgs;
|
||||
|
||||
openscad = libsForQt5.callPackage ../applications/graphics/openscad {};
|
||||
|
||||
open-stage-control = callPackage ../applications/audio/open-stage-control {
|
||||
electron = electron_15;
|
||||
nodejs = nodejs-16_x;
|
||||
};
|
||||
open-stage-control = callPackage ../applications/audio/open-stage-control { };
|
||||
|
||||
opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
|
||||
|
||||
|
||||
@ -1738,6 +1738,8 @@ self: super: with self; {
|
||||
|
||||
clf = callPackage ../development/python-modules/clf { };
|
||||
|
||||
clip = callPackage ../development/python-modules/clip { };
|
||||
|
||||
cock = callPackage ../development/python-modules/cock { };
|
||||
|
||||
click = callPackage ../development/python-modules/click { };
|
||||
@ -10983,6 +10985,8 @@ self: super: with self; {
|
||||
|
||||
termcolor = callPackage ../development/python-modules/termcolor { };
|
||||
|
||||
termgraph = callPackage ../development/python-modules/termgraph { };
|
||||
|
||||
terminado = callPackage ../development/python-modules/terminado { };
|
||||
|
||||
terminaltables = callPackage ../development/python-modules/terminaltables { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user