From 2ccf06c42e1e9f5b27cda04ccf45a47bf8e53313 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 3 Aug 2025 12:03:41 +0000 Subject: [PATCH] brakeman: migrate to by-name brakeman: 6.1.2 -> 7.1.0 brakeman: fix changelog version with let binding --- .../tools/analysis => by-name/br}/brakeman/Gemfile | 0 .../tools/analysis => by-name/br}/brakeman/Gemfile.lock | 6 +++--- .../tools/analysis => by-name/br}/brakeman/gemset.nix | 8 ++++---- .../default.nix => by-name/br/brakeman/package.nix} | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 13 insertions(+), 11 deletions(-) rename pkgs/{development/tools/analysis => by-name/br}/brakeman/Gemfile (100%) rename pkgs/{development/tools/analysis => by-name/br}/brakeman/Gemfile.lock (70%) rename pkgs/{development/tools/analysis => by-name/br}/brakeman/gemset.nix (64%) rename pkgs/{development/tools/analysis/brakeman/default.nix => by-name/br/brakeman/package.nix} (78%) diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile b/pkgs/by-name/br/brakeman/Gemfile similarity index 100% rename from pkgs/development/tools/analysis/brakeman/Gemfile rename to pkgs/by-name/br/brakeman/Gemfile diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/by-name/br/brakeman/Gemfile.lock similarity index 70% rename from pkgs/development/tools/analysis/brakeman/Gemfile.lock rename to pkgs/by-name/br/brakeman/Gemfile.lock index 3a2065935c38..a6603a1c1bed 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/by-name/br/brakeman/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - brakeman (6.1.2) + brakeman (7.1.0) racc - racc (1.7.3) + racc (1.8.1) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.5.5 + 2.6.9 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/by-name/br/brakeman/gemset.nix similarity index 64% rename from pkgs/development/tools/analysis/brakeman/gemset.nix rename to pkgs/by-name/br/brakeman/gemset.nix index b77d22a54027..fdb42970c776 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/by-name/br/brakeman/gemset.nix @@ -5,19 +5,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lylig4vgnw9l1ybwgxdi9nw9q2bc5dcplklg8nsbi7j32f7c5kp"; + sha256 = "1bs8bm3qj2wfy5h1bp8qi1d3vjw5zabhnq5rr288802kbakhiixv"; type = "gem"; }; - version = "6.1.2"; + version = "7.1.0"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; } diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/by-name/br/brakeman/package.nix similarity index 78% rename from pkgs/development/tools/analysis/brakeman/default.nix rename to pkgs/by-name/br/brakeman/package.nix index e8532a81d03b..3ea856f75b79 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/by-name/br/brakeman/package.nix @@ -5,6 +5,10 @@ bundlerUpdateScript, }: +let + gems = import ./gemset.nix; + version = gems.brakeman.version; +in bundlerApp { pname = "brakeman"; exes = [ "brakeman" ]; @@ -12,11 +16,11 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "brakeman"; - meta = with lib; { + meta = { description = "Static analysis security scanner for Ruby on Rails"; homepage = "https://brakemanscanner.org/"; changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md"; - license = [ licenses.unfreeRedistributable ]; + license = lib.licenses.unfreeRedistributable; platforms = ruby.meta.platforms; maintainers = [ ]; mainProgram = "brakeman"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb2b8144aadd..a6dc25b4dbfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1608,8 +1608,6 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; - brakeman = callPackage ../development/tools/analysis/brakeman { }; - # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: # pkgsCross.aarch64-multiplatform.freshBootstrapTools.build