commit 46b989f924f4d0f450ec1948b2de99293d563669 · pyrox.dev/nixpkgs

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

···

       313
       313
        
       

     

       314
       314
        
       - `rome` was removed because it is no longer maintained and is succeeded by `biome`.

     

       315
       315
        
       

     

       316
       316
       +
       - The `prometheus-knot-exporter` was migrated to a version maintained by CZ.NIC. Various metric names have changed, so checking existing rules is recommended.

     

       317
       317
       +
       

     

       316
       318
        
       - The `services.mtr-exporter.target` has been removed in favor of `services.mtr-exporter.jobs` which allows specifying multiple targets.

     

       317
       319
        
       

     

       318
       320
        
       - Setting `nixpkgs.config` options while providing an external `pkgs` instance will now raise an error instead of silently ignoring the options. NixOS modules no longer set `nixpkgs.config` to accomodate this. This specifically affects `services.locate`, `services.xserver.displayManager.lightdm.greeters.tiny` and `programs.firefox` NixOS modules. No manual intervention should be required in most cases, however, configurations relying on those modules affecting packages outside the system environment should switch to explicit overlays.

+27 -25

pkgs/servers/monitoring/prometheus/knot-exporter.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, lib, python3, nixosTests }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , python3

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , nixosTests

     

       5
       5
       +
       }:

     

       2
       6
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       7
       7
       +
       python3.pkgs.buildPythonApplication rec {

     

       4
       8
        
         pname = "knot-exporter";

     

       5
       5
       -
         version = "unstable-2021-08-21";

     

       9
       9
       +
         version = "3.3.2";

     

       10
       10
       +
         pyproject = true;

     

       6
       11
        
       

     

       7
       7
       -
         src = fetchFromGitHub {

     

       8
       8
       -
           owner = "ghedo";

     

       9
       9
       -
           repo = "knot_exporter";

     

       10
       10
       -
           rev = "b18eb7db735b50280f0815497475f4c7092a6550";

     

       11
       11
       -
           sha256 = "sha256-FGzkO/KHDhkM3PA2urNQcrMi3MHADkd0YwAvu1jvfrU=";

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           pname = "knot_exporter";

     

       14
       14
       +
           inherit version;

     

       15
       15
       +
           hash = "sha256-/TBzq9MhYb664TsSD46Ep7gOkLBmmPSK9d89xlgvbSw=";

     

       12
       16
        
         };

     

       13
       17
        
       

     

       14
       14
       -
         dontBuild = true;

     

       15
       15
       -
       

     

       16
       16
       -
         nativeBuildInputs = [ python3.pkgs.wrapPython ];

     

       17
       17
       -
         buildInputs = [ python3 ];

     

       18
       18
       -
       

     

       19
       19
       -
         installPhase = ''

     

       20
       20
       -
           runHook preInstall

     

       18
       18
       +
         nativeBuildInputs = [

     

       19
       19
       +
           python3.pkgs.hatchling

     

       20
       20
       +
         ];

     

       21
       21
        
       

     

       22
       22
       -
           install -Dm0755 knot_exporter $out/bin/knot_exporter

     

       23
       23
       -
           patchShebangs $out/bin

     

       24
       24
       -
           buildPythonPath ${python3.pkgs.prometheus-client}

     

       25
       25
       -
           patchPythonScript $out/bin/knot_exporter

     

       22
       22
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       23
       23
       +
           libknot

     

       24
       24
       +
           prometheus-client

     

       25
       25
       +
           psutil

     

       26
       26
       +
         ];

     

       26
       27
        
       

     

       27
       27
       -
           runHook postInstall

     

       28
       28
       -
         '';

     

       28
       28
       +
         pythonImportsCheck = [

     

       29
       29
       +
           "knot_exporter"

     

       30
       30
       +
         ];

     

       29
       31
        
       

     

       30
       32
        
         passthru.tests = { inherit (nixosTests.prometheus-exporters) knot; };

     

       31
       33
        
       

     

       32
       34
        
         meta = with lib; {

     

       33
       33
       -
           homepage = "https://github.com/ghedo/knot_exporter";

     

       34
       34
       -
           description = " Prometheus exporter for Knot DNS";

     

       35
       35
       +
           description = "Prometheus exporter for Knot DNS";

     

       36
       36
       +
           homepage = "https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/knot_exporter";

     

       35
       37
        
           license = licenses.gpl3Only;

     

       36
       36
       -
           maintainers = with maintainers; [ ma27 ];

     

       37
       37
       -
           platforms = platforms.linux;

     

       38
       38
       +
           maintainers = with maintainers; [ ma27 hexa ];

     

       39
       39
       +
           mainProgram = "knot-exporter";

     

       38
       40
        
         };

     

       39
       41
        
       }