Merge master into haskell-updates
This commit is contained in:
commit
a0616b9ef8
|
@ -240,10 +240,10 @@ rec {
|
|||
* to implicit typing rules, so it should work with older
|
||||
* parsers as well.
|
||||
*/
|
||||
toYAML = {}@args: toJSON args;
|
||||
toYAML = toJSON;
|
||||
|
||||
withRecursion =
|
||||
args@{
|
||||
{
|
||||
/* If this option is not null, the given value will stop evaluating at a certain depth */
|
||||
depthLimit
|
||||
/* If this option is true, an error will be thrown, if a certain given depth is exceeded */
|
||||
|
@ -287,7 +287,7 @@ rec {
|
|||
allowPrettyValues ? false,
|
||||
/* If this option is true, the output is indented with newlines for attribute sets and lists */
|
||||
multiline ? true
|
||||
}@args:
|
||||
}:
|
||||
let
|
||||
go = indent: v: with builtins;
|
||||
let isPath = v: typeOf v == "path";
|
||||
|
|
|
@ -12,7 +12,6 @@ let
|
|||
concatStringsSep
|
||||
elem
|
||||
filter
|
||||
findFirst
|
||||
foldl'
|
||||
getAttrFromPath
|
||||
head
|
||||
|
@ -34,7 +33,6 @@ let
|
|||
recursiveUpdate
|
||||
reverseList sort
|
||||
setAttrByPath
|
||||
toList
|
||||
types
|
||||
warnIf
|
||||
zipAttrsWith
|
||||
|
@ -46,7 +44,6 @@ let
|
|||
showFiles
|
||||
showOption
|
||||
unknownModule
|
||||
literalExpression
|
||||
;
|
||||
|
||||
showDeclPrefix = loc: decl: prefix:
|
||||
|
@ -604,7 +601,6 @@ rec {
|
|||
}
|
||||
else
|
||||
let
|
||||
firstNonOption = findFirst (m: !isOption m.options) "" decls;
|
||||
nonOptions = filter (m: !isOption m.options) decls;
|
||||
in
|
||||
throw "The option `${showOption loc}' in module `${(lib.head optionDecls)._file}' would be a parent of the following options, but its type `${(lib.head optionDecls).options.type.description or "<no description>"}' does not support nested options.\n${
|
||||
|
@ -652,11 +648,7 @@ rec {
|
|||
'opts' is a list of modules. Each module has an options attribute which
|
||||
correspond to the definition of 'loc' in 'opt.file'. */
|
||||
mergeOptionDecls =
|
||||
let
|
||||
coerceOption = file: opt:
|
||||
if isFunction opt then setDefaultModuleLocation file opt
|
||||
else setDefaultModuleLocation file { options = opt; };
|
||||
in loc: opts:
|
||||
loc: opts:
|
||||
foldl' (res: opt:
|
||||
let t = res.type;
|
||||
t' = opt.options.type;
|
||||
|
|
|
@ -8,7 +8,6 @@ let
|
|||
concatLists
|
||||
concatMap
|
||||
concatMapStringsSep
|
||||
elemAt
|
||||
filter
|
||||
foldl'
|
||||
head
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
# Tested in lib/tests/sources.sh
|
||||
let
|
||||
inherit (builtins)
|
||||
hasContext
|
||||
match
|
||||
readDir
|
||||
split
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (lib) types;
|
||||
checkMaintainer = handle: uncheckedAttrs:
|
||||
let
|
||||
prefix = [ "lib" "maintainers" handle ];
|
||||
|
|
|
@ -6,7 +6,6 @@ let
|
|||
inherit (lib)
|
||||
elem
|
||||
flip
|
||||
functionArgs
|
||||
isAttrs
|
||||
isBool
|
||||
isDerivation
|
||||
|
@ -16,7 +15,6 @@ let
|
|||
isList
|
||||
isString
|
||||
isStorePath
|
||||
setFunctionArgs
|
||||
toDerivation
|
||||
toList
|
||||
;
|
||||
|
|
|
@ -143,13 +143,6 @@ let
|
|||
properties
|
||||
);
|
||||
|
||||
featuresToProperties = features:
|
||||
lib.listToAttrs
|
||||
(builtins.map (feature: {
|
||||
name = "feature@${feature}";
|
||||
value = "enabled";
|
||||
}) features);
|
||||
|
||||
createDatasets =
|
||||
let
|
||||
datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
|
||||
|
|
|
@ -131,15 +131,6 @@ let
|
|||
properties
|
||||
);
|
||||
|
||||
featuresToProperties = features:
|
||||
lib.listToAttrs
|
||||
(builtins.map
|
||||
(feature: {
|
||||
name = "feature@${feature}";
|
||||
value = "enabled";
|
||||
})
|
||||
features);
|
||||
|
||||
createDatasets =
|
||||
let
|
||||
datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
|
||||
|
|
|
@ -15,7 +15,7 @@ let
|
|||
inherit system pkgs;
|
||||
};
|
||||
|
||||
interactiveDriver = (testing.makeTest { inherit nodes; name = "network"; testScript = "start_all(); join_all();"; }).driverInteractive;
|
||||
interactiveDriver = (testing.makeTest { inherit nodes; name = "network"; testScript = "start_all(); join_all();"; }).test.driverInteractive;
|
||||
in
|
||||
|
||||
|
||||
|
|
|
@ -6,4 +6,6 @@ f: {
|
|||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
|
||||
makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f)
|
||||
let testConfig = makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f);
|
||||
in testConfig.test # For nix-build
|
||||
// testConfig # For all-tests.nix
|
||||
|
|
|
@ -107,14 +107,12 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
|
|||
)
|
||||
|
||||
# Don't bother to test LDAP or kerberos authentification
|
||||
# For now deactivate change_password API test. Current bug report at https://redmine.postgresql.org/issues/7648
|
||||
# Password change works from the UI, if email SMTP is configured.
|
||||
with subtest("run browser test"):
|
||||
machine.succeed(
|
||||
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
||||
&& python regression/runtests.py \
|
||||
--pkg browser \
|
||||
--exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking,browser.tests.test_change_password'
|
||||
--exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking'
|
||||
)
|
||||
|
||||
# fontconfig is necessary for chromium to run
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, imagemagick
|
||||
, libappindicator-gtk3
|
||||
, libdbusmenu
|
||||
, libdrm
|
||||
|
@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
|
|||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
imagemagick
|
||||
pango
|
||||
systemd
|
||||
mesa # for libgbm
|
||||
|
@ -106,8 +108,15 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
substituteInPlace $out/share/applications/tidal-hifi.desktop --replace \
|
||||
"/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
|
||||
substituteInPlace $out/share/applications/tidal-hifi.desktop \
|
||||
--replace \ "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" \
|
||||
--replace "/usr/share/icons/hicolor/0x0/apps/tidal-hifi.png" "tidal-hifi.png"
|
||||
|
||||
for size in 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
|
||||
convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \
|
||||
-resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/tidal-hifi.png
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yoshimi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Uo403vxzmDntmdoQZQqncuLpDXVJ2FdGi4pQ9jE9b/k=";
|
||||
hash = "sha256-fkN5VNiXRVKCCAyrG6Z2s5qLEtHQNB2874VprhHBhAg=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
|
|
@ -109,7 +109,7 @@ let
|
|||
gappsWrapperArgs+=(
|
||||
# Add gio to PATH so that moving files to the trash works when not using a desktop environment
|
||||
--prefix PATH : ${glib.bin}/bin
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
)
|
||||
'';
|
||||
|
|
26
pkgs/applications/misc/jot/default.nix
Normal file
26
pkgs/applications/misc/jot/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jot";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "araekiel";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CgS9I05Om4JxAbPN0vxh2Y7dftIkVnZkRP7PY4kOfpw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-8nRO01/hUKT6Jt7/3Sw2+aLU6hITSNl6nn9UEAvfyJY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rapid note management for the terminal";
|
||||
homepage = "https://github.com/araekiel/jot";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
mainProgram = "jt";
|
||||
};
|
||||
}
|
|
@ -1,32 +1,71 @@
|
|||
{ lib, stdenv, pkgs, python3, fetchpatch, glibcLocales, installShellFiles }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glibcLocales
|
||||
, installShellFiles
|
||||
, python3
|
||||
}:
|
||||
|
||||
with python3.pkgs; buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "khal";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Tu+3rDAqJthgbbOSgXWHpO2UwnoVvy6iEWFKRk/PDHY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pimutils";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FneJmoAOb7WjSgluCwlspf27IU3MsQZFKryL9OSSsUw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
glibcLocales
|
||||
installShellFiles
|
||||
] ++ (with python3.pkgs; [
|
||||
setuptools-scm
|
||||
sphinx
|
||||
sphinxcontrib_newsfeed
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs;[
|
||||
atomicwrites
|
||||
click
|
||||
click-log
|
||||
configobj
|
||||
python-dateutil
|
||||
freezegun
|
||||
icalendar
|
||||
lxml
|
||||
pkginfo
|
||||
pkgs.vdirsyncer
|
||||
python-dateutil
|
||||
pytz
|
||||
pyxdg
|
||||
requests-toolbelt
|
||||
tzlocal
|
||||
urwid
|
||||
pkginfo
|
||||
freezegun
|
||||
];
|
||||
nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed installShellFiles ];
|
||||
|
||||
checkInputs = with python3.pkgs;[
|
||||
freezegun
|
||||
hypothesis
|
||||
packaging
|
||||
pytestCheckHook
|
||||
vdirsyncer
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Tests working with latest pytz version, https://github.com/pimutils/khal/pull/1183
|
||||
(fetchpatch {
|
||||
name = "support-later-pytz.patch";
|
||||
url = "https://github.com/pimutils/khal/commit/53eb8a7426d5c09478c78d809c4df4391438e246.patch";
|
||||
sha256 = "sha256-drGtvJlQ3qFUdeukRWCFycPSZGWG/FSRqnbwJzFKITc=";
|
||||
excludes = [
|
||||
"CHANGELOG.rst"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# shell completions
|
||||
|
@ -38,19 +77,14 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
# man page
|
||||
PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \
|
||||
make -C doc man
|
||||
install -Dm755 doc/build/man/khal.1 -t $out/share/man/man1
|
||||
installManPage doc/build/man/khal.1
|
||||
|
||||
# desktop
|
||||
# .desktop file
|
||||
install -Dm755 misc/khal.desktop -t $out/share/applications
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.isAarch64;
|
||||
|
||||
checkInputs = [
|
||||
glibcLocales
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
disabledTests = [
|
||||
|
@ -59,10 +93,10 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "http://lostpackets.de/khal/";
|
||||
description = "CLI calendar application";
|
||||
homepage = "http://lostpackets.de/khal/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
{ pname
|
||||
, program
|
||||
, src
|
||||
, year
|
||||
, version
|
||||
, desktopName
|
||||
, longDescription
|
||||
, buildFHSUserEnv
|
||||
, extraBuildInputs ? []
|
||||
, extraBuildInputs ? [ ]
|
||||
, jdk
|
||||
, stdenv
|
||||
, lib
|
||||
, dpkg
|
||||
|
@ -14,7 +16,6 @@
|
|||
, autoPatchelfHook
|
||||
, sane-backends
|
||||
, cups
|
||||
, jdk11
|
||||
}:
|
||||
let
|
||||
thisPackage = stdenv.mkDerivation rec {
|
||||
|
@ -23,7 +24,6 @@ let
|
|||
|
||||
buildInputs = [
|
||||
sane-backends #for libsane.so.1
|
||||
jdk11
|
||||
] ++ extraBuildInputs;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -34,33 +34,33 @@ let
|
|||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "${pname}${year}";
|
||||
name = "${pname}";
|
||||
desktopName = desktopName;
|
||||
genericName = "View and edit PDF files";
|
||||
exec = "${pname} %f";
|
||||
icon = "${pname}${year}";
|
||||
icon = "${pname}";
|
||||
comment = "Views and edits PDF files";
|
||||
mimeTypes = [ "application/pdf" ];
|
||||
categories = [ "Office" ];
|
||||
})
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg-deb -x $src ./${pname}-${version}";
|
||||
unpackCmd = "dpkg-deb -x $src ./${program}-${version}";
|
||||
dontBuild = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
|
||||
substituteInPlace opt/${pname}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
|
||||
substituteInPlace opt/${program}${year}/${program}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk.out}"
|
||||
substituteInPlace opt/${program}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk.out}"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/pixmaps}
|
||||
rm -rf opt/${pname}${year}/jre
|
||||
cp -r opt/${pname}${year} $out/share/
|
||||
ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/
|
||||
ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname}
|
||||
rm -rf opt/${program}${year}/jre
|
||||
cp -r opt/${program}${year} $out/share/
|
||||
ln -s $out/share/${program}${year}/.install4j/${program}${year}.png $out/share/pixmaps/${pname}.png
|
||||
ln -s $out/share/${program}${year}/${program}${year} $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
@ -74,7 +74,7 @@ buildFHSUserEnv {
|
|||
cups
|
||||
thisPackage
|
||||
];
|
||||
runScript = pname;
|
||||
runScript = "${program}${year}";
|
||||
|
||||
# link desktop item and icon into FHS user environment
|
||||
extraInstallCommands = ''
|
||||
|
|
|
@ -1,42 +1,69 @@
|
|||
{ program ? "pdfstudioviewer"
|
||||
# For upstream versions, download links, and change logs see https://www.qoppa.com/pdfstudio/versions
|
||||
#
|
||||
# PDF Studio license is for a specific year, so we need different packages for different years.
|
||||
# All versions of PDF Studio Viewer are free, so we package only the latest year.
|
||||
# Thus, packages are pdfstudioviewer, pdfstudio2021, pdfstudio2022, etc.
|
||||
# Variables:
|
||||
# - program is either "pdfstudio" or "pdfstudioviewer", defaults to "pdfstudio".
|
||||
# - year identifies the year portion of the version, defaults to most recent year.
|
||||
# - pname is either "pdfstudio${year}" or "pdfstudioviewer".
|
||||
|
||||
{ program ? "pdfstudio"
|
||||
, year ? "2022"
|
||||
, fetchurl
|
||||
, libgccjit
|
||||
, callPackage
|
||||
, jdk11
|
||||
, jdk17
|
||||
}:
|
||||
|
||||
let makeurl = { pname, year, version }: "https://download.qoppa.com/${pname}/v${year}/${
|
||||
builtins.replaceStrings [ "pdfstudio" "viewer" "." ] [ "PDFStudio" "Viewer" "_" ] "${pname}_v${version}"
|
||||
}_linux64.deb";
|
||||
let
|
||||
longDescription = ''
|
||||
PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer.
|
||||
'';
|
||||
pname = if (program == "pdfstudio") then "${program}${year}" else program;
|
||||
desktopName =
|
||||
if (program == "pdfstudio")
|
||||
then "PDF Studio ${year}"
|
||||
else "PDF Studio Viewer";
|
||||
dot2dash = str: builtins.replaceStrings [ "." ] [ "_" ] str;
|
||||
in
|
||||
{
|
||||
pdfstudio = callPackage ./common.nix rec {
|
||||
pname = program;
|
||||
year = "2021";
|
||||
version = "${year}.2.0";
|
||||
desktopName = "PDF Studio";
|
||||
longDescription = ''
|
||||
PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer.
|
||||
'';
|
||||
extraBuildInputs = [
|
||||
libgccjit #for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
src = fetchurl {
|
||||
url = makeurl { inherit pname year version; };
|
||||
sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU=";
|
||||
};
|
||||
};
|
||||
|
||||
pdfstudioviewer = callPackage ./common.nix rec {
|
||||
pname = program;
|
||||
year = "2021";
|
||||
version = "${year}.2.0";
|
||||
desktopName = "PDF Studio Viewer";
|
||||
inherit desktopName pname program year;
|
||||
version = "${year}.0.2";
|
||||
longDescription = ''
|
||||
PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
|
||||
'';
|
||||
src = fetchurl {
|
||||
url = makeurl { inherit pname year version; };
|
||||
sha256 = "sha256-RjVfl3wRK4bqNwSZr2R0CNx4urHTL0QLmKdogEnySWU=";
|
||||
url = "https://web.archive.org/web/20220909093140/https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb";
|
||||
sha256 = "sha256-za+a5vGkINLFvFoZdnB++4VGE9rfdfZf5HFNw/Af1AA=";
|
||||
};
|
||||
jdk = jdk11;
|
||||
};
|
||||
}.${program}
|
||||
|
||||
pdfstudio2021 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
libgccjit #for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
jdk = jdk11;
|
||||
};
|
||||
|
||||
pdfstudio2022 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64_adoptium17.deb";
|
||||
sha256 = "sha256-fWZXCyizP++pkmC+UpgCzGvb0QrNs4RI6iC4ZBL8hLE=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
libgccjit #for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
jdk = jdk17;
|
||||
};
|
||||
}.${pname}
|
||||
|
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/whalebird \
|
||||
--add-flags $out/opt/Whalebird/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -177,7 +177,7 @@ stdenv.mkDerivation rec {
|
|||
${optionalString (disableFeatures != []) ''
|
||||
--add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"
|
||||
''}
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
${optionalString vulkanSupport ''
|
||||
--prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share"
|
||||
--add-flags ${escapeShellArg commandLineArgs}
|
||||
|
|
|
@ -184,7 +184,7 @@ in stdenv.mkDerivation {
|
|||
mkdir -p "$out/bin"
|
||||
|
||||
makeWrapper "${browserBinary}" "$out/bin/chromium" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags ${escapeShellArg commandLineArgs}
|
||||
|
||||
ed -v -s "$out/bin/chromium" << EOF
|
||||
|
|
|
@ -148,7 +148,7 @@ in stdenv.mkDerivation {
|
|||
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
|
||||
--set CHROME_WRAPPER "google-chrome-$dist" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags ${escapeShellArg commandLineArgs}
|
||||
|
||||
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do
|
||||
|
|
|
@ -29,32 +29,32 @@
|
|||
"version": "0.1.1"
|
||||
},
|
||||
"aiven": {
|
||||
"hash": "sha256-FjCcUC06iDeKaHSlQPNuKdqEhA8ft4MQ+sY3YPlNY6E=",
|
||||
"hash": "sha256-ceicNERNIM6KDjSXF/D3NG1aTC2Mhlhbq56QbsJUuF4=",
|
||||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v3.6.0",
|
||||
"vendorHash": "sha256-X9AJM4OsJ2/zl2Mm6gaz5wA6hk9AfOlUFYYN9Ojirrc=",
|
||||
"version": "3.6.0"
|
||||
"rev": "v3.7.0",
|
||||
"vendorHash": "sha256-4fbbbJnWzJ4DF3YjkeH/mqS45LVc5yg7zSC9V8jGbXo=",
|
||||
"version": "3.7.0"
|
||||
},
|
||||
"akamai": {
|
||||
"hash": "sha256-rUVSXaxC71nb32o2zShm9/SoUN+UoD2CQadifZWXWR8=",
|
||||
"hash": "sha256-XlL8UcfZI1oxGti2Hr4mgmu34qbyPG5yJJ+h8ndgo/k=",
|
||||
"owner": "akamai",
|
||||
"provider-source-address": "registry.terraform.io/akamai/akamai",
|
||||
"repo": "terraform-provider-akamai",
|
||||
"rev": "v2.3.0",
|
||||
"vendorHash": "sha256-lqoPXrnihdewqyByfl2y6mH3AHlELz2ZIdIE7v/ljrE=",
|
||||
"version": "2.3.0"
|
||||
"rev": "v2.4.1",
|
||||
"vendorHash": "sha256-BRPDsb0h9YINJ4dwGM5FEuUto3UFVImRUn/i6gHAkAc=",
|
||||
"version": "2.4.1"
|
||||
},
|
||||
"alicloud": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-ubALJacK0vHndZGarGWus+S2EmRRL0XaX1/ORgBPejs=",
|
||||
"hash": "sha256-lJsCXLSIbb/jLjNsvU0GFljlrKBR2TDDOGXDhBTaIKI=",
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.186.0",
|
||||
"vendorHash": "sha256-TUcwNiS+WpvoLQWzAqdPDHqnNVrnAI2h6UkC6YsfG/s=",
|
||||
"version": "1.186.0"
|
||||
"rev": "v1.187.0",
|
||||
"vendorHash": "sha256-aiybvpps/TyrMRP8vbfhBAUO+9kR7WWrgo1kOWKTj24=",
|
||||
"version": "1.187.0"
|
||||
},
|
||||
"ansible": {
|
||||
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
|
||||
|
@ -93,40 +93,40 @@
|
|||
"version": "22.1.1"
|
||||
},
|
||||
"aviatrix": {
|
||||
"hash": "sha256-vLB6bMyjiZiebQWmnzSBW7geFW0ghCBba3YTteVzbII=",
|
||||
"hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=",
|
||||
"owner": "AviatrixSystems",
|
||||
"provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix",
|
||||
"repo": "terraform-provider-aviatrix",
|
||||
"rev": "v2.24.0",
|
||||
"rev": "v2.24.1",
|
||||
"vendorHash": null,
|
||||
"version": "2.24.0"
|
||||
"version": "2.24.1"
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-nIFfPAuRZv+deLHDhOhl27TcIkVFIrI704RmlK9fH38=",
|
||||
"hash": "sha256-btpN208sQQLCq5yj4w23AHbEG+ylX3o7GB5DHmGIrw0=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.32.0",
|
||||
"vendorHash": "sha256-qnh28bbG5k6jMUepcxtgDWk1DptQiXjkg702QtYIM28=",
|
||||
"version": "4.32.0"
|
||||
"rev": "v4.33.0",
|
||||
"vendorHash": "sha256-bQrf5s/6GPOfW5iYO7gBdSoxSnKRDUEoSVIn+NPQH20=",
|
||||
"version": "4.33.0"
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-r7trdPrlvZ5rW75L7AEkG1baQaLMXnZ48Axi552nPIM=",
|
||||
"hash": "sha256-rj/ODxmuK0Ro1KVHh4onR/evtUdKzay9BpQDgrx+eNA=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.28.1",
|
||||
"rev": "v2.29.0",
|
||||
"vendorHash": null,
|
||||
"version": "2.28.1"
|
||||
"version": "2.29.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-5HMy28/AnUH+18i5eBm1OjQZElvrXsWd6jwQteFCpR4=",
|
||||
"hash": "sha256-dBrmoxkQ4KlAM3gW5JRMy96nI7BJ5UH647yZkAViosk=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.24.0",
|
||||
"rev": "v3.25.0",
|
||||
"vendorHash": null,
|
||||
"version": "3.24.0"
|
||||
"version": "3.25.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
|
||||
|
@ -139,22 +139,22 @@
|
|||
},
|
||||
"baiducloud": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-0tu+WwL5aZVhmQs30KwY7ctlPqhcYb179QVLI3wGedw=",
|
||||
"hash": "sha256-LaehOof8T2LGgn6Q/oo+SPcld9QRVk+MjaEJnYvNNnQ=",
|
||||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.15.9",
|
||||
"rev": "v1.15.10",
|
||||
"vendorHash": "sha256-v07NMx8caXvY97FefNnRV7gMQbUq4k2ZmE5huqqe354=",
|
||||
"version": "1.15.9"
|
||||
"version": "1.15.10"
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-fh1RRl+NLKTLLFUGK5gkWqWMCzUwHBFk69Tc0JIuFgs=",
|
||||
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
|
||||
"owner": "F5Networks",
|
||||
"provider-source-address": "registry.terraform.io/F5Networks/bigip",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.15.1",
|
||||
"rev": "v1.15.2",
|
||||
"vendorHash": null,
|
||||
"version": "1.15.1"
|
||||
"version": "1.15.2"
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-arNkR67rsqxVV2omEV9MWQmDO95PLuoVicifLjEfBTM=",
|
||||
|
@ -166,13 +166,13 @@
|
|||
"version": "2.21.2"
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-UUDL1w/3IEa+Na77FoYReevJLT3AJq5giHYS6Bq4DQs=",
|
||||
"hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=",
|
||||
"owner": "brightbox",
|
||||
"provider-source-address": "registry.terraform.io/brightbox/brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v3.0.4",
|
||||
"vendorHash": "sha256-M/S7gRRcAs53Ctx1oecHrlTxYxI1Kpr3ygTZLHG/9pY=",
|
||||
"version": "3.0.4"
|
||||
"rev": "v3.0.5",
|
||||
"vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=",
|
||||
"version": "3.0.5"
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=",
|
||||
|
@ -287,13 +287,13 @@
|
|||
"version": "0.11.0"
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-lHZURLE8woJzFVuuDFxSciyrt7rTAgvR7rF4INEGoVI=",
|
||||
"hash": "sha256-viQDfs3xOsGOsRmTB6LkdN1JPc95UYpQ6et2ud+Or94=",
|
||||
"owner": "DataDog",
|
||||
"provider-source-address": "registry.terraform.io/DataDog/datadog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.15.1",
|
||||
"vendorHash": "sha256-X8X3nX+xHAqSb+j0P0PJ366MAFGRvUmcu/qYQqMI+0U=",
|
||||
"version": "3.15.1"
|
||||
"rev": "v3.16.0",
|
||||
"vendorHash": "sha256-U533VGe37ItG5EK+fJo8Nj8t1MhDAHdT03ghQLL3WzI=",
|
||||
"version": "3.16.0"
|
||||
},
|
||||
"dhall": {
|
||||
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
|
||||
|
@ -332,13 +332,13 @@
|
|||
"version": "3.2.3"
|
||||
},
|
||||
"dnsimple": {
|
||||
"hash": "sha256-O64xOyGXLcCFy8rBR9QDzcYDi2fm2AHIObDyOJ33ZmA=",
|
||||
"hash": "sha256-dge7slNS1EkWwjt3+WS8tlKjFHw6LV/q1Bxrl1RflBw=",
|
||||
"owner": "dnsimple",
|
||||
"provider-source-address": "registry.terraform.io/dnsimple/dnsimple",
|
||||
"repo": "terraform-provider-dnsimple",
|
||||
"rev": "v0.14.0",
|
||||
"rev": "v0.14.1",
|
||||
"vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=",
|
||||
"version": "0.14.0"
|
||||
"version": "0.14.1"
|
||||
},
|
||||
"docker": {
|
||||
"hash": "sha256-hUKe9VjaNbiPhbxyFKly5PlKWngU2pl6ygwRJSokxr8=",
|
||||
|
@ -359,13 +359,13 @@
|
|||
"version": "2.0.4"
|
||||
},
|
||||
"equinix": {
|
||||
"hash": "sha256-rawuS0k6f727/4zODo2+tWwEvtJ7mU7Fatm1vFVRVkc=",
|
||||
"hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=",
|
||||
"owner": "equinix",
|
||||
"provider-source-address": "registry.terraform.io/equinix/equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v1.9.0",
|
||||
"vendorHash": "sha256-mrX0PWvND/DiQ4QruWpG6hx+AimV5I1zfpsyigzWl/8=",
|
||||
"version": "1.9.0"
|
||||
"rev": "v1.10.0",
|
||||
"vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=",
|
||||
"version": "1.10.0"
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-d+CMg3wYHsOYow8LG7P+qcszUBiCbNwEp1zCJN7yZKo=",
|
||||
|
@ -395,13 +395,13 @@
|
|||
"version": "2.3.2"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"hash": "sha256-zO5bt17cwMnv6kk1McRPOrs4UJ15MBpTRT2WoDovXG4=",
|
||||
"hash": "sha256-2eXNumT1Hkc33bW635qYr5jxlByX+yZ8zSKRpgKWQJo=",
|
||||
"owner": "FlexibleEngineCloud",
|
||||
"provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",
|
||||
"repo": "terraform-provider-flexibleengine",
|
||||
"rev": "v1.32.0",
|
||||
"vendorHash": "sha256-jX98VUNTOa0C9WiAiFUiFQ9W7vhRdXCgmmxz84CmEpw=",
|
||||
"version": "1.32.0"
|
||||
"rev": "v1.33.0",
|
||||
"vendorHash": "sha256-smk44z0q2Ku9iO+74vhb/gk5DvdaJe/wDFg7EtQEh/E=",
|
||||
"version": "1.33.0"
|
||||
},
|
||||
"fortios": {
|
||||
"deleteVendor": true,
|
||||
|
@ -415,13 +415,13 @@
|
|||
"version": "1.15.0"
|
||||
},
|
||||
"gandi": {
|
||||
"hash": "sha256-TAigFxgn8OufZTXCBhjURLcUaVvOWvNXonn/QV+Bt6I=",
|
||||
"hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=",
|
||||
"owner": "go-gandi",
|
||||
"provider-source-address": "registry.terraform.io/go-gandi/gandi",
|
||||
"repo": "terraform-provider-gandi",
|
||||
"rev": "v2.1.0",
|
||||
"vendorHash": "sha256-qDsBI+EruukMnLlLojC2An7lTafQoCkUQU+guhgctSk=",
|
||||
"version": "2.1.0"
|
||||
"rev": "v2.2.0",
|
||||
"vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-NJ5HvW3LOvshzea7t0/sAsp3SqiXErXd32Ej0Qp4zsk=",
|
||||
|
@ -442,24 +442,24 @@
|
|||
"version": "3.18.0"
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-BNLgY5mvtBu2Zfa5Caw5EMzMyZXsmjl6V5LOqrXgz78=",
|
||||
"hash": "sha256-RveRVr5IdZrBX9uF0q0wyx/sh+cNBDp9CAv3zXOdATQ=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.37.0",
|
||||
"rev": "v4.38.0",
|
||||
"vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=",
|
||||
"version": "4.37.0"
|
||||
"version": "4.38.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-hqcpJELpYz9rkjndzhMRveGZKWH/1Pjea9lw7NfTC6c=",
|
||||
"hash": "sha256-zQ8GgmWM3frLTstcrO0GKBWk1pMQTNMqxDGH9EmlzcQ=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.37.0",
|
||||
"rev": "v4.38.0",
|
||||
"vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=",
|
||||
"version": "4.37.0"
|
||||
"version": "4.38.0"
|
||||
},
|
||||
"googleworkspace": {
|
||||
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
|
||||
|
@ -498,13 +498,13 @@
|
|||
"version": "1.35.2"
|
||||
},
|
||||
"helm": {
|
||||
"hash": "sha256-OzxTPxk3lfmA13KfDGBvDd1AqCsKRw+bv7QiEo9fPQc=",
|
||||
"hash": "sha256-oX6pchJcgv9w5xLGe09GBzngz9+a/OZn6FTBWURgiLk=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/helm",
|
||||
"repo": "terraform-provider-helm",
|
||||
"rev": "v2.6.0",
|
||||
"rev": "v2.7.0",
|
||||
"vendorHash": null,
|
||||
"version": "2.6.0"
|
||||
"version": "2.7.0"
|
||||
},
|
||||
"heroku": {
|
||||
"hash": "sha256-n6M7i7zompAGRoP9WxrcWdBHsK2RssfTgCKsvAE5XZM=",
|
||||
|
@ -544,13 +544,13 @@
|
|||
"version": "3.1.0"
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-idfHSXXicEeQqjoJGkRDr78Bq00bHz2OtqLlVqehZz8=",
|
||||
"hash": "sha256-Hr60bx3fGpfSxQAwGckhmZ80Iw/bPKLNDXeVXV1GTdo=",
|
||||
"owner": "huaweicloud",
|
||||
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.40.2",
|
||||
"rev": "v1.41.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.40.2"
|
||||
"version": "1.41.0"
|
||||
},
|
||||
"huaweicloudstack": {
|
||||
"hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=",
|
||||
|
@ -571,13 +571,13 @@
|
|||
"version": "0.1.2"
|
||||
},
|
||||
"ibm": {
|
||||
"hash": "sha256-wKs9WWajz08u3EXNmevVLnXxBIY4FBazLuDYyPBPH3I=",
|
||||
"hash": "sha256-zcc7xUSTntTC0vLFBEW1PvvkSEtzD5VkKy/Jq8x5zKk=",
|
||||
"owner": "IBM-Cloud",
|
||||
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.45.0",
|
||||
"rev": "v1.45.1",
|
||||
"vendorHash": "sha256-FAoRQxnc/vD5KYp0hb6iWGbZiWEtLzEr6R+vdruitKc=",
|
||||
"version": "1.45.0"
|
||||
"version": "1.45.1"
|
||||
},
|
||||
"icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
|
@ -625,13 +625,13 @@
|
|||
"version": "3.10.0"
|
||||
},
|
||||
"ksyun": {
|
||||
"hash": "sha256-3iK17ZiYrQOnfZwFIL/4FF+My5vieszlm2V8reTDEWM=",
|
||||
"hash": "sha256-y7F6eCyiYVtiBaHCaZyUUPAE9GkKo/m/OY98EeBd8DU=",
|
||||
"owner": "kingsoftcloud",
|
||||
"provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
|
||||
"repo": "terraform-provider-ksyun",
|
||||
"rev": "v1.3.52",
|
||||
"vendorHash": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=",
|
||||
"version": "1.3.52"
|
||||
"rev": "v1.3.54",
|
||||
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=",
|
||||
"version": "1.3.54"
|
||||
},
|
||||
"kubectl": {
|
||||
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
|
||||
|
@ -697,13 +697,13 @@
|
|||
"version": "2.2.3"
|
||||
},
|
||||
"logicmonitor": {
|
||||
"hash": "sha256-F22tBNnH8dvSjrd0Wx+bAfiiQ9emJjHGXn3x4mQKH5E=",
|
||||
"hash": "sha256-GQPTFf+JxJB3iO1Us0zOAAG2NonuJ/b5la6f1j2Nd4k=",
|
||||
"owner": "logicmonitor",
|
||||
"provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor",
|
||||
"repo": "terraform-provider-logicmonitor",
|
||||
"rev": "v2.0.2",
|
||||
"rev": "v2.0.3",
|
||||
"vendorHash": null,
|
||||
"version": "2.0.2"
|
||||
"version": "2.0.3"
|
||||
},
|
||||
"lxd": {
|
||||
"hash": "sha256-rNqlPyKpBNaIRtiNHB8U8jowWhqdQtDIMxreZ5Dfm3E=",
|
||||
|
@ -834,13 +834,13 @@
|
|||
"version": "1.7.1"
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-qB/sRPvX+srpySJPDWxoZviVFtbVTK9hwAR6D4pyjmc=",
|
||||
"hash": "sha256-x1yrAYq8UXs69QkXMUq7mZ6in8o2+GPaS0EsAjn/pXg=",
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.94.0",
|
||||
"rev": "v4.95.0",
|
||||
"vendorHash": null,
|
||||
"version": "4.94.0"
|
||||
"version": "4.95.0"
|
||||
},
|
||||
"okta": {
|
||||
"hash": "sha256-rgDBZsbXBzBcDgVoaFkPD27Ezef9J23oqtBJAHqJrrE=",
|
||||
|
@ -1050,22 +1050,22 @@
|
|||
"version": "6.17.0"
|
||||
},
|
||||
"skytap": {
|
||||
"hash": "sha256-8hVHtuLBJDBH3z90VoKbbnvCBTrJxCd228veFCO449A=",
|
||||
"hash": "sha256-EAimiuQJOt12baZSjDKI+c9UjJd8e26ouOAZIZezw/I=",
|
||||
"owner": "skytap",
|
||||
"provider-source-address": "registry.terraform.io/skytap/skytap",
|
||||
"repo": "terraform-provider-skytap",
|
||||
"rev": "v0.14.5",
|
||||
"rev": "v0.15.0",
|
||||
"vendorHash": null,
|
||||
"version": "0.14.5"
|
||||
"version": "0.15.0"
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-1aHhiZhswlLzEBkvjFQI7jLPAX2/KLxE0oKLspnRtQI=",
|
||||
"hash": "sha256-i96scuSP7I8rcyncUkpBoxxM0D4zp9rNHqWwb9WLbhA=",
|
||||
"owner": "Snowflake-Labs",
|
||||
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.45.0",
|
||||
"rev": "v0.46.0",
|
||||
"vendorHash": "sha256-43q1SrV7tEt0x7iRUAgBFg1oh8+B9i1i59nlR8kbLIY=",
|
||||
"version": "0.45.0"
|
||||
"version": "0.46.0"
|
||||
},
|
||||
"sops": {
|
||||
"hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=",
|
||||
|
@ -1113,22 +1113,22 @@
|
|||
"version": "2.19.0"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-aC/KtMOl5Ldrlme9Bd4E4UQSLVsKFsJbsL9KMGDmJbo=",
|
||||
"hash": "sha256-SoCXh0pRqEkto2K+ZfN7ncVGDVC32zDElS+rBdOfa0g=",
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.78.0",
|
||||
"rev": "v1.78.3",
|
||||
"vendorHash": null,
|
||||
"version": "1.78.0"
|
||||
"version": "1.78.3"
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-DRbJ1ZmYMkEncZHE12uLcNHhbSnxvyG3IYqlUsxs+pI=",
|
||||
"hash": "sha256-jh5bRe/3OsdgvSpraYEc1NgvBmYb1tFuVSPQ2ZAesSY=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.36.1",
|
||||
"vendorHash": "sha256-KLae79G6owcJiSxSBKRJX3U0cw9vnihnCs0SjRoIn7Y=",
|
||||
"version": "0.36.1"
|
||||
"rev": "v0.37.0",
|
||||
"vendorHash": "sha256-Su5WpKF9zXeGKdaV8TxsTc6OGUYToNnXAbxWaNxS52U=",
|
||||
"version": "0.37.0"
|
||||
},
|
||||
"thunder": {
|
||||
"hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
|
||||
|
|
|
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
wrapProgramShell $out/opt/${binaryName}/${binaryName} \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName}
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram $executable \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"}
|
||||
done
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
# executable wrapper
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation {
|
|||
cp -r bin $out/bin
|
||||
|
||||
wrapProgram $out/bin/session-desktop \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
|
|||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||
)
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ let
|
|||
makeWrapper $out/lib/slack/slack $out/bin/slack \
|
||||
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
|
||||
--suffix PATH : ${lib.makeBinPath [xdg-utils]} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/slack.desktop \
|
||||
|
|
|
@ -62,7 +62,7 @@ in
|
|||
# executable wrapper
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/micropad" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "22.9.1";
|
||||
version = "22.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "sha256-uVcu14Pg9Na3qG05O03IGWp71N994S2zRyTkcSjwhrk=";
|
||||
sha256 = "sha256-9cHCFXVgg7fahbQsVUAxgznyMfx4O42D1qWverucpZ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
|
|
@ -72,10 +72,6 @@ let
|
|||
sha256 = args.cargoSha256;
|
||||
} // depsExtraArgs);
|
||||
|
||||
# If we have a cargoSha256 fixed-output derivation, validate it at build time
|
||||
# against the src fixed-output derivation to check consistency.
|
||||
validateCargoDeps = args ? cargoHash || args ? cargoSha256;
|
||||
|
||||
target = rust.toRustTargetSpec stdenv.hostPlatform;
|
||||
targetIsJSON = lib.hasSuffix ".json" target;
|
||||
useSysroot = targetIsJSON && !__internal_dontAddSysroot;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv }@orig:
|
||||
{ stdenv }:
|
||||
# srcOnly is a utility builder that only fetches and unpacks the given `src`,
|
||||
# maybe pathings it in the process with the optional `patches` and
|
||||
# `buildInputs` attributes.
|
||||
|
|
|
@ -1,17 +1,21 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenv, fetchzip }:
|
||||
|
||||
fetchzip {
|
||||
name = "cooper-hewitt-2014-06-09";
|
||||
stdenv.mkDerivation {
|
||||
pname = "cooper-hewitt";
|
||||
version = "unstable-2014-06-09";
|
||||
|
||||
url = "https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip";
|
||||
src = fetchzip {
|
||||
url = "https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip";
|
||||
hash = "sha256-bTlEXQeYNNspvnNdvQhJn6CNBrcSKYWuNWF/N6+3Vb0=";
|
||||
};
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D -m 644 -t "$out/share/fonts/opentype" *.otf
|
||||
'';
|
||||
|
||||
sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/";
|
||||
description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches";
|
||||
|
|
|
@ -34,7 +34,7 @@ buildType = if stdenv.isDarwin then
|
|||
|
||||
edk2 = buildStdenv.mkDerivation {
|
||||
pname = "edk2";
|
||||
version = "202202";
|
||||
version = "202205";
|
||||
|
||||
patches = [
|
||||
# pass targetPrefix as an env var
|
||||
|
@ -50,7 +50,7 @@ edk2 = buildStdenv.mkDerivation {
|
|||
repo = "edk2";
|
||||
rev = "edk2-stable${edk2.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d";
|
||||
sha256 = "sha256-5V3gXZoePxRVL0miV/ku/HILT7d06E8UI28XRx8vZjA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonEnv ];
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
, pcre
|
||||
, SDL2
|
||||
, sqlite
|
||||
, getconf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -43,11 +44,17 @@ stdenv.mkDerivation rec {
|
|||
sqlite
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ getconf ];
|
||||
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change libhl.dylib $out/lib/libhl.dylib $out/bin/hl
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A virtual machine for Haxe";
|
||||
homepage = "https://hashlink.haxe.org/";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ iblech locallycompact ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ iblech locallycompact logo ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,32 @@
|
|||
*** a/Makefile 1970-01-01 01:00:01.000000000 +0100
|
||||
--- b/Makefile 2022-06-21 23:36:10.023460654 +0200
|
||||
*************** endif
|
||||
*** 109,110 ****
|
||||
--- 109,111 ----
|
||||
LIBOPENAL = -lopenal
|
||||
+ LIBOPENGL = -lGL
|
||||
RELEASE_NAME = linux
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -107,6 +107,7 @@ LIBFLAGS += -L/opt/libjpeg-turbo/lib64
|
||||
endif
|
||||
|
||||
LIBOPENAL = -lopenal
|
||||
+LIBOPENGL = -lGL
|
||||
RELEASE_NAME = linux
|
||||
|
||||
endif
|
||||
--- a/libs/sdl/gl.c
|
||||
+++ b/libs/sdl/gl.c
|
||||
@@ -7,7 +7,7 @@
|
||||
# include <OpenGLES/ES3/gl.h>
|
||||
# define HL_GLES
|
||||
#elif defined(HL_MAC)
|
||||
-# include <SDL.h>
|
||||
+# include <SDL2/SDL.h>
|
||||
# include <OpenGL/gl3.h>
|
||||
# define glBindImageTexture(...) hl_error("Not supported on OSX")
|
||||
# define glDispatchCompute(...) hl_error("Not supported on OSX")
|
||||
--- a/libs/sdl/sdl.c
|
||||
+++ b/libs/sdl/sdl.c
|
||||
@@ -7,7 +7,7 @@
|
||||
# include <SDL.h>
|
||||
# include <SDL_syswm.h>
|
||||
#elif defined(HL_MAC)
|
||||
-# include <SDL.h>
|
||||
+# include <SDL2/SDL.h>
|
||||
#else
|
||||
# include <SDL2/SDL.h>
|
||||
#endif
|
||||
|
|
|
@ -29,5 +29,18 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ malbarbo ];
|
||||
license = licenses.mit;
|
||||
knownVulnerabilities = [
|
||||
# wasm3 expects all wasm code to be pre-validated, any users
|
||||
# should be aware that running unvalidated wasm will potentially
|
||||
# lead to RCE until upstream have added a builtin validator
|
||||
"CVE-2022-39974"
|
||||
"CVE-2022-34529"
|
||||
"CVE-2022-28990"
|
||||
"CVE-2022-28966"
|
||||
"CVE-2021-45947"
|
||||
"CVE-2021-45946"
|
||||
"CVE-2021-45929"
|
||||
"CVE-2021-38592"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxcrypt";
|
||||
|
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-Ohf+RCOXnoCxAFnXXV9e2TCqpfZziQl+FGJTGDSQTF0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for tests on musl is being upstreamed:
|
||||
# https://github.com/besser82/libxcrypt/pull/157
|
||||
# Applied in all environments to prevent patchrot
|
||||
(fetchpatch {
|
||||
url = "https://github.com/besser82/libxcrypt/commit/a4228faa0b96986abc076125cf97d352a063d92f.patch";
|
||||
sha256 = "sha256-iGNz8eer6OkA0yR74WisE6GbFTYyXKw7koXl/R7DhVE=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs autogen.sh
|
||||
./autogen.sh
|
||||
|
|
|
@ -67,8 +67,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "wnG2MjY0DtAhVcEdcxu77tDa4T9Xm2pMYZU2wXLx2OA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "setuptools-gte-62.1.0.patch";
|
||||
url = "https://github.com/apache/thrift/pull/2635/commits/c41ad9d5119e9bdae1746167e77e224f390f2c42.patch";
|
||||
name = "setuptools-gte-62.1.0.patch"; # https://github.com/apache/thrift/pull/2635
|
||||
url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff";
|
||||
hash = "sha256-FkErrg/6vXTomS4AsCsld7t+Iccc55ZiDaNjJ3W1km0=";
|
||||
})
|
||||
];
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wolfssl";
|
||||
version = "5.5.0";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfSSL";
|
||||
repo = "wolfssl";
|
||||
rev = "v${version}-stable";
|
||||
sha256 = "sha256-PqxwWPK5eBcS5d6e0CL4uZHybDye1K8pxniKU99YSAE=";
|
||||
sha256 = "sha256-gDY5uEvV5nNPObrar5Fq2UTW30UZ71CooUwQVJkq4l8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
158
pkgs/development/libraries/wxwidgets/wxGTK32.nix
Normal file
158
pkgs/development/libraries/wxwidgets/wxGTK32.nix
Normal file
|
@ -0,0 +1,158 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, expat
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, gnome2
|
||||
, gst_all_1
|
||||
, gtk3
|
||||
, libGL
|
||||
, libGLU
|
||||
, libSM
|
||||
, libXinerama
|
||||
, libXtst
|
||||
, libXxf86vm
|
||||
, libpng
|
||||
, libtiff
|
||||
, libjpeg_turbo
|
||||
, zlib
|
||||
, pcre2
|
||||
, pkg-config
|
||||
, xorgproto
|
||||
, compat28 ? false
|
||||
, compat30 ? true
|
||||
, unicode ? true
|
||||
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, withWebKit ? stdenv.isDarwin
|
||||
, webkitgtk
|
||||
, setfile
|
||||
, AGL
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, QTKit
|
||||
, AVFoundation
|
||||
, AVKit
|
||||
, WebKit
|
||||
}:
|
||||
let
|
||||
catch = fetchFromGitHub {
|
||||
owner = "wxWidgets";
|
||||
repo = "Catch";
|
||||
rev = "5f5e4cecd1cafc85e109471356dec29e778d2160";
|
||||
hash = "sha256-fB/E17tiAicAkq88Je/YFYohJ6EHJOO54oQaqiR/OzY=";
|
||||
};
|
||||
|
||||
nanosvg = fetchFromGitHub {
|
||||
owner = "wxWidgets";
|
||||
repo = "nanosvg";
|
||||
rev = "ccdb1995134d340a93fb20e3a3d323ccb3838dd0";
|
||||
hash = "sha256-ymziU0NgGqxPOKHwGm0QyEdK/8jL/QYk5UdIQ3Tn8jw=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxwidgets";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxWidgets";
|
||||
repo = "wxWidgets";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k6td/8pF7ad7+gVm7L0jX79fHKwR7/qrOBpSFggyaI0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gstreamer
|
||||
libpng
|
||||
libtiff
|
||||
libjpeg_turbo
|
||||
zlib
|
||||
pcre2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
gtk3
|
||||
libSM
|
||||
libXinerama
|
||||
libXtst
|
||||
libXxf86vm
|
||||
xorgproto
|
||||
]
|
||||
++ lib.optional withMesa libGLU
|
||||
++ lib.optional (withWebKit && stdenv.isLinux) webkitgtk
|
||||
++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
expat
|
||||
setfile
|
||||
Carbon
|
||||
Cocoa
|
||||
Kernel
|
||||
QTKit
|
||||
AVFoundation
|
||||
AVKit
|
||||
WebKit
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-precomp-headers"
|
||||
# This is the default option, but be explicit
|
||||
"--disable-monolithic"
|
||||
"--enable-mediactrl"
|
||||
"--with-nanosvg"
|
||||
(if compat28 then "--enable-compat28" else "--disable-compat28")
|
||||
(if compat30 then "--enable-compat30" else "--disable-compat30")
|
||||
] ++ lib.optional unicode "--enable-unicode"
|
||||
++ lib.optional withMesa "--with-opengl"
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"--with-osx_cocoa"
|
||||
"--with-libiconv"
|
||||
] ++ lib.optionals withWebKit [
|
||||
"--enable-webview"
|
||||
"--enable-webviewwebkit"
|
||||
];
|
||||
|
||||
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib";
|
||||
|
||||
preConfigure = ''
|
||||
cp -r ${catch}/* 3rdparty/catch/
|
||||
cp -r ${nanosvg}/* 3rdparty/nanosvg/
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure \
|
||||
--replace 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
|
||||
substituteInPlace configure \
|
||||
--replace "-framework System" "-lSystem"
|
||||
'';
|
||||
|
||||
postInstall = "
|
||||
pushd $out/include
|
||||
ln -s wx-*/* .
|
||||
popd
|
||||
";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
inherit compat28 compat30 unicode;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.wxwidgets.org/";
|
||||
description = "A Cross-Platform C++ GUI Library";
|
||||
longDescription = ''
|
||||
wxWidgets gives you a single, easy-to-use API for writing GUI applications
|
||||
on multiple platforms that still utilize the native platform's controls
|
||||
and utilities. Link with the appropriate library for your platform and
|
||||
compiler, and your application will adopt the look and feel appropriate to
|
||||
that platform. On top of great GUI functionality, wxWidgets gives you:
|
||||
online help, network programming, streams, clipboard and drag and drop,
|
||||
multithreading, image loading and saving in a variety of popular formats,
|
||||
database support, HTML viewing and printing, and much more.
|
||||
'';
|
||||
license = licenses.wxWindows;
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -28,7 +28,7 @@ let
|
|||
in
|
||||
buildDunePackage rec {
|
||||
pname = "mldoc";
|
||||
version = "1.4.8";
|
||||
version = "1.4.9";
|
||||
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
|
@ -36,7 +36,7 @@ buildDunePackage rec {
|
|||
owner = "logseq";
|
||||
repo = "mldoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-263/TQ8+Ihv6bCWnq4hA5Yk6mtokb3312dJrJ8U1QQs=";
|
||||
sha256 = "sha256-jKZ4ejskngXb03EnHBlqRKC5xeNHJ32n73y1zQP9CiM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "1.5.12";
|
||||
version = "2.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-v29esQUrrpF8PGafu9LF/rN/W8xRSIe+H9V+R4toPxk=";
|
||||
hash = "sha256-yuZKgDbdxQ7pGGLVB1/B3cD3Ep08uE9jjCqVzc+DF3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioswitcher";
|
||||
version = "3.0.0";
|
||||
version = "3.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomerFi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-zJS09YQRMv3B0daW0cgBRPoLQkPyGuBgMohf6E2yqaM=";
|
||||
hash = "sha256-CHyJuIqJpO7wUmOyeDXa4oBvxMthC96OCECtg13gqe0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -54,7 +54,9 @@ buildPythonPackage rec {
|
|||
"test_hexadecimale_timestamp_to_localtime_with_the_current_timestamp_should_return_a_time_string"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioswitcher" ];
|
||||
pythonImportsCheck = [
|
||||
"aioswitcher"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to interact with Switcher water heater";
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowebostv";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -15,8 +15,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A7GiAQIuEXmCfo2pDJESCdAEaLumi1ACXnBMdGKwSvE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r/XdxF7/g6uDQIATi/OC6lNTUtBZg1jdgZHZilPPFNc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "22.8.0";
|
||||
version = "22.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-peSGe9ycxVD2ve8tFpmznQZr3Hrc1KimeVlThmd0NFo=";
|
||||
sha256 = "sha256-OQArggd7210OyFpZKm3kr3fFbakIDG7U3WBNImAAobw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
, aiohttp
|
||||
, flask
|
||||
, mock
|
||||
, msrest
|
||||
, pytest
|
||||
, pytest-asyncio
|
||||
, pytest-trio
|
||||
|
@ -39,7 +38,6 @@ buildPythonPackage rec {
|
|||
aiohttp
|
||||
flask
|
||||
mock
|
||||
msrest
|
||||
pytest
|
||||
pytest-trio
|
||||
pytest-asyncio
|
||||
|
@ -78,6 +76,11 @@ buildPythonPackage rec {
|
|||
"tests/testserver_tests/"
|
||||
# requires missing pytest plugin
|
||||
"tests/async_tests/test_rest_asyncio_transport.py"
|
||||
# needs msrest, which cannot be included in checkInputs due to circular dependency new in msrest 0.7.1
|
||||
# azure-core needs msrest which needs azure-core
|
||||
"tests/test_polling.py"
|
||||
"tests/async_tests/test_base_polling_async.py"
|
||||
"tests/async_tests/test_polling_async.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boxx";
|
||||
version = "0.10.6";
|
||||
version = "0.10.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-npPwYhDTujBpTnPyhvZbA+EK4jU8nnHSBgSw9xlTcJM=";
|
||||
hash = "sha256-OPbqCsTZZskZOJMcK1OJsG3Qgx4K0X217g5pNWQZDAM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casa-formats-io";
|
||||
version = "0.2";
|
||||
version = "0.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-omDPTR/RRHosOF+ejZzuGUBO1LAN/SefNQsvnXxezOQ=";
|
||||
sha256 = "sha256-8iZ+wcSfh5ACTb3/iQAf2qQpwZ6wExWwcdJoLmCEjB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
@ -33,4 +33,3 @@ buildPythonPackage rec {
|
|||
maintainers = with lib.maintainers; [ smaret ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -3,15 +3,19 @@
|
|||
, fetchPypi
|
||||
, requests
|
||||
, ciso8601
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dwdwfsapi";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8541eb93a6323bec6a2281aa06667e72b02c8e5fac40f899c402089b1c774472";
|
||||
hash = "sha256-zeSV2acjtSWUYnrMjEBtrSPlXRvrNQRX5SYPYHnaOy0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -22,7 +26,9 @@ buildPythonPackage rec {
|
|||
# All tests require network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "dwdwfsapi" ];
|
||||
pythonImportsCheck = [
|
||||
"dwdwfsapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client to retrieve data provided by DWD via their geoserver WFS API";
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fjaraskupan";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "elupus";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-i7816KJraHkrXKYA+vhKMs5xhXksnYc2uYiE0pPEicw=";
|
||||
hash = "sha256-Vt2THMB4m0YCLdfEnAokwS0oJfcgp3fmZMUDhTrekZY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "govee-ble";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KMWz/CiF0Xti8G31T6JAJfUJEUpBa5QczjrQeA2KcrA=";
|
||||
hash = "sha256-3uYAyItZ1X18pw3h3rTJpcv2H7O+e4sFCv1R7vb8QPI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,18 +14,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hdbscan";
|
||||
version = "0.8.27";
|
||||
version = "0.8.28";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26";
|
||||
sha256 = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo=";
|
||||
};
|
||||
patches = [
|
||||
# This patch fixes compatibility with numpy 1.20. It will be in the next release
|
||||
# after 0.8.27
|
||||
# should be included in next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scikit-learn-contrib/hdbscan/commit/5b67a4fba39c5aebe8187a6a418da677f89a63e0.patch";
|
||||
sha256 = "07d7jdwk0b8kgaqkifd529sarji01j1jiih7cfccc5kxmlb5py9h";
|
||||
name = "joblib-1.2.0-compat.patch";
|
||||
url = "https://github.com/scikit-learn-contrib/hdbscan/commit/d829c639923f6866e1917e46ddbde45b513913f3.patch";
|
||||
excludes = [
|
||||
"docs/basic_hdbscan.rst"
|
||||
"docs/how_hdbscan_works.rst"
|
||||
];
|
||||
sha256 = "sha256-t0D4OsHEcMwmBZM8Mk1N0uAKi6ra+TOzEks9/efsvWI=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hstspreload";
|
||||
version = "2022.8.1";
|
||||
version = "2022.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lQ28j4vOtxSjkMZXTKG+vesAN9KWj5T4sZ3QbaWP9Gw=";
|
||||
sha256 = "sha256-P9aVJUkGUpghAHcJ3OQSbpx3TpkhJU7Lxp0n/RsJBYI=";
|
||||
};
|
||||
|
||||
# Tests require network connection
|
||||
|
|
|
@ -9,20 +9,21 @@
|
|||
, lz4
|
||||
, setuptools
|
||||
, sphinx
|
||||
, psutil
|
||||
}:
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "joblib";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4158fcecd13733f8be669be0683b96ebdbbd38d23559f54dca7205aea1bf1e35";
|
||||
sha256 = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg=";
|
||||
};
|
||||
|
||||
checkInputs = [ sphinx numpydoc pytestCheckHook ];
|
||||
checkInputs = [ sphinx numpydoc pytestCheckHook psutil ];
|
||||
propagatedBuildInputs = [ lz4 setuptools ];
|
||||
|
||||
pytestFlagsArray = [ "joblib/test" ];
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lxmf";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "markqvist";
|
||||
repo = "lxmf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SRDUFDtXJ1ZkX8A4ekF+YSOnxj/vsFsvr3W/LOIuerg=";
|
||||
hash = "sha256-NwjijbRSg9RYl1NS5dXAG4HohkZx5oeEyMyvEFYQhYk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, aiodns
|
||||
, aiohttp
|
||||
, azure-core
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, fetchFromGitHub
|
||||
|
@ -16,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "msrest";
|
||||
version = "0.6.21";
|
||||
version = "0.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -24,11 +25,13 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "msrest-for-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IlBwlVQ/v+vJmCWNbFZKGL6a9K09z4AYrPm3kwaA/nI=";
|
||||
# no tag for 0.7.1
|
||||
rev = "2d8fd04f68a124d0f3df7b81584accc3270b1afc";
|
||||
hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-core
|
||||
aiodns
|
||||
aiohttp
|
||||
certifi
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nomadnet";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "markqvist";
|
||||
repo = "NomadNet";
|
||||
rev = version;
|
||||
hash = "sha256-VNfsuCN251C+6uvywosHmuz76f263wCeIisQldvFRVg=";
|
||||
hash = "sha256-NCnf50li0RZa8RCDutS1s7DfLfOK3RjEeJ4QvQzqsHs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "6.0.0";
|
||||
version = "6.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CnL/oF85efwFKtj1ol+6zjKv07IhFQetYUCXbbbFqn8=";
|
||||
hash = "sha256-GaN/3WbuXc5p/+VhFngSX6aKnxMj72pyeB9HaA+PbCo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.22.1";
|
||||
version = "0.23.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-vgHfdfyKzabYdsHtCMXcfQexYYxw17bKjNr8wSPBFvI=";
|
||||
sha256 = "sha256-nLJLp5LnsluZe/pzLvycvjPmPYXGGobZaS5kI70CVa8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylutron-caseta";
|
||||
version = "0.15.2";
|
||||
version = "0.16.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "gurumitts";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dw/uCEY4+kpgNjbjgvw+kSfluziIK6NvIKo5QIjt+GQ=";
|
||||
hash = "sha256-QASVifbDh9nsgKi0cT4VaUX0d6inVS8rddr/rsbJ7/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rns";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LANk104sO9we7n681a+yVmWOcd9SBQ/kiQAN38xaq80=";
|
||||
hash = "sha256-2GTMpIYDbvwAuRVOEW1Tp8idelHAV5SkAyGBj2yh1OQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,11 +8,12 @@
|
|||
, pytestCheckHook
|
||||
, hypothesis
|
||||
, pytest-mock
|
||||
, moto
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "s3-credentials";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kzu+ySeAi+nRIJSBSJUQzNHD7KVANlWoi0OWKXkc0/8=";
|
||||
hash = "sha256-vKOcOSt9vscj5ixrHZGL6PRun/x38JLbni75nw2YAbg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -34,6 +35,7 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
hypothesis
|
||||
pytest-mock
|
||||
moto
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -16,6 +16,10 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ msrest ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "msrest>=0.6.0,<0.7.0" "msrest"
|
||||
'';
|
||||
|
||||
# Tests are highly impure
|
||||
checkPhase = ''
|
||||
${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)'
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect-mqtt";
|
||||
version = "0.39.2";
|
||||
version = "0.40.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,14 +19,14 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-mqtt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-htLyf7ouy/psG/BJr3nATQjd+bTFETjGEWQYs2uMtSM=";
|
||||
hash = "sha256-WnaVE9WEJmdlxsPUZcEmeCf4DK1GCyd2yQmBiQZ7NkI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
paho-mqtt
|
||||
python-dateutil
|
||||
weconnect
|
||||
];
|
||||
] ++ weconnect.optional-dependencies.Images;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace weconnect_mqtt/__version.py \
|
||||
|
@ -34,8 +34,6 @@ buildPythonPackage rec {
|
|||
substituteInPlace pytest.ini \
|
||||
--replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \
|
||||
--replace "pytest-cov" ""
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "weconnect[Images]~=0.40.0" "weconnect"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.47.1";
|
||||
version = "0.48.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,16 +21,21 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qxE8hX6HBmP6s+NivwSgbrPWzUDr8RW9HAyQ21WTiZE=";
|
||||
hash = "sha256-SLVOvGGhyn/kMYgZUmcy5cw7tDHS7wIcVdP5ZnRgmVc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ascii-magic
|
||||
oauthlib
|
||||
pillow
|
||||
requests
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
Images = [
|
||||
ascii-magic
|
||||
pillow
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest-httpserver
|
||||
pytestCheckHook
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.188.0";
|
||||
version = "0.188.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DmVnJRGxaMfpJbzJGNM0hA0j5HQ1qRH+7b4zNod8b5I=";
|
||||
sha256 = "sha256-6VHqjLG11JB1WmXZ6+i5H3ovSGd7hA/oZ+AN5Sw++4I=";
|
||||
};
|
||||
|
||||
makeFlags = [ "FLOW_RELEASE=1" ];
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.82.0";
|
||||
version = "1.82.2";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w8km6Ze2qAoYGZZxfHucQSBEOv4d+mWatfeYYI2lrRw=";
|
||||
sha256 = "sha256-o8Wp9zrpIkeigQhbsaMURIiL6coOX8OwUDQmRfO8VoY=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, fetchurl, makeDesktopItem, appimageTools }:
|
||||
let
|
||||
name = "saleae-logic-2";
|
||||
version = "2.3.59";
|
||||
version = "2.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
|
||||
sha256 = "sha256-jIu/ODVD/x+TjcVSGlOw6/JWESJYDKZQrJGMAix9wTY=";
|
||||
sha256 = "sha256-jvD/DLpcJKAqy9LSSEVZFtD+BMxfbUmdJwfnQMtA7rg=";
|
||||
};
|
||||
desktopItem = makeDesktopItem {
|
||||
inherit name;
|
||||
|
|
|
@ -2,61 +2,61 @@
|
|||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.292-hardened1.patch",
|
||||
"sha256": "0l20yxg50azpxm2x4gr37yhkvjw3wlishjm2x8pqwil3g1pxykdi",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.292-hardened1/linux-hardened-4.14.292-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.294-hardened1.patch",
|
||||
"sha256": "0x7qnfih7hvn94f8w5g6qqdvsswr71ml9wd9fy1p14dd8k068hcj",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.294-hardened1/linux-hardened-4.14.294-hardened1.patch"
|
||||
},
|
||||
"sha256": "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h",
|
||||
"version": "4.14.292"
|
||||
"sha256": "069i11hv4fhwc9dirqbag1g1k3fn21wzpfggah4f1a41whf98apy",
|
||||
"version": "4.14.294"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.257-hardened1.patch",
|
||||
"sha256": "03hv417v0abn6n0zbmypfsjmxb4aqdz23vrykhgn259w4h45w2z9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.257-hardened1/linux-hardened-4.19.257-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.259-hardened1.patch",
|
||||
"sha256": "05hnliiszj0ri0dkfm1ppaqss1x5nd0jbyr5l7736s5bi707lmsp",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.259-hardened1/linux-hardened-4.19.259-hardened1.patch"
|
||||
},
|
||||
"sha256": "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga",
|
||||
"version": "4.19.257"
|
||||
"sha256": "1ska6v95zjjj44h53gi34rnbsrm4507jwxi3kklnky6d0aykiy1z",
|
||||
"version": "4.19.259"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.142-hardened1.patch",
|
||||
"sha256": "074w7j8wx2k3lk3ssm9x14wf4gns85l2p6syq4pigkb67gvdphpv",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.142-hardened1/linux-hardened-5.10.142-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.145-hardened1.patch",
|
||||
"sha256": "08rq52prxnvzg0j2d8gs010hh44qlhga00h2mvcxlfj10ifg4rgb",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.145-hardened1/linux-hardened-5.10.145-hardened1.patch"
|
||||
},
|
||||
"sha256": "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz",
|
||||
"version": "5.10.142"
|
||||
"sha256": "0qdcqmwvc70hfgj8hb8ccwmnvwl41dvdffqrmyg3cyblwprr0ngw",
|
||||
"version": "5.10.145"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.67-hardened1.patch",
|
||||
"sha256": "1151dry0ia25rq50vnvrkjsxz5h9zsr6lahld3vilk2p01bv2fc3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.67-hardened1/linux-hardened-5.15.67-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.70-hardened1.patch",
|
||||
"sha256": "0m3r9i5zyv12y4y6jn7yqv6n080ikar0hdn2bfzs85mnzc9vsmqr",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.70-hardened1/linux-hardened-5.15.70-hardened1.patch"
|
||||
},
|
||||
"sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys",
|
||||
"version": "5.15.67"
|
||||
"sha256": "0xhdjz7aqq13pkh1yr7ax3msqdb2xvrcpj464wibn1rl4pq2cz0s",
|
||||
"version": "5.15.70"
|
||||
},
|
||||
"5.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened2",
|
||||
"name": "linux-hardened-5.19.8-hardened2.patch",
|
||||
"sha256": "1dfgnx2yr5d5kh2d8r7ywqkyjq1rfni2b5sdpqly0w986rlkw48k",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.8-hardened2/linux-hardened-5.19.8-hardened2.patch"
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.19.11-hardened1.patch",
|
||||
"sha256": "0n0w9qmbhhg9svnjkvmhx24i8d0mhrx2k4xfb3rmnsjg79rcl0qd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.11-hardened1/linux-hardened-5.19.11-hardened1.patch"
|
||||
},
|
||||
"sha256": "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1",
|
||||
"version": "5.19.8"
|
||||
"sha256": "0wyrwdqm4dypx2jbb7d8c3b7fl7q5j434d6g9x2v6sw01gwx4m2m",
|
||||
"version": "5.19.11"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.212-hardened1.patch",
|
||||
"sha256": "0vdx78n1aggyfia017h40k6xg7bd2spcv3s4m0kiq693skxzlh4x",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.212-hardened1/linux-hardened-5.4.212-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.214-hardened1.patch",
|
||||
"sha256": "0j96knplhwvk1w1af4fs818ninvrs38ykg76mb80pjjvi3fdl402",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.214-hardened1/linux-hardened-5.4.214-hardened1.patch"
|
||||
},
|
||||
"sha256": "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9",
|
||||
"version": "5.4.212"
|
||||
"sha256": "1ny57g5agk8sq6cbp2crjiay5bfkwqy32i4a5yw7x0lch2s7kg4s",
|
||||
"version": "5.4.214"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.294";
|
||||
version = "4.14.295";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "069i11hv4fhwc9dirqbag1g1k3fn21wzpfggah4f1a41whf98apy";
|
||||
sha256 = "0svalywqmrhav63vw0ns06c25sgyvzwfngljpham3nm7jjxbkk32";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.259";
|
||||
version = "4.19.260";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1ska6v95zjjj44h53gi34rnbsrm4507jwxi3kklnky6d0aykiy1z";
|
||||
sha256 = "1vlhaapbkvvk2acw1i5f6v6gd8v0x37n1y3i066cddl90my6yl24";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.329";
|
||||
version = "4.9.330";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "168hy7vhgw2sfknflhhf6ykhkp4xs8v0igii6ivjlvs3dmwm21sj";
|
||||
sha256 = "0psrl8fcbp1bsanjmllic503dlyhkj8bjzfc20p2ksahlhv1j0mz";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.145";
|
||||
version = "5.10.146";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0qdcqmwvc70hfgj8hb8ccwmnvwl41dvdffqrmyg3cyblwprr0ngw";
|
||||
sha256 = "1hbdxvlibp9w0q8bk1zlx77ayq2wcld8rjm134ybgbcf4zrrggbv";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.70";
|
||||
version = "5.15.71";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0xhdjz7aqq13pkh1yr7ax3msqdb2xvrcpj464wibn1rl4pq2cz0s";
|
||||
sha256 = "0lqy3nmhij6sb4963kb5dhvfdx46mg79hp81kq10wv01iq9hhm2z";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.19.11";
|
||||
version = "5.19.12";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0wyrwdqm4dypx2jbb7d8c3b7fl7q5j434d6g9x2v6sw01gwx4m2m";
|
||||
sha256 = "1fmhwbgqpr6q3z3ygys153szivlmv3mcnwilbbyfcb1iqx4aadn4";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.214";
|
||||
version = "5.4.215";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1ny57g5agk8sq6cbp2crjiay5bfkwqy32i4a5yw7x0lch2s7kg4s";
|
||||
sha256 = "1gafnf9gbsfzvp9jq6y8qhpvas5cv9y0m9bad2sg55sjlb1zfard";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.140-rt73"; # updated by ./update-rt.sh
|
||||
version = "5.10.145-rt74"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4";
|
||||
sha256 = "0qdcqmwvc70hfgj8hb8ccwmnvwl41dvdffqrmyg3cyblwprr0ngw";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1abrxwxx3kfmbyabb1hhjpz1l7idrn2g14zx7qix7ds7n9f6dcgf";
|
||||
sha256 = "16a2cnvn1azxsw1qjwbygkych0jzkfpmj0kx08jdz3fx3xbmqpr4";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
@ -12,9 +12,9 @@ let
|
|||
jre = jre11;
|
||||
};
|
||||
"2.8" = {
|
||||
kafkaVersion = "2.8.1";
|
||||
kafkaVersion = "2.8.2";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "0fgil47hxdnc374k0p9sxv6b163xknp3pkihv3r99p977czb1228";
|
||||
sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ=";
|
||||
jre = jre11;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
|
||||
# build time
|
||||
, autoreconfHook
|
||||
|
@ -41,6 +42,14 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-37032.patch";
|
||||
url = "https://github.com/FRRouting/frr/commit/ff6db1027f8f36df657ff2e5ea167773752537ed.patch";
|
||||
sha256 = "sha256-b3nT6xco620hMSqlj/nTWTJCegf3ARAGaQbii4Yq6Ag=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.28.2.6151-914ddd2b3";
|
||||
version = "1.29.0.6244-819d3678c";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "sha256-aWRcPHwuZA/xM1QUx4rOUhh3ICvwCgDFrPgnVWB4aUE=";
|
||||
sha256 = "sha256-f9QRaAF9qE3NpCt3lMWQ7MAbfLI7YQaIIF/fkJorUxY=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "sha256-J8sQ/fLz00Tiy5ka+M9JIXbQUzIfGBvofiGX7stWf84=";
|
||||
sha256 = "sha256-iGMO6uuNm2c7UBZvA5dYaSxUrEQCL1tR9zLA3rZhBn4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "mysql";
|
||||
version = "5.7.37";
|
||||
version = "5.7.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0=";
|
||||
sha256 = "sha256-ERw6ypGJfkUwOds5GkdSZeAg/ZIcuXMHwACEqI5NYQQ=";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
diff --git a/config/environments/production.rb b/config/environments/production.rb
|
||||
index a523888a8d..422c2c1ee8 100644
|
||||
index 6b73c82e9d..0cefea6fc0 100644
|
||||
--- a/config/environments/production.rb
|
||||
+++ b/config/environments/production.rb
|
||||
@@ -32,6 +32,7 @@ Discourse::Application.configure do
|
||||
@@ -32,5 +32,6 @@ Discourse::Application.configure do
|
||||
user_name: GlobalSetting.smtp_user_name,
|
||||
password: GlobalSetting.smtp_password,
|
||||
authentication: GlobalSetting.smtp_authentication,
|
||||
+ ca_file: "/etc/ssl/certs/ca-certificates.crt",
|
||||
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls
|
||||
}
|
||||
|
||||
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls,
|
||||
open_timeout: GlobalSetting.smtp_open_timeout,
|
||||
read_timeout: GlobalSetting.smtp_read_timeout
|
|
@ -11,13 +11,13 @@
|
|||
}@args:
|
||||
|
||||
let
|
||||
version = "2.9.0.beta9";
|
||||
version = "2.9.0.beta10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pavNdAbk9yuWRg++p1MCmpBMuYKDs63QbJpHrPS9oAY=";
|
||||
sha256 = "sha256-7uMcJZolLUoJILRYbmcSDArcMP3o89ubh6XttZ7TsLg=";
|
||||
};
|
||||
|
||||
runtimeDeps = [
|
||||
|
@ -161,7 +161,7 @@ let
|
|||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/app/assets/javascripts/yarn.lock";
|
||||
sha256 = "14d7y29460ggqcjnc9vk1q2lnxfl6ycyp8rc103g3gs2bl5sb6r0";
|
||||
sha256 = "0s8cmy76xh4z9y932bjshmpyr04zn3yn62ld9174lks2j965qkbl";
|
||||
};
|
||||
|
||||
assets = stdenv.mkDerivation {
|
||||
|
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-assign";
|
||||
rev = "030cdc2d9c06cd2fed24fa47861b0213fd2d854e";
|
||||
sha256 = "sha256-3JBBxgWWkCAHci+Cv69o+4JY1b70yOckE+1y5ipl5a8=";
|
||||
rev = "c5ad176aaf60150ff44a3f4dd01920ce57975551";
|
||||
sha256 = "sha256-AHymwpWcPlgcuJR5x3Ea+l2cuMJKXyNVBtZFJKjsNf4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.0.3.1)
|
||||
activesupport (7.0.4)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
@ -9,7 +9,7 @@ GEM
|
|||
concurrent-ruby (1.1.10)
|
||||
i18n (1.12.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
minitest (5.16.2)
|
||||
minitest (5.16.3)
|
||||
rrule (0.4.4)
|
||||
activesupport (>= 2.3)
|
||||
tzinfo (2.0.5)
|
||||
|
@ -22,4 +22,4 @@ DEPENDENCIES
|
|||
rrule (= 0.4.4)
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.9
|
||||
2.3.22
|
||||
|
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-calendar";
|
||||
rev = "3cf82dcc6c717965e1d1ff384965e2ee215402f0";
|
||||
sha256 = "sha256-D6FP+vgCqi+wLV+gFAPTAAND3os7mcvpl2z8c5JiFxo=";
|
||||
rev = "d0908b9b2e80087dd6638e661c3307d8d384550e";
|
||||
sha256 = "sha256-zmoL4v3tdcPQUdLl+bcT4Kb7EDLVgJa9VVX9ofcPoHk=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-calendar";
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7";
|
||||
sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.3.1";
|
||||
version = "7.0.4";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default"];
|
||||
|
@ -36,10 +36,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
|
||||
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.16.2";
|
||||
version = "5.16.3";
|
||||
};
|
||||
rrule = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-chat-integration";
|
||||
rev = "c68fde5d2bbb92cad24a35ff61586453d67264f5";
|
||||
sha256 = "sha256-Gmy8I/MbIdicHqZjlwNDz8PdCdxptzynd1pyL4BM5z4=";
|
||||
rev = "7bf7368520d37a2dca9c21dcffd8831d987f64f8";
|
||||
sha256 = "sha256-f0JgiuwSKtCfr+s3D4HVVWjyE/5sixqRDsgcvBJs8Uk=";
|
||||
};
|
||||
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 = "bf56ab3559328cdf89cdd5b32ec32f41aa87017e";
|
||||
sha256 = "sha256-JoqOmv/x9aiSXBAwXO1PSg0E/1eb19dNXxqCLOIyHvo=";
|
||||
rev = "16bb6a946cc2014aa709aba60940a96b5452936d";
|
||||
sha256 = "sha256-E9qGAG4XWrxqP1SPq5LYQn89sQbX8DgGxtCfEQcBFX8=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-data-explorer";
|
||||
|
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-docs";
|
||||
rev = "13bab928c72c847c4c3f7ebb8600343b48f14a5f";
|
||||
sha256 = "sha256-Gno+dbu8/l/cdrzJZL82DmMilZ5zJScFaQ88x8Hum0k=";
|
||||
rev = "9cffc3e479117af1665096e16b7d5a637b112b28";
|
||||
sha256 = "sha256-F74eFhDIdWbnCCsWsT3SrQBSS8IUPLi2N9w3h8i5++0=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
# gem "rails"
|
||||
gem 'sawyer', '0.8.2'
|
||||
gem 'octokit', '4.22.0'
|
||||
gem 'sawyer', '0.9.2'
|
||||
gem 'octokit', '5.6.1'
|
||||
|
|
|
@ -1,47 +1,27 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
faraday (1.10.1)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
addressable (2.8.1)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
faraday (2.5.2)
|
||||
faraday-net_http (>= 2.0, < 3.1)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.4)
|
||||
multipart-post (~> 2)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
multipart-post (2.2.3)
|
||||
octokit (4.22.0)
|
||||
faraday (>= 0.9)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
public_suffix (4.0.7)
|
||||
faraday-net_http (3.0.0)
|
||||
octokit (5.6.1)
|
||||
faraday (>= 1, < 3)
|
||||
sawyer (~> 0.9)
|
||||
public_suffix (5.0.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
sawyer (0.8.2)
|
||||
sawyer (0.9.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (> 0.8, < 2.0)
|
||||
faraday (>= 0.17.3, < 3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
octokit (= 4.22.0)
|
||||
sawyer (= 0.8.2)
|
||||
octokit (= 5.6.1)
|
||||
sawyer (= 0.9.2)
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.9
|
||||
2.3.22
|
||||
|
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-github";
|
||||
rev = "739bdf9ecc0bfe5256a4814fbc758168552ae069";
|
||||
sha256 = "sha256-pD6sqvUfHUb/5J0HpgqHmYsJnrFcB1ubZR/PMU/GApU=";
|
||||
rev = "e513628acc716c8e35611d9a31fca8badf2757e2";
|
||||
sha256 = "sha256-K6FzV/r9i0rlOlek5AYZkwfV5diBtzBd5zLmMStcqAI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-github";
|
||||
|
|
|
@ -5,132 +5,31 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
|
||||
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
|
||||
dependencies = ["faraday-net_http" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "037w5kg3y9jrwgg7izfn1pmzngy0hdhcr7slmxwqa3mdb4rx9r9q";
|
||||
sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.1";
|
||||
};
|
||||
faraday-em_http = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-em_synchrony = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-excon = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
faraday-httpclient = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
faraday-multipart = {
|
||||
dependencies = ["multipart-post"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.4";
|
||||
version = "2.5.2";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
|
||||
sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
faraday-net_http_persistent = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
};
|
||||
faraday-patron = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-rack = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-retry = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
multipart-post = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.3";
|
||||
version = "3.0.0";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
|
@ -138,20 +37,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj";
|
||||
sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.22.0";
|
||||
version = "5.6.1";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
|
||||
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.7";
|
||||
version = "5.0.0";
|
||||
};
|
||||
ruby2_keywords = {
|
||||
groups = ["default"];
|
||||
|
@ -169,9 +68,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
|
||||
sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.2";
|
||||
version = "0.9.2";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@ GEM
|
|||
specs:
|
||||
hashie (5.0.0)
|
||||
net-ldap (0.14.0)
|
||||
omniauth (1.9.1)
|
||||
omniauth (1.9.2)
|
||||
hashie (>= 3.4.6)
|
||||
rack (>= 1.6.2, < 3)
|
||||
omniauth-ldap (1.0.5)
|
||||
|
@ -12,7 +12,7 @@ GEM
|
|||
pyu-ruby-sasl (~> 0.0.3.2)
|
||||
rubyntlm (~> 0.3.4)
|
||||
pyu-ruby-sasl (0.0.3.3)
|
||||
rack (2.2.3)
|
||||
rack (2.2.4)
|
||||
rubyntlm (0.3.4)
|
||||
|
||||
PLATFORMS
|
||||
|
@ -25,4 +25,4 @@ DEPENDENCIES
|
|||
rubyntlm (= 0.3.4)
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.9
|
||||
2.3.22
|
||||
|
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "jonmbake";
|
||||
repo = "discourse-ldap-auth";
|
||||
rev = "a7a2e35eb5a8f6ee3b90bf48424efcb2a66c9989";
|
||||
sha256 = "sha256-Dsb12bZEZlNjFGw1GX7zt2hDVM9Ua+MDWSmBn4HEvs0=";
|
||||
rev = "84635b1c352b2145b8e6074d94047f1e2020dcbc";
|
||||
sha256 = "sha256-yCCSger7qa9R/BMaQdcFtLXqLPj3i3y4tTanz+ufZTw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jonmbake/discourse-ldap-auth";
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue