Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d2fdbb7e40
100 changed files with 7827 additions and 338 deletions
|
|
@ -537,7 +537,7 @@ let
|
|||
mergeModules' prefix modules
|
||||
(concatMap (m: map (config: { file = m._file; inherit config; }) (pushDownProperties m.config)) modules);
|
||||
|
||||
mergeModules' = prefix: options: configs:
|
||||
mergeModules' = prefix: modules: configs:
|
||||
let
|
||||
# an attrset 'name' => list of submodules that declare ‘name’.
|
||||
declsByName =
|
||||
|
|
@ -554,11 +554,11 @@ let
|
|||
else
|
||||
mapAttrs
|
||||
(n: option:
|
||||
[{ inherit (module) _file; options = option; }]
|
||||
[{ inherit (module) _file; pos = builtins.unsafeGetAttrPos n subtree; options = option; }]
|
||||
)
|
||||
subtree
|
||||
)
|
||||
options);
|
||||
modules);
|
||||
|
||||
# The root of any module definition must be an attrset.
|
||||
checkedConfigs =
|
||||
|
|
@ -762,9 +762,16 @@ let
|
|||
else res.options;
|
||||
in opt.options // res //
|
||||
{ declarations = res.declarations ++ [opt._file];
|
||||
# In the case of modules that are generated dynamically, we won't
|
||||
# have exact declaration lines; fall back to just the file being
|
||||
# evaluated.
|
||||
declarationPositions = res.declarationPositions
|
||||
++ (if opt.pos != null
|
||||
then [opt.pos]
|
||||
else [{ file = opt._file; line = null; column = null; }]);
|
||||
options = submodules;
|
||||
} // typeSet
|
||||
) { inherit loc; declarations = []; options = []; } opts;
|
||||
) { inherit loc; declarations = []; declarationPositions = []; options = []; } opts;
|
||||
|
||||
/* Merge all the definitions of an option to produce the final
|
||||
config value. */
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ reportFailure() {
|
|||
checkConfigOutput() {
|
||||
local outputContains=$1
|
||||
shift
|
||||
if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then
|
||||
if evalConfig "$@" 2>/dev/null | grep -E --silent "$outputContains" ; then
|
||||
((++pass))
|
||||
else
|
||||
echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"
|
||||
|
|
@ -444,6 +444,24 @@ checkConfigOutput '^"The option `a\.b. defined in `.*/doRename-warnings\.nix. ha
|
|||
checkConfigOutput '^"pear"$' config.once.raw ./merge-module-with-key.nix
|
||||
checkConfigOutput '^"pear\\npear"$' config.twice.raw ./merge-module-with-key.nix
|
||||
|
||||
# Declaration positions
|
||||
# Line should be present for direct options
|
||||
checkConfigOutput '^10$' options.imported.line10.declarationPositions.0.line ./declaration-positions.nix
|
||||
checkConfigOutput '/declaration-positions.nix"$' options.imported.line10.declarationPositions.0.file ./declaration-positions.nix
|
||||
# Generated options may not have line numbers but they will at least get the
|
||||
# right file
|
||||
checkConfigOutput '/declaration-positions.nix"$' options.generated.line18.declarationPositions.0.file ./declaration-positions.nix
|
||||
checkConfigOutput '^null$' options.generated.line18.declarationPositions.0.line ./declaration-positions.nix
|
||||
# Submodules don't break it
|
||||
checkConfigOutput '^39$' config.submoduleLine34.submodDeclLine39.0.line ./declaration-positions.nix
|
||||
checkConfigOutput '/declaration-positions.nix"$' config.submoduleLine34.submodDeclLine39.0.file ./declaration-positions.nix
|
||||
# New options under freeform submodules get collected into the parent submodule
|
||||
# (consistent with .declarations behaviour, but weird; notably appears in system.build)
|
||||
checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.0.line ./declaration-positions.nix
|
||||
checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.1.line ./declaration-positions.nix
|
||||
# nested options work
|
||||
checkConfigOutput '^30$' options.nested.nestedLine30.declarationPositions.0.line ./declaration-positions.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
|
|
|||
49
lib/tests/modules/declaration-positions.nix
Normal file
49
lib/tests/modules/declaration-positions.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib, options, ... }:
|
||||
let discardPositions = lib.mapAttrs (k: v: v);
|
||||
in
|
||||
# unsafeGetAttrPos is unspecified best-effort behavior, so we only want to consider this test on an evaluator that satisfies some basic assumptions about this function.
|
||||
assert builtins.unsafeGetAttrPos "a" { a = true; } != null;
|
||||
assert builtins.unsafeGetAttrPos "a" (discardPositions { a = true; }) == null;
|
||||
{
|
||||
imports = [
|
||||
{
|
||||
options.imported.line10 = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
};
|
||||
|
||||
# Simulates various patterns of generating modules such as
|
||||
# programs.firefox.nativeMessagingHosts.ff2mpv. We don't expect to get
|
||||
# line numbers for these, but we can fall back on knowing the file.
|
||||
options.generated = discardPositions {
|
||||
line18 = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
};
|
||||
};
|
||||
|
||||
options.submoduleLine34.extraOptLine23 = lib.mkOption {
|
||||
default = 1;
|
||||
type = lib.types.int;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
options.nested.nestedLine30 = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
};
|
||||
|
||||
options.submoduleLine34 = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.submoduleWith {
|
||||
modules = [
|
||||
({ options, ... }: {
|
||||
options.submodDeclLine39 = lib.mkOption { };
|
||||
})
|
||||
{ freeformType = with lib.types; lazyAttrsOf (uniq unspecified); }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
submoduleLine34.submodDeclLine39 = (options.submoduleLine34.type.getSubOptions [ ]).submodDeclLine39.declarationPositions;
|
||||
};
|
||||
}
|
||||
|
|
@ -7206,6 +7206,12 @@
|
|||
githubId = 69209;
|
||||
name = "Ian Duncan";
|
||||
};
|
||||
ianliu = {
|
||||
email = "ian.liu88@gmail.com";
|
||||
github = "ianliu";
|
||||
githubId = 30196;
|
||||
name = "Ian Liu Rodrigues";
|
||||
};
|
||||
ianmjones = {
|
||||
email = "ian@ianmjones.com";
|
||||
github = "ianmjones";
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ with lib.maintainers; {
|
|||
};
|
||||
|
||||
flutter = {
|
||||
members = [ gilice mkg20001 RossComputerGuy FlafyDev hacker1024 ];
|
||||
members = [ mkg20001 RossComputerGuy FlafyDev hacker1024 ];
|
||||
scope = "Maintain Flutter and Dart-related packages and build tools";
|
||||
shortName = "flutter";
|
||||
enableFeatureFreezePing = false;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ in {
|
|||
nodes = {
|
||||
docker = { ... }: {
|
||||
virtualisation = {
|
||||
diskSize = 2048;
|
||||
diskSize = 3072;
|
||||
docker.enable = true;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -59,13 +59,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bespokesynth";
|
||||
version = "unstable-2023-08-17";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BespokeSynth";
|
||||
repo = pname;
|
||||
rev = "c6b1410afefc8b0b9aeb4aa11ad5c32651879c9f";
|
||||
hash = "sha256-MLHlHSszD2jEN4/f2jC4vjAidr3gVOSK606qs5bq+Sc=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vDvNm9sW9BfWloB0CA+JHTp/bfDWAP/T0hDXjoMZ3X4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,18 +18,24 @@
|
|||
, libjack2
|
||||
, withGUI ? true
|
||||
, Cocoa
|
||||
, portaudio
|
||||
, alsa-lib
|
||||
# Enable GL/GLES rendering
|
||||
, withGL ? !stdenv.hostPlatform.isDarwin
|
||||
# Use GLES instead of GL, some platforms have better support for one than the other
|
||||
, preferGLES ? stdenv.hostPlatform.isAarch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "furnace";
|
||||
version = "0.6pre9";
|
||||
version = "0.6pre16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tildearrow";
|
||||
repo = "furnace";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-i7/NN179Wyr1FqNlgryyFtishFr5EY1HI6BRQKby/6E=";
|
||||
hash = "sha256-n66Bv8xB/0KMJYoMILxsaKoaX+E0OFGI3QGqhxKTFUQ=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
|
@ -53,8 +59,12 @@ stdenv.mkDerivation rec {
|
|||
rtmidi
|
||||
SDL2
|
||||
zlib
|
||||
portaudio
|
||||
] ++ lib.optionals withJACK [
|
||||
libjack2
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
# portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs
|
||||
alsa-lib
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Cocoa
|
||||
];
|
||||
|
|
@ -67,16 +77,16 @@ stdenv.mkDerivation rec {
|
|||
"-DSYSTEM_RTMIDI=ON"
|
||||
"-DSYSTEM_SDL2=ON"
|
||||
"-DSYSTEM_ZLIB=ON"
|
||||
"-DSYSTEM_PORTAUDIO=ON"
|
||||
"-DWITH_JACK=${if withJACK then "ON" else "OFF"}"
|
||||
"-DWITH_PORTAUDIO=ON"
|
||||
"-DWITH_RENDER_SDL=ON"
|
||||
"-DWITH_RENDER_OPENGL=${lib.boolToString withGL}"
|
||||
"-DWARNINGS_ARE_ERRORS=ON"
|
||||
] ++ lib.optionals withGL [
|
||||
"-DUSE_GLES=${lib.boolToString preferGLES}"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc)
|
||||
"-Wno-error=mismatched-new-delete"
|
||||
"-Wno-error=use-after-free"
|
||||
]);
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a
|
||||
# bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access
|
||||
|
|
|
|||
38
pkgs/applications/misc/flashprint/default.nix
Normal file
38
pkgs/applications/misc/flashprint/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib, stdenv, libGLU, qtbase, fetchurl, dpkg, autoPatchelfHook, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashprint";
|
||||
version = "5.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-kxvqEgXlKQlfzlCqKb5o3hvop82vDsJmQDK9XOCq61g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qtbase libGLU ];
|
||||
|
||||
qtWrapperArgs = [ "--prefix QT_QPA_PLATFORM : xcb" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mv etc usr/* $out
|
||||
ln -s $out/share/FlashPrint5/FlashPrint $out/bin/flashprint
|
||||
sed -i "/^Exec=/ c Exec=$out/bin/flashprint" $out/share/applications/FlashPrint5.desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Slicer for the FlashForge 3D printers";
|
||||
homepage = "https://www.flashforge.com/";
|
||||
license = licenses.unfree;
|
||||
mainProgram = "flashprint";
|
||||
maintainers = [ maintainers.ianliu ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matcha-rss-digest";
|
||||
version = "0.6";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piqoni";
|
||||
repo = "matcha";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Zk85k2SllPR9zznLGevwH6hS1EEW2qEa9YXbSguRVeM=";
|
||||
hash = "sha256-aW/a1rfq/pjRpJzoEfuj0JMnyFwQKPL1+Wxvh7wVbho=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Dw1z23DRG0OtakJfrgpTfd71F58KfGsqz215zK0XOdI=";
|
||||
vendorHash = "sha256-bwl4/4yYm8TC3D+FgyXzhQg8SdNHyXQM9YCn8p8+DF0=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/piqoni/matcha";
|
||||
|
|
|
|||
|
|
@ -7,25 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rlaunch";
|
||||
version = "1.3.13";
|
||||
version = "1.3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PonasKovas";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1w8qvny72l5358wnk4dmqnrv4mrpzxrzf49svav9grzxzzf8mqy2";
|
||||
hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og=";
|
||||
};
|
||||
|
||||
cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx";
|
||||
|
||||
patches = [
|
||||
# Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64
|
||||
# Remove with next version update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/PonasKovas/rlaunch/commit/f78f36876bba45fe4e7310f58086ddc63f27a57e.patch";
|
||||
hash = "sha256-rTS1khw1zt3i1AJ11BhAILcmaohAwVc7Qfl6Fc76Kvs=";
|
||||
})
|
||||
];
|
||||
cargoHash = "sha256-/a1SjGDcauOy1vmXvmWBZmag8G+T2au+Z7b0y1Vj3C8=";
|
||||
|
||||
# The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "skytemple";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-brt1bNQonAjbqCsMLHgOS8leDb3Y8MWKIxV+BXoJ1lY=";
|
||||
hash = "sha256-7sv0TzYMQLEaohy45JPPiK2wS3x4sXaevT/BfHaSbWw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -294,6 +294,12 @@ let
|
|||
# We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408:
|
||||
base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format
|
||||
|
||||
# Add final newlines to scripts that do not end with one.
|
||||
# This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged,
|
||||
# as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final
|
||||
# newline.
|
||||
find . -type f -perm -0100 -exec sed -i -e '$a\' {} +
|
||||
|
||||
patchShebangs .
|
||||
# Link to our own Node.js and Java (required during the build):
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ clang_use_chrome_plugins=false
|
|||
disable_fieldtrial_testing_config=true
|
||||
enable_hangout_services_extension=false
|
||||
enable_mdns=false
|
||||
enable_mse_mpeg2ts_stream_parser=true
|
||||
enable_nacl=false
|
||||
enable_reading_list=false
|
||||
enable_remoting=false
|
||||
|
|
|
|||
|
|
@ -27,39 +27,39 @@
|
|||
};
|
||||
stable = {
|
||||
chromedriver = {
|
||||
sha256_darwin = "0gzx3zka8i2ngsdiqp8sr0v6ir978vywa1pj7j08vsf8kmb93iiy";
|
||||
sha256_darwin = "0phhcqid7wjw923qdi65zql3fid25swwszksgnw3b8fgz67jn955";
|
||||
sha256_darwin_aarch64 =
|
||||
"18iyapwjg0yha8qgbw7f605n0j54nd36shv3497bd84lc9k74b14";
|
||||
sha256_linux = "0d8mqzjc11g1bvxvffk0xyhxfls2ycl7ym4ssyjq752g2apjblhp";
|
||||
version = "116.0.5845.96";
|
||||
"00fwq8slvjm6c7krgwjd4mxhkkrp23n4icb63qlvi2hy06gfj4l6";
|
||||
sha256_linux = "0ws8ch1j2hzp483vr0acvam1zxmzg9d37x6gqdwiqwgrk6x5pvkh";
|
||||
version = "117.0.5938.88";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d";
|
||||
sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw";
|
||||
rev = "811d332bd90551342c5cbd39e133aa276022d7f8";
|
||||
sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-06-09";
|
||||
version = "2023-08-01";
|
||||
};
|
||||
};
|
||||
sha256 = "152lyrw8k36gbmf4fmfny4ajqh0523y5d48yrshbgwn5klmbhaji";
|
||||
sha256bin64 = "118sk39939d52srws2vgs1mfizpikswxh5ihd9x053vzn0aj8cfa";
|
||||
version = "116.0.5845.187";
|
||||
sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6";
|
||||
sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi";
|
||||
version = "117.0.5938.88";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
gn = {
|
||||
rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d";
|
||||
sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw";
|
||||
rev = "811d332bd90551342c5cbd39e133aa276022d7f8";
|
||||
sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-06-09";
|
||||
version = "2023-08-01";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
rev = "116.0.5845.187-1";
|
||||
sha256 = "0br5lms6mxg2mg8ix5mkb79bg6wk5f2hn0xy1xc7gk9h3rl58is1";
|
||||
rev = "117.0.5938.88-1";
|
||||
sha256 = "1wz15ib56j8c84bgrbf0djk5wli49b1lvaqbg18pdclkp1mqy5w9";
|
||||
};
|
||||
};
|
||||
sha256 = "152lyrw8k36gbmf4fmfny4ajqh0523y5d48yrshbgwn5klmbhaji";
|
||||
sha256bin64 = "118sk39939d52srws2vgs1mfizpikswxh5ihd9x053vzn0aj8cfa";
|
||||
version = "116.0.5845.187";
|
||||
sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6";
|
||||
sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi";
|
||||
version = "117.0.5938.88";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.50.16";
|
||||
version = "0.50.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YhPn1DTw4/hdDksD2epV7JsD5Jj+pWIh/Uwn79r0mh4=";
|
||||
hash = "sha256-N/6l2hFb8jlq6NdGShXgr2BijOfWpfVziVFQRkz0Cu8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HWcm8y8bySMV3ue1RpxiXfYyV33cXGFII1/d+XD2Iro=";
|
||||
|
|
|
|||
|
|
@ -15,18 +15,18 @@
|
|||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freefilesync";
|
||||
version = "12.5";
|
||||
version = "13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip";
|
||||
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
|
||||
# The URL only redirects to the file on the second attempt
|
||||
postFetch = ''
|
||||
rm -f $out
|
||||
tryDownload "$url"
|
||||
'';
|
||||
hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM=";
|
||||
hash = "sha256-E0lYKNCVtkdnhI3NPx8828Fz6sfmIm18KSC0NSWgHfQ=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
@ -127,4 +127,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-09-07";
|
||||
version = "unstable-2023-09-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "8d4073d2fedfc9952c3a06fd9d9be17ffeb50cf0";
|
||||
sha256 = "BpE402BL9PHx6g2gkeRBP4F2XLAjca3KpyXwFDWayio=";
|
||||
rev = "8e1ebe5a55f6a725ba6fe342b4b7604438d9d406";
|
||||
sha256 = "zz2erN/ap6vT56khqbpANu1eV/C9eQ6SBWEV4GNbmEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@ let
|
|||
};
|
||||
|
||||
linux = stdenv.mkDerivation rec {
|
||||
pname = "trilium-desktop";
|
||||
inherit version;
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl linuxSource;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "gamescope";
|
||||
version = "3.12.3";
|
||||
version = "3.12.5";
|
||||
|
||||
vkroots = fetchFromGitHub {
|
||||
owner = "Joshua-Ashton";
|
||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation {
|
|||
owner = "ValveSoftware";
|
||||
repo = "gamescope";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eo3c+s+sB20wrzbe2H/pMAYdvKeYOpWwEqmuuLY6ZJA=";
|
||||
hash = "sha256-u4pnKd5ZEC3CS3E2i8E8Wposd8Tu4ZUoQXFmr0runwE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -106,6 +106,8 @@ stdenv.mkDerivation {
|
|||
libdisplay-info
|
||||
];
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
postUnpack = ''
|
||||
rm -rf source/subprojects/vkroots
|
||||
ln -s ${vkroots} source/subprojects/vkroots
|
||||
|
|
@ -114,7 +116,12 @@ stdenv.mkDerivation {
|
|||
# --debug-layers flag expects these in the path
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/gamescope" \
|
||||
--prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]}
|
||||
--prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]}
|
||||
|
||||
# Install Vulkan layer in lib output
|
||||
install -d $lib/share/vulkan
|
||||
mv $out/share/vulkan/implicit_layer.d $lib/share/vulkan
|
||||
rm -r $out/share/vulkan
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ makeSetupHook {
|
|||
passthru = {
|
||||
# Extract the function call used to create a binary wrapper from its embedded docstring
|
||||
extractCmd = writeShellScript "extract-binary-wrapper-cmd" ''
|
||||
strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p'
|
||||
${cc.bintools.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p'
|
||||
'';
|
||||
|
||||
tests = tests.makeBinaryWrapper;
|
||||
|
|
|
|||
29
pkgs/by-name/pd/pdepend/package.nix
Normal file
29
pkgs/by-name/pd/pdepend/package.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ php, fetchFromGitHub, lib }:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "pdepend";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdepend";
|
||||
repo = "pdepend";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZmgMuOpUsx5JWTcPRS6qKbTWZvuOrBVOVdPMcvvTV20=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MWm8urRB9IujqrIl22x+JFFCRR+nINLQqnHUywT2pi0=";
|
||||
|
||||
meta = {
|
||||
description = "An adaptation of JDepend for PHP";
|
||||
homepage = "https://github.com/pdepend/pdepend";
|
||||
license = lib.licenses.bsd3;
|
||||
longDescription = "
|
||||
PHP Depend is an adaptation of the established Java
|
||||
development tool JDepend. This tool shows you the quality
|
||||
of your design in terms of extensibility, reusability and
|
||||
maintainability.
|
||||
";
|
||||
maintainers = lib.teams.php.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
37
pkgs/by-name/ph/phpdocumentor/package.nix
Normal file
37
pkgs/by-name/ph/phpdocumentor/package.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, php
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpdocumentor";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpDocumentor";
|
||||
repo = "phpDocumentor";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fNjix3pJDRCTWM3Xtn+AtZe4RJfgQ60kiJB9J9tC5t4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rsBg2EHbvYLVr6haN1brHZFVjLDaxqdkNWf0HL3Eoy0=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
wrapProgram "$out/bin/phpdoc" \
|
||||
--set-default APP_CACHE_DIR /tmp \
|
||||
--set-default APP_LOG_DIR /tmp/log
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/phpDocumentor/phpDocumentor/releases/tag/v${finalAttrs.version}";
|
||||
description = "PHP documentation generator";
|
||||
homepage = "https://phpdoc.org";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "phpdoc";
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
})
|
||||
42
pkgs/by-name/pl/platformsh/package.nix
Normal file
42
pkgs/by-name/pl/platformsh/package.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ common-updater-scripts, curl, fetchFromGitHub, jq, lib, php, writeShellScript }:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "platformsh";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformsh";
|
||||
repo = "legacy-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-aEQxlotwMScEIfHrVDdXBgFxMqAIypkEl9TLi1Bvhnw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-e89xxgTI6FajDfj8xr8VYlbxJD6lUZWz5+2UFQTClsY=";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace config-defaults.yaml \
|
||||
--replace "@version-placeholder@" "${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeShellScript "update-${finalAttrs.pname}" ''
|
||||
set -o errexit
|
||||
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
|
||||
NEW_VERSION=$(curl -s https://api.github.com/repos/platformsh/legacy-cli/releases/latest | jq .tag_name --raw-output)
|
||||
|
||||
if [[ "v${finalAttrs.version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version "platformsh" "$NEW_VERSION"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The unified tool for managing your Platform.sh services from the command line.";
|
||||
homepage = "https://github.com/platformsh/legacy-cli";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "platform";
|
||||
maintainers = with lib.maintainers; [ shyim ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
30
pkgs/by-name/re/replxx/package.nix
Normal file
30
pkgs/by-name/re/replxx/package.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "replxx";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmokHuginnsson";
|
||||
repo = "replxx";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
hash = "sha256-WGiczMJ64YPq0DHKZRBDa7EGlRx7hPlpnk6zPdIVFh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
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 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
28
pkgs/by-name/ro/robo/package.nix
Normal file
28
pkgs/by-name/ro/robo/package.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
lib
|
||||
, php
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "robo";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "consolidation";
|
||||
repo = "robo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-4sQc3ec34F5eBy9hquTqmzUgvFCTlml3LJdP39gPim4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QX7AFtW6Vm9P0ABOuTs1U++nvWBzpvtxhTbK40zDYqc=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
description = "Modern task runner for PHP";
|
||||
homepage = "https://github.com/consolidation/robo";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "robo";
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
})
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.104";
|
||||
version = "1.105";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-R2b3zc+BwX9RvabqxXbRRHV3kKh5G1bnGg0ZP4BnBMI=";
|
||||
hash = "sha256-rufBz5u6dV91oD211JuCUP2Km3RoFwkZ1OhRxyoGxpQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.3.3";
|
||||
version = "1.3.8";
|
||||
|
||||
mkPretendard = { pname, typeface, hash }:
|
||||
stdenvNoCC.mkDerivation {
|
||||
|
|
@ -35,18 +35,24 @@ in
|
|||
pretendard = mkPretendard {
|
||||
pname = "pretendard";
|
||||
typeface = "Pretendard";
|
||||
hash = "sha256-xCEZlwTPhrNIO6WODl55wo2oin+iMYOL/rVaEybpzr0=";
|
||||
hash = "sha256-Re4Td9uA8Qn/xv39Bo9i3gShYWQ1mRX44Vyx7/i4xwI=";
|
||||
};
|
||||
|
||||
pretendard-gov = mkPretendard {
|
||||
pname = "pretendard-gov";
|
||||
typeface = "PretendardGOV";
|
||||
hash = "sha256-GQv/Ia91QgXZwFX+WdE7aRFUJFWhCMLFY86gu4Ii2w8=";
|
||||
};
|
||||
|
||||
pretendard-jp = mkPretendard {
|
||||
pname = "pretendard-jp";
|
||||
typeface = "PretendardJP";
|
||||
hash = "sha256-x0G7ULzkIJqZlK995+wWKHXZdWryUTRouGTa5LsJQzk=";
|
||||
hash = "sha256-7OLInF1XUQxyHyb9a0zyfCLZrdcxMTM2QeBe3lwLJ0A=";
|
||||
};
|
||||
|
||||
pretendard-std = mkPretendard {
|
||||
pname = "pretendard-std";
|
||||
typeface = "PretendardStd";
|
||||
hash = "sha256-/I8LZhFB86/+o+IzUP+bSIq7scKPOL7k/6/Bom0ZSqg=";
|
||||
hash = "sha256-DCR6KUAblVjhapqMn2p0nzndEJm4OCawGV3nAWZvSBs=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ let
|
|||
homepage = "https://flutter.dev";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [ babariviere ericdallo FlafyDev gilice hacker1024 ];
|
||||
maintainers = with maintainers; [ babariviere ericdallo FlafyDev hacker1024 ];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
3536
pkgs/development/interpreters/nickel/Cargo.lock
generated
Normal file
3536
pkgs/development/interpreters/nickel/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -8,16 +8,26 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nickel";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tweag";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bG0vNfKQpFQHDBfokvTpfXgVmKg6u/BcIz139pLwwsE=";
|
||||
hash = "sha256-iHHZ2CXle8edJoJDIOMrUNucTdhyNZpSKfAPUmnt6eI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qPKAozFXv94wgY99ugjsSuaN92SXZGgZwI2+7UlerHQ=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"topiary-0.2.3" = "sha256-DcmrQ8IuvUBDCBKKSt13k8rU8DJZWFC8MvxWB7dwiQM=";
|
||||
"tree-sitter-bash-0.20.3" = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI=";
|
||||
"tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs=";
|
||||
"tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU=";
|
||||
"tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18=";
|
||||
"web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M=";
|
||||
};
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "-p nickel-lang-cli" ];
|
||||
|
||||
|
|
@ -25,9 +35,6 @@ rustPlatform.buildRustPackage rec {
|
|||
python3
|
||||
];
|
||||
|
||||
# Disable checks on Darwin because of issue described in https://github.com/tweag/nickel/pull/1454
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libadwaita";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = "libadwaita";
|
||||
rev = version;
|
||||
hash = "sha256-NBYIDW0sphmBT2cIB2CPsCJrjRsINxWpumJbQK5RjU8=";
|
||||
hash = "sha256-lxNIysW2uth4Hp6NHjo0vWHupITb9qWkkdG8YEDLrUE=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfabric";
|
||||
version = "1.18.1";
|
||||
version = "1.19.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "ofiwg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3iQsFfpXSyMFkBeByGJmKSTUXuLsWA0l8t1cCDkNRos=";
|
||||
sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -4,19 +4,20 @@
|
|||
let
|
||||
copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}";
|
||||
copyPlugins = ''
|
||||
mkdir -p plugins
|
||||
${lib.concatMapStringsSep "\n" copySinglePlugin plugins}
|
||||
chmod +w -R plugins/*
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librime";
|
||||
version = "1.8.5";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rime";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FkkZIxSuqlFFOjABBpnE5ax2Vdo9tzP0prM7ATDIIdk=";
|
||||
sha256 = "sha256-4gEdltdm9A3FxwyZqgSyUWgQ934glinfKwHF8S05f5I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
{ stdenv, fetchurl, makeWrapper, lib, php }:
|
||||
|
||||
let
|
||||
pname = "pdepend";
|
||||
version = "2.14.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar";
|
||||
sha256 = "sha256-t6Yf+z/8O/tZuYoLAZo2G5bORh8XPeEMdK57dWjHsmk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src $out/libexec/pdepend/pdepend.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/pdepend \
|
||||
--add-flags "$out/libexec/pdepend/pdepend.phar"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An adaptation of JDepend for PHP";
|
||||
homepage = "https://github.com/pdepend/pdepend";
|
||||
license = licenses.bsd3;
|
||||
longDescription = "
|
||||
PHP Depend is an adaptation of the established Java
|
||||
development tool JDepend. This tool shows you the quality
|
||||
of your design in terms of extensibility, reusability and
|
||||
maintainability.
|
||||
";
|
||||
maintainers = teams.php.members;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyauth";
|
||||
version = "0.0.14";
|
||||
version = "0.0.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EJLuSvkJrQBIrSM/dODhTtwPpnz67lmg4ZEwI4TPOVc=";
|
||||
hash = "sha256-J2shp4YMGvDFDrfKxnqHQSfH6yteKM1DpQ+8DjblcNI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asysocks";
|
||||
version = "0.2.7";
|
||||
version = "0.2.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Kf2KDonjb+t7sA4jnC8mTh7fWoEDfRPhDkggb9A5E0Q=";
|
||||
hash = "sha256-zg3xEveyEOisk8s4R/36Ly9JH5xDvVsjS4FZIxHOlZ8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloup";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4ItMwje7mlvY/4G6btSUmOIgDaw5InsWSOlXiCAo6ZM=";
|
||||
hash = "sha256-zBBZYQ2B2qCMxgflbHroGfqwEPGdGfPIdc7rZ1GDrPY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "confection";
|
||||
version = "0.1.1";
|
||||
version = "0.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "explosion";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OpUMx8hcTnBdaATzRXBICwF6eAGsdyA0jFvX4nVBiM4=";
|
||||
hash = "sha256-PJbFv+5bT4+oF7PRAO6AGnjRhjNudiJEkPFgGSmuI8c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, importlib-metadata
|
||||
, jsonschema
|
||||
, license-expression
|
||||
, lxml
|
||||
, packageurl-python
|
||||
, py-serializable
|
||||
|
|
@ -22,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "4.1.0";
|
||||
version = "4.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -31,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "CycloneDX";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pRYjpmHhsw03b87YjS8YMmkQNwfcihp/bk56LFn55AU=";
|
||||
hash = "sha256-7bqIKwKGfMj5YPqZpvWtP881LNOgvJ+DMHs1U63gCN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,6 +42,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
importlib-metadata
|
||||
license-expression
|
||||
packageurl-python
|
||||
requirements-parser
|
||||
setuptools
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "devolo-plc-api";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "2Fake";
|
||||
repo = "devolo_plc_api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-roKwCNOvSVRFKBxXz0a9SDo925RHqX0qKv/1QWD3diw=";
|
||||
hash = "sha256-EP99AswHmLO+8ZQAPjJyw/P9QqfDawy3AqyJR870Qms=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -4,27 +4,27 @@
|
|||
, pefile
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dnfile";
|
||||
version = "0.13.0";
|
||||
format = "setuptools";
|
||||
version = "0.14.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "malwarefrank";
|
||||
repo = pname;
|
||||
repo = "dnfile";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TH30gEoxXkaDac6hJsGQFWzwDeqzdZ19HK8i/3Dlh8k=";
|
||||
hash = "sha256-5xkoG7c9Piwrv+9qour7MZ+rabdngtd05b0T+AU8tSo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest-runner" ""
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pefile
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-render";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4nqImAYk4pYXSuE2/znzwjtf0349bydqi4iN69wG080=";
|
||||
hash = "sha256-seL96aOJ554pD7lgzXZFDCXqY/3TAQugWMA7MtqKoAE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cryptography
|
||||
, decorator
|
||||
, invoke
|
||||
, mock
|
||||
, paramiko
|
||||
|
|
@ -11,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fabric";
|
||||
version = "3.0.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-v+lgwa6QTnYkr51ArVubmVge2cT9CTScDQK3SG4dD4k=";
|
||||
hash = "sha256-h4PKQuOwB28IsmkBqsa52bHxnEEAdOesz6uQLBhP9KM=";
|
||||
};
|
||||
|
||||
# only relevant to python < 3.4
|
||||
|
|
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
|||
--replace ', "pathlib2"' ' '
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ invoke paramiko cryptography ];
|
||||
propagatedBuildInputs = [ invoke paramiko cryptography decorator ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook pytest-relaxed mock ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,16 @@
|
|||
, buildPythonPackage
|
||||
, cloudscraper
|
||||
, fetchFromGitHub
|
||||
, garth
|
||||
, pdm-backend
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "garminconnect";
|
||||
version = "0.1.55";
|
||||
format = "setuptools";
|
||||
version = "0.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -17,15 +19,20 @@ buildPythonPackage rec {
|
|||
owner = "cyberjunky";
|
||||
repo = "python-garminconnect";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YPLlrlV8UyoaNtE+LgX7jpZkR7jbSe/2WRR0v0cfACY=";
|
||||
hash = "sha256-C+LldV7TyyubaH8HVdFl7NnaPSLf4bzM03+r72vkOk8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pdm-backend
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudscraper
|
||||
garth
|
||||
requests
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
# Tests require a token
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
65
pkgs/development/python-modules/garth/default.nix
Normal file
65
pkgs/development/python-modules/garth/default.nix
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pdm-backend
|
||||
, pydantic
|
||||
, pytest-vcr
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-oauthlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "garth";
|
||||
version = "0.4.25";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-n+vy9MCSBvxFOcD/jk2oPSa/bzf550mk+dZYSVa0rm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pdm-backend
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pydantic
|
||||
requests
|
||||
requests-oauthlib
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-vcr
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"garth"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_client_request"
|
||||
"test_connectapi"
|
||||
"test_daily"
|
||||
"test_download"
|
||||
"test_exchange"
|
||||
"test_hrv_data_get"
|
||||
"test_login"
|
||||
"test_refresh_oauth2_token"
|
||||
"test_sleep_data"
|
||||
"test_username"
|
||||
"test_weekly"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Garmin SSO auth and connect client";
|
||||
homepage = "https://github.com/matin/garth";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gehomesdk";
|
||||
version = "0.5.20";
|
||||
version = "0.5.23";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk=";
|
||||
hash = "sha256-6Xk7wAF0bZrHriSyDMnPfaPRBiVinHawj3nEqpwbUmo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.9.0";
|
||||
version = "2023.9.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FM07+ORPFne+9gtruuKqp2EwPLF9py7zi9a6vehN2Yk=";
|
||||
hash = "sha256-EItguRqgf6oCKUPdW4cH5kGeZqn4Ke+7gVYhcYrhhjk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ buildPythonPackage rec {
|
|||
# Tests expecting results from a different version of libmagic
|
||||
"test_process_archive_ace"
|
||||
"test_process_runnable_win32_lnk"
|
||||
"test_process_misc_csv"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "karton-core";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "CERT-Polska";
|
||||
repo = "karton";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1Bv0e218cvLuv/go0L13C39fFAeo0FJeCoU+XFUBhzk=";
|
||||
hash = "sha256-sf8O4Y/yMoTFCibQRtNDX3pXdQ0Xzor3WqeU4xp3WuU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow-dataclass";
|
||||
version = "8.5.14";
|
||||
version = "8.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "lovasoa";
|
||||
repo = "marshmallow_dataclass";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ckz2EQj8gtD+YxNCxisswfSu9FcD//ZeSZRrLBhrld0=";
|
||||
hash = "sha256-+1bMo5D+7kbkZHcAvmgC1WxNk6Ba04iLccMqTKrxt80=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.2.2";
|
||||
version = "2.2.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7mQq0phe920t7aJxvP0cCpVNH9s7F+x1fBdzAVUgtKE=";
|
||||
hash = "sha256-qRSJN1tWMECQU/jbC2UzhEZAVQwvm7hTIr3cqvFO4TM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nats-py";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "nats-io";
|
||||
repo = "nats.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vcTkQeaWBsPlPCp53VqI3inH0PkdxkKWDTW/vtrD/xw=";
|
||||
hash = "sha256-6t4BTUWjzTbegPvySv9Y6pQrRDwparuYb6rC+HOXWLo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, jax
|
||||
, jaxlib
|
||||
|
|
@ -12,13 +12,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "objax";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "objax";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ=";
|
||||
# The latest release (1.7.0) has not been tagged on GitHub. Thus, we fallback to fetchPypi.
|
||||
# An issue has been opened upstream: https://github.com/google/objax/issues/263
|
||||
# src = fetchFromGitHub {
|
||||
# owner = "google";
|
||||
# repo = "objax";
|
||||
# rev = "v${version}";
|
||||
# hash = "";
|
||||
# };
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-92Z5RxYoWkMAqyF7H/MagPnC4pfXks5k9zmjvo+Z2Mc=";
|
||||
};
|
||||
|
||||
# Avoid propagating the dependency on `jaxlib`, see
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.0.33";
|
||||
version = "0.0.34";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YZ9I+Pdfh7i8gtBYnVwIaJSRSG0uU+8hKSCSk391hzc=";
|
||||
hash = "sha256-VIw0FRFhZpd9R5/j8ejgfy1p8/R2Gv8Wtjc3PDA4bqo=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
|
|
|||
|
|
@ -12,18 +12,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydata-sphinx-theme";
|
||||
version = "0.13.3";
|
||||
version = "0.14.0";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version format;
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
pname = "pydata_sphinx_theme";
|
||||
hash = "sha256-v0HKbBxiFukp4og05AS/yQ4IC1GRW751Y7Xm/acDVPA=";
|
||||
hash = "sha256-vffSdZFOdnVijKK/brOiHQ76DmuZo6VCGDJZQHZ1TDM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Bootstrap-based Sphinx theme from the PyData community";
|
||||
homepage = "https://github.com/pydata/pydata-sphinx-theme";
|
||||
changelog = "https://github.com/pydata/pydata-sphinx-theme/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyipma";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "dgomes";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BwW8gUFeinZ9Z/v1orJKRTqt2WxVMD+hQj+A3gU1LDI=";
|
||||
hash = "sha256-a6UXc8XLZhSyUb8AxnXoPgiyP004GQfuapRmVeOaFQU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynws";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthewFlamm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Mq8kYS4p53gdSGF83AkSPecVizoEBbeKvyk7nCsRYdM=";
|
||||
hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "pyopengl";
|
||||
version = "3.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyOpenGL";
|
||||
|
|
@ -24,7 +25,20 @@ buildPythonPackage rec {
|
|||
substituteInPlace OpenGL/platform/glx.py \
|
||||
--replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
|
||||
--replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \
|
||||
--replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'"
|
||||
--replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'" \
|
||||
--replace "'GLESv1_CM'," "'${pkgs.libGL}/lib/libGLESv1_CM${ext}'," \
|
||||
--replace "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}',"
|
||||
substituteInPlace OpenGL/platform/egl.py \
|
||||
--replace "('OpenGL','GL')" "('${pkgs.libGL}/lib/libOpenGL${ext}', '${pkgs.libGL}/lib/libGL${ext}')" \
|
||||
--replace "'GLU'," "'${pkgs.libGLU}/lib/libGLU${ext}'," \
|
||||
--replace "'glut'," "'${pkgs.freeglut}/lib/libglut${ext}'," \
|
||||
--replace "'GLESv1_CM'," "'${pkgs.libGL}/lib/libGLESv1_CM${ext}'," \
|
||||
--replace "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}'," \
|
||||
--replace "'EGL'," "'${pkgs.libGL}/lib/libEGL${ext}',"
|
||||
substituteInPlace OpenGL/platform/darwin.py \
|
||||
--replace "'OpenGL'," "'${pkgs.libGL}/lib/libGL${ext}'," \
|
||||
--replace "'GLUT'," "'${pkgs.freeglut}/lib/libglut${ext}',"
|
||||
# TODO: patch 'gle' in OpenGL/platform/egl.py
|
||||
'' + ''
|
||||
# https://github.com/NixOS/nixpkgs/issues/76822
|
||||
# pyopengl introduced a new "robust" way of loading libraries in 3.1.4.
|
||||
|
|
@ -41,7 +55,10 @@ buildPythonPackage rec {
|
|||
# Tests have many dependencies
|
||||
# Extension types could not be found.
|
||||
# Should run test suite from $out/${python.sitePackages}
|
||||
doCheck = false;
|
||||
doCheck = false; # does not affect pythonImportsCheck
|
||||
|
||||
# OpenGL looks for libraries during import, making this a somewhat decent test of the flaky patching above.
|
||||
pythonImportsCheck = "OpenGL";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pyopengl.sourceforge.net/";
|
||||
|
|
|
|||
85
pkgs/development/python-modules/pyrender/default.nix
Normal file
85
pkgs/development/python-modules/pyrender/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, freetype-py
|
||||
, imageio
|
||||
, networkx
|
||||
, numpy
|
||||
, pillow
|
||||
, pyglet
|
||||
, pyopengl
|
||||
, scipy
|
||||
, six
|
||||
, trimesh
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrender";
|
||||
version = "0.1.45";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmatl";
|
||||
repo = "pyrender";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-V2G8QWXMxFDQpT4XDOJhIFI2V9VhDQCaXYBb/QVLxgM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # yet to be tagged
|
||||
name = "relax-pyopengl.patch";
|
||||
url = "https://github.com/mmatl/pyrender/commit/7c613e8aed7142df9ff40767a8f10b7a19b6255c.patch";
|
||||
hash = "sha256-SXRV9RC3PfQGjjIQ+n97HZrSDPae3rAHnTBiHXSFLaY=";
|
||||
})
|
||||
];
|
||||
|
||||
# trimesh too new
|
||||
# issue: https://github.com/mmatl/pyrender/issues/203
|
||||
# mega pr: https://github.com/mmatl/pyrender/pull/216
|
||||
# relevant pr commit: https://github.com/mmatl/pyrender/pull/216/commits/5069aeb957addff8919f05dc9be4040f55bff329
|
||||
# the commit does not apply as a patch when cherry picked, hence the substituteInPlace
|
||||
postPatch = ''
|
||||
substituteInPlace tests/unit/test_meshes.py \
|
||||
--replace \
|
||||
"bm = trimesh.load('tests/data/WaterBottle.glb').dump()[0]" \
|
||||
'bm = trimesh.load("tests/data/WaterBottle.glb").geometry["WaterBottle"]'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
freetype-py
|
||||
imageio
|
||||
networkx
|
||||
numpy
|
||||
pillow
|
||||
pyglet
|
||||
pyopengl
|
||||
scipy
|
||||
six
|
||||
trimesh
|
||||
];
|
||||
|
||||
env.PYOPENGL_PLATFORM = "egl"; # enables headless rendering during check
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# does not work inside sandbox, no GPU
|
||||
"tests/unit/test_offscreen.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyrender" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pyrender.readthedocs.io/en/latest/";
|
||||
description = "Easy-to-use glTF 2.0-compliant OpenGL renderer for visualization of 3D scenes";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "reptor";
|
||||
version = "0.2";
|
||||
version = "0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
|||
owner = "Syslifters";
|
||||
repo = "reptor";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Pkz0snlYMd+xn7fJKVdO8M8wA7ABSq8R6i6UN+bwx6Y=";
|
||||
hash = "sha256-3FRMdiSKWlEUmggtSDea9w386uwAn/VUzXiD1xRNuxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,19 +28,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-files";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k=";
|
||||
hash = "sha256-PVHI3SuXXH+XpSaBhtSUT5I6wYK3WmwW67nJmPLKdg4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace skytemple_files/patch/arm_patcher.py \
|
||||
--replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\""
|
||||
substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \
|
||||
--replace "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\""
|
||||
'';
|
||||
|
||||
buildInputs = [ armips ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tree-sitter";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "tree_sitter";
|
||||
inherit version;
|
||||
hash = "sha256-6T8ILFRdZkm8+11oHtJV6wBKbOIpiJcaEo9AaS/uxg0=";
|
||||
hash = "sha256-CmwGq6pV3hdCQaR2tTYXO7ooJB0uqF0ZjTOqi/AJ8Cg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "altair";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
|
||||
sha256 = "sha256-bQbIct5+0KmD51oxotmWmC49tWuuSXkuRtybtr36bA8=";
|
||||
sha256 = "sha256-O6jWKRsYr1YDwcgwbzBFL8BqrwS1+C2ikEnvxya+S1Q=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt-extras";
|
||||
rev = "2533707e47be067946572f4c83f3ba42036fa425";
|
||||
version = "2023-09-13";
|
||||
rev = "99b0d2138b498b3d553c0b23d5d18cad3e40e028";
|
||||
version = "2023-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulp";
|
||||
repo = "sbt-extras";
|
||||
inherit rev;
|
||||
sha256 = "k53jlbXf1VRdZQcTwpSeNJTcOCVoLWNzfEdEOVNPFsY=";
|
||||
sha256 = "hejhCclA/HSyEC4MgX3h61fB8jsfIErGAnxqUrqNBLU=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sbt";
|
||||
version = "1.9.4";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-aL0CJcKdo5ss+yW2dwqRn2nkdiG7JQESFSdC1/KauHA=";
|
||||
hash = "sha256-kj15F8y5mp/ZhfSr/YHKrK7UIoTmfT92lsxSOefFlcs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inferno";
|
||||
version = "0.11.16";
|
||||
version = "0.11.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hCrDvlC547ee/ZYj+7tnJTKGMPxams6/WJvvBsr7CvE=";
|
||||
hash = "sha256-RDxHQgKVMqTFjiuxF87l4OXcAG9zIG8Xr0cnp/0J4Wg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J7P84aU/3/hvZlr06gpN98QXqRoe2Z6IQ91RbgB4Ohc=";
|
||||
cargoHash = "sha256-wQLECnW+z62okJKpebNvUeRCiUfbuHCou1/uhO8gH+0=";
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kubie";
|
||||
version = "0.21.2";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "sbstp";
|
||||
repo = "kubie";
|
||||
sha256 = "sha256-fkIKb2fcml9E2sSJwhYPrqiThFgpNYh1CampQu8RT4k=";
|
||||
sha256 = "sha256-gqCCUK9xJJq+phYBXJ8gSwU0jclRP6RgifPt/py1PG0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zZwSLMuuaQ8Ht6Ux/wrqB/VEHCvBqTQGvg+RSr8+AiQ=";
|
||||
cargoHash = "sha256-usS3XZLY4SngEdpvpx+Dxywh7HR8uPgTJabXH5iNsuE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
3536
pkgs/development/tools/language-servers/nls/Cargo.lock
generated
Normal file
3536
pkgs/development/tools/language-servers/nls/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -9,13 +9,20 @@ rustPlatform.buildRustPackage {
|
|||
|
||||
inherit (nickel) src version nativeBuildInputs;
|
||||
|
||||
cargoHash = "sha256-UGfc5cr6vl10aCVihOEEZktF8MzT56C9/wSvSQhCiVs=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"topiary-0.2.3" = "sha256-DcmrQ8IuvUBDCBKKSt13k8rU8DJZWFC8MvxWB7dwiQM=";
|
||||
"tree-sitter-bash-0.20.3" = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI=";
|
||||
"tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs=";
|
||||
"tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU=";
|
||||
"tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18=";
|
||||
"web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M=";
|
||||
};
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "-p nickel-lang-lsp" ];
|
||||
|
||||
# Disable checks on Darwin because of issue described in https://github.com/tweag/nickel/pull/1454
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = {
|
||||
inherit (nickel.meta) homepage changelog license maintainers;
|
||||
description = "A language server for the Nickel programming language";
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ml9N4oxq80A1y7oFE98eifFIEtdcT9IRhXwDMEJ298k=";
|
||||
hash = "sha256-ojwhRsJzcQBZ8rBhs1VtsDmc2KYlAr8MR3oShxxyDtY=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoHash = "sha256-PC2StxMefsiKaY9fXIG4167G9SoWlbmJBDGwrFBa4os=";
|
||||
cargoHash = "sha256-zRZ0hFBzU3NLgwRVkcSIZAaaa6CKT8fJj0IIRxiMGGg=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
{ stdenv, fetchurl, makeWrapper, writeShellScript, lib, php, curl, jq, common-updater-scripts }:
|
||||
|
||||
let
|
||||
pname = "platformsh";
|
||||
version = "3.79.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/platformsh/platformsh-cli/releases/download/v${version}/platform.phar";
|
||||
sha256 = "sha256-STGMKWgI4C6ccg8DGUhdnEENOB2//gtpU0ljM4cQCXI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src $out/libexec/platformsh/platform.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/platform \
|
||||
--add-flags "$out/libexec/platformsh/platform.phar"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = writeShellScript "update-${pname}" ''
|
||||
set -o errexit
|
||||
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
|
||||
NEW_VERSION=$(curl -s https://api.github.com/repos/platformsh/platformsh-cli/releases/latest | jq .tag_name --raw-output)
|
||||
|
||||
if [[ "v${version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version "platformsh" "$NEW_VERSION"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The unified tool for managing your Platform.sh services from the command line.";
|
||||
homepage = "https://github.com/platformsh/platformsh-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ shyim ];
|
||||
mainProgram = "platform";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "matrix-appservice-discord",
|
||||
"version": "3.1.1",
|
||||
"version": "4.0.0",
|
||||
"description": "A bridge between Matrix and Discord",
|
||||
"main": "discordas.js",
|
||||
"engines": {
|
||||
"npm": "please-use-yarn",
|
||||
"node": ">=16 <=18"
|
||||
"node": ">=18 <=20"
|
||||
},
|
||||
"scripts": {
|
||||
"test": "mocha -r ts-node/register test/config.ts test/test_*.ts test/**/test_*.ts",
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
"coverage": "tsc && nyc mocha build/test/config.js build/test",
|
||||
"build": "tsc",
|
||||
"postinstall": "yarn build",
|
||||
"start": "yarn build && node ./build/src/discordas.js -c config.yaml",
|
||||
"debug": "yarn build && node --inspect ./build/src/discordas.js -c config.yaml",
|
||||
"start": "node ./build/src/discordas.js",
|
||||
"debug": "node --inspect ./build/src/discordas.js",
|
||||
"addbot": "node ./build/tools/addbot.js",
|
||||
"adminme": "node ./build/tools/adminme.js",
|
||||
"usertool": "node ./build/tools/userClientTools.js",
|
||||
|
|
@ -40,16 +40,16 @@
|
|||
},
|
||||
"homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme",
|
||||
"dependencies": {
|
||||
"@mx-puppet/matrix-discord-parser": "0.1.10",
|
||||
"better-discord.js": "github:matrix-org/better-discord.js#5024781db755259e88abe915630b7d5b3ba5f48f",
|
||||
"better-sqlite3": "^7.1.0",
|
||||
"@mx-puppet/better-discord.js": "^12.5.1",
|
||||
"@mx-puppet/matrix-discord-parser": "^0.1.10",
|
||||
"better-sqlite3": "^8.6.0",
|
||||
"command-line-args": "^5.1.1",
|
||||
"command-line-usage": "^6.1.0",
|
||||
"escape-html": "^1.0.3",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"js-yaml": "^3.14.0",
|
||||
"marked": "^1.2.2",
|
||||
"matrix-appservice-bridge": "^5.0.0",
|
||||
"matrix-appservice-bridge": "^9.0.1",
|
||||
"mime": "^2.4.6",
|
||||
"p-queue": "^6.4.0",
|
||||
"pg-promise": "^10.5.6",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "3.1.1",
|
||||
"srcHash": "sha256-g681w7RD96/xKP+WnIyY4bcVHVQhysgDPZo4TgCRiuY=",
|
||||
"yarnSha256": "0cm9yprj0ajmrdpap3p2lx3xrrkar6gghlxnj9127ks6p5c1ji3r"
|
||||
"version": "4.0.0",
|
||||
"srcHash": "sha256-UyRMMbnX4aJVv8oQfgn/rkZT1cRATtcgFj4fXszDKqo=",
|
||||
"yarnSha256": "11zw1nkvsplnsiddyi1nb9zgdxn1mkh24nlcvaa69rpsjns9rj5k"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ curl -O "$src/package.json"
|
|||
cat > pin.json << EOF
|
||||
{
|
||||
"version": "$(echo $tag | grep -P '(\d|\.)+' -o)",
|
||||
"srcSha256": "$src_hash",
|
||||
"srcHash": "$src_hash",
|
||||
"yarnSha256": "$yarn_sha256"
|
||||
}
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libasn1c";
|
||||
version = "0.9.35";
|
||||
version = "0.9.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "libasn1c";
|
||||
rev = version;
|
||||
hash = "sha256-mi97sWo42U/02xv4QDyUTRh26cyxhcOV5npqCuWsUOc=";
|
||||
hash = "sha256-Qh4QVssHS6XDfHJBR+y8J5tUhT/6tDg+aF9nX6UAGV8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosmo-netif";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "libosmo-netif";
|
||||
rev = version;
|
||||
hash = "sha256-PhGi/6JVO8tXxzfGwEKUB/GdrgCJkqROo26TPU+O9Sg=";
|
||||
hash = "sha256-NjclrjpgX2ZySxTTjdeiOTOXsOTESLmj2LY89goedKI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosmo-sccp";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "libosmo-sccp";
|
||||
rev = version;
|
||||
hash = "sha256-ScJZke9iNmFc9XXqtRjb24ZzKfa5EYws5PDNhcZFb7U=";
|
||||
hash = "sha256-icEyI0zgsiBfawcNW8IarVPj0VNxzsev2W+cRGPev7Y=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-systemdsystemunitdir=$out" ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosmoabis";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "libosmo-abis";
|
||||
rev = version;
|
||||
hash = "sha256-RKJis0Ur3Y0LximNQl+hm6GENg8t2E1S++2c+63D2pQ=";
|
||||
hash = "sha256-AtBv3llE7TX1tBBE4BQ4gXFs2WNqgjNDkezRpoDoHbg=";
|
||||
};
|
||||
|
||||
configureFlags = [ "enable_dahdi=false" ];
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, gnutls
|
||||
, libmnl
|
||||
, liburing
|
||||
, libusb1
|
||||
, lksctp-tools
|
||||
, pcsclite
|
||||
|
|
@ -14,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosmocore";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "libosmocore";
|
||||
rev = version;
|
||||
hash = "sha256-xs8XI6xIUIZ7e0b+z4+FB6jNGY08t1wI4Ud8EHdi93I=";
|
||||
hash = "sha256-rFV2Sf45nq0L+65vt9a9Qz6xRoL5jReQ03ASQAD3DDg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
gnutls
|
||||
liburing
|
||||
libusb1
|
||||
lksctp-tools
|
||||
pcsclite
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-bsc";
|
||||
version = "1.9.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-bsc";
|
||||
rev = version;
|
||||
hash = "sha256-oCHEWQjHG2JZdoisROukwRbpQq2cNAgC+1yOqsgx+As=";
|
||||
hash = "sha256-9WXK2vw+SvAAaBzhpeB+sBux9cGWyPtJVczRfk4rI6E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-bts";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-bts";
|
||||
rev = version;
|
||||
hash = "sha256-RSWXWQn3DAPtThUbthyXrSFSQhHzKaH/m1f6/MCojzM=";
|
||||
hash = "sha256-tg6SxTSmPAkmoWsA0U69/EESlziR4cnq/+PWLavS3mk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-ggsn";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-ggsn";
|
||||
rev = version;
|
||||
hash = "sha256-j7Szh6lDZY9ji9VAdE3D73R/WBPDo85nVB8hr4HzO7M=";
|
||||
hash = "sha256-673qQgymMAKsdunwWhELo2etKqkdCvxR7B8VgmXkEEA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-hlr";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-hlr";
|
||||
rev = version;
|
||||
hash = "sha256-lFIYoDaJbVcC0A0TukRO9KDTVx31WqPPz/Z3wACJBp0=";
|
||||
hash = "sha256-snl4Ezvz28NJEjHwb68V+W3MvMJjkFvc/AlGaeSyiXc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-mgw";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-mgw";
|
||||
rev = version;
|
||||
hash = "sha256-l7JBAigcqQdb1IIz2iuetK8EKVkevtei7hB98g4a79Y=";
|
||||
hash = "sha256-vsOaWlO6y6qV1XcH/jNjvFzApIHqNrPDzZtDoTIMA5k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-msc";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-msc";
|
||||
rev = version;
|
||||
hash = "sha256-CVyjSo+QFDLcow6XAcudhQ7LOnbCSHeYVTzTMh7KEwg=";
|
||||
hash = "sha256-e36k/uEajtQ3cnqn+xvPQPGWuA8ILIlkjOkd96IOvow=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-pcu";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-pcu";
|
||||
rev = version;
|
||||
hash = "sha256-wZLTDvqVxP0FXV0VQH5KuigwbgzBipwL5JkTDp5Mzrc=";
|
||||
hash = "sha256-p5gBOHw/3NJ482EX5LcmaWkwz/ikcK7EEeio/puNTFo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-ggsn";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-sgsn";
|
||||
rev = version;
|
||||
hash = "sha256-tjExV8XigPEZ5gOCEoWfjhtGJVa5Ja3GHnpSovradak=";
|
||||
hash = "sha256-jI82LS/WubFAkxBVF31qH4NWSmjC94dL73oOu3shfdU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo-sip-connector";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "osmo-sip-connector";
|
||||
rev = version;
|
||||
hash = "sha256-vsPtNeh6Yi5fQb+E90OF4/Hnjl9T5nMf9EMBhzpIA2I=";
|
||||
hash = "sha256-5+bNqdQuobCwy99BLTIWLLNIpirMcb8w1xnIew5a9WE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -215,8 +215,10 @@ let
|
|||
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
|
||||
});
|
||||
|
||||
azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip"
|
||||
"sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4=";
|
||||
azure-mgmt-maps = (overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip"
|
||||
"sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4=").overridePythonAttrs (attrs: {
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
|
||||
});
|
||||
|
||||
azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip"
|
||||
"sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk=";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
hash = "sha256-usbYNalA0r09LXR6eV2e/T1eMNV4LnhzYLzPJQ6XNKQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-s5QytuNhjZQhIDJtpeAW3J4op1t4nC+xD2i7Zf5mzfw=";
|
||||
cargoSha256 = "sha256-fgB0vlbOhzGV1Sj180GCuTGZlVpAUlBUMAfsrG2FiuA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "moar";
|
||||
version = "1.16.1";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r1M47KYFJYhLX1HK0uPVkupghyoqdbhStgaquvC4MQI=";
|
||||
hash = "sha256-PknHG0ODrR5YbaZgWdwt/PtNf+q1uyK5KYlrntYZT64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo=";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, fetchurl, appimageTools }:
|
||||
let
|
||||
name = "vial-${version}";
|
||||
version = "0.7";
|
||||
version = "0.7.1";
|
||||
pname = "Vial";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
|
||||
hash = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8=";
|
||||
hash = "sha256-pOcrxZ6vbnbdE/H4Kxufxm/ZovaYBXjFpVpKZYV7f3c=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "hysteria";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apernet";
|
||||
repo = pname;
|
||||
rev = "e11762a196e4fcdbde728ef160bc3c6cfeb5bc6e";
|
||||
hash = "sha256-9Fo/qKcoZg8OYH4cok18rweA1PAFULOCJGTdUB8fbAU=";
|
||||
rev = "app/v${version}";
|
||||
hash = "sha256-MMBDBWeOm0yiKNGe/Ywriv8oR0YoM3Or5uGGuePOV3U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7un8oi6pKYiJGw6mbG35crndLg35y7VkoAnQKMJduh4=";
|
||||
vendorHash = "sha256-zsPqqk8nKhtF2RXfF2yRhienzLMLPAcHQgnEX8gcl3s=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -18,23 +18,23 @@
|
|||
}:
|
||||
|
||||
let
|
||||
get-nix-license = import ./get-nix-license.nix {
|
||||
get-nix-license = import ./get_nix_license.nix {
|
||||
inherit lib writeText;
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-init";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-init";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VP0UwJhiY6gDF3tBI1DOW0B4XAl9CzTHzgIP68iF4VM=";
|
||||
hash = "sha256-YUstBO+iznr0eJYVJdNQ2BjDhvviRQuojhT9IlTuR0k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-x1zRQGWN2NOvDDrQgkeObf6eNoCGMSw3DVgwVqfbI48=";
|
||||
cargoHash = "sha256-OAgEzf+EyrwjNa40BwPwSNZ4lhEH93YxCbPJJ3r7oSQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
|
|
@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
mkdir -p data
|
||||
ln -s ${get-nix-license} data/get-nix-license.rs
|
||||
ln -s ${get-nix-license} data/get_nix_license.rs
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ let
|
|||
(attrNames deprecatedAliases);
|
||||
|
||||
"invalid aliases" = attrNames (filterAttrs
|
||||
(k: v: licenses.${v}.deprecated or true)
|
||||
(_: v: licenses.${v}.deprecated or true)
|
||||
deprecatedAliases);
|
||||
};
|
||||
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "deploy-rs";
|
||||
version = "unstable-2023-06-04";
|
||||
version = "unstable-2023-09-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "serokell";
|
||||
repo = "deploy-rs";
|
||||
rev = "65211db63ba1199f09b4c9f27e5eba5ec50d76ac";
|
||||
hash = "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=";
|
||||
rev = "31c32fb2959103a796e07bbe47e0a5e287c343a8";
|
||||
hash = "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iUYtLH01YGxsDQbSnQrs4jw2eJxsOn2v3HOIfhsZbdQ=";
|
||||
cargoHash = "sha256-WqZnDWMrqWy1rzR6n+acFW6VHWbDnQmoxtPDA5B37JU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ let
|
|||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
|
||||
electron = electron_24;
|
||||
|
||||
version = "2023.5.1";
|
||||
version = "2023.8.3";
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
sha256 = "sha256-dD9C6+GRjCMcfBse2Qq0ot8bVGyhjnd8VvpdNlrjRs4=";
|
||||
hash = "sha256-ZsAc9tC087Em/VzgaVm5fU+JnI4gIsSAphxicdJWztU=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
|
@ -42,7 +42,7 @@ let
|
|||
pname = "bitwarden-desktop-native";
|
||||
inherit src version;
|
||||
sourceRoot = "${src.name}/apps/desktop/desktop_native";
|
||||
cargoSha256 = "sha256-8U4E5q2OSZGXy2ZRn0y4Skm5Y+FiOJVU1mtzObO9UqY=";
|
||||
cargoHash = "sha256-iBZvdBfuZtcoSgyU4B58ARIBplqUuT5bRev9qnk9LpE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -95,7 +95,7 @@ buildNpmPackage' {
|
|||
npmBuildFlags = [
|
||||
"--workspace apps/desktop"
|
||||
];
|
||||
npmDepsHash = "sha256-USXWA/7wuu3i9/+/pMXREgcB+4yOpQGG5RGuUyJvuQw=";
|
||||
npmDepsHash = "sha256-ARq6iYOkL9CMyAX37g8+Wf+UQsH7hU1jCq/52I1qS9A=";
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
|
|
|
|||
|
|
@ -4014,10 +4014,6 @@ with pkgs;
|
|||
|
||||
pbpctrl = callPackage ../applications/audio/pbpctrl { };
|
||||
|
||||
pdepend = callPackage ../development/php-packages/pdepend { };
|
||||
|
||||
platformsh = callPackage ../misc/platformsh { };
|
||||
|
||||
inherd-quake = callPackage ../applications/misc/inherd-quake {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
|
|
@ -30216,6 +30212,7 @@ with pkgs;
|
|||
|
||||
inherit (callPackages ../data/fonts/pretendard { })
|
||||
pretendard
|
||||
pretendard-gov
|
||||
pretendard-jp
|
||||
pretendard-std;
|
||||
|
||||
|
|
@ -40530,6 +40527,8 @@ with pkgs;
|
|||
|
||||
faustPhysicalModeling = callPackage ../applications/audio/faustPhysicalModeling { };
|
||||
|
||||
flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };
|
||||
|
||||
flockit = callPackage ../tools/backup/flockit { };
|
||||
|
||||
fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { };
|
||||
|
|
|
|||
|
|
@ -4191,6 +4191,8 @@ self: super: with self; {
|
|||
|
||||
garminconnect = callPackage ../development/python-modules/garminconnect { };
|
||||
|
||||
garth = callPackage ../development/python-modules/garth { };
|
||||
|
||||
gassist-text = callPackage ../development/python-modules/gassist-text { };
|
||||
|
||||
gast = callPackage ../development/python-modules/gast { };
|
||||
|
|
@ -8312,6 +8314,8 @@ self: super: with self; {
|
|||
|
||||
pyre-extensions = callPackage ../development/python-modules/pyre-extensions { };
|
||||
|
||||
pyrender = callPackage ../development/python-modules/pyrender { };
|
||||
|
||||
pyrevolve = callPackage ../development/python-modules/pyrevolve { };
|
||||
|
||||
pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue