mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e3f1f8bba2
@ -214,6 +214,13 @@
|
||||
<link xlink:href="options.html#opt-services.soju.enable">services.soju</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://nats.io/">nats</link>, a high
|
||||
performance cloud and edge messaging system. Available as
|
||||
<link linkend="opt-services.nats.enable">services.nats</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-incompatibilities">
|
||||
|
||||
@ -65,6 +65,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
|
||||
|
||||
- [soju](https://sr.ht/~emersion/soju), a user-friendly IRC bouncer. Available as [services.soju](options.html#opt-services.soju.enable).
|
||||
|
||||
- [nats](https://nats.io/), a high performance cloud and edge messaging system. Available as [services.nats](#opt-services.nats.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
|
||||
|
||||
|
||||
|
||||
@ -221,9 +221,10 @@ in {
|
||||
default = config.networking.hostName;
|
||||
description = ''
|
||||
The domain name of the server, with optional explicit port.
|
||||
This is used by remote servers to connect to this server,
|
||||
e.g. matrix.org, localhost:8080, etc.
|
||||
This is used by remote servers to look up the server address.
|
||||
This is also the last part of your UserID.
|
||||
|
||||
The server_name cannot be changed later so it is important to configure this correctly before you start Synapse.
|
||||
'';
|
||||
};
|
||||
public_baseurl = mkOption {
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.15.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.16.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "0cbz2l31cg87n6qlbvwdjy92q9qgmmkrsvaj37cc34ajh7asd833";
|
||||
sha256 = "1na5ja68h14smfwxrli1kfr6fhf5dshyvcdaj0c4mwms838bdl4j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
diff --git a/comm/mail/config/mozconfigs/common b/comm/mail/config/mozconfigs/common
|
||||
--- a/comm/mail/config/mozconfigs/common
|
||||
+++ b/comm/mail/config/mozconfigs/common
|
||||
@@ -1,6 +1,3 @@
|
||||
ac_add_options --enable-application=comm/mail
|
||||
|
||||
-# Disable enforcing that add-ons are signed by the trusted root.
|
||||
-MOZ_REQUIRE_SIGNING=
|
||||
-
|
||||
. "$topsrcdir/build/mozconfig.common.override"
|
||||
diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure
|
||||
--- a/comm/mail/moz.configure
|
||||
+++ b/comm/mail/moz.configure
|
||||
@@ -12,6 +12,7 @@
|
||||
imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/")
|
||||
|
||||
imply_option("--enable-default-browser-agent", False)
|
||||
+imply_option("MOZ_REQUIRE_SIGNING", False)
|
||||
|
||||
|
||||
@depends(target_is_windows, target_is_linux)
|
||||
|
||||
@ -19,6 +19,12 @@ rec {
|
||||
};
|
||||
patches = [
|
||||
./no-buildconfig-90.patch
|
||||
|
||||
# There is a bug in Thunderbird 91 where add-ons are required
|
||||
# to be signed when the build is run with default settings.
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1727113
|
||||
# https://phabricator.services.mozilla.com/D124361
|
||||
./D124361.diff
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -16,12 +16,12 @@ with lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.15.0";
|
||||
version = "1.15.2";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-Wu5rtVoQql/0XWkszYOqE4QJxKUY/CsCpmjkaB+E6Hc=";
|
||||
sha256 = "sha256-zvWJ1Q8nJw4hjPeBnuVprjn2NSlFwv4BwtHwgwHHvSI=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -16,6 +16,18 @@
|
||||
"Fuzzy_Clock@dallagi",
|
||||
"fuzzy-clock@keepawayfromfire.co.uk"
|
||||
],
|
||||
"hide-activities-button": [
|
||||
"Hide_Activities@shay.shayel.org",
|
||||
"hide-activities-button@nmingori.gnome-shell-extensions.org"
|
||||
],
|
||||
"shutdowntimer": [
|
||||
"ShutdownTimer@neumann",
|
||||
"ShutdownTimer@deminder"
|
||||
],
|
||||
"noannoyance": [
|
||||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
],
|
||||
"transparent-window": [
|
||||
"transparent-window@pbxqdown.github.com",
|
||||
"transparentwindows.mdirshad07"
|
||||
@ -23,6 +35,10 @@
|
||||
"floating-dock": [
|
||||
"floatingDock@sun.wxg@gmail.com",
|
||||
"floating-dock@nandoferreira_prof@hotmail.com"
|
||||
],
|
||||
"gnome-trash": [
|
||||
"gnome-trash@gnome-trash.b00f.gitlab.com",
|
||||
"gnome-trash@b00f.github.io"
|
||||
]
|
||||
},
|
||||
"40": {
|
||||
@ -37,6 +53,23 @@
|
||||
"lock-keys": [
|
||||
"lockkeys@vaina.lt",
|
||||
"lockkeys@fawtytoo"
|
||||
],
|
||||
"hide-activities-button": [
|
||||
"Hide_Activities@shay.shayel.org",
|
||||
"hide-activities-button@nmingori.gnome-shell-extensions.org"
|
||||
],
|
||||
"shutdowntimer": [
|
||||
"ShutdownTimer@neumann",
|
||||
"shutdown-timer-gnome-shell-extension",
|
||||
"ShutdownTimer@deminder"
|
||||
],
|
||||
"noannoyance": [
|
||||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
],
|
||||
"extension-list": [
|
||||
"extension-list@tu.berry",
|
||||
"screen-lock@garciabaameiro.com"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,6 +16,22 @@
|
||||
"system-monitor@paradoxxx.zero.gmail.com" = "system-monitor"; # manually packaged
|
||||
"System_Monitor@bghome.gmail.com" = "system-monitor-2";
|
||||
|
||||
"Hide_Activities@shay.shayel.org" = "hide-activities-button";
|
||||
"hide-activities-button@nmingori.gnome-shell-extensions.org" = "hide-activities-button-2";
|
||||
|
||||
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
|
||||
# there seem to be upstream plans, so this should be checked periodically:
|
||||
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
|
||||
"ShutdownTimer@neumann" = null;
|
||||
"shutdown-timer-gnome-shell-extension" = "shutdowntimer-2";
|
||||
"ShutdownTimer@deminder" = "shutdowntimer";
|
||||
|
||||
"noannoyance@sindex.com" = "noannoyance";
|
||||
"noannoyance@daase.net" = "noannoyance-2";
|
||||
|
||||
"extension-list@tu.berry" = "extension-list";
|
||||
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug
|
||||
|
||||
|
||||
# ############################################################################
|
||||
# These are conflicts for 3.38 extensions. They will very probably come back
|
||||
@ -32,7 +48,6 @@
|
||||
#"flypie@schneegans.github.com" = null;
|
||||
|
||||
|
||||
|
||||
# ############################################################################
|
||||
# Overrides for extensions that were manually packaged in the past but are gradually
|
||||
# being replaced by automatic packaging where possible.
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -110,5 +110,7 @@ stdenv.mkDerivation {
|
||||
# "All of the code in the compiler-rt project is dual licensed under the MIT
|
||||
# license and the UIUC License (a BSD-like license)":
|
||||
license = with lib.licenses; [ mit ncsa ];
|
||||
# TODO/FIXME: Build fails on Hydra:
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "24.0.5";
|
||||
sha256 = "4ZyYcBhep67aPr8SY7JK/3YXD5Th8UcyjTP7UIZ5c5Q=";
|
||||
version = "24.0.6";
|
||||
sha256 = "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z";
|
||||
}
|
||||
|
||||
@ -1,16 +1,26 @@
|
||||
{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, cairo, cmake, opencv, pcre, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frei0r-plugins";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
|
||||
hash = "sha256-Gx/48Pm8I+7XJOlOmnwdjwJEv+M0JLtP5o5kYMCIUjo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf pkg-config ];
|
||||
buildInputs = [ cairo opencv ];
|
||||
# A PR to add support for OpenCV 4 was merged in May 2020. This
|
||||
# patch can be removed when a release beyond 1.7.0 is issued.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "opencv4-support.patch";
|
||||
url = "https://github.com/dyne/frei0r/commit/c0c8eed79fc8abe6c9881a53d7391efb526a3064.patch";
|
||||
sha256 = "sha256-qxUAui4EEBEj8M/SoyMUkj//KegMTTT6FTBDC/Chxz4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ cairo opencv pcre ];
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
for f in $out/lib/frei0r-1/*.so* ; do
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "22.1.0";
|
||||
version = "23.0.0";
|
||||
pname = "azure-mgmt-compute";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "2aad414843aee0f54427f887f7536cc5155d6852728d44dfeef633ac52135fdc";
|
||||
sha256 = "1eb26b965ba4049ddcf10d4f25818725fc03c491c3be76537d0d74ceb1146b04";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
39
pkgs/development/python-modules/certauth/default.nix
Normal file
39
pkgs/development/python-modules/certauth/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pyopenssl
|
||||
, tldextract
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certauth";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikreymer";
|
||||
repo = "certauth";
|
||||
rev = "ad2bae5d40a9e45519fc1f2cd7678174bbc55b3d"; # Repo has no git tags
|
||||
sha256 = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyopenssl
|
||||
tldextract
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "certauth" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple CertificateAuthority and host certificate creation, useful for man-in-the-middle HTTPS proxy";
|
||||
homepage = "https://github.com/ikreymer/certauth";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cucumber-tag-expressions";
|
||||
version = "3.0.1";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "71823468f567726332b87f40530b27fc83b35daea6514f5cbb03f0533d96e5be";
|
||||
sha256 = "83ce5fa87d1b37a690106aedf58a12d0d16758f38f73336f2c703e2bfe01d7db";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest-html ];
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dogpile.cache";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6f0bcf97c73bfec1a7bf14e5a248488cee00c2d494bf63f3789ea6d95a57c1cf";
|
||||
sha256 = "ea09bebf24bb7c028caf98963785fe9ad0bd397305849a3303bc5380d468d813";
|
||||
};
|
||||
|
||||
# Disable concurrency tests that often fail,
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage (rec {
|
||||
pname = "elasticsearch";
|
||||
version = "7.14.0";
|
||||
version = "7.14.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f3ab1454e646170bbc6796b8707e4bff125234391d2acc022221e1c0313becb4";
|
||||
sha256 = "f928898fe06869516f2603f9a96a6f166c06888233806b31ac6568bac0266501";
|
||||
};
|
||||
|
||||
# Check is disabled because running them destroy the content of the local cluster!
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.2.3";
|
||||
version = "2.3.0";
|
||||
pname = "elementpath";
|
||||
disabled = isPy27; # uses incompatible class syntax
|
||||
|
||||
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
owner = "sissaschool";
|
||||
repo = "elementpath";
|
||||
rev = "v${version}";
|
||||
sha256 = "142w8xbxdvz6949nqd4malqijyxfcv917cls4lsv4x7164b4naf7";
|
||||
sha256 = "1zghj0v1s03ahynx7sczag7iaam757ypwl1lm0ym6j37dnq8vnxk";
|
||||
};
|
||||
|
||||
# avoid circular dependency with xmlschema which directly depends on this
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "eventlet";
|
||||
version = "0.31.1";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0xldgwjf9jkp28rn0pg0i32bg6m7pdh7dwgi0grcvqzs0iii5sdr";
|
||||
sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dnspython greenlet monotonic six ]
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2faca51e974c46203c09fd4cb2c03fd6e82cd572cc06a2bbc3b401aa419cb09f";
|
||||
sha256 = "ad1bf9991bdee2a2fee44d19e54790a6eb900652841a5d7a32aa1c468a196f49";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-re2";
|
||||
version = "0.2.20210801";
|
||||
version = "0.2.20210901";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0806d78691e67970b3761767a30f1c631fed85b87001266c6adcb672ac2c9beb";
|
||||
sha256 = "676fa9ee54e3fb70f290526fc0f4d78d1e5a4add701b5547494eaf7c68c72247";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mechanize";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6355c11141f6d4b54a17fc2106944806b5db2711e60b120d15d83db438c333fd";
|
||||
sha256 = "d16cea241253b5eb6380bf8a46627cad91d1f2c3f93a33279a31ce276d6c5d44";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ html5lib ];
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwparserfromhell";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d3f74c0101f81ff73c61985b67f2e7048a30dc5f6a578ea1544e69133988d874";
|
||||
sha256 = "1ad779f1bc0808d280ec1026c9de74f424de535568e21debd12830b5b0fa097e";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pefile";
|
||||
version = "2021.5.24";
|
||||
version = "2021.9.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erocarrera";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0qdy88dvy29ixsyfqdcvf3w6rz09vpimk0568i09v1ayhs52p62k";
|
||||
sha256 = "1pgsw84i9r6ydkfzqifgl5lvcz3cf3xz5c2543kl3q8mgb21wxaz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyacoustid";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e62b2929fbc5ead508758d2f700f5d355f7d83d14f5efe33c1d4fc59cbdeba84";
|
||||
sha256 = "c279d9c30a7f481f1420fc37db65833b5f9816cd364dc2acaa93a11c482d4141";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests audioread ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transitions";
|
||||
version = "0.8.8";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-56hrMaFhp2Ez8Ymzrp2tJ1WoDqTB4O7hgFZI0CH7Z30=";
|
||||
sha256 = "fc2ec6d6b6f986cd7e28e119eeb9ba1c9cc51ab4fbbdb7f2dedad01983fd2de0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
28
pkgs/development/tools/gokart/default.nix
Normal file
28
pkgs/development/tools/gokart/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gokart";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wfv33yi83klnnyfas7wnsnx34cf28k1yvq06lkii96fvnzcar36";
|
||||
};
|
||||
|
||||
vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd";
|
||||
|
||||
# Would need files to scan which are not shipped by the project
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Static analysis tool for securing Go code";
|
||||
homepage = "https://github.com/praetorian-inc/gokart";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wrangler";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Dr1qVdB/UliZM8gUVibi5vyO3Ni4icUqQXTo3UYmFqQ=";
|
||||
sha256 = "sha256-RnnmhdfYAmqfi2aM2oYrieFNOkiae4WGfR5RoHeNfmw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-XDMxNqWxHDof5L1zX99DH1nSpqqi4NlnjtljQxNWagw=";
|
||||
cargoSha256 = "sha256-sneNRs4DPrNA84K73DVSxAAmZ2fqX6VyQhF8bKgIbaQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.38.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.39.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851",
|
||||
"sha256": "1wyvk0niyppg7h9ayfsiy6x309bjwsbgf62nah13aps89jk8n1pc",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.38/alpha/linux64",
|
||||
"version": "1.1.38"
|
||||
"url": "https://factorio.com/get-download/1.1.39/alpha/linux64",
|
||||
"version": "1.1.39"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.38.tar.xz",
|
||||
@ -38,12 +38,12 @@
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.38.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.39.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71",
|
||||
"sha256": "06figqmyd5bgwhpppziag4hs7x3ixr7wd8186cza3ly57bibha2m",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.38/headless/linux64",
|
||||
"version": "1.1.38"
|
||||
"url": "https://factorio.com/get-download/1.1.39/headless/linux64",
|
||||
"version": "1.1.39"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.38.tar.xz",
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib, stdenv
|
||||
, rtpPath ? "share/vim-plugins"
|
||||
, rtpPath
|
||||
, vim
|
||||
, vimGenDocHook
|
||||
}:
|
||||
|
||||
rec {
|
||||
@ -25,6 +26,7 @@ rec {
|
||||
addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
|
||||
name = namePrefix + name;
|
||||
|
||||
nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ vimGenDocHook ];
|
||||
inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
|
||||
|
||||
installPhase = ''
|
||||
@ -34,21 +36,6 @@ rec {
|
||||
mkdir -p $out/${rtpPath}
|
||||
cp -r . $target
|
||||
|
||||
# build help tags
|
||||
if [ -d "$target/doc" ]; then
|
||||
echo "Building help tags"
|
||||
if ! ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -V1 -c "helptags $target/doc" +quit!; then
|
||||
echo "Failed to build help tags!"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "No docs available"
|
||||
fi
|
||||
|
||||
if [ -n "$addonInfo" ]; then
|
||||
echo "$addonInfo" > $target/addon-info.json
|
||||
fi
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}));
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
let
|
||||
|
||||
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
|
||||
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook;
|
||||
|
||||
inherit (lib) extends;
|
||||
|
||||
@ -11,6 +11,8 @@ let
|
||||
# Convert derivation to a vim plugin.
|
||||
toVimPlugin = drv:
|
||||
drv.overrideAttrs(oldAttrs: {
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ vimGenDocHook ];
|
||||
passthru = (oldAttrs.passthru or {}) // {
|
||||
vimPlugin = true;
|
||||
};
|
||||
|
||||
13
pkgs/misc/vim-plugins/update-shell.nix
Normal file
13
pkgs/misc/vim-plugins/update-shell.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ nixpkgs ? import ../../.. { } }:
|
||||
with nixpkgs;
|
||||
let
|
||||
pyEnv = python3.withPackages(ps: [ ps.GitPython ]);
|
||||
in
|
||||
mkShell {
|
||||
packages = [
|
||||
bash
|
||||
pyEnv
|
||||
nix-prefetch-scripts
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3
|
||||
#!nix-shell update-shell.nix -i python3
|
||||
|
||||
|
||||
# format:
|
||||
# $ nix run nixpkgs.python3Packages.black -c black update.py
|
||||
|
||||
31
pkgs/misc/vim-plugins/vim-gen-doc-hook.sh
Normal file
31
pkgs/misc/vim-plugins/vim-gen-doc-hook.sh
Normal file
@ -0,0 +1,31 @@
|
||||
echo "Sourcing vim-gen-doc-hook"
|
||||
|
||||
# the doc folder is copied via the copy_directories entry of the rockspec
|
||||
# in the folder gitsigns.nvim-scm-1-rocks/gitsigns.nvim/scm-1
|
||||
vimPluginGenTags() {
|
||||
echo "Executing vimPluginGenTags"
|
||||
|
||||
target="$out/@rtpPath@/$pname"
|
||||
mkdir -p $out/@rtpPath@
|
||||
cp -r . $target
|
||||
|
||||
# build help tags
|
||||
if [ -d "$target/doc" ]; then
|
||||
echo "Building help tags"
|
||||
if ! @vimBinary@ -N -u NONE -i NONE -n -E -s -V1 -c "helptags $target/doc" +quit!; then
|
||||
echo "Failed to build help tags!"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "No docs available"
|
||||
fi
|
||||
|
||||
if [ -n "$addonInfo" ]; then
|
||||
echo "$addonInfo" > $target/addon-info.json
|
||||
fi
|
||||
|
||||
echo "Finished executing vimPluginInstallPhase"
|
||||
}
|
||||
|
||||
preFixupHooks+=(vimPluginGenTags)
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, fetchFromGitHub, runtimeShell
|
||||
, hasLuaModule
|
||||
, python3
|
||||
, callPackage, makeSetupHook
|
||||
}:
|
||||
|
||||
/*
|
||||
@ -485,7 +486,18 @@ rec {
|
||||
'';
|
||||
};
|
||||
|
||||
inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix;
|
||||
vimGenDocHook = callPackage ({ vim }:
|
||||
makeSetupHook {
|
||||
name = "vim-gen-doc-hook";
|
||||
deps = [ vim ];
|
||||
substitutions = {
|
||||
vimBinary = "${vim}/bin/vim";
|
||||
inherit rtpPath;
|
||||
};
|
||||
} ./vim-gen-doc-hook.sh) {};
|
||||
|
||||
inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim vimGenDocHook; })
|
||||
buildVimPlugin buildVimPluginFrom2Nix;
|
||||
|
||||
# used to figure out which python dependencies etc. neovim needs
|
||||
requiredPlugins = {
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lemmy-server";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LemmyNet";
|
||||
repo = "lemmy";
|
||||
rev = version;
|
||||
sha256 = "sha256-wDRBeAYjPpAd3DL99fH4Yng994hGmAmxlBqzOeXTP88=";
|
||||
sha256 = "sha256-AFVipxzKwNiillVmMA+Q7nMKajN9mzw37mBpqzf+XpM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7wF5mUjSeJvCNLZcR6XB31RX2RLOOEyTGpOQxg+NcWk=";
|
||||
cargoSha256 = "sha256-nxuynzQRUqne1KZIvP152afWbG2Zb9zyCqy7Bx4PeJ8=";
|
||||
|
||||
buildInputs = [ postgresql ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
||||
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ultra relevant and instant full-text search API";
|
||||
description = "🐀 Building a federated alternative to reddit in rust";
|
||||
homepage = "https://join-lemmy.org/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
|
||||
@ -18,6 +18,11 @@ stdenv.mkDerivation {
|
||||
sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix location of timezone data for TZ= completion
|
||||
./tz_completion.patch
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses pcre ];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
14
pkgs/shells/zsh/tz_completion.patch
Normal file
14
pkgs/shells/zsh/tz_completion.patch
Normal file
@ -0,0 +1,14 @@
|
||||
On NixOS, timezone data is located at /etc/zoneinfo
|
||||
diff --git a/Completion/Unix/Type/_time_zone b/Completion/Unix/Type/_time_zone
|
||||
index cd924bbc7..5d683291b 100644
|
||||
--- a/Completion/Unix/Type/_time_zone
|
||||
+++ b/Completion/Unix/Type/_time_zone
|
||||
@@ -3,7 +3,7 @@
|
||||
local expl
|
||||
|
||||
if (( ! $+_zoneinfo_dirs )); then
|
||||
- _zoneinfo_dirs=( /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )
|
||||
+ _zoneinfo_dirs=( /etc/zoneinfo /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )
|
||||
fi
|
||||
|
||||
_wanted time-zones expl 'time zone' _files -W _zoneinfo_dirs "$@" -
|
||||
@ -7,11 +7,11 @@
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "salt";
|
||||
version = "3003.2";
|
||||
version = "3003.3";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c8hsRLF22M/cAzux5C5P3I3TQkgz+qLqDQk4+hc4Vqk=";
|
||||
sha256 = "pvnIyLXiYA6oYgtKZzcd4XYRvrT42X5LubCzCKN+0eI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
31
pkgs/tools/security/nmap-formatter/default.nix
Normal file
31
pkgs/tools/security/nmap-formatter/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nmap-formatter";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vdjagilev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1r8l7ajcb436b60ir6xgy53wafk6rw1cil326yg6mhcngz9sazbk";
|
||||
};
|
||||
|
||||
vendorSha256 = "0c1b4iw28qj8iq55lg32xqw69jjdv5ial495j0gz68s17kydbwhb";
|
||||
|
||||
postPatch = ''
|
||||
# Fix hard-coded release
|
||||
substituteInPlace cmd/root.go \
|
||||
--replace "0.2.0" "${version}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool that allows you to convert nmap output";
|
||||
homepage = "https://github.com/vdjagilev/nmap-formatter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -5437,6 +5437,8 @@ with pkgs;
|
||||
|
||||
gitea = callPackage ../applications/version-management/gitea { };
|
||||
|
||||
gokart = callPackage ../development/tools/gokart { };
|
||||
|
||||
gl2ps = callPackage ../development/libraries/gl2ps { };
|
||||
|
||||
glab = callPackage ../applications/version-management/git-and-tools/glab { };
|
||||
@ -7576,6 +7578,8 @@ with pkgs;
|
||||
graphicalSupport = true;
|
||||
};
|
||||
|
||||
nmap-formatter = callPackage ../tools/security/nmap-formatter { };
|
||||
|
||||
nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { };
|
||||
|
||||
nnn = callPackage ../applications/misc/nnn { };
|
||||
|
||||
@ -1371,6 +1371,8 @@ in {
|
||||
|
||||
cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { };
|
||||
|
||||
certauth = callPackage ../development/python-modules/certauth { };
|
||||
|
||||
certbot = callPackage ../development/python-modules/certbot { };
|
||||
|
||||
certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user