Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-12-09 12:01:25 +00:00 committed by GitHub
commit 35a3e58b28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 706 additions and 602 deletions

View file

@ -385,7 +385,7 @@ def check_results(
sys.exit(1)
def parse_plugin_line(line: str) -> PluginDesc:
branch = "master"
branch = "HEAD"
alias = None
name, repo = line.split("/")
if " as " in repo:

View file

@ -823,6 +823,16 @@ let
(assertValueOneOf "OnLink" boolValues)
];
sectionDHCPServerStaticLease = checkUnitConfig "DHCPServerStaticLease" [
(assertOnlyFields [
"MACAddress"
"Address"
])
(assertHasField "MACAddress")
(assertHasField "Address")
(assertMacAddress "MACAddress")
];
};
};
@ -1163,6 +1173,25 @@ let
};
};
dhcpServerStaticLeaseOptions = {
options = {
dhcpServerStaticLeaseConfig = mkOption {
default = {};
example = { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; };
type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPServerStaticLease;
description = ''
Each attribute in this set specifies an option in the
<literal>[DHCPServerStaticLease]</literal> section of the unit. See
<citerefentry><refentrytitle>systemd.network</refentrytitle>
<manvolnum>5</manvolnum></citerefentry> for details.
Make sure to configure the corresponding client interface to use
<literal>ClientIdentifier=mac</literal>.
'';
};
};
};
networkOptions = commonNetworkOptions // {
linkConfig = mkOption {
@ -1275,6 +1304,17 @@ let
'';
};
dhcpServerStaticLeases = mkOption {
default = [];
example = [ { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; } ];
type = with types; listOf (submodule dhcpServerStaticLeaseOptions);
description = ''
A list of DHCPServerStaticLease sections to be added to the unit. See
<citerefentry><refentrytitle>systemd.network</refentrytitle>
<manvolnum>5</manvolnum></citerefentry> for details.
'';
};
ipv6Prefixes = mkOption {
default = [];
example = [ { AddressAutoconfiguration = true; OnLink = true; } ];
@ -1646,6 +1686,10 @@ let
[IPv6Prefix]
${attrsToSection x.ipv6PrefixConfig}
'')
+ flip concatMapStrings def.dhcpServerStaticLeases (x: ''
[DHCPServerStaticLease]
${attrsToSection x.dhcpServerStaticLeaseConfig}
'')
+ def.extraConfig;
};

View file

@ -454,6 +454,7 @@ in
systemd-journal = handleTest ./systemd-journal.nix {};
systemd-networkd = handleTest ./systemd-networkd.nix {};
systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {};
systemd-networkd-dhcpserver-static-leases = handleTest ./systemd-networkd-dhcpserver-static-leases.nix {};
systemd-networkd-ipv6-prefix-delegation = handleTest ./systemd-networkd-ipv6-prefix-delegation.nix {};
systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
systemd-nspawn = handleTest ./systemd-nspawn.nix {};

View file

@ -0,0 +1,81 @@
# In contrast to systemd-networkd-dhcpserver, this test configures
# the router with a static DHCP lease for the client's MAC address.
import ./make-test-python.nix ({ lib, ... }: {
name = "systemd-networkd-dhcpserver-static-leases";
meta = with lib.maintainers; {
maintainers = [ veehaitch tomfitzhenry ];
};
nodes = {
router = {
virtualisation.vlans = [ 1 ];
systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
networking = {
useNetworkd = true;
useDHCP = false;
firewall.enable = false;
};
systemd.network = {
networks = {
# systemd-networkd will load the first network unit file
# that matches, ordered lexiographically by filename.
# /etc/systemd/network/{40-eth1,99-main}.network already
# exists. This network unit must be loaded for the test,
# however, hence why this network is named such.
"01-eth1" = {
name = "eth1";
networkConfig = {
DHCPServer = true;
Address = "10.0.0.1/24";
};
dhcpServerStaticLeases = [{
dhcpServerStaticLeaseConfig = {
MACAddress = "02:de:ad:be:ef:01";
Address = "10.0.0.10";
};
}];
};
};
};
};
client = {
virtualisation.vlans = [ 1 ];
systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
networking = {
useNetworkd = true;
useDHCP = false;
firewall.enable = false;
interfaces.eth1 = {
useDHCP = true;
macAddress = "02:de:ad:be:ef:01";
};
};
# This setting is important to have the router assign the
# configured lease based on the client's MAC address. Also see:
# https://github.com/systemd/systemd/issues/21368#issuecomment-982193546
systemd.network.networks."40-eth1".dhcpV4Config.ClientIdentifier = "mac";
};
};
testScript = ''
start_all()
with subtest("check router network configuration"):
router.wait_for_unit("systemd-networkd-wait-online.service")
eth1_status = router.succeed("networkctl status eth1")
assert "Network File: /etc/systemd/network/01-eth1.network" in eth1_status, \
"The router interface eth1 is not using the expected network file"
assert "10.0.0.1" in eth1_status, "Did not find expected router IPv4"
with subtest("check client network configuration"):
client.wait_for_unit("systemd-networkd-wait-online.service")
eth1_status = client.succeed("networkctl status eth1")
assert "Network File: /etc/systemd/network/40-eth1.network" in eth1_status, \
"The client interface eth1 is not using the expected network file"
assert "10.0.0.10" in eth1_status, "Did not find expected client IPv4"
with subtest("router and client can reach each other"):
client.wait_until_succeeds("ping -c 5 10.0.0.1")
router.wait_until_succeeds("ping -c 5 10.0.0.10")
'';
})

View file

@ -1,37 +0,0 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, MMA, libjack2, libsmf, python2Packages }:
let
inherit (python2Packages) pyGtkGlade pygtksourceview python;
in stdenv.mkDerivation rec {
version = "12.02.1";
pname = "linuxband";
src = fetchurl {
url = "https://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
patchPhase = ''
sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in
cat src/main/config/linuxband.rc.in
'';
postFixup = ''
PYTHONPATH=$pyGtkGlade/share/:pygtksourceview/share/:$PYTHONPATH
for f in $out/bin/*; do
wrapProgram $f \
--prefix PYTHONPATH : $PYTHONPATH
done
'';
meta = {
description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment";
homepage = "https://linuxband.org/";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.linux;
};
}

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "mpc";
version = "0.33";
version = "0.34";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "mpc";
rev = "v${version}";
sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx";
sha256 = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw=";
};
buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.isDarwin [ libiconv ];

View file

@ -18,13 +18,13 @@ assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
version = "0.45";
version = "0.46";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
sha256 = "sha256-KDSHbEZ2PJLEIlXqPvBQ2ZPWno+IoajTjkl9faAXIko=";
sha256 = "sha256-FyuN0jkHaJLXqcVbW+OggHkNBjmqH7bS7W/QXUoDjJk=";
};
buildInputs = [ glib ncurses libmpdclient boost ]

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.89.4";
version = "0.90.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yXOe+SCMvr3xi0kd2AuWm1CzzBuODCED6p7kaWGXvpM=";
sha256 = "sha256-1qa7RHSkwQLMJr0l3JtdcHQsmSiKlRjF5ETSVhpo4jY=";
};
vendorSha256 = "sha256-NqWi9n8H5IeMmkBwTX3HN1RLLtWA5sM1iy1L2BZCH7M=";
vendorSha256 = "sha256-hRebd50RQ0JZGDf5zJX21UTjq5JwvPWWF/KA6/7JxVw=";
doCheck = false;

View file

@ -27,6 +27,8 @@ let
inherit sha256;
};
ldflags = [ "-s" "-w" ];
postConfigure = ''
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \

View file

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.9.5",
"version": "1.9.6",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -54,7 +54,7 @@
"@types/minimist": "^1.2.1",
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"allchange": "^1.0.5",
"allchange": "^1.0.6",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
"electron": "13.5",

View file

@ -1,6 +1,6 @@
{
"version": "1.9.5",
"desktopSrcHash": "8x3TBu0zSNEVWp+ULydule8bPSd01pMkCZHdJbQf82U=",
"desktopYarnHash": "0axz0d5qryd0k89lrziah1r6j1154c1cibf1qsjk1azlri3k4298",
"webHash": "04pabvvb3l88gp866fkbjngl9r20s300pvw7qykynl0ps8fjms0l"
"version": "1.9.6",
"desktopSrcHash": "AJLKp9VbNF0XvcQe6t0/pw1hiVCgRiRb27KJooQ2NlQ=",
"desktopYarnHash": "1xa8vrqj3g3hfhzrk8m7yr57my9ipyyhw8vsx4m86v8i1iqrpmnm",
"webHash": "161w6i122i81jyb23mpxlf7k5wx2v4c6ai2liywn89q74hj3axr5"
}

View file

@ -10,12 +10,12 @@ in
rec {
thunderbird = common rec {
pname = "thunderbird";
version = "91.3.2";
version = "91.4.0";
application = "comm/mail";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "954be27795935e494d27d57da99b49ff61db8a2b26fa8e159a30d6c272033b015790735b40129d7de94f861af23cf748f88a7a45df3861f753d6e15d28fb366c";
sha512 = "f19eba17b8018d11358258f6c9fbe4b2d20858f5afdf82ad5a81de5f6191f833ecf01ee4631297b0880dfa8b76baa1f9cd09a976cab2d2206ca5a902283fa102";
};
patches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "21.04.14";
version = "21.11.29";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "0ndxjp173dwz78m41mn818mh4bdsxa2ypv4wrwicx0v4d8z90ddj";
sha256 = "sha256-3zZ/LpjYhYOHPpgRysGYXFLvYux5GgurItuYm7zAZ2M=";
};
nativeBuildInputs = [ gtk3 ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, fetchFromGitHub
, ncurses
, python3
@ -14,19 +14,25 @@
stdenv.mkDerivation rec {
pname = "spdk";
version = "21.07";
version = "21.10";
src = fetchFromGitHub {
owner = "spdk";
repo = "spdk";
rev = "v${version}";
sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg=";
sha256 = "sha256-pFynTbbSF1g58VD9bOhe3c4oCozeqE+35kECTQwDBDM=";
};
patches = [
# Backport of upstream patch for ncurses-6.3 support.
# Will be in next release after 21.10.
./ncurses-6.3.patch
# DPDK 21.11 compatibility.
(fetchpatch {
url = "https://github.com/spdk/spdk/commit/f72cab94dd35d7b45ec5a4f35967adf3184ca616.patch";
sha256 = "sha256-sSetvyNjlM/hSOUsUO3/dmPzAliVcteNDvy34yM5d4A=";
})
];
nativeBuildInputs = [

View file

@ -15,7 +15,7 @@ buildLuarocksPackage {
pname = "alt-getopt";
version = "0.8.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/alt-getopt-0.8.0-1.rockspec";
url = "https://luafr.org/luarocks/alt-getopt-0.8.0-1.rockspec";
sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -159,7 +159,7 @@ buildLuarocksPackage {
pname = "busted";
version = "2.0.0-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/busted-2.0.0-1.rockspec";
url = "https://luafr.org/luarocks/busted-2.0.0-1.rockspec";
sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw";
}).outPath;
src = fetchurl {
@ -184,7 +184,7 @@ buildLuarocksPackage {
pname = "cassowary";
version = "2.3.1-2";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cassowary-2.3.1-2.rockspec";
url = "https://luafr.org/luarocks/cassowary-2.3.1-2.rockspec";
sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -244,7 +244,7 @@ buildLuarocksPackage {
pname = "cosmo";
version = "16.06.04-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/cosmo-16.06.04-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cosmo-16.06.04-1.rockspec";
sha256 = "0ipv1hrlhvaz1myz6qxabq7b7kb3bz456cya3r292487a3g9h9pb";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -276,7 +276,7 @@ buildLuarocksPackage {
pname = "coxpcall";
version = "1.17.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/coxpcall-1.17.0-1.rockspec";
url = "https://luafr.org/luarocks/coxpcall-1.17.0-1.rockspec";
sha256 = "0mf0nggg4ajahy5y1q5zh2zx9rmgzw06572bxx6k8b736b8j7gca";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -307,7 +307,7 @@ buildLuarocksPackage {
pname = "cqueues";
version = "20200726.52-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/cqueues-20200726.52-0.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cqueues-20200726.52-0.rockspec";
sha256 = "0w2kq9w0wda56k02rjmvmzccz6bc3mn70s9v7npjadh85i5zlhhp";
}).outPath;
src = fetchurl {
@ -393,7 +393,7 @@ buildLuarocksPackage {
pname = "dkjson";
version = "2.5-3";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/dkjson-2.5-3.rockspec";
url = "https://luafr.org/luarocks/dkjson-2.5-3.rockspec";
sha256 = "18xngdzl2q207cil64aj81qi6qvj1g269pf07j5x4pbvamd6a1l3";
}).outPath;
src = fetchurl {
@ -418,7 +418,7 @@ buildLuarocksPackage {
pname = "fifo";
version = "0.2-0";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec";
url = "https://luafr.org/luarocks/fifo-0.2-0.rockspec";
sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq";
}).outPath;
src = fetchurl {
@ -444,10 +444,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lewis6991/gitsigns.nvim",
"rev": "552f114caeaec4ce97822cb55dfa7c7e5368136b",
"date": "2021-10-15T13:31:44+01:00",
"path": "/nix/store/40vkv3sc4h6gh9ac88k7pilszxmy38yv-gitsigns.nvim",
"sha256": "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q",
"rev": "5eb87a0b05914d3763277ebe257bd5bafcdde8cd",
"date": "2021-12-06T18:02:22+00:00",
"path": "/nix/store/c5l5bz7m5f48l57p4yrpxfhqga0cxsny-gitsigns.nvim",
"sha256": "02cmgc3fgrwx6v6ylzqxdwgk9jsmd8j2q6fdnfbllg3zjwx3agcd",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -496,14 +496,14 @@ inspect = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "inspect";
version = "3.1.1-0";
version = "3.1.2-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/inspect-3.1.1-0.rockspec";
sha256 = "00spibq2h4an8v0204vr1hny4vv6za720c37ipsahpjk198ayf1p";
url = "https://luarocks.org/inspect-3.1.2-0.rockspec";
sha256 = "13jbv3rhj4mv2farrxns88g7j34ljag7vz0kma0fm2pzdz3686vx";
}).outPath;
src = fetchurl {
url = "https://github.com/kikito/inspect.lua/archive/v3.1.1.tar.gz";
sha256 = "1nz0yqhkd0nkymghrj99gb2id40g50drh4a96g3v5k7h1sbg94h2";
url = "https://github.com/kikito/inspect.lua/archive/v3.1.2.tar.gz";
sha256 = "08ln4p5bmvcs8wj8hzs4ny66m63abyxjkmcxhjji5ay99g85cn3b";
};
disabled = with lua; (luaOlder "5.1");
@ -524,14 +524,14 @@ buildLuarocksPackage {
version = "scm-0";
knownRockspec = (fetchurl {
url = "mirror://luarocks/ldbus-scm-0.rockspec";
sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx";
sha256 = "1c0h6fx7avzh89hl17v6simy1p4mjg8bimlsbjybks0zxznd8rbm";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/daurnimator/ldbus.git",
"rev": "9e176fe851006037a643610e6d8f3a8e597d4073",
"date": "2019-08-16T14:26:05+10:00",
"path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus",
"sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s",
"rev": "6d4909c983c8a0e2c7384bac8055c628aa524ea2",
"date": "2021-11-10T23:58:54+11:00",
"path": "/nix/store/j830jk2hkanz7abkdsbvg2warsyr0a2c-ldbus",
"sha256": "18q98b98mfvjzbyssf18bpnlx4hsx4s9lwcwia4z9dxiaiw7b77j",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -539,7 +539,7 @@ buildLuarocksPackage {
}
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
propagatedBuildInputs = [ lua ];
meta = {
@ -585,7 +585,7 @@ buildLuarocksPackage {
pname = "lgi";
version = "0.9.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lgi-0.9.2-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lgi-0.9.2-1.rockspec";
sha256 = "1gqi07m4bs7xibsy4vx8qgyp3yb1wnh0gdq1cpwqzv35y6hn5ds3";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -666,7 +666,7 @@ buildLuarocksPackage {
pname = "lpeg";
version = "1.0.2-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.rockspec";
url = "https://luafr.org/luarocks/lpeg-1.0.2-1.rockspec";
sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89";
}).outPath;
src = fetchurl {
@ -692,7 +692,7 @@ buildLuarocksPackage {
pname = "lpeg_patterns";
version = "0.5-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lpeg_patterns-0.5-0.rockspec";
url = "https://luafr.org/luarocks/lpeg_patterns-0.5-0.rockspec";
sha256 = "1vzl3ryryc624mchclzsfl3hsrprb9q214zbi1xsjcc4ckq5qfh7";
}).outPath;
src = fetchurl {
@ -716,7 +716,7 @@ buildLuarocksPackage {
pname = "lpeglabel";
version = "1.6.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lpeglabel-1.6.0-1.rockspec";
url = "https://luafr.org/luarocks/lpeglabel-1.6.0-1.rockspec";
sha256 = "13gc32pggng6f95xx5zw9n9ian518wlgb26mna9kh4q2xa1k42pm";
}).outPath;
src = fetchurl {
@ -741,7 +741,7 @@ buildLuarocksPackage {
pname = "lpty";
version = "1.2.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lpty-1.2.2-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.rockspec";
sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg";
}).outPath;
src = fetchurl {
@ -766,7 +766,7 @@ buildLuarocksPackage {
pname = "lrexlib-gnu";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.1-1.rockspec";
url = "https://luafr.org/luarocks/lrexlib-gnu-2.9.1-1.rockspec";
sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -799,7 +799,7 @@ buildLuarocksPackage {
pname = "lrexlib-pcre";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lrexlib-pcre-2.9.1-1.rockspec";
url = "https://luafr.org/luarocks/lrexlib-pcre-2.9.1-1.rockspec";
sha256 = "036k27xaplxn128b3p67xiqm8k40s7bxvh87wc8v2cx1cc4b9ia4";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -833,7 +833,7 @@ buildLuarocksPackage {
pname = "lrexlib-posix";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lrexlib-posix-2.9.1-1.rockspec";
url = "https://luarocks.org/lrexlib-posix-2.9.1-1.rockspec";
sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1111,17 +1111,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit}:
buildLuarocksPackage {
pname = "lua-resty-openssl";
version = "0.7.5-1";
version = "0.8.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-openssl-0.7.5-1.rockspec";
sha256 = "13v14in9cgmjgarmy6br9629ns1qlhw7a30c061y6gncjannnv6y";
url = "https://luarocks.org/lua-resty-openssl-0.8.2-1.rockspec";
sha256 = "1dxaxh3l4vhrv5p2pwphl7jn7jpcjq3dmawfl9wbp3a88121gbsx";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/fffonion/lua-resty-openssl.git",
"rev": "6a7f4a1649da7e0499b542b73c61e8dbdf91f57e",
"date": "2021-09-18T06:15:54+08:00",
"path": "/nix/store/01bninsbgix30zl97lk0p10ycqkc37kx-lua-resty-openssl",
"sha256": "1ypji678lna9z3a48lhxs7wrw8d1prln7yfvqfm96lbmfvr5wfxw",
"rev": "53e2d4ba7e8c31181c1fd71d3817911da0533675",
"date": "2021-11-22T12:07:07+08:00",
"path": "/nix/store/x7s51wf9ysxs2xs4adixf7ypmadfwp5c-lua-resty-openssl",
"sha256": "19cvqz81d0lxql55pgsbgynval0jxh8sicps94nzapvj90xqjviy",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1176,7 +1176,7 @@ buildLuarocksPackage {
pname = "lua-term";
version = "0.7-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lua-term-0.7-1.rockspec";
url = "https://luarocks.org/lua-term-0.7-1.rockspec";
sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2";
}).outPath;
src = fetchurl {
@ -1232,7 +1232,7 @@ buildLuarocksPackage {
pname = "lua-yajl";
version = "2.0-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-yajl-2.0-1.rockspec";
url = "https://luarocks.org/lua-yajl-2.0-1.rockspec";
sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1266,7 +1266,7 @@ buildLuarocksPackage {
pname = "lua-zlib";
version = "1.2-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lua-zlib-1.2-1.rockspec";
url = "https://luarocks.org/lua-zlib-1.2-1.rockspec";
sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1385,7 +1385,7 @@ buildLuarocksPackage {
pname = "luacov";
version = "0.15.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/luacov-0.15.0-1.rockspec";
url = "https://luarocks.org/luacov-0.15.0-1.rockspec";
sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1484,7 +1484,7 @@ buildLuarocksPackage {
pname = "luadbi-postgresql";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-postgresql-0.7.2-1.rockspec";
url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.rockspec";
sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1550,7 +1550,7 @@ buildLuarocksPackage {
pname = "luaepnf";
version = "0.3-2";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/luaepnf-0.3-2.rockspec";
url = "https://luarocks.org/luaepnf-0.3-2.rockspec";
sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1667,7 +1667,7 @@ buildLuarocksPackage {
pname = "luafilesystem";
version = "1.7.0-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luafilesystem-1.7.0-2.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.rockspec";
sha256 = "0xivgn8bbkx1g5a30jrjcv4hg5mpiiyrm3fhlz9lndgbh4cnjrq6";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1699,17 +1699,17 @@ lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lualogging";
version = "1.5.2-1";
version = "1.6.0-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lualogging-1.5.2-1.rockspec";
sha256 = "0jlqjhr5p9ji51bkmz8n9jc55i3vzqjfwjxvxp2ib9h4gmh2zqk3";
url = "https://luarocks.org/lualogging-1.6.0-2.rockspec";
sha256 = "1235sfss0gmcw744rnhzfffhd1z732g2b2vsbpbz9kcvvhznmamb";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/lualogging.git",
"rev": "8b4d8dd5a311245a197890405ba9324b9f5f5ab1",
"date": "2021-08-12T19:29:39+02:00",
"path": "/nix/store/q1v28n04hh3r7aw37cxakzksfa3kw5qa-lualogging",
"sha256": "0nj0ik91lgl9rwgizdkn7vy9brddsz1kxfn70c01x861vaxi63iz",
"rev": "0bc4415de03ff1a99c92c02a5bed14a45b078079",
"date": "2021-11-09T20:20:42+01:00",
"path": "/nix/store/p3cyhqjw12bj7s6y4hndzqdkdfwq3958-lualogging",
"sha256": "18664k4kfi4zq9n0217j57h42li6ws8s3f6d4yj0rcqsl19fxa7c",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2060,7 +2060,7 @@ buildLuarocksPackage {
pname = "lyaml";
version = "6.2.7-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lyaml-6.2.7-1.rockspec";
url = "https://luarocks.org/lyaml-6.2.7-1.rockspec";
sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja";
}).outPath;
src = fetchurl {
@ -2252,10 +2252,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/nvim-lua/plenary.nvim",
"rev": "80bb2b9bb74bdca38a46480b6f2e15af990406e4",
"date": "2021-10-06T19:20:08+02:00",
"path": "/nix/store/mw4r562qxr7giy1n43iylp3qb8ch0jqs-plenary.nvim",
"sha256": "11akcpxcp4m997a2y76ajknnmsifac2hj4nq9i4a8b1j08bxinim",
"rev": "c2bb2d8fd5b44bfc6aad3a5463c84576a98dd4a9",
"date": "2021-12-06T21:11:29+01:00",
"path": "/nix/store/h376md0lpbv31n5wyrq0cilkpx2lkr18-plenary.nvim",
"sha256": "12csjz882yv9wwhzx964fq210655m8820491xjsrjlwccfc09i35",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,

View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pynvml";
version = "11.0.0";
version = "11.4.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1fxKItNVtAw0HWugqoiKLU0iUxd9JDkA+EAbfmyssbs=";
sha256 = "b2e4a33b80569d093b513f5804db0c7f40cfc86f15a013ae7a8e99c5e175d5dd";
};
propagatedBuildInputs = [ cudatoolkit ];

View file

@ -1,4 +1,8 @@
{
"compe-tmux": {
"date": "2021-12-07",
"new": "cmp-tmux"
},
"gist-vim": {
"date": "2020-03-27",
"new": "vim-gist"

File diff suppressed because it is too large Load diff

View file

@ -748,7 +748,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-XFo3FLaeLnXVQAEZol9PipqYYZ9C1z23S/qijxf0uIE=";
cargoSha256 = "sha256-zYm+7qAvhVGa/afddHhI2aQxmiLOkus5PHZBDP9S/Qg=";
};
in
''

View file

@ -1,16 +1,16 @@
907th/vim-auto-save
aca/completion-tabnine
AckslD/nvim-neoclip.lua@main
AckslD/nvim-whichkey-setup.lua@main
ackyshake/Spacegray.vim@main
ahmedkhalf/lsp-rooter.nvim@main
AckslD/nvim-neoclip.lua
AckslD/nvim-whichkey-setup.lua
ackyshake/Spacegray.vim
ahmedkhalf/lsp-rooter.nvim
airblade/vim-gitgutter
airblade/vim-rooter
ajmwagar/vim-deus
akinsho/bufferline.nvim
akinsho/toggleterm.nvim
aklt/plantuml-syntax
allendang/nvim-expand-expr@main
allendang/nvim-expand-expr
altercation/vim-colors-solarized
alvan/vim-closetag
alvarosevilla95/luatab.nvim
@ -20,26 +20,26 @@ amiorin/ctrlp-z
andersevenrud/compe-tmux@cmp
andrep/vimacs
andreshazard/vim-logreview
AndrewRadev/sideways.vim@main
AndrewRadev/splitjoin.vim@main
AndrewRadev/sideways.vim
AndrewRadev/splitjoin.vim
AndrewRadev/tagalong.vim
andsild/peskcolor.vim
andviro/flake8-vim
andweeb/presence.nvim@main
andweeb/presence.nvim
andymass/vim-matchup
andys8/vim-elm-syntax
antoinemadec/coc-fzf
antoinemadec/FixCursorHold.nvim
ap/vim-css-color
arcticicestudio/nord-vim
arcticicestudio/nord-vim@master
arkav/lualine-lsp-progress
arthurxavierx/vim-unicoder
artur-shaik/vim-javacomplete2
autozimu/LanguageClient-neovim
axelf4/vim-strip-trailing-whitespace
ayu-theme/ayu-vim
b0o/SchemaStore.nvim@main
b3nj5m1n/kommentary@main
b0o/SchemaStore.nvim
b3nj5m1n/kommentary
bakpakin/fennel.vim
bazelbuild/vim-bazel
bbchung/clighter8
@ -53,15 +53,15 @@ blueballs-theme/blueballs-neovim
blueyed/vim-diminactive
bogado/file-line
bohlender/vim-smt2
brennanfee/vim-gui-position@main
brennanfee/vim-gui-position
bronson/vim-trailing-whitespace
brooth/far.vim
buoto/gotests-vim
camspiers/lens.vim
camspiers/snap@main
camspiers/snap
carlitux/deoplete-ternjs
ccarpita/rtorrent-syntax-file
cespare/vim-toml@main
cespare/vim-toml
chaoren/vim-wordmotion
chentau/marks.nvim
chikatoike/concealedyank.vim
@ -121,7 +121,7 @@ dpelle/vim-LanguageTool
dracula/vim as dracula-vim
drewtempelmeyer/palenight.vim
drmingdrmer/xptemplate
dstein64/nvim-scrollview@main
dstein64/nvim-scrollview
dstein64/vim-startuptime
dylanaraps/wal.vim
eagletmt/ghcmod-vim
@ -129,21 +129,21 @@ eagletmt/neco-ghc
easymotion/vim-easymotion
eddiebergman/nvim-treesitter-pyfold
eddyekofo94/gruvbox-flat.nvim
EdenEast/nightfox.nvim@main
EdenEast/nightfox.nvim
editorconfig/editorconfig-vim
edkolev/tmuxline.vim
edluffy/hologram.nvim@main
edluffy/specs.nvim@main
edluffy/hologram.nvim
edluffy/specs.nvim
edwinb/idris2-vim
ehamberg/vim-cute-python
eigenfoo/stan-vim
eikenb/acp
elixir-editors/vim-elixir
ellisonleao/glow.nvim@main
ellisonleao/gruvbox.nvim@main
ellisonleao/glow.nvim
ellisonleao/gruvbox.nvim
elmcast/elm-vim
elzr/vim-json
embark-theme/vim@main as embark-vim
embark-theme/vim as embark-vim
embear/vim-localvimrc
enomsg/vim-haskellConcealPlus
enricobacis/vim-airline-clock
@ -167,12 +167,12 @@ fiatjaf/neuron.vim
fisadev/vim-isort
flazz/vim-colorschemes
floobits/floobits-neovim
folke/lsp-colors.nvim@main
folke/todo-comments.nvim@main
folke/tokyonight.nvim@main
folke/trouble.nvim@main
folke/twilight.nvim@main
folke/which-key.nvim@main
folke/lsp-colors.nvim
folke/todo-comments.nvim
folke/tokyonight.nvim
folke/trouble.nvim
folke/twilight.nvim
folke/which-key.nvim
FooSoft/vim-argwrap
freitass/todo.txt-vim
frigoeu/psc-ide-vim
@ -180,7 +180,7 @@ fruit-in/brainfuck-vim
fruit-in/vim-nong-theme
fsharp/vim-fsharp
garbas/vim-snipmate
gbrlsnchs/telescope-lsp-handlers.nvim@trunk
gbrlsnchs/telescope-lsp-handlers.nvim
gcmt/taboo.vim
gcmt/wildfire.vim
gelguy/wilder.nvim
@ -188,16 +188,16 @@ gennaro-tedesco/nvim-jqx
gennaro-tedesco/nvim-peekup
gentoo/gentoo-syntax
GEverding/vim-hocon
gfanto/fzf-lsp.nvim@main
ggandor/lightspeed.nvim@main
gfanto/fzf-lsp.nvim
ggandor/lightspeed.nvim
gibiansky/vim-textobj-haskell
gioele/vim-autoswap
gleam-lang/gleam.vim
glepnir/dashboard-nvim
glepnir/galaxyline.nvim@main
glepnir/lspsaga.nvim@main
glepnir/galaxyline.nvim
glepnir/lspsaga.nvim
glepnir/oceanic-material
glepnir/zephyr-nvim@main
glepnir/zephyr-nvim
glts/vim-textobj-comment
godlygeek/csapprox
godlygeek/tabular
@ -231,17 +231,17 @@ henrik/vim-indexed-search
HerringtonDarkholme/yats.vim
honza/vim-snippets
hotwatermorning/auto-git-diff
hrsh7th/cmp-buffer@main
hrsh7th/cmp-calc@main
hrsh7th/cmp-cmdline@main
hrsh7th/cmp-emoji@main
hrsh7th/cmp-nvim-lsp-document-symbol@main
hrsh7th/cmp-nvim-lsp@main
hrsh7th/cmp-nvim-lua@main
hrsh7th/cmp-omni@main
hrsh7th/cmp-path@main
hrsh7th/cmp-vsnip@main
hrsh7th/nvim-cmp@main
hrsh7th/cmp-buffer
hrsh7th/cmp-calc
hrsh7th/cmp-cmdline
hrsh7th/cmp-emoji
hrsh7th/cmp-nvim-lsp
hrsh7th/cmp-nvim-lsp-document-symbol
hrsh7th/cmp-nvim-lua
hrsh7th/cmp-omni
hrsh7th/cmp-path
hrsh7th/cmp-vsnip
hrsh7th/nvim-cmp
hrsh7th/nvim-compe
hrsh7th/vim-vsnip
hrsh7th/vim-vsnip-integ
@ -270,12 +270,12 @@ ivanov/vim-ipython
jackguo380/vim-lsp-cxx-highlight
jacoborus/tender.vim
jakwings/vim-pony
jamessan/vim-gnupg@main
jamessan/vim-gnupg
jaredgorski/SpaceCamp
jasonccox/vim-wayland-clipboard
jaxbot/semantic-highlight.vim
JazzCore/ctrlp-cmatcher
jbyuki/venn.nvim@main
jbyuki/venn.nvim
jc-doyle/cmp-pandoc-references
jceb/vim-hier
jceb/vim-orgmode
@ -284,7 +284,7 @@ jeetsukumaran/vim-indentwise
jeffkreeftmeijer/neovim-sensible
jeffkreeftmeijer/vim-numbertoggle
jelera/vim-javascript-syntax
jgdavey/tslime.vim@main
jgdavey/tslime.vim
jhradilek/vim-docbk
jhradilek/vim-snippets as vim-docbk-snippets
jiangmiao/auto-pairs
@ -296,22 +296,22 @@ jnurmine/zenburn
jonbri/vim-colorstepper
jonsmithers/vim-html-template-literals
joonty/vim-xdebug
joosepalviste/nvim-ts-context-commentstring@main
joosepalviste/nvim-ts-context-commentstring
jordwalke/vim-reasonml
josa42/coc-lua
josa42/vim-lightline-coc
jose-elias-alvarez/minsnip.nvim@main
jose-elias-alvarez/null-ls.nvim@main
jose-elias-alvarez/nvim-lsp-ts-utils@main
joshdick/onedark.vim@main
jpalardy/vim-slime@main
jose-elias-alvarez/minsnip.nvim
jose-elias-alvarez/null-ls.nvim
jose-elias-alvarez/nvim-lsp-ts-utils
joshdick/onedark.vim
jpalardy/vim-slime
jparise/vim-graphql
jparise/vim-phabricator
jreybert/vimagit
jsfaint/gen_tags.vim
JuliaEditorSupport/deoplete-julia
JuliaEditorSupport/julia-vim
Julian/lean.nvim@main
Julian/lean.nvim
Julian/vim-textobj-variable-segment
juliosueiras/vim-terraform-completion
junegunn/fzf.vim
@ -347,16 +347,16 @@ karb94/neoscroll.nvim
kassio/neoterm
kbenzie/vim-spirv
kchmck/vim-coffee-script
kdheepak/cmp-latex-symbols@main
kdheepak/cmp-latex-symbols
kdheepak/lazygit.nvim
kdheepak/tabline.nvim@main
kdheepak/tabline.nvim
KeitaNakamura/neodark.vim
keith/investigate.vim
keith/rspec.vim
keith/swift.vim
kevinhwang91/nvim-bqf@main
kevinhwang91/nvim-hlslens@main
kevinhwang91/rnvimr@main
kevinhwang91/nvim-bqf
kevinhwang91/nvim-hlslens
kevinhwang91/rnvimr
kien/rainbow_parentheses.vim
knubie/vim-kitty-navigator
konfekt/fastfold
@ -388,8 +388,8 @@ leanprover/lean.vim
ledger/vim-ledger
lepture/vim-jinja
lervag/vimtex
lewis6991/gitsigns.nvim@main
lf-lang/lingua-franca.vim@main
lewis6991/gitsigns.nvim
lf-lang/lingua-franca.vim
lfe-support/vim-lfe
lfilho/cosco.vim
lifepillar/vim-gruvbox8
@ -456,7 +456,7 @@ megaannum/forms
megaannum/self
mengelbrecht/lightline-bufferline
metakirby5/codi.vim
metalelf0/jellybeans-nvim@main
metalelf0/jellybeans-nvim
mfukar/robotframework-vim
mfussenegger/nvim-dap
mfussenegger/nvim-jdtls
@ -475,7 +475,7 @@ michaeljsmith/vim-indent-object
mileszs/ack.vim
milkypostman/vim-togglelist
mindriot101/vim-yapf
mk12/vim-lean@main
mk12/vim-lean
mkasa/lushtags
mlr-msft/vim-loves-dafny
moll/vim-bbye
@ -485,7 +485,7 @@ motus/pig.vim
mpickering/hlint-refactor-vim
ms-jpq/chadtree@chad
mtikekar/vim-bsv
MunifTanjim/nui.nvim@main
MunifTanjim/nui.nvim
mzlogin/vim-markdown-toc
mzlogin/vim-smali
nacro90/numb.nvim
@ -493,7 +493,7 @@ nanotech/jellybeans.vim
natebosch/vim-lsc
nathanaelkane/vim-indent-guides
nathangrigg/vim-beancount
nathanmsmith/nvim-ale-diagnostic@main
nathanmsmith/nvim-ale-diagnostic
navicore/vissort.vim
nbouscal/vim-stylish-haskell
ncm2/float-preview.nvim
@ -548,32 +548,33 @@ nvim-lua/lsp_extensions.nvim
nvim-lua/plenary.nvim
nvim-lua/popup.nvim
nvim-lualine/lualine.nvim
nvim-neorg/neorg@main
nvim-neorg/neorg
nvim-orgmode/orgmode
nvim-pack/nvim-spectre
nvim-telescope/telescope-cheat.nvim
nvim-telescope/telescope-dap.nvim
nvim-telescope/telescope-frecency.nvim
nvim-telescope/telescope-fzf-native.nvim@main
nvim-telescope/telescope-fzf-native.nvim
nvim-telescope/telescope-fzf-writer.nvim
nvim-telescope/telescope-fzy-native.nvim
nvim-telescope/telescope-project.nvim
nvim-telescope/telescope-symbols.nvim
nvim-telescope/telescope-z.nvim@main
nvim-telescope/telescope-z.nvim
nvim-telescope/telescope.nvim
nvim-treesitter/completion-treesitter
nvim-treesitter/nvim-treesitter
nvim-treesitter/nvim-treesitter-refactor
nvim-treesitter/nvim-treesitter-textobjects
nvim-treesitter/nvim-treesitter
nvim-treesitter/playground
oberblastmeister/neuron.nvim
oberblastmeister/termwrapper.nvim
ocaml/vim-ocaml
octol/vim-cpp-enhanced-highlight
ojroques/nvim-bufdel@main
ojroques/vim-oscyank@main
ojroques/nvim-bufdel
ojroques/vim-oscyank
Olical/aniseed
Olical/conjure
olimorris/onedarkpro.nvim@main
olimorris/onedarkpro.nvim
onsails/diaglist.nvim
onsails/lspkind-nvim
OrangeT/vim-csharp
@ -597,7 +598,7 @@ petRUShka/vim-opencl
phaazon/hop.nvim
phanviet/vim-monokai-pro
plasticboy/vim-markdown
Pocco81/TrueZen.nvim@main
Pocco81/TrueZen.nvim
ponko2/deoplete-fish
posva/vim-vue
powerman/vim-plugin-AnsiEsc
@ -622,8 +623,8 @@ qpkorr/vim-bufkill
Quramy/tsuquyomi
racer-rust/vim-racer
radenling/vim-dispatch-neovim
rafamadriz/friendly-snippets@main
rafamadriz/neon@main
rafamadriz/friendly-snippets
rafamadriz/neon
rafaqz/ranger.vim
rafi/awesome-vim-colorschemes
raghur/fruzzy
@ -648,10 +649,10 @@ rhysd/vim-grammarous
rhysd/vim-operator-surround
RishabhRD/nvim-lsputils
RishabhRD/popfix
rktjmp/fwatch.nvim@main
rktjmp/lush.nvim@main
rmagatti/auto-session@main
rmagatti/goto-preview@main
rktjmp/fwatch.nvim
rktjmp/lush.nvim
rmagatti/auto-session
rmagatti/goto-preview
RobertAudi/securemodelines
rodjek/vim-puppet
romainl/vim-cool
@ -676,7 +677,7 @@ rust-lang/rust.vim
ryanoasis/vim-devicons
ryvnf/readline.vim
saadparwaiz1/cmp_luasnip
saecki/crates.nvim@main
saecki/crates.nvim
sainnhe/edge
sainnhe/gruvbox-material
sainnhe/sonokai
@ -684,7 +685,7 @@ sakhnik/nvim-gdb
saltstack/salt-vim
samoshkin/vim-mergetool
sbdchd/neoformat
scalameta/nvim-metals@main
scalameta/nvim-metals
sdiehl/vim-ormolu
sebastianmarkow/deoplete-rust
SevereOverfl0w/deoplete-github
@ -718,7 +719,7 @@ SidOfc/mkdx
simnalamburt/vim-mundo
simrat39/rust-tools.nvim
simrat39/symbols-outline.nvim
sindrets/diffview.nvim@main
sindrets/diffview.nvim
SirVer/ultisnips
sjl/gundo.vim
sjl/splice.vim
@ -755,7 +756,7 @@ ternjs/tern_for_vim
terryma/vim-expand-region
terryma/vim-multiple-cursors
tex/vimpreviewpandoc
Th3Whit3Wolf/one-nvim@main
Th3Whit3Wolf/one-nvim
theHamsta/nvim-dap-virtual-text
ThePrimeagen/git-worktree.nvim
ThePrimeagen/harpoon
@ -779,7 +780,7 @@ tmhedberg/SimpylFold
tmsvg/pear-tree
tmux-plugins/vim-tmux
tmux-plugins/vim-tmux-focus-events
tom-anders/telescope-vim-bookmarks.nvim@main
tom-anders/telescope-vim-bookmarks.nvim
tomasiser/vim-code-dark
tomasr/molokai
tomlion/vim-solidity
@ -822,11 +823,11 @@ tpope/vim-tbone
tpope/vim-unimpaired
tpope/vim-vinegar
travitch/hasksyn
tremor-rs/tremor-vim@main
tremor-rs/tremor-vim
triglav/vim-visual-increment
troydm/zoomwintab.vim
turbio/bracey.vim
tversteeg/registers.nvim@main
tversteeg/registers.nvim
tweekmonster/wstrip.vim
twerth/ir_black
twinside/vim-haskellconceal
@ -834,8 +835,8 @@ Twinside/vim-hoogle
tyru/caw.vim
tyru/open-browser-github.vim
tyru/open-browser.vim
tzachar/cmp-tabnine@main
tzachar/compe-tabnine@main
tzachar/cmp-tabnine
tzachar/compe-tabnine
uarun/vim-protobuf
udalov/kotlin-vim
ujihisa/neco-look
@ -905,7 +906,7 @@ w0ng/vim-hybrid
wakatime/vim-wakatime
wannesm/wmgraphviz.vim
wbthomason/packer.nvim
weilbith/nvim-code-action-menu@main
weilbith/nvim-code-action-menu
wellle/targets.vim
wellle/tmux-complete.vim
wfxr/minimap.vim
@ -915,7 +916,6 @@ wincent/command-t
wincent/ferret
wincent/terminus
windwp/nvim-autopairs
windwp/nvim-spectre
winston0410/cmd-parser.nvim
winston0410/range-highlight.nvim
wlangstroth/vim-racket
@ -926,8 +926,8 @@ xolox/vim-misc
xuhdev/vim-latex-live-preview
Xuyuanp/nerdtree-git-plugin
Xuyuanp/scrollbar.nvim
yamatsum/nvim-cursorline@main
yamatsum/nvim-nonicons@main
yamatsum/nvim-cursorline
yamatsum/nvim-nonicons
ycm-core/YouCompleteMe
Yggdroot/hiPairs
Yggdroot/indentLine

View file

@ -1,18 +1,15 @@
{ lib, stdenv, fetchpatch, fetchFromGitLab, kernel }:
{ lib, stdenv, fetchFromGitLab, kernel }:
stdenv.mkDerivation rec {
pname = "ddcci-driver";
# XXX: We apply a patch for the upcoming version to the source of version 0.4.1
# XXX: When 0.4.2 is actually released, don't forget to remove this comment,
# XXX: fix the rev in fetchFromGitLab, and remove the patch.
version = "0.4.2";
name = "${pname}-${kernel.version}-${version}";
src = fetchFromGitLab {
owner = "${pname}-linux";
repo = "${pname}-linux";
rev = "v0.4.1";
sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg";
rev = "v${version}";
sha256 = "sSmL8PqxqHHQiume62si/Kc9El58/b4wkB93iG0dnNM=";
};
hardeningDisable = [ "pic" ];
@ -28,13 +25,6 @@ stdenv.mkDerivation rec {
--replace depmod \#
'';
patches = [
(fetchpatch {
url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/bf9d79852cbd0aa5c2e288ce51b8280f74a1f5d2.patch";
sha256 = "sha256-ShqVzkoRnlX4Y5ARY11YVYatFI1K7bAtLulP3/8/nwg=";
})
];
makeFlags = kernel.makeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"KVER=${kernel.modDirVersion}"

View file

@ -2,21 +2,21 @@
, kernel
, fetchurl
, pkg-config, meson, ninja
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core
, doxygen, python3
, withExamples ? []
, shared ? false }:
let
mod = kernel != null;
dpdkVersion = "21.05";
dpdkVersion = "21.11";
in stdenv.mkDerivation rec {
pname = "dpdk";
version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}";
src = fetchurl {
url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz";
sha256 = "sha256-HhJJm0xfzbV8g+X+GE6mvs3ffPCSiTwsXvLvsO7BLws=";
sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
};
nativeBuildInputs = [
@ -39,6 +39,12 @@ in stdenv.mkDerivation rec {
zlib
] ++ lib.optionals mod kernel.moduleBuildDependencies;
# Propagated to support current DPDK users in nixpkgs which statically link
# with the framework (e.g. odp-dpdk).
propagatedBuildInputs = [
rdma-core
];
postPatch = ''
patchShebangs config/arm buildtools
'';
@ -52,6 +58,7 @@ in stdenv.mkDerivation rec {
++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni"
++ lib.optional (!shared) "-Ddefault_library=static"
++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem"
++ lib.optional stdenv.isAarch64 "-Dmachine=generic"
++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"
++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
@ -67,7 +74,11 @@ in stdenv.mkDerivation rec {
rm -f $kmod/lib/modules/${kernel.modDirVersion}/build
'';
postInstall = lib.optionalString (withExamples != []) ''
postInstall = ''
# Remove Sphinx cache files. Not only are they not useful, but they also
# contain store paths causing spurious dependencies.
rm -rf $out/share/doc/dpdk/html/.doctrees
'' + lib.optionalString (withExamples != []) ''
find examples -type f -executable -exec install {} $out/bin \;
'';

View file

@ -2,51 +2,51 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.256-hardened1.patch",
"sha256": "0dxp40jq9xwrc8v81yyiy6vachqdwlviws152yzinh0k3j4s1c3g",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.256-hardened1/linux-hardened-4.14.256-hardened1.patch"
"name": "linux-hardened-4.14.257-hardened1.patch",
"sha256": "1jqd7drkjpfs9ajkvz0m0l6p0hp74ffchffcrkivqqc99cgzi666",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.257-hardened1/linux-hardened-4.14.257-hardened1.patch"
},
"sha256": "180s2zmkfxk7af9nnkmfi2cs56af6vwyd21hjcfdxiygjm7j114p",
"version": "4.14.256"
"sha256": "0jnw02jphvm9zcviwwymxyhq8kd0bk0v1827ninnv6bdy3140izv",
"version": "4.14.257"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.219-hardened1.patch",
"sha256": "0447km2z1ww6yzixln1a3b7ymrj3ymxag7ny1d60d0d5064id6vj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.219-hardened1/linux-hardened-4.19.219-hardened1.patch"
"name": "linux-hardened-4.19.220-hardened1.patch",
"sha256": "0i2vcwcan23h6vq9xy2fpi95saw6cgk2l2sfmy7xspkff1avhnns",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.220-hardened1/linux-hardened-4.19.220-hardened1.patch"
},
"sha256": "1nq9228zm24d8azvv6d6r5iw8lfkb7z5lblyhk137mydzdqwsklg",
"version": "4.19.219"
"sha256": "0q5hrh6q2f2r97nff136db7367p3hn0la2gl7q4knms3g8fis1jq",
"version": "4.19.220"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.83-hardened1.patch",
"sha256": "1ipx6ad7n2lzlrr02fk2qif5ac2mqpis0qghvms95dd3lpi4lj5r",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.83-hardened1/linux-hardened-5.10.83-hardened1.patch"
"name": "linux-hardened-5.10.84-hardened1.patch",
"sha256": "1hl213iwf3gv81w68win2z4zwbkq6vxpg3dwy9h8md3kdm9pnhzr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.84-hardened1/linux-hardened-5.10.84-hardened1.patch"
},
"sha256": "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg",
"version": "5.10.83"
"sha256": "0g935v0khv0i2qlrwr656hxl28m6zlbclc9rv15nq46xf8fjg5kf",
"version": "5.10.84"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.6-hardened1.patch",
"sha256": "1ndj0dsxpailr12pp5kg8qqsvrmcdkhzlnxarl1jsp6c70g051r1",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.6-hardened1/linux-hardened-5.15.6-hardened1.patch"
"name": "linux-hardened-5.15.7-hardened1.patch",
"sha256": "0s3lh59lgl5ki5wvpigiv0n3psa9k0aq058aiyxykaw36qdwahy6",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.7-hardened1/linux-hardened-5.15.7-hardened1.patch"
},
"sha256": "1w0plw9rzk2c0g8yxzwj7c6wkq538sy56mx1skmf58wrl83bmsdk",
"version": "5.15.6"
"sha256": "1caxpqmik6gkhk3437pcgfq6vvlbs962hylgbh64iizd76l5142x",
"version": "5.15.7"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.163-hardened1.patch",
"sha256": "1yybid435c466grsfx53iax5x0b1ycz7a02ymx9r85gixp6qd3bp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.163-hardened1/linux-hardened-5.4.163-hardened1.patch"
"name": "linux-hardened-5.4.164-hardened1.patch",
"sha256": "1kynk3979jx7b03gkan7b92vf3719wvkdzn5dmdrliy1g5pzx87k",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.164-hardened1/linux-hardened-5.4.164-hardened1.patch"
},
"sha256": "1glh0azkrqdwydvbz9rp3czc5ppb72gq7svl3zbkjc6qfqbzwik2",
"version": "5.4.163"
"sha256": "0142nic300xjdz9s6w1cp6cyhk2c2wpks9wxzqca6jz4da7k0l9r",
"version": "5.4.164"
}
}

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.256";
version = "4.14.257";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "180s2zmkfxk7af9nnkmfi2cs56af6vwyd21hjcfdxiygjm7j114p";
sha256 = "0jnw02jphvm9zcviwwymxyhq8kd0bk0v1827ninnv6bdy3140izv";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.219";
version = "4.19.220";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1nq9228zm24d8azvv6d6r5iw8lfkb7z5lblyhk137mydzdqwsklg";
sha256 = "0q5hrh6q2f2r97nff136db7367p3hn0la2gl7q4knms3g8fis1jq";
};
} // (args.argsOverride or {}))

View file

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.4.293";
version = "4.4.294";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1z9hc68v8fvph29l2w3md4734hhgp36sy8mzdlkmdrlkjihq6bvd";
sha256 = "0k0h5m1ng2049d5ggrq4q81vgsfmdpkqla73vg2a3bf2v6ycjmc7";
};
} // (args.argsOverride or {}))

View file

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.291";
version = "4.9.292";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0lwb9mb4s6qnwklygvfsr5ap85k83w1apkbbfdzzacfn9rvpfpdm";
sha256 = "0y3b6qqv6vrh2p5wwv5bicvbqrvxf1y5xm4myy5pk6yp2igws3kd";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.83";
version = "5.10.84";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg";
sha256 = "0g935v0khv0i2qlrwr656hxl28m6zlbclc9rv15nq46xf8fjg5kf";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.6";
version = "5.15.7";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1w0plw9rzk2c0g8yxzwj7c6wkq538sy56mx1skmf58wrl83bmsdk";
sha256 = "1caxpqmik6gkhk3437pcgfq6vvlbs962hylgbh64iizd76l5142x";
};
} // (args.argsOverride or { }))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.163";
version = "5.4.164";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1glh0azkrqdwydvbz9rp3czc5ppb72gq7svl3zbkjc6qfqbzwik2";
sha256 = "0142nic300xjdz9s6w1cp6cyhk2c2wpks9wxzqca6jz4da7k0l9r";
};
} // (args.argsOverride or {}))

View file

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.78-rt56"; # updated by ./update-rt.sh
version = "5.10.83-rt58"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y";
sha256 = "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0fg627hd0yq2cnbli2v795qfdwhgqqyzmxrq03vyqwg8471kdqzb";
sha256 = "1n1jj7zyhnk4d5imf5v0cblqxv7q0ybc3i17yd224qmkj3bmly9w";
};
}; in [ rt-patch ] ++ kernelPatches;

View file

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.4.161-rt66"; # updated by ./update-rt.sh
version = "5.4.161-rt67"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -21,7 +21,7 @@ in buildLinux (args // {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1prjfvymk4zp94vlgp3nqf1k184blx14kakpikbnk8nck5p9z02m";
sha256 = "1xn3i1m0n4zcsnw5k52iyrd994zxmrla4rkjmdr71ra7csbrvkbx";
};
}; in [ rt-patch ] ++ kernelPatches;

View file

@ -1,8 +1,8 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.15.6";
release = "2";
version = "5.15.7";
release = "1";
suffix = "xanmod${release}-tt";
in
buildLinux (args // rec {
@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-7wK/KIITQT3qmn4WMZHR9wigYgiq88njGn/FLYwI1ls=";
sha256 = "sha256-SeqPnzT3SApFozgQsiGtS9uUqxk8aXcDp7adcERlL1A=";
};
structuredExtraConfig = with lib.kernel; {

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "pktgen";
version = "21.05.0";
version = "21.11.0";
src = fetchFromGitHub {
owner = "pktgen";
repo = "Pktgen-DPDK";
rev = "pktgen-${version}";
sha256 = "sha256-7lLDtbd14olEHO+1BuI6KTEUNRM/zAyRXau/OZbYbGA=";
sha256 = "sha256-3z5DSkggHTwjzsRzRG5zzZTcNsn/5YankJT8CKSN8b4=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
RTE_SDK = dpdk;
GUI = lib.optionalString withGtk "true";
NIX_CFLAGS_COMPILE = "-msse3";
# requires symbols from this file
NIX_LDFLAGS = "-lrte_net_bond";
@ -43,7 +42,7 @@ stdenv.mkDerivation rec {
description = "Traffic generator powered by DPDK";
homepage = "http://dpdk.org/";
license = licenses.bsdOriginal;
platforms = [ "x86_64-linux" ];
platforms = platforms.linux;
maintainers = [ maintainers.abuibrahim ];
};
}

View file

@ -6,8 +6,8 @@
callPackage ./generic.nix args {
src = fetchhg {
url = "https://hg.nginx.org/nginx-quic";
rev = "6d1488b62dc5"; # branch=quic
sha256 = "18xrkzzi4cxl4zi7clikwww9ad9l7vilrfs67hhzx7898jkws5fi";
rev = "0ee56d2eac44"; # branch=quic
sha256 = "sha256-ErJa71aOzcjcBl1P9+g5kzs5sr0JdjrPwYKZ9VAvQus=";
};
preConfigure = ''
@ -16,9 +16,8 @@ callPackage ./generic.nix args {
configureFlags = [
"--with-http_v3_module"
"--with-http_quic_module"
"--with-stream_quic_module"
];
version = "quic";
version = "1.21.4-quic";
}

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "monetdb";
version = "11.39.13";
version = "11.41.11";
src = fetchurl {
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
sha256 = "sha256-e30Vykwk6U83/0pS3OWPJ2Oq2SAtNc1S6c1ZO42k39c=";
sha256 = "sha256-SiZvAvsl2NPa5AxeLtpvWwDhl7ZC0Z/6H/l1hCGpWzw=";
};
postPatch = ''
@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
'set(LINUX_DISTRO "nixos")'
'';
postInstall = ''
rm $out/bin/monetdb_mtest.sh
'';
nativeBuildInputs = [ cmake python3 ];
buildInputs = [ bison openssl readline bzip2 ];

View file

@ -15,14 +15,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-update";
version = "7.0.1";
version = "8.0.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-qUrQWXiK4Gb79Wtcj9nM/FFT/C+b3vAgm9JohvIY2NU=";
sha256 = "sha256-S03Wl99T+dVgGb1TaFJBOZGaPAaqbPDC9+cqQHbYGqY=";
};
cargoSha256 = "sha256-jCaP6e/z9/gjKJfBKIq+dq7pWs5tWyct+JCnUFVVHBY=";
cargoSha256 = "sha256-bBAepKOeRHFJbHSjoBj94b5vnQhX1J2uh8BZHkwWW7E=";
nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microdnf";
version = "3.7.1";
version = "3.8.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
sha256 = "1is8hqckjdz1h9w44iq1ljyfs5b0qd2cyivl30ny4dv8m8zba4zv";
sha256 = "sha256-Ip1XcE8fPXhdgVaR4VPH+ElP6JbnK4JekZuWyT5ot/M=";
};
nativeBuildInputs = [ pkg-config cmake gettext help2man ];

View file

@ -466,6 +466,7 @@ mapAliases ({
libwnck3 = libwnck;
lilypond-unstable = lilypond; # added 2021-03-11
links = links2; # added 2016-01-31
linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;

View file

@ -21055,7 +21055,7 @@ with pkgs;
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
# Use latest boringssl to allow http3 support
openssl = boringssl;
openssl = quictls;
};
nginxStable = callPackage ../servers/http/nginx/stable.nix {
@ -26599,8 +26599,6 @@ with pkgs;
lingot = callPackage ../applications/audio/lingot { };
linuxband = callPackage ../applications/audio/linuxband { };
littlegptracker = callPackage ../applications/audio/littlegptracker {
inherit (darwin.apple_sdk.frameworks) Foundation;
};