Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1ef91b1d7e
|
|
@ -0,0 +1,24 @@
|
|||
name: "Check cherry-picks"
|
||||
on:
|
||||
pull_request_target:
|
||||
branches:
|
||||
- 'release-*'
|
||||
- 'staging-*'
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
check:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
fetch-depth: 0
|
||||
filter: blob:none
|
||||
- name: Check cherry-picks
|
||||
env:
|
||||
BASE_SHA: ${{ github.event.pull_request.base.sha }}
|
||||
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
||||
run: |
|
||||
./maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
|
||||
|
|
@ -93,12 +93,12 @@ in mkLicense lset) ({
|
|||
url = "https://aomedia.org/license/patent-license/";
|
||||
};
|
||||
|
||||
apsl10 = {
|
||||
apple-psl10 = {
|
||||
spdxId = "APSL-1.0";
|
||||
fullName = "Apple Public Source License 1.0";
|
||||
};
|
||||
|
||||
apsl20 = {
|
||||
apple-psl20 = {
|
||||
spdxId = "APSL-2.0";
|
||||
fullName = "Apple Public Source License 2.0";
|
||||
};
|
||||
|
|
@ -1272,6 +1272,18 @@ in mkLicense lset) ({
|
|||
};
|
||||
} // {
|
||||
# TODO: remove legacy aliases
|
||||
apsl10 = {
|
||||
# deprecated for consistency with `apple-psl20`; use `apple-psl10`
|
||||
spdxId = "APSL-1.0";
|
||||
fullName = "Apple Public Source License 1.0";
|
||||
deprecated = true;
|
||||
};
|
||||
apsl20 = {
|
||||
# deprecated due to confusion with Apache-2.0; use `apple-psl20`
|
||||
spdxId = "APSL-2.0";
|
||||
fullName = "Apple Public Source License 2.0";
|
||||
deprecated = true;
|
||||
};
|
||||
gpl2 = {
|
||||
spdxId = "GPL-2.0";
|
||||
fullName = "GNU General Public License v2.0";
|
||||
|
|
|
|||
|
|
@ -224,6 +224,12 @@
|
|||
githubId = 12578560;
|
||||
name = "Quinn Bohner";
|
||||
};
|
||||
_8aed = {
|
||||
email = "8aed@riseup.net";
|
||||
github = "8aed";
|
||||
githubId = 140662578;
|
||||
name = "Huit Aed";
|
||||
};
|
||||
_8-bit-fox = {
|
||||
email = "sebastian@markwaerter.de";
|
||||
github = "8-bit-fox";
|
||||
|
|
@ -5782,6 +5788,12 @@
|
|||
githubId = 122112154;
|
||||
name = "Edgar Lee";
|
||||
};
|
||||
elrohirgt = {
|
||||
email = "elrohirgt@gmail.com";
|
||||
github = "ElrohirGT";
|
||||
githubId = 45268815;
|
||||
name = "Flavio Galán";
|
||||
};
|
||||
elvishjerricco = {
|
||||
email = "elvishjerricco@gmail.com";
|
||||
matrix = "@elvishjerricco:matrix.org";
|
||||
|
|
@ -8527,6 +8539,12 @@
|
|||
fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA";
|
||||
}];
|
||||
};
|
||||
imrying = {
|
||||
email = "philiprying@gmail.com";
|
||||
github = "imrying";
|
||||
githubId = 36996706;
|
||||
name = "Philip Rying";
|
||||
};
|
||||
imuli = {
|
||||
email = "i@imu.li";
|
||||
github = "imuli";
|
||||
|
|
@ -9612,6 +9630,12 @@
|
|||
githubId = 51028009;
|
||||
name = "John Rodewald";
|
||||
};
|
||||
johnrtitor = {
|
||||
email = "masumrezarock100@gmail.com";
|
||||
github = "johnrtitor";
|
||||
githubId = 50095635;
|
||||
name = "Masum Reza";
|
||||
};
|
||||
john-shaffer = {
|
||||
email = "jdsha@proton.me";
|
||||
github = "john-shaffer";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,92 @@
|
|||
#!/usr/bin/env bash
|
||||
# Find alleged cherry-picks
|
||||
|
||||
set -e
|
||||
|
||||
if [ $# != "2" ] ; then
|
||||
echo "usage: check-cherry-picks.sh base_rev head_rev"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
|
||||
problem=0
|
||||
|
||||
while read new_commit_sha ; do
|
||||
if [ "$GITHUB_ACTIONS" = 'true' ] ; then
|
||||
echo "::group::Commit $new_commit_sha"
|
||||
else
|
||||
echo "================================================="
|
||||
fi
|
||||
git rev-list --max-count=1 --format=medium "$new_commit_sha"
|
||||
echo "-------------------------------------------------"
|
||||
|
||||
original_commit_sha=$(
|
||||
git rev-list --max-count=1 --format=format:%B "$new_commit_sha" \
|
||||
| grep -Ei -m1 "cherry.*[0-9a-f]{40}" \
|
||||
| grep -Eoi -m1 '[0-9a-f]{40}'
|
||||
)
|
||||
if [ "$?" != "0" ] ; then
|
||||
echo " ? Couldn't locate original commit hash in message"
|
||||
[ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup::
|
||||
continue
|
||||
fi
|
||||
|
||||
set -f # prevent pathname expansion of patterns
|
||||
for branch_pattern in $PICKABLE_BRANCHES ; do
|
||||
set +f # re-enable pathname expansion
|
||||
|
||||
while read -r picked_branch ; do
|
||||
if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then
|
||||
echo " ✔ $original_commit_sha present in branch $picked_branch"
|
||||
|
||||
range_diff_common='git range-diff
|
||||
--no-notes
|
||||
--creation-factor=100
|
||||
'"$original_commit_sha~..$original_commit_sha"'
|
||||
'"$new_commit_sha~..$new_commit_sha"'
|
||||
'
|
||||
|
||||
if $range_diff_common --no-color | grep -E '^ {4}[+-]{2}' > /dev/null ; then
|
||||
if [ "$GITHUB_ACTIONS" = 'true' ] ; then
|
||||
echo ::endgroup::
|
||||
echo -n "::warning ::"
|
||||
else
|
||||
echo -n " ⚠ "
|
||||
fi
|
||||
echo "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:"
|
||||
|
||||
$range_diff_common --color
|
||||
|
||||
problem=1
|
||||
else
|
||||
echo " ✔ $original_commit_sha highly similar to $new_commit_sha"
|
||||
$range_diff_common --color
|
||||
[ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup::
|
||||
fi
|
||||
|
||||
# move on to next commit
|
||||
continue 3
|
||||
fi
|
||||
done <<< "$(
|
||||
git for-each-ref \
|
||||
--format="%(refname)" \
|
||||
"refs/remotes/origin/$branch_pattern"
|
||||
)"
|
||||
done
|
||||
|
||||
if [ "$GITHUB_ACTIONS" = 'true' ] ; then
|
||||
echo ::endgroup::
|
||||
echo -n "::error ::"
|
||||
else
|
||||
echo -n " ✘ "
|
||||
fi
|
||||
echo "$original_commit_sha not found in any pickable branch"
|
||||
|
||||
problem=1
|
||||
done <<< "$(
|
||||
git rev-list \
|
||||
-E -i --grep="cherry.*[0-9a-f]{40}" --reverse \
|
||||
"$1..$2"
|
||||
)"
|
||||
|
||||
exit $problem
|
||||
|
|
@ -55,6 +55,8 @@ in {
|
|||
then [ package ] ++ extraPackages
|
||||
else [ package32 ] ++ extraPackages32;
|
||||
in prevLibs ++ additionalLibs;
|
||||
# ensure font packages are picked up by Steam
|
||||
extraPkgs = (prev.extraPkgs or []) ++ config.fonts.packages;
|
||||
} // optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice)
|
||||
{
|
||||
buildFHSEnv = pkgs.buildFHSEnv.override {
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.301";
|
||||
version = "1.2.305";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w7gHcHXvCWGzIiq4NvKjha/gs7W8fmNnZPe99lHstIg=";
|
||||
hash = "sha256-WbSGbwm3/GXRZBvnleJYXxXBhIj+NwKAMLBZdUkf4PE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pPWX9KtWDgJrQKt9PX1gb0v/DCop8lOxJyAjFZr3RpI=";
|
||||
vendorHash = "sha256-BN2baLI91tJyGFEuuS9lAzKsKwPPpKm0eUK7Hxwbvkk=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "conmon-rs";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B8uloch+ucOLIIR64GE5Z8ahe2NLqPmDGcugQVSqpl4=";
|
||||
hash = "sha256-+htd9RJGSFzzyEQSBJGIzurQDQgpJ+sJHLPe3aPH0cg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ capnproto protobuf ];
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-hEhAnNppiyY6EcdHfri534ih8VUfpT7lO9L4mFJ6Caw=";
|
||||
cargoHash = "sha256-CcWji/qMd7eX0O3cR9/FLID17WpSfz4kEAhDgKb3jds=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OCI container runtime monitor written in Rust";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,23 @@
|
|||
{ lib
|
||||
, python3Packages
|
||||
, python312Packages
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, ...
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
python312Packages.buildPythonPackage rec {
|
||||
pname = "ark-pixel-font";
|
||||
version = "2023.11.26";
|
||||
version = "2024.04.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TakWolf";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6a9wNmcXlEesPthpMt+GrWyO3x6WVtemVTXP8rbWmLk=";
|
||||
hash = "sha256-G34cu/mSt/p8UPJt+Q1T2qy6d9LGgT1Jslt9syRz5eo=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
nativeBuildInputs = with python312Packages; [
|
||||
pixel-font-builder
|
||||
unidata-blocks
|
||||
character-encoding-utils
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.81";
|
||||
version = "1.0.82";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ZOoMWvtuLDhbJu+qzVPHGTCqh2b3PHUggfxNtUW1DoU=";
|
||||
hash = "sha256-3NukL5DyyBMR1yiSP7SWhREP/vFl+Zd2gsGxC//7edI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cTz9ZR+79yPqTaDqXjSlqXd7NxHDl6Q75N26z+vi7ck=";
|
||||
cargoHash = "sha256-niKg9IxNranrm52bXbp231cx/47kY+fd2ycdkudAWVo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand to show result of macro expansion";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildGoModule rec {
|
|||
meta = {
|
||||
description = "Admin tool to view and inspect multiple x509 Certificates";
|
||||
homepage = "https://github.com/mgit-at/cert-viewer";
|
||||
license = lib.licenses.apsl20;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.mkg20001 ];
|
||||
mainProgram = "cert-viewer";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"dependencies": {}
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
{ lib, buildDubPackage, fetchFromGitHub, clang, ldc, which }:
|
||||
buildDubPackage rec {
|
||||
pname = "dstep";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jacob-carlborg";
|
||||
repo = "dstep";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZFz2+GtBk3StqXo/9x47xrDFdz5XujHR62hj0p3AjcY=";
|
||||
};
|
||||
|
||||
dubLock = ./dub-lock.json;
|
||||
|
||||
nativeBuildInputs = [ ldc which clang ];
|
||||
|
||||
preConfigure = ''
|
||||
./configure --llvm-path ${lib.getLib clang.cc}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 bin/dstep -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for converting C and Objective-C headers to D modules";
|
||||
homepage = "https://github.com/jacob-carlborg/dstep";
|
||||
license = licenses.boost;
|
||||
mainProgram = "dstep";
|
||||
maintainers = with maintainers; [ imrying ];
|
||||
};
|
||||
}
|
||||
|
|
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://lightningcss.dev/";
|
||||
changelog = "https://github.com/parcel-bundler/lightningcss/releases/tag/v${version}";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ toastal ];
|
||||
maintainers = with maintainers; [ johnrtitor toastal ];
|
||||
mainProgram = "lightningcss";
|
||||
# never built on aarch64-linux since first introduction in nixpkgs
|
||||
broken = stdenv.isLinux && stdenv.isAarch64;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
description = "MaaAssistantArknights stripped-down version of FastDeploy";
|
||||
homepage = "https://github.com/MaaAssistantArknights/FastDeploy";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
broken = cudaSupport && stdenv.hostPlatform.system != "x86_64-linux";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Cross platform port of the macOS CoreFoundation";
|
||||
homepage = "https://github.com/gerickson/opencflite";
|
||||
license = lib.licenses.apsl20;
|
||||
license = lib.licenses.apple-psl20;
|
||||
maintainers = with lib.maintainers; [ wegank ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, lib, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "passt";
|
||||
version = "0.2023_11_10.5ec3634";
|
||||
src = fetchgit {
|
||||
url = "git://passt.top/passt";
|
||||
rev = "5ec3634b07215337c2e69d88f9b1d74711897d7d";
|
||||
hash = "sha256-76CD9PYD/NcBkmRYFSZaYl381QJjuWo0VsNdh31d6/M=";
|
||||
};
|
||||
nativeBuildInputs = [ ];
|
||||
buildInputs = [];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
cp passt pasta qrap $out/bin/
|
||||
cp passt.1 pasta.1 qrap.1 $out/share/man/man1/
|
||||
'' + (lib.optionalString stdenv.hostPlatform.avx2Support ''
|
||||
cp passt.avx2 pasta.avx2 $out/bin/
|
||||
runHook postInstall
|
||||
'');
|
||||
meta = with lib; {
|
||||
homepage = "https://passt.top/passt/about/";
|
||||
description = "Translation layer between a Layer-2 network interface and native Layer-4 sockets";
|
||||
longDescription = ''
|
||||
passt implements a translation layer between a Layer-2 network interface
|
||||
and native Layer-4 sockets (TCP, UDP, ICMP/ICMPv6 echo) on a host.
|
||||
It doesn't require any capabilities or privileges, and it can be used as
|
||||
a simple replacement for Slirp.
|
||||
|
||||
pasta (same binary as passt, different command) offers equivalent
|
||||
functionality, for network namespaces: traffic is forwarded using a tap
|
||||
interface inside the namespace, without the need to create further
|
||||
interfaces on the host, hence not requiring any capabilities or
|
||||
privileges.
|
||||
'';
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ _8aed ];
|
||||
};
|
||||
}
|
||||
|
|
@ -85,7 +85,9 @@ python.pkgs.buildPythonApplication rec {
|
|||
]);
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"cssutils"
|
||||
"django-csp"
|
||||
"django-filter"
|
||||
"python-dateutil"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
--replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \
|
||||
--replace-fail "bleach==5.0.*" bleach \
|
||||
--replace-fail "dnspython==2.6.*" dnspython \
|
||||
--replace-fail "django-countries==7.5.*" django-countries \
|
||||
--replace-fail "django-filter==24.1" django-filter \
|
||||
--replace-fail "importlib_metadata==7.*" importlib_metadata \
|
||||
--replace-fail "markdown==3.6" markdown \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "protoc-go-inject-tag";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "favadi";
|
||||
repo = "protoc-go-inject-tag";
|
||||
rev = "v${version}";
|
||||
sha256 = "01jsrx83pygvjx3nzfnwvb2vn5gagl79m9i67v7cfg1lzz168spj";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tMpcJ37yGr7i91Kwz57FmJ+u2x0CAus0+yWOR10fJLo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Inject custom tags to protobuf golang struct";
|
||||
homepage = "https://github.com/favadi/protoc-go-inject-tag/tree/v1.4.0";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [elrohirgt];
|
||||
mainProgram = "protoc-go-inject-tag";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
{
|
||||
lib,
|
||||
formats,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
libsForQt5,
|
||||
variants ? [ "qt6" ],
|
||||
/*
|
||||
An example of how you can override the background on the NixOS logo
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.where-is-my-sddm-theme.override {
|
||||
themeConfig.General = {
|
||||
background = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
backgroundMode = "none";
|
||||
};
|
||||
})
|
||||
];
|
||||
*/
|
||||
themeConfig ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig;
|
||||
validVariants = [
|
||||
"qt5"
|
||||
"qt6"
|
||||
];
|
||||
in
|
||||
|
||||
lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "where-is-my-sddm-theme";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepanzubkov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/D3i4QcE5+GbiAw32bFYJ7UxW/5NAl9FqQfiQc4akzI=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs =
|
||||
[ ]
|
||||
++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
|
||||
++ lib.optional (lib.elem "qt6" variants) [ qt6.qt5compat ];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/share/sddm/themes/
|
||||
''
|
||||
+ lib.optionalString (lib.elem "qt6" variants) ''
|
||||
cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/
|
||||
''
|
||||
+ lib.optionalString (lib.elem "qt5" variants) ''
|
||||
cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/
|
||||
''
|
||||
+ lib.optionalString (lib.isAttrs themeConfig) ''
|
||||
ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The most minimalistic SDDM theme among all themes";
|
||||
homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ name-snrl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
{ lib
|
||||
, formats
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, qtgraphicaleffects
|
||||
/* An example of how you can override the background on the NixOS logo
|
||||
*
|
||||
* environment.systemPackages = [
|
||||
* (pkgs.where-is-my-sddm-theme.override {
|
||||
* themeConfig.General = {
|
||||
* background = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
* backgroundMode = "none";
|
||||
* };
|
||||
* })
|
||||
* ];
|
||||
*/
|
||||
, themeConfig ? null
|
||||
}:
|
||||
|
||||
let
|
||||
user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig;
|
||||
in
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "where-is-my-sddm-theme";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepanzubkov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/D3i4QcE5+GbiAw32bFYJ7UxW/5NAl9FqQfiQc4akzI=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ qtgraphicaleffects ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/sddm/themes/
|
||||
cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/
|
||||
'' + lib.optionalString (lib.isAttrs themeConfig) ''
|
||||
ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The most minimalistic SDDM theme among all themes";
|
||||
homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ name-snrl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,16 @@
|
|||
version ? null }:
|
||||
|
||||
let ocamlPackages = coq.ocamlPackages;
|
||||
defaultVersion = lib.switch coq.coq-version [
|
||||
{ case = "8.18"; out = "2.0.3+coq8.18"; }
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.18" "8.19"; out = "2.1.2"; }
|
||||
{ case = isEq "8.18"; out = "2.0.3+coq8.18"; }
|
||||
] null;
|
||||
location = { domain = "github.com"; owner = "coq-community"; repo = "vscoq"; };
|
||||
fetch = metaFetch ({
|
||||
release."2.0.3+coq8.18".sha256 = "sha256-VXhHCP6Ni5/OcsgoI1EbJfYCpXzwkuR8kbbKrl6dfjU=";
|
||||
release."2.0.3+coq8.18".rev = "v2.0.3+coq8.18";
|
||||
release."2.1.2".rev = "v2.1.2";
|
||||
release."2.1.2".sha256 = "sha256-GloY68fLmIv3oiEGNWwmgKv1CMAReBuXzMTUsKOs328=";
|
||||
inherit location; });
|
||||
fetched = fetch (if version != null then version else defaultVersion);
|
||||
in
|
||||
|
|
@ -16,12 +19,13 @@ ocamlPackages.buildDunePackage {
|
|||
pname = "vscoq-language-server";
|
||||
inherit (fetched) version;
|
||||
src = "${fetched.src}/language-server";
|
||||
nativeBuildInputs = [ coq ];
|
||||
buildInputs =
|
||||
[ coq glib gnome.adwaita-icon-theme wrapGAppsHook ] ++
|
||||
(with ocamlPackages; [ findlib
|
||||
lablgtk3-sourceview3 yojson zarith ppx_inline_test
|
||||
ppx_assert ppx_sexp_conv ppx_deriving ppx_import sexplib
|
||||
ppx_yojson_conv lsp sel ]);
|
||||
ppx_yojson_conv lsp sel ppx_optcomp ]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Language server for the vscoq vscode/codium extension";
|
||||
|
|
|
|||
|
|
@ -7,25 +7,33 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quantlib";
|
||||
version = "1.29";
|
||||
version = "1.33";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lballabio";
|
||||
repo = "QuantLib";
|
||||
rev = "QuantLib-v${version}";
|
||||
sha256 = "sha256-TpVn3zPru/GtdNqDH45YdOkm7fkJzv/qay9SY3J6Jiw=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j2nRm6ebf5OU6mqmcC7wQf/qlf/K9RmmCAnfT+Au8ZM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost ];
|
||||
|
||||
# Required by RQuantLib, may be beneficial for others too
|
||||
cmakeFlags = [ "-DQL_HIGH_RESOLUTION_DATE=ON" ];
|
||||
|
||||
# Needed for RQuantLib and possible others
|
||||
postInstall = ''
|
||||
cp ./quantlib-config $out/bin/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free/open-source library for quantitative finance";
|
||||
homepage = "https://quantlib.org";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [];
|
||||
maintainers = [ maintainers.kupac ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ final: prev: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
hash = "sha256-ej3h4LlF/pkAYeDxePb7wMc8zrfxKMnrp1ogZLoFU+0=";
|
||||
hash = "sha256-136nEfCJjLLUMO3TZhVrltfqv8nU2fA14+L0JLe6Zfk=";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,6 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "High-level Ledger API client for Daml ledgers";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# build
|
||||
# build-system
|
||||
, setuptools
|
||||
|
||||
# propagates
|
||||
# dependencies
|
||||
, asgiref
|
||||
, typing-extensions
|
||||
|
||||
|
|
@ -19,21 +19,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-countries";
|
||||
version = "7.5.1";
|
||||
format = "pyproject";
|
||||
version = "7.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SmileyChris";
|
||||
repo = "django-countries";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-se6s0sgIfMLW0sIMp/3vK4KdDPQ5ahg6OQCDAs4my4M=";
|
||||
hash = "sha256-IR9cJbDVkZrcF3Ti70mV8VeXINQDK8OpwUTWVjD4Zn0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asgiref
|
||||
typing-extensions
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
{ lib
|
||||
, arrow
|
||||
, azure-storage-blob
|
||||
, boto
|
||||
, buildPythonPackage
|
||||
, colour
|
||||
, email-validator
|
||||
, enum34
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, flask-babelex
|
||||
, flask-mongoengine
|
||||
, flask-sqlalchemy
|
||||
, geoalchemy2
|
||||
|
|
@ -19,10 +14,9 @@
|
|||
, pymongo
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, shapely
|
||||
, sqlalchemy
|
||||
, sqlalchemy-citext
|
||||
, sqlalchemy-utils
|
||||
, wtf-peewee
|
||||
, wtforms
|
||||
}:
|
||||
|
|
@ -30,14 +24,15 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "flask-admin";
|
||||
version = "1.6.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-Admin";
|
||||
inherit version;
|
||||
hash = "sha256-JMrir4MramEaAdfcNfQtJmwdbHWkJrhp2MskG3gjM2k=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "flask-admin";
|
||||
repo = "flask-admin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L8Q9uPpoen6ZvuF2bithCMSgc6X5khD1EqH2FJPspZc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -49,66 +44,51 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
flask
|
||||
wtforms
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
aws = [
|
||||
boto
|
||||
];
|
||||
azure = [
|
||||
azure-storage-blob
|
||||
];
|
||||
optional-dependencies = {
|
||||
aws = [ boto ];
|
||||
azure = [ azure-storage-blob ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
arrow
|
||||
colour
|
||||
email-validator
|
||||
flask-babelex
|
||||
pillow
|
||||
mongoengine
|
||||
pymongo
|
||||
wtf-peewee
|
||||
sqlalchemy
|
||||
flask-mongoengine
|
||||
flask-sqlalchemy
|
||||
geoalchemy2
|
||||
mongoengine
|
||||
pillow
|
||||
psycopg2
|
||||
pymongo
|
||||
pytestCheckHook
|
||||
# flask-babelex # broken and removed
|
||||
shapely
|
||||
sqlalchemy
|
||||
sqlalchemy-citext
|
||||
sqlalchemy-utils
|
||||
wtf-peewee
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Incompatible with werkzeug 2.1
|
||||
"test_mockview"
|
||||
# Tests are outdated and don't work with peewee
|
||||
"test_nested_flask_views"
|
||||
"test_export_csv"
|
||||
"test_list_row_actions"
|
||||
"test_column_editable_list"
|
||||
"test_column_filters"
|
||||
"test_export_csv"
|
||||
geoalchemy2
|
||||
psycopg2
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests have additional requirements
|
||||
"flask_admin/tests/geoa/test_basic.py"
|
||||
"flask_admin/tests/mongoengine/test_basic.py"
|
||||
"flask_admin/tests/pymongo/test_basic.py"
|
||||
# depends on flask-babelex
|
||||
"flask_admin/tests/sqla/test_basic.py"
|
||||
"flask_admin/tests/sqla/test_form_rules.py"
|
||||
"flask_admin/tests/sqla/test_inlineform.py"
|
||||
"flask_admin/tests/sqla/test_multi_pk.py"
|
||||
"flask_admin/tests/sqla/test_postgres.py"
|
||||
"flask_admin/tests/sqla/test_translation.py"
|
||||
# RuntimeError: Working outside of application context.
|
||||
"flask_admin/tests/sqla/test_multi_pk.py"
|
||||
# Broken test
|
||||
# broken
|
||||
"flask_admin/tests/sqla/test_inlineform.py"
|
||||
"flask_admin/tests/test_model.py"
|
||||
"flask_admin/tests/fileadmin/test_fileadmin.py"
|
||||
# requires database
|
||||
"flask_admin/tests/geoa/test_basic.py"
|
||||
"flask_admin/tests/pymongo/test_basic.py"
|
||||
"flask_admin/tests/mongoengine/test_basic.py"
|
||||
"flask_admin/tests/peeweemodel/test_basic.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -120,6 +100,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/flask-admin/flask-admin/";
|
||||
changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -578,6 +578,7 @@ let
|
|||
odbc = [ pkgs.pkg-config ];
|
||||
openssl = [ pkgs.pkg-config ];
|
||||
pdftools = [ pkgs.pkg-config ];
|
||||
RQuantLib = with pkgs; [ quantlib.dev boost.dev ];
|
||||
sf = with pkgs; [ pkg-config sqlite.dev proj.dev ];
|
||||
terra = with pkgs; [ pkg-config sqlite.dev proj.dev ];
|
||||
showtext = [ pkgs.pkg-config ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -14,13 +14,13 @@
|
|||
# function correctly.
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "5.6.0";
|
||||
version = "5.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
sha256 = "sha256-zyF2NAOPNJe23tIuOHalsvnYytALKZq8QY1L8EWJMno=";
|
||||
hash = "sha256-emy2Qvx05D8omSc3Ivx66EnThW/tr77UGQu3qhat/fc=";
|
||||
};
|
||||
|
||||
# Use system openssl.
|
||||
|
|
@ -30,9 +30,9 @@ rustPlatform.buildRustPackage rec {
|
|||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8=";
|
||||
"cuid-1.3.2" = "sha256-ZihFrLerEIOdbJggaBbByRbC1sZRvF4M0LN2albB7vA=";
|
||||
"cuid-1.3.2" = "sha256-qBu1k/dJiA6rWBwk4nOOqouIneD9h2TTBT8tvs0TDfA=";
|
||||
"graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4=";
|
||||
"mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ=";
|
||||
"mysql_async-0.31.3" = "sha256-2wOupQ/LFV9pUifqBLwTvA0tySv+XWbxHiqs7iTzvvg=";
|
||||
"postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FdAUcKey3FamMWKKVDCL+ndXC4bBZHo1om9IUeLMZkA=";
|
||||
hash = "sha256-tJLx/dts7C5yupJX2jkRiAQumlPtlg2HzFx11jQczzE=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoHash = "sha256-+zlRLs/m9ThiBgzKWkIpUIL3jWMz/o+hD0m0Vks4HzY=";
|
||||
cargoHash = "sha256-LMdi1Xx6Tq8q+DQHpNDwmtQO+8hiVXjEP7fDIpbN2DU=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, buildEnv, makeWrapper
|
||||
{ stdenv, lib, fetchFromGitHub, buildEnv, makeWrapper, copyDesktopItems, makeDesktopItem
|
||||
, SDL2, libGL, curl
|
||||
, openalSupport ? true, openal
|
||||
, Cocoa, OpenAL
|
||||
|
|
@ -9,7 +9,7 @@ let
|
|||
|
||||
games = import ./games.nix { inherit stdenv lib fetchFromGitHub; };
|
||||
|
||||
wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; };
|
||||
wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2 copyDesktopItems makeDesktopItem; };
|
||||
|
||||
yquake2 = stdenv.mkDerivation rec {
|
||||
pname = "yquake2";
|
||||
|
|
@ -40,9 +40,12 @@ let
|
|||
"WITH_SYSTEMDIR=$\{out}/share/games/quake2"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
# Yamagi Quake II expects all binaries (executables and libs) to be in the
|
||||
# same directory.
|
||||
mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2/baseq2
|
||||
|
|
@ -50,8 +53,19 @@ let
|
|||
ln -s $out/lib/yquake2/quake2 $out/bin/yquake2
|
||||
ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded
|
||||
cp $src/stuff/yq2.cfg $out/share/games/quake2/baseq2
|
||||
install -Dm644 stuff/icon/Quake2.png $out/share/pixmaps/yamagi-quake2.png;
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
name = "yquake2";
|
||||
exec = "yquake2";
|
||||
icon = "yamagi-quake2";
|
||||
desktopName = "yquake2";
|
||||
comment = "Yamagi Quake II client";
|
||||
categories = [ "Game" "Shooter" ];
|
||||
})];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yamagi Quake II client";
|
||||
homepage = "https://www.yamagi.org/quake2/";
|
||||
|
|
|
|||
|
|
@ -38,8 +38,10 @@ let
|
|||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib/yquake2/${id}
|
||||
cp release/* $out/lib/yquake2/${id}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, buildEnv, makeWrapper, yquake2 }:
|
||||
{ stdenv, lib, buildEnv, makeWrapper, yquake2, copyDesktopItems, makeDesktopItem }:
|
||||
|
||||
{ games
|
||||
, name
|
||||
|
|
@ -11,19 +11,38 @@ let
|
|||
paths = [ yquake2 ] ++ games;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${name}-${lib.getVersion yquake2}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = name;
|
||||
version = lib.getVersion yquake2;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||
|
||||
buildCommand = ''
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
'' + lib.concatMapStringsSep "\n" (game: ''
|
||||
makeWrapper ${env}/bin/yquake2 $out/bin/yquake2-${game.title} \
|
||||
--add-flags "+set game ${game.id}"
|
||||
makeWrapper ${env}/bin/yq2ded $out/bin/yq2ded-${game.title} \
|
||||
--add-flags "+set game ${game.id}"
|
||||
'') games;
|
||||
'') games + ''
|
||||
install -Dm644 ${yquake2}/share/pixmaps/yamagi-quake2.png $out/share/pixmaps/yamagi-quake2.png;
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = map
|
||||
(game: makeDesktopItem ({
|
||||
name = game.id;
|
||||
exec = game.title;
|
||||
icon = "yamagi-quake2";
|
||||
desktopName = game.id;
|
||||
comment = game.description;
|
||||
categories = [ "Game" "Shooter" ];
|
||||
}))
|
||||
games;
|
||||
|
||||
meta = {
|
||||
inherit description;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,6 @@ appleDerivation' stdenvNoCC {
|
|||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ appleDerivation' stdenvNoCC {
|
|||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ appleDerivation' stdenv {
|
|||
description = "Apple's common startup stubs for darwin";
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -183,6 +183,6 @@ appleDerivation' stdenv {
|
|||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ appleDerivation {
|
|||
meta = with lib; {
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -181,6 +181,6 @@ appleDerivation' stdenv {
|
|||
description = "The Mac OS libc/libSystem (tapi library with pure headers)";
|
||||
maintainers = with maintainers; [ copumpkin gridaphobe ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,6 @@ appleDerivation' stdenvNoCC {
|
|||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ let
|
|||
} // (if builtins.isFunction attrs then attrs finalAttrs else attrs) // {
|
||||
meta = (with lib; {
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
}) // (attrs.meta or {});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@ appleDerivation' stdenvNoCC {
|
|||
description = "Impure primitive symlinks to the Mac OS native dyld, along with headers";
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ appleDerivation {
|
|||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin lnl7 ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,6 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) {
|
|||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ symlinkJoin rec {
|
|||
meta = with lib; {
|
||||
description = "MacOS Compiler Tools";
|
||||
homepage = "http://www.opensource.apple.com/source/cctools/";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ stdenv.mkDerivation {
|
|||
broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
|
||||
homepage = "http://www.opensource.apple.com/source/cctools/";
|
||||
description = "MacOS Compiler Tools (cross-platform port)";
|
||||
license = lib.licenses.apsl20;
|
||||
license = lib.licenses.apple-psl20;
|
||||
maintainers = with lib.maintainers; [ matthewbauer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
homematicip_local = callPackage ./homematicip_local { };
|
||||
|
||||
local_luftdaten = callPackage ./local_luftdaten { };
|
||||
|
||||
localtuya = callPackage ./localtuya {};
|
||||
|
||||
midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildHomeAssistantComponent
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "lichtteil";
|
||||
domain = "local_luftdaten";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lichtteil";
|
||||
repo = "local_luftdaten";
|
||||
rev = version;
|
||||
hash = "sha256-68clZgS7Qo62srcZWD3Un9BnNSwQUBr4Z5oBMTC9m8o=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/lichtteil/local_luftdaten/releases/tag/${version}";
|
||||
description = "Custom component for Home Assistant that integrates your (own) local Luftdaten sensor (air quality/particle sensor) without using the cloud";
|
||||
homepage = "https://github.com/lichtteil/local_luftdaten";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,16 +21,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2024-03-26T22-10-45Z";
|
||||
version = "2024-04-06T05-26-02Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
hash = "sha256-JdmeURCci8deQH4+7HCHkMbUzhjZBGi3dm3IHkp3XRE=";
|
||||
hash = "sha256-6ThzAPpLKzhHAXYW6EC6aiyVRvI0nJ2a4Q2GvLpg3wo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oQatc6/s1kGOZI3XetID0xmABG5XrpD0cW7aWJxWK84=";
|
||||
vendorHash = "sha256-JJfLeKoMBQ1/Q2xF6n9VD3khaiLB1ZLNl9HaQl9eKb8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
|
|||
AppKit Xplugin Foundation
|
||||
];
|
||||
meta = with lib; {
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4158,11 +4158,11 @@ self: with self; {
|
|||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xorg-server";
|
||||
version = "21.1.11";
|
||||
version = "21.1.12";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz";
|
||||
sha256 = "1vr6sc38sqipazsm61bcym2ggbgfgaamz7wf05mb31pvayyssg8x";
|
||||
url = "mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz";
|
||||
sha256 = "03x954bygi6sdynk5yy3yvsfhg6i9gjhisn3x9jxvk5mw4mnw08y";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz
|
|||
mirror://xorg/individual/util/makedepend-1.0.9.tar.xz
|
||||
mirror://xorg/individual/util/util-macros-1.20.0.tar.xz
|
||||
mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz
|
||||
mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz
|
||||
mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "HFS/HFS+ user space utils";
|
||||
license = lib.licenses.apsl20;
|
||||
license = lib.licenses.apple-psl20;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "apkg";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
|
|
@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "packaging";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "x7UYkqkF1XJ3OMfQpIQ4+27KI0dLvL42Wms5xQTY/H4=";
|
||||
hash = "sha256-VQNUzbWIDo/cbCdtx8JxN5UUMBW3mQ2B42In4b3AA+A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
, removeReferencesTo
|
||||
, btop
|
||||
, testers
|
||||
, autoAddDriverRunpath
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, cudaPackages
|
||||
, rocmSupport ? config.rocmSupport
|
||||
, rocmPackages
|
||||
}:
|
||||
|
|
@ -24,8 +24,10 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-kjSyIgLTObTOKMG5dk49XmWPXZpCWbLdpkmAsJcFliA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals cudaSupport [
|
||||
autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/apple-oss-distributions/pdisk";
|
||||
license = with licenses; [
|
||||
hpnd # original license statements seems to match this (in files that are shared with mac-fdisk)
|
||||
apsl10 # new files
|
||||
apple-psl10 # new files
|
||||
];
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -25134,8 +25134,6 @@ with pkgs;
|
|||
|
||||
whereami = callPackage ../development/libraries/whereami { };
|
||||
|
||||
where-is-my-sddm-theme = libsForQt5.callPackage ../data/themes/where-is-my-sddm-theme { };
|
||||
|
||||
wildmidi = callPackage ../development/libraries/wildmidi {
|
||||
inherit (darwin.apple_sdk.frameworks) OpenAL;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue