Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-07-22 00:05:27 +00:00 committed by GitHub
commit 3ed47ddb24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
120 changed files with 1243 additions and 374 deletions

21
.github/workflows/no-channel.yml vendored Normal file
View File

@ -0,0 +1,21 @@
name: "No channel PR"
on:
pull_request:
branches:
- 'nixos-**'
- 'nixpkgs-**'
jobs:
fail:
name: "This PR is is targeting a channel branch"
runs-on: ubuntu-latest
steps:
- run: |
cat <<EOF
The nixos-* and nixpkgs-* branches are pushed to by the channel
release script and should not be merged into directly.
Please target the equivalent release-* branch or master instead.
EOF
exit 1

View File

@ -802,6 +802,12 @@
githubId = 13426784;
name = "arcnmx";
};
arcticlimer = {
email = "vinigm.nho@gmail.com";
github = "arcticlimer";
githubId = 59743220;
name = "Vinícius Müller";
};
ardumont = {
email = "eniotna.t@gmail.com";
github = "ardumont";

View File

@ -46,6 +46,13 @@
<link xlink:href="options.html#opt-services.brtbk.instances">services.btrbk</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/xrelkd/clipcat/">clipcat</link>,
an X11 clipboard manager written in Rust. Available at
[services.clipcat](options.html#o pt-services.clipcat.enable).
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/maxmind/geoipupdate">geoipupdate</link>,
@ -537,6 +544,12 @@
2020 to 2021
</para>
</listitem>
<listitem>
<para>
the <literal>mingw-64</literal> package has been upgraded from
6.0.0 to 9.0.0
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">

View File

@ -15,6 +15,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances).
- [clipcat](https://github.com/xrelkd/clipcat/), an X11 clipboard manager written in Rust. Available at [services.clipcat](options.html#o
pt-services.clipcat.enable).
- [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable).
- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea).
@ -135,6 +138,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `isabelle` package has been upgraded from 2020 to 2021
- the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.

View File

@ -475,6 +475,7 @@
./services/misc/calibre-server.nix
./services/misc/cfdyndns.nix
./services/misc/clipmenu.nix
./services/misc/clipcat.nix
./services/misc/cpuminer-cryptonight.nix
./services/misc/cgminer.nix
./services/misc/confd.nix

View File

@ -0,0 +1,31 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.clipcat;
in {
options.services.clipcat= {
enable = mkEnableOption "Clipcat clipboard daemon";
package = mkOption {
type = types.package;
default = pkgs.clipcat;
defaultText = "pkgs.clipcat";
description = "clipcat derivation to use.";
};
};
config = mkIf cfg.enable {
systemd.user.services.clipcat = {
enable = true;
description = "clipcat daemon";
wantedBy = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig.ExecStart = "${cfg.package}/bin/clipcatd --no-daemon";
};
environment.systemPackages = [ cfg.package ];
};
}

View File

@ -37,7 +37,7 @@ in {
}
'';
description = ''
Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/master/internal/config/default.toml"/>
Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/main/internal/config/reference.toml"/>
for supported values. Ignored if configFile is set.
'';
};

View File

@ -21,7 +21,15 @@ let
))
else throw (traceSeq v "services.unbound.settings: unexpected type");
confFile = pkgs.writeText "unbound.conf" (concatStringsSep "\n" ((mapAttrsToList (toConf "") cfg.settings) ++ [""]));
confNoServer = concatStringsSep "\n" ((mapAttrsToList (toConf "") (builtins.removeAttrs cfg.settings [ "server" ])) ++ [""]);
confServer = concatStringsSep "\n" (mapAttrsToList (toConf " ") (builtins.removeAttrs cfg.settings.server [ "define-tag" ]));
confFile = pkgs.writeText "unbound.conf" ''
server:
${optionalString (cfg.settings.server.define-tag != "") (toOption " " "define-tag" cfg.settings.server.define-tag)}
${confServer}
${confNoServer}
'';
rootTrustAnchorFile = "${cfg.stateDir}/root.key";
@ -170,6 +178,7 @@ in {
# prevent race conditions on system startup when interfaces are not yet
# configured
ip-freebind = mkDefault true;
define-tag = mkDefault "";
};
remote-control = {
control-enable = mkDefault false;

View File

@ -7,10 +7,15 @@ let
# FIXME consider using LoadCredential as soon as it actually works.
envSecrets = ''
export ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
export SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
export ADMIN_USER_PWD # separate export to make `set -e` work
SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
export SECRET_KEY_BASE # separate export to make `set -e` work
${optionalString (cfg.mail.smtp.passwordFile != null) ''
export SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
export SMTP_USER_PWD # separate export to make `set -e` work
''}
'';
in {
@ -102,6 +107,11 @@ in {
type = types.str;
description = ''
Public URL where plausible is available.
Note that <literal>/path</literal> components are currently ignored:
<link xlink:href="https://github.com/plausible/analytics/issues/1182">
https://github.com/plausible/analytics/issues/1182
</link>.
'';
};
};
@ -228,6 +238,7 @@ in {
WorkingDirectory = "/var/lib/plausible";
StateDirectory = "plausible";
ExecStartPre = "@${pkgs.writeShellScript "plausible-setup" ''
set -eu -o pipefail
${envSecrets}
${pkgs.plausible}/createdb.sh
${pkgs.plausible}/migrate.sh
@ -238,6 +249,7 @@ in {
''}
''} plausible-setup";
ExecStart = "@${pkgs.writeShellScript "plausible" ''
set -eu -o pipefail
${envSecrets}
plausible start
''} plausible";

View File

@ -81,7 +81,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
# Add optional CLI options:
options = []
major_version = "${versions.major (getVersion chromiumPkg.name)}"
if major_version > "91":
if major_version > "91" and pname.startswith("google-chrome"):
# To avoid a GPU crash:
options += ["--use-gl=angle", "--use-angle=swiftshader"]
options.append("file://${startupHTML}")

View File

@ -3,6 +3,7 @@
, autoPatchelfHook
, fetchurl
, flac
, gcc11
, lib
, libmicrohttpd
, llvmPackages_10
@ -17,13 +18,11 @@
mkDerivation rec {
pname = "hqplayer-desktop";
version = "4.12.1-35";
version = "4.12.2-36";
src = fetchurl {
# FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
# c.f. https://github.com/NixOS/nixpkgs/pull/111616
url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8=";
url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm";
sha256 = "sha256-ng0Tkx6CSnzTxuunStaBhUYjxUmzx31ZaOY2gBWnH6Q=";
};
unpackPhase = ''
@ -35,11 +34,12 @@ mkDerivation rec {
buildInputs = [
alsa-lib
flac
gcc11.cc.lib
libmicrohttpd
llvmPackages_10.openmp
qtquickcontrols2
qtcharts
qtdeclarative
qtquickcontrols2
qtwebengine
qtwebview
wavpack

View File

@ -9,17 +9,17 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
version = "4.2.1.0"; # "Android Studio 4.2.1"
build = "202.7351085";
sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36";
version = "4.2.2.0"; # "Android Studio 4.2.2"
build = "202.7486908";
sha256Hash = "18zc9xr2xmphj6m6a1ilwripmvqzplp2583afq1pzzz3cv5h8fvk";
};
betaVersion = {
version = "2020.3.1.16"; # "Android Studio Arctic Fox (2020.3.1) Beta 1"
sha256Hash = "0mp1cmxkqc022nv8cggywbwcf8lp6r802nh8hcw5j00hcdnhkcq0";
version = "2020.3.1.20"; # "Android Studio Arctic Fox (2020.3.1) Beta 5"
sha256Hash = "0swcsjx29ar4b0c8yhbynshqdn2sv94ga58h2nrc99927vp17g85";
};
latestVersion = { # canary & dev
version = "2021.1.1.1"; # "Android Studio Bumblebee (2021.1.1) Canary 1"
sha256Hash = "0aavmk8byw817356jm28rl998gcp3zm7x3fq14hm2awzhk5jaklm";
version = "2021.1.1.3"; # "Android Studio Bumblebee (2021.1.1) Canary 3"
sha256Hash = "1n8iahaqhmzvpps9vhv93n3yabb26vl78yndd6gid028r8r90y4x";
};
in {
# Attributes are named by their corresponding release channels

View File

@ -2,10 +2,10 @@ let
pkgs = import ../../../../.. { };
src = pkgs.fetchgit {
url = "https://github.com/ttuegel/emacs2nix.git";
url = "https://github.com/nix-community/emacs2nix.git";
fetchSubmodules = true;
rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923";
sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df";
rev = "703b144eeb490e87133c777f82e198b4e515c312";
sha256 = "sha256-YBbRh/Cb8u9+Pn6/Bc0atI6knKVjr8jiTGgFkD2FNGI=";
};
in
pkgs.mkShell {

View File

@ -0,0 +1,93 @@
{ callPackage }:
{
caml = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "caml";
ename = "caml";
version = "4.7.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar";
sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/caml.html";
license = lib.licenses.free;
};
}) {};
markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "markdown-mode";
ename = "markdown-mode";
version = "2.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar";
sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/markdown-mode.html";
license = lib.licenses.free;
};
}) {};
org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
elpaBuild {
pname = "org-contrib";
ename = "org-contrib";
version = "0.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar";
sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k";
};
packageRequires = [ emacs org ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-contrib.html";
license = lib.licenses.free;
};
}) {};
request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "request";
ename = "request";
version = "0.3.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar";
sha256 = "168yy902bcjfdaahsbzhzb4wgqbw1mq1lfwdjh66fpzqs75c5q00";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/request.html";
license = lib.licenses.free;
};
}) {};
sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "sly";
ename = "sly";
version = "1.0.43";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar";
sha256 = "0qgji539qwk7lv9g1k11w0i2nn7n7nk456gwa0bh556mcqz2ndr8";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/sly.html";
license = lib.licenses.free;
};
}) {};
tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tuareg";
ename = "tuareg";
version = "2.3.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/tuareg-2.3.0.tar";
sha256 = "0a24q64yk4bbgsvm56j1y68zs9yi25qyl83xydx3ff75sk27f1yb";
};
packageRequires = [ caml emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/tuareg.html";
license = lib.licenses.free;
};
}) {};
}

View File

@ -0,0 +1,32 @@
/*
# Updating
To update the list of packages from nongnu (ELPA),
1. Run `./update-nongnu`.
2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`.
3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix`
*/
{ lib }:
self: let
generateNongnu = lib.makeOverridable ({
generated ? ./nongnu-generated.nix
}: let
imported = import generated {
inherit (self) callPackage;
};
super = imported;
overrides = {
};
in super // overrides);
in generateNongnu { }

View File

@ -0,0 +1,4 @@
#! /usr/bin/env nix-shell
#! nix-shell --show-trace ./emacs2nix.nix -i bash
exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "formatter";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "Djaler";
repo = "Formatter";
rev = version;
sha256 = "0da1dvzsvbwg1ys19yf0n080xc0hjwin9zacjndb24jvphy3bxql";
sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo=";
};
patches = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.2.3";
version = "0.2.6";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "LTwgLG/jUVOSR29LkLJ9q5wpPMK78yFvGtglzMG0ZC0=";
sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y=";
name = "${pname}-${version}.AppImage";
};

View File

@ -0,0 +1,46 @@
{ python3Packages, fetchFromGitHub, lib }:
python3Packages.buildPythonApplication rec {
pname = "mnamer";
version = "2.5.3";
src = fetchFromGitHub {
owner = "jkwill87";
repo = "mnamer";
rev = version;
sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd";
};
propagatedBuildInputs = with python3Packages; [
babelfish
requests
appdirs
teletype
requests-cache
guessit
];
patches = [
# requires specific old versions of dependencies which have been updated in nixpkgs
./remove_requirements.patch
# author reads a private property that changed between versions
./update_hack.patch
];
checkInputs = [ python3Packages.pytestCheckHook ];
# disable test that fail (networking, etc)
disabledTests = [
"network"
"e2e"
"test_utils.py"
];
meta = with lib; {
homepage = "https://github.com/jkwill87/mnamer";
description = "An intelligent and highly configurable media organization utility";
license = licenses.mit;
maintainers = with maintainers; [ urlordjames ];
};
}

View File

@ -0,0 +1,21 @@
diff --git a/setup.py b/setup.py
index 245c1dd..fdc17ab 100755
--- a/setup.py
+++ b/setup.py
@@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION
with open("readme.md", "r", encoding="utf8") as fp:
LONG_DESCRIPTION = fp.read()
-with open("requirements.txt", "r", encoding="utf8") as fp:
- REQUIREMENTS = fp.read().splitlines()
-
setup(
author="Jessy Williams",
author_email="jessy@jessywilliams.com",
description="A media file organiser",
entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]},
include_package_data=True,
- install_requires=REQUIREMENTS,
license="MIT",
long_description=LONG_DESCRIPTION,
long_description_content_type="text/markdown",

View File

@ -0,0 +1,13 @@
diff --git a/mnamer/utils.py b/mnamer/utils.py
index 636b596..e52bd37 100644
--- a/mnamer/utils.py
+++ b/mnamer/utils.py
@@ -280,7 +280,7 @@ def request_json(
"like Gecko) Chrome/79.0.3945.88 Safari/537.36"
)
- initial_cache_state = session._is_cache_disabled # yes, i'm a bad person
+ initial_cache_state = session._disabled # yes, i'm a bad person
try:
session._is_cache_disabled = not cache
response = session.request(

View File

@ -0,0 +1,35 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, cairo
, gobject-introspection
, gtk3
, gtk-layer-shell
}:
buildGoModule rec {
pname = "nwg-drawer";
version = "0.1.4";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YjMuXSBAgRh6vZUxKHLTqT2lEU/f+AuI/dX4PHfftZg=";
};
vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ];
meta = with lib; {
description = "Application drawer for sway Wayland compositor";
homepage = "https://github.com/nwg-piotr/nwg-drawer";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ plabadens ];
};
}

View File

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "zola";
version = "unstable-2021-07-10";
version = "unstable-2021-07-14";
src = fetchFromGitHub {
owner = "getzola";
repo = pname;
# unstable because the latest release fails to build
rev = "8c3ce7d7fbc0d585d4cbf27598ac7dfe5acd96f1";
sha256 = "sha256-Tw3u96ZPb0yUXvtJ+rna6nnb0a+KfTEiR/PPEadFxDA=";
rev = "312ffcb04c06c5f157b9fd2b944b858703238592";
sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w";
};
cargoSha256 = "sha256-mOO39LK7lQ5IxwMgfJpNwX/H5MZ3qKqfeDmnY8zXOx4=";
cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8";
nativeBuildInputs = [ cmake pkg-config installShellFiles];
buildInputs = [ openssl oniguruma ]
@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
description = "A fast static site generator with everything built-in";
homepage = "https://www.getzola.org/";
license = licenses.mit;
maintainers = with maintainers; [ dywedir _0x4A6F ];
maintainers = with maintainers; [ dandellion dywedir _0x4A6F ];
# set because of unstable-* version
mainProgram = "zola";
};

View File

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.26.74";
version = "1.26.77";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "ULmoUXyPWHCewK4FPP7SX1Ena6n0aM/EWR7ZnMN1ztY=";
sha256 = "tV/VseU+IncvM3gdrmqkYLPClbsf2kSvIAZj0Ylz2Rw=";
};
dontConfigure = true;

View File

@ -62,9 +62,9 @@ mkChromiumDerivation (base: rec {
-e '/\[Desktop Entry\]/a\' \
-e 'StartupWMClass=chromium-browser' \
$out/share/applications/chromium-browser.desktop
'' + lib.optionalString (channel != "stable") ''
'' + ''
cp -v "$buildPath/crashpad_handler" "$libExecPath/"
'';
''; # TODO: Merge
passthru = { inherit sandboxExecutableName; };

View File

@ -1,8 +1,7 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
, pipewire
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
, lib
@ -165,7 +164,7 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
libPath = lib.makeLibraryPath [ libva pipewire ];
libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 ];
in with lib; ''
mkdir -p "$out/bin"

View File

@ -1,20 +1,20 @@
{
"stable": {
"version": "91.0.4472.164",
"sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4",
"sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr",
"version": "92.0.4515.107",
"sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
"sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj",
"deps": {
"gn": {
"version": "2021-04-06",
"version": "2021-05-07",
"url": "https://gn.googlesource.com/gn",
"rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
}
},
"chromedriver": {
"version": "91.0.4472.101",
"sha256_linux": "0dzx565z2rd0y4i57rv5kd7dsm69sffza96y3c773hqaghm4y1ng",
"sha256_darwin": "0nff1jmmrn6a4clfvhyzrhfp8hx85z72563jwk28apflqmnm0k68"
"version": "92.0.4515.43",
"sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw",
"sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f"
}
},
"beta": {

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm";
version = "3.6.2";
version = "3.6.3";
gitCommit = "ee407bdf364942bcb8e8c665f82e15aa28009b71";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "1s40zbk83s1kylcglydw356282virf1828v9waj1zs1gjnjml69h";
sha256 = "sha256-DfMI50eQsMHRX8S5rBzF3qlSfJizlYQyofA7HPkD4EQ=";
};
vendorSha256 = "06ccsy30kd68ml13l5k7d4225vlax3fm2pi8dapsyr4gdr234c1x";
vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk=";
doCheck = false;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.24.13";
version = "0.24.14";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28=";
sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA=";
};
buildFlagsArray = ''

View File

@ -17,10 +17,10 @@ in
mkFranzDerivation' rec {
pname = "ferdi";
name = "Ferdi";
version = "5.6.0-beta.6";
version = "5.6.0";
src = fetchurl {
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A=";
sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc=";
};
extraBuildInputs = [ xorg.libxshmfence ];
meta = with lib; {

View File

@ -2,19 +2,19 @@
buildGoModule {
pname = "go-neb";
version = "unstable-2021-03-24";
version = "unstable-2021-07-21";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "go-neb";
rev = "b6edd50d6e33de3bcdb35055fa6c5f0157f45321";
sha256 = "sha256-wFqkN4C0rWzWxa6+/LiHMMS8i/g3Q57f5z4cG2XZQzs=";
rev = "8916c80f8ce1732f64b50f9251242ca189082e76";
sha256 = "sha256-kuH4vbvS4G1bczxUdY4bd4oL4pIZzuueUxdEp4xuzJM=";
};
subPackages = [ "." ];
buildInputs = [ olm ];
vendorSha256 = "sha256-sWrLWjODf25Z8QqCDg4KyVWmTc3PRiYpRL88yxK0j/M";
vendorSha256 = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA=";
doCheck = false;

View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "kdeltachat";
version = "unstable-2021-07-04";
version = "unstable-2021-07-17";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
rev = "5d3cddc47773b49d4a801d031c1de96c38617908";
sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad";
rev = "9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158";
sha256 = "12arcrnpacq2fbjbzs6a9yz6lfsj2dkga9chpld1ran3v6by58z9";
};
nativeBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "toil";
version = "5.4.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd";
};
postPatch = ''
substituteInPlace setup.py \
--replace "docker = " "docker = 'docker' #" \
--replace "addict = " "addict = 'addict' #"
'';
propagatedBuildInputs = with python3Packages; [
addict
docker
pytz
pyyaml
enlighten
psutil
python-dateutil
dill
];
checkInputs = with python3Packages; [ pytestCheckHook ];
pytestFlagsArray = [ "src/toil/test" ];
pythonImportsCheck = [ "toil" ];
meta = with lib; {
homepage = "https://toil.ucsc-cgl.org/";
license = with licenses; [ asl20 ];
description = "Workflow engine written in pure Python";
maintainers = with maintainers; [ veprbl ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "1.12.1";
version = "1.13.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-P9fbkJSXRYZdVD1EKWWs0FKs8aQdPqHWESUqjsGgyPU=";
sha256 = "sha256-6ur1ZIJRghkZk5tLMJUmKn+XfjVGFE0MRSQ/Uz+Eans=";
};
vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0=";
vendorSha256 = "sha256-JJNyzMYAQT/pS1+eGYQsUpxDiwa6DP7JWhIBuTtnOiE=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.2.1";
version = "3.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h";
sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8";
};
nativeBuildInputs = [ installShellFiles pbr ];

View File

@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "a4ksubtitles";
namespace = "service.subtitles.a4ksubtitles";
version = "2.6.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "a4k-openproject";
repo = "a4kSubtitles";
rev = "${namespace}/${namespace}-${version}";
sha256 = "1rzgrxdcws064ji65fdbzzmgd2pdlaak3apa5n1clkmzknn7n881";
sha256 = "0fg5mcvxdc3hqybp1spy7d1nnqirwhcvrblbwksikym9m3qgw2m5";
};
propagatedBuildInputs = [

View File

@ -45,7 +45,7 @@ rec {
targetPkgs = pkgs: [ appimage-exec ]
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
runScript = "appimage-exec.sh -w ${src}";
runScript = "appimage-exec.sh -w ${src} --";
} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage

View File

@ -28,7 +28,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
emacs --batch -Q -l ${./elpa2nix.el} \
-f elpa2nix-install-package \
"${src}" "$out/share/emacs/site-lisp/elpa"
"$src" "$out/share/emacs/site-lisp/elpa"
runHook postInstall
'';

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "man-pages";
version = "5.11";
version = "5.12";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo=";
sha256 = "07ip4f70nyxn24wy0fin6klq1hm1cjjvzr9zh5baqzssl1hckxbs";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
makeFlags = [ "prefix=$(out)" ];
postInstall = ''
# conflict with shadow-utils
rm $out/share/man/man5/passwd.5 \
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Linux development manual pages";
homepage = "https://www.kernel.org/doc/man-pages/";
repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages";
repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages";
license = licenses.gpl2Plus;
platforms = with platforms; unix;
priority = 30; # if a package comes with its own man page, prefer it

View File

@ -66,13 +66,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "40.2";
version = "40.3";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-Tp2CmwOfoK3TO7ZYP8e04Cjtjc/3r4pXfgnMZpiMKBw=";
sha256 = "sha256-erEMbulpmCjdch6/jOHeRk3KqpHUlYI79LhMiTmejCs=";
};
patches = [

View File

@ -41,6 +41,7 @@ let
"armv6l" = "arm";
"armv7l" = "arm";
"powerpc64le" = "ppc64le";
"mips" = "mips";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
# We need a target compiler which is still runnable at build time,

View File

@ -41,6 +41,7 @@ let
"armv6l" = "arm";
"armv7l" = "arm";
"powerpc64le" = "ppc64le";
"mips" = "mips";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
# We need a target compiler which is still runnable at build time,

View File

@ -41,6 +41,7 @@ let
"armv6l" = "arm";
"armv7l" = "arm";
"powerpc64le" = "ppc64le";
"mips" = "mips";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
# We need a target compiler which is still runnable at build time,

View File

@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "13";
patch_version = "0-alpha1";
patch_version = "0-alpha2";
src = fetchTarball {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha1.tar.xz";
sha256 = "071k12q8m2w9bcwvfclyc46pwd9r49v6av36fhjdlqq29niyq915";
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz";
sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif";
};
}

View File

@ -11,8 +11,8 @@
let
major = "11";
minor = "0";
update = "11";
build = "9";
update = "12";
build = "7";
openjdk = stdenv.mkDerivation rec {
pname = "openjdk" + lib.optionalString headless "-headless";
@ -22,7 +22,7 @@ let
owner = "openjdk";
repo = "jdk${major}u";
rev = "jdk-${version}";
sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx";
sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];

View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.117";
src = fetchurl {
url = "www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip";
url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip";
sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z";
};

View File

@ -20,7 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c";
};
patches = [
patches =
# TODO: apply unconditionally on a rebuild; probably included in > 1.16.0
lib.optional (stdenv.is32bit && stdenv.isLinux) (fetchpatch {
name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969";
sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h";
})
++ [
(fetchpatch { # gpg: Send --with-keygrip when listing keys
name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch";
url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992";

View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libmwaw";
version="0.3.19";
version="0.3.20";
name="${baseName}-${version}";
hash="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.19/libmwaw-0.3.19.tar.xz";
sha256="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";
hash="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.20/libmwaw-0.3.20.tar.xz";
sha256="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -11,9 +11,9 @@ stdenv.mkDerivation {
propagatedBuildInputs = packages;
preferLocalBuild = true;
} // {
# For compatability with XFree86.
buildClientLibs = true;
passthru.buildClientLibs = true;
meta = {
platforms = lib.platforms.unix;

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "h3";
version = "3.7.1";
version = "3.7.2";
src = fetchFromGitHub {
owner = "uber";
repo = "h3";
rev = "v${version}";
sha256 = "1ccyzbvbacf0bl9av4yp15zmhiqr3679nnbab11yrhxm9csyal16";
sha256 = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8=";
};
nativeBuildInputs = [ cmake ];

View File

@ -6,12 +6,12 @@
buildDunePackage rec {
pname = "luv";
version = "0.5.8";
version = "0.5.9";
useDune2 = true;
src = fetchurl {
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
sha256 = "1y3g7jvb72frckjl92zyn7hzmzjy1fy4a48992jdk80vphsdzgmk";
sha256 = "0bbv28vgv5mnfbn1gag5fh3n4d9nkffqy3bif3pf47677c493ym2";
};
postConfigure = ''

View File

@ -5,13 +5,13 @@
buildDunePackage rec {
pname = "odoc";
version = "1.5.2";
version = "1.5.3";
minimumOCamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
sha256 = "0wa87h8q6izcc6rkzqn944vrb3hmc21lf0d0rmr8rhhbcvr66i6j";
sha256 = "0idzidmz7y10xkwcf4aih0mdvkipxk1gzi4anhnbbi2q2s0nzdzj";
};
useDune2 = true;

View File

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "addict";
version = "2.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "addict" ];
meta = with lib; {
description = "Module that exposes a dictionary subclass that allows items to be set like attributes";
homepage = "https://github.com/mewwts/addict";
license = with licenses; [ mit ];
maintainers = with maintainers; [ veprbl ];
};
}

View File

@ -15,12 +15,12 @@
}:
buildPythonPackage rec {
version = "0.20.23";
version = "0.20.24";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QC5WtcB/BAR50RiOXC9AbiwAaqOUMIAVXUxtBeX8qGU=";
sha256 = "1wacchqxxwbhwnfnnhlb40s66f92lkvz6423j4c1w6wb585aqqbb";
};
LC_ALL = "en_US.UTF-8";

View File

@ -0,0 +1,37 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, blessed
, prefixed
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "enlighten";
version = "1.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984";
};
propagatedBuildInputs = [
blessed
prefixed
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "enlighten" ];
disabledTests =
# https://github.com/Rockhopper-Technologies/enlighten/issues/44
lib.optional stdenv.isDarwin "test_autorefresh"
;
meta = with lib; {
description = "Enlighten Progress Bar for Python Console Apps";
homepage = "https://github.com/Rockhopper-Technologies/enlighten";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ veprbl ];
};
}

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.9.6";
version = "0.9.8";
src = fetchPypi {
inherit pname version;
sha256 = "1810deb7f780700e7e0734e1844c1b4b2525ee990b8665f7b98e3f335a31bbcf";
sha256 = "1yx9ybpw9ppym8k2ky5pxh3f2icpmk887i8ipwixrcrnml3q136p";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "prefixed";
version = "0.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "ca48277ba5fa8346dd4b760847da930c7b84416387c39e93affef086add2c029";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "prefixed" ];
meta = with lib; {
description = "Prefixed alternative numeric library";
homepage = "https://github.com/Rockhopper-Technologies/prefixed";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ veprbl ];
};
}

View File

@ -1,11 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
{ lib
, buildPythonPackage
, fetchPypi
, latexcodec
, pyyaml
, setuptools
}:
buildPythonPackage rec {
version = "0.24.0";
pname = "pybtex";
doCheck = false;
propagatedBuildInputs = [ latexcodec pyyaml ];
pythonImportsCheck = [ "pybtex" ];
propagatedBuildInputs = [
latexcodec
pyyaml
setuptools
];
src = fetchPypi {
inherit version pname;

View File

@ -0,0 +1,25 @@
{ buildPythonPackage, fetchPypi, requests, lib }:
buildPythonPackage rec {
pname = "requests-futures";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148";
};
propagatedBuildInputs = [ requests ];
# tests are disabled because they require being online
doCheck = false;
pythonImportsCheck = [ "requests_futures" ];
meta = with lib; {
description = "Asynchronous Python HTTP Requests for Humans using Futures";
homepage = "https://github.com/ross/requests-futures";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ applePrincess ];
};
}

View File

@ -0,0 +1,22 @@
{ buildPythonPackage, fetchPypi, lib }:
buildPythonPackage rec {
pname = "teletype";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "02mg0qmdf7hljq6jw1hwaid3hvkf70dfxgrxmpqybaxrph5pfg1y";
};
# no tests
doCheck = false;
pythonImportsCheck = [ "teletype" ];
meta = with lib; {
description = "A high-level cross platform tty library";
homepage = "https://github.com/jkwill87/teletype";
license = licenses.mit;
maintainers = with maintainers; [ urlordjames ];
};
}

View File

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.48.7";
version = "0.50.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8OOi2YWxn50iXdH5rqxZ2/qIlS6JX/7P3HMaPpnBH6I=";
sha256 = "1hah13icvwnaim628q6q88wbipwz1gwgnxgr3i8cnky9cx4qd3ig";
};
goPackagePath = "github.com/aquasecurity/tfsec";

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
version = "3.19.7";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "sha256-WKFfDVagr8zDzFNxI0/Oc/zGyPnb13XYmOUQuDF1WI4=";
};

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terracognita";
version = "0.6.3";
version = "0.7.1";
src = fetchFromGitHub {
owner = "cycloidio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rRSBPnvv4941IUGN/6+8/hzgYDqgPErNkd7tFrslPiQ=";
sha256 = "119rbjg3lsm73mdw6ymvslyj4y4ghj3a3dvxnvkrm55v9g0s03l9";
};
vendorSha256 = "sha256-sN9GTcG5cZxvMaLqNjY2jfLkf8a3lugM2aV3bBdT5Ww=";
vendorSha256 = "1fvp53d694a4aj8l4hj7q2lvyadn9y9c52q4bzl6yrfjq6708y8d";
doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
meta = with lib; {
description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration";
homepage = "https://github.com/cycloidio/terracognita";
changelog = "https://github.com/cycloidio/terracognita/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/cycloidio/terracognita/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "packer";
version = "1.7.3";
version = "1.7.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA=";
sha256 = "sha256-VNOq9uhtzf1hdEn+bkAOYy4gZxP5ek0WaaS/71uJzrA=";
};
vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY=";
vendorSha256 = "sha256-WYA/wZJg93+X4IAX9hOMRHVRQRyA4N4aDaScDgkGUIE=";
subPackages = [ "." ];

View File

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.12.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-heri1vb0KykEqef8uBfEazPzTgz8jjYSUB0dpPiDJ7g=";
sha256 = "sha256-kNwRnoUkX2dmj6ii9fRu/Hv4V3/sz6ag+wUPf93tmTQ=";
};
cargoSha256 = "sha256-v/yafzfAy1SBjeFwaMEWVTGJH3Fv1CYYU70TA7AUUsk=";
cargoSha256 = "sha256-5ukTSzDFCkBQ1UFfnpz1fFzJSHBYUoZAvhPGMkr/fIs=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];

View File

@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-07-17";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "f83a1f70d542ac885b72d1161140d6d999e2d7b2";
sha256 = "0mx9g2j32hbpg5gyxn4apkfm28myzpasj4w7dpq6p61c90hwhgq4";
rev = "5ad4fdd583116ec253aaf43e2d457cd3e3aa5587";
sha256 = "178c60ckgkr4ivgi1b21f1cndx9d64spydc8z75gcyz3r6lcbrmm";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-07-19";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "7ae9ada3866e05a25be1899dfb68fa2dc17f5466";
sha256 = "0plydss60in6zsgjrgrsvxgkz59bmn89ngm015prqp1w8izlwc82";
rev = "f768ee24fd8b8b3ee6751361b9ac09f7c8f381d8";
sha256 = "1rdfjz2l2v1hzsp8pfiv0c7kbmf7221a90pak7w7mncaabrzlnxr";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -533,12 +533,12 @@ final: prev:
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
version = "2021-07-17";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
rev = "75b97dfdd641d530b86dee603308aea0079736e9";
sha256 = "1rmlz74ssf9mpg4fbxinrmxnqcb4p37wi4pz96d6niiii0vj71b2";
rev = "d3ddb34d124c2fce9afa56342e67732a267d6b42";
sha256 = "1px4fny0m272jl4vvhhv317j4wh5kfb89rdlrrpqwg8dl2si24rq";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@ -569,12 +569,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2021-07-16";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "9c3c84735c9bcfd62507d6e2a137f90b1ddaa98a";
sha256 = "0g479ffpiqz15wwam4vwi8x0w7hbdnk2dxcwzryaf1cqnn6ip6in";
rev = "576f3c972aa9c4458d3dbac2794bd8643ae16e4a";
sha256 = "09cndvz8dcasn35bclhqc4i72dw93sczivvfi0zw9ncgsdl22r6g";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -690,12 +690,12 @@ final: prev:
compe-tmux = buildVimPluginFrom2Nix {
pname = "compe-tmux";
version = "2021-07-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "compe-tmux";
rev = "fcb7c80bc6b3df11d5c0d8cde4f12aa9d3653cdd";
sha256 = "18v1g8l11caqlag3d55vvn1v7k99600jzlzzmp6bv5pmi4lmhq0g";
rev = "82d2139de0279a20a70da61320042adf31b94798";
sha256 = "06dyrknc6gap8ybsjai4ndr4cdhzkwz1hnxilz9ffcbplzwldhs5";
};
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
};
@ -822,12 +822,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
version = "2021-07-19";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
rev = "9c1aa175762884812b9f3c3436ef6e26639b9589";
sha256 = "1xhbnad098a6h3vf05rkha7qpj4nb4jaxjcnll91wzvf4lngq4p0";
rev = "2cad943df739c1fcf4d923854ae642fde38b477f";
sha256 = "1j761zpa41p9hmh4bxapaqjvxx9d3nhcf2bifsibcjghcxblj1xb";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@ -1400,12 +1400,12 @@ final: prev:
editorconfig-vim = buildVimPluginFrom2Nix {
pname = "editorconfig-vim";
version = "2021-04-04";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-vim";
rev = "f305bc77faef4b418aee65682d7d147f64cfd5a9";
sha256 = "1yr8jni3z9sf348d8zw532vj4s1ww62yfslfcdgkgwhba1l2vy53";
rev = "1c4f781f2439469e5342217131886260c9445fc6";
sha256 = "0m39if0n4kijqzxk91r1a1fnyhr2p4b9nx1yzvwzkj21snysi4w8";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@ -1619,12 +1619,12 @@ final: prev:
floating-nvim = buildVimPluginFrom2Nix {
pname = "floating-nvim";
version = "2021-05-08";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "fhill2";
repo = "floating.nvim";
rev = "c47af010aa8e88758995858f0ed2771a99cd3e98";
sha256 = "0cvs6c903bq4jk4l197vvdrk8q85rl7z7iy7cvd5m4k7yd937r50";
rev = "11e75c2a201b9d73f03bd3c2db1fc94021c231eb";
sha256 = "172ak3macqmkz4jvic1xcnfpp6wafq33afyvcx4za170qh30sydj";
};
meta.homepage = "https://github.com/fhill2/floating.nvim/";
};
@ -1859,12 +1859,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-07-19";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "66638c929c61f950246f3d292b6157a9596241de";
sha256 = "1wqspsx83sy2qmmg0idi7j66swm23hnhxx630j114vh6a70vai00";
rev = "c3b63ec2ffedc7e7199265852eab13ec8c02b6e0";
sha256 = "1l8yilf0fqi16lrgpp8i8irq3fb1a73j17gvhff7m6fyzilwahjj";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2436,12 +2436,12 @@ final: prev:
lazygit-nvim = buildVimPluginFrom2Nix {
pname = "lazygit-nvim";
version = "2021-07-14";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "lazygit.nvim";
rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd";
sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv";
rev = "c1840692c17b6994bb3b96b33e48040d0cb2da99";
sha256 = "07mwa2bbny73s60as5s1schk4zhk6m6rv26ljbcl14mx45z9m8r8";
};
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
};
@ -2724,12 +2724,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-07-12";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "d7638d0a72686ca3e0e2ff019aae8cb9073d7980";
sha256 = "0fsd4azmmjjqqm6sb492bp02fvddalklmbyn1a07xql35fj5cq89";
rev = "d4ddebdb4f4bc44e731e808d794bd8c429dc9e07";
sha256 = "01lsxak9hl2shhhzqjypdjpkasrppn6v8xlzxi28c7973c5jn629";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@ -2820,12 +2820,12 @@ final: prev:
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
version = "2021-07-16";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
rev = "2d61b880aba6e4e0b730303e0e980bf0afd73961";
sha256 = "01az8gkhhvndnrjavk7jzi5wy03ybca97cbxpdimx2wpvxly484j";
rev = "d389e2b0c67f5cedd5ec5edfe53afc847f8daf61";
sha256 = "180grx6317ic6ip98awvqnfjc4zkzqh91rglls5pvwcq1w5m5vwb";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@ -3132,12 +3132,12 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2021-06-30";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "3fdfd45119be64945e635bf2406fdb0430cb85df";
sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4";
rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0";
sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@ -3408,12 +3408,12 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix {
pname = "nord-nvim";
version = "2021-07-17";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
rev = "02a07af329b9cb42187a2dd74aef8563f5957bfc";
sha256 = "10yzlv3433dfdm5n1q8r4yzwx0h73nd81w60fqkfx4cl4l7l9085";
rev = "994cb6b4efa481ac1a64aa3ac5c9e8cfea806783";
sha256 = "1wssns3iwgfkf73vgln4msv8l5gw724wyalqzv8w8ckhf68dbz4j";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
@ -3444,12 +3444,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim";
version = "2021-07-14";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e";
sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr";
rev = "fa50b4ce297599dc22b1b4bb8550eff4d791f9e4";
sha256 = "0fhp6qxwykb1hz4xgaj4sq1h1qlfdr855fyaigw171nz0p7ki7ws";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -3540,12 +3540,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-07-17";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "b90cbdef2d7eab5fa8b3693bb321305e4455f329";
sha256 = "16n168z9gdy0p0yljpx3lv958ix1369qgqc65pjs9ib5sij03q2s";
rev = "47fc74b5b3aafd2e3028c69ab96cb215c5f6c8bc";
sha256 = "0mr0dh8picgd8ghm9gvgyg08cihr4k1x8l2brfahpnxha6aghx58";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@ -3600,12 +3600,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-07-14";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6";
sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c";
rev = "e3e23d257c9a36e3d189d6b57e6c6b7e91bfa14f";
sha256 = "09rk3s6swwng78cpj1f2rlww2vkqai9sx72sqihk09sc16prp6cc";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -3648,12 +3648,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2021-07-06";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "85c931fa18cb9a7c54b0a6bde54924741bdb296c";
sha256 = "0fw59qgfaskwv8k8pjq1xb8b4k55rgr04311xma4arki9gjrv128";
rev = "8e1d114f3d855653bc71fba9e5a22a05d3a1b1a2";
sha256 = "1dm6rwx3w8hbgg20ay4bcdd3c87bqpqvl64zfc673p81m76b3s86";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -3708,12 +3708,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-07-18";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "38e0003d0c40d506e9e46ff55978b78220a76b71";
sha256 = "0r3zicx8gkj5jd0kxs1i5inxpi9jmg3nwb0km4xcj55fb3x2vbky";
rev = "4f72377143fc0961391fb0e42e751b9f677fca4e";
sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3756,12 +3756,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2021-07-07";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "2216837c0178dc81cca3d47aff9699ac1b2aec8e";
sha256 = "0n1p7abd08k28c30pzk51vm1j3wghyjxbw0c8j0jwxiyzaf3p865";
rev = "b7ca5298fd75700cc74b122654241f5ed24ecf96";
sha256 = "0pywghia4hv9pa8g1irmqc1qrbvbhhibazx8z6kcqrrmsb3026g5";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -3780,11 +3780,11 @@ final: prev:
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-07-12";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "96af0fa98252ab3543ff1464c6452930f242c615";
rev = "0e11e0322c1730559cb74f728300de2912bf9a61";
sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
@ -3792,24 +3792,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-07-10";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "f178c8c8c5cb994326578a24d3296dde6f2e9bd3";
sha256 = "1xdakhjsjfx7y3dqi99ldgwmh69jyyvisqainlkiz63g0nsy81ay";
rev = "d3e76b81e5b169af192dea4da0bd6f64faad2c36";
sha256 = "0hw50yyikndx1260a50j6izjsa4m709r7v3qzrpwz482d7fq700j";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-07-19";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "17cf76de8a16c1e459fbe916491f258371837a8d";
sha256 = "1fzm655q6xw3qqpvzx36wj5v9js1jiwb8295cccdc65irg8r6zfw";
rev = "e473630fe0872cb0ed97cd7085e724aa58bc1c84";
sha256 = "1l6cv9znpwnk4hmg3vh8gy26s8hvlbg03wmd7snjwxcpfyj6vi84";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3852,12 +3852,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2021-07-08";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "379bc8f48256c07139241e1c7a70f22dd4344c4f";
sha256 = "0bmy6rzmh3jfqd567wiavwfm9j2dpb0asmcgkyvj5j5qy2xfmi5l";
rev = "7f36db566c66998e04ea569723174c42d8190903";
sha256 = "1j2vjlfrvvvxzqq2z6z9mdlanq8q8zhfhffbrygv1zgrp6izhhkx";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -4465,12 +4465,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim";
version = "2021-07-17";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "a22eec84aaa5b31b5c708eed24a5c09f21ca46c0";
sha256 = "14lwhdbpjrq2xyy9kfihjasvqg83bb13fl0r7aw95hngayx69l7k";
rev = "11f232c7a82c3fd5d34654c6b02abae4f56ac5e6";
sha256 = "1xyrf6s8szd1lpz70ng1whhysjvnn7pxi80knyrjrkqzkqpimiac";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@ -4815,24 +4815,24 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim";
version = "2021-07-17";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "tami5";
repo = "sql.nvim";
rev = "76277236829ca77dd41d285c794ab8878129e3f8";
sha256 = "1vqxn02xy8j7ij4zm7x55zzch1bl8k6313l06mb60zxvw77i5a81";
rev = "9983108bc9941af842d3b847b60564d180fc8e4b";
sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd";
};
meta.homepage = "https://github.com/tami5/sql.nvim/";
};
srcery-vim = buildVimPluginFrom2Nix {
pname = "srcery-vim";
version = "2021-07-19";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "srcery-colors";
repo = "srcery-vim";
rev = "b2780ad5078c24519ba1e6ae3a1b3bd2218870cc";
sha256 = "1r0v4l9rvb3w42fnj1fmcfvy04gyp0lv3mis7jl716r8kvbaqwpj";
rev = "d313ed0f8f39a7fd09da65c4f02191368680387f";
sha256 = "1z9r2x58g212jy2sl981s7f8pj2nbqfgjbfi471yqafbxlynfzdw";
};
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
};
@ -4863,12 +4863,12 @@ final: prev:
suda-vim = buildVimPluginFrom2Nix {
pname = "suda-vim";
version = "2021-02-20";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "suda.vim";
rev = "fbb138f5090c3db4dabeba15326397a09df6b73b";
sha256 = "01kys8q3gycxqf760ydq1k8wq20brjvl1gxpl8j87jvnyx87kmnf";
rev = "bfafa2722178bdb8898e014a7e95b60d497960d9";
sha256 = "1cjj6d6zkd2b9hv77saz8p7xcw06rj0svdhycc4df8bcdrvvmi39";
};
meta.homepage = "https://github.com/lambdalisue/suda.vim/";
};
@ -4921,6 +4921,18 @@ final: prev:
meta.homepage = "https://github.com/keith/swift.vim/";
};
symbols-outline-nvim = buildVimPluginFrom2Nix {
pname = "symbols-outline-nvim";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "simrat39";
repo = "symbols-outline.nvim";
rev = "7414f30365a342e1d89072d474a35913643b6eec";
sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y";
};
meta.homepage = "https://github.com/simrat39/symbols-outline.nvim";
};
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
version = "2021-07-19";
@ -5141,12 +5153,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-07-19";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "46e03a935f1d080a9bd856d5a8acfcc093cd1461";
sha256 = "14ra8p9alnmvzry3iw3ghyk7nx44dh0qm82lvg6wfg5bhw1hpnnj";
rev = "664690029fdb302bee8d3f27a458383e8477add7";
sha256 = "1aaq9lmfxxxpirkbj3py76qnyfd1qhsq9msfw689zgzjqahk7zhz";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -5262,24 +5274,24 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight-nvim";
version = "2021-07-09";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "e3ad6032a7e2c54dd7500335b43c7d353a19ede9";
sha256 = "1slb67kirb0jfgjsw09dhimmxagsk2aii6w461y1w8nj3fkl6p28";
rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7";
sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
version = "2021-07-18";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
rev = "360361b093d21531c0781c5c4a61a1e6cb3edfac";
sha256 = "052kbzx2rqpw5mhh6w1zcj5il642w1a2wi6w4nbcw7scj4gq85pd";
rev = "896f2bed6b982ce5ca2c5bd454b8eb8af312e5a1";
sha256 = "1pwlw8gq0vd8zc3xqmp8r2s2wka9m9i85w08av59rmwnizk6vkza";
};
meta.homepage = "https://github.com/markonm/traces.vim/";
};
@ -6018,12 +6030,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-07-19";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "3aa42d211ebae7471e8f9926aaeef5a1df475f2f";
sha256 = "0f1adjn9x5jv541yzgqf67v9613xvkxzgc5bmkgqrfxn2l5j3vjn";
rev = "2e287bd7e73198408d73b7183e3019a3aff6c19b";
sha256 = "1n1hipxim9d1shh9ch414yy15vdr8yc5ppgk7msv6zzgsw10qyaw";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -7616,12 +7628,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
version = "2021-06-16";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf";
sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m";
rev = "7ba553effb021293c9ff5176b91e76da71797825";
sha256 = "1phfqzn94m2j7g10aifh12a4gyyrhqnj1vn2bpdp29lpm1n179yg";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@ -8299,6 +8311,18 @@ final: prev:
meta.homepage = "https://github.com/haya14busa/vim-poweryank/";
};
vim-prettier = buildVimPluginFrom2Nix {
pname = "vim-prettier";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "prettier";
repo = "vim-prettier";
rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8";
sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf";
};
meta.homepage = "https://github.com/prettier/vim-prettier";
};
vim-prettyprint = buildVimPluginFrom2Nix {
pname = "vim-prettyprint";
version = "2016-07-16";
@ -8397,12 +8421,12 @@ final: prev:
vim-qf = buildVimPluginFrom2Nix {
pname = "vim-qf";
version = "2021-06-08";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "romainl";
repo = "vim-qf";
rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646";
sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l";
rev = "65f115c350934517382ae45198a74232a9069c2a";
sha256 = "0pylxkmhcanks59imah3q2xyn8lp5735xm17p13yx9vx90779nwp";
};
meta.homepage = "https://github.com/romainl/vim-qf/";
};
@ -9729,6 +9753,18 @@ final: prev:
meta.homepage = "https://github.com/preservim/vimux/";
};
vimway-lsp-diag-nvim = buildVimPluginFrom2Nix {
pname = "vimway-lsp-diag-nvim";
version = "2021-07-21";
src = fetchFromGitHub {
owner = "onsails";
repo = "vimway-lsp-diag.nvim";
rev = "dee2f59a45f72fb2ba0dd29cb06ed5357097ee07";
sha256 = "16da94g367sb07d1xn55cvyi48zjgjv2c1p7mzabpidm9c7r99pm";
};
meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/";
};
vimwiki = buildVimPluginFrom2Nix {
pname = "vimwiki";
version = "2020-05-26";

View File

@ -635,7 +635,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-D54R7LK4CH5S7x0g+3K1EJ4b10P7wRAIkHYwCOFJtfg=";
cargoSha256 = "046c5w47isnz5l23kpk8zkbw312yp5dz9wq9dc2kmpklai71fc1a";
};
in
''

View File

@ -506,6 +506,7 @@ Olical/aniseed
Olical/conjure
olimorris/onedark.nvim
onsails/lspkind-nvim
onsails/vimway-lsp-diag.nvim
OrangeT/vim-csharp
osyo-manga/shabadou.vim
osyo-manga/vim-anzu
@ -537,6 +538,7 @@ preservim/tagbar
preservim/vim-pencil
preservim/vim-wordy
preservim/vimux
prettier/vim-prettier
psliwka/vim-smoothie
ptzz/lf.vim
puremourning/vimspector
@ -628,6 +630,7 @@ sickill/vim-pasta
SidOfc/mkdx
simnalamburt/vim-mundo
simrat39/rust-tools.nvim
simrat39/symbols-outline.nvim
sindrets/diffview.nvim@main
SirVer/ultisnips
sjl/gundo.vim

View File

@ -335,6 +335,23 @@ let
meta = { license = lib.licenses.mit; };
};
divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "competitive-programming-helper";
publisher = "DivyanshuAgrawal";
version = "5.8.5";
sha256 = "25v2tdAX7fVl2B5nvOIKN9vP1G5rA0G67CiDQn9n9Uc=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
description = "Makes judging, compiling, and downloading problems for competitve programming easy. Also supports auto-submit for a few sites.";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=DivyanshuAgrawal.competitive-programming-helper";
homepage = "https://github.com/agrawal-d/cph";
license = licenses.gpl3;
maintainers = with maintainers; [ arcticlimer ];
};
};
donjayamanne.githistory = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog";
@ -386,8 +403,8 @@ let
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
version = "11.5.1";
sha256 = "sha256-Ic7eT8WX2GDYIj/aTu1d4m+fgPtXe4YQx04G0awbwnM=";
version = "11.6.0";
sha256 = "sha256-JxCNE/IL/v94xWmhebsRZo1Gw+nSSpDgZ41ZGongGVI=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

View File

@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.239-hardened1.patch",
"sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch"
"name": "linux-hardened-4.14.240-hardened1.patch",
"sha256": "0j5zp0f8s4w3f60yam2spg3bx56bdjvv0mh632zlhchz8rdk5zs4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.240-hardened1/linux-hardened-4.14.240-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.197-hardened1.patch",
"sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch"
"name": "linux-hardened-4.19.198-hardened1.patch",
"sha256": "18c5j00xiwc0xn5klcrwazk6wvjiy3cixbfbrw4xj7zal9r5p6q9",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.198-hardened1/linux-hardened-4.19.198-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.51-hardened1.patch",
"sha256": "0s9q7vlhnsd484kzg9mnqc7zab09ch3i3w654wvhkxk9zy4kgzhr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.51-hardened1/linux-hardened-5.10.51-hardened1.patch"
"name": "linux-hardened-5.10.52-hardened1.patch",
"sha256": "062a32rb1g5xk1npiz9fa114k7g4x9pmygycn3alc0phngjmvr98",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.52-hardened1/linux-hardened-5.10.52-hardened1.patch"
},
"5.12": {
"extra": "-hardened1",
"name": "linux-hardened-5.12.18-hardened1.patch",
"sha256": "0mlff4ylnx1pvswamhsms9366jw618ic8w42rnzrwqhasfnwkqjb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.18-hardened1/linux-hardened-5.12.18-hardened1.patch"
"name": "linux-hardened-5.12.19-hardened1.patch",
"sha256": "1nr3922gd6il69k5cpp9g3knpy6yjb6jsmpi9k4v02bkvypg86dc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.19-hardened1/linux-hardened-5.12.19-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.133-hardened1.patch",
"sha256": "0nnsyl2fxv7nnj7c47nnr753yh5x3wbny7ml8x23f5zdvjz43yfj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.133-hardened1/linux-hardened-5.4.133-hardened1.patch"
"name": "linux-hardened-5.4.134-hardened1.patch",
"sha256": "0iay6dxwd1vqj02ljf0ghncrqpr6b0gby90xiza8kkk8wnh3r9hh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.134-hardened1/linux-hardened-5.4.134-hardened1.patch"
}
}

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.239";
version = "4.14.240";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0";
sha256 = "1k65qwzlnqnh9ym0n2fxpa8nk2qwvykwhwgaixk3b7ndzmr8b6c8";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.197";
version = "4.19.198";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6";
sha256 = "13k0r6a4n8nbni64a18wqzy0pg4vn1zw2li78xrm78rqcrnah85y";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];

View File

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.4.275";
version = "4.4.276";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1aiwq6019sibsw5smj6ii28cr64dv24c19k4n8c09nakhmhcg94i";
sha256 = "1hf9h5kr1ws2lvinzq6cv7aps8af1kx4q8j4bsk2vv4i2zvmfr7y";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

View File

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.275";
version = "4.9.276";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "08mz7mzmhk5n1gwadrc5fw8s40jk0rayvdpjcricl4sv56574lb6";
sha256 = "16jp05jhmqcp8lawqga69gxn1acdkxsskn3a6wf0635863fky3hv";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.51";
version = "5.10.52";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1qkssvqk29svn10ws3lrnzfbmlvzrixkf7r7lslc7k3lqa9yiflm";
sha256 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.12.18";
version = "5.12.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "12sjscf53z6fc1jah3i2578r3a0i7rkw2jmqi0w328a22i0paakg";
sha256 = "0wscz736n13m833cd12lskn47r0b8ki4fhgpjnwga0jsab9iqf79";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.13.3";
version = "5.13.4";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1ir80wn019kslv6ysiqxdvarrjlr8b3skk1s43cwki3x2cjnxskq";
sha256 = "0v3x1q1r0r8lyjg5hsj7yayfxqcgfj01p86ya4s0i9jaclpwv4ki";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.133";
version = "5.4.134";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0c08jp5k5h4c2s4pbpyvnvzczr79jh833wy9jv15nkvqp3xnd8w9";
sha256 = "0haqw1w6f8p330ydbsl7iml1x0qqrv63az6921p2a70n88b8dyy9";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.13.1";
version = "5.13.4";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@ -12,7 +12,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA=";
sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU=";
};
structuredExtraConfig = with lib.kernel; {

View File

@ -157,6 +157,13 @@ stdenv.mkDerivation {
url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch";
sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add";
})
# Fix CVE-2021-33910, disclosed 2021-07-20
(fetchpatch {
name = "CVE-2021-33910.patch";
url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch";
sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4";
})
];
postPatch = ''

View File

@ -1,14 +1,14 @@
{ lib, stdenv, windows, fetchurl }:
let
version = "6.0.0";
version = "9.0.0";
in stdenv.mkDerivation {
pname = "mingw-w64";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0";
sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r";
};
outputs = [ "out" "dev" ];

View File

@ -4,6 +4,7 @@
, cairo
, fetchurl
, flac
, gcc11
, gnome
, gssdp
, gupnp
@ -16,13 +17,11 @@
stdenv.mkDerivation rec {
pname = "hqplayerd";
version = "4.24.1-62";
version = "4.24.2-63";
src = fetchurl {
# FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
# c.f. https://github.com/NixOS/nixpkgs/pull/111616
url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm";
sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs=";
url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm";
sha256 = "sha256-6JUgHDO+S73n/IVQhkmC0Nw4GQVzTLtiBbz/wZiflRg=";
};
unpackPhase = ''
@ -35,6 +34,7 @@ stdenv.mkDerivation rec {
alsa-lib
cairo
flac
gcc11.cc.lib
gnome.rygel
gssdp
gupnp
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
# misc service support files
mkdir -p $out/var/lib/hqplayerd
cp -r ./var/hqplayer/web $out/var/lib/hqplayerd
cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer
runHook postInstall
'';

View File

@ -2,7 +2,6 @@
, lib
, fakeroot
, fetchurl
, fetchpatch
, libfaketime
, substituteAll
## runtime dependencies
@ -70,11 +69,7 @@ stdenv.mkDerivation {
};
patches = [
# adjust configure check to work with libtiff > 4.1
(fetchpatch {
name = "libtiff-4.2.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6";
sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw";
})
./libtiff-4.patch
];
# Note that `configure` (and maybe `faxsetup`) are looking
# for a couple of standard binaries in the `PATH` and

View File

@ -0,0 +1,12 @@
https://bugs.gentoo.org/706154
--- a/configure
+++ b/configure
@@ -2583,7 +2583,7 @@ EOF
echo '#define TIFFSTRIPBYTECOUNTS uint32'
echo '#define TIFFVERSION TIFF_VERSION'
echo '#define TIFFHEADER TIFFHeader';;
- 4.[01]) tiff_runlen_t="uint32"
+ 4.[0-9]) tiff_runlen_t="uint32"
tiff_offset_t="uint64"
echo '#define TIFFSTRIPBYTECOUNTS uint64'
echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'

View File

@ -1,29 +1,17 @@
{ lib, python3, fetchFromGitHub }:
let
python = python3.override {
packageOverrides = self: super: {
mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
version = "0.8.18";
src = oldAttrs.src.override {
inherit version;
sha256 = "32daf7a7dcf5d4013b37321df7b319f36523f38884ccc3e2e965917d0a5c73c1";
};
});
};
};
in python.pkgs.buildPythonPackage rec {
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-signal";
version = "0.1.1";
version = "unstable-2021-07-01";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-signal";
rev = "v${version}";
sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl";
rev = "56eb24412fcafb4836f29375fba9cc6db1715d6f";
sha256 = "10nbfl48yb7h23znkxvkqh1dgp2xgldvxsigwfmwa1qbq0l4dljl";
};
propagatedBuildInputs = with python.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
CommonMark
aiohttp
asyncpg
@ -53,7 +41,7 @@ in python.pkgs.buildPythonPackage rec {
" > $out/bin/mautrix-signal
chmod +x $out/bin/mautrix-signal
wrapProgram $out/bin/mautrix-signal \
--set PATH ${python}/bin \
--set PATH ${python3}/bin \
--set PYTHONPATH "$PYTHONPATH"
'';

View File

@ -12,24 +12,22 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.23.4.4805-186bae04e";
version = "1.23.5.4841-549599676";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "161baz4klwb8wyvc3mnbvvwjcmdfp38rn270jwvmwzp6b70jclyx";
sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0vj7k81fl8chaxqz287arvn9vva4cd4wcnybc5yvls3589h9x1zq";
sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb";
};
outputs = [ "out" "basedb" ];
nativeBuildInputs = [ dpkg ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
unpackPhase = ''
dpkg-deb -R $src .
'';

View File

@ -26,12 +26,15 @@ let
mixFodDeps = beamPackages.fetchMixDeps {
pname = "${pname}-deps";
inherit src version;
sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6";
sha256 = "1x0if0ifk272vcqjlgf097pxsw13bhwy8vs0b89l0bssx1bzygsi";
# We need ecto 3.6 as this version checks whether the database exists before
# trying to create it. The creation attempt would always require super-user privileges
# and since 3.6 this isn't the case anymore.
patches = [ ./ecto_sql-fix.patch ];
patches = [
./ecto_sql-fix.patch
./plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch
];
};
yarnDeps = mkYarnModules {

View File

@ -0,0 +1,26 @@
From 127a77882879e5cdf32d908ee3b1b6cbdc9e482e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Wed, 14 Jul 2021 01:20:29 +0200
Subject: [PATCH] Bump `clickhouse_ecto` dependency to be compatible with ecto
3.6
---
mix.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mix.lock b/mix.lock
index ecae8ac..d42af1e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -12,7 +12,7 @@
"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
"cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"},
"certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"},
- "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "b30ccc93a4101a25ff0bba92113e18d8a9a8b28e", []},
+ "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "1969f14ecef7c357b2bd8bdc3e566234269de58c", []},
"clickhousex": {:git, "https://github.com/plausible/clickhousex", "0832dd4b1af1f0eba1d1018c231bf0d8d281f031", []},
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
"comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"},
--
2.31.1

View File

@ -52,8 +52,6 @@ in stdenv.mkDerivation rec {
makeFlags = [ "deps" ];
phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
installPhase = ''
for i in deps/*; do
( cd $i

View File

@ -0,0 +1,150 @@
{stdenv, lib, fetchurl, fetchpatch, autoreconfHook}:
stdenv.mkDerivation rec {
pname = "arj";
version = "3.10.22";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1nx7jqxwqkihhdmdbahhzqhjqshzw1jcsvwddmxrwrn8rjdlr7jq";
};
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/001_arches_align.patch";
sha256 = "0i3qclm2mh98c04rqpx1r4qagd3wpxlkj7lvq0ddpkmr8bm0fh0m";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/002_no_remove_static_const.patch";
sha256 = "0zfjqmjsj0y1kfzxbp29v6nxq5qwgazhb9clqc544sm5zn0bdp8n";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/003_64_bit_clean.patch";
sha256 = "0mda9fkaqf2s1xl6vlbkbq20362h3is9dpml9kfmacpbifl4dx3n";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/004_parallel_build.patch";
sha256 = "0gam6k7jknzmbjlf1r6c9kjh5s5h76pd31v59cnaqiycwiy8z6q9";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/005_use_system_strnlen.patch";
sha256 = "0q0ypm8mdsxd0rl1k0id6fdx5m7mvqgwcla4r250cmc6zqzpib6d";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/006_use_safe_strcpy.patch";
sha256 = "1garad95s34cix3kd77lz37andrcnz19glzkfdnkjaq7ldvzwikc";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/hurd_no_fcntl_getlk.patch";
sha256 = "0b3hpn4qypimrw9ar2n4h24886sl6pmim4lb4ly1wqcq0f73arva";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security_format.patch";
sha256 = "0q67cvln55p38bm0xwd2cgppqmkp2nfar2pg1zj78f7ncn35lbvf";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/doc_refer_robert_k_jung.patch";
sha256 = "1wxdx0m6a9vdvjlaycwsissn75l1ni7grg8n6qmkynz2vrcvgzb1";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix.patch";
sha256 = "19ycp1rak7l6ql28m50v95ls621w3sl8agw5r5va73svkgh8hc3g";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_flags.patch";
sha256 = "1jw1y9i9lw1idgi4l9cycwsql1hcz1m4f3k2iybwsgx0acaw695q";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_strip.patch";
sha256 = "1b18khj6cxnjyqk2ycygwqlcs20hrsbf4h6bckl99dxnpbq5blxi";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_pie.patch";
sha256 = "1jqswxgc1plipblf055n9175fbanfi6fb67lnzk8dcvxjn227fs3";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/self_integrity_64bit.patch";
sha256 = "0s5zdq81a0f83hdg9hy6lqn3xvckx9y9r20awczm9mbf11vi01cb";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-afl.patch";
sha256 = "0yajcwpghij8wg21a0kkp3f9x7anz5m121jx2vnkyn04bvi9541a";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-dir.patch";
sha256 = "10lv3867k0wm2s0cyf40hkxfqbjaxm4aph5ivk2q2rjkracrn2y4";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-symlink.patch";
sha256 = "095pdfskxwh0jnyy31dpz10s2ppv8n7lvvn4q722y3g71d0c79qq";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/out-of-bounds-read.patch";
sha256 = "0ps9lqkbqzlhzr2bnr47sir431z1nywr7nagkmk42iki4d96v0jq";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/remove_build_date.patch";
sha256 = "1vjlfq6firxpj068l9acyqs77mfydn1rwgr2jmxgsy9mq0fw1dsc";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/reproducible_help_archive.patch";
sha256 = "0l3qi9f140pwc6fk8qdbxx4g9d8zlf45asimmr8wfpbi4pf59n8i";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_cross.patch";
sha256 = "1vb0vbh3jbxj192q47vg3f41l343ghcz2ypbrrm2bkbpwm5cl8qr";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/fix-time_t-usage.patch";
sha256 = "012c6pnf5y4jwn715kxn3vjy088rm905959j6yh8bslyx84qaijv";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix_autoreconf.patch";
sha256 = "0yhxbdasnbqcg1nyx2379fpbr7fmdlv4n2nlxrv1z1vbc7rlvw9d";
})
];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = ''
cd gnu
'';
postConfigure = ''
cd ..
'';
meta = with lib; {
description = "Open-source implementation of the world-famous ARJ archiver";
longDescription = ''
This version of ARJ has been created with an intent to preserve maximum
compatibility and retain the feature set of the original ARJ archiver as
provided by ARJ Software, Inc.
'';
license = licenses.gpl2Plus;
maintainers = [ maintainers.sander ];
platforms = platforms.unix;
};
}

View File

@ -0,0 +1,27 @@
{stdenv, lib, fetchFromGitHub, autoreconfHook}:
stdenv.mkDerivation {
pname = "lha";
version = "unstable-2021-01-07";
src = fetchFromGitHub {
owner = "jca02266";
repo = "lha";
rev = "03475355bc6311f7f816ea9a88fb34a0029d975b";
sha256 = "18w2x0g5yq89yxkxh1fmb05lz4hw7a3b4jmkk95gvh11mwbbr5lm";
};
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms";
platforms = platforms.unix;
maintainers = [ maintainers.sander ];
# Some of the original LhA code has been rewritten and the current author
# considers adopting a "true" free and open source license for it.
# However, old code is still covered by the original LHa license, which is
# not a free software license (it has additional requirements on commercial
# use).
license = licenses.unfree;
};
}

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ibus-m17n";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus-m17n";
rev = version;
sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg=";
sha256 = "sha256-hdm1ObzN9pFLeO1ujobHxiQYnA+dg9zIp/qho6S0H78=";
};
nativeBuildInputs = [

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "android-tools";
version = "31.0.0p1";
version = "31.0.2";
src = fetchurl {
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
sha256 = "1dn7v10gdx1pi0pkddznd5sdz941qz0x4jww8h2mk50nbyxc792i";
sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ=";
};
nativeBuildInputs = [ cmake perl go ];

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "code-minimap";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "wfxr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s=";
sha256 = "sha256-eCHmMtndcQJqKmjxhkcLvjMUXApkSnH+7qyG7PDfcwo=";
};
cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s=";
cargoSha256 = "sha256-wKCANWznOJMlQ8T2q39NNNRmgPYMpbkJhXpxojusNsE=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

View File

@ -4,11 +4,11 @@
with python3.pkgs; buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20210623.0";
version = "20210719.0";
src = fetchPypi {
inherit pname version;
sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77";
sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc=";
};
# no tests

View File

@ -16,13 +16,13 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
version = "1.19.4";
version = "1.20.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2";
sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4=";
};
patches = [
@ -36,12 +36,6 @@ with python.pkgs; buildPythonApplication rec {
# drop coverage testing
sed -i '/--cov/d' pytest.ini
# migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1
# https://github.com/esphome/issues/issues/2021
substituteInPlace tests/unit_tests/strategies.py --replace \
"@st.defines_strategy_with_reusable_values" \
"@st.defines_strategy(force_reusable_values=True)"
'';
# Remove esptool and platformio from requirements

View File

@ -10,7 +10,7 @@
let
sha256 = {
"x86_64-linux" = "sha256-nGIUOS4LzfeXamcT0uigbQsVkULH2R3bli0DDEpg3ns=";
"x86_64-linux" = "sha256-FRZTUOlOK1bIbrHdR9yQv45zMhby3tWbMPpaPPq3L9s=";
"i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1";
}."${stdenv.system}";
@ -25,7 +25,7 @@ in
stdenv.mkDerivation rec {
pname = "etcher";
version = "1.5.120";
version = "1.5.121";
src = fetchurl {
url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb";

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gparted";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz";
sha256 = "sha256-jcGAJF3Z6kXm4vS8aVEvGH4Ivn95nJioJaCwTBYcvSo=";
sha256 = "sha256-Xu4ubXSxXvlrE7OiMQyGjtIpjgM0ECHn0SpamKHR4Qk=";
};
# Tries to run `pkexec --version` to get version.

View File

@ -26,8 +26,6 @@ stdenv.mkDerivation {
stripRoot = false;
};
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
buildInputs = [
makeWrapper
libGLU libGL

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "system-config-printer";
version = "1.5.12";
version = "1.5.15";
src = fetchFromGitHub {
owner = "openPrinting";
repo = pname;
rev = version;
sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf";
rev = "v${version}";
sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc";
};
prePatch = ''
@ -26,17 +26,6 @@ stdenv.mkDerivation rec {
patches = [
./detect_serverbindir.patch
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104
# (Fixes will be included in next upstream release.)
(fetchpatch {
url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch";
sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n";
})
(fetchpatch {
url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch";
sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23";
})
];
buildInputs = [
@ -55,6 +44,10 @@ stdenv.mkDerivation rec {
pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
preConfigure = ''
intltoolize --copy --force --automake
'';
configureFlags = [
"--with-udev-rules"
"--with-udevdir=${placeholder "out"}/etc/udev"

Some files were not shown because too many files have changed in this diff Show More