gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into haskell-updates

Browse Source
This commit is contained in:
sternenseemann
2021-10-06 22:54:03 +02:00
parent 4f6767556e d25fa35e02
commit 6bd7a35f23
49 changed files with 985 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/periodic-merge-24h.yml
+4
View File
@@ -28,6 +28,10 @@ jobs:
pairs:
- from: master
into: haskell-updates
- from: release-21.05
into: staging-next-21.05
- from: staging-next-21.05
into: staging-21.05
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
steps:
- uses: actions/checkout@v2
.github/workflows/periodic-merge-6h.yml
-4
View File
@@ -30,10 +30,6 @@ jobs:
into: staging-next
- from: staging-next
into: staging
- from: release-21.05
into: staging-next-21.05
- from: staging-next-21.05
into: staging-21.05
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
steps:
- uses: actions/checkout@v2
lib/systems/supported.nix
+1
View File
@@ -16,6 +16,7 @@ rec {
];
tier3 = [
"aarch64-darwin"
"armv6l-linux"
"armv7l-linux"
"i686-linux"
nixos/modules/module-list.nix
+1
View File
@@ -985,6 +985,7 @@
./services/web-apps/jirafeau.nix
./services/web-apps/jitsi-meet.nix
./services/web-apps/keycloak.nix
./services/web-apps/lemmy.nix
./services/web-apps/limesurvey.nix
./services/web-apps/mastodon.nix
./services/web-apps/mattermost.nix
nixos/modules/services/web-apps/lemmy.md
+34
View File
@@ -0,0 +1,34 @@
# Lemmy {#module-services-lemmy}
Lemmy is a federated alternative to reddit in rust.
## Quickstart {#module-services-lemmy-quickstart}
the minimum to start lemmy is
```nix
services.lemmy = {
enable = true;
settings = {
hostname = "lemmy.union.rocks";
database.createLocally = true;
};
jwtSecretPath = "/run/secrets/lemmyJwt";
caddy.enable = true;
}
```
(note that you can use something like agenix to get your secret jwt to the specified path)
this will start the backend on port 8536 and the frontend on port 1234.
It will expose your instance with a caddy reverse proxy to the hostname you've provided.
Postgres will be initialized on that same instance automatically.
## Usage {#module-services-lemmy-usage}
On first connection you will be asked to define an admin user.
## Missing {#module-services-lemmy-missing}
- Exposing with nginx is not implemented yet.
- This has been tested using a local database with a unix socket connection. Using different database settings will likely require modifications
nixos/modules/services/web-apps/lemmy.nix
+238
View File
@@ -0,0 +1,238 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.services.lemmy;
settingsFormat = pkgs.formats.json { };
in
{
meta.maintainers = with maintainers; [ happysalada ];
# Don't edit the docbook xml directly, edit the md and generate it:
# `pandoc lemmy.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > lemmy.xml`
meta.doc = ./lemmy.xml;
options.services.lemmy = {
enable = mkEnableOption "lemmy a federated alternative to reddit in rust";
jwtSecretPath = mkOption {
type = types.path;
description = "Path to read the jwt secret from.";
};
ui = {
port = mkOption {
type = types.port;
default = 1234;
description = "Port where lemmy-ui should listen for incoming requests.";
};
};
caddy.enable = mkEnableOption "exposing lemmy with the caddy reverse proxy";
settings = mkOption {
default = { };
description = "Lemmy configuration";
type = types.submodule {
freeformType = settingsFormat.type;
options.hostname = mkOption {
type = types.str;
default = null;
description = "The domain name of your instance (eg 'lemmy.ml').";
};
options.port = mkOption {
type = types.port;
default = 8536;
description = "Port where lemmy should listen for incoming requests.";
};
options.federation = {
enabled = mkEnableOption "activitypub federation";
};
options.captcha = {
enabled = mkOption {
type = types.bool;
default = true;
description = "Enable Captcha.";
};
difficulty = mkOption {
type = types.enum [ "easy" "medium" "hard" ];
default = "medium";
description = "The difficultly of the captcha to solve.";
};
};
options.database.createLocally = mkEnableOption "creation of database on the instance";
};
};
};
config =
let
localPostgres = (cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql");
in
lib.mkIf cfg.enable {
services.lemmy.settings = (mapAttrs (name: mkDefault)
{
bind = "127.0.0.1";
tls_enabled = true;
pictrs_url = with config.services.pict-rs; "http://${address}:${toString port}";
actor_name_max_length = 20;
rate_limit.message = 180;
rate_limit.message_per_second = 60;
rate_limit.post = 6;
rate_limit.post_per_second = 600;
rate_limit.register = 3;
rate_limit.register_per_second = 3600;
rate_limit.image = 6;
rate_limit.image_per_second = 3600;
} // {
database = mapAttrs (name: mkDefault) {
user = "lemmy";
host = "/run/postgresql";
port = 5432;
database = "lemmy";
pool_size = 5;
};
});
services.postgresql = mkIf localPostgres {
enable = mkDefault true;
};
services.pict-rs.enable = true;
services.caddy = mkIf cfg.caddy.enable {
enable = mkDefault true;
virtualHosts."${cfg.settings.hostname}" = {
extraConfig = ''
handle_path /static/* {
root * ${pkgs.lemmy-ui}/dist
file_server
}
@for_backend {
path /api/* /pictrs/* feeds/* nodeinfo/*
}
handle @for_backend {
reverse_proxy 127.0.0.1:${toString cfg.settings.port}
}
@post {
method POST
}
handle @post {
reverse_proxy 127.0.0.1:${toString cfg.settings.port}
}
@jsonld {
header Accept "application/activity+json"
header Accept "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""
}
handle @jsonld {
reverse_proxy 127.0.0.1:${toString cfg.settings.port}
}
handle {
reverse_proxy 127.0.0.1:${toString cfg.ui.port}
}
'';
};
};
assertions = [{
assertion = cfg.settings.database.createLocally -> localPostgres;
message = "if you want to create the database locally, you need to use a local database";
}];
systemd.services.lemmy = {
description = "Lemmy server";
environment = {
LEMMY_CONFIG_LOCATION = "/run/lemmy/config.hjson";
# Verify how this is used, and don't put the password in the nix store
LEMMY_DATABASE_URL = with cfg.settings.database;"postgres:///${database}?host=${host}";
};
documentation = [
"https://join-lemmy.org/docs/en/administration/from_scratch.html"
"https://join-lemmy.org/docs"
];
wantedBy = [ "multi-user.target" ];
after = [ "pict-rs.service " ] ++ lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ];
requires = lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ];
# script is needed here since loadcredential is not accessible on ExecPreStart
script = ''
${pkgs.coreutils}/bin/install -m 600 ${settingsFormat.generate "config.hjson" cfg.settings} /run/lemmy/config.hjson
jwtSecret="$(< $CREDENTIALS_DIRECTORY/jwt_secret )"
${pkgs.jq}/bin/jq ".jwt_secret = \"$jwtSecret\"" /run/lemmy/config.hjson | ${pkgs.moreutils}/bin/sponge /run/lemmy/config.hjson
${pkgs.lemmy-server}/bin/lemmy_server
'';
serviceConfig = {
DynamicUser = true;
RuntimeDirectory = "lemmy";
LoadCredential = "jwt_secret:${cfg.jwtSecretPath}";
};
};
systemd.services.lemmy-ui = {
description = "Lemmy ui";
environment = {
LEMMY_UI_HOST = "127.0.0.1:${toString cfg.ui.port}";
LEMMY_INTERNAL_HOST = "127.0.0.1:${toString cfg.settings.port}";
LEMMY_EXTERNAL_HOST = cfg.settings.hostname;
LEMMY_HTTPS = "false";
};
documentation = [
"https://join-lemmy.org/docs/en/administration/from_scratch.html"
"https://join-lemmy.org/docs"
];
wantedBy = [ "multi-user.target" ];
after = [ "lemmy.service" ];
requires = [ "lemmy.service" ];
serviceConfig = {
DynamicUser = true;
WorkingDirectory = "${pkgs.lemmy-ui}";
ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.lemmy-ui}/dist/js/server.js";
};
};
systemd.services.lemmy-postgresql = mkIf cfg.settings.database.createLocally {
description = "Lemmy postgresql db";
after = [ "postgresql.service" ];
bindsTo = [ "postgresql.service" ];
requiredBy = [ "lemmy.service" ];
partOf = [ "lemmy.service" ];
script = with cfg.settings.database; ''
PSQL() {
${config.services.postgresql.package}/bin/psql --port=${toString cfg.settings.database.port} "$@"
}
# check if the database already exists
if ! PSQL -lqt | ${pkgs.coreutils}/bin/cut -d \| -f 1 | ${pkgs.gnugrep}/bin/grep -qw ${database} ; then
PSQL -tAc "CREATE ROLE ${user} WITH LOGIN;"
PSQL -tAc "CREATE DATABASE ${database} WITH OWNER ${user};"
fi
'';
serviceConfig = {
User = config.services.postgresql.superUser;
Type = "oneshot";
RemainAfterExit = true;
};
};
};
}
nixos/modules/services/web-apps/lemmy.xml
+56
View File
@@ -0,0 +1,56 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-lemmy">
<title>Lemmy</title>
<para>
Lemmy is a federated alternative to reddit in rust.
</para>
<section xml:id="module-services-lemmy-quickstart">
<title>Quickstart</title>
<para>
the minimum to start lemmy is
</para>
<programlisting language="bash">
services.lemmy = {
enable = true;
settings = {
hostname = &quot;lemmy.union.rocks&quot;;
database.createLocally = true;
};
jwtSecretPath = &quot;/run/secrets/lemmyJwt&quot;;
caddy.enable = true;
}
</programlisting>
<para>
(note that you can use something like agenix to get your secret
jwt to the specified path)
</para>
<para>
this will start the backend on port 8536 and the frontend on port
1234. It will expose your instance with a caddy reverse proxy to
the hostname you’ve provided. Postgres will be initialized on that
same instance automatically.
</para>
</section>
<section xml:id="module-services-lemmy-usage">
<title>Usage</title>
<para>
On first connection you will be asked to define an admin user.
</para>
</section>
<section xml:id="module-services-lemmy-missing">
<title>Missing</title>
<itemizedlist spacing="compact">
<listitem>
<para>
Exposing with nginx is not implemented yet.
</para>
</listitem>
<listitem>
<para>
This has been tested using a local database with a unix socket
connection. Using different database settings will likely
require modifications
</para>
</listitem>
</itemizedlist>
</section>
</chapter>
nixos/tests/calibre-web.nix
-10
View File
@@ -11,10 +11,6 @@ import ./make-test-python.nix (
meta.maintainers = with pkgs.lib.maintainers; [ pborzenkov ];
nodes = {
default = { ... }: {
services.calibre-web.enable = true;
};
customized = { pkgs, ... }: {
services.calibre-web = {
enable = true;
@@ -33,12 +29,6 @@ import ./make-test-python.nix (
testScript = ''
start_all()
default.wait_for_unit("calibre-web.service")
default.wait_for_open_port(${toString defaultPort})
default.succeed(
"curl --fail 'http://localhost:${toString defaultPort}/basicconfig' | grep 'Basic Configuration'"
)
customized.succeed(
"mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
)
pkgs/applications/graphics/gscan2pdf/default.nix
+4 -2
View File
@@ -10,11 +10,11 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "gscan2pdf";
version = "2.12.1";
version = "2.12.3";
src = fetchurl {
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
sha256 = "0x20wpqqw6534rn73660zdfy4c3jpg2n31py566k0x2nd6g0mhg5";
sha256 = "tdXTcoI7DnrBsXtXR0r07hz0lDcAjZJad+o4wwxHcOk=";
};
nativeBuildInputs = [ wrapGAppsHook ];
@@ -111,6 +111,8 @@ perlPackages.buildPerlPackage rec {
# # Looks like you failed 1 test of 1.
# t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100)
rm t/169_import_scan.t
# t/1604_import_multipage_DjVu.t ................ Dubious, test returned 255 (wstat 65280, 0xff00)
rm t/1604_import_multipage_DjVu.t
# Disable a test which passes but reports an incorrect status
# t/0601_Dialog_Scan.t .......................... All 14 subtests passed
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/common.nix
+1 -17
View File
@@ -156,23 +156,6 @@ buildStdenv.mkDerivation ({
sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab";
})
# These fix Firefox on sway and other non-Gnome wayland WMs. They should be
# removed whenever the following two patches make it onto a release:
# 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8
# 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4
# This will probably happen in the next point release, but let's be careful
# and double check whether it's working on sway on the next v bump.
++ lib.optionals (lib.versionAtLeast version "92") [
(fetchpatch {
url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4";
sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8=";
})
(fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8";
sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA=";
})
]
++ patches;
@@ -265,6 +248,7 @@ buildStdenv.mkDerivation ({
# this will run autoconf213
configureScript="$(realpath ./mach) configure"
export MOZCONFIG=$(pwd)/mozconfig
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
# Set C flags for Rust's bindgen program. Unlike ordinary C
# compilation, bindgen does not invoke $CC directly. Instead it
pkgs/applications/networking/browsers/firefox/packages.nix
+6 -6
View File
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
version = "92.0.1";
version = "93.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef";
sha512 = "b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91";
};
meta = {
@@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec {
pname = "firefox-esr";
version = "91.1.0esr";
version = "91.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "dad0249eb2ce66eb90ff5daf0dfb63105a19790dd45661d977f7cc889644e86b33b9b0c472f46d4032ae2e4fe02c2cf69d552156fb0ad4cf77a15b3542556ed3";
sha512 = "f4cff7e43ff9927cbab3f02d37d360ee8bb0dbe988e280cb0638ee67bfe3c76e3a0469336de1b212fba66c958d58594b1739aafee1ebb84695d098c1e5c77b9d";
};
meta = {
@@ -57,10 +57,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
version = "78.14.0esr";
version = "78.15.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac";
sha512 = "ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378";
};
meta = {
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+5 -7
View File
@@ -18,14 +18,12 @@ let
# E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict)
spellLangComponents = splitString "_" spellcheckerLanguage;
hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1);
in if spellcheckerLanguage != null
then ''
--set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
--set LC_MESSAGES "${spellcheckerLanguage}"''
else "");
in lib.optionalString (spellcheckerLanguage != null) ''
--set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
--set LC_MESSAGES "${spellcheckerLanguage}"'');
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.18.1"; # Please backport all updates to the stable channel.
version = "5.19.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 +33,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 = "0x1wrzxyspghv0hwdh3sw8536c9qi7211d2g5cr3f33kz9db5xp4";
sha256 = "0avns5axcfs8x9sv7hyjxi1cr7gag00avfj0h99wgn251b313g1a";
};
nativeBuildInputs = [
pkgs/applications/window-managers/wio/default.nix
+11 -10
View File
@@ -1,39 +1,40 @@
{ lib
, stdenv
, fetchFromBitbucket
, meson
, ninja
, pkg-config
, fetchFromGitHub
, alacritty
, cage
, cairo
, libxkbcommon
, makeWrapper
, mesa
, meson
, ninja
, pkg-config
, udev
, wayland
, wayland-protocols
, wlroots
, mesa
, xwayland
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "wio";
version = "0.pre+unstable=2021-06-27";
src = fetchFromBitbucket {
owner = "anderson_torres";
src = fetchFromGitHub {
owner = "museoa";
repo = pname;
rev = "e0b258777995055d69e61a0246a6a64985743f42";
sha256 = "sha256-8H9fOnZsNjjq9XvOv68F4RRglGNluxs5/jp/h4ROLiI=";
};
nativeBuildInputs = [
makeWrapper
meson
ninja
pkg-config
makeWrapper
];
buildInputs = [
cairo
libxkbcommon
@@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux;
inherit (wayland.meta) platforms;
};
passthru.providedSessions = [ "wio" ];
pkgs/build-support/agda/default.nix
+3 -1
View File
@@ -49,6 +49,7 @@ let
, meta
, buildInputs ? []
, everythingFile ? "./Everything.agda"
, includePaths ? []
, libraryName ? pname
, libraryFile ? "${libraryName}.agda-lib"
, buildPhase ? null
@@ -57,6 +58,7 @@ let
, ...
}: let
agdaWithArgs = withPackages (builtins.filter (p: p ? isAgdaDerivation) buildInputs);
includePathArgs = concatMapStrings (path: "-i" + path + " ") (includePaths ++ [(dirOf everythingFile)]);
in
{
inherit libraryName libraryFile;
@@ -67,7 +69,7 @@ let
buildPhase = if buildPhase != null then buildPhase else ''
runHook preBuild
agda -i ${dirOf everythingFile} ${everythingFile}
agda ${includePathArgs} ${everythingFile}
runHook postBuild
'';
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+2
View File
@@ -15,6 +15,7 @@
, dbus
, polkit
, switchboard
, wingpanel-indicator-power
}:
stdenv.mkDerivation rec {
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
libgee
polkit
switchboard
wingpanel-indicator-power # settings schema
];
meta = with lib; {
pkgs/development/compilers/sbcl/2.0.8.nix
+2 -2
View File
@@ -1,4 +1,4 @@
import ./common.nix {
version = "2.1.2";
sha256 = "sha256-t3EFUJOYVe1JWYxKAUSD7RILaZFliio7avpHcT3OTAs=";
version = "2.0.8";
sha256 = "1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390";
}
pkgs/development/haskell-modules/configuration-nix.nix
-2
View File
@@ -94,8 +94,6 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;
# avoid compiling twice by providing executable as a separate output (with small closure size)
niv = enableSeparateBinOutput super.niv;
ormolu = enableSeparateBinOutput super.ormolu;
pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
+8 -11
View File
@@ -8,32 +8,30 @@
stdenv.mkDerivation rec {
pname = "dbqn" + lib.optionalString buildNativeImage "-native";
version = "0.0.0+unstable=2021-10-02";
version = "0.0.0+unstable=2021-10-05";
src = fetchFromGitHub {
owner = "dzaima";
repo = "BQN";
rev = "d6bd66d26a89b8e9f956ec4f6b6bc5dcb5861a09";
hash = "sha256-BLRep7OGHfDFowIAsBS19PTzgIhrdKMnO2JSjKuwGYo=";
rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5";
sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx";
};
buildInputs = lib.optional (!buildNativeImage) jdk;
nativeBuildInputs = [
makeWrapper
] ++ lib.optional buildNativeImage jdk;
jdk
];
dontConfigure = true;
buildPhase = ''
runHook preBuild
mkdir -p output
javac --release 8 -encoding UTF-8 -d ./output $(find src -name '*.java')
(cd output; jar cvfe ../BQN.jar BQN.Main *)
rm -fr output
patchShebangs --build ./build8
./build8
'' + lib.optionalString buildNativeImage ''
native-image --report-unsupported-elements-at-runtime \
-H:CLibraryPath=${lib.getLib jdk}/lib \
-J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn
'' + ''
runHook postBuild
@@ -64,7 +62,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres sternenseemann ];
inherit (jdk.meta) platforms;
priority = if buildNativeImage then 10 else 0;
};
}
# TODO: Processing app
pkgs/development/libraries/agda/agda-prelude/default.nix
+2 -4
View File
@@ -1,14 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub }:
mkDerivation rec {
version = "compat-2.6.1";
version = "compat-2.6.2";
pname = "agda-prelude";
src = fetchFromGitHub {
owner = "UlfNorell";
repo = "agda-prelude";
rev = version;
sha256 = "128rbhd32qlq2nq3wgqni4ih58zzwvs9pkn9j8236ycxxp6x81sl";
sha256 = "0j2nip5fbn61fpkm3qz4dlazl4mzdv7qlgw9zm15bkcvaila0h14";
};
preConfigure = ''
@@ -19,8 +19,6 @@ mkDerivation rec {
'';
meta = with lib; {
# Remove if a version compatible with agda 2.6.2 is made
broken = true;
homepage = "https://github.com/UlfNorell/agda-prelude";
description = "Programming library for Agda";
license = lib.licenses.mit;
pkgs/development/libraries/agda/agdarsec/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib, mkDerivation, fetchFromGitHub
, standard-library }:
mkDerivation rec {
pname = "agdarsec";
version = "0.4.1";
src = fetchFromGitHub {
owner = "gallais";
repo = "agdarsec";
rev = "v${version}";
sha256 = "02fqkycvicw6m2xsz8p01aq8n3gj2d2gyx8sgj15l46f8434fy0x";
};
everythingFile = "./index.agda";
includePaths = [ "src" "examples" ];
buildInputs = [ standard-library ];
meta = with lib; {
homepage = "https://gallais.github.io/agdarsec/";
description = "Total Parser Combinators in Agda";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ turion ];
};
}
pkgs/development/libraries/libnsl/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libnsl";
version = "1.3.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "thkukuk";
repo = pname;
rev = "v${version}";
sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5";
sha256 = "sha256-f9kNzzR8baf5mLgrh+bKO/rBRZA5ZYc1tJdyLE7Bi1w=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/development/python-modules/Theano/default.nix
+1 -1
View File
@@ -90,7 +90,7 @@ in buildPythonPackage rec {
pythonImportsCheck = [ "theano" ];
meta = with lib; {
homepage = "http://deeplearning.net/software/theano/";
homepage = "https://github.com/Theano/Theano";
description = "A Python library for large-scale array computation";
license = licenses.bsd3;
maintainers = with maintainers; [ maintainers.bcdarwin ];
pkgs/development/python-modules/aioesphomeapi/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "9.1.4";
version = "9.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "sha256-I7SFujEh5s+WgRktmjTrcQlASOjywXvlC1SiltcKRAE=";
sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/class-registry/default.nix
-32
View File
@@ -1,32 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, nose
, pythonOlder
}:
buildPythonPackage rec {
pname = "class-registry";
version = "3.0.5";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "todofixthis";
repo = pname;
rev = version;
sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q";
};
checkInputs = [
nose
];
pythonImportsCheck = [ "class_registry" ];
meta = with lib; {
description = "Factory and registry pattern for Python classes";
homepage = "https://class-registry.readthedocs.io/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ kevincox ];
};
}
pkgs/development/python-modules/graspologic/default.nix
+1 -1
View File
@@ -41,7 +41,7 @@ buildPythonPackage rec {
disabledTests = [ "gridplot_outputs" ];
meta = with lib; {
homepage = "https://graspy.neurodata.io";
homepage = "https://graspologic.readthedocs.io";
description = "A package for graph statistical algorithms";
license = licenses.asl20; # changing to `licenses.mit` in next release
maintainers = with maintainers; [ bcdarwin ];
pkgs/development/python-modules/ocrmypdf/default.nix
+7 -1
View File
@@ -34,7 +34,13 @@ buildPythonPackage rec {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
sha256 = "sha256-gFlQztrRN69HtR6sTJl8tryuTibxQrz97QcS5UkFOVs=";
# The content of .git_archival.txt is substituted upon tarball creation,
# which creates indeterminism if master no longer points to the tag.
# See https://github.com/jbarlow83/OCRmyPDF/issues/841
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
sha256 = "0zw7c6l9fkf128gxsbd7v4abazlxiygqys6627jpsjbmxg5jgp5w";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/phx-class-registry/default.nix
+21 -15
View File
@@ -1,28 +1,34 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "phx-class-registry";
pname = "class-registry";
version = "3.0.5";
disabled = pythonOlder "3.5";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "14iap8db2ldmnlf5kvxs52aps31rl98kpa5nq8wdm30a86n6457i";
src = fetchFromGitHub {
owner = "todofixthis";
repo = pname;
rev = version;
sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q";
};
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
disabledTests = [
"test_branding"
"test_happy_path"
"test_len"
pythonImportsCheck = [
"class_registry"
];
meta = with lib; {
description = "Registry pattern for Python classes, with setuptools entry points integration";
homepage = "https://github.com/todofixthis/class-registry";
description = "Factory and registry pattern for Python classes";
homepage = "https://class-registry.readthedocs.io/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
maintainers = with maintainers; [ kevincox SuperSandro2000 ];
};
}
pkgs/development/python-modules/pikepdf/default.nix
+2 -2
View File
@@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "3.1.0";
version = "3.1.1";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "aeb813b5f36534d2bedf08487ab2b022c43f4c8a3e86e611c5f7c8fb97309db5";
sha256 = "sha256-klSUszWsIIz7o0/Ql8K4CWYujBH0mAbqyUcabpn1SkQ=";
};
patches = [
pkgs/development/python-modules/pyenchant/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pyenchant";
version = "3.2.1";
version = "3.2.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "5e206a1d6596904a922496f6c9f7d0b964b243905f401f5f2f40ea4d1f74e2cf";
sha256 = "1cf830c6614362a78aab78d50eaf7c6c93831369c52e1bb64ffae1df0341e637";
};
propagatedBuildInputs = [ enchant2 ];
pkgs/development/python-modules/pypinyin/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pypinyin";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "mozillazg";
repo = "python-pinyin";
rev = "v${version}";
sha256 = "0i0ggizkgd809ylz74j1v5lfpyifz3wypj6f8l8fr5ad7a7r9s09";
sha256 = "0h3lpb8bw9zp8is5sx2zg931wz12x0zfan1kksnbhx16vwv1kgw3";
};
postPatch = ''
pkgs/development/python-modules/sqlite-utils/default.nix
+2 -2
View File
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.17";
version = "3.17.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "77acd202aa568a1f6888c5d8879f306bb3f8acedc82df0df98eb615caa491abb";
sha256 = "0cfde0c46a2d4c09d6df8609fe53642bc3ab443bcef3106d8f1eabeb3fccbe3d";
};
postPatch = ''
pkgs/development/python-modules/transitions/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "transitions";
version = "0.8.9";
version = "0.8.10";
src = fetchPypi {
inherit pname version;
sha256 = "fc2ec6d6b6f986cd7e28e119eeb9ba1c9cc51ab4fbbdb7f2dedad01983fd2de0";
sha256 = "b0385975a842e885c1a55c719d2f90164471665794d39d51f9eb3f11e1d9c8ac";
};
propagatedBuildInputs = [
pkgs/development/tools/backblaze-b2/default.nix
-1
View File
@@ -29,7 +29,6 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
b2sdk
class-registry
phx-class-registry
setuptools
docutils
pkgs/development/tools/rslint/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rslint";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "rslint";
repo = pname;
rev = "v${version}";
sha256 = "12329x39zqmgl8zf228msdcdjfv3h11dmfha1kiwq71jvfga2v10";
sha256 = "sha256-AkSQpGbhRVmDuDAbMzx00BELpI2szJ+rjKo8Qjcug1E=";
};
cargoSha256 = "sha256-/pZ6jQ/IdLLFdFTvmbXZKCw9HhnTkSSh6q79Rpbtfz8=";
cargoSha256 = "sha256-U8Uf7LG6+dOi+XxRpJrpy0kAqyr8fAlVchE9ZJ+ex/s=";
cargoBuildFlags = [
"-p" "rslint_cli"
pkgs/development/tools/sumneko-lua-language-server/default.nix
+2 -9
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server";
version = "2.3.6";
version = "2.4.1";
src = fetchFromGitHub {
owner = "sumneko";
repo = "lua-language-server";
rev = version;
sha256 = "sha256-iwmH4pbeKNkEYsaSd6I7ULSoEMwAtxOanF7vAutuW64=";
sha256 = "sha256-RhjH/phRVlNO9nPL+TtcrZYpwqNygpXjI/Pdyrxxv/4=";
fetchSubmodules = true;
};
@@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
makeWrapper
];
postPatch = ''
# doesn't work on aarch64, already removed on master:
# https://github.com/actboy168/bee.lua/commit/fd5ee552c8cff2c48eff72edc0c8db5b7bf1ee2c
rm {3rd/luamake/,}3rd/bee.lua/test/test_platform.lua
sed /test_platform/d -i {3rd/luamake/,}3rd/bee.lua/test/test.lua
'';
preBuild = ''
cd 3rd/luamake
'';
pkgs/misc/vim-plugins/generated.nix
+90 -90
View File
@@ -233,12 +233,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2021-09-07";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "3909c7805ee3c140c6bbc16ec001046a07eada15";
sha256 = "03ay788vacs65cylp0ly7clpzhrx8vzc7zn94mk15hr9843s1kkd";
rev = "dc7619fc3c6e3368ae449bf8ae1ad7630a720406";
sha256 = "0izpxbwa144r9wjiy1m0r19hfwdlm2r3pggn178gj56ll7y2njnk";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -449,12 +449,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-10-05";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "33828c635ef856919889b229ab771268089d4c36";
sha256 = "0645p6mwgnhdp5lnri4c4h6ryyfn1s3487ydnhkr4p629vnrsl4k";
rev = "d84f60a07871fa8efef59d350f9884fd8a542a98";
sha256 = "1y9pkgwkc0cga25afknn5xrbn2kx46kg97348gjnk9bg297qm05g";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -641,12 +641,12 @@ final: prev:
cmp-path = buildVimPluginFrom2Nix {
pname = "cmp-path";
version = "2021-09-11";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-path";
rev = "0016221b6143fd6bf308667c249e9dbdee835ae2";
sha256 = "03k43xavw17bbjzmkknp9z4m8jv9hn6wyvjwaj1gpyz0n21kn5bb";
rev = "8d88c92dd5a202a996b4caac7284e4ea2f086765";
sha256 = "0m7wmnanhmvx4ww5xiz6rfjzk3ci10gk4dda8qd87kdiszq1zay7";
};
meta.homepage = "https://github.com/hrsh7th/cmp-path/";
};
@@ -906,12 +906,12 @@ final: prev:
compe-tmux = buildVimPluginFrom2Nix {
pname = "compe-tmux";
version = "2021-08-24";
version = "2021-09-16";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "compe-tmux";
rev = "881b5255e12fef6c28e1039f4afeb77626205b24";
sha256 = "1l2bvjhwi2s33cp6m58gvi9k2hpg3sdv9048ah8xk0rjd7kb2adn";
rev = "b80706c31711db5ef0fab9e141733a7e95203d22";
sha256 = "1874rzhxylqqkbv7sdkfq5dpbpqzpwf0r90yx3gxa4mipnjd22sm";
};
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
};
@@ -2495,12 +2495,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline.nvim";
version = "2021-10-04";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "31fe9b4ac3eaaac0bf5e90d607662c32f59dc0b7";
sha256 = "1fwyrp5w7q4pz4a5dh24j2v8qrm4pr71p7qm14hj7xw3a80s9bci";
rev = "948b6ac3303b9e2e75daad0bd0ec844ed6b06d4a";
sha256 = "1adsy4nkl8dm6bqkc2chy47na3kqh8g1lkmxzvc5wdfw0c27z0i0";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -2892,12 +2892,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
version = "2021-09-17";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
rev = "4d1ddf0508069395ed54e7eb38a47f04fb03a387";
sha256 = "06x3zdfss58ky5z8kgca1gq2zvdqv1nfw3mgnlsj0qq52mj0jwgj";
rev = "61c7c8668b80537aefa69654a6e5a5e63095be61";
sha256 = "0aa7cwzaqzma1w5xyvppj6g3i8kc7199zwd4nhc9ydx9isn885sh";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@@ -2928,12 +2928,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed.nvim";
version = "2021-09-28";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
rev = "0bc3acda929b946e175d83a5f702d28d231b0089";
sha256 = "1n7wa3hirmrm83w4f9m9wns3alsfmfpzc2r77l9kda012iigm51i";
rev = "9340b1bb6ec9f92939a323889200e3032f8ed6fe";
sha256 = "1w9x9g3l0hnc157fjq0qyz52mr4s6m56zwsmc0l0b53z9prma5mz";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@@ -3036,12 +3036,12 @@ final: prev:
lspkind-nvim = buildVimPluginFrom2Nix {
pname = "lspkind-nvim";
version = "2021-08-19";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "onsails";
repo = "lspkind-nvim";
rev = "9cc326504e566f467407bae2669a98963c5404d2";
sha256 = "0bbczy2hhdl79g749d41vv5fyfcdd3rsxhi8mbq6avc0vhw72m8c";
rev = "0df591f3001d8c58b7d71a8dc7e006b8cea4959d";
sha256 = "02w8wagfssbail50p1pb6bdjig6y9ns0bbmdal4kfdq797sh4c3n";
};
meta.homepage = "https://github.com/onsails/lspkind-nvim/";
};
@@ -3084,12 +3084,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-10-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "2f7e2b173386c9a5f26fbc22a765301784893e1c";
sha256 = "02w690fhlhmbjb03958kz5migh8iv5rnmhh3lg8sb08haclh14g3";
rev = "7ae2627a8088f879272f85b9ac97d346ec554521";
sha256 = "0agwval3hpkmgr56jnf6x2yhdy5bqzw4z1vcnh2qbp34yi0r5a07";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@@ -3648,12 +3648,12 @@ final: prev:
neovim-ayu = buildVimPluginFrom2Nix {
pname = "neovim-ayu";
version = "2021-09-13";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "Shatur";
repo = "neovim-ayu";
rev = "9841e30f2cff5b1929620565c9289eb561bae75a";
sha256 = "0h25wgv5fvkycfsvw6jb82jl3fb94fvay1ii91yqiailpwa2ig76";
rev = "750d2246d38cd2839356ab8506fc8328a76d33db";
sha256 = "0gg11pswi2alz2khd7ygjhq6kb2nnawpd1f2vvgpc3wpqhp6lk92";
};
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
};
@@ -3768,12 +3768,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
version = "2021-10-04";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
rev = "15dfe546111a96e5f30198d5bd163658acdbbe3b";
sha256 = "0a03i8i5fjzffqv4pp29x32ld3h5azvia2a1b3sc5i0bbzishxb5";
rev = "9727b081eaab33e7ba7d6593e85e1ff2c854ecaa";
sha256 = "065bp6aq5kx7kkngjim8q314balbn36aamf71g1aqklxxkkiyfz5";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@@ -3864,12 +3864,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "1fadae38e9e43cbd20ab238e18c2d6f099607e74";
sha256 = "1jsjsi2i08h9mjj88yzw6hrzphlhzsvqjdm1lkqwmjllklnh3xwk";
rev = "1c482001bd3dc044f973efc474919b33a9994e5a";
sha256 = "120vkg5q8ilnvmymk6zi42bxifabvzr4yc0d83kb7457xk0xkdpz";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -3912,12 +3912,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "72b2b6428561e692f7d65699eebaf122d7f24c29";
sha256 = "1s01m28v5clx1p1h4q8fga3f3mqsn5w6wlmdcyb3d9qzlzlvwvy1";
rev = "85fd134e6a6d3dfcca43f5f75f0262348ae20dd2";
sha256 = "07mdc7p2ymxvmm810w79n224vx5bpp374r95dxc7v37ngpsv32nz";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@@ -3972,12 +3972,12 @@ final: prev:
nvim-cmp = buildVimPluginFrom2Nix {
pname = "nvim-cmp";
version = "2021-09-30";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "af70f40d2eb6db2121536c8df2e114af759df537";
sha256 = "1sv6hsfa1anax7dvp9h83m4z50kpg51fzvvmjb15jjfdih5zmcdb";
rev = "a39f72a4634e4bb05371a6674e3e9218cbfc6b20";
sha256 = "04ksgg491nmyy7khdid9j45pv65yp7ksa0q7cr7gvqrh69v55daj";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -4104,12 +4104,12 @@ final: prev:
nvim-gps = buildVimPluginFrom2Nix {
pname = "nvim-gps";
version = "2021-09-30";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-gps";
rev = "e8b068b0e59395e2acf4b1bdc066bd80539704ba";
sha256 = "1342brvmsjgrwb2hzm466hbd7s5dxw7i0dkwcjnipqdw2jvll9vs";
rev = "449dc8b5b34d54504d8331b9fa7eee95520400cc";
sha256 = "1baa9l71dgn2chbkj6p00rkj8xdq6d8icr93w31wmas6470bwgf2";
};
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
};
@@ -4176,12 +4176,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-10-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "30442900db62ff875013b3f1584e8c0a832c43d2";
sha256 = "1v0hmf5sv884l1svvfb20yb5q9vfbc4ap0268hcxc7393al4fs2f";
rev = "66659884c36dadd1f445f9012fcf4e7600286d3e";
sha256 = "1hp3rqk1zfvxgjmllfdh5as9112x54mfa73l3dxawqfv4cfi25w5";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -4284,12 +4284,12 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "29e5b754b7250aded609e8c071804053db5765c6";
sha256 = "14vj1yb570hg3zajvp62pwn75hih22dp2jp63vdfpmalznzwjjbc";
rev = "7ca37f824bc79bcaa8d6a5d8f94295d625269e0e";
sha256 = "0n3m44pykba0vn7440n8s6i7i8ii0r7wcnpdym9vdk4skpn1y3fa";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
@@ -4524,12 +4524,12 @@ final: prev:
open-browser-vim = buildVimPluginFrom2Nix {
pname = "open-browser.vim";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "tyru";
repo = "open-browser.vim";
rev = "3bb313a81922486c419e0a587cf84ef853af3e16";
sha256 = "17bg3vny1rzbyyra7qzzh9p0i00i2ivl96mdd4pbn2zqh77jd2vv";
rev = "80ec3f2bb0a86ac13c998e2f2c86e16e6d2f20bb";
sha256 = "01qj967nch3wwkbshrsdzyyr4apvsqrpa4dkmpn21qr2183w84zz";
};
meta.homepage = "https://github.com/tyru/open-browser.vim/";
};
@@ -5041,24 +5041,24 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools.nvim";
version = "2021-10-01";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "c2aacb9cd51907ec6cce65a683cb2df6ae78a227";
sha256 = "067hjyw7d2wf443bny3m3gjkq3avf3k99xwzkl1yrd4vn321h2kn";
rev = "046f18f2b4af2cd928bdb1736f83fea54efd3dcb";
sha256 = "1h9y5jj90vkl50vfwi1hvhn2z71yhjsfvfldlvwakjx92izn84dm";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
rust-vim = buildVimPluginFrom2Nix {
pname = "rust.vim";
version = "2021-09-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust.vim";
rev = "c06a17151c69b9d61e60a28274932a28fd37c453";
sha256 = "11ms2has79w2jazvca2mysdbscs1412xmcql0mxc72wrpnws321h";
rev = "4aa69b84c8a58fcec6b6dad6fe244b916b1cf830";
sha256 = "07nh8gvkwq91i7qcz0rk5jlc8sb4d3af4zq2892kmmw576zg1wd8";
};
meta.homepage = "https://github.com/rust-lang/rust.vim/";
};
@@ -6174,12 +6174,12 @@ final: prev:
vifm-vim = buildVimPluginFrom2Nix {
pname = "vifm.vim";
version = "2021-10-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "vifm";
repo = "vifm.vim";
rev = "69d1d341e6e8c5424be178cc60375b517c9e4d4e";
sha256 = "1zh6jg0ycalwq0dz7b65lrvhr5af6317j12k1s2xl7piabjbhxrx";
rev = "85d7681b004d1a32dd02a5790d713e06f4a251b8";
sha256 = "0f3bq3d0nhxxsdmzq2qb7jjnwf8blkzsbnprqb715f5lqr6diwls";
};
meta.homepage = "https://github.com/vifm/vifm.vim/";
};
@@ -6570,12 +6570,12 @@ final: prev:
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
version = "2021-09-13";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "vim-autoformat";
repo = "vim-autoformat";
rev = "a65a58db77ad1b5889a68bedbea890c8161b7f8c";
sha256 = "1frvyb3xpd4njh7ixg1ywj8x11ga343kqrmrgncb45scv12i7hx4";
rev = "7d7662e3f958e729ce21fee0ae623e3b2c438e3d";
sha256 = "0ijciwpxjkykk6cc1a55bwbc9kbbac8yq33gh331323gmzm517h8";
};
meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
};
@@ -7146,12 +7146,12 @@ final: prev:
vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
version = "2021-09-02";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
rev = "b2b5709b7979bb99b0548d5879c49672891b9b5b";
sha256 = "076rvky65x7qiplbidmpz4f3is9l77g12bci1h490cni4n3rh73f";
rev = "77eae77073b285f7b6967922447370f2952d4e4d";
sha256 = "0wkz452gchd796h8ysr0xccpk86q8i63mk7ywfrxghf3a7zk0kan";
};
meta.homepage = "https://github.com/justinmk/vim-dirvish/";
};
@@ -7290,12 +7290,12 @@ final: prev:
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
version = "2021-09-04";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "elixir-editors";
repo = "vim-elixir";
rev = "7e7f42cf10ba05b6d783de411a6ceca50fe0cc69";
sha256 = "0pfh63qinj1kr612plnixw12rndpv2qz45w1kb9kqddzzp3fjy98";
rev = "8ace05a9a4e225d103a9c06f6d5148d0e07408df";
sha256 = "0b3lk6z5l3bmxkh4syk8jrqh9s0d4kikna23990f3j06k141k6gp";
};
meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
};
@@ -8541,12 +8541,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-10-01";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "870df0bb741eed49d093268593bce385bd82a41a";
sha256 = "185jbg2i49vknfy64s811dppwgw1d4lq8q97q0rrnvh7w6q88wl8";
rev = "ce323c1ed83866fa28371c800d8d9afb24f1a64d";
sha256 = "16sgpdygilvd3mpqhm61lqiybnq100fdqd826zfvff2cri24dscl";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -9861,12 +9861,12 @@ final: prev:
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
version = "2021-09-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
rev = "02d28b932398bb7774def2edaef6f1c0ad92c3e3";
sha256 = "1bh93qfvswb66fj7amhfmhyiyg17rnp28cpq07asm5gccr27ssw7";
rev = "eb42c62812f149f7315552f43e3dd617a43b2ab4";
sha256 = "04cl96qy6db0r07wg5vwhwpbcma53868gy75lfl21is87biz0d6b";
};
meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
};
@@ -10162,12 +10162,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
version = "2021-09-26";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
rev = "dfea06dc0e8da24338eef3414259055f360449cb";
sha256 = "1h8g3pcwgjlm68rlzb0v9xwbgccklig68pd8i8g18bzw341b622b";
rev = "7861d1925baef8fe3fa313affdfbdcaa6b2af26f";
sha256 = "165klmixdch1nc9cxdldl5yg4q79q58riw0mg0mahqvvr5m1yrw3";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@@ -10186,12 +10186,12 @@ final: prev:
vim-unimpaired = buildVimPluginFrom2Nix {
pname = "vim-unimpaired";
version = "2021-09-19";
version = "2021-09-24";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-unimpaired";
rev = "112e23a22ff41d090c2440aeaf12d2a6c5486bc6";
sha256 = "05vc09g91c6zz37p6as3q1fm9c7ahvjih1jd607bhgbzys8342c7";
rev = "39f195d7e66141d7f1fa683927547026501e9961";
sha256 = "0bbiv32brznns82v8s0s2fylcn4j5d3vw4x2kp5h6zb4lqgya30q";
};
meta.homepage = "https://github.com/tpope/vim-unimpaired/";
};
@@ -10270,12 +10270,12 @@ final: prev:
vim-vsnip-integ = buildVimPluginFrom2Nix {
pname = "vim-vsnip-integ";
version = "2021-10-02";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip-integ";
rev = "0eee427f96aa11dec031adc104e218775bafc172";
sha256 = "1nb0kbv986vw4nf785s24435pyrya8jn4sjqn0168x5a0j83n2vr";
rev = "8db26e85c12a382db6c34487de2e1512dd7516f5";
sha256 = "1rlaglccvgpaj89lfn41ygykdizlis4wwrw92qxb9raz2a0z9idh";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
};
@@ -10727,12 +10727,12 @@ final: prev:
wilder-nvim = buildVimPluginFrom2Nix {
pname = "wilder.nvim";
version = "2021-10-03";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "gelguy";
repo = "wilder.nvim";
rev = "4a98c80aa4e8156f41c972e58a7308a69f9fc87a";
sha256 = "09iv34ha118dm1wdi6hdjs6vmy6la3q01ilalxihqhvwr7hlz48p";
rev = "666b1778031c288615715ebd837acb1f946d83a7";
sha256 = "1sx4rczbvg78gyyap56wa48i2lvy8x6briyp8jv500sh7x89q4zm";
};
meta.homepage = "https://github.com/gelguy/wilder.nvim/";
};
pkgs/misc/vim-plugins/vim-plugin-names
+1 -1
View File
@@ -15,7 +15,7 @@ alvan/vim-closetag
alx741/vim-hindent
alx741/vim-stylishask
amiorin/ctrlp-z
andersevenrud/compe-tmux@main
andersevenrud/compe-tmux@cmp
andrep/vimacs
andreshazard/vim-logreview
AndrewRadev/sideways.vim@main
pkgs/misc/vscode-extensions/default.nix
+12
View File
@@ -1045,6 +1045,18 @@ let
};
};
llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-clangd";
publisher = "llvm-vs-code-extensions";
version = "0.1.13";
sha256 = "/MpwbM+obcD3uqk8hnDrnbEK9Jot4fMe4sNzLt6mVGI=";
};
meta = {
license = lib.licenses.mit;
};
};
lokalise.i18n-ally = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "i18n-ally";
pkgs/servers/calibre-web/default.nix
+3 -2
View File
@@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.12";
version = "0.6.13";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
sha256 = "sha256-IgS281qDxG302UznC63nZH8/ty4fgFtn+lLYdakGA4w=";
sha256 = "sha256-zU7ujvFPi4UaaEglIK3YX3TJxBME35NEKKblnJRt0tM=";
};
prePatch = ''
@@ -53,6 +53,7 @@ python3.pkgs.buildPythonApplication rec {
flask_login
flask_principal
iso-639
lxml
pypdf3
requests
sqlalchemy
pkgs/servers/sql/mariadb/default.nix
+1 -1
View File
@@ -92,7 +92,7 @@ common = rec { # attributes common to both builds
# Remove Development components. Need to use libmysqlclient.
rm "$out"/lib/mysql/plugin/daemon_example.ini
rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a}
rm "$out"/bin/{mariadb_config,mysql_config}
rm "$out"/bin/{mariadb-config,mariadb_config,mysql_config}
rm -r $out/include
rm -r $out/lib/pkgconfig
rm -rf "$out"/share/aclocal
pkgs/servers/web-apps/lemmy/ui.nix
+2 -1
View File
@@ -57,7 +57,8 @@ mkYarnPackage {
preInstall = ''
mkdir $out
cp -R ./deps/lemmy-ui/dist/assets $out
cp -R ./deps/lemmy-ui/dist $out
cp -R ./node_modules $out
'';
distPhase = "true";
pkgs/tools/security/exploitdb/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-10-02";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-gUjFFxzkHHhNMDAgFmmIAuEACSCn1YXuauvjGAkrK6k=";
sha256 = "sha256-MTV6rDgy6FxmdQHoBnDNBwiKEiGj9THqoHJCwUoAoB8=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/top-level/agda-packages.nix
+2
View File
@@ -31,5 +31,7 @@ let
../development/libraries/agda/functional-linear-algebra { };
generic = callPackage ../development/libraries/agda/generic { };
agdarsec = callPackage ../development/libraries/agda/agdarsec { };
};
in mkAgdaPackages Agda
pkgs/top-level/all-packages.nix
+2
View File
@@ -1623,6 +1623,8 @@ with pkgs;
font-config-info = callPackage ../tools/misc/font-config-info { };
foxdot = with python3Packages; toPythonApplication foxdot;
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
genann = callPackage ../development/libraries/genann { };
pkgs/top-level/perl-packages.nix
+8 -8
View File
@@ -9262,10 +9262,10 @@ let
GraphicsTIFF = buildPerlPackage {
pname = "Graphics-TIFF";
version = "9";
version = "16";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-9.tar.gz";
sha256 = "1n1r9r7f6hp2s6l361pyvb1i1pm9xqy0w9n3z5ygm7j64160kz9a";
sha256 = "Kv0JTCBGnvp8+cMmDjzuqd4Qw9r+BjOo0eJC405OOdg=";
};
buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ];
propagatedBuildInputs = [ Readonly ];
@@ -10454,10 +10454,10 @@ let
ImagePNGLibpng = buildPerlPackage {
pname = "Image-PNG-Libpng";
version = "0.56";
version = "0.57";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BK/BKB/Image-PNG-Libpng-0.56.tar.gz";
sha256 = "1nf7qcql7b2w98i859f76q1vb4b2zd0k0ypjbsw7ngs2zzmvzyzs";
sha256 = "+vu/6/9CP3u4XvJ6MEH7YpG1AzbHpYIiSlysQzHDx9k=";
};
buildInputs = [ pkgs.libpng ];
meta = {
@@ -17031,10 +17031,10 @@ let
PDFAPI2 = buildPerlPackage {
pname = "PDF-API2";
version = "2.038";
version = "2.042";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.038.tar.gz";
sha256 = "7447c4749b02a784f525d3c7ece99d34b0a10475db65096f6316748dd2f9bd09";
sha256 = "dEfEdJsCp4T1JdPH7OmdNLChBHXbZQlvYxZ0jdL5vQk=";
};
buildInputs = [ TestException TestMemoryCycle ];
propagatedBuildInputs = [ FontTTF ];
@@ -17046,10 +17046,10 @@ let
PDFBuilder = buildPerlPackage {
pname = "PDF-Builder";
version = "3.022";
version = "3.023";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz";
sha256 = "0cfafyci5xar567z82w0vcjrwa6inf1a9ydszgkz51bi1ilj8as8";
sha256 = "SCskaQxxhfLn+7r5pIKz0SieJduAC/SPKVn1Epl3yjE=";
};
checkInputs = [ TestException TestMemoryCycle ];
propagatedBuildInputs = [ FontTTF ];
pkgs/top-level/python-aliases.nix
+1
View File
@@ -36,6 +36,7 @@ mapAliases ({
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
bt_proximity = bt-proximity; # added 2021-07-02
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
class-registry = phx-class-registry; # added 2021-10-05
ConfigArgParse = configargparse; # added 2021-03-18
dateutil = python-dateutil; # added 2021-07-03
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
pkgs/top-level/python-packages.nix
-2
View File
@@ -1501,8 +1501,6 @@ in {
ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { };
class-registry = callPackage ../development/python-modules/class-registry { };
claripy = callPackage ../development/python-modules/claripy { };
cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };
pkgs/top-level/release-r.nix
+13
View File
@@ -0,0 +1,13 @@
/*
This is the Hydra jobset for the `r-updates` branch in Nixpkgs.
The jobset can be tested by:
$ hydra-eval-jobs -I . pkgs/top-level/release-r.nix
*/
{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }:
with import ./release-lib.nix { inherit supportedSystems; };
mapTestOn {
rPackages = packagePlatforms pkgs.rPackages;
}