From b48bbe83febd6a457fef9b43f270e3bd0191f21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 02:09:38 +0200 Subject: Rename php forward-ports to ports --- flakes/private/php/flake.lock | 62 ----------------------------------------- flakes/private/php/flake.nix | 40 -------------------------- flakes/private/ports/flake.lock | 62 +++++++++++++++++++++++++++++++++++++++++ flakes/private/ports/flake.nix | 39 ++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 102 deletions(-) delete mode 100644 flakes/private/php/flake.lock delete mode 100644 flakes/private/php/flake.nix create mode 100644 flakes/private/ports/flake.lock create mode 100644 flakes/private/ports/flake.nix (limited to 'flakes/private') diff --git a/flakes/private/php/flake.lock b/flakes/private/php/flake.lock deleted file mode 100644 index c9af933..0000000 --- a/flakes/private/php/flake.lock +++ /dev/null @@ -1,62 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "flake": false, - "locked": { - "lastModified": 1596265691, - "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", - "type": "github" - } - }, - "nixpkgs-4": { - "flake": false, - "locked": { - "lastModified": 1646497237, - "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-4": "nixpkgs-4" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flakes/private/php/flake.nix b/flakes/private/php/flake.nix deleted file mode 100644 index a730b68..0000000 --- a/flakes/private/php/flake.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - description = "Php old versions"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs = { - url = "github:NixOS/nixpkgs/840c782d507d60aaa49aa9e3f6d0b0e780912742"; - flake = false; - }; - inputs.nixpkgs-4 = { - url = "github:NixOS/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026"; - flake = false; - }; - outputs = { self, nixpkgs, nixpkgs-4, flake-utils }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: - let - pkgs = import nixpkgs { inherit system; overlays = []; }; - in rec { - packages = { - php72 = pkgs.php72; - php73 = pkgs.php73; - php74 = (import nixpkgs-4 { inherit system; overlays = []; }).php74; - cryptpad = (import nixpkgs-4 { inherit system; overlays = []; }).cryptpad; - python37 = (import nixpkgs-4 { inherit system; overlays = []; }).python37; - python37Packages = (import nixpkgs-4 { inherit system; overlays = []; }).python37Packages; - telegram-purple = (import nixpkgs-4 { inherit system; overlays = []; }).telegram-purple; - }; - defaultPackage = packages.php73; - legacyPackages = packages; - }) // rec { - overlays = { - php = final: prev: { - php72 = self.packages."${final.system}".php72; - php73 = self.packages."${final.system}".php73; - php74 = self.packages."${final.system}".php74; - cryptpad = self.packages."${final.system}".cryptpad; - python37 = self.packages."${final.system}".python37; - telegram-purple = self.packages."${final.system}".telegram-purple; - }; - }; - overlay = overlays.php; - }; -} diff --git a/flakes/private/ports/flake.lock b/flakes/private/ports/flake.lock new file mode 100644 index 0000000..c9af933 --- /dev/null +++ b/flakes/private/ports/flake.lock @@ -0,0 +1,62 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs-4": { + "flake": false, + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixpkgs-4": "nixpkgs-4" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flakes/private/ports/flake.nix b/flakes/private/ports/flake.nix new file mode 100644 index 0000000..42aae30 --- /dev/null +++ b/flakes/private/ports/flake.nix @@ -0,0 +1,39 @@ +{ + description = "Php old versions"; + inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.nixpkgs = { + url = "github:NixOS/nixpkgs/840c782d507d60aaa49aa9e3f6d0b0e780912742"; + flake = false; + }; + inputs.nixpkgs-4 = { + url = "github:NixOS/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026"; + flake = false; + }; + outputs = { self, nixpkgs, nixpkgs-4, flake-utils }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: + let + pkgs = import nixpkgs { inherit system; overlays = []; }; + in rec { + packages = { + php72 = pkgs.php72; + php73 = pkgs.php73; + php74 = (import nixpkgs-4 { inherit system; overlays = []; }).php74; + cryptpad = (import nixpkgs-4 { inherit system; overlays = []; }).cryptpad; + python37 = (import nixpkgs-4 { inherit system; overlays = []; }).python37; + python37Packages = (import nixpkgs-4 { inherit system; overlays = []; }).python37Packages; + telegram-purple = (import nixpkgs-4 { inherit system; overlays = []; }).telegram-purple; + }; + legacyPackages = packages; + }) // rec { + overlays = { + ports = final: prev: { + php72 = self.packages."${final.system}".php72; + php73 = self.packages."${final.system}".php73; + php74 = self.packages."${final.system}".php74; + cryptpad = self.packages."${final.system}".cryptpad; + python37 = self.packages."${final.system}".python37; + telegram-purple = self.packages."${final.system}".telegram-purple; + }; + }; + overlay = overlays.ports; + }; +} -- cgit v1.2.3