Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát 2022-12-16 21:58:10 +01:00
commit 5bfe30aafa
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
23 changed files with 163 additions and 65 deletions

2
.gitignore vendored
View File

@ -2,6 +2,8 @@
,*
.*.swp
.*.swo
.\#*
\#*\#
.idea/
.vscode/
outputs/

View File

@ -21,6 +21,13 @@ in
services.miniflux = {
enable = mkEnableOption (lib.mdDoc "miniflux and creates a local postgres database for it");
package = mkOption {
type = types.package;
default = pkgs.miniflux;
defaultText = literalExpression "pkgs.miniflux";
description = lib.mdDoc "Miniflux package to use.";
};
config = mkOption {
type = types.attrsOf types.str;
example = literalExpression ''
@ -89,7 +96,7 @@ in
after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ];
serviceConfig = {
ExecStart = "${pkgs.miniflux}/bin/miniflux";
ExecStart = "${cfg.package}/bin/miniflux";
User = dbUser;
DynamicUser = true;
RuntimeDirectory = "miniflux";
@ -122,6 +129,6 @@ in
environment = cfg.config;
};
environment.systemPackages = [ pkgs.miniflux ];
environment.systemPackages = [ cfg.package ];
};
}

View File

@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule {
pname = "pms";
version = "unstable-2022-11-12";
src = fetchFromGitHub {
owner = "ambientsound";
repo = "pms";
rev = "40d6e37111293187ab4542c7a64bd73d1b13974f";
sha256 = "sha256-294MiS4c2PO2lFSSRrg8ns7sXzZsEUAqPG3q2z3TRUg=";
};
vendorHash = "sha256-XNFzG4hGDUN0wWbpBoQWUH1bWIgoYcyP4tNRGSV4ro4=";
meta = with lib; {
description = "An interactive Vim-like console client for MPD";
homepage = "https://ambientsound.github.io/pms/";
license = licenses.mit;
maintainers = with maintainers; [ deejayem ];
};
}

View File

@ -0,0 +1,26 @@
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "seashells";
version = "0.1.2";
format = "setuptools";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM=";
};
doCheck = false; # there are no tests
pythonImportsCheck = [ "seashells" ];
meta = with lib; {
homepage = "https://seashells.io/";
description = "Pipe command-line programs to seashells.io";
longDescription = ''
Official cient for seashells.io, which allows you to view
command-line output on the web, in real-time.
'';
license = licenses.mit;
maintainers = with maintainers; [ deejayem ];
};
}

View File

@ -11,9 +11,10 @@
, odd-unstable ? false
, patchlevel-unstable ? false
, url ? null
, extraRegex ? null
}:
genericUpdater {
inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable;
versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}";
versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"} ${lib.optionalString (extraRegex != null) "--extra-regex=${lib.escapeShellArg extraRegex}"}";
}

View File

@ -26,6 +26,8 @@ parser.add_argument(
parser.add_argument("--url", help="url of the page that lists the package versions")
parser.add_argument("--file", help="file name for writing debugging information")
parser.add_argument("--extra-regex", help="additional regex to filter versions with")
if __name__ == "__main__":
args = parser.parse_args()
@ -59,7 +61,9 @@ if __name__ == "__main__":
link_url = link.get("href", None)
if link_url is not None:
match = re.fullmatch(
rf"{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url
rf"(.*/)?{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url
)
if match:
print(match.group(1))
version = match.group(2)
if (not args.extra_regex) or re.fullmatch(args.extra_regex, version):
print(version)

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.11.3";
version = "1.17.2";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro-${version}.zip";
sha256 = "0hjsrwp6d1k68p0qhn7v9689ihy06ssnfpi8dj61jw6r64c234m4";
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "1lf0226gl9912qrk4s57bsncv23886b8wk7wri6icg26xp1cxa3v";
};
dontUnpack = true;
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir $out
unzip $src -d $out
mv $out/maestro-$version/* $out
rm -rf $out/maestro-$version
mv $out/maestro/* $out
rm -rf $out/maestro
'';
postFixup = ''

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.16.1";
version = "0.16.7";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-5b9uJfIGWDQi5exPVCgK/9wrozptX1FebPMrWJ0v4TM=";
sha256 = "sha256-zo7YQ4Is3VWsXGvPNrg95tZ76qTSQRyntFjDeqhoyVw=";
};
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

View File

@ -5,15 +5,16 @@
, SDL2_image
, SDL2_mixer
, SDL2_ttf
, directoryListingUpdater
}:
stdenv.mkDerivation rec {
pname = "lbreakouthd";
version = "1.0.10";
version = "1.1";
src = fetchurl {
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
hash = "sha256-hlGhPa91u6pOaZoFJSDcXYQdizTFjuuTLnx9fcrXUhA=";
hash = "sha256-5hjS0aJ5f8Oe0aSuVgcV10h5OmWsaMHF5B9wYVFrlDY=";
};
buildInputs = [
@ -25,6 +26,12 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
passthru.updateScript = directoryListingUpdater {
inherit pname version;
url = "https://lgames.sourceforge.io/LBreakoutHD/";
extraRegex = "(?!.*-win(32|64)).*";
};
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "https://lgames.sourceforge.io/LBreakoutHD/";

View File

@ -5,6 +5,7 @@
, SDL2_image
, SDL2_mixer
, SDL2_ttf
, directoryListingUpdater
}:
stdenv.mkDerivation rec {
@ -23,6 +24,12 @@ stdenv.mkDerivation rec {
SDL2_ttf
];
passthru.updateScript = directoryListingUpdater {
inherit pname version;
url = "https://lgames.sourceforge.io/LPairs/";
extraRegex = "(?!.*-win(32|64)).*";
};
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "http://lgames.sourceforge.net/LPairs/";

View File

@ -1,12 +1,18 @@
{ lib, stdenv, fetchurl, SDL, SDL_mixer }:
{ lib
, stdenv
, fetchurl
, SDL
, SDL_mixer
, directoryListingUpdater
}:
stdenv.mkDerivation rec {
pname = "ltris";
version = "1.2.5";
version = "1.2.6";
src = fetchurl {
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
hash = "sha256-Ksb5TdQMTEzaJfjHVhgq27dSFvZxUnNUQ6OpAU+xwzM=";
hash = "sha256-wjziFFTAOJxSl6fvLhTv6ATZQGJefusDhqKXgOwsRvY=";
};
buildInputs = [
@ -16,6 +22,12 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
passthru.updateScript = directoryListingUpdater {
inherit pname version;
url = "https://lgames.sourceforge.io/LTris/";
extraRegex = "(?!.*-win(32|64)).*";
};
meta = with lib; {
homepage = "https://lgames.sourceforge.io/LTris/";
description = "Tetris clone from the LGames series";

View File

@ -2,61 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.300-hardened1.patch",
"sha256": "1y43qxcn00w1gayjj1rr3vfws8m4f2p9nz080nqilw0g14kq73sa",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.300-hardened1/linux-hardened-4.14.300-hardened1.patch"
"name": "linux-hardened-4.14.302-hardened1.patch",
"sha256": "028wmgp5xkxf0k127vfnfr8wfvrdn68phfjxh21fjs5nag0vxmgs",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.302-hardened1/linux-hardened-4.14.302-hardened1.patch"
},
"sha256": "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y",
"version": "4.14.300"
"sha256": "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3",
"version": "4.14.302"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.267-hardened1.patch",
"sha256": "0phlfwigzh2j5j8xjqamywqn8libpzvhingx0vjxggf0wqxvgix0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.267-hardened1/linux-hardened-4.19.267-hardened1.patch"
"name": "linux-hardened-4.19.269-hardened1.patch",
"sha256": "03gmxnficyjngxq1ciwp2jbr38zi0pfkax8bycs3xp1xhx90p3db",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.269-hardened1/linux-hardened-4.19.269-hardened1.patch"
},
"sha256": "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l",
"version": "4.19.267"
"sha256": "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf",
"version": "4.19.269"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.157-hardened1.patch",
"sha256": "1igmixscnjynnczwcrwp2kcw2llrbw3zlg4qzvyfmqvf3ylbbq5z",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.157-hardened1/linux-hardened-5.10.157-hardened1.patch"
"name": "linux-hardened-5.10.159-hardened1.patch",
"sha256": "0kjiijq9qd5zyy2gvsn8xv99jv5crfyqi69lchmsqk1gs4qhs7m9",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.159-hardened1/linux-hardened-5.10.159-hardened1.patch"
},
"sha256": "0zrjdmaj3sx0w7397glaiq6w9wwdj7lpff77a09kzmbyfz0dfk7w",
"version": "5.10.157"
"sha256": "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v",
"version": "5.10.159"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.81-hardened1.patch",
"sha256": "0dignkwdpfi0jm3d1iz63rc4a0ki1vwyw100nganxbrg13kjm9jv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.81-hardened1/linux-hardened-5.15.81-hardened1.patch"
"name": "linux-hardened-5.15.83-hardened1.patch",
"sha256": "0cyd14xlmiy7bj5psjws2p1xdc7vzhv1hy77xca4mlwssb41zvdb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.83-hardened1/linux-hardened-5.15.83-hardened1.patch"
},
"sha256": "1awny3lgfkh5n2gdksajbyzips8kawz6rkr0p5inwkbmppg5r24g",
"version": "5.15.81"
"sha256": "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0",
"version": "5.15.83"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.225-hardened1.patch",
"sha256": "09h8bjq73fyx6kqk0kcy3z2a0cs32gg4visv859siwb8rw1ziva2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.225-hardened1/linux-hardened-5.4.225-hardened1.patch"
"name": "linux-hardened-5.4.227-hardened1.patch",
"sha256": "1q5xxaz154iz65x6n4m1lfsly9p978zzrnp9xdh6sp1cw8g39fyn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.227-hardened1/linux-hardened-5.4.227-hardened1.patch"
},
"sha256": "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar",
"version": "5.4.225"
"sha256": "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy",
"version": "5.4.227"
},
"6.0": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.0.11-hardened1.patch",
"sha256": "0y48mj6sj43s1d58gds0v8dbyiavsvl5n0a8iqjs0fb8f6wbld0r",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.11-hardened1/linux-hardened-6.0.11-hardened1.patch"
"name": "linux-hardened-6.0.13-hardened1.patch",
"sha256": "0v037rg3h8khjdr1hhkpqv2xb9g5vc7dklxf8zidaww27gb2g528",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.13-hardened1/linux-hardened-6.0.13-hardened1.patch"
},
"sha256": "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib",
"version": "6.0.11"
"sha256": "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8",
"version": "6.0.13"
}
}

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.301";
version = "4.14.302";
# 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 = "16zrpfadsnznpl37crbq5g1hz1ch0zfp2a75yzlqy2fs0f7fxlmc";
sha256 = "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.268";
version = "4.19.269";
# 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 = "0kr0di4gr6p57c8h6ybcli01kazq235npbh6qrpx0hpmqcdcx6r1";
sha256 = "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.158";
version = "5.10.159";
# 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 = "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy";
sha256 = "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.82";
version = "5.15.83";
# 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 = "0r8v7113favmch2x6br7jk6idihza99l9qyd7ik99i5sg6xzdvpw";
sha256 = "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0";
};
} // (args.argsOverride or { }))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.226";
version = "5.4.227";
# 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 = "0i4s1hl5q0ax55z7m5krzyw1zj9v03q8jcfksknb6qrg3lm5a7qc";
sha256 = "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.0.12";
version = "6.0.13";
# 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/v6.x/linux-${version}.tar.xz";
sha256 = "00ag63lnxw2gijw3b6v29lhrlv480m12954q5zh4jawlz3nk1dw9";
sha256 = "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8";
};
} // (args.argsOverride or { }))

View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.153-rt76"; # updated by ./update-rt.sh
version = "5.10.158-rt77"; # 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 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw";
sha256 = "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "12gf2nnnfcbmyp34xnns35qpnzsnwjilq2qs1xvq6m51gcnnzq7g";
sha256 = "1yl2add34ylsancly5dblxigljwrcxgs456cz7xlnpywrlfsir5m";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.122.0";
version = "0.123.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-NvUnLnACQCBvIiM3a0dtTUhfr9P3Ra9TX5Gy4Pj0tww=";
sha256 = "sha256-K5o7lEFrUjAXXwL1cnWfuRNVXvLehk0tXCCIc0rfK5s=";
};
vendorSha256 = "sha256-qc2i4bfasTBzndsxbMk6xRhtbgmbBAvuyBgUMeIiHaA=";
vendorSha256 = "sha256-CJ2b6O57E1mrNAWkDcnICeDzW3q4+uSeXV5UnYkbUng=";
doCheck = false;

View File

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM=";
};
postPatch = ''
substituteInPlace Makefile.in --replace 'ar r libbgpdump.a' '$(AR) r libbgpdump.a'
'';
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib bzip2 ];

View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
configureFlags = [ "--enable-fastsampling" ];
makeFlags = [ "AR:=$(AR)" ];
postInstall = ''
mv $out/bin/iperf $out/bin/iperf2
ln -s $out/bin/iperf2 $out/bin/iperf

View File

@ -11466,6 +11466,8 @@ with pkgs;
skim = callPackage ../tools/misc/skim { };
seashells = callPackage ../applications/misc/seashells { };
seaweedfs = callPackage ../applications/networking/seaweedfs { };
sec = callPackage ../tools/admin/sec { };
@ -30677,6 +30679,8 @@ with pkgs;
ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
pms = callPackage ../applications/audio/pms { };
pragha = libsForQt5.callPackage ../applications/audio/pragha { };
rofi-mpd = callPackage ../applications/audio/rofi-mpd { };