colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-09 00:02:42 +00:00 committed by GitHub
commit 5c6643bcdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 295 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/backport.yml vendored
View File

@ -8,8 +8,14 @@ on:
# the GitHub repository. This means that it should not evaluate user input in a # the GitHub repository. This means that it should not evaluate user input in a
# way that allows code injection. # way that allows code injection.
permissions:
contents: read
jobs: jobs:
backport: backport:
permissions:
contents: write # for zeebe-io/backport-action to create branch
pull-requests: write # for zeebe-io/backport-action to create PR to backport
name: Backport Pull Request name: Backport Pull Request
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
runs-on: ubuntu-latest runs-on: ubuntu-latest

3
.github/workflows/basic-eval.yml vendored
View File

@ -10,6 +10,9 @@ on:
# branches: # branches:
# - master # - master
# - release-** # - release-**
permissions:
contents: read
jobs: jobs:
tests: tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest

5
.github/workflows/direct-push.yml vendored
View File

@ -4,8 +4,13 @@ on:
branches: branches:
- master - master
- release-** - release-**
permissions:
contents: read
jobs: jobs:
build: build:
permissions:
contents: write # for peter-evans/commit-comment to comment on commit
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS' if: github.repository_owner == 'NixOS'
env: env:

5
.github/workflows/pending-clear.yml vendored
View File

@ -4,8 +4,13 @@ on:
check_suite: check_suite:
types: [ completed ] types: [ completed ]
permissions:
contents: read
jobs: jobs:
action: action:
permissions:
statuses: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: clear pending status - name: clear pending status

5
.github/workflows/pending-set.yml vendored
View File

@ -8,8 +8,13 @@ on:
# the GitHub repository. This means that it should not evaluate user input in a # the GitHub repository. This means that it should not evaluate user input in a
# way that allows code injection. # way that allows code injection.
permissions:
contents: read
jobs: jobs:
action: action:
permissions:
statuses: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: set pending status - name: set pending status

6
.github/workflows/periodic-merge-24h.yml vendored
View File

@ -14,8 +14,14 @@ on:
# Merge every 24 hours # Merge every 24 hours
- cron: '0 0 * * *' - cron: '0 0 * * *'
permissions:
contents: read
jobs: jobs:
periodic-merge: periodic-merge:
permissions:
contents: write # for devmasx/merge-branch to merge branches
issues: write # for peter-evans/create-or-update-comment to create or update comment
if: github.repository_owner == 'NixOS' if: github.repository_owner == 'NixOS'
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:

6
.github/workflows/periodic-merge-6h.yml vendored
View File

@ -14,8 +14,14 @@ on:
# Merge every 6 hours # Merge every 6 hours
- cron: '0 */6 * * *' - cron: '0 */6 * * *'
permissions:
contents: read
jobs: jobs:
periodic-merge: periodic-merge:
permissions:
contents: write # for devmasx/merge-branch to merge branches
issues: write # for peter-evans/create-or-update-comment to create or update comment
if: github.repository_owner == 'NixOS' if: github.repository_owner == 'NixOS'
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:

9
maintainers/maintainer-list.nix
View File

@ -14600,6 +14600,15 @@
github = "snpschaaf"; github = "snpschaaf";
githubId = 105843013; githubId = 105843013;
}; };
SohamG = {
email = "sohamg2@gmail.com";
name = "Soham S Gumaste";
github = "SohamG";
githubId = 7116239;
keys = [{
fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442";
}];
};
jali-clarke = { jali-clarke = {
email = "jinnah.ali-clarke@outlook.com"; email = "jinnah.ali-clarke@outlook.com";
name = "Jinnah Ali-Clarke"; name = "Jinnah Ali-Clarke";

212
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, utils, ... }:
let let
xcfg = config.services.xserver; xcfg = config.services.xserver;
@ -30,7 +30,7 @@ let
inherit (libsForQt5) kdeGear kdeFrameworks plasma5; inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
inherit (pkgs) writeText; inherit (pkgs) writeText;
inherit (lib) inherit (lib)
getBin optionalString getBin optionalString literalExpression
mkRemovedOptionModule mkRenamedOptionModule mkRemovedOptionModule mkRenamedOptionModule
mkDefault mkIf mkMerge mkOption types; mkDefault mkIf mkMerge mkOption types;
@ -192,6 +192,13 @@ in
default = false; default = false;
}; };
excludePackages = mkOption {
description = "List of default packages to exclude from the configuration";
type = types.listOf types.package;
default = [];
example = literalExpression "[ pkgs.plasma5Packages.oxygen ]";
};
# Internally allows configuring kdeglobals globally # Internally allows configuring kdeglobals globally
kdeglobals = mkOption { kdeglobals = mkOption {
internal = true; internal = true;
@ -263,89 +270,94 @@ in
environment.systemPackages = environment.systemPackages =
with libsForQt5; with libsForQt5;
with plasma5; with kdeGear; with kdeFrameworks; with plasma5; with kdeGear; with kdeFrameworks;
[ let
frameworkintegration requiredPackages = [
kactivities frameworkintegration
kauth kactivities
kcmutils kauth
kconfig kcmutils
kconfigwidgets kconfig
kcoreaddons kconfigwidgets
kdoctools kcoreaddons
kdbusaddons kdoctools
kdeclarative kdbusaddons
kded kdeclarative
kdesu kded
kdnssd kdesu
kemoticons kdnssd
kfilemetadata kemoticons
kglobalaccel kfilemetadata
kguiaddons kglobalaccel
kiconthemes kguiaddons
kidletime kiconthemes
kimageformats kidletime
kinit kimageformats
kirigami2 # In system profile for SDDM theme. TODO: wrapper. kinit
kio kirigami2 # In system profile for SDDM theme. TODO: wrapper.
kjobwidgets kio
knewstuff kjobwidgets
knotifications knewstuff
knotifyconfig knotifications
kpackage knotifyconfig
kparts kpackage
kpeople kparts
krunner kpeople
kservice krunner
ktextwidgets kservice
kwallet ktextwidgets
kwallet-pam kwallet
kwalletmanager kwallet-pam
kwayland kwalletmanager
kwayland-integration kwayland
kwidgetsaddons kwayland-integration
kxmlgui kwidgetsaddons
kxmlrpcclient kxmlgui
plasma-framework kxmlrpcclient
solid plasma-framework
sonnet solid
threadweaver sonnet
threadweaver
breeze-qt5 breeze-qt5
kactivitymanagerd kactivitymanagerd
kde-cli-tools kde-cli-tools
kdecoration kdecoration
kdeplasma-addons kdeplasma-addons
kgamma5 kgamma5
khotkeys khotkeys
kscreen kscreen
kscreenlocker kscreenlocker
kwayland kwayland
kwin kwin
kwrited kwrited
libkscreen libkscreen
libksysguard libksysguard
milou milou
plasma-browser-integration plasma-integration
plasma-integration polkit-kde-agent
polkit-kde-agent
plasma-desktop plasma-desktop
plasma-workspace plasma-workspace
plasma-workspace-wallpapers plasma-workspace-wallpapers
konsole breeze-icons
oxygen pkgs.hicolor-icon-theme
breeze-icons kde-gtk-config
pkgs.hicolor-icon-theme breeze-gtk
kde-gtk-config qtvirtualkeyboard
breeze-gtk
qtvirtualkeyboard pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
];
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ optionalPackages = [
] plasma-browser-integration
konsole
oxygen
];
in
requiredPackages
++ utils.removePackagesByName optionalPackages cfg.excludePackages
# Phonon audio backend # Phonon audio backend
++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer ++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer
@ -457,27 +469,29 @@ in
environment.systemPackages = environment.systemPackages =
with libsForQt5; with libsForQt5;
with plasma5; with kdeGear; with kdeFrameworks; with plasma5; with kdeGear; with kdeFrameworks;
[ let
ksystemstats requiredPackages = [
kinfocenter ksystemstats
kmenuedit kinfocenter
plasma-systemmonitor kmenuedit
spectacle plasma-systemmonitor
systemsettings spectacle
systemsettings
dolphin dolphin
dolphin-plugins dolphin-plugins
ffmpegthumbs ffmpegthumbs
kdegraphics-thumbnailers kdegraphics-thumbnailers
khelpcenter kio-extras
kio-extras ];
print-manager optionalPackages = [
elisa
elisa gwenview
gwenview okular
okular khelpcenter
] print-manager
; ];
in requiredPackages ++ utils.removePackagesByName optionalPackages cfg.excludePackages;
systemd.user.services = { systemd.user.services = {
plasma-run-with-systemd = { plasma-run-with-systemd = {

1
nixos/tests/matrix/mjolnir.nix
View File

@ -45,7 +45,6 @@ import ../make-test-python.nix (
enable_registration = true; enable_registration = true;
enable_registration_without_verification = true; enable_registration_without_verification = true;
registration_shared_secret = "supersecret-registration"; registration_shared_secret = "supersecret-registration";
enable_registration_without_verification = true;
listeners = [ { listeners = [ {
# The default but tls=false # The default but tls=false

8
nixos/tests/plasma5.nix
View File

@ -13,7 +13,10 @@ import ./make-test-python.nix ({ pkgs, ...} :
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.defaultSession = "plasma"; services.xserver.displayManager.defaultSession = "plasma";
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5 = {
enable = true;
excludePackages = [ pkgs.plasma5Packages.elisa ];
};
services.xserver.displayManager.autoLogin = { services.xserver.displayManager.autoLogin = {
enable = true; enable = true;
user = "alice"; user = "alice";
@ -40,6 +43,9 @@ import ./make-test-python.nix ({ pkgs, ...} :
with subtest("Check that logging in has given the user ownership of devices"): with subtest("Check that logging in has given the user ownership of devices"):
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
with subtest("Ensure Elisa is not installed"):
machine.fail("which elisa")
with subtest("Run Dolphin"): with subtest("Run Dolphin"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'") machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")
machine.wait_for_window(" Dolphin") machine.wait_for_window(" Dolphin")

10
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,14 +1,14 @@
{ {
"version": "15.1.1", "version": "15.1.2",
"repo_hash": "sha256-wCO0Ksi5c8kgerpK/O3IkI6CJARQbQj9nWmnxBVhBIM=", "repo_hash": "sha256-gZCKI2OXKQZzRe3T/nbnRC0qFHnOBVOAST+ky0qmJDc=",
"yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4", "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v15.1.1-ee", "rev": "v15.1.2-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "15.1.1", "GITALY_SERVER_VERSION": "15.1.2",
"GITLAB_PAGES_VERSION": "1.59.0", "GITLAB_PAGES_VERSION": "1.59.0",
"GITLAB_SHELL_VERSION": "14.7.4", "GITLAB_SHELL_VERSION": "14.7.4",
"GITLAB_WORKHORSE_VERSION": "15.1.1" "GITLAB_WORKHORSE_VERSION": "15.1.2"
} }
} }

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -11,7 +11,7 @@ let
gemdir = ./.; gemdir = ./.;
}; };
version = "15.1.1"; version = "15.1.2";
package_version = "v${lib.versions.major version}"; package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
in in
@ -24,7 +24,7 @@ buildGoModule {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-JMKB6lrmQBbBgXSKinL2shlXRXhZrf4QwoJrm+VpKdE="; sha256 = "sha256-g/SlrE/NVMYqZaEgKncMLjsfI8jAE0xfyy6rpShsi2Q=";
}; };
vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww="; vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "15.1.1"; version = "15.1.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = data.owner; owner = data.owner;

4
pkgs/desktops/gnome/apps/gnome-boxes/default.nix
View File

@ -54,11 +54,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-boxes"; pname = "gnome-boxes";
version = "42.2"; version = "42.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "98K8oU3K4oONsR+iyA4jQI41SBeK+GGg1NDcxql4ABU="; sha256 = "Vu/3+vgwD6oc4U+An468Knu02RWvx7EnNxKXkWBbYNM=";
}; };
patches = [ patches = [

4
pkgs/development/python-modules/dvc-render/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc-render"; pname = "dvc-render";
version = "0.0.6"; version = "0.0.7";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "iterative"; owner = "iterative";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-l0efiCLoOVuSYoHWYYyu8FT1yosdFl6BeogzJyNKltw="; hash = "sha256-QUrXUfvxQ2XZPTWXXuYBJpzFGNb8KeqpMh47WdCQu04=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/numpyro/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "numpyro"; pname = "numpyro";
version = "0.9.2"; version = "0.10.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit version pname; inherit version pname;
hash = "sha256-TbzyIt17/z56juc8kH1L8rTkvSgcsT5ah6xmvWTo6tM="; hash = "sha256-UCgFGHNLQunZgXGgmLWiH9GPEpRMIoSCqJryGIDHTdo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/poetry/default.nix
View File

@ -32,7 +32,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "poetry"; pname = "poetry";
version = "1.1.12"; version = "1.1.14";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "python-poetry"; owner = "python-poetry";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1fm4yj6wxr24v7b77gmf63j7xsgszhbhzw2i9fvlfi0p9l0q34pm"; sha256 = "sha256-n/GZOUoIMxWlULDqOe59Gt7Hz/+Mc4QcZT+1+HtQovs=";
}; };
postPatch = '' postPatch = ''

4
pkgs/games/extremetuxracer/default.nix
View File

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.8.1"; version = "0.8.2";
pname = "extremetuxracer"; pname = "extremetuxracer";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
sha256 = "sha256-ktqWPtMqub/xJjRu37lUnocdfDzsdT9KxQmODVPDg0E="; sha256 = "sha256-HIdJZeniSVM78VwI2rxh5gwFuz/VeJF4gBF/+KkQzU4=";
}; };
buildInputs = [ buildInputs = [

50
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -2,42 +2,42 @@
"4.14": { "4.14": {
"patch": { "patch": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.14.285-hardened1.patch", "name": "linux-hardened-4.14.286-hardened1.patch",
"sha256": "1s7dzzb9aj4xbabddq5jcbd2aci3zxqwryjnmzrhzrdw6j8wszwx", "sha256": "00vcsd4w2agvsd057k8m95cg9li81awi17hjb50207nx3g8hdrka",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.285-hardened1/linux-hardened-4.14.285-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.286-hardened1/linux-hardened-4.14.286-hardened1.patch"
}, },
"sha256": "0ynkcq2cm0q2qcmll1jg76msfa2a186xy5rv81ahfvylbjdkijfs", "sha256": "1x26fys9c2zai69wvvwpcxhdbbl02vijn4h7g6k6nq4y36fvkfyx",
"version": "4.14.285" "version": "4.14.286"
}, },
"4.19": { "4.19": {
"patch": { "patch": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.19.249-hardened1.patch", "name": "linux-hardened-4.19.250-hardened1.patch",
"sha256": "0n2q0vwqxvzkkxn4mdaiqyx7ry8k4cr3hx3czcr3wbqvwh2bbnbz", "sha256": "121pivhdlvkx8vblxdi6w39xwa16liq700hblsw8r0kba6jhzkhm",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.249-hardened1/linux-hardened-4.19.249-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.250-hardened1/linux-hardened-4.19.250-hardened1.patch"
}, },
"sha256": "14aiypira32hsw7wy9bhdw9rvfn705r0sb4415n9pfvi091bsjyf", "sha256": "0p3mnl49708inhnrh461s6cnyn20qsqb9dw541h7crgsyd30mqvf",
"version": "4.19.249" "version": "4.19.250"
}, },
"5.10": { "5.10": {
"patch": { "patch": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.10.127-hardened1.patch", "name": "linux-hardened-5.10.128-hardened1.patch",
"sha256": "0lmsmmj1f0zqm5plb3c4sfqkq70msa24l1hcsrynavmzys8hndmq", "sha256": "14pjxnk1p9fqmbxq4p45gc6p1cz86qg3x4ac5qa17rhdnaxm7pk7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.127-hardened1/linux-hardened-5.10.127-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.128-hardened1/linux-hardened-5.10.128-hardened1.patch"
}, },
"sha256": "100m4b6w1kbc1lc3gwlmkp8xl42xai0v5wdbx0mxrq8y1gp374j1", "sha256": "0jyk3is94c3xin48saqywfr66iwqvzqq1rs5px4zkpfp139fjngc",
"version": "5.10.127" "version": "5.10.128"
}, },
"5.15": { "5.15": {
"patch": { "patch": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.15.51-hardened1.patch", "name": "linux-hardened-5.15.52-hardened1.patch",
"sha256": "0rfj0ypag0wn0ja77c920ppbqbik07i9yfrlhjanrz66vdip0z1r", "sha256": "03shqi5lcsvrgklm2qgggwkxww0fs8bs25xc0l6mmiqa3sabws63",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.51-hardened1/linux-hardened-5.15.51-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.52-hardened1/linux-hardened-5.15.52-hardened1.patch"
}, },
"sha256": "1229m4r4n61n5l8anp2pcqdhajkwmavhr1z00n8gvx3yn9w4ifhz", "sha256": "01bdmgbl31nm0wg5mrzn6xgls4h5gig96mjrmn790npjm5fhls7l",
"version": "5.15.51" "version": "5.15.52"
}, },
"5.18": { "5.18": {
"patch": { "patch": {
@ -52,11 +52,11 @@
"5.4": { "5.4": {
"patch": { "patch": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.4.202-hardened1.patch", "name": "linux-hardened-5.4.203-hardened1.patch",
"sha256": "1gkgipw7ic0l3gh6haylcyss46wbph7zhx91fdp4na20jy4dxrzv", "sha256": "1wjh14vh929vjgw4kkcyvyc1w0c7v0mlv2ywycj6zv1klwxzfnbh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.202-hardened1/linux-hardened-5.4.202-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.203-hardened1/linux-hardened-5.4.203-hardened1.patch"
}, },
"sha256": "0gak58h5l2d8rmbmjw48460bgqi73yf1m7swsbbhfsmbkvhvr8aw", "sha256": "12kr55nf6pmb0d52x5r3ilfssyqng9s8cpnbm9aglv062ddkz4zw",
"version": "5.4.202" "version": "5.4.203"
} }
} }

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.286"; version = "4.14.287";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1x26fys9c2zai69wvvwpcxhdbbl02vijn4h7g6k6nq4y36fvkfyx"; sha256 = "05pnz2wch5b430j82sjqhxyfbpln4p1569avj2qkk62x4164kdbq";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.250"; version = "4.19.251";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0p3mnl49708inhnrh461s6cnyn20qsqb9dw541h7crgsyd30mqvf"; sha256 = "1x6ag81wzcynfa4l819mamk9k11fxgq5m1gain93avparjnwi1rp";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

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

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.10.128"; version = "5.10.129";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0jyk3is94c3xin48saqywfr66iwqvzqq1rs5px4zkpfp139fjngc"; sha256 = "1zlw89m7wpy02rnk8mizng43i77hrkwzl280sivqz1c05c2jzrxa";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.15.52"; version = "5.15.53";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "01bdmgbl31nm0wg5mrzn6xgls4h5gig96mjrmn790npjm5fhls7l"; sha256 = "01vvyw6sjkkjs7l4cy04yv19d9f3wmpy5gqfm763y7q58dr73apk";
}; };
} // (args.argsOverride or { })) } // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.18.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.18.9"; version = "5.18.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0g69ylrdb3khjnnz3v4m6xng49fzjlnvxfaqq77krznwrrpy50iq"; sha256 = "1qyyfdfp8qn8a6brgly0h72jvz9s0wp2pjyrcpknzvmqvc0kv7pr";
}; };
} // (args.argsOverride or { })) } // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.4.203"; version = "5.4.204";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "12kr55nf6pmb0d52x5r3ilfssyqng9s8cpnbm9aglv062ddkz4zw"; sha256 = "0ivsfdw55mysihylk5n46r7limf1rqddipap17mkfnyq345b3hgx";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

6
pkgs/tools/X11/libstrangle/default.nix
View File

@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
substituteAllInPlace src/strangle.sh substituteAllInPlace src/strangle.sh
substituteAllInPlace src/stranglevk.sh substituteAllInPlace src/stranglevk.sh
''; '';
postInstall = ''
substitute $out/share/vulkan/implicit_layer.d/libstrangle_vk.json $out/share/vulkan/implicit_layer.d/libstrangle_vk.x86.json \
--replace "libstrangle_vk.so" "$out/lib/libstrangle/lib32/libstrangle_vk.so"
substituteInPlace $out/share/vulkan/implicit_layer.d/libstrangle_vk.json \
--replace "libstrangle_vk.so" "$out/lib/libstrangle/lib64/libstrangle_vk.so"
'';
meta = with lib; { meta = with lib; {
homepage = "https://gitlab.com/torkel104/libstrangle"; homepage = "https://gitlab.com/torkel104/libstrangle";

43
pkgs/tools/misc/ocs-url/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib, stdenv, fetchgit, libsForQt5 }:
stdenv.mkDerivation rec {
name = "ocs-url";
version = "3.1.0";
srcs = [
(fetchgit {
url = "https://www.opencode.net/dfn2/ocs-url.git";
rev = "release-${version}";
sha256 = "RvbkcSj8iUAHAEOyETwfH+3XnCCY/p8XM8LgVrZxrws=";
})
(fetchgit {
url = "https://github.com/akiraohgaki/qtil";
rev = "v0.4.0";
sha256 = "XRSp0F7ggfkof1RNAnQU3+O9DcXDy81VR7NakITOXrw=";
})
];
sourceRoot = "ocs-url";
buildInputs = with libsForQt5.qt5; [
qtbase
qtsvg
qtquickcontrols
qmake
wrapQtAppsHook
];
# We are NOT in $sourceRoot here
postUnpack = ''
mkdir -p $sourceRoot/lib/qtil
cp -r qtil/* $sourceRoot/lib/qtil/
'';
meta = with lib; {
description = "Open Collaboration System for use with DE store websites";
license = licenses.gpl3Only;
maintainers = with maintainers; [ SohamG ];
platforms = platforms.linux;
};
}

6
pkgs/tools/networking/checkip/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "checkip"; pname = "checkip";
version = "0.38.0"; version = "0.38.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jreisinger"; owner = "jreisinger";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-F+Sc3t1GYpGR+EEP+9GpzfaiWNQVpDivzpS66E7Li3A="; sha256 = "sha256-ZwrwBWhji/moT1dQBCkMP5DI+xEfE6dGtZerFubobjc=";
}; };
vendorSha256 = "sha256-aiqnJ1PjrwSC6YtixNvyTxgbs8z2radcETNhKHGlPk0="; vendorSha256 = "sha256-cahrJvPSemlEpaQ1s4bbi1yp0orTDGOoanqXDVVIpjQ=";
# Requires network # Requires network
doCheck = false; doCheck = false;

13
pkgs/tools/networking/pdnsd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pdnsd"; pname = "pdnsd";
@ -9,7 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v"; sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v";
}; };
patchPhase = '' patches =
# fix build with linux headers >= 5.13
lib.optional stdenv.isLinux
(fetchpatch {
name = "fix-build-linux-headers-gte-5.13.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch?id=7ce35657f269c3b7016e8940ad36e59cf06e12a4";
hash = "sha256-Sh/0ZyiQpDvFZOWE9OCQ9+ocXurjzJvrE4WNWaGwAwk=";
});
postPatch = ''
sed -i 's/.*(cachedir).*/:/' Makefile.in sed -i 's/.*(cachedir).*/:/' Makefile.in
''; '';

6
pkgs/tools/security/cdk-go/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cdk-go"; pname = "cdk-go";
version = "1.0.6"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cdk-team"; owner = "cdk-team";
repo = "CDK"; repo = "CDK";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XzUSiE03ZbP75ewwBJFwZE0aKNlOFprezeD26japLD8="; sha256 = "sha256-0RDCg0UYCj0hlCM3BgOzKfuOulQVI/C9Mz6g5TJ5B1Y=";
}; };
vendorSha256 = "sha256-mP49DmOHvS8ewQG7I1J5OEmAOkHEFJfAsEPeiaRBpWc="; vendorSha256 = "sha256-fEGU8egsEAYStsYiTi1SFyBY3qBrrOiPuZn1eZ+YCVM=";
# At least one test is outdated # At least one test is outdated
doCheck = false; doCheck = false;

6
pkgs/tools/security/cloudlist/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudlist"; pname = "cloudlist";
version = "1.0.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-o5xJwbdYeFF3jWTy/zvswB9dFp/fxtgZB5a+c7cc2OQ="; sha256 = "sha256-CYEQ+hHFKSHuW2U//59g+oHkxRzVOZzipkOB6KueHvA=";
}; };
vendorSha256 = "sha256-rzbf/au2qrdoBowsw7DbeCcBbF42bqJDnuKC1sSFxho="; vendorSha256 = "sha256-pZsRpvSDGpfEVgszB52cZS5Kk+REeLnw3qsyGGVZoa0=";
meta = with lib; { meta = with lib; {
description = "Tool for listing assets from multiple cloud providers"; description = "Tool for listing assets from multiple cloud providers";

4
pkgs/tools/security/dismap/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dismap"; pname = "dismap";
version = "0.3"; version = "0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zhzyker"; owner = "zhzyker";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-WaQdDcBvv4mHdPFAB+spC64YeT3jlfyMYNsTjBILjwA="; sha256 = "sha256-YjjiS6iLIQvrPS378v2nyrgwWBJ9YtDeNTPz0ze05mU=";
}; };
vendorSha256 = "sha256-GnchyE2TswvjYlehhMYesZruTTwyTorfR+17K0RXXFY="; vendorSha256 = "sha256-GnchyE2TswvjYlehhMYesZruTTwyTorfR+17K0RXXFY=";

2
pkgs/top-level/all-packages.nix
View File

@ -1244,6 +1244,8 @@ with pkgs;
nominatim = callPackage ../servers/nominatim { }; nominatim = callPackage ../servers/nominatim { };
ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
pferd = callPackage ../tools/misc/pferd {}; pferd = callPackage ../tools/misc/pferd {};
qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { };