mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
2c70ec4a27
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, nixosTests
|
||||
, alsa-lib
|
||||
|
|
@ -14,30 +13,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.69";
|
||||
version = "1.71";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tm0yTh46UKnsjH9hv3cMW0YL2x3OTRL+14x4c7w124U=";
|
||||
hash = "sha256-c2gFq+TgTMI+Eld0z8hryLew3XkrQ7XAfq2s+zdEkBQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Adapt CMake script to be Darwin-compatible
|
||||
# https://github.com/8bitbubsy/ft2-clone/pull/30
|
||||
(fetchpatch {
|
||||
name = "0001-ft2-clone-Make-CMake-script-macOS-compatible.patch";
|
||||
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/0033a567abf7ddbdb2bc59c7f730d22f986010aa.patch";
|
||||
hash = "sha256-fhA+T6RI+Qmhr7mbG9lEA7esWskgK8+DkWzol0J2lUo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-ft2-clone-Fix-__MACOSX_CORE__-typo.patch";
|
||||
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/fe50aff9233130150a6631875611c7db67a2d705.patch";
|
||||
hash = "sha256-X4AVuJ0iRlpH1N/YzjdVk5+yv7eiDNoZkk0mhOizgOg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ SDL2 ]
|
||||
++ lib.optional stdenv.isLinux alsa-lib
|
||||
|
|
@ -63,4 +47,3 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.littleEndian;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.66.0";
|
||||
version = "2.69.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-Du2bvtlNjxtkJ31RCKZmGtWxOEIjohbmEC5o3VvFGlY=";
|
||||
hash = "sha256-9eELWlOzUd3xwAoob5XCj16JihOt6SHZe0Ybxb9dtQI=";
|
||||
};
|
||||
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
|
@ -23,6 +22,7 @@ appimageTools.wrapType2 rec {
|
|||
install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png
|
||||
${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png
|
||||
install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png
|
||||
|
||||
substituteInPlace $out/share/applications/ledger-live-desktop.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stellar-core";
|
||||
version = "19.13.0";
|
||||
version = "19.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stellar";
|
||||
repo = "stellar-core";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-C775tL+x1IX4kfCM/7gOg/V8xunq/rkhIfdkwkhLENk=";
|
||||
hash = "sha256-lxBn/T01Tsa7tid3mRJUigUwv9d3BAPZhV9Mp1lywBU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-18";
|
||||
version = "7.1.1-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A=";
|
||||
hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
, plasma-framework
|
||||
, qttools
|
||||
, iconv
|
||||
, cppunit
|
||||
, syncthing
|
||||
, webviewSupport ? true
|
||||
, jsSupport ? true
|
||||
, kioPluginSupport ? stdenv.isLinux
|
||||
|
|
@ -31,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.4.6";
|
||||
version = "1.4.7";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ=";
|
||||
sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -58,18 +60,31 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wrapQtAppsHook
|
||||
cmake
|
||||
qttools
|
||||
# Although these are test dependencies, we add them anyway so that we test
|
||||
# whether the test units compile. On Darwin we don't run the tests but we
|
||||
# still build them.
|
||||
cppunit
|
||||
syncthing
|
||||
]
|
||||
++ lib.optionals plasmoidSupport [ extra-cmake-modules ]
|
||||
;
|
||||
|
||||
# No tests are available by upstream, but we test --help anyway
|
||||
# Don't test on Darwin because output is .app
|
||||
# syncthing server seems to hang on darwin, causing tests to fail.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
preCheck = ''
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
# don't test --help on Darwin because output is .app
|
||||
doInstallCheck = !stdenv.isDarwin;
|
||||
installCheckPhase = ''
|
||||
$out/bin/syncthingtray --help | grep ${finalAttrs.version}
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=ON"
|
||||
# See https://github.com/Martchus/syncthingtray/issues/208
|
||||
"-DEXCLUDE_TESTS_FROM_ALL=OFF"
|
||||
"-DAUTOSTART_EXEC_PATH=${autostartExecPath}"
|
||||
# See https://github.com/Martchus/syncthingtray/issues/42
|
||||
"-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
|
|
|
|||
|
|
@ -85,7 +85,8 @@ let
|
|||
++ lib.optional jackSupport libjack2
|
||||
++ lib.optional smartcardSupport opensc
|
||||
++ lib.optional (cfg.speechSynthesisSupport or false) speechd
|
||||
++ pkcs11Modules;
|
||||
++ pkcs11Modules
|
||||
++ gtk_modules;
|
||||
gtk_modules = [ libcanberra-gtk3 ];
|
||||
|
||||
launcherName = "${applicationName}${nameSuffix}";
|
||||
|
|
|
|||
|
|
@ -40,11 +40,7 @@
|
|||
# If one wishes to use a different src or name for a very custom build
|
||||
, overrideSrc ? {}
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.8";
|
||||
minor = "5";
|
||||
patch = "0";
|
||||
}
|
||||
, version ? "3.8.5.0"
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -204,6 +200,11 @@ let
|
|||
gr-zeromq = {
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
pythonRuntime = [
|
||||
# Will compile without this, but it is required by tests, and by some
|
||||
# gr blocks.
|
||||
python.pkgs.pyzmq
|
||||
];
|
||||
};
|
||||
};
|
||||
shared = (import ./shared.nix {
|
||||
|
|
@ -214,7 +215,7 @@ let
|
|||
removeReferencesTo
|
||||
featuresInfo
|
||||
features
|
||||
versionAttr
|
||||
version
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
|
|
@ -222,23 +223,28 @@ let
|
|||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
});
|
||||
inherit (shared) hasFeature; # function
|
||||
inherit (shared.passthru) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
disallowedReferences
|
||||
stripDebugList
|
||||
doCheck
|
||||
dontWrapPythonPrograms
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
stdenv.mkDerivation (finalAttrs: (shared // {
|
||||
inherit pname version;
|
||||
# Will still evaluate correctly if not used here. It only helps nix-update
|
||||
# find the right file in which version is defined.
|
||||
inherit (shared) src;
|
||||
# Remove failing tests
|
||||
preConfigure = (shared.preConfigure or "") + ''
|
||||
# https://github.com/gnuradio/gnuradio/issues/3801
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding.py
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py
|
||||
rm gr-blocks/python/blocks/qa_ctrlport_probes.py
|
||||
# Tests that fail due to numpy deprecations upstream hasn't accomodated to yet.
|
||||
rm gr-fec/python/fec/qa_polar_decoder_sc.py
|
||||
rm gr-fec/python/fec/qa_polar_decoder_sc_list.py
|
||||
rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py
|
||||
rm gr-fec/python/fec/qa_polar_encoder.py
|
||||
rm gr-fec/python/fec/qa_polar_encoder_systematic.py
|
||||
rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py
|
||||
'';
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.3_8.patch
|
||||
|
|
@ -291,4 +297,4 @@ stdenv.mkDerivation {
|
|||
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
|
||||
''
|
||||
;
|
||||
}
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -42,11 +42,7 @@
|
|||
# If one wishes to use a different src or name for a very custom build
|
||||
, overrideSrc ? {}
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.9";
|
||||
minor = "8";
|
||||
patch = "0";
|
||||
}
|
||||
, version ? "3.9.8.0"
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -231,6 +227,11 @@ let
|
|||
gr-zeromq = {
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
pythonRuntime = [
|
||||
# Will compile without this, but it is required by tests, and by some
|
||||
# gr blocks.
|
||||
python.pkgs.pyzmq
|
||||
];
|
||||
};
|
||||
gr-network = {
|
||||
cmakeEnableFlag = "GR_NETWORK";
|
||||
|
|
@ -250,7 +251,7 @@ let
|
|||
removeReferencesTo
|
||||
featuresInfo
|
||||
features
|
||||
versionAttr
|
||||
version
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
|
|
@ -258,24 +259,21 @@ let
|
|||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
});
|
||||
inherit (shared) hasFeature; # function
|
||||
inherit (shared.passthru) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
cmakeFlags
|
||||
disallowedReferences
|
||||
stripDebugList
|
||||
doCheck
|
||||
dontWrapPythonPrograms
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
stdenv.mkDerivation (finalAttrs: (shared // {
|
||||
inherit pname version;
|
||||
# Will still evaluate correctly if not used here. It only helps nix-update
|
||||
# find the right file in which version is defined.
|
||||
inherit (shared) src;
|
||||
# Remove failing tests
|
||||
preConfigure = (shared.preConfigure or "") + ''
|
||||
# https://github.com/gnuradio/gnuradio/issues/3801
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding.py
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py
|
||||
rm gr-blocks/python/blocks/qa_ctrlport_probes.py
|
||||
'';
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.patch
|
||||
|
|
@ -303,4 +301,4 @@ stdenv.mkDerivation {
|
|||
${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
|
||||
''
|
||||
;
|
||||
}
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -45,11 +45,7 @@
|
|||
# If one wishes to use a different src or name for a very custom build
|
||||
, overrideSrc ? {}
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.10";
|
||||
minor = "7";
|
||||
patch = "0";
|
||||
}
|
||||
, version ? "3.10.7.0"
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -252,6 +248,11 @@ let
|
|||
gr-zeromq = {
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
pythonRuntime = [
|
||||
# Will compile without this, but it is required by tests, and by some
|
||||
# gr blocks.
|
||||
python.pkgs.pyzmq
|
||||
];
|
||||
};
|
||||
gr-network = {
|
||||
cmakeEnableFlag = "GR_NETWORK";
|
||||
|
|
@ -271,7 +272,7 @@ let
|
|||
removeReferencesTo
|
||||
featuresInfo
|
||||
features
|
||||
versionAttr
|
||||
version
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
|
|
@ -279,24 +280,14 @@ let
|
|||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
});
|
||||
inherit (shared) hasFeature; # function
|
||||
inherit (shared.passthru) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
cmakeFlags
|
||||
disallowedReferences
|
||||
stripDebugList
|
||||
doCheck
|
||||
dontWrapPythonPrograms
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
stdenv.mkDerivation (finalAttrs: (shared // {
|
||||
inherit pname version;
|
||||
# Will still evaluate correctly if not used here. It only helps nix-update
|
||||
# find the right file in which version is defined.
|
||||
inherit (shared) src;
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.patch
|
||||
|
|
@ -332,4 +323,4 @@ stdenv.mkDerivation {
|
|||
${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
|
||||
''
|
||||
;
|
||||
}
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, removeReferencesTo
|
||||
, featuresInfo
|
||||
, features
|
||||
, versionAttr
|
||||
, version
|
||||
, sourceSha256
|
||||
# If overridden. No need to set default values, as they are given defaults in
|
||||
# the main expressions
|
||||
|
|
@ -13,10 +13,21 @@
|
|||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rec {
|
||||
version = builtins.concatStringsSep "." (
|
||||
lib.attrVals [ "major" "minor" "patch" ] versionAttr
|
||||
let
|
||||
# Check if a feature is enabled, while defaulting to true if feat is not
|
||||
# specified.
|
||||
hasFeature = feat: (
|
||||
if builtins.hasAttr feat features then
|
||||
features.${feat}
|
||||
else
|
||||
true
|
||||
);
|
||||
versionAttr = {
|
||||
major = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version));
|
||||
minor = builtins.elemAt (lib.splitVersion version) 2;
|
||||
patch = builtins.elemAt (lib.splitVersion version) 3;
|
||||
};
|
||||
in {
|
||||
src = if overrideSrc != {} then
|
||||
overrideSrc
|
||||
else
|
||||
|
|
@ -27,14 +38,6 @@ rec {
|
|||
sha256 = sourceSha256;
|
||||
}
|
||||
;
|
||||
# Check if a feature is enabled, while defaulting to true if feat is not
|
||||
# specified.
|
||||
hasFeature = feat: (
|
||||
if builtins.hasAttr feat features then
|
||||
features.${feat}
|
||||
else
|
||||
true
|
||||
);
|
||||
nativeBuildInputs = lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
lib.optionals (hasFeature feat) (
|
||||
|
|
@ -109,9 +112,14 @@ rec {
|
|||
# Wrapping is done with an external wrapper
|
||||
dontWrapPythonPrograms = true;
|
||||
dontWrapQtApps = true;
|
||||
# Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order
|
||||
# for it to happen.
|
||||
doCheck = false;
|
||||
# On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if
|
||||
# find libgnuradio-runtim.3.*.dylib .
|
||||
doCheck = !stdenv.isDarwin;
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Software Defined Radio (SDR) software";
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jujutsu";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinvonz";
|
||||
repo = "jj";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5RN2xaH591/83iNXRcW9i/TyU5ndPZq3P/BesHM9I6w=";
|
||||
hash = "sha256-LJW4Px3K5cz6RJ4sUbwUXsp2+rzEW5wowi+DALHajYA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G4W3GeTWTuIZO1PupuZ0hACwhNoNBQhULyT9f6qVckg=";
|
||||
cargoHash = "sha256-fs1cWhBFp2u3HiEx/mMnbwvgwKo97KmftA/sr4dGsiM=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
|
|
|
|||
|
|
@ -417,6 +417,7 @@ fi
|
|||
tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")"
|
||||
exit_handlers+=(remove_tmpHomePath)
|
||||
HOME="$tmpHomePath"
|
||||
ln -s /build/.netrc "$HOME/"
|
||||
unset XDG_CONFIG_HOME
|
||||
export GIT_CONFIG_NOSYSTEM=1
|
||||
|
||||
|
|
|
|||
|
|
@ -247,6 +247,7 @@ in lib.makeScope pkgs.newScope (self: with self; {
|
|||
# see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem
|
||||
preFixup = ''
|
||||
patch $out/lib/node_modules/elm-pages/generator/src/codegen.js ${./packages/elm-pages-fix-read-only.patch}
|
||||
patch $out/lib/node_modules/elm-pages/generator/src/init.js ${./packages/elm-pages-fix-init-read-only.patch}
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
diff --git a/generator/src/init.js b/generator/src/init.js
|
||||
index 06386ff..7127dae 100644
|
||||
--- a/generator/src/init.js
|
||||
+++ b/generator/src/init.js
|
||||
@@ -6,6 +6,20 @@ import { fileURLToPath } from "url";
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
+let walknDo = function(somePath, doStuff) {
|
||||
+ doStuff(somePath, true);
|
||||
+ const dir = fs.readdirSync(somePath)
|
||||
+ dir.forEach((i) => {
|
||||
+ let p = path.join(somePath, i);
|
||||
+ const s = fs.statSync(p)
|
||||
+ if (s.isDirectory()) {
|
||||
+ walknDo(p, doStuff)
|
||||
+ } else {
|
||||
+ doStuff(p);
|
||||
+ }
|
||||
+ });
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* @param {string} name
|
||||
*/
|
||||
@@ -18,6 +32,13 @@ export async function run(name) {
|
||||
if (!fs.existsSync(name)) {
|
||||
try {
|
||||
await fsExtra.copy(template, appRoot);
|
||||
+ walknDo(appRoot, (file, isDir) => {
|
||||
+ if (isDir) {
|
||||
+ fs.chmodSync(file, 0o755);
|
||||
+ } else {
|
||||
+ fs.chmodSync(file, 0o644);
|
||||
+ }
|
||||
+ });
|
||||
fs.renameSync(
|
||||
path.resolve(appRoot, "gitignore"),
|
||||
path.resolve(appRoot, ".gitignore")
|
||||
|
|
@ -1,18 +1,11 @@
|
|||
diff --git a/generator/src/codegen.js b/generator/src/codegen.js
|
||||
index a0ef8806e..fe00ac904 100644
|
||||
index baf5368..e5edf4d 100644
|
||||
--- a/generator/src/codegen.js
|
||||
+++ b/generator/src/codegen.js
|
||||
@@ -20,33 +20,33 @@ async function generate(basePath) {
|
||||
@@ -37,9 +37,9 @@ export async function generate(basePath) {
|
||||
copyToBoth("SiteConfig.elm"),
|
||||
|
||||
const uiFileContent = elmPagesUiFile();
|
||||
await Promise.all([
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./Page.elm`),
|
||||
- `./.elm-pages/Page.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./.elm-pages/Page.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./Page.elm`))
|
||||
),
|
||||
fs.promises.writeFile("./.elm-pages/Pages.elm", uiFileContent),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./elm-application.json`),
|
||||
- `./elm-stuff/elm-pages/elm-application.json`
|
||||
|
|
@ -20,40 +13,27 @@ index a0ef8806e..fe00ac904 100644
|
|||
+ `./elm-stuff/elm-pages/elm-application.json`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./elm-application.json`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./Page.elm`),
|
||||
- `./elm-stuff/elm-pages/.elm-pages/Page.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./elm-stuff/elm-pages/.elm-pages/Page.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./Page.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SharedTemplate.elm`),
|
||||
- `./.elm-pages/SharedTemplate.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./.elm-pages/SharedTemplate.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SharedTemplate.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SharedTemplate.elm`),
|
||||
- `./elm-stuff/elm-pages/.elm-pages/SharedTemplate.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./elm-stuff/elm-pages/.elm-pages/SharedTemplate.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SharedTemplate.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SiteConfig.elm`),
|
||||
- `./.elm-pages/SiteConfig.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./.elm-pages/SiteConfig.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SiteConfig.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SiteConfig.elm`),
|
||||
- `./elm-stuff/elm-pages/.elm-pages/SiteConfig.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./elm-stuff/elm-pages/.elm-pages/SiteConfig.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SiteConfig.elm`))
|
||||
),
|
||||
fs.promises.writeFile("./.elm-pages/Pages.elm", uiFileContent),
|
||||
// write `Pages.elm` with cli interface
|
||||
fs.promises.writeFile(
|
||||
@@ -82,9 +82,9 @@ function writeFetcherModules(basePath, fetcherData) {
|
||||
}
|
||||
|
||||
async function newCopyBoth(modulePath) {
|
||||
- await fs.promises.copyFile(
|
||||
- path.join(__dirname, modulePath),
|
||||
- path.join(`./elm-stuff/elm-pages/client/.elm-pages/`, modulePath)
|
||||
+ await fs.promises.writeFile(
|
||||
+ path.join(`./elm-stuff/elm-pages/client/.elm-pages/`, modulePath),
|
||||
+ fs.readFileSync(path.join(__dirname, modulePath))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ async function copyFileEnsureDir(from, to) {
|
||||
await fs.promises.mkdir(path.dirname(to), {
|
||||
recursive: true,
|
||||
});
|
||||
- await fs.promises.copyFile(from, to);
|
||||
+ await fs.promises.writeFile(to, fs.readFileSync(from));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -5,26 +5,6 @@
|
|||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/json" = {
|
||||
sha256 = "1a107nmm905dih4w4mjjkkpdcjbgaf5qjvr7fl30kkpkckfjjnrw";
|
||||
version = "1.1.2";
|
||||
};
|
||||
|
||||
"elm/html" = {
|
||||
sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/svg" = {
|
||||
sha256 = "1cwcj73p61q45wqwgqvrvz3aypjyy3fw732xyxdyj6s256hwkn0k";
|
||||
version = "1.0.1";
|
||||
};
|
||||
|
||||
"elm/project-metadata-utils" = {
|
||||
sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/browser" = {
|
||||
sha256 = "1zlmx672glg7fdgkvh5jm47y85pv7pdfr5mkhg6x7ar6k000vyka";
|
||||
version = "1.0.1";
|
||||
|
|
@ -35,11 +15,31 @@
|
|||
version = "1.0.2";
|
||||
};
|
||||
|
||||
"elm/html" = {
|
||||
sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/http" = {
|
||||
sha256 = "008bs76mnp48b4dw8qwjj4fyvzbxvlrl4xpa2qh1gg2kfwyw56v1";
|
||||
version = "2.0.0";
|
||||
};
|
||||
|
||||
"elm/json" = {
|
||||
sha256 = "1a107nmm905dih4w4mjjkkpdcjbgaf5qjvr7fl30kkpkckfjjnrw";
|
||||
version = "1.1.2";
|
||||
};
|
||||
|
||||
"elm/project-metadata-utils" = {
|
||||
sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/svg" = {
|
||||
sha256 = "1cwcj73p61q45wqwgqvrvz3aypjyy3fw732xyxdyj6s256hwkn0k";
|
||||
version = "1.0.1";
|
||||
};
|
||||
|
||||
"elm/bytes" = {
|
||||
sha256 = "040d7irrawcbnq9jxhzx8p9qacdlw5bncy6lgndd6inm53rvvwbp";
|
||||
version = "1.0.7";
|
||||
|
|
@ -55,13 +55,13 @@
|
|||
version = "1.1.0";
|
||||
};
|
||||
|
||||
"elm/url" = {
|
||||
sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
|
||||
"elm/time" = {
|
||||
sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/time" = {
|
||||
sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
|
||||
"elm/url" = {
|
||||
sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
|
||||
, bytestring, containers, directory, edit-distance, fetchgit
|
||||
, file-embed, filelock, filepath, ghc-prim, haskeline, HTTP
|
||||
, http-client, http-client-tls, http-types, language-glsl, mtl
|
||||
, http-client, http-client-tls, http-types, language-glsl, lib, mtl
|
||||
, network, parsec, process, raw-strings-qq, scientific, SHA
|
||||
, snap-core, snap-server, lib, template-haskell, time
|
||||
, snap-core, snap-server, template-haskell, time
|
||||
, unordered-containers, utf8-string, vector, zip-archive
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "elm";
|
||||
version = "0.19.1";
|
||||
|
|
@ -29,4 +28,5 @@ mkDerivation {
|
|||
homepage = "https://elm-lang.org";
|
||||
description = "The `elm` command line interface";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "elm";
|
||||
}
|
||||
|
|
|
|||
3197
pkgs/development/compilers/elm/packages/node-packages.nix
generated
3197
pkgs/development/compilers/elm/packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lobster";
|
||||
version = "2023.11";
|
||||
version = "2023.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "lobster";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c0EElDvoFzIZvYZpjWd9az+KUxDXTETOp89I/tRCrQ0=";
|
||||
sha256 = "sha256-0hEcbLq8thlgMtCcWt8SR5XsNgQfNH4+qdE0cHfRveo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -55,8 +55,14 @@
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix `call to undeclared function 'sleep'` with clang 16
|
||||
./mariadb-connector-odbc-unistd.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ unixODBC openssl libiconv ];
|
||||
buildInputs = [ unixODBC openssl libiconv zlib ]
|
||||
++ lib.optionals stdenv.isDarwin [ libkrb5 ];
|
||||
|
||||
preConfigure = ''
|
||||
# we don't want to build a .pkg
|
||||
|
|
@ -66,6 +72,7 @@
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_EXTERNAL_ZLIB=ON"
|
||||
"-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib"
|
||||
"-DODBC_INCLUDE_DIR=${lib.getDev unixODBC}/include"
|
||||
"-DWITH_OPENSSL=ON"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff -ur a/test/use_result.c b/test/use_result.c
|
||||
--- a/test/use_result.c 1969-12-31 19:00:01.000000000 -0500
|
||||
+++ b/test/use_result.c 2023-09-05 00:08:12.979889343 -0400
|
||||
@@ -23,6 +23,8 @@
|
||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
#include "tap.h"
|
||||
|
||||
SQLINTEGER my_max_rows= 100;
|
||||
|
|
@ -1,22 +1,26 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitHub
|
||||
, alcotest
|
||||
, qcheck-core
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "algaeff";
|
||||
version = "0.2.1";
|
||||
version = "1.1.0";
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedPRL";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jpnJhF+LN2ef6QPLcCHxcMg3Fr3GSLOnJkZ9ZUIOrlY=";
|
||||
hash = "sha256-7kwQmoT8rpQWPHc+BZQi9fcZhgHxS99158ebXAXlpQ8=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest qcheck-core ];
|
||||
|
||||
meta = {
|
||||
description = "Reusable Effects-Based Components";
|
||||
homepage = "https://github.com/RedPRL/algaeff";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.31.57";
|
||||
version = "1.31.60";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-4o88p6YnnwHc7EZjmAvoCqk9xOsu/MI5aFnOtkdiO4M=";
|
||||
hash = "sha256-mBNODmy8MhpZPYwRpuJTK3TYy4Rkvz880BhLzFnxs54=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.36";
|
||||
version = "0.5.37";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5eA9fqL748VigNgy1G7bZtMstV7EI9LLPhv6xZnCEFA=";
|
||||
hash = "sha256-HKtUSINJNREvu5t2jMEirkwMG6O9tBnWhACMv4L01TE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gitignore-parser";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "mherrmann";
|
||||
repo = "gitignore_parser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Zw7BuhdUzd0pjlRHf3KbkOUhLuBVvlKhWIzZocKOU30=";
|
||||
hash = "sha256-FgP1moyfxgPmPOWpSp6+UXZOzL5HDofg3ECh53x4iaE=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "prayer-times-calculator";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "uchagani";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Zk7lzZUfojJrsrLRS9cf9AhEfGGsxZJo2MnIIOv6Ezk=";
|
||||
hash = "sha256-QIUMxs6NOqnljTi1UNp7bCQ9TgBy/u+BWEqgr2C854g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypoint";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fredrike";
|
||||
repo = "pypoint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fO0un6YIK3jutzUxbu9mSqPZHfLa3pMtfxOy1iV3Qio=";
|
||||
hash = "sha256-tQ5rQs6ECn9O9dVXKWhmy9BBpOzgqSmwpmbIRbJn2CQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tagoio-sdk";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "tago-io";
|
||||
repo = "sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GHjkw7B/T+XZ3F3XCI0INpx9NWjORr0lbuGse/W25wY=";
|
||||
hash = "sha256-ebNiEvQ1U0RLrH3OOt/oRRPElg+9jibj7fsEEd1hdmU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ let
|
|||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "22.0.3";
|
||||
version = "22.0.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
hash = "sha256-QDa5YPPi7JR8fd3jni8fjkwWH/PF023avVBENEwnbVA=";
|
||||
hash = "sha256-wl6kZmm6o9UspKdVHDqUvoDCRALp1ut7Sun/RDuEMLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
|
||||
index 3fee4259af9..53cc3107f46 100644
|
||||
--- a/lib/discourse_js_processor.rb
|
||||
+++ b/lib/discourse_js_processor.rb
|
||||
@@ -111,8 +111,6 @@ class DiscourseJsProcessor
|
||||
|
||||
def self.generate_js_processor
|
||||
Discourse::Utils.execute_command(
|
||||
- "yarn",
|
||||
- "--silent",
|
||||
"esbuild",
|
||||
"--log-level=warning",
|
||||
"--bundle",
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
, gzip
|
||||
, gnutar
|
||||
, git
|
||||
, esbuild
|
||||
, cacert
|
||||
, util-linux
|
||||
, gawk
|
||||
|
|
@ -46,13 +47,13 @@
|
|||
}@args:
|
||||
|
||||
let
|
||||
version = "3.1.0";
|
||||
version = "3.2.0.beta1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY=";
|
||||
sha256 = "sha256-HVjt5rsLSuyOaQxkbiTrsYsSXj3oSWjke98QVp+tEqk=";
|
||||
};
|
||||
|
||||
ruby = ruby_3_2;
|
||||
|
|
@ -65,6 +66,7 @@ let
|
|||
gnutar
|
||||
git
|
||||
brotli
|
||||
esbuild
|
||||
|
||||
# Misc required system utils
|
||||
which
|
||||
|
|
@ -202,7 +204,7 @@ let
|
|||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/app/assets/javascripts/yarn.lock";
|
||||
sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj";
|
||||
sha256 = "070h66zp8kmsigbrkh5d3jzbzvllzhbx0fa2yzx5lbpgnjhih3p2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = runtimeDeps ++ [
|
||||
|
|
@ -215,6 +217,7 @@ let
|
|||
nodejs_18
|
||||
jq
|
||||
moreutils
|
||||
esbuild
|
||||
];
|
||||
|
||||
outputs = [ "out" "javascripts" ];
|
||||
|
|
@ -238,6 +241,12 @@ let
|
|||
# hasn't been `patchShebangs`-ed yet. So instead we just use
|
||||
# `patch-package` from `nativeBuildInputs`.
|
||||
./asserts_patch-package_from_path.patch
|
||||
|
||||
# `lib/discourse_js_processor.rb`
|
||||
# tries to call `../node_modules/.bin/esbuild`, which
|
||||
# hasn't been `patchShebangs`-ed yet. So instead we just use
|
||||
# `esbuild` from `nativeBuildInputs`.
|
||||
./assets_esbuild_from_path.patch
|
||||
];
|
||||
|
||||
# We have to set up an environment that is close enough to
|
||||
|
|
@ -351,6 +360,12 @@ let
|
|||
|
||||
# Make sure the notification email setting applies
|
||||
./notification_email.patch
|
||||
|
||||
# `lib/discourse_js_processor.rb`
|
||||
# tries to call `../node_modules/.bin/esbuild`, which
|
||||
# hasn't been `patchShebangs`-ed yet. So instead we just use
|
||||
# `esbuild` from `nativeBuildInputs`.
|
||||
./assets_esbuild_from_path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-assign";
|
||||
rev = "0cbf10b8055370445bd36536e51986bf48bdc57e";
|
||||
sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo=";
|
||||
rev = "e9c7cb5c3f90109bc47223b0aa4054d681e9cc04";
|
||||
sha256 = "sha256-w1h1dCSyOml+AT7lPKENYfawm6BU2De5CyBHrDnDcrM=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-bbcode-color";
|
||||
rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7";
|
||||
sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs=";
|
||||
rev = "79ed22b3a3352adbd20f7e2222b9dbdb9fbaf7fe";
|
||||
sha256 = "sha256-AHgny9BW/ssmv0U2lwzVWgYKPsvWHD6kgU3mBMFX4Aw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-bbcode-color";
|
||||
|
|
|
|||
|
|
@ -22,4 +22,4 @@ DEPENDENCIES
|
|||
rrule (= 0.4.4)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.13
|
||||
2.4.17
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-calendar";
|
||||
rev = "afc2ee684de41601d6cecc46713d139760f176a6";
|
||||
sha256 = "sha256-rTQWO+E/Jg4zjZDYDvBrDQsox5q4dHkdQjwnJxgv3dI=";
|
||||
rev = "4d4fe40d09f7232b1348e1ff910b37b2cec0835d";
|
||||
sha256 = "sha256-w1sqE3KxwrE8SWqZUtPVhjITOPFXwlj4iPyPZeSfvtI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-calendar";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-chat-integration";
|
||||
rev = "70fea6b66b68868aa4c00b45a169436deaa142a8";
|
||||
sha256 = "sha256-K9MmP1F0B6Na2dTqgnsjMbTQFkF+nNKkI8aF3zPAodc=";
|
||||
rev = "4f9ccb58cae8600dcb6db84f38f235283911e6e8";
|
||||
sha256 = "sha256-Em9aAwAfUoqsOHLrqNhxUQXsO4Owydf9nhCHbBaqqpg=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-chat-integration";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-data-explorer";
|
||||
rev = "e4f8d3924a18b303c2bb7da9472cf0c060060e4e";
|
||||
sha256 = "sha256-K+GPszO3je6NmnhIRSqSEhylUK5oEByaS0bLfAGjvB4=";
|
||||
rev = "06193f27ef15828479eea61ae4a80bf59806a535";
|
||||
sha256 = "sha256-afjqgi2gzRpbZt5K9yXPy4BJ5qRv7A4ZkXHX85+Cv7s=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-data-explorer";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-docs";
|
||||
rev = "a4b203274b88c5277d0b5b936de0bc0e0016726c";
|
||||
sha256 = "sha256-R+VP/gsb2Oa6lPVMhRoGZzOBx5C7kRSxqwYpWE10GHw=";
|
||||
rev = "89c7274b1a730edefd1b56c13b8c04305d4ef331";
|
||||
sha256 = "sha256-j3zrGmoAvbSHFnbiUfetyfiQJebrtW3Iw5GvsRRq1kk=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ GEM
|
|||
specs:
|
||||
addressable (2.8.5)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
faraday (2.7.10)
|
||||
base64 (0.1.1)
|
||||
faraday (2.7.11)
|
||||
base64
|
||||
faraday-net_http (>= 2.0, < 3.1)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-net_http (3.0.2)
|
||||
|
|
@ -24,4 +26,4 @@ DEPENDENCIES
|
|||
sawyer (= 0.9.2)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.13
|
||||
2.4.17
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-github";
|
||||
rev = "8aa068d56ef010cecaabd50657e7753f4bbecc1f";
|
||||
sha256 = "sha256-WzljuGvv6pki3ROkvhXZWQaq5D9JkCbWjdlkdRI8lHE=";
|
||||
rev = "21fa5c97ca23b4c39aef5ab9c4f8ebb22f19a19b";
|
||||
sha256 = "sha256-0Teu6nMJWAT9TCjZ0RWZKtfsUKAS1cga5DvALIvrUyY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-github";
|
||||
|
|
|
|||
|
|
@ -10,16 +10,26 @@
|
|||
};
|
||||
version = "2.8.5";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-net_http" "ruby2_keywords"];
|
||||
base64 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9";
|
||||
sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.10";
|
||||
version = "0.1.1";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["base64" "faraday-net_http" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vn7jwss2v6jhnxvjsiwbs3irjwhbx9zxn4l6fhd4rkcfyxzdnw5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.11";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-math";
|
||||
rev = "529ad1fe6da924da378a60bec48c35657bb01a68";
|
||||
sha256 = "sha256-zhtAy0tTVMzQfPilTwfyyzxgCJD4xazOITBuliFR5Gg=";
|
||||
rev = "66d522cd8e4cf98547f083c4decdc64c688767de";
|
||||
sha256 = "sha256-Zil6LWl6ACyP/ZkxNli1u9/3dlHFRETtmIov1BmQ3u4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-math";
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-openid-connect";
|
||||
rev = "b1df541ad29f6f6098a1008b83393b2d400986ed";
|
||||
sha256 = "sha256-afRd/9M0nQGkS14Q8BJhcJwMCkOku3Fr0uHxcRl44vQ=";
|
||||
rev = "322bf50700840b327d9a52091fedbacc0bb1edfe";
|
||||
sha256 = "sha256-8WMhlKHYVm2wHbkP7b8dhOosvwDNjHqTrEziQT1Bu/4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-openid-connect";
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@ DEPENDENCIES
|
|||
webrick (= 1.7.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.13
|
||||
2.4.17
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-prometheus";
|
||||
rev = "8a7a46a80cc65aa0839bc5e3c3b6f8ef6544089f";
|
||||
sha256 = "sha256-TL+pbP26LvRMKdy8CAuBEK+LZfAs8HfggMeUDaBu9hc=";
|
||||
rev = "305610c90079556cdfa2aa09b567a6ca10d11de5";
|
||||
sha256 = "sha256-dz+/2pbbhs8sxYMxe/wAjvdxoU4ihjN95A4ngP0KzQg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-reactions";
|
||||
rev = "643f807a3a2195f08211064301f0350d9f51604f";
|
||||
sha256 = "sha256-4FdiYUNysSuOJ664G3YvlUHx/J7MLUS3kVBdXT47oEw=";
|
||||
rev = "f04f077e9f0392ca2373ca001044069d650ae6e5";
|
||||
sha256 = "sha256-HuFXgfd5HO7qfVlf1RHxenlNL10YRF5OYya4Yt6eS14=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-reactions";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-saved-searches";
|
||||
rev = "7c9bdcd68951e7cef16cafe3c4bfb583bb994d2a";
|
||||
sha256 = "sha256-6RIN12ACDCeRcxmsC3FgeIPdvovI4arn7w/Dqil1yCI=";
|
||||
rev = "1b90d26cc35bd049d0ab7ea3922f7db6ac7ec017";
|
||||
sha256 = "sha256-d+zbm8UAZ/ow8o1Y5mWAyjg5JCvQ761jcGcO72tHEIs=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-saved-searches";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-solved";
|
||||
rev = "b5d487d6a5bfe2571d936eec5911d02a5f3fcc32";
|
||||
sha256 = "sha256-Tt7B9PcsV8E7B+m8GnJw+MBz9rGYtojKt6NjBFMQvOM=";
|
||||
rev = "3b9ecc69c6a25b7671c42842b8a6f3872873f537";
|
||||
sha256 = "sha256-gtG+v25jJ0DiYlU2vatreGj13yrb5WWRTvxlcDdAibw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-solved";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-spoiler-alert";
|
||||
rev = "65989714af08eda44196cca3a0afe85c9e9443f9";
|
||||
sha256 = "sha256-R/vqNEDst50+Y7anckIvhy4viBOqBemIZMh4sPt7kRM=";
|
||||
rev = "b57e79343acc15cb2c0a032a2deb29ad4b9d53cc";
|
||||
sha256 = "sha256-Ypt6PYCZzArCv9KkCtw5rfT6++dDoUx5q9m/eMvP0Sc=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-spoiler-alert";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-voting";
|
||||
rev = "6449fc15658d972e20086a3f1fae3dbac9cd9eeb";
|
||||
sha256 = "sha256-f04LpVeodCVEB/t5Ic2dketp542Nrc0rZWbQ6hrC22g=";
|
||||
rev = "83ab47f3186694039c6850ac3e230443e05d37c5";
|
||||
sha256 = "sha256-2sSBLSSPddxXqvEukDn8tzLVOOWoPBA+C8N5jVccCjA=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-voting";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-yearly-review";
|
||||
rev = "3246c6b378f9e69e664c575efc63c2ad83bcac2f";
|
||||
sha256 = "sha256-usHHyfYP4YAQ94f7gvNSH7VBRRkdZMmsSi9QQM8tPfY=";
|
||||
rev = "47014a8ecb96da8d45d0fe141a069010161b3087";
|
||||
sha256 = "sha256-9OIgxRdQoYH19vb7GcTt8MxVM5N4JPzmMIsg7FQOjJs=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-yearly-review";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ else
|
|||
# this allows us to include the bits of rails we use without pieces we do not.
|
||||
#
|
||||
# To issue a rails update bump the version number here
|
||||
rails_version = "7.0.5.1"
|
||||
rails_version = "7.0.7"
|
||||
gem "actionmailer", rails_version
|
||||
gem "actionpack", rails_version
|
||||
gem "actionview", rails_version
|
||||
|
|
@ -141,10 +141,10 @@ group :test do
|
|||
gem "fakeweb", require: false
|
||||
gem "minitest", require: false
|
||||
gem "simplecov", require: false
|
||||
gem "selenium-webdriver", require: false
|
||||
gem "selenium-webdriver", "~> 4.11", require: false
|
||||
gem "test-prof"
|
||||
gem "webdrivers", require: false
|
||||
gem "rails-dom-testing", require: false
|
||||
gem "minio_runner", require: false
|
||||
end
|
||||
|
||||
group :test, :development do
|
||||
|
|
@ -259,6 +259,11 @@ if ENV["IMPORT"] == "1"
|
|||
gem "parallel", require: false
|
||||
end
|
||||
|
||||
if ENV["GENERIC_IMPORT"] == "1"
|
||||
gem "sqlite3"
|
||||
gem "redcarpet"
|
||||
end
|
||||
|
||||
gem "web-push"
|
||||
gem "colored2", require: false
|
||||
gem "maxminddb"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: https://github.com/thoughtbot/shoulda-matchers.git
|
||||
revision: 783a90554053002017510285bc736099b2749c22
|
||||
revision: 68f76ce13e9892339f90c4928339dfd769cfa613
|
||||
specs:
|
||||
shoulda-matchers (5.3.0)
|
||||
activesupport (>= 5.2.0)
|
||||
|
|
@ -17,47 +17,47 @@ GIT
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (7.0.5.1)
|
||||
actionpack (= 7.0.5.1)
|
||||
actionview (= 7.0.5.1)
|
||||
activejob (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
actionmailer (7.0.7)
|
||||
actionpack (= 7.0.7)
|
||||
actionview (= 7.0.7)
|
||||
activejob (= 7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (7.0.5.1)
|
||||
actionview (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
actionpack (7.0.7)
|
||||
actionview (= 7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
rack (~> 2.0, >= 2.2.4)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actionview (7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
actionview (7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
actionview_precompiler (0.2.3)
|
||||
actionview_precompiler (0.3.0)
|
||||
actionview (>= 6.0.a)
|
||||
active_model_serializers (0.8.4)
|
||||
activemodel (>= 3.0)
|
||||
activejob (7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activejob (7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activerecord (7.0.5.1)
|
||||
activemodel (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activesupport (7.0.5.1)
|
||||
activemodel (7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
activerecord (7.0.7)
|
||||
activemodel (= 7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
activesupport (7.0.7)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.4)
|
||||
addressable (2.8.5)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
annotate (3.2.0)
|
||||
activerecord (>= 3.2, < 8.0)
|
||||
|
|
@ -82,6 +82,7 @@ GEM
|
|||
aws-sigv4 (~> 1.1)
|
||||
aws-sigv4 (1.5.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
base64 (0.1.1)
|
||||
better_errors (2.10.1)
|
||||
erubi (>= 1.0.0)
|
||||
rack (>= 0.9.0)
|
||||
|
|
@ -109,7 +110,7 @@ GEM
|
|||
cgi (0.3.6)
|
||||
chunky_png (1.4.0)
|
||||
coderay (1.1.3)
|
||||
colored2 (3.1.2)
|
||||
colored2 (4.0.0)
|
||||
concurrent-ruby (1.2.2)
|
||||
connection_pool (2.4.1)
|
||||
cose (1.3.0)
|
||||
|
|
@ -119,7 +120,7 @@ GEM
|
|||
crack (0.4.5)
|
||||
rexml
|
||||
crass (1.0.6)
|
||||
css_parser (1.14.0)
|
||||
css_parser (1.16.0)
|
||||
addressable
|
||||
dartsass-ruby (3.0.1)
|
||||
sass-embedded (~> 1.54)
|
||||
|
|
@ -144,8 +145,8 @@ GEM
|
|||
docile (1.4.0)
|
||||
email_reply_trimmer (0.1.13)
|
||||
erubi (1.12.0)
|
||||
excon (0.100.0)
|
||||
execjs (2.8.1)
|
||||
excon (0.102.0)
|
||||
execjs (2.9.0)
|
||||
exifr (1.4.0)
|
||||
fabrication (2.30.0)
|
||||
faker (2.23.0)
|
||||
|
|
@ -163,9 +164,9 @@ GEM
|
|||
ffi (1.15.5)
|
||||
fspath (3.1.2)
|
||||
gc_tracer (1.5.1)
|
||||
globalid (1.1.0)
|
||||
activesupport (>= 5.0)
|
||||
google-protobuf (3.23.4)
|
||||
globalid (1.2.1)
|
||||
activesupport (>= 6.1)
|
||||
google-protobuf (3.24.3)
|
||||
guess_html_encoding (0.0.11)
|
||||
hana (1.3.7)
|
||||
hashdiff (1.0.1)
|
||||
|
|
@ -188,7 +189,7 @@ GEM
|
|||
json (2.6.3)
|
||||
json-schema (3.0.0)
|
||||
addressable (>= 2.8)
|
||||
json_schemer (1.0.3)
|
||||
json_schemer (2.0.0)
|
||||
hana (~> 1.3)
|
||||
regexp_parser (~> 2.0)
|
||||
simpleidn (~> 0.2)
|
||||
|
|
@ -222,19 +223,20 @@ GEM
|
|||
matrix (0.4.2)
|
||||
maxminddb (0.1.22)
|
||||
memory_profiler (1.0.1)
|
||||
message_bus (4.3.7)
|
||||
message_bus (4.3.8)
|
||||
rack (>= 1.1.3)
|
||||
method_source (1.0.0)
|
||||
mini_mime (1.1.2)
|
||||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.4)
|
||||
mini_racer (0.8.0)
|
||||
libv8-node (~> 18.16.0.0)
|
||||
mini_scheduler (0.16.0)
|
||||
sidekiq (>= 4.2.3, < 7.0)
|
||||
mini_sql (1.4.0)
|
||||
mini_sql (1.5.0)
|
||||
mini_suffix (0.3.3)
|
||||
ffi (~> 1.9)
|
||||
minitest (5.19.0)
|
||||
minio_runner (0.1.1)
|
||||
minitest (5.20.0)
|
||||
mocha (2.1.0)
|
||||
ruby2_keywords (>= 0.0.5)
|
||||
msgpack (1.7.2)
|
||||
|
|
@ -253,7 +255,7 @@ GEM
|
|||
net-smtp (0.3.3)
|
||||
net-protocol
|
||||
nio4r (2.5.9)
|
||||
nokogiri (1.15.3)
|
||||
nokogiri (1.15.4)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
oauth (1.1.0)
|
||||
|
|
@ -268,7 +270,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (>= 1.2, < 4)
|
||||
oj (3.15.1)
|
||||
oj (3.16.1)
|
||||
omniauth (1.9.2)
|
||||
hashie (>= 3.4.6)
|
||||
rack (>= 1.6.2, < 3)
|
||||
|
|
@ -296,7 +298,7 @@ GEM
|
|||
openssl (> 2.0)
|
||||
optimist (3.1.0)
|
||||
parallel (1.23.0)
|
||||
parallel_tests (4.2.1)
|
||||
parallel_tests (4.2.2)
|
||||
parallel
|
||||
parser (3.2.2.3)
|
||||
ast (~> 2.4.1)
|
||||
|
|
@ -313,17 +315,17 @@ GEM
|
|||
pry-rails (0.3.9)
|
||||
pry (>= 0.10.4)
|
||||
public_suffix (5.0.3)
|
||||
puma (6.3.0)
|
||||
puma (6.3.1)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.7.1)
|
||||
rack (2.2.8)
|
||||
rack-mini-profiler (3.1.0)
|
||||
rack-mini-profiler (3.1.1)
|
||||
rack (>= 1.2.0)
|
||||
rack-protection (3.0.6)
|
||||
rack
|
||||
rack-protection (3.1.0)
|
||||
rack (~> 2.2, >= 2.2.4)
|
||||
rack-test (2.1.0)
|
||||
rack (>= 1.3)
|
||||
rails-dom-testing (2.1.1)
|
||||
rails-dom-testing (2.2.0)
|
||||
activesupport (>= 5.0.0)
|
||||
minitest
|
||||
nokogiri (>= 1.6)
|
||||
|
|
@ -337,9 +339,9 @@ GEM
|
|||
rails_multisite (5.0.0)
|
||||
activerecord (>= 6.0)
|
||||
railties (>= 6.0)
|
||||
railties (7.0.5.1)
|
||||
actionpack (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
railties (7.0.7)
|
||||
actionpack (= 7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
method_source
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0)
|
||||
|
|
@ -363,7 +365,7 @@ GEM
|
|||
rack (>= 1.4)
|
||||
rexml (3.2.6)
|
||||
rinku (2.0.6)
|
||||
rotp (6.2.2)
|
||||
rotp (6.3.0)
|
||||
rouge (4.1.3)
|
||||
rqrcode (2.2.0)
|
||||
chunky_png (~> 1.0)
|
||||
|
|
@ -393,7 +395,7 @@ GEM
|
|||
rspec-mocks (~> 3.12)
|
||||
rspec-support (~> 3.12)
|
||||
rspec-support (3.12.1)
|
||||
rss (0.2.9)
|
||||
rss (0.3.0)
|
||||
rexml
|
||||
rswag-specs (2.10.1)
|
||||
activesupport (>= 3.1, < 7.1)
|
||||
|
|
@ -402,7 +404,8 @@ GEM
|
|||
rspec-core (>= 2.14)
|
||||
rtlcss (0.2.1)
|
||||
mini_racer (>= 0.6.3)
|
||||
rubocop (1.55.1)
|
||||
rubocop (1.56.3)
|
||||
base64 (~> 0.1.1)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (>= 3.17.0)
|
||||
parallel (~> 1.10)
|
||||
|
|
@ -422,7 +425,7 @@ GEM
|
|||
rubocop-rspec (>= 2.0.0)
|
||||
rubocop-factory_bot (2.23.1)
|
||||
rubocop (~> 1.33)
|
||||
rubocop-rspec (2.23.0)
|
||||
rubocop-rspec (2.23.2)
|
||||
rubocop (~> 1.33)
|
||||
rubocop-capybara (~> 2.17)
|
||||
rubocop-factory_bot (~> 2.22)
|
||||
|
|
@ -436,10 +439,10 @@ GEM
|
|||
sanitize (6.0.2)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
sass-embedded (1.64.1)
|
||||
sass-embedded (1.66.1)
|
||||
google-protobuf (~> 3.23)
|
||||
rake (>= 13.0.0)
|
||||
selenium-webdriver (4.10.0)
|
||||
selenium-webdriver (4.12.0)
|
||||
rexml (~> 3.2, >= 3.2.5)
|
||||
rubyzip (>= 1.2.2, < 3.0)
|
||||
websocket (~> 1.0)
|
||||
|
|
@ -462,7 +465,7 @@ GEM
|
|||
actionpack (>= 5.2)
|
||||
activesupport (>= 5.2)
|
||||
sprockets (>= 3.0.0)
|
||||
sshkey (2.0.0)
|
||||
sshkey (3.0.0)
|
||||
stackprof (0.2.25)
|
||||
syntax_tree (6.1.1)
|
||||
prettier_print (>= 1.2.0)
|
||||
|
|
@ -491,11 +494,7 @@ GEM
|
|||
hkdf (~> 1.0)
|
||||
jwt (~> 2.0)
|
||||
openssl (~> 3.0)
|
||||
webdrivers (5.3.1)
|
||||
nokogiri (~> 1.6)
|
||||
rubyzip (>= 1.3.0)
|
||||
selenium-webdriver (~> 4.0, < 4.11)
|
||||
webmock (3.18.1)
|
||||
webmock (3.19.1)
|
||||
addressable (>= 2.8.0)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff (>= 0.4.0, < 2.0.0)
|
||||
|
|
@ -504,20 +503,20 @@ GEM
|
|||
nokogiri (~> 1.8)
|
||||
yaml-lint (0.1.2)
|
||||
yard (0.9.34)
|
||||
zeitwerk (2.6.10)
|
||||
zeitwerk (2.6.11)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
actionmailer (= 7.0.5.1)
|
||||
actionpack (= 7.0.5.1)
|
||||
actionview (= 7.0.5.1)
|
||||
actionmailer (= 7.0.7)
|
||||
actionpack (= 7.0.7)
|
||||
actionview (= 7.0.7)
|
||||
actionview_precompiler
|
||||
active_model_serializers (~> 0.8.3)
|
||||
activemodel (= 7.0.5.1)
|
||||
activerecord (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activemodel (= 7.0.7)
|
||||
activerecord (= 7.0.7)
|
||||
activesupport (= 7.0.7)
|
||||
addressable
|
||||
annotate
|
||||
aws-sdk-s3
|
||||
|
|
@ -577,6 +576,7 @@ DEPENDENCIES
|
|||
mini_scheduler
|
||||
mini_sql
|
||||
mini_suffix
|
||||
minio_runner
|
||||
minitest
|
||||
mocha
|
||||
multi_json
|
||||
|
|
@ -604,7 +604,7 @@ DEPENDENCIES
|
|||
rails-dom-testing
|
||||
rails_failover
|
||||
rails_multisite
|
||||
railties (= 7.0.5.1)
|
||||
railties (= 7.0.7)
|
||||
rake
|
||||
rb-fsevent
|
||||
rbtrace
|
||||
|
|
@ -625,7 +625,7 @@ DEPENDENCIES
|
|||
ruby-readability
|
||||
rubyzip
|
||||
sanitize
|
||||
selenium-webdriver
|
||||
selenium-webdriver (~> 4.11)
|
||||
shoulda-matchers!
|
||||
sidekiq
|
||||
simplecov
|
||||
|
|
@ -642,10 +642,9 @@ DEPENDENCIES
|
|||
unf
|
||||
unicorn
|
||||
web-push
|
||||
webdrivers
|
||||
webmock
|
||||
yaml-lint
|
||||
yard
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.13
|
||||
2.4.17
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pz26qpdx1xncpy5h8k4afw0npnh6wn580yvwv2cf857zrzvr1pm";
|
||||
sha256 = "15ni57icsw1ilz5srlasff4h31h2ckgmxbdd8jnbniscvz4x2sd0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "003y7cdxwzdqx8hgw02kf1b5mp8qr8syx07f35sk3ghhqxp39ksy";
|
||||
sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11ihpqcvz3f38ka85zdjkdcvgdbcan81dbr0y9bi784jn1v5ggwa";
|
||||
sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
actionview_precompiler = {
|
||||
dependencies = ["actionview"];
|
||||
|
|
@ -38,10 +38,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07dx8vkwig8han4zccs0chahcf9ibd4abzx9n56qah8zak5cyrhd";
|
||||
sha256 = "07jyr2h87ha6k2y965rs4ywq142ddkfkhbmp0r44xg4wnffr8jbl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
};
|
||||
active_model_serializers = {
|
||||
dependencies = ["activemodel"];
|
||||
|
|
@ -60,10 +60,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11wkxf16zdb9gsnc94x4hyj89wjks06gnk4fbl7gp5vkbl744n83";
|
||||
sha256 = "0s5r5z9jm57jjabh8w2823rpjd1agn8z2rlqgyyn4s9pbbhgalzy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y";
|
||||
sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport"];
|
||||
|
|
@ -82,10 +82,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796";
|
||||
sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
|
|
@ -93,10 +93,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c";
|
||||
sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.4";
|
||||
version = "2.8.5";
|
||||
};
|
||||
annotate = {
|
||||
dependencies = ["activerecord" "rake"];
|
||||
|
|
@ -205,6 +205,16 @@
|
|||
};
|
||||
version = "1.5.0";
|
||||
};
|
||||
base64 = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
better_errors = {
|
||||
dependencies = ["erubi" "rack" "rouge"];
|
||||
groups = ["development"];
|
||||
|
|
@ -351,10 +361,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
|
||||
sha256 = "1zj06gjqwykgzxmbkp2hmg3wv5kv8zz5d77acxipzcgicdjgvfan";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.2";
|
||||
version = "4.0.0";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -424,10 +434,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj";
|
||||
sha256 = "18mii41bbl106rn940ah8v3xclj4yrxxa0bwlwp546244n9b83zp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.0";
|
||||
version = "1.16.0";
|
||||
};
|
||||
dartsass-ruby = {
|
||||
dependencies = ["sass-embedded"];
|
||||
|
|
@ -572,20 +582,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08r6qgbpkxxsihjmlspk3l1sr69q5hx35p1l4wp7rmkbzys89867";
|
||||
sha256 = "0mbkyyadz9vw7mzixi9dks6i6iw033yn2hzwfvnfdvgqq6ywqs4g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.100.0";
|
||||
version = "0.102.0";
|
||||
};
|
||||
execjs = {
|
||||
groups = ["assets" "default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd";
|
||||
sha256 = "1a4dhqclx0n4dc5riiff1nkwfinaf5an1dxjywmlwa9wm57r9q9p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
};
|
||||
exifr = {
|
||||
groups = ["default"];
|
||||
|
|
@ -746,20 +756,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk";
|
||||
sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
};
|
||||
google-protobuf = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dq5lgkxhagqr8zjrwr10zi8rldbg2vhis2m5q86v5q9415ylfgj";
|
||||
sha256 = "0pcl4x4cw3snl5xzs99lm82m9xkfs8vm1a8dfrc34pwb77mwrwv3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.23.4";
|
||||
version = "3.24.3";
|
||||
};
|
||||
guess_html_encoding = {
|
||||
groups = ["default"];
|
||||
|
|
@ -920,10 +930,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mbf7v8bzmxyk413y16drnww68bgyzknlqmaqvj785iakja7in7x";
|
||||
sha256 = "0spgxaxvsl3qvyj9qb95gd5hvy2pnp98hbgp8nfw6s69yyw0xmgj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
version = "2.0.0";
|
||||
};
|
||||
jwt = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1122,10 +1132,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ppqgch8xxccpmccdx37lb00112ayqjb80zz5m3w3298vdzb1kn4";
|
||||
sha256 = "15xqp7pnicjh2868fsc6fmxw8cw32bpiaqpc5bz8cwdib09ns3qk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.3.7";
|
||||
version = "4.3.8";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -1138,14 +1148,14 @@
|
|||
version = "1.0.0";
|
||||
};
|
||||
mini_mime = {
|
||||
groups = ["default"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
|
||||
sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.2";
|
||||
version = "1.1.5";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -1184,10 +1194,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dgwyyya821sfj4f92sljsxmmnak2yrzsbckvy82001zgq1n3b41";
|
||||
sha256 = "0yrxjmwhfnvcwbj9vscyq0z67sq09zl8qhmzgakq2ywy4yvcpwgg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
mini_suffix = {
|
||||
dependencies = ["ffi"];
|
||||
|
|
@ -1200,15 +1210,25 @@
|
|||
};
|
||||
version = "0.3.3";
|
||||
};
|
||||
minio_runner = {
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11rwvbqichq5jipgbr5x6s609485ga7vxc32r3h9vx342gs6nrzy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6";
|
||||
sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.19.0";
|
||||
version = "5.20.0";
|
||||
};
|
||||
mocha = {
|
||||
dependencies = ["ruby2_keywords"];
|
||||
|
|
@ -1336,10 +1356,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7";
|
||||
sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
};
|
||||
oauth = {
|
||||
dependencies = ["oauth-tty" "snaky_hash" "version_gem"];
|
||||
|
|
@ -1379,10 +1399,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vzcrsv6w5k90l75gy83dlfkv2z9pvnr82mz1nhnijmcg3rgqaz8";
|
||||
sha256 = "0m4vsd6i093kmyz9gckvzpnws997laldaiaf86hg5lza1ir82x7n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.15.1";
|
||||
version = "3.16.1";
|
||||
};
|
||||
omniauth = {
|
||||
dependencies = ["hashie" "rack"];
|
||||
|
|
@ -1512,10 +1532,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04y02j0kyhfww41dnnjawn2gpp24smq0x21dvaa5z6pnq0fvmahv";
|
||||
sha256 = "1pa50my9sgh4wh9jah1qxjd33wsp1ahv29vj2q1biz434p67vh5p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast" "racc"];
|
||||
|
|
@ -1607,10 +1627,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh";
|
||||
sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.3.0";
|
||||
version = "6.3.1";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -1642,10 +1662,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13dhpp1iljhqp9c8akmp6gjhx47qf83w12ns4bif26ldkignpam1";
|
||||
sha256 = "18vj7q740f7ffj677i258abryj97w0a6g3d5859y0lgypm5big1v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -1653,10 +1673,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8";
|
||||
sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.6";
|
||||
version = "3.1.0";
|
||||
};
|
||||
rack-test = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -1675,10 +1695,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd";
|
||||
sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
};
|
||||
rails-html-sanitizer = {
|
||||
dependencies = ["loofah" "nokogiri"];
|
||||
|
|
@ -1719,10 +1739,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z4lqqbd4i5izsg97mx5yf3gj7y5d07wgvad0jzjghjg12pf142i";
|
||||
sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.5.1";
|
||||
version = "7.0.7";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -1873,10 +1893,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig";
|
||||
sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.2.2";
|
||||
version = "6.3.0";
|
||||
};
|
||||
rouge = {
|
||||
groups = ["default" "development"];
|
||||
|
|
@ -1995,10 +2015,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1b1zx07kr64kkpm4lssd4r1a1qyr829ppmfl85i4adcvx9mqfid0";
|
||||
sha256 = "1wv27axi39hhr0nmaffdl5bdjqiafcvp9xhfgnsgfczsblja50sn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.9";
|
||||
version = "0.3.0";
|
||||
};
|
||||
rswag-specs = {
|
||||
dependencies = ["activesupport" "json-schema" "railties" "rspec-core"];
|
||||
|
|
@ -2023,15 +2043,15 @@
|
|||
version = "0.2.1";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s9p5qaqq68h5s3ys8xlk9swccma7arjif1w58987n6gicrsprrm";
|
||||
sha256 = "1i3571gchdj3c28znr5kisj0fkppy57208g9j1kv23rhk3p5q5p2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.55.1";
|
||||
version = "1.56.3";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
|
|
@ -2083,10 +2103,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l364y00bw1zcs3grdxcxpn48vfrjds2khsiaxjqq3r9grvbprfy";
|
||||
sha256 = "0ylwy4afnxhbrvlaf8an9nrizj78axnzggiyfcp8v531cv8six5f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.23.0";
|
||||
version = "2.23.2";
|
||||
};
|
||||
ruby-prof = {
|
||||
groups = ["development"];
|
||||
|
|
@ -2160,10 +2180,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15k44qn8vk8ap8khkmpsiw40pywm9pkx4a5yhm8vfi2rgqci9k90";
|
||||
sha256 = "038fzkbq5sw9lf947akhpsvdm14q6jfzl2yn87s8958h42sn0xjy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.64.1";
|
||||
version = "1.66.1";
|
||||
};
|
||||
selenium-webdriver = {
|
||||
dependencies = ["rexml" "rubyzip" "websocket"];
|
||||
|
|
@ -2171,10 +2191,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0hwxxvx6j95ln82pjmrgyzg6qmf511dkcp5q79n6m5m8z4way8m3";
|
||||
sha256 = "0jwll13m7bqph4lgl75m7vwd175k657znwa7qn9qkf5dcxdjkcjs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.10.0";
|
||||
version = "4.12.0";
|
||||
};
|
||||
shoulda-matchers = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -2182,8 +2202,8 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "783a90554053002017510285bc736099b2749c22";
|
||||
sha256 = "10rw7ksi462fxamap6kimdy7hpdgx8477r6zs1kgrbakx24dm3wx";
|
||||
rev = "68f76ce13e9892339f90c4928339dfd769cfa613";
|
||||
sha256 = "08kbcdfplmbdhgq0x6lk2lpwrlgijrfq6vhl5hkmxg9v9gpgbbrj";
|
||||
type = "git";
|
||||
url = "https://github.com/thoughtbot/shoulda-matchers.git";
|
||||
};
|
||||
|
|
@ -2282,10 +2302,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
|
||||
sha256 = "1k8i5pzjhcnyf0bhcyn5iixpfp4pz0556rcxwpglh6p0sr8s6nv5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
};
|
||||
stackprof = {
|
||||
groups = ["default"];
|
||||
|
|
@ -2484,27 +2504,16 @@
|
|||
};
|
||||
version = "3.0.0";
|
||||
};
|
||||
webdrivers = {
|
||||
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19aaxhawzv7315rh285gd1fg6m6wbrn3w3kilyibci1wphgm7mfp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.3.1";
|
||||
};
|
||||
webmock = {
|
||||
dependencies = ["addressable" "crack" "hashdiff"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal";
|
||||
sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.18.1";
|
||||
version = "3.19.1";
|
||||
};
|
||||
websocket = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -2552,9 +2561,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06vf6y5ai20ry3b1h9cl7vsdj6i5valq172zdxpnfhj5zvlp104j";
|
||||
sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.10";
|
||||
version = "2.6.11";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ let
|
|||
|
||||
in package.override rec {
|
||||
pname = "snipe-it";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snipe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s8w98jd81cg3rr2h6i63qm72idxdbhgliz2bdka91cqq0zh6d88";
|
||||
sha256 = "0kx5j9a2fbj9zy0i9r01z3lsbqlf488kn5b42fjs47nfzk1yznvx";
|
||||
};
|
||||
|
||||
passthru.tests = nixosTests.snipe-it;
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.33.0";
|
||||
version = "1.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-DdRcDSvgFf+NSDpWT4MnAOLNJ5sfqvJqKBhfPwTHd/g=";
|
||||
hash = "sha256-Rd8PJWKPUriVf3BmHFvhmb+SQskVeqOFdJB8Gsopgnw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ov1ftDqJtxLCu3xgtGcg+Q2OMkOsHrwk1SNNfdlUieY=";
|
||||
npmDepsHash = "sha256-rEqbwdeIQg6YS7uLeoP2uMbJWsnovIHBVp9CPlTc2NY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tgpt";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aandrew-me";
|
||||
repo = "tgpt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kmQvKqrELCL6UdyV8yrwrnjlSYLYIx/SBTKVsqcLng4=";
|
||||
hash = "sha256-AnGll0BjvR7xUWGn25M4nz4PIJAscl6Sh0pTn1102h8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM=";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nvitop";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XuehaiPan";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nHJ2m5Q0IWl0nx13iGBkHsHj2YdPS+33kLUBsjbpyuM=";
|
||||
hash = "sha256-DPdKdIqFUozTt5Go3+c7oSv9tZSio486QeSlSfIrBZ4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "nvidia-ml-py" ];
|
||||
|
|
|
|||
|
|
@ -20,8 +20,10 @@ let
|
|||
boost
|
||||
volk
|
||||
logLib
|
||||
python
|
||||
;
|
||||
inherit mkDerivationWith mkDerivation;
|
||||
inherit gnuradio;
|
||||
} // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") {
|
||||
inherit (gnuradio) uhd;
|
||||
});
|
||||
|
|
@ -31,9 +33,6 @@ in {
|
|||
|
||||
### Packages
|
||||
|
||||
inherit gnuradio;
|
||||
inherit (gnuradio) python;
|
||||
|
||||
osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { };
|
||||
|
||||
ais = callPackage ../development/gnuradio-modules/ais/default.nix { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue