From 9dee6d3afc784434b22b8861a0ae03bf595c3a78 Mon Sep 17 00:00:00 2001 From: kp2pml30 Date: Mon, 12 May 2025 16:52:03 +0400 Subject: [PATCH 1/2] feat: add collecting nix derivation from source --- .gitignore | 2 ++ collect-sources.nix | 62 +++++++++++++++++++++++++++++++++++++++++++ flake.lock | 64 +++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 33 +++++++++++++++++++++++ 4 files changed, 161 insertions(+) create mode 100644 collect-sources.nix create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.gitignore b/.gitignore index 0416a3b..d3b2e3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /.ruff_cache __pycache__ /third-party +/.direnv +/.envrc diff --git a/collect-sources.nix b/collect-sources.nix new file mode 100644 index 0000000..cf049b9 --- /dev/null +++ b/collect-sources.nix @@ -0,0 +1,62 @@ +{ rootDerivation +, derivationName +, stdenv +, ... # added for future backwards compatibility +}: +let + config = builtins.fromJSON (builtins.readFile "${rootDerivation}/.git-third-party/config.json"); + allRepoNames = builtins.attrNames config.repos; + makeDependentDerivation = + name: + let + cleanName = builtins.head (builtins.tail (builtins.match "^(.*/|)([^/]+)$" name)); + myConfig = config.repos."${name}"; + shouldFetchModules = !(builtins.hasAttr "submodules" myConfig) || myConfig.submodules != []; + base-src = builtins.fetchGit { + url = myConfig.url; + rev = myConfig.commit; + submodules = shouldFetchModules; + #fetchSubmodules = shouldFetchModules; + # fetchLFS = true; + shallow = true; + }; + in stdenv.mkDerivation { + name = "git3party_${derivationName}_${cleanName}"; + src = base-src; + patches = + builtins.map + (num: "${rootDerivation}/.git-third-party/patches/${name}/${toString num}") + (builtins.genList (x: x + 1) myConfig.patches); + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + #outputHashMode = "recursive"; + + installPhase = '' + cp -r . "$out" + ''; + }; + dependentDerivations = builtins.map (name: { name = name; der = makeDependentDerivation name; }) allRepoNames; + + cpFlags = "--no-preserve=ownership,mode --preserve=xattr"; + + copyLines = builtins.concatStringsSep "\n" ([ + "cp ${cpFlags} -r '${rootDerivation}/.' ." + ] ++ builtins.map (nameDer: "mkdir -p '${nameDer.name}'\ncp ${cpFlags} -r '${nameDer.der}'/. '${nameDer.name}'") dependentDerivations); +in + stdenv.mkDerivation { + name = derivationName; + + srcs = [ + rootDerivation + ] ++ (builtins.map (x: x.name) dependentDerivations); + + phases = [ "unpackPhase" "installPhase" ]; + + #outputHashMode = "recursive"; + + unpackPhase = copyLines; + + installPhase = '' + cp -r . "$out" + ''; + } diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..e8c2902 --- /dev/null +++ b/flake.lock @@ -0,0 +1,64 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..50cde64 --- /dev/null +++ b/flake.nix @@ -0,0 +1,33 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + systems = { + url = "github:nix-systems/default"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "systems"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = inputs@{ self, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem + (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + devShells.default = pkgs.mkShell { + packages = with pkgs; [ + python312 + pre-commit + ]; + + shellHook = '' + ''; + }; + } + ); +} From 239e7dd93035d87cefc49f311a8cdda5b6088e96 Mon Sep 17 00:00:00 2001 From: kp2pml30 Date: Mon, 12 May 2025 16:58:59 +0400 Subject: [PATCH 2/2] fix: change license of nix --- LICENSE.lgpl | 165 ++++++++++++++++++++++++++++++++++++++++++++ collect-sources.nix | 16 +++++ 2 files changed, 181 insertions(+) create mode 100644 LICENSE.lgpl diff --git a/LICENSE.lgpl b/LICENSE.lgpl new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/LICENSE.lgpl @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/collect-sources.nix b/collect-sources.nix index cf049b9..47fc880 100644 --- a/collect-sources.nix +++ b/collect-sources.nix @@ -1,3 +1,19 @@ +# Git Third Party +# Copyright (c) 2025 kp2pml30, All rights reserved. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3.0 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. + { rootDerivation , derivationName , stdenv