commit e2801b1fcff5da3fadd42299f2decb61bccd7f72 · pyrox.dev/nixpkgs

+9 -7

nixos/lib/testing/nodes.nix

···

       30
       30
        
                   })

     

       31
       31
        
                 ({ options, ... }: {

     

       32
       32
        
                   key = "nodes.nix-pkgs";

     

       33
       33
       -
                   config = mkIf (!options.nixpkgs.pkgs.isDefined) {

     

       34
       34
       -
                     # Ensure we do not use aliases. Ideally this is only set

     

       35
       35
       -
                     # when the test framework is used by Nixpkgs NixOS tests.

     

       36
       36
       -
                     nixpkgs.config.allowAliases = false;

     

       37
       37
       -
                     # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates.

     

       38
       38
       -
                     nixpkgs.system = hostPkgs.stdenv.hostPlatform.system;

     

       39
       39
       -
                   };

     

       33
       33
       +
                   config = optionalAttrs (!config.node.pkgsReadOnly) (

     

       34
       34
       +
                     mkIf (!options.nixpkgs.pkgs.isDefined) {

     

       35
       35
       +
                       # Ensure we do not use aliases. Ideally this is only set

     

       36
       36
       +
                       # when the test framework is used by Nixpkgs NixOS tests.

     

       37
       37
       +
                       nixpkgs.config.allowAliases = false;

     

       38
       38
       +
                       # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates.

     

       39
       39
       +
                       nixpkgs.system = hostPkgs.stdenv.hostPlatform.system;

     

       40
       40
       +
                     }

     

       41
       41
       +
                   );

     

       40
       42
        
                 })

     

       41
       43
        
                 testModuleArgs.config.extraBaseModules

     

       42
       44
        
               ];

+1 -1

nixos/modules/services/misc/gollum.nix

···

       154
       154
        
           };

     

       155
       155
        
         };

     

       156
       156
        
       

     

       157
       157
       -
         meta.maintainers = with lib.maintainers; [ erictapen bbenno joscha ];

     

       157
       157
       +
         meta.maintainers = with lib.maintainers; [ erictapen bbenno ];

     

       158
       158
        
       }

+1 -1

nixos/modules/services/network-filesystems/orangefs/server.nix

···

       192
       192
        
           # orangefs daemon will run as user

     

       193
       193
        
           users.users.orangefs = {

     

       194
       194
        
             isSystemUser = true;

     

       195
       195
       -
             group = "orangfs";

     

       195
       195
       +
             group = "orangefs";

     

       196
       196
        
           };

     

       197
       197
        
           users.groups.orangefs = {};

     

       198
       198

-1

nixos/tests/all-tests.nix

···

       331
       331
        
         graylog = handleTest ./graylog.nix {};

     

       332
       332
        
         grocy = handleTest ./grocy.nix {};

     

       333
       333
        
         grub = handleTest ./grub.nix {};

     

       334
       334
       -
         guacamole-client = handleTest ./guacamole-client.nix {};

     

       335
       334
        
         guacamole-server = handleTest ./guacamole-server.nix {};

     

       336
       335
        
         gvisor = handleTest ./gvisor.nix {};

     

       337
       336
        
         hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; };

+2 -2

nixos/tests/dconf.nix

···

       14
       14
        
               profiles.user.databases = [

     

       15
       15
        
                 {

     

       16
       16
        
                   settings = {

     

       17
       17
       -
                     "test/not/locked" = mkInt32 1;

     

       18
       18
       -
                     "test/is/locked" = "locked";

     

       17
       17
       +
                     "test/not".locked = mkInt32 1;

     

       18
       18
       +
                     "test/is".locked = "locked";

     

       19
       19
        
                   };

     

       20
       20
        
                   locks = [

     

       21
       21
        
                     "/test/is/locked"

+1 -1

nixos/tests/hardened.nix

···

       28
       28
        
               };

     

       29
       29
        
             };

     

       30
       30
        
             boot.extraModulePackages =

     

       31
       31
       -
               optional (versionOlder config.boot.kernelPackages.kernel.version "5.6")

     

       31
       31
       +
               pkgs.lib.optional (pkgs.lib.versionOlder config.boot.kernelPackages.kernel.version "5.6")

     

       32
       32
        
                 config.boot.kernelPackages.wireguard;

     

       33
       33
        
             boot.kernelModules = [ "wireguard" ];

     

       34
       34
        
           };

+1 -1

nixos/tests/legit.nix

···

       8
       8
        
         meta.maintainers = [ lib.maintainers.ratsclub ];

     

       9
       9
        
       

     

       10
       10
        
         nodes = {

     

       11
       11
       -
           server = { config, pkgs }: {

     

       11
       11
       +
           server = { config, pkgs, ... }: {

     

       12
       12
        
             services.legit = {

     

       13
       13
        
               enable = true;

     

       14
       14
        
               settings = {

+16 -8

nixos/tests/litestream.nix

···

       44
       44
        
             };

     

       45
       45
        
             services.grafana = {

     

       46
       46
        
               enable = true;

     

       47
       47
       -
               security = {

     

       48
       48
       -
                 adminUser = "admin";

     

       49
       49
       -
                 adminPassword = "admin";

     

       50
       50
       -
               };

     

       51
       51
       -
               addr = "localhost";

     

       52
       52
       -
               port = 3000;

     

       53
       53
       -
               extraOptions = {

     

       54
       54
       -
                 DATABASE_URL = "sqlite3:///var/lib/grafana/data/grafana.db?cache=private&mode=rwc&_journal_mode=WAL";

     

       47
       47
       +
               settings = {

     

       48
       48
       +
                 security = {

     

       49
       49
       +
                   admin_user = "admin";

     

       50
       50
       +
                   admin_password = "admin";

     

       51
       51
       +
                 };

     

       52
       52
       +
       

     

       53
       53
       +
                 server = {

     

       54
       54
       +
                   http_addr = "localhost";

     

       55
       55
       +
                   http_port = 3000;

     

       56
       56
       +
                 };

     

       57
       57
       +
       

     

       58
       58
       +
                 database = {

     

       59
       59
       +
                   type = "sqlite3";

     

       60
       60
       +
                   path = "/var/lib/grafana/data/grafana.db";

     

       61
       61
       +
                   wal = true;

     

       62
       62
       +
                 };

     

       55
       63
        
               };

     

       56
       64
        
             };

     

       57
       65
        
             users.users.foo = {

+2 -2

nixos/tests/lxd-image-server.nix

···

       8
       8
        
           };

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         lxd-image-metadata = lxd-image.lxdMeta.${pkgs.stdenv.hostPlatform.system};

     

       12
       12
       -
         lxd-image-rootfs = lxd-image.lxdImage.${pkgs.stdenv.hostPlatform.system};

     

       11
       11
       +
         lxd-image-metadata = lxd-image.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};

     

       12
       12
       +
         lxd-image-rootfs = lxd-image.lxdContainerImage.${pkgs.stdenv.hostPlatform.system};

     

       13
       13
        
       

     

       14
       14
        
       in {

     

       15
       15
        
         name = "lxd-image-server";

+1 -1

nixos/tests/mongodb.nix

···

       27
       27
        
         in {

     

       28
       28
        
           name = "mongodb";

     

       29
       29
        
           meta = with pkgs.lib.maintainers; {

     

       30
       30
       -
             maintainers = [ bluescreen303 offline cstrahan rvl phile314 ];

     

       30
       30
       +
             maintainers = [ bluescreen303 offline rvl phile314 ];

     

       31
       31
        
           };

     

       32
       32
        
       

     

       33
       33
        
           nodes = {

+1 -1

nixos/tests/osquery.nix

···

       36
       36
        
             machine.succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | tee /dev/console | grep -q '127.0.0.1'")

     

       37
       37
        
       

     

       38
       38
        
             # osquery binaries respect configuration from the Nix config option.

     

       39
       39
       -
             machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"utc\";' | osqueryi | tee /dev/console | grep -q ${boolToString utc}")

     

       39
       39
       +
             machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"utc\";' | osqueryi | tee /dev/console | grep -q ${lib.boolToString utc}")

     

       40
       40
        
       

     

       41
       41
        
             # osquery binaries respect configuration from the Nix flags option.

     

       42
       42
        
             machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"config_refresh\";' | osqueryi | tee /dev/console | grep -q ${config_refresh}")

+9 -9

nixos/tests/sftpgo.nix

···

       17
       17
        
       

     

       18
       18
        
         # Returns an attributeset of users who are not system users.

     

       19
       19
        
         normalUsers = config:

     

       20
       20
       -
           filterAttrs (name: user: user.isNormalUser) config.users.users;

     

       20
       20
       +
           lib.filterAttrs (name: user: user.isNormalUser) config.users.users;

     

       21
       21
        
       

     

       22
       22
        
         # Returns true if a user is a member of the given group

     

       23
       23
        
         isMemberOf =

     
···

       26
       26
        
           groupName:

     

       27
       27
        
           # users.users attrset

     

       28
       28
        
           user:

     

       29
       29
       -
             any (x: x == user.name) config.users.groups.${groupName}.members;

     

       29
       29
       +
             lib.any (x: x == user.name) config.users.groups.${groupName}.members;

     

       30
       30
        
       

     

       31
       31
        
         # Generates a valid SFTPGo user configuration for a given user

     

       32
       32
        
         # Will be converted to JSON and loaded on application startup.

     
···

       52
       52
        
             # inside the dataprovider they will be automatically created.

     

       53
       53
        
             # You have to create the folder on the filesystem yourself

     

       54
       54
        
             virtual_folders =

     

       55
       55
       -
               lib.optional (lib.isMemberOf config sharedFolderName user) {

     

       55
       55
       +
               lib.optional (isMemberOf config sharedFolderName user) {

     

       56
       56
        
                 name = sharedFolderName;

     

       57
       57
        
                 mapped_path = "${config.services.sftpgo.dataDir}/${sharedFolderName}";

     

       58
       58
        
                 virtual_path = "/${sharedFolderName}";

     
···

       63
       63
        
               lib.recursiveUpdate {

     

       64
       64
        
                 "/" = [ "list" ];     # read-only top level directory

     

       65
       65
        
                 "/private" = [ "*" ]; # private subdirectory, not shared with others

     

       66
       66
       -
               } (lib.optionalAttrs (lib.isMemberOf config "shared" user) {

     

       66
       66
       +
               } (lib.optionalAttrs (isMemberOf config "shared" user) {

     

       67
       67
        
                 "/shared" = [ "*" ];

     

       68
       68
        
               });

     

       69
       69
        
       

     
···

       89
       89
        
         # of users and folders to import to SFTPGo.

     

       90
       90
        
         loadDataJson = config: pkgs.writeText "users-and-folders.json" (builtins.toJSON {

     

       91
       91
        
           users =

     

       92
       92
       -
             lib.mapAttrsToList (name: user: lib.generateUserAttrSet config user) (normalUsers config);

     

       92
       92
       +
             lib.mapAttrsToList (name: user: generateUserAttrSet config user) (normalUsers config);

     

       93
       93
        
       

     

       94
       94
        
           folders = [

     

       95
       95
        
             {

     
···

       144
       144
        
       {

     

       145
       145
        
         name = "sftpgo";

     

       146
       146
        
       

     

       147
       147
       -
         meta.maintainers = with maintainers; [ yayayayaka ];

     

       147
       147
       +
         meta.maintainers = with lib.maintainers; [ yayayayaka ];

     

       148
       148
        
       

     

       149
       149
        
         nodes = {

     

       150
       150
        
           server = { nodes, ... }: {

     
···

       228
       228
        
                 # Created shared folder directories

     

       229
       229
        
                 "d ${statePath}/${sharedFolderName} 2770 ${sftpgoUser} ${sharedFolderName}   -"

     

       230
       230
        
               ]

     

       231
       231
       -
               ++ mapAttrsToList (name: user:

     

       231
       231
       +
               ++ lib.mapAttrsToList (name: user:

     

       232
       232
        
                 # Create private user directories

     

       233
       233
        
                 ''

     

       234
       234
        
                   d ${statePath}/users/${user.name} 0700 ${sftpgoUser} ${sftpgoGroup} -

     
···

       273
       273
        
                 networking.firewall.allowedTCPPorts = [ 22 80 ];

     

       274
       274
        
                 services.sftpgo = {

     

       275
       275
        
                   settings = {

     

       276
       276
       -
                     sftpd.bindings = mkForce [{

     

       276
       276
       +
                     sftpd.bindings = lib.mkForce [{

     

       277
       277
        
                       address = "";

     

       278
       278
        
                       port = 22;

     

       279
       279
        
                     }];

     

       280
       280
        
       

     

       281
       281
       -
                     httpd.bindings = mkForce [{

     

       281
       281
       +
                     httpd.bindings = lib.mkForce [{

     

       282
       282
        
                       address = "";

     

       283
       283
        
                       port = 80;

     

       284
       284
        
                     }];

+4

nixos/tests/tracee.nix

···

       43
       43
        
                   mv $GOPATH/tracee-integration $out/bin/

     

       44
       44
        
                 '';

     

       45
       45
        
                 doInstallCheck = false;

     

       46
       46
       +
       

     

       47
       47
       +
                 meta = oa.meta // {

     

       48
       48
       +
                   outputsToInstall = [];

     

       49
       49
       +
                 };

     

       46
       50
        
               }))

     

       47
       51
        
             ];

     

       48
       52
        
           };

+3 -3

pkgs/applications/networking/cluster/kubelogin/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kubelogin";

     

       5
       5
       -
         version = "0.0.31";

     

       5
       5
       +
         version = "0.0.32";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Azure";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-yIRiIZKq+Q10Uo/9qEToeMHMipA5rApkxIRr/IJ0yfY=";

     

       11
       11
       +
           sha256 = "sha256-pMen6ZL1S0xr5+h7gVBMG4XjlZUifIiqHvjKgg8AY5c=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-XHSVLATWKklg1jWL4Lnaey7hCkYHAk/cNyUgQZ6WIq0=";

     

       14
       14
       +
         vendorHash = "sha256-pNOCagxOcxhELSWO1GfbxGmopYXIgKD00XdZdVgawrc=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [

     

       17
       17
        
           "-X main.version=${version}"

+3 -3

pkgs/applications/networking/cluster/tf-summarize/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "tf-summarize";

     

       10
       10
       -
         version = "0.3.2";

     

       10
       10
       +
         version = "0.3.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "dineshba";

     

       14
       14
        
           repo = "tf-summarize";

     

       15
       15
        
           rev = "v${version}";

     

       16
       16
       -
           hash = "sha256-d8DIVPQkuEvDCO0wKl+aK1jSu6MJCpTxQrgKYcFnzjA=";

     

       16
       16
       +
           hash = "sha256-1sYWOvSWxoS0R6M1HxJ6yyBSa/LY3b9G8mF3NMofFhM=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE=";

     

       19
       19
       +
         vendorHash = "sha256-YdfZt8SHBJHk5VUC8Em97EzX79EV4hxvo0B05npBA2U=";

     

       20
       20
        
       

     

       21
       21
        
         ldflags = [

     

       22
       22
        
           "-s"

+2 -2

pkgs/applications/terminal-emulators/iterm2/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenvNoCC.mkDerivation rec {

     

       13
       13
        
         pname = "iterm2";

     

       14
       14
       -
         version = "3.4.20";

     

       14
       14
       +
         version = "3.4.21";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchzip {

     

       17
       17
        
           url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";

     

       18
       18
       -
           hash = "sha256-RXBv3RXd2Kq8k7rbOE3HPEf6vI64VZCo1IX03gDy7l0=";

     

       18
       18
       +
           hash = "sha256-hx2d08U4AeRCLtSV3QBcnRu1QS0RblLx/LUH6HHdQvw=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         dontFixup = true;

+15 -17

pkgs/by-name/ui/uiua/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         rustPlatform,

     

       5
       5
       -
         fetchFromGitHub,

     

       6
       6
       -
         audioSupport ? true,

     

       7
       7
       -
         darwin,

     

       8
       8
       -
         alsa-lib,

     

       9
       9
       -
         pkg-config

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , rustPlatform

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , audioSupport ? true

     

       7
       7
       +
       , darwin

     

       8
       8
       +
       , alsa-lib

     

       10
       9
        
       }:

     

       11
       11
       -
       rustPlatform.buildRustPackage {

     

       10
       10
       +
       

     

       11
       11
       +
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "uiua";

     

       13
       13
       -
         version = "unstable-2023-09-28";

     

       13
       13
       +
         version = "0.0.16";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "uiua-lang";

     

       17
       17
        
           repo = "uiua";

     

       18
       18
       -
           rev = "9b8c65332396f521f170b0ed3ce104b7a8bcf7c0";

     

       19
       19
       -
           hash = "sha256-+pleCEEwgRj+p+k9oKIvbsGUWC49qByV/juv76ZdBcc=";

     

       18
       18
       +
           rev = "refs/tags/${version}";

     

       19
       19
       +
           hash = "sha256-CMuCl4idoO5qIpXdkXBbglsZQBWVT8w9azbn2rRxviA=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoHash = "sha256-L8TCMe6eHS3QRy6HuTc1WvMfzsDhKx9YYupAkNeBwpk=";

     

       22
       22
       +
         cargoHash = "sha256-BLP9OGTnksM9NscfhtVWxE0/CqZgkqqlIMgRclCzEzs=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = lib.optionals stdenv.isDarwin [

     

       25
       25
        
           rustPlatform.bindgenHook

     
···

       37
       37
        
       

     

       38
       38
        
         buildFeatures = lib.optional audioSupport "audio";

     

       39
       39
        
       

     

       40
       40
       -
         doCheck = true;

     

       41
       41
       -
       

     

       42
       40
        
         meta = with lib; {

     

       43
       41
        
           description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code";

     

       44
       42
        
           longDescription = ''

     
···

       49
       47
        
           homepage = "https://www.uiua.org/";

     

       50
       48
        
           license = licenses.mit;

     

       51
       49
        
           mainProgram = "uiua";

     

       52
       52
       -
           maintainers = with maintainers; [ cafkafk ];

     

       50
       50
       +
           maintainers = with maintainers; [ cafkafk tomasajt ];

     

       53
       51
        
         };

     

       54
       52
        
       }

+63 -7

pkgs/data/fonts/source-han/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
       -
         makePackage =

     

       8
       8
       +
         makeSuperOTC =

     

       9
       9
        
           { family

     

       10
       10
        
           , description

     

       11
       11
        
           , rev

     
···

       13
       13
        
           , zip ? ""

     

       14
       14
        
           , prefix ? ""

     

       15
       15
        
           }:

     

       16
       16
       -
           let Family =

     

       17
       17
       -
             lib.toUpper (lib.substring 0 1 family) +

     

       18
       18
       -
             lib.substring 1 (lib.stringLength family) family;

     

       16
       16
       +
           let

     

       17
       17
       +
             Family =

     

       18
       18
       +
               lib.toUpper (lib.substring 0 1 family) +

     

       19
       19
       +
               lib.substring 1 (lib.stringLength family) family;

     

       19
       20
        
           in

     

       20
       21
        
           stdenvNoCC.mkDerivation rec {

     

       21
       22
        
             pname = "source-han-${family}";

     
···

       49
       50
        
               maintainers = with lib.maintainers; [ taku0 emily ];

     

       50
       51
        
             };

     

       51
       52
        
           };

     

       53
       53
       +
       

     

       54
       54
       +
         makeVariable =

     

       55
       55
       +
           { family

     

       56
       56
       +
           , version

     

       57
       57
       +
           , hash

     

       58
       58
       +
           , format

     

       59
       59
       +
           }:

     

       60
       60
       +
           let

     

       61
       61
       +
             Family =

     

       62
       62
       +
               lib.toUpper (lib.substring 0 1 family) +

     

       63
       63
       +
               lib.substring 1 (lib.stringLength family) family;

     

       64
       64
       +
           in

     

       65
       65
       +
           fetchurl {

     

       66
       66
       +
             pname = "source-han-${family}-vf-${format}";

     

       67
       67
       +
             inherit version hash;

     

       68
       68
       +
             url = "https://raw.githubusercontent.com/adobe-fonts/source-han-${family}/${version}R/Variable/OTC/SourceHan${Family}-VF.${format}.ttc";

     

       69
       69
       +
             recursiveHash = true;

     

       70
       70
       +
             downloadToTemp = true;

     

       71
       71
       +
             postFetch = "install -Dm444 $downloadedFile $out/share/fonts/variable/SourceHan${Family}-VF.${format}.ttc";

     

       72
       72
       +
       

     

       73
       73
       +
             meta = {

     

       74
       74
       +
               description = "An open source Pan-CJK ${Family} typeface";

     

       75
       75
       +
               homepage = "https://github.com/adobe-fonts/source-han-${family}";

     

       76
       76
       +
               license = lib.licenses.ofl;

     

       77
       77
       +
               maintainers = with lib.maintainers; [ taku0 emily ];

     

       78
       78
       +
             };

     

       79
       79
       +
           };

     

       52
       80
        
       in

     

       53
       81
        
       {

     

       54
       54
       -
         sans = makePackage {

     

       82
       82
       +
         sans = makeSuperOTC {

     

       55
       83
        
           family = "sans";

     

       56
       84
        
           description = "sans-serif";

     

       57
       85
        
           rev = "2.004R";

     
···

       59
       87
        
           zip = ".zip";

     

       60
       88
        
         };

     

       61
       89
        
       

     

       62
       62
       -
         serif = makePackage {

     

       90
       90
       +
         serif = makeSuperOTC {

     

       63
       91
        
           family = "serif";

     

       64
       92
        
           description = "serif";

     

       65
       93
        
           rev = "2.001R";

     
···

       68
       96
        
           prefix = "01_";

     

       69
       97
        
         };

     

       70
       98
        
       

     

       71
       71
       -
         mono = makePackage {

     

       99
       99
       +
         mono = makeSuperOTC {

     

       72
       100
        
           family = "mono";

     

       73
       101
        
           description = "monospaced";

     

       74
       102
        
           rev = "1.002";

     

       75
       103
        
           hash = "sha256-DBkkSN6QhI8R64M2h2iDqaNtxluJZeSJYAz8x6ZzWME=";

     

       104
       104
       +
         };

     

       105
       105
       +
       

     

       106
       106
       +
         sans-vf-otf = makeVariable {

     

       107
       107
       +
           family = "sans";

     

       108
       108
       +
           version = "2.004";

     

       109
       109
       +
           hash = "sha256-V7PE09c7h4RDS8Ij4PSI36Gy+LM+PVDi73Rcs+4DfHo=";

     

       110
       110
       +
           format = "otf";

     

       111
       111
       +
         };

     

       112
       112
       +
       

     

       113
       113
       +
         sans-vf-ttf = makeVariable {

     

       114
       114
       +
           family = "sans";

     

       115
       115
       +
           version = "2.004";

     

       116
       116
       +
           hash = "sha256-mXTG/d30gUxzxkJpaH4vOawRXMSxxTXlHCvHEsfGqbc=";

     

       117
       117
       +
           format = "ttf";

     

       118
       118
       +
         };

     

       119
       119
       +
       

     

       120
       120
       +
         serif-vf-otf = makeVariable {

     

       121
       121
       +
           family = "serif";

     

       122
       122
       +
           version = "2.002";

     

       123
       123
       +
           hash = "sha256-8sD4bU6w7HBm4vBuPAjcjpxN2rtEJugAw+X0bAOcmjA=";

     

       124
       124
       +
           format = "otf";

     

       125
       125
       +
         };

     

       126
       126
       +
       

     

       127
       127
       +
         serif-vf-ttf = makeVariable {

     

       128
       128
       +
           family = "serif";

     

       129
       129
       +
           version = "2.002";

     

       130
       130
       +
           hash = "sha256-dmTZFRsD55WCOg2+sqd8bkmTSnSNn5xUYf0PgzIvzww=";

     

       131
       131
       +
           format = "ttf";

     

       76
       132
        
         };

     

       77
       133
        
       }

+54

pkgs/development/libraries/fbjni/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , fetchpatch

     

       6
       6
       +
       , jdk_headless

     

       7
       7
       +
       , gtest

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "fbjni";

     

       12
       12
       +
         version = "0.5.1";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "facebookincubator";

     

       16
       16
       +
           repo = pname;

     

       17
       17
       +
           rev = "v${version}";

     

       18
       18
       +
           sha256 = "sha256-97KqfFWtR3VJe2s0D60L3dsIDm4kMa0hpkKoZSAEoVY=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           # Part of https://github.com/facebookincubator/fbjni/pull/76

     

       23
       23
       +
           # fix cmake file installation directory

     

       24
       24
       +
           (fetchpatch {

     

       25
       25
       +
             url = "https://github.com/facebookincubator/fbjni/commit/ab02e60b5da28647bfcc864b0bb1b9a90504cdb1.patch";

     

       26
       26
       +
             sha256 = "sha256-/h6kosulRH/ZAU2u0zRSaNDK39jsnFt9TaSxyBllZqM=";

     

       27
       27
       +
           })

     

       28
       28
       +
           # install headers

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
             url = "https://github.com/facebookincubator/fbjni/commit/74e125caa9a815244f1e6bd08eaba57d015378b4.patch";

     

       31
       31
       +
             sha256 = "sha256-hQS35D69GD3ewV4zzPG+LO7jk7ncCj2CYDbLJ6SnpqE=";

     

       32
       32
       +
           })

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         nativeBuildInputs = [

     

       36
       36
       +
           cmake

     

       37
       37
       +
           jdk_headless

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         buildInputs = [

     

       41
       41
       +
           gtest

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         cmakeFlags = [

     

       45
       45
       +
           "-DJAVA_HOME=${jdk_headless.passthru.home}"

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         meta = with lib; {

     

       49
       49
       +
           description = "A library designed to simplify the usage of the Java Native Interface";

     

       50
       50
       +
           homepage = "https://github.com/facebookincubator/fbjni";

     

       51
       51
       +
           license = licenses.asl20;

     

       52
       52
       +
           maintainers = with maintainers; [ jonringer ];

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+2 -2

pkgs/development/libraries/graphene-hardened-malloc/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
       11
        
         pname = "graphene-hardened-malloc";

     

       12
       12
       -
         version = "11";

     

       12
       12
       +
         version = "12";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "GrapheneOS";

     

       16
       16
        
           repo = "hardened_malloc";

     

       17
       17
        
           rev = finalAttrs.version;

     

       18
       18
       -
           sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU=";

     

       18
       18
       +
           sha256 = "sha256-ujwzr4njNsf/VTyEq7zKHWxoivU3feavSTx+MLIj1ZM=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         doCheck = true;

+2 -2

pkgs/development/python-modules/marisa-trie/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "marisa-trie";

     

       13
       13
       -
         version = "1.0.0";

     

       13
       13
       +
         version = "1.1.0";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-2KaDAfAjpyTrN5qqGxD4ip4aRYzIpBtSfGJQeFm0pNI=";

     

       20
       20
       +
           hash = "sha256-W/Q+0M82r0V4/nsDTPlfUyQ5dmUWaA5L1gNyNhHr1Ws=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+39

pkgs/development/python-modules/sqids/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "sqids";

     

       11
       11
       +
         version = "0.3.0";

     

       12
       12
       +
         format = "pyproject";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.8";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchPypi {

     

       17
       17
       +
           inherit pname version;

     

       18
       18
       +
           hash = "sha256-qAY41kOp0m+mua/4bvVwuDW5p0EpwY675Ux3W1JsqbE=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           setuptools-scm

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         doCheck = true;

     

       26
       26
       +
       

     

       27
       27
       +
         nativeCheckInputs = [

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [ "sqids" ];

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           homepage = "https://sqids.org/python";

     

       35
       35
       +
           description = "A library that lets you generate short YouTube-looking IDs from numbers";

     

       36
       36
       +
           license = with licenses; mit;

     

       37
       37
       +
           maintainers = with maintainers; [ panicgh ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+2 -2

pkgs/development/python-modules/zodbpickle/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "zodbpickle";

     

       9
       9
       -
         version = "3.0.1";

     

       9
       9
       +
         version = "3.1";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-Dwl1vdSnYVMg50rysLi+R2PHPPi/fEISq3IEQonndJg=";

     

       16
       16
       +
           hash = "sha256-uewy5wbHuAi3mlOnrZZgkRfpQoN3K0AO52VSEHqrzBE=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         # fails..

+3 -3

pkgs/development/tools/oh-my-posh/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "oh-my-posh";

     

       9
       9
       -
         version = "18.7.0";

     

       9
       9
       +
         version = "18.10.3";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "jandedobbeleer";

     

       13
       13
        
           repo = pname;

     

       14
       14
        
           rev = "refs/tags/v${version}";

     

       15
       15
       -
           hash = "sha256-dnaKcyDy4TdlTPl0hCUCshW6aFMLUUFwVskv1jiO0fk=";

     

       15
       15
       +
           hash = "sha256-gNSG4jGGkvLyitqO4o44tv/nRGzOcX5haLUFdj/PqBM=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-GHOWcZqZmjL+EptcuCwbj0WSWKmhbsxpZFvHhlmsbxU=";

     

       18
       18
       +
         vendorHash = "sha256-ia5uglahH4btHYqeG3yyStOoM1ALxm/lQ+pyc0oxIwE=";

     

       19
       19
        
       

     

       20
       20
        
         sourceRoot = "${src.name}/src";

     

       21
       21

+3 -3

pkgs/development/tools/rust/rtthost/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "rtthost";

     

       13
       13
       -
         version = "0.20.0";

     

       13
       13
       +
         version = "0.21.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchCrate {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           hash = "sha256-h/D2LW8tQ2WfVrP+HOLs3Gg7HS2Rd0zXBxbnxvEeiWk=";

     

       17
       17
       +
           hash = "sha256-Vp2TXKDr6Mu4CD6RlHjTL04FIShzKXwNZmu0PIqx1FY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoHash = "sha256-cEzp33y1wuOrKHJBdAPxWUc1ANpT7Sg1MZmaCno1WKA=";

     

       20
       20
       +
         cargoHash = "sha256-XRxijak3kBMYCx9u39OWvqz3tjnKipjcV3DPEUBYrvQ=";

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];

     

       23
       23

+2 -2

pkgs/servers/monitoring/vmagent/default.nix

···

       1
       1
        
       { lib, fetchFromGitHub, buildGoModule }:

     

       2
       2
        
       buildGoModule rec {

     

       3
       3
        
         pname = "vmagent";

     

       4
       4
       -
         version = "1.93.0";

     

       4
       4
       +
         version = "1.93.5";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "VictoriaMetrics";

     

       8
       8
        
           repo = "VictoriaMetrics";

     

       9
       9
        
           rev = "v${version}";

     

       10
       10
       -
           sha256 = "sha256-NkpMGsNz4knt5QY6B9sPJ3GcXEgPNyNgAsNBs9F2GOQ=";

     

       10
       10
       +
           sha256 = "sha256-AC3tQAgGHKl86MakfSWnFMX1Lr5r7RwZfomXtp5/oBs=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];

-1

pkgs/servers/tracing/tempo/default.nix

···

       38
       38
        
           license = licenses.asl20;

     

       39
       39
        
           homepage = "https://grafana.com/oss/tempo/";

     

       40
       40
        
           maintainers = with maintainers; [ willibutz ];

     

       41
       41
       -
           platforms = platforms.linux;

     

       42
       41
        
         };

     

       43
       42
        
       }

+8 -2

pkgs/tools/llm/open-interpreter/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , python3

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , semgrep

     

       4
       5
        
       }:

     

       5
       6
        
       let

     

       6
       6
       -
         version = "0.1.4";

     

       7
       7
       +
         version = "0.1.7";

     

       7
       8
        
       in

     

       8
       9
        
       python3.pkgs.buildPythonApplication {

     

       9
       10
        
         pname = "open-interpreter";

     
···

       14
       15
        
           owner = "KillianLucas";

     

       15
       16
        
           repo = "open-interpreter";

     

       16
       17
        
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-3a4pRV8o+NBZGgOuXng97KjRVU8xVqBp+B9sXsCqHtk=";

     

       18
       18
       +
           hash = "sha256-U+GKvlFY9vkjXaPI0H5RsoMFLlLq1+IuSy/cOj/LNSw=";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         nativeBuildInputs = [

     
···

       31
       32
        
           openai

     

       32
       33
        
           # pyreadline3 # this is a windows deps

     

       33
       34
        
           python-dotenv

     

       35
       35
       +
           pyyaml

     

       34
       36
        
           rich

     

       35
       37
        
           six

     

       36
       38
        
           tiktoken

     

       37
       39
        
           tokentrim

     

       38
       40
        
           wget

     

       41
       41
       +
           yaspin

     

       42
       42
       +
         ] ++ [

     

       43
       43
       +
           semgrep

     

       39
       44
        
         ];

     

       40
       45
        
       

     

       41
       46
        
         # the import check phase fails trying to do a network request to openai

     
···

       48
       53
        
           license = licenses.mit;

     

       49
       54
        
           changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}";

     

       50
       55
        
           maintainers = with maintainers; [ happysalada ];

     

       56
       56
       +
           mainProgram = "interpreter";

     

       51
       57
        
         };

     

       52
       58
        
       }

+5 -5

pkgs/tools/misc/a4term/default.nix pkgs/by-name/a4/a4/package.nix

···

       5
       5
        
       , libvterm-neovim

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       stdenv.mkDerivation rec {

     

       9
       9
       -
         pname = "a4term";

     

       8
       8
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
       +
         pname = "a4";

     

       10
       10
        
         version = "0.2.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "rpmohn";

     

       14
       14
        
           repo = "a4";

     

       15
       15
       -
           rev = "v${version}";

     

       15
       15
       +
           rev = "v${finalAttrs.version}";

     

       16
       16
        
           hash = "sha256-AX5psz9+bLdFFeDR55TIrAWDAkhDygw6289OgIfOJTg=";

     

       17
       17
        
         };

     

       18
       18
        
       

     
···

       21
       21
        
           libvterm-neovim

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
       -
         makeFlags = [ "PREFIX=$(out)" ];

     

       24
       24
       +
         installFlags = [ "PREFIX=${placeholder "out"}" ];

     

       25
       25
        
       

     

       26
       26
        
         meta = {

     

       27
       27
        
           description = "A dynamic terminal window manager";

     
···

       31
       31
        
           platforms = lib.platforms.linux;

     

       32
       32
        
           mainProgram = "a4";

     

       33
       33
        
         };

     

       34
       34
       -
       }

     

       34
       34
       +
       })

+4 -4

pkgs/tools/misc/rot8/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "rot8";

     

       5
       5
       -
         version = "0.1.5";

     

       5
       5
       +
         version = "1.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "efernau";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "refs/tags/v${version}";

     

       11
       11
       -
           hash = "sha256-i+VLVA/XKZiFPEeFHR3CpZKi8CWA/tiaZJerciqQHJ0=";

     

       11
       11
       +
           hash = "sha256-dHx3vFY0ztyTIlzUi22TYphPD5hvgfHrWaaeoGxnvW0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-Zz3RK79pMBn9JcpOVHf8vrvQzOJuV7anm136HcTBhJE=";

     

       14
       14
       +
         cargoHash = "sha256-KDg6Ggnm6Cl/1fXqNcc7/jRFJ6KTLVGveJ6Fs3NLlHE=";

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
       -
           description = "screen rotation daemon for X11 and sway";

     

       17
       17
       +
           description = "screen rotation daemon for X11 and wlroots";

     

       18
       18
        
           homepage = "https://github.com/efernau/rot8";

     

       19
       19
        
           license = licenses.mit;

     

       20
       20
        
           maintainers = [ maintainers.smona ];

+5 -4

pkgs/tools/misc/rtx/default.nix

···

       10
       10
        
       , openssl

     

       11
       11
        
       , direnv

     

       12
       12
        
       , Security

     

       13
       13
       +
       , SystemConfiguration

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       rustPlatform.buildRustPackage rec {

     

       16
       17
        
         pname = "rtx";

     

       17
       17
       -
         version = "2023.9.0";

     

       18
       18
       +
         version = "2023.10.1";

     

       18
       19
        
       

     

       19
       20
        
         src = fetchFromGitHub {

     

       20
       21
        
           owner = "jdxcode";

     

       21
       22
        
           repo = "rtx";

     

       22
       23
        
           rev = "v${version}";

     

       23
       23
       -
           hash = "sha256-TH2JC+Cjw+ed1O33QKGq+lonIKlu6pHuY1jtrZh/FMM=";

     

       24
       24
       +
           hash = "sha256-E0jBTnfp8asLC2V8TtYSCh6fTxqkFwCMZjsjjBKEN0s=";

     

       24
       25
        
         };

     

       25
       26
        
       

     

       26
       26
       -
         cargoHash = "sha256-zJVCzVgwU9lR3E61w+71eUd7Au9LmJcbHtgLvzTj7r4=";

     

       27
       27
       +
         cargoHash = "sha256-n/GxC5wDfhPboynFu8S1f9+kNDVmcKoSHaT96khyi2Q=";

     

       27
       28
        
       

     

       28
       29
        
         nativeBuildInputs = [ installShellFiles pkg-config ];

     

       29
       29
       -
         buildInputs = [ openssl  ] ++ lib.optionals stdenv.isDarwin [ Security ];

     

       30
       30
       +
         buildInputs = [ openssl  ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

     

       30
       31
        
       

     

       31
       32
        
         postPatch = ''

     

       32
       33
        
           patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs

+11 -1

pkgs/tools/system/nsc/default.nix

···

       39
       39
        
           export HOME=$(mktemp -d)

     

       40
       40
        
         '';

     

       41
       41
        
       

     

       42
       42
       +
         # Tests currently fail on darwin because of a test in nsc which

     

       43
       43
       +
         # expects command output to contain a specific path. However

     

       44
       44
       +
         # the test strips table formatting from the command output in a naive way

     

       45
       45
       +
         # that removes all the table characters, including '-'.

     

       46
       46
       +
         # The nix build directory looks something like:

     

       47
       47
       +
         # /private/tmp/nix-build-nsc-2.8.1.drv-0/nsc_test2000598938/keys

     

       48
       48
       +
         # Then the `-` are removed from the path unintentionally and the test fails.

     

       49
       49
       +
         # This should be fixed upstream to avoid mangling the path when

     

       50
       50
       +
         # removing the table decorations from the command output.

     

       51
       51
       +
         doCheck = !stdenv.isDarwin;

     

       52
       52
       +
       

     

       42
       53
        
         meta = {

     

       43
       54
        
           description = "A tool for creating NATS account and user access configurations";

     

       44
       55
        
           homepage = "https://github.com/nats-io/nsc";

     

       45
       56
        
           license = with lib.licenses; [ asl20 ];

     

       46
       57
        
           maintainers = with lib.maintainers; [ cbrewster ];

     

       47
       58
        
           mainProgram = "nsc";

     

       48
       48
       -
           broken = stdenv.isDarwin;

     

       49
       59
        
         };

     

       50
       60
        
       }

+8 -16

pkgs/tools/virtualization/awsebcli/default.nix

···

       1
       1
       -
       { lib, python3, fetchFromGitHub, glibcLocales, docker-compose_1, git }:

     

       1
       1
       +
       { lib, python3, fetchFromGitHub, glibcLocales, git }:

     

       2
       2
        
       let

     

       3
       3
       -
         docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override {

     

       4
       4
       -
           inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko;

     

       5
       5
       -
         }).overridePythonAttrs "1.25.5" "sha256-ei622Bc/30COUF5vfUl6wLd3OIcZVCvp5JoO/Ud6UMY=";

     

       6
       6
       -
       

     

       7
       3
        
         changeVersion = overrideFunc: version: hash: overrideFunc (oldAttrs: rec {

     

       8
       4
        
           inherit version;

     

       9
       5
        
           src = oldAttrs.src.override {

     
···

       11
       7
        
           };

     

       12
       8
        
         });

     

       13
       9
        
       

     

       14
       14
       -
         localPython = python3.override

     

       15
       15
       -
           {

     

       16
       16
       -
             self = localPython;

     

       17
       17
       -
             packageOverrides = self: super: {

     

       18
       18
       -
               cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI=";

     

       19
       19
       -
               wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE=";

     

       20
       20
       -
               semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ=";

     

       21
       21
       -
             };

     

       10
       10
       +
         localPython = python3.override {

     

       11
       11
       +
           self = localPython;

     

       12
       12
       +
           packageOverrides = self: super: {

     

       13
       13
       +
             cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI=";

     

       22
       14
        
           };

     

       15
       15
       +
         };

     

       23
       16
        
       in

     

       24
       17
        
       with localPython.pkgs; buildPythonApplication rec {

     

       25
       18
        
         pname = "awsebcli";

     

       26
       26
       -
         version = "3.20.9";

     

       19
       19
       +
         version = "3.20.10";

     

       27
       20
        
         format = "setuptools";

     

       28
       21
        
       

     

       29
       22
        
         src = fetchFromGitHub {

     

       30
       23
        
           owner = "aws";

     

       31
       24
        
           repo = "aws-elastic-beanstalk-cli";

     

       32
       25
        
           rev = "refs/tags/${version}";

     

       33
       33
       -
           hash = "sha256-tnBDEeR+SCHb9UT3pTO7ISm4TVICvVfrV5cfz/60YQY=";

     

       26
       26
       +
           hash = "sha256-4JZx0iTMyrPHbuS3zlhpiWnenAQO5eSBJbPHUizLhYo=";

     

       34
       27
        
         };

     

       35
       28
        
       

     

       36
       29
        
         postPatch = ''

     
···

       60
       53
        
           tabulate

     

       61
       54
        
           termcolor

     

       62
       55
        
           websocket-client

     

       63
       63
       -
           docker_compose

     

       64
       56
        
         ];

     

       65
       57
        
       

     

       66
       58
        
         pythonRelaxDeps = [

+1

pkgs/top-level/aliases.nix

···

       55
       55
        
       

     

       56
       56
        
         ### A ###

     

       57
       57
        
       

     

       58
       58
       +
         a4term = a4; # Added 2023-10-06

     

       58
       59
        
         airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19

     

       59
       60
        
         alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream" ; # Added 2023-07-28

     

       60
       61
        
         alsaLib = alsa-lib; # Added 2021-06-09

+7 -3

pkgs/top-level/all-packages.nix

···

       7657
       7657
        
       

     

       7658
       7658
        
         dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };

     

       7659
       7659
        
       

     

       7660
       7660
       -
         a4term = callPackage ../tools/misc/a4term { };

     

       7661
       7661
       -
       

     

       7662
       7660
        
         erofs-utils = callPackage ../tools/filesystems/erofs-utils { };

     

       7663
       7661
        
       

     

       7664
       7662
        
         e2tools = callPackage ../tools/filesystems/e2tools { };

     
···

       8250
       8248
        
         fermyon-spin = callPackage ../development/tools/fermyon-spin { };

     

       8251
       8249
        
       

     

       8252
       8250
        
         fbcat = callPackage ../tools/misc/fbcat { };

     

       8251
       8251
       +
       

     

       8252
       8252
       +
         fbjni = callPackage ../development/libraries/fbjni { };

     

       8253
       8253
        
       

     

       8254
       8254
        
         fbv = callPackage ../tools/graphics/fbv { };

     

       8255
       8255
        
       

     
···

       18469
       18469
        
         asdf-vm = callPackage ../tools/misc/asdf-vm { };

     

       18470
       18470
        
       

     

       18471
       18471
        
         rtx = callPackage ../tools/misc/rtx {

     

       18472
       18472
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       18472
       18472
       +
           inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;

     

       18473
       18473
        
         };

     

       18474
       18474
        
       

     

       18475
       18475
        
         ### DEVELOPMENT / TOOLS

     
···

       30221
       30221
        
         source-han-sans = sourceHanPackages.sans;

     

       30222
       30222
        
         source-han-serif = sourceHanPackages.serif;

     

       30223
       30223
        
         source-han-mono = sourceHanPackages.mono;

     

       30224
       30224
       +
         source-han-sans-vf-otf = sourceHanPackages.sans-vf-otf;

     

       30225
       30225
       +
         source-han-sans-vf-ttf = sourceHanPackages.sans-vf-ttf;

     

       30226
       30226
       +
         source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;

     

       30227
       30227
       +
         source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;

     

       30224
       30228
        
       

     

       30225
       30229
        
         spleen = callPackage ../data/fonts/spleen { };

     

       30226
       30230

+2

pkgs/top-level/python-packages.nix

···

       13213
       13213
        
       

     

       13214
       13214
        
         spyse-python = callPackage ../development/python-modules/spyse-python { };

     

       13215
       13215
        
       

     

       13216
       13216
       +
         sqids = callPackage ../development/python-modules/sqids { };

     

       13217
       13217
       +
       

     

       13216
       13218
        
         sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };

     

       13217
       13219
        
       

     

       13218
       13220
        
         sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };