darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge pull request #476 from DarkKirb/create-pull-request/patch

Browse source 
Run automatic update
This commit is contained in:
Charlotte 🦝 Delenk 2024-07-13 17:38:58 +02:00 committed by GitHub
commit 34c95e5858
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 53 additions and 618 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -408,11 +408,11 @@
]
},
"locked": {
"lastModified": 1720470846,
"narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
"lastModified": 1720734513,
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
"type": "github"
},
"original": {
@ -565,11 +565,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1720515935,
"narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
"lastModified": 1720737798,
"narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
"rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751",
"type": "github"
},
"original": {
@ -650,11 +650,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1720534015,
"narHash": "sha256-i9/HZuAjSpsiZV3V5q4IXyyQloLGL0SoNCj1ibACx54=",
"lastModified": 1720806416,
"narHash": "sha256-JiNPWY0C77QxjGZnirpdu0rKKdOPesLTzHnvwnDypPo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0cafdf3122eae230c9e468c06549d9f2b9842dc",
"rev": "836c11a6f6eac0e621f60633719e1ced1262b123",
"type": "github"
},
"original": {
@ -699,11 +699,11 @@
]
},
"locked": {
"lastModified": 1720491570,
"narHash": "sha256-PHS2BcQ9kxBpu9GKlDg3uAlrX/ahQOoAiVmwGl6BjD4=",
"lastModified": 1720750737,
"narHash": "sha256-hPXe9Pr3s2EKRdDki3UkCKoPGlNkOhplCooNoC/L7Qc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "b970af40fdc4bd80fd764796c5f97c15e2b564eb",
"rev": "a17c5d38c6fe47880eb8c6bede15d943ac2c4d17",
"type": "github"
},
"original": {

13
overlays/default.nix
View file

@ -1,17 +1,5 @@
inputs: system: self: prev: let
inherit (inputs) nixpkgs element-web;
nixpkgsPatched = self.applyPatches {
name = "nixpkgs-patched";
src = inputs.nixpkgs;
patches = [./fix-rocm-python.patch];
};
python311Scope = self.lib.makeScope self.newScope (scope: {
python3 = self.python311;
python3Packages = self.python311Packages;
sphinx = scope.python3Packages.toPythonApplication scope.python3Packages.sphinx;
rocmPackages = self.recurseIntoAttrs (scope.callPackage "${nixpkgsPatched}/pkgs/development/rocm-modules/6" { });
});
common = with nixpkgs.legacyPackages.${system}; {
fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (super: {
patches =
@ -76,7 +64,6 @@ inputs: system: self: prev: let
bsnes-plus = self.libsForQt5.callPackage ../packages/emulator/bsnes-plus {};
sliding-sync = self.callPackage ../packages/matrix/sliding-sync {};
yiffstash = self.python3Packages.callPackage ../packages/python/yiffstash.nix {};
rocmPackages = python311Scope.rocmPackages;
};
perSystem = {
aarch64-linux = {

552
overlays/fix-rocm-python.patch
View file

@ -1,552 +0,0 @@
diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix
index 7d80242ccbda..0619139b2933 100644
--- a/pkgs/development/rocm-modules/6/clr/default.nix
+++ b/pkgs/development/rocm-modules/6/clr/default.nix
@@ -21,7 +21,7 @@
, libGL
, libxml2
, libX11
-, python3Packages
+, python311Packages
}:
let
@@ -65,8 +65,8 @@ in stdenv.mkDerivation (finalAttrs: {
makeWrapper
cmake'
perl
- python3Packages.python
- python3Packages.cppheaderparser
+ python311Packages.python
+ python311Packages.cppheaderparser
];
buildInputs = [
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 4d10ea244044..203883bbd8f7 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -4,7 +4,7 @@
, symlinkJoin
, fetchFromGitHub
, cudaPackages
-, python3Packages
+, python311Packages
, elfutils
, boost179
, opencv
@@ -17,7 +17,10 @@ let
rocmUpdateScript = callPackage ./update.nix { };
in rec {
## ROCm ##
- llvm = recurseIntoAttrs (callPackage ./llvm/default.nix { inherit rocmUpdateScript rocm-device-libs rocm-runtime rocm-thunk clr; });
+ llvm = recurseIntoAttrs (callPackage ./llvm/default.nix {
+ inherit rocmUpdateScript rocm-device-libs rocm-runtime rocm-thunk clr;
+ inherit (python311Packages) callPackage;
+ });
rocm-core = callPackage ./rocm-core {
inherit rocmUpdateScript;
@@ -34,7 +37,7 @@ in rec {
stdenv = llvm.rocmClangStdenv;
};
- rocm-smi = python3Packages.callPackage ./rocm-smi {
+ rocm-smi = python311Packages.callPackage ./rocm-smi {
inherit rocmUpdateScript;
stdenv = llvm.rocmClangStdenv;
};
@@ -77,7 +80,7 @@ in rec {
# stdenv = llvm.rocmClangStdenv;
};
- rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { inherit stdenv; };
+ rocm-docs-core = python311Packages.callPackage ./rocm-docs-core { inherit stdenv; };
hip-common = callPackage ./hip-common {
inherit rocmUpdateScript;
@@ -187,7 +190,7 @@ in rec {
stdenv = llvm.rocmClangStdenv;
};
- tensile = python3Packages.callPackage ./tensile {
+ tensile = python311Packages.callPackage ./tensile {
inherit rocmUpdateScript rocminfo;
stdenv = llvm.rocmClangStdenv;
};
diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix
index caa2ebe42823..9cdc1cad1dbb 100644
--- a/pkgs/development/rocm-modules/6/llvm/base.nix
+++ b/pkgs/development/rocm-modules/6/llvm/base.nix
@@ -17,7 +17,7 @@
, mpfr
, zlib
, ncurses
-, python3Packages
+, python311Packages
, buildDocs ? true
, buildMan ? true
, buildTests ? true
@@ -86,11 +86,11 @@ in stdenv.mkDerivation (finalAttrs: {
cmake
ninja
git
- python3Packages.python
+ python311Packages.python
] ++ lib.optionals (buildDocs || buildMan) [
doxygen
sphinx
- python3Packages.recommonmark
+ python311Packages.recommonmark
] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [
lit
] ++ extraNativeBuildInputs;
diff --git a/pkgs/development/rocm-modules/6/llvm/stage-2/libcxx.nix b/pkgs/development/rocm-modules/6/llvm/stage-2/libcxx.nix
index 473227242765..121ab3033ca7 100644
--- a/pkgs/development/rocm-modules/6/llvm/stage-2/libcxx.nix
+++ b/pkgs/development/rocm-modules/6/llvm/stage-2/libcxx.nix
@@ -6,6 +6,7 @@
callPackage ../base.nix rec {
inherit stdenv rocmUpdateScript;
buildMan = false; # No man pages to build
+ buildTests = false;
targetName = "libcxx";
targetDir = "runtimes";
diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/flang.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/flang.nix
index 421663dcb1b7..d596ddd67c9e 100644
--- a/pkgs/development/rocm-modules/6/llvm/stage-3/flang.nix
+++ b/pkgs/development/rocm-modules/6/llvm/stage-3/flang.nix
@@ -4,7 +4,7 @@
, clang-unwrapped
, mlir
, graphviz
-, python3Packages
+, python311Packages
}:
callPackage ../base.nix rec {
@@ -14,7 +14,7 @@ callPackage ../base.nix rec {
extraNativeBuildInputs = [
graphviz
- python3Packages.sphinx-markdown-tables
+ python311Packages.sphinx-markdown-tables
];
extraBuildInputs = [ mlir ];
diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/lldb.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/lldb.nix
index 9b7d25e06d9d..7a8e1b0b6ee1 100644
--- a/pkgs/development/rocm-modules/6/llvm/stage-3/lldb.nix
+++ b/pkgs/development/rocm-modules/6/llvm/stage-3/lldb.nix
@@ -7,7 +7,7 @@
, lua5_3
, graphviz
, gtest
-, python3Packages
+, python311Packages
}:
callPackage ../base.nix rec {
@@ -15,7 +15,7 @@ callPackage ../base.nix rec {
buildTests = false; # FIXME: Bad pathing for clang executable in tests, using relative path most likely
targetName = "lldb";
targetDir = targetName;
- extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ];
+ extraNativeBuildInputs = [ python311Packages.sphinx-automodapi ];
extraBuildInputs = [
xz
diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/6/migraphx/default.nix
index 4cc2e4bd24b3..0dd6fe155bcc 100644
--- a/pkgs/development/rocm-modules/6/migraphx/default.nix
+++ b/pkgs/development/rocm-modules/6/migraphx/default.nix
@@ -26,7 +26,7 @@
, sphinx
, docutils
, ghostscript
-, python3Packages
+, python311Packages
, buildDocs ? false
, buildTests ? false
, gpuTargets ? clr.gpuTargets
@@ -71,15 +71,15 @@ in stdenv.mkDerivation (finalAttrs: {
rocm-cmake
clr
clang-tools-extra
- python3Packages.python
+ python311Packages.python
] ++ lib.optionals buildDocs [
latex
doxygen
sphinx
docutils
ghostscript
- python3Packages.sphinx-rtd-theme
- python3Packages.breathe
+ python311Packages.sphinx-rtd-theme
+ python311Packages.breathe
];
buildInputs = [
@@ -96,8 +96,8 @@ in stdenv.mkDerivation (finalAttrs: {
oneDNN_2
blaze
cppcheck
- python3Packages.pybind11
- python3Packages.onnx
+ python311Packages.pybind11
+ python311Packages.onnx
];
cmakeFlags = [
diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix
index 0b57cf6592cb..899504be77c8 100644
--- a/pkgs/development/rocm-modules/6/miopen/default.nix
+++ b/pkgs/development/rocm-modules/6/miopen/default.nix
@@ -28,7 +28,7 @@
, gtest
, rocm-comgr
, roctracer
-, python3Packages
+, python311Packages
, buildDocs ? false # Needs internet because of rocm-docs-core
, buildTests ? false
}:
@@ -156,9 +156,9 @@ in stdenv.mkDerivation (finalAttrs: {
doxygen
sphinx
rocm-docs-core
- python3Packages.sphinx-rtd-theme
- python3Packages.breathe
- python3Packages.myst-parser
+ python311Packages.sphinx-rtd-theme
+ python311Packages.breathe
+ python311Packages.myst-parser
] ++ lib.optionals buildTests [
gtest
zlib
diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix
index 8459dff1c892..94af55aed3ba 100644
--- a/pkgs/development/rocm-modules/6/mivisionx/default.nix
+++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix
@@ -23,7 +23,7 @@
, lmdb
, rapidjson
, rocm-docs-core
-, python3Packages
+, python311Packages
, useOpenCL ? false
, useCPU ? false
, buildDocs ? false # Needs internet
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
] ++ lib.optionals buildDocs [
rocm-docs-core
- python3Packages.python
+ python311Packages.python
];
buildInputs = [
@@ -75,9 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
libjpeg_turbo
lmdb
rapidjson
- python3Packages.pybind11
- python3Packages.numpy
- python3Packages.torchWithRocm
+ python311Packages.pybind11
+ python311Packages.numpy
+ python311Packages.torchWithRocm
];
cmakeFlags = [
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
postBuild = lib.optionalString buildDocs ''
- python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html
+ python311 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html
'';
postInstall = lib.optionalString (!useOpenCL && !useCPU) ''
diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index f93cceddd68a..d693e9e658a2 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -7,7 +7,7 @@
, cmake
, rocm-cmake
, clr
-, python3
+, python311
, tensile
, msgpack
, libxml2
@@ -15,7 +15,7 @@
, gfortran
, openmp
, amd-blis
-, python3Packages
+, python311Packages
, buildTensile ? true
, buildTests ? false
, buildBenchmarks ? false
@@ -68,12 +68,12 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
- python3
+ python311
] ++ lib.optionals buildTensile [
msgpack
libxml2
- python3Packages.msgpack
- python3Packages.joblib
+ python311Packages.msgpack
+ python311Packages.joblib
] ++ lib.optionals buildTests [
gtest
] ++ lib.optionals (buildTests || buildBenchmarks) [
@@ -81,13 +81,13 @@ stdenv.mkDerivation (finalAttrs: {
openmp
amd-blis
] ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [
- python3Packages.pyyaml
+ python311Packages.pyyaml
];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_C_COMPILER" "hipcc")
(lib.cmakeFeature "CMAKE_CXX_COMPILER" "hipcc")
- (lib.cmakeFeature "python" "python3")
+ (lib.cmakeFeature "python" "${python311}/bin/python3")
(lib.cmakeFeature "AMDGPU_TARGETS" (lib.concatStringsSep ";" gpuTargets))
(lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile)
(lib.cmakeBool "ROCM_SYMLINK_LIBS" false)
diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/6/rocfft/default.nix
index 9fd1f02398b3..d27b23723cc5 100644
--- a/pkgs/development/rocm-modules/6/rocfft/default.nix
+++ b/pkgs/development/rocm-modules/6/rocfft/default.nix
@@ -5,7 +5,7 @@
, rocmUpdateScript
, cmake
, clr
-, python3
+, python311
, rocm-cmake
, sqlite
, boost
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
clr
- python3
+ python311
rocm-cmake
];
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
finalAttrs.finalPackage
openmp
- (python3.withPackages (ps: with ps; [
+ (python311.withPackages (ps: with ps; [
pandas
scipy
]))
diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/6/rocgdb/default.nix
index 2112c6cf0210..4f98b7889556 100644
--- a/pkgs/development/rocm-modules/6/rocgdb/default.nix
+++ b/pkgs/development/rocm-modules/6/rocgdb/default.nix
@@ -13,7 +13,7 @@
, ncurses
, expat
, rocdbgapi
-, python3
+, python311
, babeltrace
, sourceHighlight
}:
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
ncurses
expat
rocdbgapi
- python3
+ python311
babeltrace
sourceHighlight
];
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-iconv-path=${glibc.bin}"
"--enable-tui"
"--with-babeltrace"
- "--with-python=python3"
+ "--with-python=python311"
"--with-system-zlib"
"--enable-64-bit-bfd"
"--with-gmp=${gmp.dev}"
diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix
index cb1df3f1fd43..8a1523c966a8 100644
--- a/pkgs/development/rocm-modules/6/rocminfo/default.nix
+++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix
@@ -6,7 +6,7 @@
, rocm-cmake
, rocm-runtime
, busybox
-, python3
+, python311
, gnugrep
# rocminfo requires that the calling user have a password and be in
# the video group. If we let rocm_agent_enumerator rely upon
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [ rocm-runtime ];
- propagatedBuildInputs = [ python3 ];
+ propagatedBuildInputs = [ python311 ];
cmakeFlags = [ "-DROCRTST_BLD_TYPE=Release" ];
prePatch = ''
diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix
index d8747009a10e..362bf644a3a6 100644
--- a/pkgs/development/rocm-modules/6/rocmlir/default.nix
+++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix
@@ -13,7 +13,7 @@
, zstd
, zlib
, ncurses
-, python3Packages
+, python311Packages
, buildRockCompiler ? false
, buildTests ? false # `argument of type 'NoneType' is not iterable`
}:
@@ -53,8 +53,8 @@ in stdenv.mkDerivation (finalAttrs: {
rocm-cmake
ninja
clr
- python3Packages.python
- python3Packages.tomli
+ python311Packages.python
+ python311Packages.tomli
];
buildInputs = [
diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix
index ca6291992d85..1efa3c950d45 100644
--- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix
+++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix
@@ -21,7 +21,7 @@
, mpi
, systemd
, gtest
-, python3Packages
+, python311Packages
, gpuTargets ? clr.gpuTargets
}:
@@ -73,11 +73,11 @@ in stdenv.mkDerivation (finalAttrs: {
cmake
clang
clr
- python3Packages.lxml
- python3Packages.cppheaderparser
- python3Packages.pyyaml
- python3Packages.barectf
- python3Packages.pandas
+ python311Packages.lxml
+ python311Packages.cppheaderparser
+ python311Packages.pyyaml
+ python311Packages.barectf
+ python311Packages.pandas
];
buildInputs = [
diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/6/rocsparse/default.nix
index 2a1043b33c05..775e841bd5b3 100644
--- a/pkgs/development/rocm-modules/6/rocsparse/default.nix
+++ b/pkgs/development/rocm-modules/6/rocsparse/default.nix
@@ -11,7 +11,7 @@
, git
, gtest
, boost
-, python3Packages
+, python311Packages
, buildTests ? false
, buildBenchmarks ? false # Seems to depend on tests
, gpuTargets ? [ ]
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals (buildTests || buildBenchmarks) [
gtest
boost
- python3Packages.python
- python3Packages.pyyaml
+ python311Packages.python
+ python311Packages.pyyaml
];
cmakeFlags = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals (buildTests || buildBenchmarks) [
"-DBUILD_CLIENTS_TESTS=ON"
"-DCMAKE_MATRICES_DIR=/build/source/matrices"
- "-Dpython=python3"
+ "-Dpython=python311"
] ++ lib.optionals buildBenchmarks [
"-DBUILD_CLIENTS_BENCHMARKS=ON"
];
diff --git a/pkgs/development/rocm-modules/6/roctracer/default.nix b/pkgs/development/rocm-modules/6/roctracer/default.nix
index 2523a9ab5330..d50b72c762b5 100644
--- a/pkgs/development/rocm-modules/6/roctracer/default.nix
+++ b/pkgs/development/rocm-modules/6/roctracer/default.nix
@@ -11,7 +11,7 @@
, gcc-unwrapped
, libbacktrace
, rocm-runtime
-, python3Packages
+, python311Packages
, buildDocs ? false # Nothing seems to be generated, so not making the output
, buildTests ? false
}:
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxml2
libbacktrace
- python3Packages.python
- python3Packages.cppheaderparser
+ python311Packages.python
+ python311Packages.cppheaderparser
];
cmakeFlags = [
diff --git a/pkgs/development/rocm-modules/6/rpp/default.nix b/pkgs/development/rocm-modules/6/rpp/default.nix
index 239c99017d02..abd3dbad0106 100644
--- a/pkgs/development/rocm-modules/6/rpp/default.nix
+++ b/pkgs/development/rocm-modules/6/rpp/default.nix
@@ -9,7 +9,7 @@
, clr
, openmp
, boost
-, python3Packages
+, python311Packages
, buildDocs ? false # Needs internet
, useOpenCL ? false
, useCPU ? false
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
clr
] ++ lib.optionals buildDocs [
rocm-docs-core
- python3Packages.python
+ python311Packages.python
];
buildInputs = [
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
postBuild = lib.optionalString buildDocs ''
- python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html
+ python311 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html
'';
passthru.updateScript = rocmUpdateScript {

10
packages/fonts/nasin-nanpa/source.json
View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/ETBCOR/nasin-nanpa",
"rev": "4af0db16f455bd7fc4d8f58021ddece2533326cb",
"date": "2024-06-11T04:07:18-06:00",
"path": "/nix/store/dcv4ikv7bmv4iakdfxvlpx7nb6zc9kdw-nasin-nanpa",
"sha256": "0ppjaq37mrx0iwhz2p6ggnlnsagd51d2k7jfba6jcsw4y0mc53lz",
"hash": "sha256-n47CKvCEayaNWk6eKVoo7SltqX3PXPEhj6DnegZW8l4=",
"rev": "2328f105873bee2bdc7b1ce6a8ed17fe15ea2dc8",
"date": "2024-07-11T19:47:39-06:00",
"path": "/nix/store/0ar05r52maw304h7iycc5xngk8789297-nasin-nanpa",
"sha256": "0ldqx374nd6mj7pzpm3yl38al44ih9j87906p5p3b2a21mhj44il",
"hash": "sha256-NBIiYQ1CiTVuuQakg2SCkRCq0KB+1PvvkdU0S87ouFE=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

10
packages/matrix/matrix-media-repo/source.json
View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/turt2live/matrix-media-repo",
"rev": "33caaac42d1f7b1a6afac5f2dd3c39f1054f25ad",
"date": "2024-07-05T13:42:42-06:00",
"path": "/nix/store/vf2w9zzx9qcri4q4wa3g2xbs9mizk4b0-matrix-media-repo",
"sha256": "0gd0dqbqrncxgbq35g6d5vxqw86dbzbcm1b9nqbfjvhsp5b2l515",
"hash": "sha256-JRQqVrkabukWtmmFytZfzSCO+y7NvDLwep3ZjBduoD0=",
"rev": "8ad2c21c491d6815a9938db6327bdfc15495684d",
"date": "2024-07-10T10:57:57-06:00",
"path": "/nix/store/pc1xwkrsrhkszqqiyv29dqdfmwk8n8k7-matrix-media-repo",
"sha256": "06l8g01q81p2l9dcnjfw8j1lhf2hwwjydmlbslvxd6w7cblkxg32",
"hash": "sha256-Yrw+6WKHm9Y31YvW5iXnUDhIg0TcSctaouIGhAN4iBo=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
packages/matrix/mautrix-discord/gomod2nix.toml
View file

@ -63,8 +63,8 @@ schema = 3
version = "v1.6.0"
hash = "sha256-0PeGjGxxM7lUSx2dn8yPUBpilPQzEN9nkgf3s+5zGTY="
[mod."go.mau.fi/util"]
version = "v0.2.1"
hash = "sha256-ueWv/RjYieBavfIFJsDR6KoGn/6K5RI7X2m9YU8U14E="
version = "v0.2.2-0.20231228160422-22fdd4bbddeb"
hash = "sha256-k1wrTDyJ9rCsLvQ+Pbg1BbOANRGzrQyRvIT++9BZ8PM="
[mod."go.mau.fi/zeroconfig"]
version = "v0.1.2"
hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
@ -96,5 +96,5 @@ schema = 3
version = "v2.4.1"
hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
[mod."maunium.net/go/mautrix"]
version = "v0.16.3-0.20240218195727-4ceb1123b660"
hash = "sha256-IMwwA03kHfNAMFDOzhS/NPo10N/2xht4/qPH+nnoOxs="
version = "v0.16.3-0.20240712164054-e6046fbf432c"
hash = "sha256-QeUoCxfJnHNNYXmL02/uEKWFT8A+nVLzA4NUkCcuV0c="

10
packages/matrix/mautrix-discord/source.json
View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/mautrix/discord",
"rev": "a126a36249df7fda1d89f345a34607e9e54a077a",
"date": "2024-06-24T21:43:11+03:00",
"path": "/nix/store/j87a5wv86qh8lij8i1gyvzml7b4nm7dv-discord",
"sha256": "0m8xi74x340yrp7bhxj3b3drblsj4qswfb98klmxzykjvdhik530",
"hash": "sha256-YJQZYdty+t8rnSgtxzUmUtOV21hDdrjOzR6Q0cmJHVU=",
"rev": "035f2a408b4a6cf73acbf168dff5d16198930ee2",
"date": "2024-07-12T20:09:07+03:00",
"path": "/nix/store/xcbcxkmmh0rhdqd84vw6v4hsf3i5fhsy-discord",
"sha256": "05v68hq79gr6xlmm4spmxf796xwxjz8k8rfpccfwwjzw2br16arh",
"hash": "sha256-MCsT8hL8S84dY9dlNNGXnXeTjuv1alIr7Sa/dDBEZhc=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

10
packages/matrix/mautrix-telegram/source.json
View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/mautrix/telegram",
"rev": "f6cb26f7f53089488e085b45add5303fa283dc3e",
"date": "2024-05-24T10:19:43+02:00",
"path": "/nix/store/hr2g0phiy0qxaind09vjc04x2ag3qj0z-telegram",
"sha256": "1cp5nhs04zknl36s2xb0b2v39ivfjzp9k24yvmasjdk3jbdb0ha0",
"hash": "sha256-QEGw2pJjNqlV3Z6Ime6Xbsc0tlhgdaHNoHZ+AjS05bI=",
"rev": "efcf1535ffe0a2a2dacf24ff0b3e707967a8bae4",
"date": "2024-07-12T20:25:57+03:00",
"path": "/nix/store/h6vcqcw0ll8qwjaqlp8s8zvm2j8fgww9-telegram",
"sha256": "0f7gc8ww4r7clncps148n0xz5l7rqg2dxj0wzjzdi3z9j4s1a60s",
"hash": "sha256-GhgVNJHpj9i+/BzI3sTD+dDyO7CIBH2Zpexkwjli7zg=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

16
packages/matrix/mautrix-whatsapp/gomod2nix.toml
View file

@ -77,14 +77,14 @@ schema = 3
version = "v0.1.1-0.20240705162345-47e713a595ab"
hash = "sha256-Dv9uBYPpSMOPacao1VqJ1DFhpvsU+HDiIAKL0BY8BEc="
[mod."go.mau.fi/util"]
version = "v0.5.1-0.20240702170310-bd1da3c069eb"
hash = "sha256-04fZMIfda0VmnHJKhdicCfCvwO1WpV6EundKsH9u6MI="
version = "v0.5.1-0.20240710154926-931b33d6d530"
hash = "sha256-rGs8nrTQuyHtlwyDN5en/jrbC7dAww2q1lOLLgn/ruQ="
[mod."go.mau.fi/webp"]
version = "v0.1.0"
hash = "sha256-KIP/Onw0t/o10oBuvmRQDff7GF8G5lsMaDXpe0fjvNg="
[mod."go.mau.fi/whatsmeow"]
version = "v0.0.0-20240706081318-bd4d4e8f74f6"
hash = "sha256-QDM9c6BNvmk4vRZVQQSV96t69W0o6rmXhFaqEn2j630="
version = "v0.0.0-20240710112833-d732338c041f"
hash = "sha256-2+WrcaKNis4/Vi2vo6hxlJ7tO/02jXTbgjLKmw9ICiA="
[mod."go.mau.fi/zeroconfig"]
version = "v0.1.2"
hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
@ -92,8 +92,8 @@ schema = 3
version = "v0.25.0"
hash = "sha256-traLAylqoBwGIh0Z1fuEhNjbGgQBItgVjtZYdYr0zzQ="
[mod."golang.org/x/exp"]
version = "v0.0.0-20240613232115-7f521ea00fb8"
hash = "sha256-QRK52QHPPhj+JIcQbd4/hI5ceEbKu3e9mR57XxocwOE="
version = "v0.0.0-20240707233637-46b078467d37"
hash = "sha256-jTwnJtpErpBIGT38VAJI8+UAnGfa8V3M1y1yN4dHTvE="
[mod."golang.org/x/image"]
version = "v0.18.0"
hash = "sha256-g9N/y4asXG1lctPJ1KEf8XIjeJi/mQ43EXUa8HTj/zQ="
@ -122,5 +122,5 @@ schema = 3
version = "v1.0.0"
hash = "sha256-fYc/WwqE0ev0dvnu5qGmHJsYiSTuWeOTiAVzmQIKWyY="
[mod."maunium.net/go/mautrix"]
version = "v0.19.0-beta.1.0.20240706071202-017ca6222317"
hash = "sha256-shbH1x0pCpM2n9VvSU7JaPetR5EMH9IWU+xC2dx31/0="
version = "v0.19.0-beta.1.0.20240712164309-85e0664cb441"
hash = "sha256-GGG+QJL+bJVcoXf+P3Nkt4zkqozI0q28B3h32CegyL0="

10
packages/matrix/mautrix-whatsapp/source.json
View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/mautrix/whatsapp",
"rev": "46c8af02b4d8591ff2806e6b90ea85990f2b1690",
"date": "2024-07-06T11:19:51+03:00",
"path": "/nix/store/sz34jxjxzy38s7qb1zbnqxwhfar8xx7f-whatsapp",
"sha256": "145l27gfxrhy68a35d3iin4mzl0vqcwyk3nggcs5l4lyv7z5pcqz",
"hash": "sha256-H7Nb/tmeElo0e8+O6TnDG9BfiY1xtDIUMh7m7t4RtJA=",
"rev": "f4091c1d2e8cbb0caff7ab8abe4818636c0b50c0",
"date": "2024-07-12T19:53:52+03:00",
"path": "/nix/store/2ihcqzy49i6a3180058dbaqqgn3rw5y4-whatsapp",
"sha256": "061gmrcdd94dvcirm2d1yji6hp3rl02vwn7g8zphzz53zbkl6b5p",
"hash": "sha256-tyxD5/qj/A/vR+9YvgWgeVxoovShiZoj242k1liuLxg=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

4
packages/python/mautrix.nix
View file

@ -12,11 +12,11 @@
}:
buildPythonPackage rec {
pname = "mautrix";
version = "0.20.4";
version = "0.20.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vWfxpGex9Mg/6EbkiNjsDfmE1CWckVSOTRJQfyuhhpI=";
sha256 = "sha256-jjOISBrwOOs0El7m3v4Zxo1dHj95jYnd4b1cfzq0NyM=";
};
propagatedBuildInputs = [

4
packages/python/tulir-telethon.nix
View file

@ -9,11 +9,11 @@
}:
buildPythonPackage rec {
pname = "tulir-telethon";
version = "1.35.0a1";
version = "1.37.0a1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-v8cLENsskYSNE9cwLT1qQaYwEHhT303odNoDQ7c4SR0=";
sha256 = "sha256-FckMHqGaBsqvFbrEnDWqJAQG8j/euY2NooesnxV6Kcc=";
};
patchPhase = ''