From 5a8b5fcff362b6be8961205c54a247aa072af3d5 Mon Sep 17 00:00:00 2001 From: Matthew Kenigsberg Date: Fri, 26 Sep 2025 12:21:22 -0600 Subject: [PATCH 1/2] Correct nixpkgs branch in catalog explanation There is no such branch `unstable` in nixpkgs. We pull from `nixos-unstable` --- docs/concepts/packages-and-catalog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/packages-and-catalog.md b/docs/concepts/packages-and-catalog.md index 1bb81476..8640c59a 100644 --- a/docs/concepts/packages-and-catalog.md +++ b/docs/concepts/packages-and-catalog.md @@ -26,7 +26,7 @@ Packages are declared in the [environment manifest][manifest_concept]. The built-in catalog is called the Base Catalog, and contains a wide variety of open source packages you can use in your environments. The Base Catalog uses [nixpkgs][nixpkgs] as an input. Nixpkgs is a community maintained project, but the Base Catalog is maintained by Flox. -Upstream changes in [nixpkgs][nixpkgs] are reflected in the Flox Catalog daily from the `unstable` branch of [nixpkgs][nixpkgs]. +Upstream changes in [nixpkgs][nixpkgs] are reflected in the Flox Catalog daily from the `nixos-unstable` branch of [nixpkgs][nixpkgs]. ## Supported package metadata From 0b116fbd97fcf0ce175a3363a71ddc42621fcea4 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 30 Sep 2025 11:56:57 -0500 Subject: [PATCH 2/2] bump: 1.7.3 -> 1.7.4 --- FLOX_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FLOX_VERSION b/FLOX_VERSION index bbf649f6..3511591d 100644 --- a/FLOX_VERSION +++ b/FLOX_VERSION @@ -1 +1 @@ -1.7.3 \ No newline at end of file +1.7.4 \ No newline at end of file