materus/Nixerus
1
0
Fork 0
mirror of https://github.com/materusPL/Nixerus.git synced 2025-09-03 18:35:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:7071878ada9d4ec712f8b99a841d6ee641ac97cd
Branches Tags
materus:master
materus:dependabot/github_actions/actions/checkout-5
materus:testing
materus:mock
..
compare: materus:4519d5dc831eb1acf63e891d9474ce01ed617136
Branches Tags
materus:master
materus:dependabot/github_actions/actions/checkout-5
materus:testing
materus:mock

No commits in common. "7071878ada9d4ec712f8b99a841d6ee641ac97cd" and "4519d5dc831eb1acf63e891d9474ce01ed617136" have entirely different histories.
7071878ada ... 4519d5dc83

3 changed files with 43 additions and 22 deletions
Show Stats Expand all files Collapse all files

53
flake.lock generated
View File

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756022458, "lastModified": 1747565775,
"narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +44,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1747542820,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1741173522,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,15 +77,15 @@
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1756145408, "lastModified": 1741294988,
"narHash": "sha256-ltkbs5Watrq+V2l9hWefSdM7cfvxLkabtMJeZn0MiCo=", "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=",
"owner": "nix-community", "path": "/nix/store/hfzv9pkm0c6hzvkav8ii476s4cx9nph3-source",
"repo": "NUR", "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e",
"rev": "c9c985b60eb46d97370f7d3fefdc300b953c044d", "type": "path"
"type": "github"
}, },
"original": { "original": {
"id": "nur", "id": "nur",
@ -98,6 +98,27 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur" "nur": "nur"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

2
pkgs/default.nix
View File

@ -7,7 +7,7 @@ rec {
prefixes = callPackage ./libs/amdgpu-pro-libs/prefixes.nix { }; prefixes = callPackage ./libs/amdgpu-pro-libs/prefixes.nix { };
firmware = callPackage ./libs/amdgpu-pro-libs/firmware.nix { }; firmware = callPackage ./libs/amdgpu-pro-libs/firmware.nix { };
}; };
svt-av1-psyex = callPackage ./libs/svt-av1-psyex.nix { }; svt-av1-psy = callPackage ./libs/svt-av1-psy.nix { };
ffmpeg_7-amf-full = (pkgs.ffmpeg_7-full.overrideAttrs (finalAttrs: previousAttrs: { configureFlags = previousAttrs.configureFlags ++ [ "--enable-amf" ]; buildInputs = previousAttrs.buildInputs ++ [ pkgs.amf-headers ]; })); ffmpeg_7-amf-full = (pkgs.ffmpeg_7-full.overrideAttrs (finalAttrs: previousAttrs: { configureFlags = previousAttrs.configureFlags ++ [ "--enable-amf" ]; buildInputs = previousAttrs.buildInputs ++ [ pkgs.amf-headers ]; }));

10
pkgs/libs/svt-av1-psyex.nix → pkgs/libs/svt-av1-psy.nix
View File

@ -11,14 +11,14 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "svt-av1-psyex"; pname = "svt-av1-psy";
version = "3.0.2-A"; version = "3.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BlueSwordM"; owner = "gianni-rosato";
repo = "svt-av1-psyex"; repo = "svt-av1-psy";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-oZMBuC8NZw8QaKCPk5q+S9S2yaMn9UVlvWMsqadtM/4="; hash = "sha256-le/t03vM4WyBswDOLiI3yUnsvpY0jVXeupkkCt8UrXE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [