From 64cd065cc059071220e50bc38632d831f2132d0d Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Mon, 28 Oct 2024 19:49:38 -0700 Subject: [PATCH 1/2] Add note on Nix and open source --- src/pages/concepts/nix.mdx | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/pages/concepts/nix.mdx b/src/pages/concepts/nix.mdx index 776272e3..17b936a4 100644 --- a/src/pages/concepts/nix.mdx +++ b/src/pages/concepts/nix.mdx @@ -2,7 +2,7 @@ title: Nix wip: true snippet: | - A build tool, [package manager](/concepts/package-management), and [programming language](/concepts/nix-language) + A CLI, [package manager](/concepts/package-management), and [programming language](/concepts/nix-language) related: ["nix-language", "nixos", "nixpkgs"] externalSources: [ { @@ -44,11 +44,20 @@ externalSources: [ ] --- -*Nix* refers to a few different things: +[*Nix*][nix] can be a somewhat confusing term because it refers to multiple things: 1. The pure and functional [programming language][lang] 2. The [Nix CLI](#cli) -3. The overall Nix package management system +3. The overall Nix [package management system][package-management] + +All of these are closely interrelated and should be thought of as a single tool. +In this document, we'll go over each of these three aspects of Nix. + + +The Nix project is fully open source and largely developed within the [`NixOS`][nixos-org] organization on [GitHub]. +It licensed under the generally quite permissive [LGPL 2.1][license]. +We at Determinate Systems have actively contributed to Nix as an open source project in the past—alongside countless talented individuals—and will continue to do so as part of our [mission] to make Nix better. + ## The Nix CLI \{#cli} @@ -78,7 +87,13 @@ The [Determinate Nix Installer][install] enables the [unified CLI](#unified-cli) [ds]: https://determinate.systems [env]: /concepts/dev-env [flakes]: /concepts/flakes +[github]: https://github.com [install]: /concepts/nix-installer [lang]: /concepts/nix-language +[license]: https://github.com/nixOS/nix?tab=LGPL-2.1-1-ov-file +[mission]: https://determinate.systems/posts/we-want-to-make-nix-better +[nix]: https://nixos.org +[nixos-org]: https://github.com/NixOS [packages]: /concepts/packages +[package-management]: /concepts/package-management [store]: /concepts/nix-store From 85bb4b16da6d33ca083482b72c24b1af2733b1f4 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Mon, 28 Oct 2024 20:01:20 -0700 Subject: [PATCH 2/2] Update flake.lock and improve wording --- flake.lock | 10 +++++----- src/pages/concepts/nix.mdx | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 0df8e9f0..4bdc8a9f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,12 +2,12 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", - "revCount": 635167, + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "revCount": 636163, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.635167%2Brev-086b448a5d54fd117f4dc2dee55c9f0ff461bdc1/0192005b-cf99-7543-8e3a-deb3339dad33/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.636163%2Brev-cd3e8833d70618c4eea8df06f95b364b016d4950/0192cd43-85cd-7ff3-b9be-a3f7995e917d/source.tar.gz" }, "original": { "type": "tarball", diff --git a/src/pages/concepts/nix.mdx b/src/pages/concepts/nix.mdx index 17b936a4..68a88eeb 100644 --- a/src/pages/concepts/nix.mdx +++ b/src/pages/concepts/nix.mdx @@ -53,10 +53,12 @@ externalSources: [ All of these are closely interrelated and should be thought of as a single tool. In this document, we'll go over each of these three aspects of Nix. - + The Nix project is fully open source and largely developed within the [`NixOS`][nixos-org] organization on [GitHub]. -It licensed under the generally quite permissive [LGPL 2.1][license]. +It's licensed under [LGPL 2.1][license], which is generally quite permissive regarding commercial use. + We at Determinate Systems have actively contributed to Nix as an open source project in the past—alongside countless talented individuals—and will continue to do so as part of our [mission] to make Nix better. +We have also created [Determinate Nix][det-nix], a downstream distribution of Nix intended for enterprise. ## The Nix CLI \{#cli} @@ -84,6 +86,7 @@ The *original CLI* for Nix is still the official CLI but, as we mention above, n The [Determinate Nix Installer][install] enables the [unified CLI](#unified-cli) by default, but leaves the tools from the original CLI accessible. +[det-nix]: https://docs.determinate.systems/determinate-nix [ds]: https://determinate.systems [env]: /concepts/dev-env [flakes]: /concepts/flakes