Merge branch 'master' into staging-next

This commit is contained in:
Dmitry Kalinkin 2021-07-08 04:38:15 -04:00
commit 280e629ee0
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
95 changed files with 1938 additions and 1064 deletions

View file

@ -3,7 +3,7 @@
- Thanks for your contribution!
- To remove the stale label, just leave a new comment.
- _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/) or on the [#nixos IRC channel](https://webchat.freenode.net/#nixos).
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos).
## Suggestions for PRs

View file

@ -41,7 +41,7 @@ weechat.override {
configure = { availablePlugins, ... }: {
init = ''
/set foo bar
/server add freenode chat.freenode.org
/server add libera irc.libera.chat
'';
};
}

View file

@ -348,6 +348,13 @@
release instead of the old 2.7.7 version.
</para>
</listitem>
<listitem>
<para>
The <literal>pulseeffects</literal> package updated to
<link xlink:href="https://github.com/wwmm/easyeffects/releases/tag/v6.0.0">version
4.x</link> and renamed to <literal>easyeffects</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>libwnck</literal> package now defaults to the 3.x

View file

@ -108,7 +108,23 @@
</arg>
</group> <replaceable>name</replaceable>
</arg>
<sbr />
<arg>
<option>--build-host</option> <replaceable>host</replaceable>
</arg>
<arg>
<option>--target-host</option> <replaceable>host</replaceable>
</arg>
<arg>
<option>--use-remote-sudo</option>
</arg>
<sbr />
<arg>
<option>--show-trace</option>
</arg>

View file

@ -18,12 +18,13 @@
<para>
If you encounter problems, please report them on the
<literal
xlink:href="https://discourse.nixos.org">Discourse</literal> or
on the <link
xlink:href="https://discourse.nixos.org">Discourse</literal>,
the <link
xlink:href="https://matrix.to/#nix:nixos.org">Matrix room</link>,
or on the <link
xlink:href="irc://irc.libera.chat/#nixos">
<literal>#nixos</literal> channel on Libera.Chat</link>, or
consider
<link
<literal>#nixos</literal> channel on Libera.Chat</link>.
Alternatively, consider <link
xlink:href="#chap-contributing">
contributing to this manual</link>. Bugs should be
reported in

View file

@ -86,6 +86,8 @@ In addition to numerous new and upgraded packages, this release has the followin
* The `antlr` package now defaults to the 4.x release instead of the
old 2.7.7 version.
* The `pulseeffects` package updated to [version 4.x](https://github.com/wwmm/easyeffects/releases/tag/v6.0.0) and renamed to `easyeffects`.
* The `libwnck` package now defaults to the 3.x release instead of the
old 2.31.0 version.

View file

@ -14,15 +14,21 @@ let
requires = [ "postgresql.service" ];
path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ];
script = ''
set -e -o pipefail
umask 0077 # ensure backup is only readable by postgres user
if [ -e ${cfg.location}/${db}.sql.gz ]; then
${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
fi
${dumpCmd} | \
${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz
gzip -c > ${cfg.location}/${db}.in-progress.sql.gz
mv ${cfg.location}/${db}.in-progress.sql.gz ${cfg.location}/${db}.sql.gz
'';
serviceConfig = {
@ -113,12 +119,12 @@ in {
})
(mkIf (cfg.enable && cfg.backupAll) {
systemd.services.postgresqlBackup =
postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall";
postgresqlBackupService "all" "pg_dumpall";
})
(mkIf (cfg.enable && !cfg.backupAll) {
systemd.services = listToAttrs (map (db:
let
cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}";
cmd = "pg_dump ${cfg.pgdumpOptions} ${db}";
in {
name = "postgresqlBackup-${db}";
value = postgresqlBackupService db cmd;

View file

@ -0,0 +1,197 @@
{
"bluez5.features.device": [
{
"name": "Air 1 Plus",
"no-features": [
"hw-volume-mic"
]
},
{
"name": "AirPods",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "AirPods Pro",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "AXLOIE Goin",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "JBL Endurance RUN BT",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl",
"sbc-xq"
]
},
{
"name": "JBL LIVE650BTNC"
},
{
"name": "Soundcore Life P2-L",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "Urbanista Stockholm Plus",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"address": "~^94:16:25:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^9c:64:8b:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^a0:e9:db:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^0c:a6:94:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:14:02:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^44:5e:f3:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^d4:9c:28:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:18:6b:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^b8:ad:3e:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^a0:e9:db:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:24:1c:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:11:b1:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^a4:15:66:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:14:f1:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:26:7e:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^90:03:b7:",
"no-features": [
"hw-volume"
]
}
],
"bluez5.features.adapter": [
{
"bus-type": "usb",
"vendor-id": "usb:0bda"
},
{
"bus-type": "usb",
"no-features": [
"msbc-alt1-rtl"
]
},
{
"no-features": [
"msbc-alt1-rtl"
]
}
],
"bluez5.features.kernel": [
{
"sysname": "Linux",
"release": "~^[0-4]\\.",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"sysname": "Linux",
"release": "~^5\\.[1-7]\\.",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"sysname": "Linux",
"release": "~^5\\.(8|9|10)\\.",
"no-features": [
"msbc-alt1"
]
},
{
"no-features": []
}
]
}

View file

@ -7,7 +7,7 @@
},
"context.modules": [
{
"name": "libpipewire-module-rtkit",
"name": "libpipewire-module-rt",
"args": {},
"flags": [
"ifexists",

View file

@ -15,6 +15,7 @@ let
defaults = {
alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
bluez-hardware = (builtins.fromJSON (builtins.readFile ./bluez-hardware.conf.json));
media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));
v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
};
@ -22,6 +23,7 @@ let
configs = {
alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor;
bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor;
bluez-hardware = defaults.bluez-hardware;
media-session = recursiveUpdate defaults.media-session cfg.config.media-session;
v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor;
};
@ -120,6 +122,10 @@ in {
mkIf config.services.pipewire.pulse.enable {
source = json.generate "bluez-monitor.conf" configs.bluez-monitor;
};
environment.etc."pipewire/media-session.d/bluez-hardware.conf" =
mkIf config.services.pipewire.pulse.enable {
source = json.generate "bluez-hardware.conf" configs.bluez-hardware;
};
environment.etc."pipewire/media-session.d/with-jack" =
mkIf config.services.pipewire.jack.enable {

View file

@ -38,8 +38,8 @@ in
# Use services.matterbridge.configPath instead.
[irc]
[irc.freenode]
Server="irc.freenode.net:6667"
[irc.libera]
Server="irc.libera.chat:6667"
Nick="matterbot"
[mattermost]
@ -55,7 +55,7 @@ in
name="gateway1"
enable=true
[[gateway.inout]]
account="irc.freenode"
account="irc.libera"
channel="#testing"
[[gateway.inout]]

View file

@ -133,8 +133,8 @@ in
Nick = "paul";
AltNick = "paul1";
LoadModule = [ "chansaver" "controlpanel" ];
Network.freenode = {
Server = "chat.freenode.net +6697";
Network.libera = {
Server = "irc.libera.chat +6697";
LoadModule = [ "simple_away" ];
Chan = {
"#nixos" = { Detached = false; };

View file

@ -11,7 +11,7 @@ let
server = mkOption {
type = types.str;
example = "chat.freenode.net";
example = "irc.libera.chat";
description = ''
IRC server address.
'';
@ -150,8 +150,8 @@ in
'';
example = literalExample ''
{
"freenode" = {
server = "chat.freenode.net";
"libera" = {
server = "irc.libera.chat";
port = 6697;
useSSL = true;
modules = [ "simple_away" ];

View file

@ -31,6 +31,30 @@ let
example = literalExample "pkgs.dockerTools.buildDockerImage {...};";
};
login = {
username = mkOption {
type = with types; nullOr str;
default = null;
description = "Username for login.";
};
passwordFile = mkOption {
type = with types; nullOr str;
default = null;
description = "Path to file containing password.";
example = "/etc/nixos/dockerhub-password.txt";
};
registry = mkOption {
type = with types; nullOr str;
default = null;
description = "Registry where to login to.";
example = "https://docker.pkg.github.com";
};
};
cmd = mkOption {
type = with types; listOf str;
default = [];
@ -220,6 +244,8 @@ let
};
};
isValidLogin = login: login.username != null && login.passwordFile != null && login.registry != null;
mkService = name: container: let
dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn;
in {
@ -235,6 +261,13 @@ let
preStart = ''
${cfg.backend} rm -f ${name} || true
${optionalString (isValidLogin container.login) ''
cat ${container.login.passwordFile} | \
${cfg.backend} login \
${container.login.registry} \
--username ${container.login.username} \
--password-stdin
''}
${optionalString (container.imageFile != null) ''
${cfg.backend} load -i ${container.imageFile}
''}

View file

@ -73,8 +73,30 @@ let
machine.succeed(
"systemctl start ${backupService}.service",
"zcat /var/backup/postgresql/${backupName}.sql.gz | grep '<test>ok</test>'",
"ls -hal /var/backup/postgresql/ >/dev/console",
"stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600",
)
with subtest("Backup service fails gracefully"):
# Sabotage the backup process
machine.succeed("rm /run/postgresql/.s.PGSQL.5432")
machine.fail(
"systemctl start ${backupService}.service",
)
machine.succeed(
"ls -hal /var/backup/postgresql/ >/dev/console",
"zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
"stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
)
# In a previous version, the second run would overwrite prev.sql.gz,
# so we test a second run as well.
machine.fail(
"systemctl start ${backupService}.service",
)
machine.succeed(
"stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
"zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
)
with subtest("Initdb works"):
machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2")

View file

@ -0,0 +1,85 @@
{ lib, stdenv
, desktop-file-utils
, fetchFromGitHub
, fftwFloat
, glib
, glibmm
, gtk4
, gtkmm4
, itstool
, libbs2b
, libebur128
, libsamplerate
, libsndfile
, lilv
, lv2
, meson
, ninja
, nlohmann_json
, pipewire
, pkg-config
, python3
, rnnoise
, rubberband
, speexdsp
, wrapGAppsHook
, zita-convolver
}:
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "6.0.0";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
hash = "sha256:1m3jamnhgpx3z51nfc8xg7adhf5x7dirvw0wf129hzxx4fjl7rch";
};
nativeBuildInputs = [
desktop-file-utils
itstool
meson
ninja
pkg-config
python3
wrapGAppsHook
];
buildInputs = [
fftwFloat
glib
glibmm
gtk4
gtkmm4
libbs2b
libebur128
libsamplerate
libsndfile
lilv
lv2
nlohmann_json
pipewire
rnnoise
rubberband
speexdsp
zita-convolver
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
separateDebugInfo = true;
meta = with lib; {
description = "Audio effects for PipeWire applications.";
homepage = "https://github.com/wwmm/easyeffects";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
}

View file

@ -1,127 +0,0 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
, itstool
, python3
, libxml2
, desktop-file-utils
, wrapGAppsHook
, gst_all_1
, pipewire
, gtk3
, glib
, glibmm
, gtkmm3
, lilv
, lv2
, serd
, sord
, sratom
, libbs2b
, libsamplerate
, libsndfile
, libebur128
, rnnoise
, boost
, dbus
, fftwFloat
, calf
, zita-convolver
, zam-plugins
, rubberband
, lsp-plugins
}:
let
lv2Plugins = [
calf # limiter, compressor exciter, bass enhancer and others
lsp-plugins # delay
];
ladspaPlugins = [
rubberband # pitch shifting
zam-plugins # maximizer
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
version = "5.0.3";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx";
};
nativeBuildInputs = [
meson
ninja
pkg-config
libxml2
itstool
python3
desktop-file-utils
wrapGAppsHook
];
buildInputs = [
pipewire
glib
glibmm
gtk3
gtkmm3
gst_all_1.gstreamer
gst_all_1.gst-plugins-base # gst-fft
gst_all_1.gst-plugins-good # spectrum plugin
gst_all_1.gst-plugins-bad
lilv lv2 serd sord sratom
libbs2b
libebur128
libsamplerate
libsndfile
rnnoise
boost
dbus
fftwFloat
zita-convolver
];
patches = [
(fetchpatch {
# Fix build failure.
# https://github.com/wwmm/pulseeffects/pull/934
url = "https://github.com/wwmm/pulseeffects/commit/ab7354a6850d23840b4c9af212dbebf4f31a562f.patch";
sha256 = "1hd05xn6sp0xs632mqgwk19hl40kh2f69mx5mgzahysrj057w22c";
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
preFixup = ''
gappsWrapperArgs+=(
--set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}"
--set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}"
)
'';
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
separateDebugInfo = true;
meta = with lib; {
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
homepage = "https://github.com/wwmm/pulseeffects";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
}

View file

@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec {
pname = "btcpayserver";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-cCm4CZdVtjO2nj69CgRCrcwO0lAbiQVD6KocOj4CSdY=";
sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs=";
};
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];

View file

@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "electrs";
version = "0.8.9";
version = "0.8.10";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
sha256 = "01fli2k5yh4iwlds97p5c36q19s3zxrqhkzp9dsjbgsf7sv35r3y";
sha256 = "0q7mvpflnzzm88jbsdxgvhk9jr5mvn23hhj2iwy2grnfngxsmz3y";
};
# needed for librocksdb-sys
nativeBuildInputs = [ llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8";
cargoSha256 = "0i8npa840g4kz50n6x40z22x9apq8snw6xgjz4vn2kh67xc4c738";
meta = with lib; {
description = "An efficient re-implementation of Electrum Server in Rust";

View file

@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec {
pname = "nbxplorer";
version = "2.1.51";
version = "2.1.52";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
sha256 = "sha256-tvuuoDZCSDFa8gAVyH+EP1DLtdPfbkr+w5lSxZkzZXg=";
sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY=";
};
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];

View file

@ -181,23 +181,23 @@
})
(fetchNuGet {
name = "NBitcoin.Altcoins";
version = "2.0.31";
sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm";
version = "2.0.33";
sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf";
})
(fetchNuGet {
name = "NBitcoin.TestFramework";
version = "2.0.22";
sha256 = "1zwhjy6xppl01jhkgl7lqjsmi8crny4qq22ml20cz8l437j1zi4n";
version = "2.0.23";
sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx";
})
(fetchNuGet {
name = "NBitcoin";
version = "5.0.76";
sha256 = "0q3ilmsrw9ip1s38qmfs4qi02xvccmy1naafffn5yxj08q0n1p79";
version = "5.0.78";
sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9";
})
(fetchNuGet {
name = "NBitcoin";
version = "5.0.77";
sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb";
version = "5.0.81";
sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x";
})
(fetchNuGet {
name = "NETStandard.Library";

View file

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-swPLJIcm8XD0+/e9pGK2bDqUb7AS/5FdQ3A7Ceh5dZc=";
sha256 = "sha256-5PNogoahAZUjIlQsVXwm7j5OmP3/uEEdV0vrIDXXBx8=";
};
cargoSha256 = "sha256-4njx8T3kzyN63Jo0aHee5ImqcObiADvi+dHKWcRmbQw=";
cargoSha256 = "0iikys90flzmnnb6l2wzag8mp91p6z9y7rjzym2sd6m7xhgbc1x6";
nativeBuildInputs = [ clang ];

View file

@ -16,7 +16,7 @@
let
pname = "TeXmacs";
version = "1.99.19";
version = "2.1";
common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
};
@ -26,7 +26,7 @@ mkDerivation {
src = fetchurl {
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
sha256 = "1izwqb0z4gqiglv57mjswk6sjivny73kd2sxrf3nmj7wr12pn5m8";
sha256 = "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48";
};
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -13,12 +13,12 @@
stdenv.mkDerivation rec {
pname = "IPMIView";
version = "2.18.0";
buildVersion = "201007";
version = "2.19.0";
buildVersion = "210401";
src = fetchurl {
url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
sha256 = "10cv63yhh81gjxahsg4y3zp4mjivc217m4z1vcpwvvnds46c65h8";
sha256 = "sha256-6hxOu/Wkcrp9MaMYlxOR2DZW21Wi3BIFZp3Vm8NRBWs=";
};
nativeBuildInputs = [ patchelf makeWrapper ];
@ -29,10 +29,14 @@ stdenv.mkDerivation rec {
else throw "IPMIView is not supported on this platform";
in
''
patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
runHook preBuild
patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/libawt_xawt.so
patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/libfontmanager.so
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
runHook postBuild
'';
desktopItem = makeDesktopItem rec {
@ -44,6 +48,8 @@ stdenv.mkDerivation rec {
};
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -R . $out/
@ -61,6 +67,8 @@ stdenv.mkDerivation rec {
mkdir -p $WORK_DIR
ln -snf '$out'/iKVM.jar '$out'/iKVM_ssl.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR
cd $WORK_DIR'
runHook postInstall
'';
meta = with lib; {

View file

@ -1,24 +1,45 @@
{ lib, stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }:
{ lib
, autoreconfHook
, fetchFromGitHub
, gettext
, ncurses
, readline
, stdenv
, texinfo
}:
stdenv.mkDerivation {
name = "pinfo-0.6.10";
stdenv.mkDerivation rec {
pname = "pinfo";
version = "0.6.13";
src = fetchurl {
# homepage needed you to login to download the tarball
url = "https://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
+ "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2";
sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
src = fetchFromGitHub {
owner = "baszoetekouw";
repo = pname;
rev = "v${version}";
sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ gettext texinfo ncurses readline ];
nativeBuildInputs = [
autoreconfHook
];
configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ];
buildInputs = [
gettext
texinfo
ncurses
readline
];
configureFlags = [
"--with-curses=${ncurses.dev}"
"--with-readline=${readline.dev}"
];
meta = with lib; {
description = "A viewer for info files";
homepage = "https://github.com/baszoetekouw/pinfo";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -533,10 +533,10 @@
"owner": "mrparkers",
"provider-source-address": "registry.terraform.io/mrparkers/keycloak",
"repo": "terraform-provider-keycloak",
"rev": "v3.0.0",
"sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a",
"vendorSha256": "0kh6lljvqd577s19gx0fmfsmx9wm3ikla3jz16lbwwb8ahbqcw1f",
"version": "3.0.0"
"rev": "v3.1.1",
"sha256": "0qh0y1j3y5hzcr8h8wzralv7h8dmrg8jnjccz0fzcmhbkazfrs4p",
"vendorSha256": "0il4rvwa23zghrq0b8qrzgxyjy0211v9z2a4ln2xmlhcz0105zg8",
"version": "3.1.1"
},
"ksyun": {
"owner": "terraform-providers",

View file

@ -194,9 +194,9 @@ rec {
};
terraform_1_0 = mkTerraform {
version = "1.0.1";
sha256 = "0sy33wf2wjhybr5smmyla7ci61w8irk0nrv3vv7h87yli1dd9yj0";
vendorSha256 = "0ai7h85f0xdlh7q04l4hb9m5wajyqbylhvpjanlhkzvc60silhmx";
version = "1.0.2";
sha256 = "0gnv6hajpn1ks4944cr8rgkvly9cgvx4zj1zwc7nf1sikqfa8r1a";
vendorSha256 = "0q1frza5625b1va0ipak7ns3myca9mb02r60h0py3v5gyl2cb4dk";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
};

View file

@ -21,7 +21,7 @@ let
python_magic
]);
version = "0.2.0";
version = "0.3.0";
in buildPythonPackage {
pname = "weechat-matrix";
inherit version;
@ -30,7 +30,7 @@ in buildPythonPackage {
owner = "poljar";
repo = "weechat-matrix";
rev = version;
hash = "sha256-qsTdF9mGHac4rPs53mgoOElcujicRNXbJ7GsoptWSGc=";
hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc=";
};
propagatedBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "2.8.7";
version = "2.9.5";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-ZiG+LMeQboFxaLIBSHjRNe5tt8bEguYXQp3nhkoMpek=";
sha256 = "sha256-oBwusx63a8AWNHqlNtG0S/SiIRM55fbc/CGN2MFJDYA=";
};
vendorSha256 = "sha256-5R3TmwOzHgdEQhS4B4Bb0InghaEhUVxDSl7oZl3aNZ4=";
vendorSha256 = "sha256-VHUDqDsfY0c6r5sJbMX7JcXTIBXze9cd5qHqZWZAC2g=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.4.5";
version = "1.4.6";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
sha256 = "sha256-HaEQTmpyM1r/+rTkki93aStdzdnhNmkfNJTZRTPehTw=";
sha256 = "sha256-Y4n67LJyNUsLmGMu7B73n888qmCQ9HjxCSM1MlfTbqQ=";
};
propagatedBuildInputs = with python3.pkgs; [

View file

@ -4,16 +4,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.17.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "1bm2xj5ypn63wxxpdix9b4hbam3s2z08jx2rk5adzd5yg499sxx0";
sha256 = "0hrdlc1dxbxvqxylk0i2f110c6bfp9azsnzqzmjj2b29xxbrmwca";
};
vendorSha256 = "1jvd7d095wvf94y2di48pvqv9hiw3bj859q5yx9v6lglkwdgz6nw";
vendorSha256 = "1qqpxm4s1s2yp1zmi4m25y1a6r7kxc5rmvfsg50jmqsfnwligpz6";
doCheck = false;

View file

@ -1,21 +1,19 @@
{ lib, stdenv, fetchurl, python2Packages, makeWrapper
, guiSupport ? false, tk ? null
, ApplicationServices
, mercurialSrc ? fetchurl rec {
meta.name = "mercurial-${meta.version}";
meta.version = "4.9.1";
url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
}
}:
let
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
in python2Packages.buildPythonApplication rec {
pname = "mercurial";
version = "4.9.1";
inherit (mercurialSrc.meta) name version;
src = mercurialSrc;
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
};
format = "other";
@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication {
'';
meta = {
inherit (mercurialSrc.meta) version;
description = "A fast, lightweight SCM system for very large distributed projects";
homepage = "https://www.mercurial-scm.org";
downloadPage = "https://www.mercurial-scm.org/release/";
@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication {
platforms = lib.platforms.unix;
};
}

View file

@ -1,20 +1,18 @@
{ lib, fetchurl, python3Packages
, mercurial, qt5
}:
let
tortoisehgSrc = fetchurl rec {
meta.name = "tortoisehg-${meta.version}";
meta.version = "5.8";
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
};
# Extension point for when thg's mercurial is lagging behind mainline.
tortoiseMercurial = mercurial;
python3Packages.buildPythonApplication rec {
pname = "tortoisehg";
version = "5.8";
in python3Packages.buildPythonApplication {
inherit (tortoisehgSrc.meta) name version;
src = tortoisehgSrc;
src = fetchurl {
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
};
# Extension point for when thg's mercurial is lagging behind mainline.
tortoiseMercurial = mercurial;
propagatedBuildInputs = with python3Packages; [
tortoiseMercurial qscintilla-qt5 iniparse

View file

@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
in
lib.optionalString (conf != null) "cp ${configFile} config.def.h";
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
meta = with lib; {
homepage = "https://dwm.suckless.org/";
description = "An extremely fast, small, and dynamic window manager for X";

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "workstyle";
version = "0.2.1";
version = "unstable-2021-05-09";
src = fetchFromGitHub {
owner = "pierrechevalier83";
repo = pname;
rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9";
sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn";
rev = "f2023750d802259ab3ee7d7d1762631ec157a0b1";
sha256 = "04xds691sw4pi2nq8xvdhn0312wwia60gkd8b1bjqy11zrqbivbx";
};
cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54";
cargoSha256 = "0xwv8spr96z4aimjlr15bhwl6i3zqp7jr45d9zr3sbi9d8dbdja2";
doCheck = false; # No tests

View file

@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.2.7";
version = "0.2.8";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "sha256-nRPt+Tyfq62o+3KjsXkHQHUMMslHFGNBd3s2pTb7l4w=";
sha256 = "sha256-T4A9NGT6sUSTKmLcAWjcp3Y8QQzZFAVSXevXtGm3szY=";
};
cargoSha256 = "sha256-lmzA7XM8B5QJI4Wo0cKeMR3+np6jT6mdGzTry4g87ng=";
cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE=";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libX11 libXinerama ];

View file

@ -1,6 +1,6 @@
{
"commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz",
"sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq",
"msg": "Update from Hackage at 2021-06-26T12:56:56Z"
"commit": "080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36.tar.gz",
"sha256": "0shv10s208nazb7q36vsx6a4sy7a14qikad4b984r9gz3j6g7l62",
"msg": "Update from Hackage at 2021-07-02T10:49:03Z"
}

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation (rec {
pname = "ponyc";
version = "0.41.1";
version = "0.42.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
sha256 = "02wx070cy1193xzv58vh79yzwgpqiayqlwd3i285698fppbcg69a";
sha256 = "1s8glmzz0g5lj1fjwwy4m3n660smiq5wl9r1lg686wqh42hcgnsy";
# Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched
# LLVM. (The submodule is a specific tag in the LLVM source tree).

View file

@ -1,21 +1,21 @@
--- a/lib/CMakeLists.txt 2021-05-27 15:58:36.819331229 -0400
+++ b/lib/CMakeLists.txt 2021-05-27 16:00:19.768268649 -0400
@@ -10,12 +10,12 @@
--- a/lib/CMakeLists.txt.orig 2021-07-07 13:40:20.209410160 -0400
+++ a/lib/CMakeLists.txt 2021-07-07 13:43:11.886969662 -0400
@@ -15,12 +15,12 @@
endif()
ExternalProject_Add(gbenchmark
- URL https://github.com/google/benchmark/archive/v1.5.2.tar.gz
+ SOURCE_DIR gbenchmark-prefix/src/benchmark
- URL ${PONYC_GBENCHMARK_URL}
+ SOURCE_DIR gbenchmark-prefix/src/benchmark
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli
)
ExternalProject_Add(googletest
- URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz
+ URL @googletest@
+ URL @googletest@
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli
)
@@ -28,75 +28,6 @@
@@ -33,75 +33,6 @@
COMPONENT library
)

View file

@ -18,19 +18,19 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
version = "0.14.2";
version = "0.14.3";
src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf";
sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw";
sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0";
};

View file

@ -64,7 +64,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1hf2i36ayscdg7fa81akx031chg8c3scbjphj4c1qawif41bynmm";
sha256 = "0nvaaba06dgkl2kfq6ldmj0v6mm2dh7wfky6lsxxy5kskbncyqjr";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash

View file

@ -74,6 +74,7 @@ broken-packages:
- aeson-filthy
- aeson-flowtyped
- aeson-match-qq
- aeson-modern-tojson
- aeson-options
- aeson-prefix
- aeson-schema
@ -261,6 +262,7 @@ broken-packages:
- aws-route53
- aws-sdk-text-converter
- aws-simple
- aws-xray-client-persistent
- axel
- azubi
- azure-acs
@ -1904,6 +1906,7 @@ broken-packages:
- haskell-src-match
- haskell-src-meta-mwotton
- haskell-stack-trace-plugin
- haskell-to-elm
- HaskellTorrent
- HaskellTutorials
- haskell-type-exts
@ -2755,6 +2758,7 @@ broken-packages:
- linear-maps
- linear-opengl
- linearscan
- linear-smc
- linear-vect
- line-drawing
- lines-of-action
@ -3183,6 +3187,7 @@ broken-packages:
- nested-sequence
- netclock
- netease-fm
- net-mqtt-rpc
- netrium
- NetSNMP
- netspec
@ -4511,6 +4516,7 @@ broken-packages:
- streaming-png
- streaming-utils
- streaming-with
- streamly-examples
- streamly-fsnotify
- stream-monad
- streamproc

View file

@ -564,6 +564,7 @@ dont-distribute-packages:
- bip32
- birch-beer
- bird
- biscuit-servant
- bit-array
- bitcoin-address
- bitcoin-api
@ -2344,6 +2345,7 @@ dont-distribute-packages:
- polysemy-path
- polysemy-plugin
- polysemy-readline
- polysemy-req
- polysemy-resume
- polysemy-test
- polysemy-time

File diff suppressed because it is too large Load diff

View file

@ -253,26 +253,26 @@ let
in {
ruby_2_6 = generic {
version = rubyVersion "2" "6" "7" "";
version = rubyVersion "2" "6" "8" "";
sha256 = {
src = "17m9qxalwhk95dw1qhgxbvr3kkcxs3h86yirfg5mwj35gy5pw8p4";
git = "08gvknanwdfsaj3lmcv1bdqjf9lldphzi7gmlv3cfa8ligx2vbap";
src = "0vfam28ifl6h2wxi6p70j0hm3f1pvsp432hf75m5j25wfy2vf1qq";
git = "0rc3n6sk8632r0libpv8jwslc7852hgk64rvbdrspc9razjwx21c";
};
};
ruby_2_7 = generic {
version = rubyVersion "2" "7" "3" "";
version = rubyVersion "2" "7" "4" "";
sha256 = {
src = "0f2kwn98n9h9hy1fd547s7d0a7ga8jjm4nh294bwiwnq65gaj9c9";
git = "0vxg9w4dgpw2ig5snxmkahvzdp2yh71w8qm49g35d5hqdsql7yrx";
src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh";
git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p";
};
};
ruby_3_0 = generic {
version = rubyVersion "3" "0" "1" "";
version = rubyVersion "3" "0" "2" "";
sha256 = {
src = "09vpnxxcxc46qv40xbxr9xkdpbgb0imdy25l2vpsxxlr47djb61n";
git = "0vricyhnnczcbsgvz65pdhi9yx1i34zarbjlc5y5mcmj01y9r7ar";
src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah";
git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r";
};
};
}

View file

@ -1,17 +1,17 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{
"2.6.7" = ops useRailsExpress [
"2.6.8" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"2.7.3" = ops useRailsExpress [
"2.7.4" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"3.0.1" = ops useRailsExpress [
"3.0.2" = ops useRailsExpress [
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
];

View file

@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "skaes";
repo = "rvm-patchsets";
rev = "28c6469ce841ff3033c376e78a7043009a3bdc5c";
sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9";
rev = "0251817e2b9d5f73370bbbb12fdf7f7089bd1ac3";
sha256 = "1biiq5xzzdfb4hr1sgmx14i2nr05xa9w21pc7dl8c5n4f2ilg8ss";
}

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cpp-utilities";
version = "5.10.4";
version = "5.10.5";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pZh/NbTzQR2kjMeauv1HcRn0hDBaCNRbaZ3+1qs5rxU=";
sha256 = "sha256-1GAZKMfA2cB/7/TZfV+WOvjlu0sWq1loOauX4EfHogA=";
};
nativeBuildInputs = [ cmake ];

View file

@ -6,13 +6,14 @@
stdenv.mkDerivation rec {
pname = "fcft";
version = "2.4.1";
version = "2.4.2";
src = fetchzip {
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM=";
sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2";
};
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
buildInputs = [ freetype fontconfig pixman tllist ]
++ lib.optional withHarfBuzz harfbuzz;

View file

@ -3,7 +3,7 @@
multimediaSupport ? true
}:
let
version = "2.2.4";
version = "2.3.8";
in
stdenv.mkDerivation {
pname = "notcurses";
@ -24,7 +24,7 @@ stdenv.mkDerivation {
owner = "dankamongmen";
repo = "notcurses";
rev = "v${version}";
sha256 = "sha256-FScs6eQxhRMEyPDSD+50RO1B6DIAo+KnvHP3RO2oAnw=";
sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E=";
};
meta = {

View file

@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt
index 93b5e2a9..1b915ac3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,6 +13,9 @@ option('media-session',
description: 'Build and install pipewire-media-session',
@@ -200,3 +200,6 @@ option('media-session',
type: 'feature',
value: 'auto')
+option('media-session-prefix',
+ description: 'Install directory for pipewire-media-session and its support files',
+ type: 'string')
option('man',
description: 'Build manpages',
type: 'feature',
option('session-managers',
diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
index 1edebb2d..251270eb 100644
--- a/src/daemon/systemd/user/meson.build

View file

@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644
# access.allowed to list an array of paths of allowed
# apps.
#access.allowed = [
- # @media_session_path@
+ # <media_session_path>
- # @session_manager_path@
+ # <session_manager_path>
#]
# An array of rejected paths.
@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644
# but it is better to start it as a systemd service.
# Run the session manager with -h for options.
#
- @comment@{ path = "@media_session_path@" args = "" }
+ @comment@{ path = "<media_session_path>" args = "" }
- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
+ @comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
#
# You can optionally start the pulseaudio-server here as well
# but it is better to start it as a systemd service.

View file

@ -14,6 +14,7 @@
, dbus
, alsa-lib
, libjack2
, libusb1
, udev
, libva
, libsndfile
@ -43,10 +44,11 @@ let
};
mesonEnable = b: if b then "enabled" else "disabled";
mesonList = l: "[" + lib.concatStringsSep "," l + "]";
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.30";
version = "0.3.31";
outputs = [
"out"
@ -64,7 +66,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE=";
sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79";
};
patches = [
@ -96,6 +98,7 @@ let
dbus
glib
libjack2
libusb1
libsndfile
ncurses
udev
@ -122,6 +125,7 @@ let
"-Dmedia-session-prefix=${placeholder "mediaSession"}"
"-Dlibjack-path=${placeholder "jack"}/lib"
"-Dlibcamera=disabled"
"-Droc=disabled"
"-Dlibpulse=${mesonEnable pulseTunnelSupport}"
"-Davahi=${mesonEnable zeroconfSupport}"
"-Dgstreamer=${mesonEnable gstreamerSupport}"
@ -133,6 +137,7 @@ let
"-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"
"-Dsysconfdir=/etc"
"-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"
"-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}"
];
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
@ -187,6 +192,7 @@ let
paths-out-media-session = [
"nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"
"nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"
"nix-support/etc/pipewire/media-session.d/bluez-hardware.conf.json"
"nix-support/etc/pipewire/media-session.d/media-session.conf.json"
"nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"
];

View file

@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "dependency-injector";
version = "4.32.2";
version = "4.34.0";
src = fetchFromGitHub {
owner = "ets-labs";
repo = "python-dependency-injector";
rev = version;
sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg";
sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0=";
};
propagatedBuildInputs = [
@ -42,6 +42,11 @@ buildPythonPackage rec {
pyyaml
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "six>=1.7.0,<=1.15.0" "six"
'';
disabledTestPaths = [
# There is no unique identifier to disable the one failing test
"tests/unit/ext/test_aiohttp_py35.py"

View file

@ -5,17 +5,22 @@
buildPythonPackage rec {
pname = "distutils-extra";
version = "2.39";
version = "2.45";
src = fetchurl {
url = "https://launchpad.net/python-distutils-extra/trunk/${version}/+download/python-${pname}-${version}.tar.gz";
sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj";
url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${version}/python-${pname}-${version}.tar.bz2";
sha256 = "1aifizd4nkvdnkwdna7i6xgjcqi1cf228bg8kmnwz67f5rflk3z8";
};
# Tests are out-dated as the last upstream release is from 2016
doCheck = false;
pythonImportsCheck = [ "DistUtilsExtra" ];
meta = with lib; {
homepage = "https://launchpad.net/python-distutils-extra";
description = "Enhancements to Python's distutils";
license = licenses.gpl2;
homepage = "https://launchpad.net/python-distutils-extra";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -25,9 +25,8 @@ buildPythonPackage rec {
sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338=";
};
# Allow later aniso8601 releases
# https://github.com/graphql-python/graphene/pull/1331
patches = [ (fetchpatch {
# Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331
url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch";
sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk=";
}) ];

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "maestral";
version = "1.4.5";
version = "1.4.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
sha256 = "sha256-kyOBF+qsl/+9u0P+EmfxbuJNGMqPSLCWJUlcZMyKJH4=";
sha256 = "sha256-kaRcM8Z0xeDp3JYputKZmzTfYYq2oKpF7AM6ciFF7I4=";
};
propagatedBuildInputs = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "6.2.0";
version = "6.4.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Dinnerbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-o5JVj4Tt5+VOjDC0TDlVuVbDUQPvZGX5Zeoz0vVxPJ8=";
sha256 = "sha256-pJ5TY9tbdhVW+kou+n5fMgCdHVBK6brBrlGIuO+VIK0=";
};
propagatedBuildInputs = [

View file

@ -1,18 +1,30 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.12.25";
version = "8.12.26";
src = fetchPypi {
inherit pname version;
sha256 = "de4db4e2582f989a9cbae54364a647b24a72a7b0126be50d8356cf02217dc6c9";
sha256 = "sha256-Zbq269vg7FGWx0YmlJdI21M30jiVqrwe+PXXKEeHmYo=";
};
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "tests/*.py" ];
pythonImportsCheck = [ "phonenumbers" ];
meta = with lib; {
description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
homepage = "https://github.com/daviddrysdale/python-phonenumbers";
license = licenses.asl20;
description = "Python module for handling international phone numbers";
homepage = "https://github.com/daviddrysdale/python-phonenumbers";
license = licenses.asl20;
maintainers = with maintainers; [ fadenb ];
};
}

View file

@ -53,9 +53,13 @@ buildPythonPackage rec {
typing-extensions
];
# fails to import graphql, but integrated graphql support is about to
# be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
disabledTestPaths = [ "tests/test_graphql.py" ];
disabledTestPaths = [
# fails to import graphql, but integrated graphql support is about to
# be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
"tests/test_graphql.py"
# contextfunction was removed in Jinja 3.1
"tests/test_templates.py"
];
pythonImportsCheck = [ "starlette" ];

View file

@ -1,2 +0,0 @@
source 'https://rubygems.org'
gem 'solargraph'

View file

@ -1,64 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
ast (2.4.1)
backport (1.1.2)
benchmark (0.1.1)
e2mmap (0.1.0)
jaro_winkler (1.5.4)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
mini_portile2 (2.5.0)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.20.1)
parser (2.7.2.0)
ast (~> 2.4.1)
racc (1.5.2)
rainbow (3.0.0)
regexp_parser (2.0.3)
reverse_markdown (2.0.0)
nokogiri
rexml (3.2.4)
rubocop (1.7.0)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.4.0)
parser (>= 2.7.1.5)
ruby-progressbar (1.11.0)
solargraph (0.40.1)
backport (~> 1.1)
benchmark
bundler (>= 1.17.2)
e2mmap
jaro_winkler (~> 1.5)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
parser (~> 2.3)
reverse_markdown (>= 1.0.5, < 3)
rubocop (>= 0.52)
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
thor (1.0.1)
tilt (2.0.10)
unicode-display_width (1.7.0)
yard (0.9.26)
PLATFORMS
ruby
DEPENDENCIES
solargraph
BUNDLED WITH
2.1.4

View file

@ -1,16 +0,0 @@
{ lib, bundlerApp, bundlerUpdateScript }:
bundlerApp {
pname = "solargraph";
exes = [ "solargraph" ];
gemdir = ./.;
passthru.updateScript = bundlerUpdateScript "solargraph";
meta = with lib; {
description = "A Ruby language server";
homepage = "https://solargraph.org/";
license = licenses.mit;
maintainers = with maintainers; [ nicknovitski angristan ];
};
}

View file

@ -1,250 +0,0 @@
{
ast = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
type = "gem";
};
version = "2.4.1";
};
backport = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc";
type = "gem";
};
version = "1.1.2";
};
benchmark = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
type = "gem";
};
version = "0.1.1";
};
e2mmap = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
type = "gem";
};
version = "0.1.0";
};
jaro_winkler = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
type = "gem";
};
version = "1.5.4";
};
kramdown = {
dependencies = ["rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
type = "gem";
};
version = "2.3.0";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
type = "gem";
};
version = "1.1.0";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
version = "2.5.0";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
version = "1.11.1";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
type = "gem";
};
version = "1.20.1";
};
parser = {
dependencies = ["ast"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
type = "gem";
};
version = "2.7.2.0";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
type = "gem";
};
version = "1.5.2";
};
rainbow = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
type = "gem";
};
version = "3.0.0";
};
regexp_parser = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip";
type = "gem";
};
version = "2.0.3";
};
reverse_markdown = {
dependencies = ["nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6";
type = "gem";
};
version = "2.0.0";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
type = "gem";
};
version = "3.2.4";
};
rubocop = {
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12kkyzyzh30mi9xs52lc1pjki1al4x9acdaikj40wslhpwp1ng1l";
type = "gem";
};
version = "1.7.0";
};
rubocop-ast = {
dependencies = ["parser"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj";
type = "gem";
};
version = "1.4.0";
};
ruby-progressbar = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
type = "gem";
};
version = "1.11.0";
};
solargraph = {
dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q0dh4da4qygn92vjwqz0w6m4pdhs2zdmrx3zlmxmghizh32ghk7";
type = "gem";
};
version = "0.40.1";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
type = "gem";
};
version = "1.0.1";
};
tilt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
version = "2.0.10";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
type = "gem";
};
version = "1.7.0";
};
yard = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
type = "gem";
};
version = "0.9.26";
};
}

View file

@ -126,6 +126,7 @@ source 'https://rubygems.org' do
gem 'semian'
gem 'sequel'
gem 'sequel_pg'
gem 'solargraph'
gem 'simplecov'
gem 'sinatra'
gem 'slop'

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "efm-langserver";
version = "0.0.31";
version = "0.0.32";
src = fetchFromGitHub {
owner = "mattn";
repo = "efm-langserver";
rev = "v${version}";
sha256 = "sha256-4NdD+WwvlqfJdPqXTz9LUyriJyLPppi8jH6dxYupe6A=";
sha256 = "sha256-zjjzdHlWEDDmPaDPuyk1ZoXwEFBogf51KjOmRmhFAdc=";
};
vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI=";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.14";
version = "0.12.15";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-+qFR5XGV1LSCY8AR7gd269UcOwlL5hkvKiQEhdsqIJc=";
sha256 = "sha256-Ikt8kBkwI9AQrWp9j4Zaf+BqGVcyhyagBDjTGZm/dzQ=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubectx";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "ahmetb";
repo = pname;
rev = "v${version}";
sha256 = "sha256-anTogloat0YJN6LR6mww5IPwokHYoDY6L7i2pMzI8/M=";
sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM=";
};
vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg=";

View file

@ -1,8 +1,9 @@
{lib, stdenv, fetchurl}:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "funnelweb";
version = "3.20";
name = "funnelweb-${meta.version}";
src = fetchurl {
url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz";
sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg";

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchgit, cmake, pcre, doxygen }:
stdenv.mkDerivation rec {
name = "editorconfig-core-c-${meta.version}";
pname = "editorconfig-core-c";
version = "0.12.1";
src = fetchgit {
url = "https://github.com/editorconfig/editorconfig-core-c.git";
rev = "v${meta.version}";
rev = "v${version}";
sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4";
fetchSubmodules = true;
inherit name;
};
buildInputs = [ pcre ];
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/editorconfig/editorconfig-core-c";
license = with licenses; [ bsd2 bsd3 ];
version = "0.12.1";
maintainers = with maintainers; [ dochang ];
platforms = platforms.unix;
};

View file

@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
stdenv.mkDerivation rec {
name = "rolespec-${meta.version}";
pname = "rolespec";
version = "20161104";
src = fetchFromGitHub {
owner = "nickjj";
repo = "rolespec";
rev = "d9ee530cd709168882059776c482fc37f46cb743";
sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl";
inherit name;
};
nativeBuildInputs = [ makeWrapper ];
@ -41,9 +40,7 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/nickjj/rolespec";
license = licenses.gpl3;
version = "20161104";
maintainers = [ maintainers.dochang ];
platforms = platforms.unix;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "7.5.0";
version = "7.7.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj";
sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897";
};
passthru.updateScript = ./update.sh;

View file

@ -34,7 +34,7 @@ let
in env.mkDerivation rec {
pname = "katago";
version = "1.9.1";
githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362";
githash = "c3220a5a404af835792c476f3f24904e4b799444";
src = fetchFromGitHub {
owner = "lightvector";

View file

@ -1,10 +1,11 @@
{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }:
stdenv.mkDerivation rec {
name = "mfcl2700dncupswrapper-${meta.version}";
pname = "mfcl2700dncupswrapper";
version = "3.2.0-1";
src = fetchurl {
url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb";
url = "https://download.brother.com/welcome/dlf102086/mfcl2700dncupswrapper-${version}.i386.deb";
sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1";
};
@ -39,6 +40,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.linux;
version = "3.2.0-1";
};
}

View file

@ -101,7 +101,12 @@ python3Packages.buildPythonApplication {
./hplip-3.20.11-nixos-cups-ppd-search-path.patch
];
prePatch = ''
postPatch = ''
# https://github.com/NixOS/nixpkgs/issues/44230
substituteInPlace createPPD.sh \
--replace ppdc "${cups}/bin/ppdc" \
--replace "gzip -c" "gzip -cn"
# HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
find . -type f -exec sed -i \
-e s,/etc/hp,$out/etc/hp,g \
@ -149,6 +154,12 @@ python3Packages.buildPythonApplication {
export CUPS_DATADIR="${cups}/share/cups"
'';
postConfigure = ''
# don't save timestamp, in order to improve reproducibility
substituteInPlace Makefile \
--replace "GZIP_ENV = --best" "GZIP_ENV = --best -n"
'';
enableParallelBuilding = true;
#

View file

@ -395,6 +395,10 @@ self: super: {
dependencies = with self; [ ultisnips ];
});
neogit = super.neogit.overrideAttrs (old: {
dependencies = with self; [ plenary-nvim ];
});
nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {
dependencies = with self; [ popfix ];
});

View file

@ -844,6 +844,7 @@ let
PREEMPT_VOLUNTARY = yes;
X86_AMD_PLATFORM_DEVICE = yes;
X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes;
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enable CPU/memory hotplug support

View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
version = "2.3.0";
version = "2.3.1";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl libkrb5 ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
sha256 = "03k6skl3191i5jby710xr1caq85cvzbjqmqv59mfkfbvihn2zfx2";
sha256 = "0azcg8fh0bbc4a6b0mghdg4b9v62bb3haaq6cycj40fk4mf1dldx";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.34.0";
version = "1.35.1";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-Gu9o1aUDlhcEZPZZsfVF0FnlzT1DvbEXMXjnOxhY8tY=";
sha256 = "sha256-RF0ZLcQNBVEExzSaOBM9EbqP1wuY8yIWYV8uabyc40o=";
};
goPackagePath = "github.com/exoscale/cli";

View file

@ -1,12 +1,13 @@
{ fetchFromGitHub, perl, lib, stdenv }:
stdenv.mkDerivation rec {
name = "sec-${meta.version}";
pname = "sec";
version = "2.8.3";
src = fetchFromGitHub {
owner = "simple-evcorr";
repo = "sec";
rev = meta.version;
rev = version;
sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83";
};
@ -27,6 +28,5 @@ stdenv.mkDerivation rec {
description = "Simple Event Correlator";
maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.all;
version = "2.8.3";
};
}

View file

@ -95,10 +95,11 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/vncserver \
--prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])}
# The viewer is in Java and requires `JAVA_HOME`.
# The viewer is in Java and requires `JAVA_HOME` (which is a single
# path, cannot be multiple separated paths).
# For SSH support, `ssh` is required on `PATH`.
wrapProgram $out/bin/vncviewer \
--prefix JAVA_HOME : "${lib.makeLibraryPath [ openjdk ]}/openjdk" \
--set JAVA_HOME "${lib.makeLibraryPath [ openjdk ]}/openjdk" \
--prefix PATH : ${lib.makeBinPath [ openssh ]}
'';

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.173.1";
version = "0.173.2";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-v3Sln1qtYDdWCWJSKErxUoPAUzwWrTYM0j5X+mz+1xo=";
sha256 = "sha256-X7Tj50A0CwkGUyKGsCj6LBAlNZwMhFk/gDEgG1KNjx0=";
};
vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM=";

View file

@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, cmake, glib, boost, pkg-config, gtk3, ragel, lua, lib }:
stdenv.mkDerivation rec {
pname = "gpick";
version = "0.2.6";
src = fetchFromGitHub {
owner = "thezbyg";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-Z67EJRtKJZLoTUtdMttVTLkzTV2F5rKZ96vaothLiFo=";
};
nativeBuildInputs = [ cmake pkg-config ];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
buildInputs = [ boost gtk3 ragel lua ];
meta = with lib; {
description = "Advanced color picker written in C++ using GTK+ toolkit";
homepage = "http://www.gpick.org/";
license = licenses.bsd3;
maintainers = [ maintainers.vanilla ];
platforms = platforms.linux;
};
}

View file

@ -2,15 +2,14 @@
, readline, zlib, bzip2, autoconf, automake, curl }:
stdenv.mkDerivation rec {
name = "lnav-${meta.version}";
pname = "lnav";
version = "0.9.0";
src = fetchFromGitHub {
owner = "tstack";
repo = "lnav";
rev = "v${meta.version}";
rev = "v${version}";
sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg";
inherit name;
};
buildInputs = [
@ -47,7 +46,6 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/tstack/lnav/releases";
license = licenses.bsd2;
version = "0.9.0";
maintainers = with maintainers; [ dochang ma27 ];
platforms = platforms.unix;
};

View file

@ -8,8 +8,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "tmuxinator";
version = "2.0.3";
source.sha256 = "0js43hl07is9nx1b17g8x2blh1q7ls8y4dshcb50r5dn7drpardh";
version = "3.0.1";
source.sha256 = "1vm96iyzbcy1388b3zyqivfhs4p63v87mp5qwlr4s8i2haq62xyf";
erubis = buildRubyGem rec {
inherit ruby;

View file

@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, xsel }:
stdenv.mkDerivation rec {
name = "yank-${meta.version}";
pname = "yank";
version = "1.2.0";
src = fetchFromGitHub {
owner = "mptre";
repo = "yank";
rev = "v${meta.version}";
rev = "v${version}";
sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc";
inherit name;
};
installFlags = [ "PREFIX=$(out)" ];
@ -27,7 +26,6 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/mptre/yank/releases";
license = licenses.mit;
version = "1.2.0";
maintainers = [ maintainers.dochang ];
platforms = platforms.unix;
};

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.38.1";
version = "0.38.2";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-H0K38SX/mKsVjdQEa6vzx5TNRhqqomYk28+5Wl5H0sA=";
sha256 = "sha256-v2uVIFPc8h58W03Jo2vsbLT5f7F8bJw4uMtSErrBYdo=";
};
vendorSha256 = null;

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
let
version = "3.7.12";
version = "3.7.13";
in
fetchFromGitHub {
name = "stevenblack-blocklist-${version}";
@ -9,7 +9,7 @@ fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
rev = version;
sha256 = "sha256-hGaiIFHgsLb6oLJ4k4yfxqeDhK0W+diCAI5odo08Q0E=";
sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw=";
meta = with lib; {
description = "Unified hosts file with base extensions";

View file

@ -17,11 +17,11 @@ let
pname = "bitwarden";
version = {
x86_64-linux = "1.27.0";
x86_64-linux = "1.27.1";
}.${system} or "";
sha256 = {
x86_64-linux = "sha256-Ik+g7jkTBHRbGwDhbiJGQorMmt6GhCXVUd82Sug9a28=";
x86_64-linux = "sha256-CqyIARPHri018AOgI1rFJ9Td3K8OamXVgupAINME7BY=";
}.${system} or "";
meta = with lib; {

View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
version = "0.6.2";
version = "0.7.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
sha256 = "sha256-Iv5A+o4TNSHJeTZgZ2e0SCHclz1mGMVRJDdBAWilyT8=";
sha256 = "sha256-WUD6KZdtMJ/nEbC5MStK8qWKK05lXuk8+VD741g448s=";
};
cargoSha256 = "sha256-ISG/0WtgWwZoQd8PsvaQ9L8UKwerzEhY/84DxkdZV2g=";
cargoSha256 = "sha256-uF9mbJ7Nd+JaoZN886NX8iRv8/LZSqYntoosyFzzAIs=";
nativeBuildInputs = [
gpgme # for gpgme-config

View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "mdbook";
version = "0.4.9";
version = "0.4.10";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "mdBook";
rev = "v${version}";
sha256 = "sha256-wc3poiLnIHbbl0j2sWQkEbxccpohPnvjLPdNuKfsDSY=";
sha256 = "sha256-1Ddy/kb2Q7P+tzyEr3EC3qWm6MGSsDL3/vnPJLAm/J0=";
};
cargoSha256 = "sha256-2DNfacPp9IMke2j8WYxpGmMxityaFGyXrc0jOyqPl3c=";
cargoSha256 = "sha256-x2BwnvEwTqz378aDE7OHWuEwNEsUnRudLq7sUJjHRpA=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

View file

@ -653,7 +653,8 @@ mapAliases ({
pyo3-pack = maturin;
pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10
pulseaudioLight = pulseaudio; # added 2018-04-25
pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and pulseeffects-pw if you use PipeWire."; # added 2021-02-13, move back once we default to PipeWire audio server.
pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # added 2021-02-13
pulseeffects-pw = easyeffects; # added 2021-07-07
phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22

View file

@ -295,6 +295,8 @@ in
glade = callPackage ../development/tools/glade { };
gpick = callPackage ../tools/misc/gpick { };
hobbes = callPackage ../development/tools/hobbes { };
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
@ -12672,7 +12674,7 @@ in
bundler-audit = callPackage ../tools/security/bundler-audit { };
solargraph = callPackage ../development/ruby-modules/solargraph { };
solargraph = rubyPackages.solargraph;
rbenv = callPackage ../development/ruby-modules/rbenv { };
@ -19741,8 +19743,8 @@ in
libpulseaudio = libpulseaudio-vanilla;
pulseeffects-pw = callPackage ../applications/audio/pulseeffects {
boost = boost172;
easyeffects = callPackage ../applications/audio/easyeffects {
glibmm = glibmm_2_68;
};
pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy {
@ -27479,7 +27481,32 @@ in
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
neovim-unwrapped = callPackage ../applications/editors/neovim {
lua = luajit;
# neovim doesn't build with luajit on aarch64:
# ./luarocks init
# PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found:
# no field package.preload['luarocks.core.hardcoded']
# no file '/private/tmp/nix-build-luarocks-3.2.1.drv-0/source/src/luarocks/core/hardcoded.lua'
# no file './luarocks/core/hardcoded.lua'
# no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/luajit-2.1.0-beta3/luarocks/core/hardcoded.lua'
# no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded.lua'
# no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded/init.lua'
# no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded.lua'
# no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded/init.lua'
# no file './luarocks/core/hardcoded.so'
# no file '/usr/local/lib/lua/5.1/luarocks/core/hardcoded.so'
# no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks/core/hardcoded.so'
# no file '/usr/local/lib/lua/5.1/loadall.so'
# no file './luarocks.so'
# no file '/usr/local/lib/lua/5.1/luarocks.so'
# no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks.so'
# no file '/usr/local/lib/lua/5.1/loadall.so')
# make: *** [GNUmakefile:57: luarocks] Error 1
#
# See https://github.com/NixOS/nixpkgs/issues/129099
# Possibly related: https://github.com/neovim/neovim/issues/7879
lua =
if stdenv.isAarch64 then lua5_1 else
luajit;
};
neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };

View file

@ -82,7 +82,7 @@ let
recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {};
staticHaskellPackagesPlatforms =
packagePlatforms pkgs.pkgsStatic.haskellPackages;
packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104;
jobs = recursiveUpdateMany [
(mapTestOn {
@ -98,7 +98,8 @@ let
# test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC
pkgsStatic.haskellPackages = {
# Use integer-simple to avoid GMP linking problems (LGPL)
pkgsStatic.haskell.packages.integer-simple.ghc8104 = {
inherit (staticHaskellPackagesPlatforms)
hello
random
@ -300,12 +301,12 @@ let
};
constituents = [
# TODO: reenable darwin builds if static libiconv works
jobs.pkgsStatic.haskellPackages.hello.x86_64-linux
jobs.pkgsStatic.haskellPackages.hello.aarch64-linux
jobs.pkgsStatic.haskellPackages.lens.x86_64-linux
jobs.pkgsStatic.haskellPackages.lens.aarch64-linux
jobs.pkgsStatic.haskellPackages.random.x86_64-linux
jobs.pkgsStatic.haskellPackages.random.aarch64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux
];
};
}

View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15r6ab17iwhhq92by4ah9z4wwvjbr07qn16x8pn2ypgqwvfy74h7";
sha256 = "1wswkgwhmfk5j76ar76plhaxna12x0cyf2di57azahlcv88rrwra";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q1r3x9fbq5wlgn4xhqw48la09q7f97zna7ld5fglk3jpmh973x5";
sha256 = "101r0x4lhzp23hksch7z24ajvp549lskxn2cr7pbgr64jjy6v17y";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp";
sha256 = "0mxqpiwgqam5vfk8wsfyj4dpxq0xqqvfbcwx1i4p9n1ahrx7wv7f";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5";
sha256 = "1pj4xz316b3z56vpb8pnrkwj4rlf3hgas5fhddk6yh7ifrl30sc9";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zfrkcnp9wy1dm4b6iqf29858dp04a62asfmldainqmv4a7931q7";
sha256 = "1fn488la8dllfg5zhm74k8y23xl9czrzzs55b9v624j43wjhfxcl";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn";
sha256 = "1jqybz7h11xkjpqdffb9gphwmd56lms9xqskza00wd2pswxcwkn4";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq";
sha256 = "0q00vrknnnhmg02nik06ivrmz7hnq5snpy653kdpskvp4c9ys55c";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
activemodel = {
dependencies = ["activesupport"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal";
sha256 = "0xjy8fg7n5wwv29ngvvdf5r6815s5f0knzyswxh8w6z8f8qj5wr7";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68";
sha256 = "18897s9h9kha8vgky1yfq4x91m3p81k6rkrb1fgjlnqnvarh9vg0";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sbpkk3r8qi47bd0ilznq4gpfyfwm2bwvxqb5z0wc75h3zj1jhqg";
sha256 = "03gb6jbvdzm0xlr2g393jvf980ybjf9zzgspl0p4ixh3lcxxr51w";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -115,10 +115,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr";
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
addressable = {
dependencies = ["public_suffix"];
@ -126,10 +126,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.7.0";
version = "2.8.0";
};
ast = {
groups = ["default"];
@ -147,10 +147,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03xphzq4fgva2xiwlpc7jqp0jl6k022gp7alwg0r7vyai0zx6q5n";
sha256 = "0hb4br24c7awarvcdmairg9g9xs37nlc98fp5abhq3b426zlzskg";
type = "gem";
};
version = "3.4.4";
version = "3.4.5";
};
atomos = {
groups = ["default"];
@ -172,6 +172,16 @@
};
version = "1.9.2";
};
backport = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xbzzjrgah0f8ifgd449kak2vyf30micpz6x2g82aipfv7ypsb4i";
type = "gem";
};
version = "1.2.0";
};
bacon = {
groups = ["default"];
platforms = [];
@ -182,6 +192,16 @@
};
version = "1.2.0";
};
benchmark = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
type = "gem";
};
version = "0.1.1";
};
builder = {
groups = ["default"];
platforms = [];
@ -219,10 +239,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0aq55b8b33pl0yi2abib8i8d22rifji8nzfpf48vj0a0092rllcl";
sha256 = "161azhqndf9gvnsvsx0k2x2kpalsgmlz233hvwc7ckbiral7q86s";
type = "gem";
};
version = "3.4.4";
version = "3.4.5";
};
camping = {
dependencies = ["mab" "rack"];
@ -643,10 +663,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
type = "gem";
};
version = "1.1.8";
version = "1.1.9";
};
crass = {
groups = ["default"];
@ -673,10 +693,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i4j6j18ih6lx7gk9jg2p7q8iswc897mgzn5m62jbf0zv0f7mkji";
sha256 = "0j00s12wn9ai2qinbmzak6v0173cldqllnzs2s2id7gl45py2s75";
type = "gem";
};
version = "1.4.0";
version = "1.4.2";
};
daemons = {
groups = ["default"];
@ -771,6 +791,16 @@
};
version = "2.7.6";
};
e2mmap = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
type = "gem";
};
version = "0.1.0";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
groups = ["default"];
@ -828,21 +858,41 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19g5nvkycnkzqq4mqn1zjznq9adrlv2jz0dr9w10cbn42hhqpiz7";
sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl";
type = "gem";
};
version = "0.81.0";
version = "0.84.0";
};
faraday = {
dependencies = ["faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"];
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi";
sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah";
type = "gem";
};
version = "1.4.1";
version = "1.5.0";
};
faraday-em_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
type = "gem";
};
version = "1.0.0";
};
faraday-em_synchrony = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
type = "gem";
};
version = "1.0.0";
};
faraday-excon = {
groups = ["default"];
@ -854,6 +904,16 @@
};
version = "1.1.0";
};
faraday-httpclient = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
type = "gem";
};
version = "1.0.1";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
@ -874,15 +934,25 @@
};
version = "1.1.0";
};
faraday-patron = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
type = "gem";
};
version = "1.0.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
type = "gem";
};
version = "1.15.0";
version = "1.15.3";
};
ffi-compiler = {
dependencies = ["ffi" "rake"];
@ -944,10 +1014,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
sha256 = "0mprf1dwznz5ld0q1jpbyl59fwnwk6azspnd0am7zz7kfg3pxhv5";
type = "gem";
};
version = "0.2.5";
version = "0.3.0";
};
forwardable-extended = {
groups = ["default"];
@ -985,10 +1055,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jjgqg1iys8k5mjb1wlg8x26d97h1yikgipxwjf9rlyl4i725gn1";
sha256 = "02618y5gw8sbn258w298894if1xkn5gg7q6wj1sw0bx469xgj256";
type = "gem";
};
version = "3.4.4";
version = "3.4.5";
};
gio2 = {
dependencies = ["gobject-introspection"];
@ -996,10 +1066,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m1dafspwk38jhk8kgk7v1r8pphz42mk9jkz8h3rvlxqnrnsl7sk";
sha256 = "0wflbi8yhrxv84q6lzrrqvdhpwrcklspkyzwyi47690wlbjff6cl";
type = "gem";
};
version = "3.4.4";
version = "3.4.5";
};
gitlab-markup = {
groups = ["default"];
@ -1017,10 +1087,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qk30k15qk93mhw2dl191akqs9m0016avc8pwzvvcm7gk99qpbxc";
sha256 = "0aba6j1ixlb5bg2542dhm16c880vdk9cqn70247vhixzc3by0463";
type = "gem";
};
version = "3.4.4";
version = "3.4.5";
};
globalid = {
dependencies = ["activesupport"];
@ -1039,10 +1109,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wm1s6xa2cf1n2yvcya8ah57rc0q1klmnrvvdaby3qyn8a6gdlby";
sha256 = "0rfjkgk5wxs19qah531k6ki6384iqf7b8cbdqc9l6ff9gvkf8cmw";
type = "gem";
};
version = "3.4.4";
version = "3.4.5";
};
gpgme = {
dependencies = ["mini_portile2"];
@ -1131,10 +1201,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
type = "gem";
};
version = "1.0.3";
version = "1.0.4";
};
"http_parser.rb" = {
groups = ["default"];
@ -1182,10 +1252,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
sha256 = "1papdw0503grmbl51jwaa2yn7ndvm94vbdqzz46r25hp3r6d1pls";
type = "gem";
};
version = "0.1.0";
version = "0.1.2";
};
jaro_winkler = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
type = "gem";
};
version = "1.5.4";
};
jbuilder = {
dependencies = ["activesupport"];
@ -1299,10 +1379,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wbz3cjfrz3ii70lmmyspkm29x2wyr44ly0m818d2w7qi3igq79p";
sha256 = "1wqpp3m4zwy7l8n8z8d4krvf38q1gfx9lnsyipnfsapspsmsgdb6";
type = "gem";
};
version = "1.4.12";
version = "1.4.19";
};
libv8 = {
groups = ["default"];
@ -1351,10 +1431,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly";
type = "gem";
};
version = "2.9.1";
version = "2.10.0";
};
mab = {
groups = ["default"];
@ -1409,6 +1489,16 @@
};
version = "0.9.0";
};
matrix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
type = "gem";
};
version = "0.4.2";
};
mercenary = {
groups = ["default"];
platforms = [];
@ -1445,10 +1535,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy";
type = "gem";
};
version = "3.2021.0225";
version = "3.2021.0704";
};
mini_magick = {
groups = ["default"];
@ -1465,20 +1555,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1np6srnyagghhh2w4nyv09sz47v0i6ri3q6blicj94vgxqp12c94";
sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih";
type = "gem";
};
version = "1.0.3";
version = "1.1.0";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
type = "gem";
};
version = "2.5.1";
version = "2.5.3";
};
minitest = {
groups = ["default"];
@ -1638,10 +1728,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
type = "gem";
};
version = "1.11.5";
version = "1.11.7";
};
opus-ruby = {
dependencies = ["ffi"];
@ -1682,10 +1772,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vz880akmcgxf30mrmkld5zyvzr79qaaprnrn10yn7915qsqjh51";
sha256 = "1xaqx3i4cx7xb5m5qfm7jclq3yyrj8abaqif0q1i72259g5klb8c";
type = "gem";
};
version = "3.4.4";
version = "3.4.5";
};
parallel = {
groups = ["default"];
@ -1818,10 +1908,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i";
sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj";
type = "gem";
};
version = "5.3.1";
version = "5.3.2";
};
racc = {
groups = ["default"];
@ -1871,10 +1961,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0flnpli87b9j0zvb3c4l5addjbznbpkbmp1wzfjc1gh8qxlhcs1n";
sha256 = "0k3d3acac2qn9fg185z3y79nvg4ghr4lyhqiz6mbwlsd7r2nd8mh";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@ -1904,10 +1994,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2";
sha256 = "0hwp0qwkphp3fvbsq6ljp8s99v621si9bgqihysz5bv1d1z52mm4";
type = "gem";
};
version = "6.1.3.2";
version = "6.1.4";
};
rainbow = {
groups = ["default"];
@ -1982,14 +2072,15 @@
version = "1.4.0";
};
red-colors = {
dependencies = ["matrix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kdjqvd9zdim2im6492lb4f3559sblrxcnza2xm7j7qr8hhyvisj";
sha256 = "1xqnbbcqg55abn985m716l6n5izyaaf4zdllhc8095cfqz2fbjcx";
type = "gem";
};
version = "0.1.2";
version = "0.3.0";
};
redcarpet = {
groups = ["default"];
@ -2006,10 +2097,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48";
sha256 = "057xp6bkfpmkq0csd1aa0nji1vjsx8pc0c63blcj6scvi9nh1l5k";
type = "gem";
};
version = "4.2.5";
version = "4.3.1";
};
redis-rack = {
dependencies = ["rack" "redis-store"];
@ -2054,6 +2145,17 @@
};
version = "2.1.0";
};
reverse_markdown = {
dependencies = ["nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6";
type = "gem";
};
version = "2.0.0";
};
rexml = {
groups = ["default"];
platforms = [];
@ -2154,10 +2256,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w";
sha256 = "045iralskypd95f42jdgbzp0alv2q0qlvya4qm6bkahg2rfb8s1x";
type = "gem";
};
version = "1.15.0";
version = "1.18.3";
};
rubocop-ast = {
dependencies = ["parser"];
@ -2165,10 +2267,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hx4im1a2qpiwipvsl3fma358ixjp4h0mhj56ichq15xrq709qlf";
sha256 = "1hnrfy928mwpa0ippqs4s8xwghwwp5h853naphgqxcd53l33chlv";
type = "gem";
};
version = "1.5.0";
version = "1.7.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -2176,10 +2278,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sllna4r40gbw0llh8p9581mfjvi535gfby27m2b11q5x5phrhwc";
sha256 = "0sl1l9xwvbxbkla5a64avlmyirc2vsbmvqdqza17dydh8m48pb3h";
type = "gem";
};
version = "1.11.3";
version = "1.11.4";
};
ruby-graphviz = {
dependencies = ["rexml"];
@ -2226,13 +2328,11 @@
groups = ["default"];
platforms = [];
source = {
url = "https://github.com/akr/ruby-terminfo";
rev = "8aaa20b15fcf922239c200a1cccbc8853c397bb4";
fetchSubmodules = false;
sha256 = "1ak85bmnaqwpyx07wb6wfa2cr06gb30gnmv9knijnsbv4q583xlz";
type = "git";
remotes = ["https://rubygems.org"];
sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm";
type = "gem";
};
version = "0.2";
version = "0.1.1";
};
ruby-vips = {
dependencies = ["ffi"];
@ -2271,20 +2371,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
type = "gem";
};
version = "2.3.0";
version = "2.3.2";
};
rugged = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
sha256 = "1dld1z2mdnsf9i4fs74zdr6rfk75pkgzvvyxask5w2dsmkj7bb4m";
type = "gem";
};
version = "1.1.0";
version = "1.1.1";
};
safe_yaml = {
groups = ["default"];
@ -2333,10 +2433,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18b89pmkfnb8q8n3q774ifn317wsxwgcqa0d9zklqsfyrg53768i";
sha256 = "0qbx9p07jdrnpqvjnq6js9qjwjihsk91c1ndmfap153darp1adw0";
type = "gem";
};
version = "5.44.0";
version = "5.46.0";
};
sequel_pg = {
dependencies = ["pg" "sequel"];
@ -2407,10 +2507,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj";
sha256 = "067bvjmjdjs19bvy138hkqqvw8li3732radcd4x5f5dbf30yk3a9";
type = "gem";
};
version = "4.9.0";
version = "4.9.1";
};
snappy = {
groups = ["default"];
@ -2422,6 +2522,17 @@
};
version = "0.2.0";
};
solargraph = {
dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi";
type = "gem";
};
version = "0.42.3";
};
sprockets = {
dependencies = ["concurrent-ruby" "rack"];
groups = ["default"];
@ -2490,10 +2601,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420";
sha256 = "16x542qnzybzsi65ngd16921m88sh47l8fi21y8gbz08daq4rpab";
type = "gem";
};
version = "0.14.1";
version = "0.14.2";
};
tilt = {
groups = ["default"];
@ -2595,10 +2706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052";
type = "gem";
};
version = "0.7.3";
version = "0.7.5";
};
websocket-extensions = {
groups = ["default"];
@ -2621,15 +2732,15 @@
version = "5.0.2";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
sha256 = "0vcfl87z490xmj4q09davx31r2gzvan95sj90x58wq4ymgrdhf1p";
type = "gem";
};
version = "1.19.0";
version = "1.20.0";
};
xctasks = {
dependencies = ["nokogiri" "rake"];