commit e42705c98279f4f602face96269034164b6e77f5 · pyrox.dev/nixpkgs

+14 -2

lib/licenses.nix

···

       93
       93
        
           url = "https://aomedia.org/license/patent-license/";

     

       94
       94
        
         };

     

       95
       95
        
       

     

       96
       96
       -
         apsl10 = {

     

       96
       96
       +
         apple-psl10 = {

     

       97
       97
        
           spdxId = "APSL-1.0";

     

       98
       98
        
           fullName = "Apple Public Source License 1.0";

     

       99
       99
        
         };

     

       100
       100
        
       

     

       101
       101
       -
         apsl20 = {

     

       101
       101
       +
         apple-psl20 = {

     

       102
       102
        
           spdxId = "APSL-2.0";

     

       103
       103
        
           fullName = "Apple Public Source License 2.0";

     

       104
       104
        
         };

     
···

       1272
       1272
        
         };

     

       1273
       1273
        
       } // {

     

       1274
       1274
        
         # TODO: remove legacy aliases

     

       1275
       1275
       +
         apsl10 = {

     

       1276
       1276
       +
           # deprecated for consistency with `apple-psl20`; use `apple-psl10`

     

       1277
       1277
       +
           spdxId = "APSL-1.0";

     

       1278
       1278
       +
           fullName = "Apple Public Source License 1.0";

     

       1279
       1279
       +
           deprecated = true;

     

       1280
       1280
       +
         };

     

       1281
       1281
       +
         apsl20 = {

     

       1282
       1282
       +
           # deprecated due to confusion with Apache-2.0; use `apple-psl20`

     

       1283
       1283
       +
           spdxId = "APSL-2.0";

     

       1284
       1284
       +
           fullName = "Apple Public Source License 2.0";

     

       1285
       1285
       +
           deprecated = true;

     

       1286
       1286
       +
         };

     

       1275
       1287
        
         gpl2 = {

     

       1276
       1288
        
           spdxId = "GPL-2.0";

     

       1277
       1289
        
           fullName = "GNU General Public License v2.0";

+1 -1

pkgs/by-name/op/opencflite/package.nix

···

       36
       36
        
         meta = {

     

       37
       37
        
           description = "Cross platform port of the macOS CoreFoundation";

     

       38
       38
        
           homepage = "https://github.com/gerickson/opencflite";

     

       39
       39
       -
           license = lib.licenses.apsl20;

     

       39
       39
       +
           license = lib.licenses.apple-psl20;

     

       40
       40
        
           maintainers = with lib.maintainers; [ wegank ];

     

       41
       41
        
           platforms = [ "x86_64-linux" ];

     

       42
       42
        
         };

+1 -1

pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix

···

       15
       15
        
         meta = with lib; {

     

       16
       16
        
           maintainers = with maintainers; [ copumpkin ];

     

       17
       17
        
           platforms   = platforms.darwin;

     

       18
       18
       -
           license     = licenses.apsl20;

     

       18
       18
       +
           license     = licenses.apple-psl20;

     

       19
       19
        
         };

     

       20
       20
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix

···

       37
       37
        
         meta = with lib; {

     

       38
       38
        
           maintainers = with maintainers; [ copumpkin ];

     

       39
       39
        
           platforms   = platforms.darwin;

     

       40
       40
       -
           license     = licenses.apsl20;

     

       40
       40
       +
           license     = licenses.apple-psl20;

     

       41
       41
        
         };

     

       42
       42
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix

···

       24
       24
        
           description = "Apple's common startup stubs for darwin";

     

       25
       25
        
           maintainers = with maintainers; [ copumpkin ];

     

       26
       26
        
           platforms   = platforms.darwin;

     

       27
       27
       -
           license     = licenses.apsl20;

     

       27
       27
       +
           license     = licenses.apple-psl20;

     

       28
       28
        
         };

     

       29
       29
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix

···

       183
       183
        
         meta = with lib; {

     

       184
       184
        
           maintainers = with maintainers; [ copumpkin ];

     

       185
       185
        
           platforms   = platforms.darwin;

     

       186
       186
       -
           license     = licenses.apsl20;

     

       186
       186
       +
           license     = licenses.apple-psl20;

     

       187
       187
        
         };

     

       188
       188
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix

···

       17
       17
        
         meta = with lib; {

     

       18
       18
        
           maintainers = with maintainers; [ matthewbauer ];

     

       19
       19
        
           platforms   = platforms.darwin;

     

       20
       20
       -
           license     = licenses.apsl20;

     

       20
       20
       +
           license     = licenses.apple-psl20;

     

       21
       21
        
         };

     

       22
       22
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix

···

       181
       181
        
           description = "The Mac OS libc/libSystem (tapi library with pure headers)";

     

       182
       182
        
           maintainers = with maintainers; [ copumpkin gridaphobe ];

     

       183
       183
        
           platforms   = platforms.darwin;

     

       184
       184
       -
           license     = licenses.apsl20;

     

       184
       184
       +
           license     = licenses.apple-psl20;

     

       185
       185
        
         };

     

       186
       186
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix

···

       34
       34
        
         meta = with lib; {

     

       35
       35
        
           maintainers = with maintainers; [ copumpkin ];

     

       36
       36
        
           platforms   = platforms.darwin;

     

       37
       37
       -
           license     = licenses.apsl20;

     

       37
       37
       +
           license     = licenses.apple-psl20;

     

       38
       38
        
         };

     

       39
       39
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/default.nix

···

       187
       187
        
         } // (if builtins.isFunction attrs then attrs finalAttrs else attrs) // {

     

       188
       188
        
           meta = (with lib; {

     

       189
       189
        
             platforms = platforms.darwin;

     

       190
       190
       -
             license = licenses.apsl20;

     

       190
       190
       +
             license = licenses.apple-psl20;

     

       191
       191
        
           }) // (attrs.meta or {});

     

       192
       192
        
         });

     

       193
       193

+1 -1

pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix

···

       11
       11
        
           description = "Impure primitive symlinks to the Mac OS native dyld, along with headers";

     

       12
       12
        
           maintainers = with maintainers; [ copumpkin ];

     

       13
       13
        
           platforms   = platforms.darwin;

     

       14
       14
       -
           license     = licenses.apsl20;

     

       14
       14
       +
           license     = licenses.apple-psl20;

     

       15
       15
        
         };

     

       16
       16
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix

···

       12
       12
        
         meta = with lib; {

     

       13
       13
        
           maintainers = with maintainers; [ copumpkin lnl7 ];

     

       14
       14
        
           platforms   = platforms.darwin;

     

       15
       15
       -
           license     = licenses.apsl20;

     

       15
       15
       +
           license     = licenses.apple-psl20;

     

       16
       16
        
         };

     

       17
       17
        
       }

+1 -1

pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix

···

       38
       38
        
         meta = with lib; {

     

       39
       39
        
           maintainers = with maintainers; [ copumpkin ];

     

       40
       40
        
           platforms   = platforms.darwin;

     

       41
       41
       -
           license     = licenses.apsl20;

     

       41
       41
       +
           license     = licenses.apple-psl20;

     

       42
       42
        
         };

     

       43
       43
        
       }

+1 -1

pkgs/os-specific/darwin/cctools/apple.nix

···

       116
       116
        
         meta = with lib; {

     

       117
       117
        
           description = "MacOS Compiler Tools";

     

       118
       118
        
           homepage = "http://www.opensource.apple.com/source/cctools/";

     

       119
       119
       -
           license = licenses.apsl20;

     

       119
       119
       +
           license = licenses.apple-psl20;

     

       120
       120
        
           platforms = platforms.darwin;

     

       121
       121
        
         };

     

       122
       122
        
       }

+1 -1

pkgs/os-specific/darwin/cctools/port.nix

···

       186
       186
        
           broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets

     

       187
       187
        
           homepage = "http://www.opensource.apple.com/source/cctools/";

     

       188
       188
        
           description = "MacOS Compiler Tools (cross-platform port)";

     

       189
       189
       -
           license = lib.licenses.apsl20;

     

       189
       189
       +
           license = lib.licenses.apple-psl20;

     

       190
       190
        
           maintainers = with lib.maintainers; [ matthewbauer ];

     

       191
       191
        
         };

     

       192
       192
        
       }

+1 -1

pkgs/servers/x11/quartz-wm/default.nix

···

       24
       24
        
           AppKit Xplugin Foundation

     

       25
       25
        
         ];

     

       26
       26
        
         meta = with lib; {

     

       27
       27
       -
           license = licenses.apsl20;

     

       27
       27
       +
           license = licenses.apple-psl20;

     

       28
       28
        
           platforms = platforms.darwin;

     

       29
       29
        
           maintainers = with maintainers; [ matthewbauer ];

     

       30
       30
        
         };

+1 -1

pkgs/tools/filesystems/hfsprogs/default.nix

···

       52
       52
        
       

     

       53
       53
        
         meta = {

     

       54
       54
        
           description = "HFS/HFS+ user space utils";

     

       55
       55
       -
           license = lib.licenses.apsl20;

     

       55
       55
       +
           license = lib.licenses.apple-psl20;

     

       56
       56
        
           platforms = lib.platforms.linux;

     

       57
       57
        
         };

     

       58
       58
        
       }

+1 -1

pkgs/tools/system/pdisk/default.nix

···

       82
       82
        
           homepage = "https://github.com/apple-oss-distributions/pdisk";

     

       83
       83
        
           license = with licenses; [

     

       84
       84
        
             hpnd # original license statements seems to match this (in files that are shared with mac-fdisk)

     

       85
       85
       -
             apsl10 # new files

     

       85
       85
       +
             apple-psl10 # new files

     

       86
       86
        
           ];

     

       87
       87
        
           maintainers = with maintainers; [ OPNA2608 ];

     

       88
       88
        
           platforms = platforms.unix;