23.11 is Tapir

topiary: 0.1.0 -> 0.2.0

.github/workflows/periodic-merge-24h.yml

@@ -38,6 +38,10 @@ jobs:
             into: staging-next-22.11
           - from: staging-next-22.11
             into: staging-22.11
+          - from: release-23.05
+            into: staging-next-23.05
+          - from: staging-next-23.05
+            into: staging-23.05
     name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
     steps:
       - uses: actions/checkout@v3

.version

@@ -1 +1 @@
-23.05
+23.11

lib/trivial.nix

@@ -195,7 +195,7 @@ rec {
      On each release the first letter is bumped and a new animal is chosen
      starting with that new letter.
   */
-  codeName = "Stoat";
+  codeName = "Tapir";
 
   /* Returns the current nixpkgs version suffix as string. */
   versionSuffix =

nixos/doc/manual/release-notes/release-notes.md

@@ -3,6 +3,7 @@
 This section lists the release notes for each stable version of NixOS and current unstable revision.
 
 ```{=include=} sections
+rl-2311.section.md
 rl-2305.section.md
 rl-2211.section.md
 rl-2205.section.md

nixos/doc/manual/release-notes/rl-2311.section.md

@@ -0,0 +1,12 @@
+# Release 23.11 (“Tapir”, 2023.11/??) {#sec-release-23.11}
+
+## Highlights {#sec-release-23.11-highlights}
+
+## New Services {#sec-release-23.11-new-services}
+
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
+## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
+
+## Other Notable Changes {#sec-release-23.11-notable-changes}
+

pkgs/development/tools/misc/topiary/default.nix

@@ -1,35 +1,56 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, fetchpatch
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "topiary";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Gm6AzzVLUXZi2jzJ1b/c4yjIvRRA2e5mC2CMVyly2X8=";
+    hash = "sha256-OJdR+8eGbcDjirupjcczztYbGKGKaRywZnqqjv0EOSU=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "tree-sitter-bash-0.19.0" = "sha256-5gBH0tBnNevAdBwlsLQAI9JOyz2lDY7Gb54HVCD4+Zs=";
-      "tree-sitter-nickel-0.0.1" = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE=";
+      "tree-sitter-bash-0.19.0" = "sha256-Po2r+wUWJwC+ODk/xotYI7PsmjC3TFSu1dU0FrrnAXQ=";
+      "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs=";
+      "tree-sitter-nickel-0.0.1" = "sha256-NLgbTl1Te/lHTGra4DdxLtqIg6yXf5lfyl37qpp8SNQ=";
       "tree-sitter-ocaml-0.20.1" = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y=";
-      "tree-sitter-query-0.0.1" = "sha256-dWWof8rYFTto3A4BfbKTKcNieRbwFdF6xDXW9tQvAqQ=";
+      "tree-sitter-query-0.1.0" = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU=";
+      "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M=";
     };
   };
 
+  patches = [
+    # the versions in `Cargo.toml`s are outdated
+    (fetchpatch {
+      name = "bump-version-to-0.2.0.patch";
+      url = "https://github.com/tweag/topiary/commit/612fdb64f50ab15889a0b508bf727f159f26a112.patch";
+      hash = "sha256-MHaAnYyjXdKbh/pE3bL2iAPX6bMQkK+LUGYCL5mBM44=";
+    })
+  ];
+
+  cargoBuildFlags = [ "-p" "topiary-cli" ];
+  cargoTestFlags = cargoBuildFlags;
+
+  env = {
+    TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
+  };
+
   postInstall = ''
     install -Dm444 languages/* -t $out/share/languages
   '';
 
-  TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
-
   meta = with lib; {
     description = "A uniform formatter for simple languages, as part of the Tree-sitter ecosystem";
     homepage = "https://github.com/tweag/topiary";
+    changelog = "https://github.com/tweag/topiary/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
   };

pkgs/tools/security/cnspec/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "cnspec";
+  version = "8.10.0";
+
+  src = fetchFromGitHub {
+    owner = "mondoohq";
+    repo = "cnspec";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xgDHpLnbTAC0OL7Z5JQsOWlarIHqvr7xrDBg6hlWRRw=";
+  };
+
+  vendorHash = "sha256-cjM8pj3squAu2KJbeGz5cd3LRGxKX9BGxtF+lUZaFyU=";
+
+  subPackages = [
+    "apps/cnspec"
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=go.mondoo.com/cnspec.Version=${version}"
+  ];
+
+  meta = with lib; {
+    description = "An open source, cloud-native security and policy project";
+    homepage = "https://github.com/mondoohq/cnspec";
+    changelog = "https://github.com/mondoohq/cnspec/releases/tag/v${version}";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -28003,6 +28003,8 @@ with pkgs;
 
   clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
 
+  cnspec = callPackage ../tools/security/cnspec { };
+
   cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { };
 
   colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { };