Update to 24.11

This commit is contained in:
Mateusz Słodkowicz 2025-04-09 19:30:03 +02:00
parent c381bde8ea
commit e8327d776b
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
5 changed files with 1165 additions and 1094 deletions

View File

@ -35,7 +35,7 @@ jobs:
nixPath: nixPath:
- nixpkgs=channel:nixos-unstable - nixpkgs=channel:nixos-unstable
- nixpkgs=channel:nixpkgs-unstable - nixpkgs=channel:nixpkgs-unstable
- nixpkgs=channel:nixos-24.05 - nixpkgs=channel:nixos-24.11
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository

View File

@ -1,5 +1,26 @@
{ {
"nodes": { "nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -7,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729459288, "lastModified": 1744208565,
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +44,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1744098102,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,12 +58,33 @@
"type": "github" "type": "github"
} }
}, },
"nur": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1729516261, "lastModified": 1741173522,
"narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=", "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
"path": "/nix/store/yygrm3h9q9wslsdamcpahpzqzaag8rix-source", "owner": "nixos",
"rev": "282dfd5c7da86c7315c231b95e95d71b36f22347", "repo": "nixpkgs",
"rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1741294988,
"narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=",
"path": "/nix/store/hfzv9pkm0c6hzvkav8ii476s4cx9nph3-source",
"rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -56,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",

View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, ninja , ninja
, jdk21 , jdk
, ghc_filesystem , ghc_filesystem
, zlib , zlib
, file , file
@ -21,7 +21,7 @@
, quazip , quazip
, libGL , libGL
, flite , flite
, addOpenGLRunpath , addDriverRunpath
, vulkan-loader , vulkan-loader
, msaClientID ? null , msaClientID ? null
, extra-cmake-modules , extra-cmake-modules
@ -56,7 +56,7 @@ let
stdenv.cc.cc.lib stdenv.cc.cc.lib
]); ]);
gameLibraryPath = libpath + ":${addOpenGLRunpath.driverLink}/lib"; gameLibraryPath = libpath + ":${addDriverRunpath.driverLink}/lib";
in in
@ -76,7 +76,7 @@ let
cmake cmake
extra-cmake-modules extra-cmake-modules
ninja ninja
jdk21 jdk
wrapQtAppsHook wrapQtAppsHook
file file
ghc_filesystem ghc_filesystem

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
#!/bin/env python #!/usr/bin/env python
from urllib.request import urlopen from urllib.request import urlopen
import subprocess import subprocess
import codecs import codecs
@ -6,11 +6,6 @@ import sys
amd_repo = "https://repo.radeon.com/amdgpu/" amd_repo = "https://repo.radeon.com/amdgpu/"
def readPackages(packageString, packages,version): def readPackages(packageString, packages,version):
for line in packageString.splitlines(): for line in packageString.splitlines():
x = line.split(":",1) x = line.split(":",1)
@ -22,7 +17,7 @@ def readPackages(packageString, packages,version):
elif x[0] == "SHA256": elif x[0] == "SHA256":
packages[len(packages) - 1]["sha256"] = x[1].strip() packages[len(packages) - 1]["sha256"] = x[1].strip()
def generateFetchurl(version = "6.2.3", ubuntu_code = "jammy"): def generateFetchurl(version = "6.3.4", ubuntu_code = "jammy"):
packages = [] packages = []
packages32 = [] packages32 = []
@ -41,8 +36,6 @@ def generateFetchurl(version = "6.2.3", ubuntu_code = "jammy"):
_all = "[" _all = "["
final = "{ fetchurl }:\n{\nversion=\""+version+"\";\nbit64 = rec { " final = "{ fetchurl }:\n{\nversion=\""+version+"\";\nbit64 = rec { "
for p in packages: for p in packages:
#x = subprocess.run(["nix-prefetch-url" ,"--type" , "sha256", p["url"]],capture_output=True)
#sha_hash = codecs.decode(x.stdout, "UTF-8").strip()
_all += " " + p["name"].replace(".","_") + " " _all += " " + p["name"].replace(".","_") + " "
final += """\n{name} = ( fetchurl {{ final += """\n{name} = ( fetchurl {{
url = "{url}"; url = "{url}";
@ -54,8 +47,6 @@ def generateFetchurl(version = "6.2.3", ubuntu_code = "jammy"):
final+= "\nall = "+ _all+"\n};\nbit32 = rec { " final+= "\nall = "+ _all+"\n};\nbit32 = rec { "
_all = "[" _all = "["
for p in packages32: for p in packages32:
#x = subprocess.run(["nix-prefetch-url" ,"--type" , "sha256", p["url"]],capture_output=True)
#sha_hash = codecs.decode(x.stdout, "UTF-8").strip()
_all += " " + p["name"].replace(".","_") + " " _all += " " + p["name"].replace(".","_") + " "
final += """\n{name} = ( fetchurl {{ final += """\n{name} = ( fetchurl {{
url = "{url}"; url = "{url}";
@ -78,5 +69,3 @@ elif len(sys.argv) == 2:
generateFetchurl(sys.argv[1],sys.argv[2]) generateFetchurl(sys.argv[1],sys.argv[2])
else: else:
print("Too much args: arg1 = version, arg2 = ubuntu codename") print("Too much args: arg1 = version, arg2 = ubuntu codename")