Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
be4a24ee49
68 changed files with 1931 additions and 1618 deletions
|
|
@ -108,5 +108,8 @@ in
|
|||
# for google-chrome https://www.chromium.org/administrators/linux-quick-start
|
||||
environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile;
|
||||
environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
|
||||
# for brave
|
||||
environment.etc."brave/policies/managed/default.json".text = builtins.toJSON defaultProfile;
|
||||
environment.etc."brave/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
)
|
||||
|
||||
# connects to the daemon
|
||||
machine.succeed("emacsclient --create-frame $EDITOR >&2 &")
|
||||
machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2")
|
||||
|
||||
# checks that Emacs shows the edited filename
|
||||
machine.wait_for_text("emacseditor")
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
import ./generic.nix (rec {
|
||||
version = "27.2";
|
||||
sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";
|
||||
patches = fetchpatch: [
|
||||
(fetchpatch {
|
||||
name = "fix-aarch64-darwin-triplet.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";
|
||||
sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg=";
|
||||
})
|
||||
# glibc 2.34 compat
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/emacs/raw/181aafcdb7ee2fded9fce4cfc448f27edccc927f/f/emacs-glibc-2.34.patch";
|
||||
sha256 = "sha256-2o3C/jhZPl2OW/LmVPt/fhdwbS9NOdF9lVEF1Kn9aEk=";
|
||||
})
|
||||
];
|
||||
})
|
||||
5
pkgs/applications/editors/emacs/28.nix
Normal file
5
pkgs/applications/editors/emacs/28.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
import ./generic.nix (rec {
|
||||
version = "28.1";
|
||||
sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=";
|
||||
patches = _: [ ];
|
||||
})
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
|
||||
index 84ede3e..8e8f42e 100644
|
||||
--- a/lib/careadlinkat.h
|
||||
+++ b/lib/careadlinkat.h
|
||||
@@ -23,6 +23,10 @@
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#ifndef AT_FDCWD
|
||||
+#define AT_FDCWD -2
|
||||
+#endif
|
||||
+
|
||||
struct allocator;
|
||||
|
||||
/* Assuming the current directory is FD, get the symbolic link value
|
||||
|
|
@ -1116,6 +1116,7 @@ self: super: {
|
|||
"coc-emmet"
|
||||
"coc-eslint"
|
||||
"coc-explorer"
|
||||
"coc-flutter"
|
||||
"coc-git"
|
||||
"coc-go"
|
||||
"coc-highlight"
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stork";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jameslittle230";
|
||||
repo = "stork";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs=";
|
||||
sha256 = "sha256-itjRJLbRTwovK+HcNEzwViEDTJ1MoRRTvZD412XYVKk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs=";
|
||||
cargoSha256 = "sha256-GaYdgC3Bf759ZPcZxoFG0nmCSz7aNHuqtyid6RS8Ui8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.16.4-mo1";
|
||||
version = "6.16.5-mo1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA=";
|
||||
sha256 = "sha256-TNiHvRLS+eAPHa+qbnVSAyWTPGJxdp9eheQamd4i24E=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "99.0-1",
|
||||
"packageVersion": "99.0.1-3",
|
||||
"source": {
|
||||
"rev": "99.0-1",
|
||||
"sha256": "0x9c19h4l1djhdq48ylnqjrrfkk2zalfpgj57cba5jqxl2fhglx3"
|
||||
"rev": "99.0.1-3",
|
||||
"sha256": "0ag4n86hvyp6kx3hp60yn7q45rgjbx7054frj6226ni2ribjx4ln"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "99.0",
|
||||
"sha512": "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c"
|
||||
"version": "99.0.1",
|
||||
"sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.10.9",
|
||||
"version": "1.10.10",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.10.9",
|
||||
"desktopSrcHash": "vbVnkb/sVW+c7JGIT8Fcjtwe7i10aY0mBoiNeAD8tvY=",
|
||||
"version": "1.10.10",
|
||||
"desktopSrcHash": "Atgcu+K28pScYokS/lTu+/mMeEC+1yTcn3Akq+KZJNY=",
|
||||
"desktopYarnHash": "0jm0i1yyfkg1ll11pb3qif1vdxx6rp0yl9kd8jg9nhsg2jzw66pr",
|
||||
"webHash": "0yp29h2cmi18y8g8scqx3zmc1l80q28gid709ysqqb349gy1kls8"
|
||||
"webHash": "1xp0rhw3k2znwvqqikhd771l2n6xyx8npcz87m9d4cisl82lpnr0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20220408";
|
||||
version = "20220415";
|
||||
pname = "neomutt";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomutt";
|
||||
repo = "neomutt";
|
||||
rev = version;
|
||||
sha256 = "1aziffkjxbflw1narih0dr8ghl142knsb5z14fjb7n5ya9xpgp05";
|
||||
sha256 = "sha256-iVKDgVN7YFPEMP+OISS7jRG9Whs2QG60yH1r2kw3MUQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "bismuth";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bismuth-Forge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kvWrhDbC7nqz810dE42xbd430OSkTN42Hkl6fXR90as=";
|
||||
sha256 = "sha256-SGeqTmU603gKlzCUJ6AMaG7++9JvMw5EpSATwJEqNq8=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
, "coc-emmet"
|
||||
, "coc-eslint"
|
||||
, "coc-explorer"
|
||||
, "coc-flutter"
|
||||
, "coc-git"
|
||||
, "coc-go"
|
||||
, "coc-highlight"
|
||||
|
|
|
|||
2157
pkgs/development/node-packages/node-packages.nix
generated
2157
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -34,5 +34,8 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/arteria/django-hijack-admin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lsix ];
|
||||
# may be unmaintained, doesn't work with recent django-hijack:
|
||||
# https://github.com/django-hijack/django-hijack-admin/issues/46
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, python,
|
||||
django, django_compat, django_nose
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, django
|
||||
, django_compat
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-hijack";
|
||||
version = "2.1.10";
|
||||
version = "3.2.0";
|
||||
|
||||
# the pypi packages don't include everything required for the tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "arteria";
|
||||
repo = "django-hijack";
|
||||
rev = "v${version}";
|
||||
sha256 = "01fwkjdzvw0yx2spwi7zc1yy64ndq1y72bfmk7kxnq5x803m2ak6";
|
||||
# the wheel comes with pre-built assets, allowing us to avoid fighting
|
||||
# with npm/webpack/gettext to build them ourselves.
|
||||
format = "wheel";
|
||||
src = fetchPypi {
|
||||
inherit version format;
|
||||
pname = "django_hijack";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
sha256 = "1ixn7ppmbq1bgqahwv3z57hk80ql7sxpwl8jms7y8w5z1h91cn86";
|
||||
};
|
||||
|
||||
checkInputs = [ django_nose ];
|
||||
propagatedBuildInputs = [ django django_compat ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# we have to do a little bit of tinkering to convince the tests to run against the installed package, not the
|
||||
# source directory
|
||||
mkdir testbase
|
||||
pushd testbase
|
||||
mv ../runtests.py .
|
||||
${python.interpreter} runtests.py hijack
|
||||
popd
|
||||
|
||||
runHook postCheck
|
||||
checkInputs = [ pytestCheckHook pytest-django ];
|
||||
preCheck = ''
|
||||
export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings'
|
||||
'';
|
||||
pytestFlagsArray = [ "--pyargs" "hijack" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows superusers to hijack (=login as) and work on behalf of another user";
|
||||
|
|
|
|||
45
pkgs/development/python-modules/gb-io/default.nix
Normal file
45
pkgs/development/python-modules/gb-io/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, rustPlatform
|
||||
, setuptools-rust
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gb-io";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "althonos";
|
||||
repo = "gb-io.py";
|
||||
rev = "v${version}";
|
||||
sha256 = "05fpz11rqqjrb8lc8id6ssv7sni9i1h7x1ra5v5flw9ghpf29ncm";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src sourceRoot;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "1qh31jysg475f2qc70b3bczmzywmg9987kn2vsmk88h8sx4nnwc5";
|
||||
};
|
||||
|
||||
sourceRoot = "source";
|
||||
|
||||
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
]);
|
||||
|
||||
checkPhase = ''
|
||||
python -m unittest discover
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "gb_io" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/althonos/gb-io.py";
|
||||
description = "A Python interface to gb-io, a fast GenBank parser written in Rust";
|
||||
license = licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dlesl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "iso4217";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dahlia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA=";
|
||||
hash = "sha256-7VrXAP/Qyzy2BDTmFwDlxHvF7HhndJsDMt/qHcsmhzs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mechanize";
|
||||
version = "0.4.7";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1773a8f5818398e0010e781dc0f942cd88b107a57424c904d545cd827c216809";
|
||||
sha256 = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ html5lib ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, iso4217
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
}:
|
||||
|
|
@ -21,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tkdrob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps=";
|
||||
hash = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,11 +28,8 @@ buildPythonPackage rec {
|
|||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
# Tests require network access
|
||||
doCheck =false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyefergy"
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.15.11";
|
||||
version = "0.15.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8=";
|
||||
sha256 = "sha256-4uS47SJelkeBkqBcA6xzcTQqAXXSgcVJIZErVdR9ELY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-aer";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
owner = "Qiskit";
|
||||
repo = "qiskit-aer";
|
||||
rev = version;
|
||||
sha256 = "sha256-COvJCj18qRNQJUXKrtlYJQGLjna44IgtNZeNVJJaIHg=";
|
||||
sha256 = "sha256-mf+Pgw/daFkt1bvqSeYzlO/Sd2F2MtwZcLr+h1u+eb0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -55,15 +55,14 @@ buildPythonPackage rec {
|
|||
cmake
|
||||
ninja
|
||||
scikit-build
|
||||
pybind11
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
blas
|
||||
catch2
|
||||
nlohmann_json
|
||||
fmt
|
||||
muparserx
|
||||
nlohmann_json
|
||||
spdlog
|
||||
];
|
||||
|
||||
|
|
@ -71,6 +70,7 @@ buildPythonPackage rec {
|
|||
cvxpy
|
||||
cython # generates some cython files at runtime that need to be cython-ized
|
||||
numpy
|
||||
pybind11
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -80,19 +80,18 @@ buildPythonPackage rec {
|
|||
dontUseCmakeConfigure = true;
|
||||
|
||||
# *** Testing ***
|
||||
|
||||
pythonImportsCheck = [
|
||||
"qiskit.providers.aer"
|
||||
"qiskit.providers.aer.backends.qasm_simulator"
|
||||
"qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output
|
||||
];
|
||||
# Slow tests
|
||||
disabledTests = [
|
||||
"test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?
|
||||
"test_initialize_2" # TODO: simulations appear incorrect, off by >10%.
|
||||
# These tests fail on cvxpy >= 1.1.15
|
||||
# these tests don't work with cvxpy >= 1.1.15
|
||||
"test_clifford"
|
||||
"test_approx_random"
|
||||
"test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?
|
||||
"test_initialize_2" # TODO: simulations appear incorrect, off by >10%.
|
||||
"test_pauli_error_2q_gate_from_string_1qonly"
|
||||
|
||||
# these fail for some builds. Haven't been able to reproduce error locally.
|
||||
"test_kraus_gate_noise"
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-wnto3IqrJFAqIv6QAXe3BB9fvXQXe2fw/iUZe3+198M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt --replace "pandas<1.4.0" "pandas"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fastdtw
|
||||
numpy
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-ibmq-provider";
|
||||
version = "0.18.3";
|
||||
version = "0.19.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
|||
owner = "Qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n1w1lnq2xw94hhhn6kdvw8dqlxk5fxwpm8ng31gxbp1s3qgni17";
|
||||
sha256 = "sha256-ODu8OgGpzlMjRX7ebMu4DXKj6jUyohCq4Hb8aV5eWIU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -58,6 +58,7 @@ buildPythonPackage rec {
|
|||
requests
|
||||
requests_ntlm
|
||||
websocket-client
|
||||
websockets
|
||||
] ++ lib.optionals withVisualization visualizationPackages;
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -72,12 +73,12 @@ buildPythonPackage rec {
|
|||
pproxy
|
||||
qiskit-aer
|
||||
vcrpy
|
||||
websockets
|
||||
] ++ lib.optionals (!withVisualization) visualizationPackages;
|
||||
|
||||
pythonImportsCheck = [ "qiskit.providers.ibmq" ];
|
||||
# These disabled tests require internet connection, aren't skipped elsewhere
|
||||
disabledTests = [
|
||||
"test_coder_operators" # fails for some reason on nixos-21.05+
|
||||
# These disabled tests require internet connection, aren't skipped elsewhere
|
||||
"test_old_api_url"
|
||||
"test_non_auth_url"
|
||||
"test_non_auth_url_with_hub"
|
||||
|
|
|
|||
|
|
@ -21,15 +21,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-nature";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qiskit";
|
||||
owner = "Qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EkYppEOQGmRIxKC4ArXZb0b+p1gPGnP6AU8LbEbOpPo=";
|
||||
sha256 = "sha256-BXUVRZ8X3OJiRexNXZsnvp+Yh8ARNYohYH49/IYFYM0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -56,7 +56,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_two_qubit_reduction" # unsure of failure reason. Might be related to recent cvxpy update?
|
||||
"test_two_qubit_reduction" # failure cause unclear
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
# Python requirements
|
||||
, cython
|
||||
, dill
|
||||
, numpy
|
||||
, networkx
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
, retworkx
|
||||
, scipy
|
||||
, scikit-quant ? null
|
||||
, setuptools-rust
|
||||
, stevedore
|
||||
, symengine
|
||||
, sympy
|
||||
|
|
@ -54,18 +55,24 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-terra";
|
||||
version = "0.19.2";
|
||||
version = "0.20.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-P2QTdt1H9I5T/ONNoo7XEVnoHweOdq3p2NH3l3/yAn4=";
|
||||
sha256 = "sha256-/t87IgazpJlfd8NT2Pkn5b6/Ut104DcJEFCubQ/bBiw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ rust.rustc rust.cargo cargoSetupHook ]);
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-tNiBXn32g1PTuTmKNXSac+4PLSc1Ao9n+oAMfvVYR30=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dill
|
||||
|
|
@ -96,7 +103,7 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [
|
||||
"qiskit"
|
||||
"qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial"
|
||||
"qiskit.pulse"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
@ -109,7 +116,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
pytestFlagsArray = [ "--durations=10" ];
|
||||
disabledTests = [
|
||||
"TestUnitarySynthesisPlugin" # uses unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure
|
||||
"TestUnitarySynthesisPlugin" # use unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure
|
||||
# matplotlib tests seems to fail non-deterministically
|
||||
"TestMatplotlibDrawer"
|
||||
"TestGraphMatplotlibDrawer"
|
||||
"test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest
|
||||
|
||||
# Flaky tests
|
||||
|
|
@ -153,18 +163,14 @@ buildPythonPackage rec {
|
|||
"test_two_qubit_weyl_decomposition_ab0"
|
||||
"test_sample_counts_memory_superposition"
|
||||
"test_piecewise_polynomial_function"
|
||||
"test_vqe_qasm"
|
||||
"test_piecewise_chebyshev_mutability"
|
||||
"test_bit_conditional_no_cregbundle"
|
||||
"test_gradient_wrapper2"
|
||||
"test_two_qubit_weyl_decomposition_abmb"
|
||||
"test_two_qubit_weyl_decomposition_abb"
|
||||
"test_two_qubit_weyl_decomposition_aac"
|
||||
"test_aqc"
|
||||
"test_gradient"
|
||||
"test_piecewise_polynomial_rotations_mutability"
|
||||
"test_confidence_intervals_1"
|
||||
"test_trotter_from_bound"
|
||||
"test_vqe_qasm"
|
||||
"test_dag_from_networkx"
|
||||
"test_defaults_to_dict_46"
|
||||
];
|
||||
|
||||
# Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@ in
|
|||
buildPythonPackage rec {
|
||||
pname = "qiskit";
|
||||
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
|
||||
version = "0.34.2";
|
||||
version = "0.36.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qiskit";
|
||||
owner = "Qiskit";
|
||||
repo = "qiskit";
|
||||
rev = version;
|
||||
sha256 = "sha256-weL65IQs6vbjJiPJdaizU0ST6u9qDYb0LhTwC6yAdhY=";
|
||||
sha256 = "sha256-zTdvROru56/HNpoHKSVe3pQZeDSMFmaTCUAr1FOaE5A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, cython
|
||||
, cmake
|
||||
|
|
@ -12,6 +13,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "symengine";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symengine";
|
||||
|
|
@ -20,13 +22,18 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# setuptools 61 compat
|
||||
url = "https://github.com/symengine/symengine.py/commit/987e665e71cf92d1b021d7d573a1b9733408eecf.patch";
|
||||
hash = "sha256-2QbNdw/lKYRIRpOU5BiwF2kK+5Lh2j/Q82MKUIvl0+c=";
|
||||
})
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "\"cmake\"" "\"${cmake}/bin/cmake\"" \
|
||||
--replace "'cython>=0.29.24'" "'cython'"
|
||||
|
||||
substituteInPlace cmake/FindCython.cmake \
|
||||
--replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython"
|
||||
'';
|
||||
|
||||
nativeBuildUnputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
, nixosTests
|
||||
}:
|
||||
|
||||
with builtins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbpf";
|
||||
version = "0.7.0";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rasdaemon";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mchehab";
|
||||
repo = "rasdaemon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vyUDwqDe+HD4mka6smdQuVSM5U9uMv/TrfHkyqVJMIo=";
|
||||
sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "soft-serve";
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "soft-serve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IaSXkbOBuvC7BhM+rGGYMcvk6jjKVDHH+lSs3y2UM40=";
|
||||
sha256 = "sha256-FtWlE2CmUx9ric4yFItj7lc57259/BVINyUhSuBNapo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-m5xwxs6XvmPffDX9dkkEG0/LdlDDm6Eq9CC0tVdauVI=";
|
||||
vendorSha256 = "sha256-MwbtrtfvQ1HimLjUCmk8Twr4tpfP4eFBUlDP15IZKto=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
}@args:
|
||||
|
||||
let
|
||||
version = "2.9.0.beta3";
|
||||
version = "2.9.0.beta4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+VYHGkISY4PFScUzk6eJ7eN9cPTjNEww/kusKcufMI0=";
|
||||
sha256 = "sha256-DpUEBGLgjcroVzdDG8/nGvC+ym19ZkGa7qvHKZZ1mH4=";
|
||||
};
|
||||
|
||||
runtimeDeps = [
|
||||
|
|
@ -161,7 +161,7 @@ let
|
|||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/app/assets/javascripts/yarn.lock";
|
||||
sha256 = "0xx5gncvb2mwpwwbgi4y320ji143i38vmz946xjcx5z3jxxjkymz";
|
||||
sha256 = "1l4nfc14cm42lkilsawfhdcnv1ln7m7bpan9a804abv4hwrs3f52";
|
||||
};
|
||||
|
||||
assets = stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-assign";
|
||||
rev = "d8d2dc950a0512cc53885afbd1da26ea38fdf1e1";
|
||||
sha256 = "sha256-FRq/zL+Hiu/Pd/8HDOmFW8Uoovw9so1gKbM4by3jSYg=";
|
||||
rev = "7a854fe5046783bcff6cc24fca818056e1b9414a";
|
||||
sha256 = "sha256-SGGwj0V4mTXD33tLnH76tQD/f6IvDbacq23XbaRdLsI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-calendar";
|
||||
rev = "c44d348c7739f08fe026f1d67dbd902cb2f4d590";
|
||||
sha256 = "sha256-+876F3/nGhqtwQn2D/v3WzqchemsocnneiYYFmjqGGo=";
|
||||
rev = "eb8bc3e864c6f735fa5a005e854f8c37411b6288";
|
||||
sha256 = "sha256-fc3oQj2NqaTfmokJUryd2oBd/eVAcNOMMT0ZT45bU28=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-calendar";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-canned-replies";
|
||||
rev = "f9d1d87e352c0d1c41c1a8e4ef26b7766e39d2f1";
|
||||
sha256 = "sha256-luFPwcnH6faTJV7Bhx9nnaxkK5PHI9vqhHrFO0m49mg=";
|
||||
rev = "18af3367d9eda8842e8ff0de96c90aa2f0bdb0a3";
|
||||
sha256 = "sha256-v8QOR0/9RUJ1zFmzhKYe/GEev3Jl4AlXWkQyuquyuJY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-canned-replies";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-chat-integration";
|
||||
rev = "0c367e19ca4c06ace067f1268c1a1a64d8da4253";
|
||||
sha256 = "sha256-X7bkAjINzKTrWcVd9MPl51Vy6pOWp378ACJJTSihQRc=";
|
||||
rev = "eaa7de8c2b659d107c2b16ac0d469592aff79d7c";
|
||||
sha256 = "sha256-7anXDbltMBM22dBnE5FFwNk7IJEUFZgDzR4Q/AYn6ng=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-chat-integration";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-checklist";
|
||||
rev = "c4f3df0d825082eeaaa3fd9fceba0258080aa6fa";
|
||||
sha256 = "sha256-VGKDpu8tohMgSjMoTzhVnPLHMfLsXOejXL3bmQQ3jWM=";
|
||||
rev = "68941e370e132c17fc2aa21ac40c033df72c9771";
|
||||
sha256 = "sha256-jJM/01fKxc1RBcSPt9/KDxMkBMH2AOp9dINxSneNhAs=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-checklist";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-data-explorer";
|
||||
rev = "e7c19ac107dcd37618c7ac7b98530e99c7fe31db";
|
||||
sha256 = "sha256-w7IzniVlSArmR58Xk9U4MLolV61w/7t1C0nMqERM9J4=";
|
||||
rev = "baaac7ce671e716559329ae756988cc395d7079e";
|
||||
sha256 = "sha256-bUCRfbKXdNbiJnU3xPMhG3s8kH7wQQoS2kV7ScHGOMQ=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-data-explorer";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-docs";
|
||||
rev = "e517e69c09479654c197b1d620e6e7a5e69edca7";
|
||||
sha256 = "sha256-fbkuFWyY25V3B32a7NYtTcOlBot18JZYRth6ainHDQo=";
|
||||
rev = "72b2e87e84221588bc2ff08961a492044f1f8237";
|
||||
sha256 = "sha256-moR4TJYffh6JwC7oxeS4+Cyngi88Ht2eTbSEJJ4JKdY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ GEM
|
|||
octokit (4.22.0)
|
||||
faraday (>= 0.9)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
public_suffix (4.0.6)
|
||||
public_suffix (4.0.7)
|
||||
ruby2_keywords (0.0.5)
|
||||
sawyer (0.8.2)
|
||||
addressable (>= 2.3.5)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-github";
|
||||
rev = "810105186dbe8441852e2df9a9fc2ae8b8516ec6";
|
||||
sha256 = "sha256-96sqnvtEmm7sxFPAk6iDiYm7XChaQV+6HXZt/m5BtsI=";
|
||||
rev = "36cbacdd32916435391b4700c024074da3bcbe74";
|
||||
sha256 = "sha256-R4Kp7NFMIXYDcAZlOUdhNdN/mmQMgXlLFolzo2OZahw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-github";
|
||||
|
|
|
|||
|
|
@ -148,10 +148,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
};
|
||||
ruby2_keywords = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-math";
|
||||
rev = "447c4811ea44d006da98dcbb6dfde142ada53567";
|
||||
sha256 = "sha256-iq3wWhYhOnh+QgChEsSIlRzDmD8kXbjNerVGfuNF7uY=";
|
||||
rev = "b875a21b4d5225b61cb525531d30eaf852db6237";
|
||||
sha256 = "sha256-UKba9ZaVjIxOqUYdl00Z2sLt3Y+exBX7MJax8EzXB1Q=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-math";
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-openid-connect";
|
||||
rev = "dfcdc38d77aab4010cfe032cdd4155b4ae60ed14";
|
||||
sha256 = "sha256-I2cuyhA4jhhz+pJ5692/lRj6YRViP//HsoZOZjtu/e4=";
|
||||
rev = "e897702139b9c0dca40b9385427ba8bad0e1eae9";
|
||||
sha256 = "sha256-miosXf4to60BqGsbXYEL37G38uVHrz2/2Pizn0Rlp2o=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-openid-connect";
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-prometheus";
|
||||
rev = "834f8683dfae475483c50bdeec979a5fa4a1cf04";
|
||||
sha256 = "sha256-M7NnXUib/iKxQT+UTqicmrZONR/Z+oXl46BNgYf1SQM=";
|
||||
rev = "43536e4a4977718972a673dc2475ae07df9a0a45";
|
||||
sha256 = "sha256-7sQldPLY7YW/sr4WBHWxJVvhvRK0LwO3+52HAIJFvY4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-saved-searches";
|
||||
rev = "a7eafe288a2f93aa8cc7cf59d8173adc70c8f48a";
|
||||
sha256 = "sha256-Zli+tzNxLIwp5sZome+pXqvpsvqM/kXRbe73QtH0rTc=";
|
||||
rev = "f008809ee3bf3a8a5c11daff0807d59ab4336a0c";
|
||||
sha256 = "sha256-/OyFL/9fLdVpsFQIlnjQ6ser6hdEs4X434nAaqKCTUE=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-saved-searches";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-solved";
|
||||
rev = "9aba2bd6b7efbea3e46158fd0b1ce96a975379d7";
|
||||
sha256 = "sha256-RmYsDCDuVxXX91haljP6Jbx3s4Nl2RV6UU3PBQ/Xi7Y=";
|
||||
rev = "17ba805a06ddfc27c6435eb20c0f8466f1708be8";
|
||||
sha256 = "sha256-G48c1khRVnCPXA8ujpDmEzL10uLC9e2sYVLVEXWIk0s=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-solved";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-spoiler-alert";
|
||||
rev = "7382d74af57f4476004014598135aec530b0342f";
|
||||
sha256 = "sha256-YyCG1bAfjJ9/itHlsZTBQgkRjgPKNKPzJopnP/Z7/NA=";
|
||||
rev = "4a07519cf9d7ac713f5e21ba770adb127524a22d";
|
||||
sha256 = "sha256-pMTXdjqI4GrLNfZMbyPdeW+Jwieh6I4O/pT2Yyf4ltA=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-spoiler-alert";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-voting";
|
||||
rev = "2de1fe5df1a5c25ad1e0e31e8d28adca315d9092";
|
||||
sha256 = "sha256-XxrRPIc9F78wHF6p1qqUZhkPqKWSebqGZn9P5lNTDeo=";
|
||||
rev = "1da667721269ca01ef53c35ec0470486b490e72c";
|
||||
sha256 = "sha256-VCMv6YWHY24v9KyO4q0YSSYK+mszOVqP46slOh8okvY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-voting";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
|||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-yearly-review";
|
||||
rev = "f2224b38c96c8772ce6cc64514b8a3edaa42ebb9";
|
||||
sha256 = "sha256-dJtQXaLsADXcsADzExGPj3L2x4zlNfsQCNBk17W0a5A=";
|
||||
rev = "ef4855f6afa16ef86013bba7da8e50a63e11b493";
|
||||
sha256 = "sha256-IVKGysAKr+lKV1CO1JJIMLtzcvpK8joWjx8Bfy+dx8Y=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-yearly-review";
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@ end
|
|||
|
||||
gem 'json'
|
||||
|
||||
# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
|
||||
# This is a desired upgrade we should get to.
|
||||
gem 'sprockets', '3.7.2'
|
||||
gem 'sprockets'
|
||||
|
||||
# this will eventually be added to rails,
|
||||
# allows us to precompile all our templates in the unicorn master
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ GEM
|
|||
chunky_png (1.4.0)
|
||||
coderay (1.1.3)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
connection_pool (2.2.5)
|
||||
cose (1.2.0)
|
||||
cbor (~> 0.5.9)
|
||||
|
|
@ -129,10 +129,10 @@ GEM
|
|||
sprockets (>= 3.3, < 4.1)
|
||||
ember-source (2.18.2)
|
||||
erubi (1.10.0)
|
||||
excon (0.92.1)
|
||||
excon (0.92.2)
|
||||
execjs (2.8.1)
|
||||
exifr (1.3.9)
|
||||
fabrication (2.27.0)
|
||||
fabrication (2.28.0)
|
||||
faker (2.20.0)
|
||||
i18n (>= 1.8.11, < 2)
|
||||
fakeweb (1.3.0)
|
||||
|
|
@ -194,7 +194,7 @@ GEM
|
|||
json (2.6.1)
|
||||
json-schema (2.8.1)
|
||||
addressable (>= 2.4)
|
||||
json_schemer (0.2.19)
|
||||
json_schemer (0.2.20)
|
||||
ecma-re-validator (~> 0.3)
|
||||
hana (~> 1.3)
|
||||
regexp_parser (~> 2.0)
|
||||
|
|
@ -206,7 +206,7 @@ GEM
|
|||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
literate_randomizer (0.4.0)
|
||||
lograge (0.11.2)
|
||||
lograge (0.12.0)
|
||||
actionpack (>= 4)
|
||||
activesupport (>= 4)
|
||||
railties (>= 4)
|
||||
|
|
@ -215,7 +215,7 @@ GEM
|
|||
logstash-logger (0.26.1)
|
||||
logstash-event (~> 1.2)
|
||||
logster (2.11.0)
|
||||
loofah (2.15.0)
|
||||
loofah (2.16.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
lru_redux (1.1.0)
|
||||
|
|
@ -236,13 +236,13 @@ GEM
|
|||
ffi (~> 1.9)
|
||||
minitest (5.15.0)
|
||||
mocha (1.13.0)
|
||||
msgpack (1.4.5)
|
||||
msgpack (1.5.1)
|
||||
multi_json (1.15.0)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.1.1)
|
||||
mustache (1.1.1)
|
||||
nio4r (2.5.8)
|
||||
nokogiri (1.13.3)
|
||||
nokogiri (1.13.4)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
oauth (0.5.8)
|
||||
|
|
@ -280,12 +280,12 @@ GEM
|
|||
openssl-signature_algorithm (1.1.1)
|
||||
openssl (~> 2.0)
|
||||
optimist (3.0.1)
|
||||
parallel (1.22.0)
|
||||
parallel_tests (3.7.3)
|
||||
parallel (1.22.1)
|
||||
parallel_tests (3.8.1)
|
||||
parallel
|
||||
parser (3.1.1.0)
|
||||
parser (3.1.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.3.4)
|
||||
pg (1.3.5)
|
||||
progress (3.6.0)
|
||||
pry (0.13.1)
|
||||
coderay (~> 1.1)
|
||||
|
|
@ -295,8 +295,8 @@ GEM
|
|||
pry (~> 0.13.0)
|
||||
pry-rails (0.3.9)
|
||||
pry (>= 0.10.4)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.6.2)
|
||||
public_suffix (4.0.7)
|
||||
puma (5.6.4)
|
||||
nio4r (~> 2.0)
|
||||
r2 (0.2.7)
|
||||
racc (1.6.0)
|
||||
|
|
@ -339,7 +339,7 @@ GEM
|
|||
redis (4.5.1)
|
||||
redis-namespace (1.8.2)
|
||||
redis (>= 3.0.4)
|
||||
regexp_parser (2.2.1)
|
||||
regexp_parser (2.3.0)
|
||||
request_store (1.5.1)
|
||||
rack (>= 1.4)
|
||||
rexml (3.2.5)
|
||||
|
|
@ -361,7 +361,7 @@ GEM
|
|||
rspec-html-matchers (0.9.4)
|
||||
nokogiri (~> 1)
|
||||
rspec (>= 3.0.0.a, < 4)
|
||||
rspec-mocks (3.11.0)
|
||||
rspec-mocks (3.11.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.11.0)
|
||||
rspec-rails (5.1.1)
|
||||
|
|
@ -380,7 +380,7 @@ GEM
|
|||
json-schema (~> 2.2)
|
||||
railties (>= 3.1, < 7.1)
|
||||
rtlit (0.0.5)
|
||||
rubocop (1.26.0)
|
||||
rubocop (1.27.0)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.1.0.0)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
|
|
@ -389,7 +389,7 @@ GEM
|
|||
rubocop-ast (>= 1.16.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.16.0)
|
||||
rubocop-ast (1.17.0)
|
||||
parser (>= 3.1.1.0)
|
||||
rubocop-discourse (2.5.0)
|
||||
rubocop (>= 1.1.0)
|
||||
|
|
@ -430,7 +430,7 @@ GEM
|
|||
simplecov_json_formatter (~> 0.1)
|
||||
simplecov-html (0.12.3)
|
||||
simplecov_json_formatter (0.1.4)
|
||||
sprockets (3.7.2)
|
||||
sprockets (4.0.3)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.4.2)
|
||||
|
|
@ -439,7 +439,7 @@ GEM
|
|||
sprockets (>= 3.0.0)
|
||||
sshkey (2.0.0)
|
||||
stackprof (0.2.19)
|
||||
test-prof (1.0.7)
|
||||
test-prof (1.0.8)
|
||||
thor (1.2.1)
|
||||
tilt (2.0.10)
|
||||
tzinfo (2.0.4)
|
||||
|
|
@ -453,7 +453,7 @@ GEM
|
|||
unicorn (6.1.0)
|
||||
kgio (~> 2.6)
|
||||
raindrops (~> 0.7)
|
||||
uniform_notifier (1.15.0)
|
||||
uniform_notifier (1.16.0)
|
||||
uri_template (0.7.0)
|
||||
webmock (3.14.0)
|
||||
addressable (>= 2.8.0)
|
||||
|
|
@ -583,7 +583,7 @@ DEPENDENCIES
|
|||
shoulda-matchers
|
||||
sidekiq
|
||||
simplecov
|
||||
sprockets (= 3.7.2)
|
||||
sprockets
|
||||
sprockets-rails
|
||||
sshkey
|
||||
stackprof
|
||||
|
|
@ -598,4 +598,4 @@ DEPENDENCIES
|
|||
yaml-lint
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.5
|
||||
2.3.9
|
||||
|
|
|
|||
|
|
@ -351,10 +351,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
};
|
||||
connection_pool = {
|
||||
groups = ["default"];
|
||||
|
|
@ -573,10 +573,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12d0xkb2qkydygs4py2z2m7vzx0hygx2dnyk98ja8lkj2k348925";
|
||||
sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.92.1";
|
||||
version = "0.92.2";
|
||||
};
|
||||
execjs = {
|
||||
groups = ["assets" "default"];
|
||||
|
|
@ -603,10 +603,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zmak7fgis1nk9j157g2rjzxrw9prr3jzlxap9vix3xm0gkihr53";
|
||||
sha256 = "0rgbmk044akxa84z9vdl8lkmd9z4xy3na1w0vh12pz02drxd93j9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.27.0";
|
||||
version = "2.28.0";
|
||||
};
|
||||
faker = {
|
||||
dependencies = ["i18n"];
|
||||
|
|
@ -1012,10 +1012,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03lzdfwpmywxc6l5apnhfjwl8swf9jz2ajwjgq38am0q60ggjrcf";
|
||||
sha256 = "1ahcnfw3lchyyq7ixjfghkw709fbm8mkqsqq9yhd9in3bhzywa88";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.19";
|
||||
version = "0.2.20";
|
||||
};
|
||||
jwt = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1080,10 +1080,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac";
|
||||
sha256 = "15pjm9pa5m3mbv9xvfgfr16q4jyaznsg8y63jz9x4jqr8npw0vx3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
};
|
||||
logstash-event = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1122,10 +1122,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23";
|
||||
sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
};
|
||||
lru_redux = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1303,10 +1303,10 @@
|
|||
}];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125";
|
||||
sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.5";
|
||||
version = "1.5.1";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1364,10 +1364,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
|
||||
sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.3";
|
||||
version = "1.13.4";
|
||||
};
|
||||
oauth = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1518,10 +1518,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bncdqm62l1q8flw10gl86gcc74zm89s5vrjww73i3094jg64pam";
|
||||
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.22.0";
|
||||
version = "1.22.1";
|
||||
};
|
||||
parallel_tests = {
|
||||
dependencies = ["parallel"];
|
||||
|
|
@ -1529,10 +1529,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vsfsfd194xnzjz94ml157w61fnag8jg47b4bssc508kb3vmk20w";
|
||||
sha256 = "01kzjshbim0w5ax7vcjfxvb83x2pglws7qr43x0qkd731f8w10f7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.3";
|
||||
version = "3.8.1";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
|
|
@ -1540,20 +1540,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
|
||||
sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.1.0";
|
||||
version = "3.1.2.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb";
|
||||
sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
};
|
||||
progress = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1603,10 +1603,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
};
|
||||
puma = {
|
||||
dependencies = ["nio4r"];
|
||||
|
|
@ -1614,10 +1614,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
|
||||
sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.6.2";
|
||||
version = "5.6.4";
|
||||
};
|
||||
r2 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1849,10 +1849,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
|
||||
sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
};
|
||||
request_store = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -1966,10 +1966,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3";
|
||||
sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
};
|
||||
rspec-rails = {
|
||||
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
|
||||
|
|
@ -2030,10 +2030,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03c6v6bfqdw8vnda0if0sx7aff0iq6xnv1adyfs0bi9msgggafcr";
|
||||
sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
|
|
@ -2041,10 +2041,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
|
||||
sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
};
|
||||
rubocop-discourse = {
|
||||
dependencies = ["rubocop" "rubocop-rspec"];
|
||||
|
|
@ -2226,10 +2226,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
|
||||
sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.2";
|
||||
version = "4.0.3";
|
||||
};
|
||||
sprockets-rails = {
|
||||
dependencies = ["actionpack" "activesupport" "sprockets"];
|
||||
|
|
@ -2271,10 +2271,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vg0zjfgibdcgkzb4c25v0f4v6v8mvpzvgcag194rwglmkkyrwkx";
|
||||
sha256 = "04yxdm2cdhwp0wsp8891f06cprp4442p3mlgpdc4pziflpfvaw05";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
@ -2371,10 +2371,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00dj2vsz9sq5i9wnncbiy4v5vayqbssppazzigd1ibpl60pzfxkq";
|
||||
sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
};
|
||||
uri_template = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec {
|
|||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -r share $out/
|
||||
cp -r caffeine/assets/icons $out/share/icons
|
||||
# autostart file
|
||||
cp -r $out/lib/python*/site-packages/etc $out/etc/
|
||||
glib-compile-schemas --strict $out/share/glib-2.0/schemas
|
||||
|
|
|
|||
|
|
@ -13,7 +13,12 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-J6iht3cagcwFekydShgaYJtkNLfEvSDqonkC7+frldM=";
|
||||
|
||||
doCheck = false;
|
||||
preCheck = ''
|
||||
# wormhole_test.go:692: failed to establish connection
|
||||
substituteInPlace wormhole/wormhole_test.go \
|
||||
--replace "TestWormholeDirectoryTransportSendRecvDirect" \
|
||||
"SkipWormholeDirectoryTransportSendRecvDirect"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/psanford/wormhole-william";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "melt";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "melt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HambmUodAwgi1/r/Nj7P7gXNK5pyBO3omMZ9ZvSK7cc=4";
|
||||
sha256 = "sha256-I1LNCrJo3Ihh03aTUG0QhS6ySuMqNJJGyZ8XZzClDlU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1f3QBbWaTiplEp/4ihds1PwrEnoq/81TzlT46TufGFs=";
|
||||
vendorSha256 = "sha256-eRFWDyXN2c5VSxYOE12sczYP3rGtzLjY9M2DQgHNFyA=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.37"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.38"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 214817055bc104e6876882ef794f1de1031edb53
|
||||
ref: refs/tags/6.1.37
|
||||
revision: 295599a02453423ea06e25c7f4347d88d1f2debc
|
||||
ref: refs/tags/6.1.38
|
||||
specs:
|
||||
metasploit-framework (6.1.37)
|
||||
metasploit-framework (6.1.38)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -31,7 +31,7 @@ GIT
|
|||
metasploit-concern
|
||||
metasploit-credential
|
||||
metasploit-model
|
||||
metasploit-payloads (= 2.0.80)
|
||||
metasploit-payloads (= 2.0.83)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.18)
|
||||
mqtt
|
||||
|
|
@ -129,13 +129,13 @@ GEM
|
|||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.575.0)
|
||||
aws-sdk-core (3.130.0)
|
||||
aws-partitions (1.577.0)
|
||||
aws-sdk-core (3.130.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.305.0)
|
||||
aws-sdk-ec2 (1.307.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.68.0)
|
||||
|
|
@ -254,7 +254,7 @@ GEM
|
|||
activemodel (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
railties (~> 6.0)
|
||||
metasploit-payloads (2.0.80)
|
||||
metasploit-payloads (2.0.83)
|
||||
metasploit_data_models (5.0.5)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -308,7 +308,7 @@ GEM
|
|||
ruby-rc4
|
||||
ttfunk
|
||||
pg (1.3.5)
|
||||
public_suffix (4.0.6)
|
||||
public_suffix (4.0.7)
|
||||
puma (5.6.4)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.6.0)
|
||||
|
|
@ -388,7 +388,7 @@ GEM
|
|||
ruby-macho (3.0.0)
|
||||
ruby-rc4 (0.1.5)
|
||||
ruby2_keywords (0.0.5)
|
||||
ruby_smb (3.0.6)
|
||||
ruby_smb (3.1.0)
|
||||
bindata
|
||||
openssl-ccm
|
||||
openssl-cmac
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.37";
|
||||
version = "6.1.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-umSWJq9jJrjawP+eXkZEKcomJNHpt7IOk+ZI1iAM6OU=";
|
||||
sha256 = "sha256-3wpO2+ALt5sw6TSGCp7ARn5TEHVi+bBgP4uJPRwVIOM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -104,30 +104,30 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07kbrac2r883h4bsw4qhgkd97v0f4p05saqj8zsy300wx56nyssm";
|
||||
sha256 = "0rl0wcvcl1dnyzyxs0m6iyma0ibx2f9a2d4zac6hrdfcqf4s6zx9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.575.0";
|
||||
version = "1.577.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm";
|
||||
sha256 = "0lrmk788830adljzfdv9ws4q7cqfh0qyp7w908pja4rkgsd4baln";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.130.0";
|
||||
version = "3.130.1";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dpid33sl72nsxyr7d57yqzqb9jby0dyjc0ncncdm41is7d25vki";
|
||||
sha256 = "13dbg60p44llx4h99s6vdqngkwkx1521ixvzrlj630wrjp6dfkp2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.305.0";
|
||||
version = "1.307.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -694,12 +694,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "214817055bc104e6876882ef794f1de1031edb53";
|
||||
sha256 = "1rg81hhdcj76jc7b5dz9s4j2dji98i35x7pzq3dbh9k3mwk9cr5s";
|
||||
rev = "295599a02453423ea06e25c7f4347d88d1f2debc";
|
||||
sha256 = "1qr02lf3v2cb7xhb1yb2fl856zj6q2g0m1ilx4q9pdqbw3dlw2nz";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.37";
|
||||
version = "6.1.38";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -716,10 +716,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12xggj210fqprkcd6zb4rnis12l9q2fi42gmwh2hfdwvbm3syvzy";
|
||||
sha256 = "15vlazx39flz2pci2yqjcgd4ljslhivbq1vvyajgsxl15q772ni0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.80";
|
||||
version = "2.0.83";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1017,10 +1017,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
};
|
||||
puma = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1387,10 +1387,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mxm2948xz9pfl2jhngvjw89arvm9qznrf86pbqi8hi7cxfr4grk";
|
||||
sha256 = "0j378l0zh3y2hdnxx753p2ds7nssi8v08fkv1wzm3yl5ws8zkxaf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.6";
|
||||
version = "3.1.0";
|
||||
};
|
||||
rubyntlm = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xjadeo";
|
||||
version = "0.8.10";
|
||||
version = "0.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "xjadeo";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dma4cjgbrpy16x63zvfr0xss4lryl0zw7nvixvhq2f6z8day1ds";
|
||||
sha256 = "sha256-S8eIkmfjwpcILZc+by0Mk4VPRUlbJT0GBe8NlJ1F9EI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -344,8 +344,8 @@ mapAliases ({
|
|||
electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
|
||||
|
||||
# Emacs
|
||||
emacs27Packages = emacs27.pkgs; # Added 2020-12-18
|
||||
emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18
|
||||
emacs28Packages = emacs28.pkgs; # Added 2021-10-04
|
||||
emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04
|
||||
emacsPackages = emacs.pkgs; # Added 2020-12-18
|
||||
emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22
|
||||
emacsPackagesNg = emacs.pkgs; # Added 2019-08-07
|
||||
|
|
|
|||
|
|
@ -25500,10 +25500,11 @@ with pkgs;
|
|||
|
||||
em = callPackage ../applications/editors/em { };
|
||||
|
||||
emacs = emacs27;
|
||||
emacs-nox = emacs27-nox;
|
||||
emacs = emacs28;
|
||||
emacsNativeComp = emacs28NativeComp;
|
||||
emacs-nox = emacs28-nox;
|
||||
|
||||
emacs27 = callPackage ../applications/editors/emacs/27.nix {
|
||||
emacs28 = callPackage ../applications/editors/emacs/28.nix {
|
||||
# use override to enable additional features
|
||||
libXaw = xorg.libXaw;
|
||||
Xaw3d = null;
|
||||
|
|
@ -25515,7 +25516,11 @@ with pkgs;
|
|||
inherit (darwin) sigtool;
|
||||
};
|
||||
|
||||
emacs27-nox = lowPrio (emacs27.override {
|
||||
emacs28NativeComp = emacs28.override {
|
||||
nativeComp = true;
|
||||
};
|
||||
|
||||
emacs28-nox = lowPrio (emacs28.override {
|
||||
withX = false;
|
||||
withNS = false;
|
||||
withGTK2 = false;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,6 @@
|
|||
};
|
||||
|
||||
# This is an alias which we disallow by default; explicitly allow it
|
||||
emacs27Packages = emacs27.pkgs;
|
||||
emacs28Packages = emacs28.pkgs;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3215,6 +3215,8 @@ in {
|
|||
inherit (pkgs) bluez glib pkg-config;
|
||||
};
|
||||
|
||||
gb-io = callPackage ../development/python-modules/gb-io { };
|
||||
|
||||
gbinder-python = callPackage ../development/python-modules/gbinder-python { };
|
||||
|
||||
gcovr = callPackage ../development/python-modules/gcovr { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue