From 23265cfec9e65a4e0e5b49cdb561f343f52b6c55 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 26 Jun 2024 01:26:35 +0200 Subject: [PATCH 1/2] Mess up formatting --- flake.nix | 2 +- pkgs/development/cuda-modules/aliases.nix | 2 +- pkgs/development/cuda-modules/{flags.nix => florps.nix} | 2 +- test.nix | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/cuda-modules/{flags.nix => florps.nix} (99%) create mode 100644 test.nix diff --git a/flake.nix b/flake.nix index b22cf56a9b5f7..f125e28a16e97 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ { description = "A collection of packages for the Nix package manager"; - outputs = { self }: + outputs = { self }: let libVersionInfoOverlay = import ./lib/flake-version-info.nix self; lib = (import ./lib).extend libVersionInfoOverlay; diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 7f28f2c76d471..2b2f63faf004f 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -1,7 +1,7 @@ # Packges which have been deprecated or removed from cudaPackages final: prev: let - mkRenamed = + mkRenamed = oldName: newName: newPkg: final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg; in diff --git a/pkgs/development/cuda-modules/flags.nix b/pkgs/development/cuda-modules/florps.nix similarity index 99% rename from pkgs/development/cuda-modules/flags.nix rename to pkgs/development/cuda-modules/florps.nix index 93952a66216b4..bc25e712feecf 100644 --- a/pkgs/development/cuda-modules/flags.nix +++ b/pkgs/development/cuda-modules/florps.nix @@ -7,7 +7,7 @@ cudaForwardCompat ? (config.cudaForwardCompat or true), lib, cudaVersion, - stdenv, + stdenv , # gpus :: List Gpu gpus, }: diff --git a/test.nix b/test.nix new file mode 100644 index 0000000000000..773869476f54b --- /dev/null +++ b/test.nix @@ -0,0 +1 @@ +1 + 1 From 2aa55ae9f4925b32b91dd5f68497bc67d5bd50f2 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 17 Jul 2024 07:23:16 +0200 Subject: [PATCH 2/2] Revert "Mess up formatting" This reverts commit 23265cfec9e65a4e0e5b49cdb561f343f52b6c55. --- flake.nix | 2 +- pkgs/development/cuda-modules/aliases.nix | 2 +- pkgs/development/cuda-modules/{florps.nix => flags.nix} | 2 +- test.nix | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/development/cuda-modules/{florps.nix => flags.nix} (99%) delete mode 100644 test.nix diff --git a/flake.nix b/flake.nix index f125e28a16e97..b22cf56a9b5f7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ { description = "A collection of packages for the Nix package manager"; - outputs = { self }: + outputs = { self }: let libVersionInfoOverlay = import ./lib/flake-version-info.nix self; lib = (import ./lib).extend libVersionInfoOverlay; diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 2b2f63faf004f..7f28f2c76d471 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -1,7 +1,7 @@ # Packges which have been deprecated or removed from cudaPackages final: prev: let - mkRenamed = + mkRenamed = oldName: newName: newPkg: final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg; in diff --git a/pkgs/development/cuda-modules/florps.nix b/pkgs/development/cuda-modules/flags.nix similarity index 99% rename from pkgs/development/cuda-modules/florps.nix rename to pkgs/development/cuda-modules/flags.nix index bc25e712feecf..93952a66216b4 100644 --- a/pkgs/development/cuda-modules/florps.nix +++ b/pkgs/development/cuda-modules/flags.nix @@ -7,7 +7,7 @@ cudaForwardCompat ? (config.cudaForwardCompat or true), lib, cudaVersion, - stdenv , + stdenv, # gpus :: List Gpu gpus, }: diff --git a/test.nix b/test.nix deleted file mode 100644 index 773869476f54b..0000000000000 --- a/test.nix +++ /dev/null @@ -1 +0,0 @@ -1 + 1