mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
58485aaddb
@ -3968,7 +3968,7 @@
|
||||
};
|
||||
davidarmstronglewis = {
|
||||
email = "davidlewis@mac.com";
|
||||
github = "davidarmstronglewis";
|
||||
github = "oceanlewis";
|
||||
githubId = 6754950;
|
||||
name = "David Armstrong Lewis";
|
||||
};
|
||||
@ -11035,12 +11035,6 @@
|
||||
githubId = 4708337;
|
||||
name = "Marcelo A. de L. Santos";
|
||||
};
|
||||
maxhille = {
|
||||
email = "mh@lambdasoup.com";
|
||||
github = "maxhille";
|
||||
githubId = 693447;
|
||||
name = "Max Hille";
|
||||
};
|
||||
maximsmol = {
|
||||
email = "maximsmol@gmail.com";
|
||||
github = "maximsmol";
|
||||
@ -15134,15 +15128,6 @@
|
||||
}];
|
||||
name = "Rahul Butani";
|
||||
};
|
||||
rs0vere = {
|
||||
email = "rs0vere@proton.me";
|
||||
github = "rs0vere";
|
||||
githubId = 140035635;
|
||||
keys = [{
|
||||
fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D";
|
||||
}];
|
||||
name = "Red Star Over Earth";
|
||||
};
|
||||
rski = {
|
||||
name = "rski";
|
||||
email = "rom.skiad+nix@gmail.com";
|
||||
@ -15398,7 +15383,7 @@
|
||||
};
|
||||
SamirTalwar = {
|
||||
email = "lazy.git@functional.computer";
|
||||
github = "SamirTalwar";
|
||||
github = "abstracte";
|
||||
githubId = 47852;
|
||||
name = "Samir Talwar";
|
||||
};
|
||||
@ -17813,12 +17798,6 @@
|
||||
githubId = 10110;
|
||||
name = "Travis B. Hartwell";
|
||||
};
|
||||
travisdavis-ops = {
|
||||
email = "travisdavismedia@gmail.com";
|
||||
github = "TravisDavis-ops";
|
||||
githubId = 52011418;
|
||||
name = "Travis Davis";
|
||||
};
|
||||
traxys = {
|
||||
email = "quentin+dev@familleboyer.net";
|
||||
github = "traxys";
|
||||
|
||||
@ -13,12 +13,15 @@ STDOUT->autoflush(1);
|
||||
|
||||
my $ua = LWP::UserAgent->new();
|
||||
|
||||
if (!defined $ENV{GH_TOKEN}) {
|
||||
die "Set GH_TOKEN before running this script";
|
||||
}
|
||||
|
||||
keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop
|
||||
while(my($k, $v) = each %$maintainers_json) {
|
||||
my $current_user = %$v{'github'};
|
||||
if (!defined $current_user) {
|
||||
print "$k has no github handle\n";
|
||||
next;
|
||||
}
|
||||
my $github_id = %$v{'githubId'};
|
||||
if (!defined $github_id) {
|
||||
@ -37,13 +40,16 @@ while(my($k, $v) = each %$maintainers_json) {
|
||||
sleep($ratelimit_reset - time() + 5);
|
||||
}
|
||||
if ($resp->code != 200) {
|
||||
print $current_user . " likely deleted their github account\n";
|
||||
print "$k likely deleted their github account\n";
|
||||
next;
|
||||
}
|
||||
my $resp_json = from_json($resp->content);
|
||||
my $api_user = %$resp_json{"login"};
|
||||
if (lc($current_user) ne lc($api_user)) {
|
||||
print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n";
|
||||
if (!defined $current_user) {
|
||||
print "$k is known on github as $api_user.\n";
|
||||
}
|
||||
elsif (lc($current_user) ne lc($api_user)) {
|
||||
print "$k is now known on github as $api_user. Editing maintainer-list.nix…\n";
|
||||
my $file = path($maintainers_list_nix);
|
||||
my $data = $file->slurp_utf8;
|
||||
$data =~ s/github = "$current_user";$/github = "$api_user";/m;
|
||||
|
||||
@ -203,10 +203,8 @@ in
|
||||
default = [
|
||||
"/ip4/0.0.0.0/tcp/4001"
|
||||
"/ip6/::/tcp/4001"
|
||||
"/ip4/0.0.0.0/udp/4001/quic"
|
||||
"/ip4/0.0.0.0/udp/4001/quic-v1"
|
||||
"/ip4/0.0.0.0/udp/4001/quic-v1/webtransport"
|
||||
"/ip6/::/udp/4001/quic"
|
||||
"/ip6/::/udp/4001/quic-v1"
|
||||
"/ip6/::/udp/4001/quic-v1/webtransport"
|
||||
];
|
||||
|
||||
@ -365,6 +365,7 @@ in
|
||||
};
|
||||
|
||||
xkb = mkOption {
|
||||
default = { };
|
||||
description = "X keyboard extension (XKB) configuration";
|
||||
type = types.submodule {
|
||||
options = {
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, dotnetCorePackages
|
||||
, dbus
|
||||
, fontconfig
|
||||
@ -22,6 +23,19 @@ buildDotnetModule rec {
|
||||
hash = "sha256-/+hlL2sj/juzWrDcb5dELp8Zdg688XK8OnjKz20rx/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Needed until stakira/OpenUtau#836 is merged and released to fix crashing issues. See stakira/OpenUtau#822
|
||||
(fetchpatch {
|
||||
name = "openutau-update-avalonia-to-11.0.4.patch";
|
||||
url = "https://github.com/stakira/OpenUtau/commit/0130d7387fb626a72850305dc61d7c175caccc0f.diff";
|
||||
hash = "sha256-w9PLnfiUtiKY/8+y4qqINeEul4kP72nKEVc5c8p2g7c=";
|
||||
# It looks like fetched files use CRLF but patch comes back with LF
|
||||
decode = "sed -e 's/$/\\r/'";
|
||||
})
|
||||
];
|
||||
# Needs binary for above patch due to CRLF shenanigans otherwise being ignored
|
||||
patchFlags = [ "-p1" "--binary" ];
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_7_0;
|
||||
|
||||
@ -47,8 +61,8 @@ buildDotnetModule rec {
|
||||
# needed until upstream bumps to dotnet 7
|
||||
postPatch = ''
|
||||
substituteInPlace OpenUtau/OpenUtau.csproj OpenUtau.Test/OpenUtau.Test.csproj --replace \
|
||||
"<TargetFramework>net6.0</TargetFramework>" \
|
||||
"<TargetFramework>net7.0</TargetFramework>"
|
||||
'<TargetFramework>net6.0</TargetFramework>' \
|
||||
'<TargetFramework>net7.0</TargetFramework>'
|
||||
'';
|
||||
|
||||
# need to make sure proprietary worldline resampler is copied
|
||||
|
||||
30
pkgs/applications/audio/openutau/deps.nix
generated
30
pkgs/applications/audio/openutau/deps.nix
generated
@ -3,22 +3,22 @@
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; sha256 = "1anby58bs94gf338vmn6vvwxw0kcz6y8yap57vgh8dgm9vysl0i5"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.0-rc1.1"; sha256 = "15gn6qbbx6zars37fvfdsyvqg9303zr8dsx7k1v6a4mzm190xhmm"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.19"; sha256 = "1vlhyjb2g98hh5gnisg4bdl9p93x8lmnkc97d24hpxgflcd7szs7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-rc1.1"; sha256 = "0nflr62lywmgby1lc6zasn24rinkq72imkazhv77wnj28ayid3bx"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-rc1.1"; sha256 = "088xz8llm8298agk4dkpzrb1bqyksgvzhj3pw1s4r1fcdfl0z64j"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-rc1.1"; sha256 = "06580q0il62f3464vq2113gbv0yng4jqm79k2wvn3brzl82pyhvq"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-rc1.1"; sha256 = "1jia97djk33za7spfr9276plvx8mybm7i3ckp1wprlnmh5b6nykp"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-rc1.1"; sha256 = "1mpm34lgxcxh5hglyq2fpggdf18cadzx9030kxax5ilp69mk93df"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-rc1.1"; sha256 = "0hzk1gb4zh9n5k3wv2n8nw9qcgyj9pvwysph3shg9m8wwrdhkiy5"; })
|
||||
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-rc1.1"; sha256 = "08116ixw118i2v11dylhwkj1ilgkpk29cp9n7zqj3zk7pxkln2f7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-rc1.1"; sha256 = "1m3r05b14vw4mn1m9ak91j00q0ppnkysb6m7w86sacqjfhpl8faa"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-rc1.1"; sha256 = "0a8xvqd0hgi8bynjipvvhg0cm9qr63p0h3ji1wbn3y9vrysliykh"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-rc1.1"; sha256 = "03lp3m40hwbpasa4q6gykj1y5772lpzzr59y5k1nbi54k2n3fl3k"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-rc1.1"; sha256 = "0bgz8djfmb17qrf44bivcyf9hwdfccl5f8hgyq158y7ag4a313sn"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-rc1.1"; sha256 = "1zslv10kcmclx5ajd74yi6j1f8p3a9iy2r0w4k8kwkc56d5jg30c"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-rc1.1"; sha256 = "0b4bmza84bv8hbh6jmy1kxxp9pnz4q4wq6bw8jc30w4jkdhp588r"; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; })
|
||||
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.4"; sha256 = "1hs29qvbhm5qdhys0j3d89c37qfalx1pcpxl3hh9adz11wc0nb3b"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; })
|
||||
(fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; sha256 = "1ps7fs451ydsaz5g4j7bhcfawp8fys6vcah3rsrl36g7ni0dwf3v"; })
|
||||
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
|
||||
(fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; sha256 = "12n5bcg1i91daqgnl7q6d55phbkv1srkrvk2k7k8vxpyv231yb6v"; })
|
||||
|
||||
@ -39,12 +39,11 @@ snap_info=($(
|
||||
# just for human consumption. Revision is just an integer that gets increased
|
||||
# by one every (stable or unstable) release.
|
||||
revision="${snap_info[0]}"
|
||||
sha512="${snap_info[1]}"
|
||||
# We need to escape the slashes
|
||||
hash="$(nix-hash --to-sri --type sha512 ${snap_info[1]} | sed 's|/|\\/|g')"
|
||||
upstream_version="${snap_info[2]}"
|
||||
last_updated="${snap_info[3]}"
|
||||
|
||||
echo "Latest $channel release is $upstream_version from $last_updated."
|
||||
|
||||
#
|
||||
# read the current spotify version from the currently *committed* nix expression
|
||||
#
|
||||
@ -70,7 +69,7 @@ echo "Updating from ${current_nix_version} to ${upstream_version}, released on $
|
||||
# search-and-replace revision, hash and version
|
||||
sed --regexp-extended \
|
||||
-e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \
|
||||
-e 's/sha512\s*=\s*"[^"]*"\s*;/sha512 = "'"${sha512}"'";/' \
|
||||
-e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${hash}"'";/' \
|
||||
-e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \
|
||||
-i "$spotify_nix"
|
||||
|
||||
|
||||
@ -145,6 +145,9 @@ in
|
||||
--replace '@node@' ${nodejs} \
|
||||
--replace './lib/quarto' ${quartoSrc}
|
||||
|
||||
substituteInPlace src/cpp/conf/rsession-dev.conf \
|
||||
--replace '@node@' ${nodejs}
|
||||
|
||||
substituteInPlace src/cpp/core/libclang/LibClang.cpp \
|
||||
--replace '@libclang@' ${llvmPackages.libclang.lib} \
|
||||
--replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so
|
||||
|
||||
@ -1,5 +1,33 @@
|
||||
diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf
|
||||
index d18362b..98cdd4c 100644
|
||||
--- a/src/cpp/conf/rsession-dev.conf
|
||||
+++ b/src/cpp/conf/rsession-dev.conf
|
||||
@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}
|
||||
external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR}
|
||||
external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR}
|
||||
external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang
|
||||
-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node
|
||||
+external-node-path=@node@/bin/node
|
||||
|
||||
# enable copilot
|
||||
copilot-enabled=1
|
||||
diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt
|
||||
index 30dd638..cb4a645 100644
|
||||
--- a/src/cpp/server/CMakeLists.txt
|
||||
+++ b/src/cpp/server/CMakeLists.txt
|
||||
@@ -250,10 +250,6 @@ if (UNIX AND NOT APPLE)
|
||||
DESTINATION ${RSERVER_SYSTEMD_DIR})
|
||||
|
||||
# install node
|
||||
- install(
|
||||
- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/"
|
||||
- DESTINATION "${RSTUDIO_INSTALL_BIN}/node"
|
||||
- USE_SOURCE_PERMISSIONS)
|
||||
|
||||
elseif(APPLE)
|
||||
|
||||
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
|
||||
index 83e9433..f1ee63d 100644
|
||||
index 033d605..f1ee63d 100644
|
||||
--- a/src/gwt/build.xml
|
||||
+++ b/src/gwt/build.xml
|
||||
@@ -87,29 +87,7 @@
|
||||
|
||||
@ -36,10 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapQtApp "$out/bin/fs-uae-launcher" \
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
|
||||
# fs-uae-launcher search side by side for fs-uae
|
||||
# fs-uae-launcher search side by side for executables and shared files
|
||||
# see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable
|
||||
ln -s ${fsuae}/bin/fs-uae $out/bin
|
||||
ln -s ${fsuae}/bin/fs-uae-device-helper $out/bin
|
||||
ln -s ${fsuae}/share/fs-uae $out/share/fs-uae
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
name = "Anytype-${version}";
|
||||
nameExecutable = pname;
|
||||
src = fetchurl {
|
||||
url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage";
|
||||
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
|
||||
name = "Anytype-${version}.AppImage";
|
||||
sha256 = "sha256-heS+3ucxv4WTiqegdmjpv8aWuC+3knxC00SDDg4R8iU=";
|
||||
};
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.28.11";
|
||||
version = "0.28.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PEWb2QBWK3XMuOAkSI2nAk6UJronG+3+NBU92uWO5LQ=";
|
||||
hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,13 +1,21 @@
|
||||
{ lib, python3Packages, fetchPypi }:
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nhentai";
|
||||
version = "0.4.16";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M=";
|
||||
version = "0.5.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RicterZ";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-SjWIctAyczjYGP4buXQBA/RcrdikMSuSBtfhORNmXMc=";
|
||||
};
|
||||
|
||||
# tests require a network connection
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests
|
||||
iso8601
|
||||
@ -21,6 +29,6 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://github.com/RicterZ/nhentai";
|
||||
description = "nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ travisdavis-ops ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, program ? "pdfstudio"
|
||||
, year ? "2022"
|
||||
, year ? "2023"
|
||||
, fetchurl
|
||||
, callPackage
|
||||
, jdk11
|
||||
@ -31,27 +31,23 @@ in
|
||||
{
|
||||
pdfstudioviewer = callPackage ./common.nix rec {
|
||||
inherit desktopName pname program year;
|
||||
version = "${year}.2.4";
|
||||
version = "${year}.0.3";
|
||||
longDescription = ''
|
||||
PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
|
||||
'';
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb";
|
||||
sha256 = "sha256-QXNsH1T+ItV3s9r8CnwgRUo1mhVbe8LkEun9gUmlVQg=";
|
||||
sha256 = "sha256-JQx5yJLjwW4VRXLM+/VNDXFN8ZcHJxlxyKDIzc++hEs=";
|
||||
};
|
||||
jdk = jdk17;
|
||||
|
||||
# Bad hash, got sha256-afRhx9VCVRFUJoUnqs1bzF0yXpz3yEgLiFjMRB9xvsk=
|
||||
# Likely unstable.
|
||||
broken = true;
|
||||
};
|
||||
|
||||
pdfstudio2021 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.2.1";
|
||||
version = "${year}.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-yELpza2C3HJJIP+ZQP7x3Tfez0Nl6ctCbHCmTmpX3jo=";
|
||||
sha256 = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||
@ -61,14 +57,24 @@ in
|
||||
|
||||
pdfstudio2022 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.2.4";
|
||||
version = "${year}.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-bti+WI8JdOmUsHq8ijfxGC4ZsWXwbwwM26kuBgPDUMQ=";
|
||||
sha256 = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
jdk = jdk17;
|
||||
};
|
||||
|
||||
pdfstudio2023 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg=";
|
||||
};
|
||||
jdk = jdk17;
|
||||
};
|
||||
}.${pname}
|
||||
|
||||
@ -10,17 +10,19 @@
|
||||
, libpulseaudio
|
||||
, libmpdclient
|
||||
, libxkbcommon
|
||||
, alsa-lib
|
||||
, makeWrapper
|
||||
,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sfwbar";
|
||||
version = "1.0_beta11";
|
||||
version = "1.0_beta13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LBCrion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "PmpiO5gvurpaFpoq8bQdZ53FYSVDnyjN8MxDpelMnAU=";
|
||||
hash = "sha256-7oiuTEqdXDReKdakJX6+HRaSi1XovM+MkHFkaFZtq64=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -30,14 +32,21 @@ stdenv.mkDerivation rec {
|
||||
libpulseaudio
|
||||
libmpdclient
|
||||
libxkbcommon
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/sfwbar \
|
||||
--suffix XDG_DATA_DIRS : $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/LBCrion/sfwbar";
|
||||
description = "A flexible taskbar application for wayland compositors, designed with a stacking layout in mind";
|
||||
|
||||
@ -111,13 +111,13 @@ in {
|
||||
|
||||
application = mkSweetHome3D rec {
|
||||
pname = lib.toLower module + "-application";
|
||||
version = "7.0.2";
|
||||
version = "7.2";
|
||||
module = "SweetHome3D";
|
||||
description = "Design and visualize your future home";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";
|
||||
sha256 = "sha256-9Jv/U7afG6+LwPB6IhqLePjQA67bPKelP+UcuvizBqo=";
|
||||
sha256 = "sha256-Io3HfussfSy6CLHE0JCAk0gjBAla/u+pS1Gan8BxozY=";
|
||||
};
|
||||
desktopName = "Sweet Home 3D";
|
||||
icons = {
|
||||
|
||||
@ -1,112 +0,0 @@
|
||||
{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook
|
||||
, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
|
||||
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
|
||||
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
|
||||
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
|
||||
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
|
||||
, fetchurl, fetchFromGitHub, imagemagick, copyDesktopItems
|
||||
}:
|
||||
|
||||
let
|
||||
binaryName = "AetherP2P";
|
||||
aether-app-git = fetchFromGitHub {
|
||||
owner = "aethereans";
|
||||
repo = "aether-app";
|
||||
rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d";
|
||||
sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aether";
|
||||
version = "2.0.0-dev.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz";
|
||||
sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7";
|
||||
# % in the url / canonical filename causes an error
|
||||
name = "aether-tarball.tar.gz";
|
||||
};
|
||||
|
||||
# there is no logo in the tarball so we grab it from github and convert it in the build phase
|
||||
buildPhase = ''
|
||||
convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
cups
|
||||
libdrm
|
||||
libuuid
|
||||
libXdamage
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
libxcb
|
||||
libxshmfence
|
||||
mesa
|
||||
nss
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = binaryName;
|
||||
icon = pname;
|
||||
desktopName = "Aether";
|
||||
genericName = meta.description;
|
||||
categories = [ "Network" ];
|
||||
mimeTypes = [ "x-scheme-handler/aether" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libcxx systemd libpulseaudio libdrm mesa
|
||||
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
|
||||
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
|
||||
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
|
||||
libXtst nspr nss libxcb pango systemd libXScrnSaver
|
||||
libappindicator-gtk3 libdbusmenu
|
||||
];
|
||||
in
|
||||
''
|
||||
mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/512x512/apps}
|
||||
mv * $out/opt/${binaryName}
|
||||
|
||||
chmod +x $out/opt/${binaryName}/${binaryName}
|
||||
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
|
||||
$out/opt/${binaryName}/${binaryName}
|
||||
|
||||
wrapProgram $out/opt/${binaryName}/${binaryName} \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
|
||||
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
|
||||
|
||||
ln -s $out/opt/${binaryName}/aether.png $out/share/icons/hicolor/512x512/apps/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Peer-to-peer ephemeral public communities";
|
||||
homepage = "https://getaether.net/";
|
||||
downloadPage = "https://getaether.net/download/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ maxhille ];
|
||||
# other platforms could be supported by building from source
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -92,11 +92,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.58.137";
|
||||
version = "1.59.117";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-6vsdQU9NbEKFp/1A0bNQvutF4I+vI0zfrx70QvU1KV4=";
|
||||
sha256 = "sha256-yckxTKAgglk6YRXist9RZufZdI22iitecmb01NmYPGQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -159,7 +159,7 @@ stdenv.mkDerivation rec {
|
||||
# Fix the desktop link and fix showing application icon in tray
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace "/opt/${dir}/${pname}" $out/bin/${pname} \
|
||||
--replace "bin/signal-desktop" "bin/signal-desktop --use-tray-icon"
|
||||
${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""}
|
||||
|
||||
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
|
||||
|
||||
@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.22.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.23.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version
|
||||
passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
|
||||
|
||||
# Kubo makes changes to its source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0=";
|
||||
hash = "sha256-ycXn8h8sFGJXVMldneN51lZgXoPaZ/XeXLtqqJ4w6H0=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
@ -37,9 +37,9 @@ buildGoModule rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace 'misc/systemd/ipfs.service' \
|
||||
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
|
||||
--replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
substituteInPlace 'misc/systemd/ipfs-hardened.service' \
|
||||
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
|
||||
--replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -64,7 +64,7 @@ let
|
||||
systemd
|
||||
];
|
||||
|
||||
version = "2023.4";
|
||||
version = "2023.5";
|
||||
|
||||
selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@ -74,8 +74,8 @@ let
|
||||
};
|
||||
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-7NoifrX1/3pUJHTYK+2dVos/oFsKiYwyhCGi07SsEhM=";
|
||||
aarch64-linux = "sha256-e0lp+SpBUmtYBcJPvql8ALeCkVtneZ1Cd3IFMVX6R2Q=";
|
||||
x86_64-linux = "sha256-FpVruI80PmpBo2JrMvgvOg7ou6LceTeit9HbWKgcPa4=";
|
||||
aarch64-linux = "sha256-NlYh8K5Xbad4xSoZ02yC5fh3SrQzyNyS9uoA73REcpo=";
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nali";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zu1k";
|
||||
repo = "nali";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZKLxsq7ybom96NKWkioROAVXUoY20zFBZn7ksk4XvT4=";
|
||||
sha256 = "sha256-JIP0QX1okCfDj2Y6wZ5TaV3QH0WP3oU3JjaKK6vMfWY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8=";
|
||||
vendorHash = "sha256-wIp/ShUddz+RIcsEuKWUfxsV/wNB2X1jZtIltBZ0ROM=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -49,9 +49,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uhd";
|
||||
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
|
||||
# and xxx.yyy.zzz. Hrmpf... style keeps changing
|
||||
version = "4.4.0.0";
|
||||
# NOTE: Use the following command to update the package, and the uhdImageSrc attribute:
|
||||
#
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
|
||||
#
|
||||
version = "4.5.0.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -59,14 +61,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "EttusResearch";
|
||||
repo = "uhd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg=";
|
||||
# The updateScript relies on the `src` using `hash`, and not `sha256. To
|
||||
# update the correct hash for the `src` vs the `uhdImagesSrc`
|
||||
hash = "sha256-0EqMBaQiNr8PE542YNkPvX3o1HhnhrO0Kz1euphY6Ps=";
|
||||
};
|
||||
# Firmware images are downloaded (pre-built) from the respective release on Github
|
||||
uhdImagesSrc = fetchurl {
|
||||
url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz";
|
||||
sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4=";
|
||||
# Please don't convert this to a hash, in base64, see comment near src's
|
||||
# hash.
|
||||
sha256 = "13cn41wv7vldk4vx7vy3jbb3wb3a5vpfg3ay893klpi6vzxc1dly";
|
||||
};
|
||||
passthru = {
|
||||
updateScript = [
|
||||
./update.sh
|
||||
# Pass it this file name as argument
|
||||
(builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file
|
||||
];
|
||||
};
|
||||
# TODO: Add passthru.updateScript that will update both of the above hashes...
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_LIBUHD=ON"
|
||||
|
||||
27
pkgs/applications/radio/uhd/update.sh
Executable file
27
pkgs/applications/radio/uhd/update.sh
Executable file
@ -0,0 +1,27 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p jq nix nix-prefetch-github
|
||||
|
||||
set -euo pipefail
|
||||
echoerr() { echo "$@" 1>&2; }
|
||||
|
||||
fname="$1"
|
||||
echoerr got fname $fname
|
||||
shift
|
||||
latest_release=$(curl --silent https://api.github.com/repos/EttusResearch/uhd/releases/latest)
|
||||
version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-)
|
||||
# Update version, if needed
|
||||
if grep -q 'version = "'$version $fname; then
|
||||
echoerr Current version $version is the latest available
|
||||
exit 0;
|
||||
fi
|
||||
echoerr got version $version
|
||||
sed -i -E 's/(version = ").*(";)/\1'$version'\2/g' $fname
|
||||
# Verify the sed command above did not fail
|
||||
grep -q $version $fname
|
||||
# Update srcHash
|
||||
srcHash="$(nix-prefetch-github EttusResearch uhd --rev v${version} | jq --raw-output .hash)"
|
||||
sed -i -E 's#(hash = ").*(";)#\1'$srcHash'\2#g' $fname
|
||||
grep -q $srcHash $fname
|
||||
imageHash="$(nix-prefetch-url https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz)"
|
||||
sed -i -E 's#(sha256 = ").*(";)#\1'$imageHash'\2#g' $fname
|
||||
grep -q $imageHash $fname
|
||||
@ -4,12 +4,12 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "23.4.0";
|
||||
version = "23.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
sha256 = "sha256-+jzGcuAcbXOwsyAL+Hr9Fas2vO2S8ZKSaZeCf/bnl7A=";
|
||||
hash = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
||||
1563
pkgs/applications/video/youtube-tui/Cargo.lock
generated
Normal file
1563
pkgs/applications/video/youtube-tui/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -7,24 +7,29 @@
|
||||
, stdenv
|
||||
, python3
|
||||
, libsixel
|
||||
, mpv
|
||||
, CoreFoundation
|
||||
, Security
|
||||
, AppKit
|
||||
,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "youtube-tui";
|
||||
version = "0.7.4";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Siriusmart";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UN70V+RGYlYJxCQGPH8cnQDSqpihGuwzETYEhbG6Ggo=";
|
||||
hash = "sha256-FOiK3yQcQuwdCEjBtRPW4iBd+8uNsvZ6l5tclHVzL+M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kAhxsSFIJAoKlmN7hVUoTSSHQ2G23f21rEvxcIRQ+kw=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libmpv-2.0.1" = "sha256-efbXk0oXkzlIqgbP4wKm7sWlVZBT2vzDSN3iwsw2vL0=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -35,6 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
xorg.libxcb
|
||||
libsixel
|
||||
mpv
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
Security
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
suffix = {
|
||||
@ -23,8 +23,8 @@ stdenv.mkDerivation {
|
||||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-WSa8fd0OSPo1HFkH6i8cGMNH1df88xI6PCx39ONb73c=";
|
||||
aarch64-linux = "sha256-eOsO/nbwKT50tC5g6INPELh2yVb5C3EGqNLQLT7IGBs=";
|
||||
x86_64-linux = "sha256-TzNPWcLDKOv12eJ9PHckdJ7tfdlozPoXj2fbdOzHfAk=";
|
||||
aarch64-linux = "sha256-cHNMfcoHCBw+BnWx9USny8jyvH97gXCCJW1aKvPXgCs=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@ -50,6 +50,8 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
description = "Secure, fast, minimal micro-container virtualization";
|
||||
homepage = "http://firecracker-microvm.io";
|
||||
changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}";
|
||||
mainProgram = "firecracker";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ thoughtpolice endocrimes ];
|
||||
|
||||
33
pkgs/by-name/cl/clarity-city/package.nix
Normal file
33
pkgs/by-name/cl/clarity-city/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "clarity-city";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "clarity-city";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1POSdd2ICnyNNmGadIujezNK8qvARD0kkLR4yWjs5kA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 TrueType/*.ttf -t $out/share/fonts/truetype
|
||||
install -Dm644 OpenType/*.otf -t $out/share/fonts/opentype
|
||||
install -Dm644 Webfonts/EOT/*.eot -t $out/share/fonts/eot
|
||||
install -Dm644 Webfonts/WOFF/*.woff -t $out/share/fonts/woff
|
||||
install -Dm644 Webfonts/WOFF2/*.woff2 -t $out/share/fonts/woff2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source sans-serif typeface";
|
||||
homepage = "https://github.com/vmware/clarity-city";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ sagikazarmark ];
|
||||
};
|
||||
})
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.nongnu.org/lzip/clzip.html";
|
||||
description = "C language version of lzip";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/AmokHuginnsson/replxx";
|
||||
description = "A readline and libedit replacement that supports UTF-8, syntax highlighting, hints and Windows and is BSD licensed";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, pkg-config
|
||||
, desktopToDarwinBundle
|
||||
, xorg
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, libxkbcommon
|
||||
, libglvnd
|
||||
, mpv
|
||||
, glfw3
|
||||
, darwin
|
||||
, waylandSupport ? false
|
||||
}:
|
||||
|
||||
assert waylandSupport -> stdenv.isLinux;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
version = "0.5.2";
|
||||
@ -27,6 +34,8 @@ buildGoModule rec {
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
desktopToDarwinBundle
|
||||
];
|
||||
|
||||
# go-glfw doesn't support both X11 and Wayland in single build
|
||||
@ -35,9 +44,25 @@ buildGoModule rec {
|
||||
buildInputs = [
|
||||
libglvnd
|
||||
mpv
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
xorg.libXxf86vm
|
||||
xorg.libX11
|
||||
] ++ (glfw3.override { inherit waylandSupport; }).buildInputs;
|
||||
] ++ lib.optionals (stdenv.isLinux && !waylandSupport) [
|
||||
xorg.libXrandr
|
||||
xorg.libXinerama
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXext
|
||||
] ++ lib.optionals (stdenv.isLinux && waylandSupport) [
|
||||
wayland
|
||||
wayland-protocols
|
||||
libxkbcommon
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Cocoa
|
||||
darwin.apple_sdk_11_0.frameworks.Kernel
|
||||
darwin.apple_sdk_11_0.frameworks.OpenGL
|
||||
darwin.apple_sdk_11_0.frameworks.UserNotifications
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for dimension in 128 256 512;do
|
||||
@ -66,7 +91,7 @@ buildGoModule rec {
|
||||
mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
description = "A lightweight cross-platform desktop client for Subsonic music servers";
|
||||
homepage = "https://github.com/dweymouth/supersonic";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ zane sochotnicky ];
|
||||
};
|
||||
|
||||
@ -44,11 +44,11 @@ in
|
||||
hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA=";
|
||||
};
|
||||
v5 = font-awesome {
|
||||
version = "5.15.3";
|
||||
hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus=";
|
||||
version = "5.15.4";
|
||||
hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo=";
|
||||
};
|
||||
v6 = font-awesome {
|
||||
version = "6.1.1";
|
||||
hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc=";
|
||||
version = "6.4.2";
|
||||
hash = "sha256-/utIhn7CWxlWXshcCUj57WuObRmLTGhTfQo7L6FDHqA=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ispc";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:029rlkh7vh8hxg8ygpspxb9hvw5q97m460zbxwb7xnx1jnq8msh4";
|
||||
sha256 = "sha256-QnGD27f1GWcuyFxFtzm1f7U/ng7VHZKSeSTcKINO/SA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, asttokens
|
||||
, pycryptodome
|
||||
, importlib-metadata
|
||||
, cbor2
|
||||
, recommonmark
|
||||
, semantic-version
|
||||
, sphinx
|
||||
@ -28,14 +29,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "vyper";
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4UBSH4qRBgsy+VO9XzosWedM65R1lTo9ml2C95T9OAA=";
|
||||
hash = "sha256-jcH1AcqrQX+wzpxoppRFh/AUfsfMfTiJzzpFwZRm5Ik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -55,6 +56,7 @@ buildPythonPackage rec {
|
||||
pycryptodome
|
||||
semantic-version
|
||||
importlib-metadata
|
||||
cbor2
|
||||
|
||||
# docs
|
||||
recommonmark
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmrpflash";
|
||||
version = "0.9.20";
|
||||
version = "0.9.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jclehner";
|
||||
repo = "nmrpflash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xfKZXaKzSTnCOC8qt6Zc/eidc1bnrKZOJPw/wwMoCaM=";
|
||||
sha256 = "sha256-nW+VD2a0vmgODbJi4H8Esnq502bEkeCKjXQi23DfdqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2023.08";
|
||||
version = "2023.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moarvm";
|
||||
repo = "moarvm";
|
||||
rev = version;
|
||||
hash = "sha256-oYdXzbT+2L/nDySKq8ZYVuVfNgzLDiskwacOM1L4lzw=";
|
||||
hash = "sha256-/78Qr/Td+dIBlzK0kYa2E4duxEjMj2haefw9Uia+3EA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ callPackage, fetchpatch, lib, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
baseVersion = "3.1";
|
||||
revision = "1";
|
||||
sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms=";
|
||||
baseVersion = "3.2";
|
||||
revision = "0";
|
||||
sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM=";
|
||||
# reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default.
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
})
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A Fast and Reliable ARQ Protocol";
|
||||
homepage = "https://github.com/skywind3000/kcp";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Wavefront alignment algorithm library v2";
|
||||
homepage = "https://github.com/smarco/WFA2-lib";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -257,7 +257,7 @@ final: prev: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
hash = "sha256-HiZtNHXkoSl3Q4cAerUs8c138AiDJJxzYNQT3I4+ea8=";
|
||||
hash = "sha256-rwpwB+vli3CXRhUFL+UvyUpPlxRk6P/2zLCn0SL9E6s=";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "communications";
|
||||
version = "1.2.4";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-SfA81UP0c7VgroxSA/RZVVKZ4arl8Uhpf324F7yGFTo=";
|
||||
sha256 = "sha256-psQuiBOI1mXXZaH4EesVO91r2ViCc0KrKxKM7Xw+gts=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "control";
|
||||
version = "3.5.2";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnu-octave";
|
||||
repo = "pkg-control";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-isUHovpknIFclspHjAtUxGLkrdxitdWSnQMED9n+R3s=";
|
||||
rev = "refs/tags/control-${version}";
|
||||
sha256 = "sha256-7beEsdrne50NY4lGCotxGXwwWnMzUR2CKCc20OCjd0g=";
|
||||
};
|
||||
|
||||
# Running autoreconfHook inside the src directory fixes a compile issue about
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "general";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-owzRp5dDxiUo2uRuvUqD+EiuRqHB2sPqq8NmYtQilM8=";
|
||||
sha256 = "sha256-amslJm3haXaAehdm6jYJxcGZl+ggUcnJc3i6YJ3QkyM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "sockets";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-GNwFLNV1u3UKJp9lhLtCclD2VSKC9Mko1hBoSn5dTpI=";
|
||||
sha256 = "sha256-u5Nb9PVyMoR0lIzXEMtkZntXbBfpyXrtLB8U+dkgYrc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "splines";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "11a34f6a7615fc8x1smk3lx8vslilx4mrxi8f01la3wq68khnq5f";
|
||||
sha256 = "sha256-r4hod3l8OpyKNs59lGE8EFn3n6tIg0KeezKjsB4D16Y=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "statistics";
|
||||
version = "1.5.4";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnu-octave";
|
||||
repo = "statistics";
|
||||
rev = "refs/tags/release-${version}";
|
||||
sha256 = "sha256-gFauFIaXKzcPeNvpWHv5FAxYQvZNh7ELrSUIvn43IfQ=";
|
||||
sha256 = "sha256-XJXDiVDg3Nw7a/ih49jtkYRmyvAhTfs3LbBQmw+87oc=";
|
||||
};
|
||||
|
||||
requiredOctavePackages = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "stk";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/stk-kriging/stk/releases/download/${version}/${pname}-${version}-octpkg.tar.gz";
|
||||
sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI=";
|
||||
sha256 = "sha256-wTjM9LUcC8BEj3TNxAz877LqJvuoxWUse9PIZoWGnIU=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "castor";
|
||||
version = "0.8.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jolicode";
|
||||
repo = "castor";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rJz4BY74BI8gyT4ZlABc4PA+SCsd8guM0m2MTej350g=";
|
||||
hash = "sha256-zTtMNBZcWjEQB70/6i4pvYEepDVCItJgkwrQ2xrXDAU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Jh4mNNYEM9sy0Dp+dZtD+xrMICjAuspe9D9BDXcfUPM=";
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "php-cs-fixer";
|
||||
version = "3.28.0";
|
||||
version = "3.34.1";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
|
||||
sha256 = "sha256-5dhS4QroRY9tGGSsXQfzWw5ObWO5fIoc+nkOUpAjUlQ=";
|
||||
sha256 = "sha256-wVqGINDvVr11QDamo1SHmkwKuDqu8GRDFBNsk3C7mt8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "phpcs";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
|
||||
sha256 = "sha256-ehQyOhSvn1gwLRVEJJLuEHaozXLAGKgWy0SWW/OpsBU=";
|
||||
sha256 = "sha256-IEIUwepbqBT7CyYIwZzKLBC/X/zJ8OPUw0qtwBeVF7c=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "phpmd";
|
||||
version = "2.13.0";
|
||||
version = "2.14.1";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar";
|
||||
sha256 = "LNR7qT3KIhIeq9WPdXVGsnuzzXN4ze/juDMpt1Ke/A0=";
|
||||
sha256 = "sha256-C5VDs0G21EyUVlldg05cbrSYG4/fk01VKE7Eq/zODu8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, freezegun
|
||||
, poetry-core
|
||||
, pyjwt
|
||||
@ -18,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioridwell";
|
||||
version = "2023.08.0";
|
||||
version = "2023.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -27,23 +26,9 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AreQC5LOthnOEj0HnEww4zLob394XwCvqZBwjsT2Lcg=";
|
||||
hash = "sha256-psynooRbX34EFYY7FTqy3KdFsv939z/qYfIfyNTVkiM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aioridwell/pull/234
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/aioridwell/commit/79a9dd7462dcfeb0833abca73a1f184827120a6f.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elastic-apm";
|
||||
version = "6.18.0";
|
||||
version = "6.19.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
owner = "elastic";
|
||||
repo = "apm-agent-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-s4aM2HuagqcF2sLHHRh2kj1tglf+JZ7hXT4PcAeFStQ=";
|
||||
hash = "sha256-XwAKydZuvNMOIT4GkfID8YW019OfatRekXmGrssZfMw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, ipykernel
|
||||
, ipython_genutils
|
||||
, ipython-genutils
|
||||
, ipywidgets
|
||||
, matplotlib
|
||||
, numpy
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipykernel
|
||||
ipython_genutils
|
||||
ipython-genutils
|
||||
ipywidgets
|
||||
matplotlib
|
||||
numpy
|
||||
|
||||
45
pkgs/development/python-modules/ipython-genutils/default.nix
Normal file
45
pkgs/development/python-modules/ipython-genutils/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipython-genutils";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ipython_genutils";
|
||||
inherit version;
|
||||
hash = "sha256-6y4RbnXs751NIo/cZq9UJpr6JqtEYwQuM3hbiHxii6g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace ipython_genutils/tests/test_path.py \
|
||||
--replace "setUp" "setup_method" \
|
||||
--replace "tearDown" "teardown_method"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ipython_genutils"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Vestigial utilities from IPython";
|
||||
homepage = "https://ipython.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, ipython
|
||||
, ipython_genutils
|
||||
, ipython-genutils
|
||||
, pandas
|
||||
, prettytable
|
||||
, pytest
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
ipython_genutils
|
||||
ipython-genutils
|
||||
prettytable
|
||||
sqlalchemy
|
||||
sqlparse
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipython_genutils";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ nose glibcLocales ];
|
||||
|
||||
checkPhase = ''
|
||||
LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Vestigial utilities from IPython";
|
||||
homepage = "https://ipython.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ipython_genutils
|
||||
, ipython-genutils
|
||||
, jupyter-contrib-core
|
||||
, jupyter-highlight-selected-word
|
||||
, jupyter-nbextensions-configurator
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython_genutils
|
||||
ipython-genutils
|
||||
jupyter-contrib-core
|
||||
jupyter-highlight-selected-word
|
||||
jupyter-nbextensions-configurator
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ipykernel
|
||||
, ipython_genutils
|
||||
, ipython-genutils
|
||||
, jinja2
|
||||
, jupyter-client
|
||||
, jupyter-core
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
argon2-cffi
|
||||
ipykernel
|
||||
ipython_genutils
|
||||
ipython-genutils
|
||||
jinja2
|
||||
jupyter-client
|
||||
jupyter-core
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyenphase";
|
||||
version = "1.11.4";
|
||||
version = "1.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "pyenphase";
|
||||
repo = "pyenphase";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZFK7Pyn8YsxdxPICtDXx2L+3t/xG3x2HC+F0plDbvHk=";
|
||||
hash = "sha256-gqbRz0JAp8hjZpFUzlFzqq86UKgD0TLWSp1Z9rdrk3s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, ipykernel
|
||||
, jupyter-core
|
||||
, jupyter-client
|
||||
, ipython_genutils
|
||||
, ipython-genutils
|
||||
, pygments
|
||||
, pyqt5
|
||||
, pytestCheckHook
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipykernel
|
||||
ipython_genutils
|
||||
ipython-genutils
|
||||
jupyter-core
|
||||
jupyter-client
|
||||
pygments
|
||||
|
||||
@ -5,11 +5,12 @@
|
||||
, pythonOlder
|
||||
, rich
|
||||
, typer
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rich-click";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,12 +19,13 @@ buildPythonPackage rec {
|
||||
owner = "ewels";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Be6okg3zmbdbdlB4/uwioUxn6CZUay/istiIoiFrsJk=";
|
||||
hash = "sha256-Fmdxs7yeaHe8++LSQGuYK3Qwc0CdPvV9UCSXa09Djt4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
rich
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# Module has no test
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -20,31 +19,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2023.08.0";
|
||||
version = "2023.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
repo = "simplisafe-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DExMa9z/VYAMoqUmr/gfZzYFWfTxnC+Cz4rRTaNSLBM=";
|
||||
hash = "sha256-U3SbaR8PTTvoAMu65+LAHSwTmR7iwqiidbefW8bNSCo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/simplisafe-python/pull/596
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/simplisafe-python/commit/60f41c690fac7acb614490b542cbbf2fa0052266.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
|
||||
@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A set of cli tools for the conventional commit and semver specifications";
|
||||
homepage = "https://github.com/oknozor/cocogitto";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ travisdavis-ops ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -323,6 +323,7 @@ dependencies = [
|
||||
"enumflags2",
|
||||
"indoc",
|
||||
"insta",
|
||||
"query-engine-metrics",
|
||||
"query-engine-tests",
|
||||
"query-tests-setup",
|
||||
"reqwest",
|
||||
@ -1046,6 +1047,30 @@ dependencies = [
|
||||
"similar",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "driver-adapters"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bigdecimal",
|
||||
"chrono",
|
||||
"expect-test",
|
||||
"futures",
|
||||
"metrics 0.18.1",
|
||||
"napi",
|
||||
"napi-derive",
|
||||
"num-bigint",
|
||||
"once_cell",
|
||||
"psl",
|
||||
"quaint",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tracing-core",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.9.0"
|
||||
@ -1149,18 +1174,6 @@ dependencies = [
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enum_dispatch"
|
||||
version = "0.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.28",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enumflags2"
|
||||
version = "0.7.7"
|
||||
@ -1881,28 +1894,6 @@ version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
|
||||
|
||||
[[package]]
|
||||
name = "js-connectors"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bigdecimal",
|
||||
"chrono",
|
||||
"expect-test",
|
||||
"futures",
|
||||
"napi",
|
||||
"napi-derive",
|
||||
"num-bigint",
|
||||
"once_cell",
|
||||
"psl",
|
||||
"quaint",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.61"
|
||||
@ -2319,9 +2310,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mobc"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc79c4a77e312fee9c7bd4b957c12ad1196db73c4a81e5c0b13f02083c4f7f2f"
|
||||
checksum = "0bdeff49b387edef305eccfe166af3e1483bb57902dbf369dddc42dc824df23b"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"futures-channel",
|
||||
@ -3162,7 +3153,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "postgres-native-tls"
|
||||
version = "0.5.0"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98"
|
||||
dependencies = [
|
||||
"native-tls",
|
||||
"tokio",
|
||||
@ -3173,7 +3164,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "postgres-protocol"
|
||||
version = "0.6.4"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98"
|
||||
dependencies = [
|
||||
"base64 0.13.1",
|
||||
"byteorder",
|
||||
@ -3190,7 +3181,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "postgres-types"
|
||||
version = "0.2.4"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98"
|
||||
dependencies = [
|
||||
"bit-vec",
|
||||
"bytes",
|
||||
@ -3625,8 +3616,8 @@ dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
"connection-string",
|
||||
"driver-adapters",
|
||||
"futures",
|
||||
"js-connectors",
|
||||
"napi",
|
||||
"napi-build",
|
||||
"napi-derive",
|
||||
@ -3693,12 +3684,12 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"colored",
|
||||
"enum_dispatch",
|
||||
"enumflags2",
|
||||
"hyper",
|
||||
"indexmap 1.9.3",
|
||||
"indoc",
|
||||
"itertools",
|
||||
"jsonrpc-core",
|
||||
"nom",
|
||||
"once_cell",
|
||||
"parse-hyperlinks",
|
||||
@ -3713,6 +3704,7 @@ dependencies = [
|
||||
"request-handlers",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sql-query-connector",
|
||||
"strip-ansi-escapes",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
@ -5171,7 +5163,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "tokio-postgres"
|
||||
version = "0.7.7"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5"
|
||||
source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"byteorder",
|
||||
@ -5509,7 +5501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"rand 0.8.5",
|
||||
"rand 0.7.3",
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
@ -5743,9 +5735,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
|
||||
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"wasm-bindgen-macro",
|
||||
@ -5753,16 +5745,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
|
||||
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.28",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@ -5780,9 +5772,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
|
||||
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@ -5790,22 +5782,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
|
||||
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.28",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
|
||||
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-logger"
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
# function correctly.
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "5.2.0";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
sha256 = "sha256-7bZ6qy5AL7c2F6HfyM7/G36XTkSVsq+T+xxNlrBCXL4=";
|
||||
sha256 = "sha256-KYPDocC6S6YhJeneyI++UmmpuAYDoX6okqgOtGetilw=";
|
||||
};
|
||||
|
||||
# Use system openssl.
|
||||
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8=";
|
||||
"graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4=";
|
||||
"mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ=";
|
||||
"postgres-native-tls-0.5.0" = "sha256-150GAIccGDAD+t/iWkLbXe4SblrW/KUcxkTy4Mrie5U=";
|
||||
"postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gItTmei+nxa56CoVv9xBmsOUH5AP48XNxdlHmXRqo2Y=";
|
||||
hash = "sha256-r1YJ7L98aLAwBd3g+WlW/UijceR7t9z7aXSZZjlMNnM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iZh9M3QgTH0brh6DkKeQyJiCDmYFUggMiZWTkAGjggE=";
|
||||
cargoHash = "sha256-Fx2BdSHo+W43ZM/SX1ccddXG9QHlftrupT2cbyT4KM0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles mdbook ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
@ -13,23 +13,23 @@ let
|
||||
sass-language = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "sass";
|
||||
rev = "refs/tags/embedded-protocol-2.2.0";
|
||||
hash = "sha256-rSjhQZnLL4UXhp8rBIcaEtQyE81utTfljJTkyhQW5wA=";
|
||||
rev = "refs/tags/embedded-protocol-2.3.0";
|
||||
hash = "sha256-J2heASfIwj4lxjsRs/0zRHSaF2tij9bO7IgXp0u/eiI=";
|
||||
};
|
||||
in
|
||||
buildDartApplication rec {
|
||||
pname = "dart-sass";
|
||||
version = "1.68.0";
|
||||
version = "1.69.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Q7pXYcEOqROxVMw5irB23i44PwhFz7YWBVJcftzu998=";
|
||||
hash = "sha256-kn3cwi1k2CkzbS+Q/JaYy8Nq3Ej0GyWifG1Bq5ZEVHA=";
|
||||
};
|
||||
|
||||
pubspecLockFile = ./pubspec.lock;
|
||||
vendorHash = "sha256-ypKiiLW4Zr0rhTLTXzOoRqZsFC3nGzqUhPFdKKIWDmk=";
|
||||
vendorHash = "sha256-PQvY+qFXovSXH5wuc60wCrt5RiooKcaGKYzbjKSvqso=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
buf
|
||||
|
||||
1001
pkgs/development/tools/rust/cargo-lambda/Cargo.lock
generated
1001
pkgs/development/tools/rust/cargo-lambda/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -14,13 +14,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-lambda";
|
||||
version = "0.18.1";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-un+GQflxhMHCMH5UEeUVsYx59ryn7MR4ApooeOuhccc=";
|
||||
hash = "sha256-QlTAYfd0taXfK370nzqictwK7bZ4bnh1oPBJKZzhnMo=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -37,10 +37,15 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreServices Security ];
|
||||
|
||||
checkFlags = [
|
||||
# Disabled because they accesses the network.
|
||||
# Disabled because they access the network.
|
||||
"--skip=test_build_basic_extension"
|
||||
"--skip=test_build_basic_function"
|
||||
"--skip=test_build_basic_zip_extension"
|
||||
"--skip=test_build_basic_zip_function"
|
||||
"--skip=test_build_event_type_function"
|
||||
"--skip=test_build_http_feature_function"
|
||||
"--skip=test_build_http_function"
|
||||
"--skip=test_build_internal_zip_extension"
|
||||
"--skip=test_build_logs_extension"
|
||||
"--skip=test_build_telemetry_extension"
|
||||
"--skip=test_download_example"
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
let
|
||||
pname = "cargo-pgrx";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
inherit version pname;
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls=";
|
||||
hash = "sha256-GiUjsSqnrUNgiT/d3b8uK9BV7cHFvaDoq6cUGRwPigM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI=";
|
||||
cargoHash = "sha256-oXOPpK8VWzbFE1xHBQYyM5+YP/pRdLvTVN/fjxrgD/c=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.8.1";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DeKqLbgHmk6034ItyBzWRXLSeOj3+h49bzf9IX3Aa00=";
|
||||
hash = "sha256-Z5poizMXp4xgn0Tx0E36rvueBx3dFL7++alewqG9E9w=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoHash = "sha256-g6XdHl/Jxa+kpIjvnaP/RtoByo5O4IDC+s8M4DfGU/8=";
|
||||
cargoHash = "sha256-EbvEclXwQgNIYQ/ppbZGhT4v4rMSpreURg2OYhQ7dRI=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
||||
@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "A Minecraft Launcher which is multi-functional, cross-platform and popular";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
inherit (jre.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sfrotz";
|
||||
version = "2.52";
|
||||
version = "2.54";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "DavidGriffith";
|
||||
repo = "frotz";
|
||||
rev = version;
|
||||
sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y";
|
||||
sha256 = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mmc-utils";
|
||||
version = "unstable-2023-08-07";
|
||||
version = "unstable-2023-10-10";
|
||||
|
||||
src = fetchzip rec {
|
||||
url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz";
|
||||
passthru.rev = "613495ecaca97a19fa7f8f3ea23306472b36453c";
|
||||
sha256 = "zOjm/YDxqU6bu6GMyQTuzuZbrCfaU4FBodRWLb8GTdE=";
|
||||
passthru.rev = "b5ca140312d279ad2f22068fd72a6230eea13436";
|
||||
sha256 = "QU4r8eajrrhT6u6WHEf1xtB1iyecBeHxu4vS+QcwAgM=";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ];
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-b4cDDUcdVoB7kU677nrKf8W/5QMnB5vEaPYVBMllEA8=";
|
||||
hash = "sha256-aZ7hdAZJH1PvrX9GQLzLquzzZG3LZSKOvt7sWQhTiR8=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
|
||||
@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
hash = "sha256-aR/94C9SI+FPs3zg3bpexmgGYrhxghyHwpXj25x0yuw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-M5Ho4CiO5DC6mWzenXEo2pu0WLHj5S8AV3oEFwD31Sw=";
|
||||
vendorHash = "sha256-M5Ho4CiO5DC6mWzenXEo2pu0WLHj5S8AV3oEFwD31Sw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
|
||||
# To achieve this, we coerce the output to a string to prevent
|
||||
# mkDerivation's splicing logic from kicking in.
|
||||
"${glib.dev}"
|
||||
] ++ optional enableAirplay2 [
|
||||
unixtools.xxd
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
@ -83,7 +85,6 @@ stdenv.mkDerivation rec {
|
||||
libgcrypt
|
||||
libuuid
|
||||
ffmpeg
|
||||
unixtools.xxd
|
||||
]
|
||||
++ optional stdenv.isLinux glib;
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "monetdb";
|
||||
version = "11.47.5";
|
||||
version = "11.47.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-GuGGs3hAheNYsaiUG7femLhi38c4gB528bruRotOdNE=";
|
||||
hash = "sha256-ZYogc8KjFYbmS7OlL2ufGxdnMAYOYeUFk8AVe7rDer0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison cmake python3 ];
|
||||
|
||||
@ -11,6 +11,13 @@ This API may be changed over time if the CI workflow making use of it is adjuste
|
||||
- Command line: `nixpkgs-check-by-name <NIXPKGS>`
|
||||
- Arguments:
|
||||
- `<NIXPKGS>`: The path to the Nixpkgs to check
|
||||
- `--version <VERSION>`: The version of the checks to perform.
|
||||
|
||||
Possible values:
|
||||
- `v0` (default)
|
||||
- `v1`
|
||||
|
||||
See [validation](#validity-checks) for the differences.
|
||||
- Exit code:
|
||||
- `0`: If the [validation](#validity-checks) is successful
|
||||
- `1`: If the [validation](#validity-checks) is not successful
|
||||
@ -35,6 +42,7 @@ These checks are performed by this tool:
|
||||
|
||||
### Nix evaluation checks
|
||||
- `pkgs.${name}` is defined as `callPackage pkgs/by-name/${shard}/${name}/package.nix args` for some `args`.
|
||||
- **Only after --version v1**: If `pkgs.${name}` is not auto-called from `pkgs/by-name`, `args` must not be empty
|
||||
- `pkgs.lib.isDerivation pkgs.${name}` is `true`.
|
||||
|
||||
## Development
|
||||
|
||||
@ -18,19 +18,42 @@ let
|
||||
callPackage = fn: args:
|
||||
let
|
||||
result = super.callPackage fn args;
|
||||
variantInfo._attributeVariant = {
|
||||
# These names are used by the deserializer on the Rust side
|
||||
CallPackage.path =
|
||||
if builtins.isPath fn then
|
||||
toString fn
|
||||
else
|
||||
null;
|
||||
CallPackage.empty_arg =
|
||||
args == { };
|
||||
};
|
||||
in
|
||||
if builtins.isAttrs result then
|
||||
# If this was the last overlay to be applied, we could just only return the `_callPackagePath`,
|
||||
# but that's not the case because stdenv has another overlays on top of user-provided ones.
|
||||
# So to not break the stdenv build we need to return the mostly proper result here
|
||||
result // {
|
||||
_callPackagePath = fn;
|
||||
}
|
||||
result // variantInfo
|
||||
else
|
||||
# It's very rare that callPackage doesn't return an attribute set, but it can occur.
|
||||
{
|
||||
_callPackagePath = fn;
|
||||
variantInfo;
|
||||
|
||||
_internalCallByNamePackageFile = file:
|
||||
let
|
||||
result = super._internalCallByNamePackageFile file;
|
||||
variantInfo._attributeVariant = {
|
||||
# This name is used by the deserializer on the Rust side
|
||||
AutoCalled = null;
|
||||
};
|
||||
in
|
||||
if builtins.isAttrs result then
|
||||
# If this was the last overlay to be applied, we could just only return the `_callPackagePath`,
|
||||
# but that's not the case because stdenv has another overlays on top of user-provided ones.
|
||||
# So to not break the stdenv build we need to return the mostly proper result here
|
||||
result // variantInfo
|
||||
else
|
||||
# It's very rare that callPackage doesn't return an attribute set, but it can occur.
|
||||
variantInfo;
|
||||
};
|
||||
|
||||
pkgs = import nixpkgsPath {
|
||||
@ -39,14 +62,14 @@ let
|
||||
overlays = [ callPackageOverlay ];
|
||||
};
|
||||
|
||||
attrInfo = attr: {
|
||||
attrInfo = attr:
|
||||
let
|
||||
value = pkgs.${attr};
|
||||
in
|
||||
{
|
||||
# These names are used by the deserializer on the Rust side
|
||||
call_package_path =
|
||||
if pkgs.${attr} ? _callPackagePath && builtins.isPath pkgs.${attr}._callPackagePath then
|
||||
toString pkgs.${attr}._callPackagePath
|
||||
else
|
||||
null;
|
||||
is_derivation = pkgs.lib.isDerivation pkgs.${attr};
|
||||
variant = value._attributeVariant or { Other = null; };
|
||||
is_derivation = pkgs.lib.isDerivation value;
|
||||
};
|
||||
|
||||
attrInfos = builtins.listToAttrs (map (name: {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
use crate::structure;
|
||||
use crate::utils::ErrorWriter;
|
||||
use crate::Version;
|
||||
use std::path::Path;
|
||||
|
||||
use anyhow::Context;
|
||||
@ -13,16 +14,34 @@ use tempfile::NamedTempFile;
|
||||
/// Attribute set of this structure is returned by eval.nix
|
||||
#[derive(Deserialize)]
|
||||
struct AttributeInfo {
|
||||
call_package_path: Option<PathBuf>,
|
||||
variant: AttributeVariant,
|
||||
is_derivation: bool,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
enum AttributeVariant {
|
||||
/// The attribute is auto-called as pkgs.callPackage using pkgs/by-name,
|
||||
/// and it is not overridden by a definition in all-packages.nix
|
||||
AutoCalled,
|
||||
/// The attribute is defined as a pkgs.callPackage <path> <args>,
|
||||
/// and overridden by all-packages.nix
|
||||
CallPackage {
|
||||
/// The <path> argument or None if it's not a path
|
||||
path: Option<PathBuf>,
|
||||
/// true if <args> is { }
|
||||
empty_arg: bool,
|
||||
},
|
||||
/// The attribute is not defined as pkgs.callPackage
|
||||
Other,
|
||||
}
|
||||
|
||||
const EXPR: &str = include_str!("eval.nix");
|
||||
|
||||
/// Check that the Nixpkgs attribute values corresponding to the packages in pkgs/by-name are
|
||||
/// of the form `callPackage <package_file> { ... }`.
|
||||
/// See the `eval.nix` file for how this is achieved on the Nix side
|
||||
pub fn check_values<W: io::Write>(
|
||||
version: Version,
|
||||
error_writer: &mut ErrorWriter<W>,
|
||||
nixpkgs: &structure::Nixpkgs,
|
||||
eval_accessible_paths: Vec<&Path>,
|
||||
@ -97,16 +116,29 @@ pub fn check_values<W: io::Write>(
|
||||
let absolute_package_file = nixpkgs.path.join(&relative_package_file);
|
||||
|
||||
if let Some(attribute_info) = actual_files.get(package_name) {
|
||||
let is_expected_file =
|
||||
if let Some(call_package_path) = &attribute_info.call_package_path {
|
||||
absolute_package_file == *call_package_path
|
||||
} else {
|
||||
false
|
||||
};
|
||||
let valid = match &attribute_info.variant {
|
||||
AttributeVariant::AutoCalled => true,
|
||||
AttributeVariant::CallPackage { path, empty_arg } => {
|
||||
let correct_file = if let Some(call_package_path) = path {
|
||||
absolute_package_file == *call_package_path
|
||||
} else {
|
||||
false
|
||||
};
|
||||
// Only check for the argument to be non-empty if the version is V1 or
|
||||
// higher
|
||||
let non_empty = if version >= Version::V1 {
|
||||
!empty_arg
|
||||
} else {
|
||||
true
|
||||
};
|
||||
correct_file && non_empty
|
||||
}
|
||||
AttributeVariant::Other => false,
|
||||
};
|
||||
|
||||
if !is_expected_file {
|
||||
if !valid {
|
||||
error_writer.write(&format!(
|
||||
"pkgs.{package_name}: This attribute is not defined as `pkgs.callPackage {} {{ ... }}`.",
|
||||
"pkgs.{package_name}: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage {} {{ ... }}` with a non-empty second argument.",
|
||||
relative_package_file.display()
|
||||
))?;
|
||||
continue;
|
||||
|
||||
@ -4,7 +4,7 @@ mod structure;
|
||||
mod utils;
|
||||
|
||||
use anyhow::Context;
|
||||
use clap::Parser;
|
||||
use clap::{Parser, ValueEnum};
|
||||
use colored::Colorize;
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
@ -15,14 +15,28 @@ use utils::ErrorWriter;
|
||||
/// Program to check the validity of pkgs/by-name
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(about)]
|
||||
struct Args {
|
||||
pub struct Args {
|
||||
/// Path to nixpkgs
|
||||
nixpkgs: PathBuf,
|
||||
/// The version of the checks
|
||||
/// Increasing this may cause failures for a Nixpkgs that succeeded before
|
||||
/// TODO: Remove default once Nixpkgs CI passes this argument
|
||||
#[arg(long, value_enum, default_value_t = Version::V0)]
|
||||
version: Version,
|
||||
}
|
||||
|
||||
/// The version of the checks
|
||||
#[derive(Debug, Clone, PartialEq, PartialOrd, ValueEnum)]
|
||||
pub enum Version {
|
||||
/// Initial version
|
||||
V0,
|
||||
/// Empty argument check
|
||||
V1,
|
||||
}
|
||||
|
||||
fn main() -> ExitCode {
|
||||
let args = Args::parse();
|
||||
match check_nixpkgs(&args.nixpkgs, vec![], &mut io::stderr()) {
|
||||
match check_nixpkgs(&args.nixpkgs, args.version, vec![], &mut io::stderr()) {
|
||||
Ok(true) => {
|
||||
eprintln!("{}", "Validated successfully".green());
|
||||
ExitCode::SUCCESS
|
||||
@ -53,6 +67,7 @@ fn main() -> ExitCode {
|
||||
/// - `Ok(true)` if the structure is valid, nothing will have been written to `error_writer`.
|
||||
pub fn check_nixpkgs<W: io::Write>(
|
||||
nixpkgs_path: &Path,
|
||||
version: Version,
|
||||
eval_accessible_paths: Vec<&Path>,
|
||||
error_writer: &mut W,
|
||||
) -> anyhow::Result<bool> {
|
||||
@ -75,7 +90,7 @@ pub fn check_nixpkgs<W: io::Write>(
|
||||
|
||||
if error_writer.empty {
|
||||
// Only if we could successfully parse the structure, we do the semantic checks
|
||||
eval::check_values(&mut error_writer, &nixpkgs, eval_accessible_paths)?;
|
||||
eval::check_values(version, &mut error_writer, &nixpkgs, eval_accessible_paths)?;
|
||||
references::check_references(&mut error_writer, &nixpkgs)?;
|
||||
}
|
||||
}
|
||||
@ -86,6 +101,7 @@ pub fn check_nixpkgs<W: io::Write>(
|
||||
mod tests {
|
||||
use crate::check_nixpkgs;
|
||||
use crate::structure;
|
||||
use crate::Version;
|
||||
use anyhow::Context;
|
||||
use std::fs;
|
||||
use std::path::Path;
|
||||
@ -174,7 +190,7 @@ mod tests {
|
||||
// We don't want coloring to mess up the tests
|
||||
let writer = temp_env::with_var("NO_COLOR", Some("1"), || -> anyhow::Result<_> {
|
||||
let mut writer = vec![];
|
||||
check_nixpkgs(&path, vec![&extra_nix_path], &mut writer)
|
||||
check_nixpkgs(&path, Version::V1, vec![&extra_nix_path], &mut writer)
|
||||
.context(format!("Failed test case {name}"))?;
|
||||
Ok(writer)
|
||||
})?;
|
||||
|
||||
@ -75,9 +75,14 @@ let
|
||||
|
||||
# Turns autoCalledPackageFiles into an overlay that `callPackage`'s all of them
|
||||
autoCalledPackages = self: super:
|
||||
builtins.mapAttrs (name: file:
|
||||
self.callPackage file { }
|
||||
) autoCalledPackageFiles;
|
||||
{
|
||||
# Needed to be able to detect empty arguments in all-packages.nix
|
||||
# See a more detailed description in pkgs/top-level/by-name-overlay.nix
|
||||
_internalCallByNamePackageFile = file: self.callPackage file { };
|
||||
}
|
||||
// builtins.mapAttrs
|
||||
(name: self._internalCallByNamePackageFile)
|
||||
autoCalledPackageFiles;
|
||||
|
||||
# A list optionally containing the `all-packages.nix` file from the test case as an overlay
|
||||
optionalAllPackagesOverlay =
|
||||
|
||||
@ -1 +1 @@
|
||||
pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`.
|
||||
pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument.
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
self: super: {
|
||||
nonDerivation = self.callPackage ./pkgs/by-name/no/nonDerivation/package.nix { };
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
import ../mock-nixpkgs.nix { root = ./.; }
|
||||
@ -0,0 +1 @@
|
||||
pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument.
|
||||
@ -0,0 +1 @@
|
||||
{ someDrv }: someDrv
|
||||
@ -1 +1 @@
|
||||
pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`.
|
||||
pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument.
|
||||
|
||||
@ -1 +1 @@
|
||||
pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`.
|
||||
pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument.
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
self: super: {
|
||||
foo = self.callPackage ./pkgs/by-name/fo/foo/package.nix {
|
||||
enableBar = true;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
import ../mock-nixpkgs.nix { root = ./.; }
|
||||
@ -0,0 +1,8 @@
|
||||
{
|
||||
someDrv,
|
||||
enableBar ? false,
|
||||
}:
|
||||
if enableBar then
|
||||
someDrv
|
||||
else
|
||||
{}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "duplicacy";
|
||||
version = "3.1.0";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gilbertchen";
|
||||
repo = "duplicacy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PYUfECxtUG2WuLmYLtE3Ugcr8GeQMQwQa4uFzcl1RoY=";
|
||||
hash = "sha256-7LflTRBB4JG84QM46wvSJrP4o3CHV4gnR24RJgDSlDg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-90NWpMEUlPo5+G7DnqFrZyTlAYDAFfZrsctNTaWVjX4=";
|
||||
vendorHash = "sha256-4M/V4vP9XwHBkZ6UwsAxZ81YAzP4inuNC5yI+5ygQsA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -37,17 +37,15 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vulkan-cts";
|
||||
version = "1.3.6.3";
|
||||
version = "1.3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "VK-GL-CTS";
|
||||
rev = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
hash = "sha256-jpKPmUduH3IuUYzBAZJFl/w1FqjGC8sXSTnet8YEZ0I=";
|
||||
hash = "sha256-f7i7gytk3cKeFQD0FR+nrUR2o0FWaJWKG7OpDz9u42E=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
prePatch = ''
|
||||
mkdir -p external/renderdoc/src
|
||||
|
||||
@ -92,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out $lib
|
||||
# Check that nothing was installed so far
|
||||
! test -e $out
|
||||
|
||||
mkdir -p $out/bin $out/archive-dir
|
||||
cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/
|
||||
|
||||
@ -4,8 +4,8 @@ rec {
|
||||
ESExtractor = fetchFromGitHub {
|
||||
owner = "Igalia";
|
||||
repo = "ESExtractor";
|
||||
rev = "v0.2.5";
|
||||
hash = "sha256-A3lyTTarR1ZJrXcrLDR5D7H1kBwJNyrPPjEklRM9YBY=";
|
||||
rev = "v0.3.3";
|
||||
hash = "sha256-qqhDv08cLQlLaEj0qfghByK+IohdvQdI2ePfUNFEArQ=";
|
||||
};
|
||||
|
||||
amber = fetchFromGitHub {
|
||||
@ -18,8 +18,8 @@ rec {
|
||||
glslang = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = "77417d5c9e0a5d4c79ddd0285d530b45f7259f0d";
|
||||
hash = "sha256-BNgnhTl7/+nC5D7Jl7QME5+qIbm+I0Wh/tf9F4WhW3U=";
|
||||
rev = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3";
|
||||
hash = "sha256-4SoET76fCfutttK00JGCKVQUn0ivGdTw6GhndvxbIDU=";
|
||||
};
|
||||
|
||||
jsoncpp = fetchFromGitHub {
|
||||
@ -29,45 +29,45 @@ rec {
|
||||
hash = "sha256-m0tz8w8HbtDitx3Qkn3Rxj/XhASiJVkThdeBxIwv3WI=";
|
||||
};
|
||||
|
||||
nvidia-video-samples = fetchFromGitHub {
|
||||
owner = "Igalia";
|
||||
repo = "vk_video_samples";
|
||||
rev = "cts-integration-0.9.9-1";
|
||||
hash = "sha256-vHUyGAx/n8yTnrFjeefbb8LsHxONxsjH3BG2D/RO99E=";
|
||||
};
|
||||
|
||||
spirv-headers = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db";
|
||||
hash = "sha256-VOq3r6ZcbDGGxjqC4IoPMGC5n1APUPUAs9xcRzxdyfk=";
|
||||
rev = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c";
|
||||
hash = "sha256-gcKwML5ItccAhX+QtR9G86h0JnaiVQEmOQzQpL005dg=";
|
||||
};
|
||||
|
||||
spirv-tools = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "01828dac778d08f4ebafd2e06bd419f6c84e5984";
|
||||
hash = "sha256-i1rDMVpUiNdacDe20DsN67/rzK5V434EzfSv97y+xGU=";
|
||||
};
|
||||
|
||||
video-parser = fetchFromGitHub {
|
||||
owner = "nvpro-samples";
|
||||
repo = "vk_video_samples";
|
||||
rev = "7d68747d3524842afaf050c5e00a10f5b8c07904";
|
||||
hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU=";
|
||||
rev = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0";
|
||||
hash = "sha256-gju6hJSIWOswGnRxKeJZsU1jgp3HSZAf7wFRxswY+Js=";
|
||||
};
|
||||
|
||||
vulkan-docs = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Docs";
|
||||
rev = "9fff8b252a3688c0231fa78709084bbe677d3bf7";
|
||||
hash = "sha256-KpKsKTY5xCSZ5Y92roa0fq/iqc1hVJNS7l87RFcxyRQ=";
|
||||
rev = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0";
|
||||
hash = "sha256-bJ2C1+zjvLiYp5A5AHTevFPU9Yka99imqLwH+uApuoY=";
|
||||
};
|
||||
|
||||
|
||||
prePatch = ''
|
||||
mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/spirv-headers external/spirv-tools external/video-parser external/vulkan-docs
|
||||
mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs
|
||||
|
||||
cp -r ${ESExtractor} external/ESExtractor/src
|
||||
cp -r ${amber} external/amber/src
|
||||
cp -r ${glslang} external/glslang/src
|
||||
cp -r ${jsoncpp} external/jsoncpp/src
|
||||
cp -r ${nvidia-video-samples} external/nvidia-video-samples/src
|
||||
cp -r ${spirv-headers} external/spirv-headers/src
|
||||
cp -r ${spirv-tools} external/spirv-tools/src
|
||||
cp -r ${video-parser} external/video-parser/src
|
||||
cp -r ${vulkan-docs} external/vulkan-docs/src
|
||||
'';
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "valeronoi";
|
||||
version = "0.1.9";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccoors";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Xa70kOPQLavuJTF9PxCgpKYj15C2fna++cFlCId0a08=";
|
||||
sha256 = "sha256-4BTBF6h/BEVr0E3E0EvvKOQGHZ4wCtdXgKBWLSfOcOI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,24 +2,28 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nexttrace";
|
||||
version = "1.2.1.1";
|
||||
version = "1.2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjlleo";
|
||||
repo = pname;
|
||||
owner = "nxtrace";
|
||||
repo = "NTrace-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B3NHY4wYCa3lR3XPqhjcrgf9iA4Bz/8bKrwxdNSa1Bk=";
|
||||
sha256 = "sha256-a9l6nsrbgwmk6cq/rPBwPwZ8yhH35VxKmn9x5PgcqGI=";
|
||||
};
|
||||
vendorHash = "sha256-8etZelvdUmHNWC0FnSX9oO3reuhB7xIzd/KxPTt6Szc=";
|
||||
vendorHash = "sha256-YAmGvmHkR1G2MLlDja5aPJqX2F3etogebasqD72YJ3M=";
|
||||
|
||||
doCheck = false; # Tests require a network connection.
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/xgadget-lab/nexttrace/config.Version=v${version}"
|
||||
"-X github.com/nxtrace/NTrace-core/config.Version=v${version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/NTrace-core $out/bin/nexttrace
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source visual route tracking CLI tool";
|
||||
homepage = "https://mtr.moe";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user