From 6a89aba6e2a1c9a6738acf1b54378176cdab4324 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Fri, 24 May 2024 18:39:29 +0800 Subject: [PATCH] feat(pkgs/cuda-samples): update packaging --- .../cpp20.patch | 0 .../default.nix | 9 ++- .../meson.patch | 0 pkgs/to-normal-packages/default.nix | 2 +- pkgs/to-sources/_sources/generated.json | 65 +------------------ pkgs/to-sources/_sources/generated.nix | 25 +------ pkgs/to-sources/nvfetcher.toml | 5 -- 7 files changed, 9 insertions(+), 97 deletions(-) rename pkgs/to-normal-packages/{cuda-samples => cuda-samples-common}/cpp20.patch (100%) rename pkgs/to-normal-packages/{cuda-samples => cuda-samples-common}/default.nix (74%) rename pkgs/to-normal-packages/{cuda-samples => cuda-samples-common}/meson.patch (100%) diff --git a/pkgs/to-normal-packages/cuda-samples/cpp20.patch b/pkgs/to-normal-packages/cuda-samples-common/cpp20.patch similarity index 100% rename from pkgs/to-normal-packages/cuda-samples/cpp20.patch rename to pkgs/to-normal-packages/cuda-samples-common/cpp20.patch diff --git a/pkgs/to-normal-packages/cuda-samples/default.nix b/pkgs/to-normal-packages/cuda-samples-common/default.nix similarity index 74% rename from pkgs/to-normal-packages/cuda-samples/default.nix rename to pkgs/to-normal-packages/cuda-samples-common/default.nix index 3b2cec4..cddd156 100644 --- a/pkgs/to-normal-packages/cuda-samples/default.nix +++ b/pkgs/to-normal-packages/cuda-samples-common/default.nix @@ -4,12 +4,11 @@ ninja, pkg-config, haskellPackages, - stdenv, - source, + cudaPackages, }: -stdenv.mkDerivation { - inherit (source) pname src; - version = "12.2"; +cudaPackages.backendStdenv.mkDerivation { + pname = "cuda-samples-common"; + inherit (cudaPackages.cuda-samples) version src; patches = [ ./meson.patch ./cpp20.patch diff --git a/pkgs/to-normal-packages/cuda-samples/meson.patch b/pkgs/to-normal-packages/cuda-samples-common/meson.patch similarity index 100% rename from pkgs/to-normal-packages/cuda-samples/meson.patch rename to pkgs/to-normal-packages/cuda-samples-common/meson.patch diff --git a/pkgs/to-normal-packages/default.nix b/pkgs/to-normal-packages/default.nix index de7b36d..18c5765 100644 --- a/pkgs/to-normal-packages/default.nix +++ b/pkgs/to-normal-packages/default.nix @@ -18,7 +18,7 @@ rec { happly = callPackage ./happly { source = sources.happly; }; cnpy = callPackage ./cnpy { source = sources.cnpy; }; amgcl = callPackage ./amgcl { source = sources.amgcl; }; - cuda-samples = callPackage ./cuda-samples { source = sources.cuda-samples; }; + cuda-samples-common = callPackage ./cuda-samples-common { cudaPackages = pkgs.cudaPackages_12_3; }; structopt = callPackage ./structopt { source = sources.structopt; }; utfcpp = callPackage ./utfcpp { source = sources.utfcpp; }; seal_lake = callPackage ./seal_lake { source = sources.seal_lake; }; diff --git a/pkgs/to-sources/_sources/generated.json b/pkgs/to-sources/_sources/generated.json index e8017d8..a9af57b 100644 --- a/pkgs/to-sources/_sources/generated.json +++ b/pkgs/to-sources/_sources/generated.json @@ -30,7 +30,6 @@ "repo": "amgcl", "rev": "1.4.4", "sha256": "sha256-PSIWbOyBtJTVslp3tP5YX81YzTQC5DCfs4WhwwmwFew=", - "sparseCheckout": [], "type": "github" }, "version": "1.4.4" @@ -51,7 +50,6 @@ "repo": "GoAuthing", "rev": "d828582922eeecf43baac7d1da4c4e533aa1dd66", "sha256": "sha256-EyeG2jyi4cQ0k8xChW9azipClJMdwUSuT0OPDBS+u28=", - "sparseCheckout": [], "type": "github" }, "version": "d828582922eeecf43baac7d1da4c4e533aa1dd66" @@ -72,7 +70,6 @@ "repo": "autobean-format", "rev": "7849d89eefb433036736bbb1c3168eb02337d34c", "sha256": "sha256-UvPHcJjgLJzhvh+CGPO8oco0eXc5gTJ1wHXV5pYwnV0=", - "sparseCheckout": [], "type": "github" }, "version": "7849d89eefb433036736bbb1c3168eb02337d34c" @@ -93,7 +90,6 @@ "repo": "autobean-refactor", "rev": "36fedaf8e7104d6da06b28936bcf6dae2b5267bf", "sha256": "sha256-MxCVuk7kuAA0GixII4XbWGPDk54mwKUeK7s0gGVgnF8=", - "sparseCheckout": [], "type": "github" }, "version": "36fedaf8e7104d6da06b28936bcf6dae2b5267bf" @@ -114,7 +110,6 @@ "repo": "autodiff", "rev": "v1.0.3", "sha256": "sha256-hdIbEIZrxA5EA3XY4MIazRv3DazUjpuDJRCgq8+kJQg=", - "sparseCheckout": [], "type": "github" }, "version": "v1.0.3" @@ -135,7 +130,6 @@ "repo": "calendar-visualization", "rev": "099535c19755f7f26cc9dd7651dbb8e201783e9f", "sha256": "sha256-PcOeBPW53BtZSuz0AD+jMmlGlFvZBaZT71AFo83wRJU=", - "sparseCheckout": [], "type": "github" }, "version": "099535c19755f7f26cc9dd7651dbb8e201783e9f" @@ -156,7 +150,6 @@ "repo": "cccl", "rev": "d4ca07a7da2a59e28a1b2a659881c7574146d240", "sha256": "sha256-D79EWf7//QQ0pTZD6OxqktV9dh3PNKm9UADkKmVRGMA=", - "sparseCheckout": [], "type": "github" }, "version": "d4ca07a7da2a59e28a1b2a659881c7574146d240" @@ -177,7 +170,6 @@ "repo": "cmdlime", "rev": "80d9673456b4cb8223ad9cf176ec88d61a388c70", "sha256": "sha256-SHum/OoVEaktqmR7tgNozGSQ8Ct14FHeycuL8mAnZbM=", - "sparseCheckout": [], "type": "github" }, "version": "80d9673456b4cb8223ad9cf176ec88d61a388c70" @@ -198,7 +190,6 @@ "repo": "cnpy", "rev": "4e8810b1a8637695171ed346ce68f6984e585ef4", "sha256": "sha256-NMPDpeNoqvqAhwQk4J+TFw+BtNLI4R+CXpzXQ6hB/LU=", - "sparseCheckout": [], "type": "github" }, "version": "4e8810b1a8637695171ed346ce68f6984e585ef4" @@ -219,7 +210,6 @@ "repo": "coc-zk", "rev": "128028b3be56590d42f531170eb451ae193b5271", "sha256": "sha256-dzrwL07uZIkau33QWeQBBIUs8oLfED0JNAdOKaroJf0=", - "sparseCheckout": [], "type": "github" }, "version": "128028b3be56590d42f531170eb451ae193b5271" @@ -240,7 +230,6 @@ "repo": "org.yuzu_emu.yuzu", "rev": "4abf1d239aba843180abfed58fa8541432fece5b", "sha256": "sha256-rBnsW8ijDEPCXzIkbfQnyhSFhIv91+jIkNPosVHJ2UY=", - "sparseCheckout": [], "type": "github" }, "version": "4abf1d239aba843180abfed58fa8541432fece5b" @@ -260,29 +249,6 @@ }, "version": "0.2.0" }, - "cuda-samples": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "cuda-samples", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "NVIDIA", - "repo": "cuda-samples", - "rev": "03309a2d4275a9186b748e033ee5f90a11492a2f", - "sha256": "sha256-lt6HpU1hmRf6pISpDnlJ38ovWuVOIFGR9DCC8rDYaiQ=", - "sparseCheckout": [ - "Common" - ], - "type": "github" - }, - "version": "03309a2d4275a9186b748e033ee5f90a11492a2f" - }, "cyCodeBase": { "cargoLocks": null, "date": "2023-07-26", @@ -299,7 +265,6 @@ "repo": "cyCodeBase", "rev": "ede026f5c1976faa90709690a4290161ed05c19b", "sha256": "sha256-1wBpadgCNbcrp4kRn4XLjbthtxuzMuOMNC/hbREHbiE=", - "sparseCheckout": [], "type": "github" }, "version": "ede026f5c1976faa90709690a4290161ed05c19b" @@ -320,7 +285,6 @@ "repo": "giraffe-wallpaper", "rev": "6fc686fe7b43cb6be8eaf3a9dc42177eb355eadd", "sha256": "sha256-vbpK1+ipg3KzBaX9g8zZiYU8abvKBMkOZKmP8r89wFg=", - "sparseCheckout": [], "type": "github" }, "version": "6fc686fe7b43cb6be8eaf3a9dc42177eb355eadd" @@ -356,7 +320,6 @@ "repo": "happly", "rev": "8a606309daaa680eee495c8279feb0b704148f4a", "sha256": "sha256-KKQdvRxqSXq3Q0TlcpDr+YGlUV3oP7PaE1V2KoP0rXg=", - "sparseCheckout": [], "type": "github" }, "version": "8a606309daaa680eee495c8279feb0b704148f4a" @@ -377,7 +340,6 @@ "repo": "hougeo", "rev": "7e48d2bda0f94fc96b2d8b2917d5ef306ba83c97", "sha256": "sha256-QbPT7oJH835hfdP+o2ON9gQliuktDu4vmS5zzyG8Wfg=", - "sparseCheckout": [], "type": "github" }, "version": "7e48d2bda0f94fc96b2d8b2917d5ef306ba83c97" @@ -398,7 +360,6 @@ "repo": "iCalendar", "rev": "e2f5f700294ae0d205b6bf2e372f3a99f801d7fc", "sha256": "sha256-e2aZr8Vh/HJnTV8GwIDMzGTZBZdYf72NtapHElHw0gg=", - "sparseCheckout": [], "type": "github" }, "version": "e2f5f700294ae0d205b6bf2e372f3a99f801d7fc" @@ -417,7 +378,6 @@ "name": null, "rev": "245d16328c47a132574e0fa4298d24a0f78b20b0", "sha256": "sha256-3VxpJpogPFBmo966GB90sQvcj/Ah56lGyR/y/WV3QT0=", - "sparseCheckout": [], "type": "git", "url": "https://github.com/AndrewRadev/linediff.vim" }, @@ -439,7 +399,6 @@ "repo": "Lyra", "rev": "a8bb6e22ea4dcd507292ecdb6443bad23ef7bfeb", "sha256": "sha256-8Y2p6A73UvWr0mKVgMW5LchRRp5DtAg/R1vZB6q2zOA=", - "sparseCheckout": [], "type": "github" }, "version": "a8bb6e22ea4dcd507292ecdb6443bad23ef7bfeb" @@ -460,7 +419,6 @@ "repo": "metacubexd", "rev": "v1.138.0", "sha256": "sha256-SFqXmH9buSPak5jjFaf1tSDw9HUmJgIbfjYOXXiQssI=", - "sparseCheckout": [], "type": "github" }, "version": "v1.138.0" @@ -480,10 +438,7 @@ "owner": "notofonts", "repo": "noto-cjk", "rev": "Sans2.004", - "sha256": "sha256-GXULnRPsIJRdiL3LdFtHbqTqSvegY2zodBxFm4P55to=", - "sparseCheckout": [ - "Sans/OTC" - ], + "sha256": "sha256-m/BnqKINE7kG2Ze5+E8UsP9LyM+mUfyN5OAPfbmqe8k=", "type": "github" }, "version": "Sans2.004" @@ -503,10 +458,7 @@ "owner": "notofonts", "repo": "noto-cjk", "rev": "Serif2.002", - "sha256": "sha256-ihbhbv875XEHupFUzIdEweukqEmwQXCXCiTG7qisE64=", - "sparseCheckout": [ - "Serif/OTC" - ], + "sha256": "sha256-+/WEkjJ3xHML/3iNT25AdQz+3pX69gtS3tOsmm1Beac=", "type": "github" }, "version": "Serif2.002" @@ -527,7 +479,6 @@ "repo": "noto-emoji", "rev": "d5f498241b3b77beddce3a53ee802c34b1fa46c4", "sha256": "sha256-NpT4SUUq7JfenAfz+XvV/My2rxTntX99zdwp9RKcySo=", - "sparseCheckout": [], "type": "github" }, "version": "d5f498241b3b77beddce3a53ee802c34b1fa46c4" @@ -548,7 +499,6 @@ "repo": "nvim-numbertoggle", "rev": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6", "sha256": "sha256-1QImFgjpfsLJ6xxb1HZPQdBH/QGPtYs5bQ7v5Mxa/nY=", - "sparseCheckout": [], "type": "github" }, "version": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" @@ -584,7 +534,6 @@ "repo": "osc52", "rev": "477b99c8a1053183ede9978b2fe00dbcdb7c4b91", "sha256": "sha256-A4SIzkKs02csNGaETmU/9P0n8mjx6hjeTUbTjSi8unI=", - "sparseCheckout": [], "type": "github" }, "version": "477b99c8a1053183ede9978b2fe00dbcdb7c4b91" @@ -605,7 +554,6 @@ "repo": "RSSHub", "rev": "db2b5cc326a825072c579c1492b609773dc4687d", "sha256": "sha256-tzUPUDZux8Z9PZ1WlGlv9Rh+Q8LSuiGPIPlZNv7uwhE=", - "sparseCheckout": [], "type": "github" }, "version": "db2b5cc326a825072c579c1492b609773dc4687d" @@ -626,7 +574,6 @@ "repo": "seal_lake", "rev": "ca84d624a8280c5354ea4d90cd29648804c6c489", "sha256": "sha256-h146QkqgOuZkqj8mJwuMVVbE+dclQrT3bo9dp3K0QUU=", - "sparseCheckout": [], "type": "github" }, "version": "ca84d624a8280c5354ea4d90cd29648804c6c489" @@ -647,7 +594,6 @@ "repo": "sfun", "rev": "v5.0.0", "sha256": "sha256-HJo7rlKv0NaF6hC46EK5xlcAlCXeQIQiXRJaQoANqpA=", - "sparseCheckout": [], "type": "github" }, "version": "v5.0.0" @@ -668,7 +614,6 @@ "repo": "spdlog", "rev": "696db97f672e9082e50e50af315d0f4234c82397", "sha256": "sha256-17k5di2NLwrkCBHa6esYV3703e+DQhj0NjOgQ5pnI/Q=", - "sparseCheckout": [], "type": "github" }, "version": "696db97f672e9082e50e50af315d0f4234c82397" @@ -689,7 +634,6 @@ "repo": "structopt", "rev": "v0.1.3", "sha256": "sha256-AyWtJ+EyTN2LEXLM5OSQB3ITzqLLRoirzkWnjwLHOIA=", - "sparseCheckout": [], "type": "github" }, "version": "v0.1.3" @@ -710,7 +654,6 @@ "repo": "taskwarrior-to-dot", "rev": "911ff711c665153b3ed9ba409671e674797eb481", "sha256": "sha256-63JOdhdLcoEyUFx6KEMdcB6clXobBgsJ4NRUPYTD4AA=", - "sparseCheckout": [], "type": "github" }, "version": "911ff711c665153b3ed9ba409671e674797eb481" @@ -731,7 +674,6 @@ "repo": "utfcpp", "rev": "v4.0.5", "sha256": "sha256-oKVFUjCvkHjqifZe98aUe68IBUaAZYWU2S2rxyAA9Cg=", - "sparseCheckout": [], "type": "github" }, "version": "v4.0.5" @@ -752,7 +694,6 @@ "repo": "vdirsyncer", "rev": "46c5622291136be6393654786a6895524e80600f", "sha256": "sha256-IrKMIEZQiccO3//Twh6oG5YS/ybIwNZD3nTaIPfEsDE=", - "sparseCheckout": [], "type": "github" }, "version": "46c5622291136be6393654786a6895524e80600f" @@ -773,7 +714,6 @@ "repo": "xclip", "rev": "b372f73579d30f9ba998ffd0a73694e7abe2c313", "sha256": "sha256-pBGRV2h7JiNZ4Im3NySEq1UGNW65MpvTjpTxy0m8jc4=", - "sparseCheckout": [], "type": "github" }, "version": "b372f73579d30f9ba998ffd0a73694e7abe2c313" @@ -794,7 +734,6 @@ "repo": "yalantinglibs", "rev": "v0.3.0", "sha256": "sha256-Su3mnC7hsw0T0u6HfsnYAwXml2T7CABySv7a18+KnK0=", - "sparseCheckout": [], "type": "github" }, "version": "v0.3.0" diff --git a/pkgs/to-sources/_sources/generated.nix b/pkgs/to-sources/_sources/generated.nix index ba0eb51..a509286 100644 --- a/pkgs/to-sources/_sources/generated.nix +++ b/pkgs/to-sources/_sources/generated.nix @@ -147,20 +147,6 @@ sha256 = "sha256-c0cbrdAeXmnIFvs6Tg0BTwmcKCbuKD31cWzXsZAred0="; }; }; - cuda-samples = { - pname = "cuda-samples"; - version = "03309a2d4275a9186b748e033ee5f90a11492a2f"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "cuda-samples"; - rev = "03309a2d4275a9186b748e033ee5f90a11492a2f"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ "Common" ]; - sha256 = "sha256-lt6HpU1hmRf6pISpDnlJ38ovWuVOIFGR9DCC8rDYaiQ="; - }; - }; cyCodeBase = { pname = "cyCodeBase"; version = "ede026f5c1976faa90709690a4290161ed05c19b"; @@ -238,7 +224,6 @@ fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sparseCheckout = [ ]; sha256 = "sha256-3VxpJpogPFBmo966GB90sQvcj/Ah56lGyR/y/WV3QT0="; }; date = "2023-03-15"; @@ -274,10 +259,7 @@ repo = "noto-cjk"; rev = "Sans2.004"; fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ "Sans/OTC" ]; - sha256 = "sha256-GXULnRPsIJRdiL3LdFtHbqTqSvegY2zodBxFm4P55to="; + sha256 = "sha256-m/BnqKINE7kG2Ze5+E8UsP9LyM+mUfyN5OAPfbmqe8k="; }; }; noto-fonts-cjk-serif-fix-weight = { @@ -288,10 +270,7 @@ repo = "noto-cjk"; rev = "Serif2.002"; fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ "Serif/OTC" ]; - sha256 = "sha256-ihbhbv875XEHupFUzIdEweukqEmwQXCXCiTG7qisE64="; + sha256 = "sha256-+/WEkjJ3xHML/3iNT25AdQz+3pX69gtS3tOsmm1Beac="; }; }; noto-fonts-emoji-monochrome = { diff --git a/pkgs/to-sources/nvfetcher.toml b/pkgs/to-sources/nvfetcher.toml index eb6ea9c..961af28 100644 --- a/pkgs/to-sources/nvfetcher.toml +++ b/pkgs/to-sources/nvfetcher.toml @@ -145,11 +145,6 @@ fetch.git = "https://github.com/AndrewRadev/linediff.vim" src.git = "https://github.com/wrvsrx/iCalendar" fetch.github = "wrvsrx/iCalendar" -[cuda-samples] -src.manual = "03309a2d4275a9186b748e033ee5f90a11492a2f" -git.sparseCheckout = [ "Common" ] -fetch.github = "NVIDIA/cuda-samples" - [noto-fonts-cjk-sans-fix-weight] src.manual = "Sans2.004" fetch.github = "notofonts/noto-cjk"