diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-04 00:02:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 00:02:16 +0000 |
| commit | 7869e723ac038acb7b62bb1112b70bc217f2341b (patch) | |
| tree | 3271b069fc35fd1ca2e3cd514e1407f2e5d11625 /pkgs/os-specific | |
| parent | 3d632fe115d524781ca8dbba772afca2047ae287 (diff) | |
| parent | 8727dcf55f4024f727652d4d6e5763f637003a3d (diff) | |
| download | nixlib-7869e723ac038acb7b62bb1112b70bc217f2341b.tar nixlib-7869e723ac038acb7b62bb1112b70bc217f2341b.tar.gz nixlib-7869e723ac038acb7b62bb1112b70bc217f2341b.tar.bz2 nixlib-7869e723ac038acb7b62bb1112b70bc217f2341b.tar.lz nixlib-7869e723ac038acb7b62bb1112b70bc217f2341b.tar.xz nixlib-7869e723ac038acb7b62bb1112b70bc217f2341b.tar.zst nixlib-7869e723ac038acb7b62bb1112b70bc217f2341b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/iomelt/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 11 |
2 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 0084a397d075..331c9020a480 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -1,17 +1,19 @@ -{ stdenv, lib, fetchurl }: +{ fetchurl +, lib +, stdenv +}: let version = "0.7"; in stdenv.mkDerivation { - pname = "iomelt"; inherit version; + pname = "iomelt"; src = fetchurl { - url = "http://iomelt.com/s/iomelt-${version}.tar.gz"; + url = "https://web.archive.org/web/20180816072405if_/http://iomelt.com/s/iomelt-${version}.tar.gz"; sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im"; }; preBuild = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 + install -d $out/{bin,share/man/man1} substituteInPlace Makefile \ --replace /usr $out @@ -19,9 +21,9 @@ in stdenv.mkDerivation { meta = with lib; { description = "A simple yet effective way to benchmark disk IO in Linux systems"; - homepage = "http://www.iomelt.com"; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/camposr/iomelt"; + maintainers = with maintainers; [ raspher ]; license = licenses.artistic2; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e94f9f7d0fb8..348a4c36adc4 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.18"; - hash = "sha256-WGfbCmM0fpWXQt1ThfaHn4bqZz22bNkhc9I2qeXMsws="; + version = "6.6.19"; + hash = "sha256-DfoClySWV0vlDDRAJsujGj5ypnGr+HsVbszCYfi+2V0="; variant = "lts"; }; mainVariant = { - version = "6.7.6"; - hash = "sha256-gg8B/i6kidgvRBOm3JiMBwP18UtVRH1ELNGQUBkDOMs="; + version = "6.7.7"; + hash = "sha256-Y+SvnvkFOGCxq+hGwpiiymNr1rYbNqppNA0d63TyUmo="; variant = "main"; }; @@ -33,9 +33,6 @@ let TCP_CONG_BBR = yes; DEFAULT_BBR = yes; - # WineSync driver for fast kernel-backed Wine - WINESYNC = module; - # Preemptive Full Tickless Kernel at 250Hz HZ = freeform "250"; HZ_250 = yes; |