commit ac435fe5f5fcb5e807f510ba6c56dbc7fc656407 · pyrox.dev/nixpkgs

pkgs/by-name/ka/kanidm/1_5.nix pkgs/servers/kanidm/1_5.nix

+1 -1

pkgs/by-name/ka/kanidm/1_6.nix pkgs/servers/kanidm/1_6.nix

···

       2
        
         version = "1.6.4";

     

       3
        
         hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw=";

     

       4
        
         cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k=";

     

       5
       -
         eolDate = "2025-09-01";

     

       6
        
       }

···

       2
        
         version = "1.6.4";

     

       3
        
         hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw=";

     

       4
        
         cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k=";

     

       5
       +
         unsupported = true;

     

       6
        
       }

pkgs/by-name/ka/kanidm/1_7.nix pkgs/servers/kanidm/1_7.nix

+1 -2

pkgs/by-name/ka/kanidm/README.md pkgs/servers/kanidm/README.md

···

       24
        
       

     

       25
        
       ### Update default

     

       26
        
       

     

       27
       -
       1. `sed -i 's/1_4/1_5/' pkgs/by-name/ka/kanidm/package.nix`

     

       28
       -
       1. Update `all-packages.nix` and set `kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;`

     

       29
        
       1. Create commit `kanidm: update default to 1.5.0`

     

       30
        
       

     

       31
        
       ### Backport to stable

···

       24
        
       

     

       25
        
       ### Update default

     

       26
        
       

     

       27
       +
       1. Update kanidm aliases in `aliases.nix`. Should remove completely after 25.11 branch off.

     

       0
        
       
     

       28
        
       1. Create commit `kanidm: update default to 1.5.0`

     

       29
        
       

     

       30
        
       ### Backport to stable

pkgs/by-name/ka/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch pkgs/servers/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch

pkgs/by-name/ka/kanidm/generic.nix pkgs/servers/kanidm/generic.nix

-1

pkgs/by-name/ka/kanidm/package.nix

···

       1
       -
       import ./1_6.nix

···

       0

pkgs/by-name/ka/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch pkgs/servers/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch

pkgs/by-name/ka/kanidm/provision-patches/1_5/recover-account.patch pkgs/servers/kanidm/provision-patches/1_5/recover-account.patch

pkgs/by-name/ka/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch pkgs/servers/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch

pkgs/by-name/ka/kanidm/provision-patches/1_6/recover-account.patch pkgs/servers/kanidm/provision-patches/1_6/recover-account.patch

pkgs/by-name/ka/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch pkgs/servers/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch

pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch pkgs/servers/kanidm/provision-patches/1_7/recover-account.patch

+2

pkgs/top-level/aliases.nix

···

       1230
        
         kube3d = k3d; # Added 2022-0705

     

       1231
        
         kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17

     

       1232
        
         kak-lsp = kakoune-lsp; # Added 2024-04-01

     

       0
        
       
     

       0
        
       
     

       1233
        
         kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10

     

       1234
        
         kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18

     

       1235
        
         kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18

···

       1230
        
         kube3d = k3d; # Added 2022-0705

     

       1231
        
         kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17

     

       1232
        
         kak-lsp = kakoune-lsp; # Added 2024-04-01

     

       1233
       +
         kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01

     

       1234
       +
         kanidmWithSecretProvisioning = lib.warnOnInstantiate "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01

     

       1235
        
         kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10

     

       1236
        
         kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18

     

       1237
        
         kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18

+3 -4

pkgs/top-level/all-packages.nix

···

       9789
        
       

     

       9790
        
         jetty = jetty_12;

     

       9791
        
       

     

       9792
       -
         kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix {

     

       9793
        
           kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;

     

       9794
        
         };

     

       9795
       -
         kanidm_1_6 = callPackage ../by-name/ka/kanidm/1_6.nix {

     

       9796
        
           kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_6;

     

       9797
        
         };

     

       9798
       -
         kanidm_1_7 = callPackage ../by-name/ka/kanidm/1_7.nix {

     

       9799
        
           kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_7;

     

       9800
        
         };

     

       9801
        
       

     

       9802
       -
         kanidmWithSecretProvisioning = kanidm.override { enableSecretProvisioning = true; };

     

       9803
        
         kanidmWithSecretProvisioning_1_5 = kanidm_1_5.override { enableSecretProvisioning = true; };

     

       9804
        
         kanidmWithSecretProvisioning_1_6 = kanidm_1_6.override { enableSecretProvisioning = true; };

     

       9805
        
         kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; };

···

       9789
        
       

     

       9790
        
         jetty = jetty_12;

     

       9791
        
       

     

       9792
       +
         kanidm_1_5 = callPackage ../servers/kanidm/1_5.nix {

     

       9793
        
           kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;

     

       9794
        
         };

     

       9795
       +
         kanidm_1_6 = callPackage ../servers/kanidm/1_6.nix {

     

       9796
        
           kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_6;

     

       9797
        
         };

     

       9798
       +
         kanidm_1_7 = callPackage ../servers/kanidm/1_7.nix {

     

       9799
        
           kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_7;

     

       9800
        
         };

     

       9801
        
       

     

       0
        
       
     

       9802
        
         kanidmWithSecretProvisioning_1_5 = kanidm_1_5.override { enableSecretProvisioning = true; };

     

       9803
        
         kanidmWithSecretProvisioning_1_6 = kanidm_1_6.override { enableSecretProvisioning = true; };

     

       9804
        
         kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; };

+2 -2

pkgs/top-level/release.nix

···

       44
        
             # so users choosing to allow don't have to rebuild them every time.

     

       45
        
             permittedInsecurePackages = [

     

       46
        
               "olm-3.2.16" # see PR #347899

     

       47
       -
               "kanidm_1_5-1.5.0"

     

       48
       -
               "kanidmWithSecretProvisioning_1_5-1.5.0"

     

       49
        
             ];

     

       50
        
           };

     

       51

···

       44
        
             # so users choosing to allow don't have to rebuild them every time.

     

       45
        
             permittedInsecurePackages = [

     

       46
        
               "olm-3.2.16" # see PR #347899

     

       47
       +
               "kanidm_1_6-1.6.4"

     

       48
       +
               "kanidmWithSecretProvisioning_1_6-1.6.4"

     

       49
        
             ];

     

       50
        
           };

     

       51