commit 8c2cf79031f7a91c1dca92910a6719a5b84c8fa2 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/prowlarr.nix

···

       31
       31
        
               Type = "simple";

     

       32
       32
        
               DynamicUser = true;

     

       33
       33
        
               StateDirectory = "prowlarr";

     

       34
       34
       -
               ExecStart = "${cfg.package}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr";

     

       34
       34
       +
               ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr";

     

       35
       35
        
               Restart = "on-failure";

     

       36
       36
        
             };

     

       37
       37
        
           };

+2 -2

nixos/modules/virtualisation/vmware-guest.nix

···

       24
       24
        
       

     

       25
       25
        
         config = mkIf cfg.enable {

     

       26
       26
        
           assertions = [ {

     

       27
       27
       -
             assertion = pkgs.stdenv.hostPlatform.isx86;

     

       27
       27
       +
             assertion = pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isAarch64;

     

       28
       28
        
             message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}";

     

       29
       29
        
           } ];

     

       30
       30
        
       

     

       31
       31
        
           boot.initrd.availableKernelModules = [ "mptspi" ];

     

       32
       32
       -
           boot.initrd.kernelModules = [ "vmw_pvscsi" ];

     

       32
       32
       +
           boot.initrd.kernelModules = lib.optionals pkgs.stdenv.hostPlatform.isx86 [ "vmw_pvscsi" ];

     

       33
       33
        
       

     

       34
       34
        
           environment.systemPackages = [ open-vm-tools ];

     

       35
       35

+1

nixos/tests/kernel-generic.nix

···

       32
       32
        
             linux_5_15_hardened

     

       33
       33
        
             linux_6_1_hardened

     

       34
       34
        
             linux_6_3_hardened

     

       35
       35
       +
             linux_6_4_hardened

     

       35
       36
        
       

     

       36
       37
        
             linux_testing;

     

       37
       38
        
         };

+12

pkgs/applications/editors/vim/plugins/generated.nix

···

       1385
       1385
        
           meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/";

     

       1386
       1386
        
         };

     

       1387
       1387
        
       

     

       1388
       1388
       +
         cmp-beancount = buildVimPluginFrom2Nix {

     

       1389
       1389
       +
           pname = "cmp-beancount";

     

       1390
       1390
       +
           version = "2022-11-27";

     

       1391
       1391
       +
           src = fetchFromGitHub {

     

       1392
       1392
       +
             owner = "crispgm";

     

       1393
       1393
       +
             repo = "cmp-beancount";

     

       1394
       1394
       +
             rev = "da154ea94d598e6649d6ad01efa0a8611eff460d";

     

       1395
       1395
       +
             sha256 = "14y2h8g5ddcf2rqwgrrsk8m3j4wmk26vdlqzx439n893dzmzd2yg";

     

       1396
       1396
       +
           };

     

       1397
       1397
       +
           meta.homepage = "https://github.com/crispgm/cmp-beancount/";

     

       1398
       1398
       +
         };

     

       1399
       1399
       +
       

     

       1388
       1400
        
         cmp-buffer = buildVimPluginFrom2Nix {

     

       1389
       1401
        
           pname = "cmp-buffer";

     

       1390
       1402
        
           version = "2022-08-10";

+1

pkgs/applications/editors/vim/plugins/vim-plugin-names

···

       115
       115
        
       https://github.com/ekickx/clipboard-image.nvim/,,

     

       116
       116
        
       https://github.com/asheq/close-buffers.vim/,HEAD,

     

       117
       117
        
       https://github.com/winston0410/cmd-parser.nvim/,,

     

       118
       118
       +
       https://github.com/crispgm/cmp-beancount/,HEAD,

     

       118
       119
        
       https://github.com/hrsh7th/cmp-buffer/,,

     

       119
       120
        
       https://github.com/hrsh7th/cmp-calc/,,

     

       120
       121
        
       https://github.com/vappolinario/cmp-clippy/,HEAD,

+29 -4

pkgs/applications/editors/vscode/extensions/default.nix

···

       2195
       2195
        
             };

     

       2196
       2196
        
       

     

       2197
       2197
        
             mgt19937.typst-preview = buildVscodeMarketplaceExtension {

     

       2198
       2198
       -
               mktplcRef = {

     

       2198
       2198
       +
               mktplcRef =

     

       2199
       2199
       +
               let

     

       2200
       2200
       +
                 sources = {

     

       2201
       2201
       +
                   "x86_64-linux" = {

     

       2202
       2202
       +
                     arch = "linux-x64";

     

       2203
       2203
       +
                     sha256 = "sha256-O8sFv23tlhJS6N8LRKkHcTJTupZejCLDRdVVCdDlWbA=";

     

       2204
       2204
       +
                   };

     

       2205
       2205
       +
                   "x86_64-darwin" = {

     

       2206
       2206
       +
                     arch = "darwin-x64";

     

       2207
       2207
       +
                     sha256 = "1npzjch67agswh3nm14dbbsx777daq2rdw1yny10jf3858z2qynr";

     

       2208
       2208
       +
                   };

     

       2209
       2209
       +
                   "aarch64-linux" = {

     

       2210
       2210
       +
                     arch = "linux-arm64";

     

       2211
       2211
       +
                     sha256 = "1vv1jfgnyjbmshh4w6rf496d9dpdsk3f0049ii4d9vi23igk4xpk";

     

       2212
       2212
       +
                   };

     

       2213
       2213
       +
                   "aarch64-darwin" = {

     

       2214
       2214
       +
                     arch = "darwin-arm64";

     

       2215
       2215
       +
                     sha256 = "0dfchzqm61kddq20zvp1pcpk1625b9wgj32ymc08piq06pbadk29";

     

       2216
       2216
       +
                   };

     

       2217
       2217
       +
                 };

     

       2218
       2218
       +
               in

     

       2219
       2219
       +
               {

     

       2199
       2220
        
                 name = "typst-preview";

     

       2200
       2221
        
                 publisher = "mgt19937";

     

       2201
       2201
       -
                 version = "0.6.0";

     

       2202
       2202
       -
                 sha256 = "sha256-ZrsTtbD3oIUjxSC1osGYwTynwvDFQxuGeDglopBJGxA=";

     

       2203
       2203
       -
               };

     

       2222
       2222
       +
                 version = "0.6.1";

     

       2223
       2223
       +
               } // sources.${stdenv.system};

     

       2224
       2224
       +
       

     

       2225
       2225
       +
               nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       2226
       2226
       +
       

     

       2227
       2227
       +
               buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ];

     

       2228
       2228
       +
       

     

       2204
       2229
        
               meta = {

     

       2205
       2230
        
                 description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";

     

       2206
       2231
        
                 downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";

+75 -26

pkgs/applications/gis/grass/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw

     

       2
       2
       -
       , cairo, readline, ffmpeg, makeWrapper, wxGTK32, libiconv, libxml2, netcdf, blas

     

       3
       3
       -
       , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, proj-datumgrid

     

       4
       4
       -
       , zstd, pdal, wrapGAppsHook

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , callPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , wrapGAppsHook

     

       7
       7
       +
       

     

       8
       8
       +
       , bison

     

       9
       9
       +
       , blas

     

       10
       10
       +
       , cairo

     

       11
       11
       +
       , ffmpeg

     

       12
       12
       +
       , fftw

     

       13
       13
       +
       , flex

     

       14
       14
       +
       , gdal

     

       15
       15
       +
       , geos

     

       16
       16
       +
       , libiconv

     

       17
       17
       +
       , libmysqlclient

     

       18
       18
       +
       , libpng

     

       19
       19
       +
       , libtiff

     

       20
       20
       +
       , libxml2

     

       21
       21
       +
       , netcdf

     

       22
       22
       +
       , pdal

     

       23
       23
       +
       , pkg-config

     

       24
       24
       +
       , postgresql

     

       25
       25
       +
       , proj

     

       26
       26
       +
       , proj-datumgrid

     

       27
       27
       +
       , python3Packages

     

       28
       28
       +
       , readline

     

       29
       29
       +
       , sqlite

     

       30
       30
       +
       , wxGTK32

     

       31
       31
       +
       , zlib

     

       32
       32
       +
       , zstd

     

       5
       33
        
       }:

     

       6
       34
        
       

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       35
       35
       +
       stdenv.mkDerivation (finalAttrs: rec {

     

       8
       36
        
         pname = "grass";

     

       9
       37
        
         version = "8.3.0";

     

       10
       38
        
       

     
···

       16
       44
        
         };

     

       17
       45
        
       

     

       18
       46
        
         nativeBuildInputs = [

     

       19
       19
       -
           pkg-config bison flex makeWrapper wrapGAppsHook

     

       47
       47
       +
           makeWrapper

     

       48
       48
       +
           wrapGAppsHook

     

       49
       49
       +
       

     

       50
       50
       +
           bison

     

       51
       51
       +
           flex

     

       20
       52
        
           gdal # for `gdal-config`

     

       21
       53
        
           geos # for `geos-config`

     

       22
       22
       -
           netcdf # for `nc-config`

     

       23
       54
        
           libmysqlclient # for `mysql_config`

     

       55
       55
       +
           netcdf # for `nc-config`

     

       56
       56
       +
           pkg-config

     

       24
       57
        
         ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);

     

       25
       58
        
       

     

       26
       59
        
         buildInputs = [

     

       27
       27
       -
           cairo zlib proj libtiff libpng libxml2 fftw sqlite

     

       28
       28
       -
           readline ffmpeg postgresql blas wxGTK32

     

       29
       29
       -
           proj-datumgrid zstd

     

       60
       60
       +
           blas

     

       61
       61
       +
           cairo

     

       62
       62
       +
           ffmpeg

     

       63
       63
       +
           fftw

     

       30
       64
        
           gdal

     

       31
       65
        
           geos

     

       66
       66
       +
           libmysqlclient

     

       67
       67
       +
           libpng

     

       68
       68
       +
           libtiff

     

       69
       69
       +
           libxml2

     

       32
       70
        
           netcdf

     

       33
       33
       -
           libmysqlclient

     

       34
       71
        
           pdal

     

       72
       72
       +
           postgresql

     

       73
       73
       +
           proj

     

       74
       74
       +
           proj-datumgrid

     

       75
       75
       +
           readline

     

       76
       76
       +
           sqlite

     

       77
       77
       +
           wxGTK32

     

       78
       78
       +
           zlib

     

       79
       79
       +
           zstd

     

       35
       80
        
         ] ++ lib.optionals stdenv.isDarwin [ libiconv ];

     

       36
       81
        
       

     

       37
       82
        
         strictDeps = true;

     
···

       46
       91
        
         '';

     

       47
       92
        
       

     

       48
       93
        
         configureFlags = [

     

       49
       49
       -
           "--with-proj-share=${proj}/share/proj"

     

       50
       50
       -
           "--with-proj-includes=${proj.dev}/include"

     

       51
       51
       -
           "--with-proj-libs=${proj}/lib"

     

       52
       52
       -
           "--without-opengl"

     

       53
       53
       -
           "--with-readline"

     

       54
       54
       -
           "--with-wxwidgets"

     

       55
       55
       -
           "--with-netcdf"

     

       94
       94
       +
           "--with-blas"

     

       95
       95
       +
           "--with-fftw"

     

       56
       96
        
           "--with-geos"

     

       57
       57
       -
           "--with-postgres"

     

       58
       58
       -
           "--with-postgres-libs=${postgresql.lib}/lib/"

     

       59
       59
       -
           # it complains about missing libmysqld but doesn't really seem to need it

     

       97
       97
       +
           # It complains about missing libmysqld but doesn't really seem to need it

     

       60
       98
        
           "--with-mysql"

     

       61
       99
        
           "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql"

     

       62
       100
        
           "--with-mysql-libs=${libmysqlclient}/lib/mysql"

     

       63
       63
       -
           "--with-blas"

     

       64
       64
       -
           "--with-zstd"

     

       65
       65
       -
           "--with-fftw"

     

       101
       101
       +
           "--with-netcdf"

     

       102
       102
       +
           "--with-postgres"

     

       103
       103
       +
           "--with-postgres-libs=${postgresql.lib}/lib/"

     

       104
       104
       +
           "--with-proj-includes=${proj.dev}/include"

     

       105
       105
       +
           "--with-proj-libs=${proj}/lib"

     

       106
       106
       +
           "--with-proj-share=${proj}/share/proj"

     

       66
       107
        
           "--with-pthread"

     

       108
       108
       +
           "--with-readline"

     

       109
       109
       +
           "--with-wxwidgets"

     

       110
       110
       +
           "--with-zstd"

     

       111
       111
       +
           "--without-opengl"

     

       67
       112
        
         ] ++ lib.optionals stdenv.isLinux [

     

       68
       113
        
           "--with-pdal"

     

       69
       114
        
         ] ++ lib.optionals stdenv.isDarwin [

     
···

       96
       141
        
       

     

       97
       142
        
         enableParallelBuilding = true;

     

       98
       143
        
       

     

       144
       144
       +
         passthru.tests = {

     

       145
       145
       +
           grass = callPackage ./tests.nix { grass = finalAttrs.finalPackage; };

     

       146
       146
       +
         };

     

       147
       147
       +
       

     

       99
       148
        
         meta = with lib; {

     

       100
       100
       -
           homepage = "https://grass.osgeo.org/";

     

       101
       149
        
           description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";

     

       150
       150
       +
           homepage = "https://grass.osgeo.org/";

     

       102
       151
        
           license = licenses.gpl2Plus;

     

       103
       152
        
           maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ];

     

       104
       153
        
           platforms = platforms.all;

     

       105
       154
        
         };

     

       106
       106
       -
       }

     

       155
       155
       +
       })

+18

pkgs/applications/gis/grass/tests.nix

···

       1
       1
       +
       { runCommand, grass }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         inherit (grass) pname version;

     

       5
       5
       +
       

     

       6
       6
       +
       in

     

       7
       7
       +
       runCommand "${pname}-tests" { meta.timeout = 60; }

     

       8
       8
       +
         ''

     

       9
       9
       +
           HOME=$(mktemp -d)

     

       10
       10
       +
       

     

       11
       11
       +
           ${grass}/bin/grass --tmp-location EPSG:3857 --exec g.version \

     

       12
       12
       +
             | grep 'GRASS ${version}'

     

       13
       13
       +
       

     

       14
       14
       +
           ${grass}/bin/grass --tmp-location EPSG:3857 --exec g.mapset -l \

     

       15
       15
       +
             | grep 'PERMANENT'

     

       16
       16
       +
       

     

       17
       17
       +
           touch $out

     

       18
       18
       +
         ''

+25

pkgs/applications/misc/tango/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildGoModule rec {

     

       7
       7
       +
         pname = "tango";

     

       8
       8
       +
         version = "1.1.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "masakichi";

     

       12
       12
       +
           repo = "tango";

     

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

     

       14
       14
       +
           hash = "sha256-e/M2iRm/UwfnRVnMo1PmQTkz4IGTxnsCXNSSUkhsiHk=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         vendorHash = "sha256-83nKtiEy1na1HgAQcbTEfl+0vGg6BkCLBK1REN9fP+k=";

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "A local command-line Japanese dictionary tool using yomichan's dictionary files";

     

       21
       21
       +
           homepage = "https://github.com/masakichi/tango";

     

       22
       22
       +
           license = licenses.mit;

     

       23
       23
       +
           maintainers = with maintainers; [ donovanglover ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

pkgs/applications/networking/cluster/bosh-cli/default.nix

···

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "bosh-cli";

     

       10
       10
        
       

     

       11
       11
       -
         version = "7.2.4";

     

       11
       11
       +
         version = "7.3.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "cloudfoundry";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-LVDWgyIBVp7UVnEuQ42eVfxDZB3BZn5InnPX7WN6MrA=";

     

       17
       17
       +
           sha256 = "sha256-o/JhfS2VkN5qzZglFN1YNSZV2A2LowNouQee4Tv2dFc=";

     

       18
       18
        
         };

     

       19
       19
        
         vendorHash = null;

     

       20
       20

+30

pkgs/applications/video/mpv/scripts/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , callPackage

     

       3
       3
       +
       , config

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       lib.recurseIntoAttrs

     

       7
       7
       +
         ({

     

       8
       8
       +
           acompressor = callPackage ./acompressor.nix { };

     

       9
       9
       +
           autocrop = callPackage ./autocrop.nix { };

     

       10
       10
       +
           autodeint = callPackage ./autodeint.nix { };

     

       11
       11
       +
           autoload = callPackage ./autoload.nix { };

     

       12
       12
       +
           convert = callPackage ./convert.nix { };

     

       13
       13
       +
           inhibit-gnome = callPackage ./inhibit-gnome.nix { };

     

       14
       14
       +
           mpris = callPackage ./mpris.nix { };

     

       15
       15
       +
           mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { };

     

       16
       16
       +
           mpvacious = callPackage ./mpvacious.nix { };

     

       17
       17
       +
           quality-menu = callPackage ./quality-menu.nix { };

     

       18
       18
       +
           simple-mpv-webui = callPackage ./simple-mpv-webui.nix { };

     

       19
       19
       +
           sponsorblock = callPackage ./sponsorblock.nix { };

     

       20
       20
       +
           thumbfast = callPackage ./thumbfast.nix { };

     

       21
       21
       +
           thumbnail = callPackage ./thumbnail.nix { };

     

       22
       22
       +
           uosc = callPackage ./uosc.nix { };

     

       23
       23
       +
           vr-reversal = callPackage ./vr-reversal.nix { };

     

       24
       24
       +
           webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };

     

       25
       25
       +
           cutter = callPackage ./cutter.nix { };

     

       26
       26
       +
         }

     

       27
       27
       +
         // (callPackage ./occivink.nix { }))

     

       28
       28
       +
         // lib.optionalAttrs config.allowAliases {

     

       29
       29
       +
         youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14

     

       30
       30
       +
       }

+38

pkgs/applications/video/mpv/scripts/quality-menu.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenvNoCC

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , oscSupport ? false

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       stdenvNoCC.mkDerivation rec {

     

       8
       8
       +
         pname = "mpv-quality-menu";

     

       9
       9
       +
         version = "4.1.0";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "christoph-heinrich";

     

       13
       13
       +
           repo = "mpv-quality-menu";

     

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

     

       15
       15
       +
           hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         dontBuild = true;

     

       19
       19
       +
       

     

       20
       20
       +
         installPhase = ''

     

       21
       21
       +
           runHook preInstall

     

       22
       22
       +
           mkdir -p $out/share/mpv/scripts

     

       23
       23
       +
           cp quality-menu.lua $out/share/mpv/scripts

     

       24
       24
       +
         '' + lib.optionalString oscSupport ''

     

       25
       25
       +
           cp quality-menu-osc.lua $out/share/mpv/scripts

     

       26
       26
       +
         '' + ''

     

       27
       27
       +
           runHook postInstall

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         passthru.scriptName = "quality-menu.lua";

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";

     

       34
       34
       +
           homepage = "https://github.com/christoph-heinrich/mpv-quality-menu";

     

       35
       35
       +
           license = licenses.gpl2Only;

     

       36
       36
       +
           maintainers = with maintainers; [ lunik1 ];

     

       37
       37
       +
         };

     

       38
       38
       +
       }

-39

pkgs/applications/video/mpv/scripts/youtube-quality.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenvNoCC

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , oscSupport ? false

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       stdenvNoCC.mkDerivation rec {

     

       8
       8
       -
         pname = "mpv-youtube-quality";

     

       9
       9
       -
         version = "unstable-2020-02-11";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchFromGitHub {

     

       12
       12
       -
           owner = "jgreco";

     

       13
       13
       -
           repo = "mpv-youtube-quality";

     

       14
       14
       -
           rev = "1f8c31457459ffc28cd1c3f3c2235a53efad7148";

     

       15
       15
       -
           sha256 = "voNP8tCwCv8QnAZOPC9gqHRV/7jgCAE63VKBd/1s5ic=";

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       18
       -
         dontBuild = true;

     

       19
       19
       -
       

     

       20
       20
       -
         installPhase = ''

     

       21
       21
       -
           runHook preInstall

     

       22
       22
       -
           mkdir -p $out/share/mpv/scripts

     

       23
       23
       -
           cp youtube-quality.lua $out/share/mpv/scripts

     

       24
       24
       -
         '' + lib.optionalString oscSupport ''

     

       25
       25
       -
           cp youtube-quality-osc.lua $out/share/mpv/scripts

     

       26
       26
       -
         '' + ''

     

       27
       27
       -
           runHook postInstall

     

       28
       28
       -
         '';

     

       29
       29
       -
       

     

       30
       30
       -
         passthru.scriptName = "youtube-quality.lua";

     

       31
       31
       -
       

     

       32
       32
       -
         meta = with lib; {

     

       33
       33
       -
           description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";

     

       34
       34
       -
           homepage = "https://github.com/jgreco/mpv-youtube-quality";

     

       35
       35
       -
           license = licenses.unfree;

     

       36
       36
       -
           platforms = platforms.all;

     

       37
       37
       -
           maintainers = with maintainers; [ lunik1 ];

     

       38
       38
       -
         };

     

       39
       39
       -
       }

+3 -3

pkgs/development/compilers/cairo/default.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "cairo";

     

       9
       9
       -
         version = "2.0.1";

     

       9
       9
       +
         version = "2.0.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "starkware-libs";

     

       13
       13
        
           repo = "cairo";

     

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

     

       15
       15
       -
           hash = "sha256-bqLkCP1hzdOMrVyyyiOZYN0BKPe8OjKMfpFGCr1/anU=";

     

       15
       15
       +
           hash = "sha256-tFWY4bqI+YVVu0E9EPl+c0UAsSn/cjgvEOQtyT9tkYg=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         cargoHash = "sha256-FzQkAlNKFFLK8XmLafm37MvLekGE24BoLliaDpc+44w=";

     

       18
       18
       +
         cargoHash = "sha256-fnkzR07MIwzjvg2ZRhhzYIUhuidEBZt0mGfxwHyhyVE=";

     

       19
       19
        
       

     

       20
       20
        
         nativeCheckInputs = [

     

       21
       21
        
           rustfmt

+7 -23

pkgs/development/libraries/raylib/default.nix

···

       8
       8
        
       , raylib-games

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       -
       stdenv.mkDerivation rec {

     

       11
       11
       +
       stdenv.mkDerivation (finalAttrs: {

     

       12
       12
        
         pname = "raylib";

     

       13
       13
       -
         version = "4.2.0";

     

       13
       13
       +
         version = "4.5.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "raysan5";

     

       17
       17
       -
           repo = pname;

     

       18
       18
       -
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-aMIjywcQxki0cKlNznPAMfvrtGj3qcR95D4/BDuPZZM=";

     

       17
       17
       +
           repo = "raylib";

     

       18
       18
       +
           rev = finalAttrs.version;

     

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

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ cmake ];

     
···

       27
       27
        
           ++ lib.optional pulseSupport libpulseaudio;

     

       28
       28
        
         propagatedBuildInputs = [ libGLU libX11 ];

     

       29
       29
        
       

     

       30
       30
       -
         patches = [

     

       31
       31
       -
           # fixes glfw compile error;

     

       32
       32
       -
           # remove with next raylib version > 4.2.0 or when glfw 3.4.0 is released.

     

       33
       33
       -
           (fetchpatch {

     

       34
       34
       -
             url = "https://github.com/raysan5/raylib/commit/2ad7967db80644a25ca123536cf2f6efcb869684.patch";

     

       35
       35
       -
             sha256 = "sha256-/xgzox1ITeoZ91QWdwnJJ+jJ5nJsMHcEgbIEdNYh4NY=";

     

       36
       36
       -
             name = "raylib-glfw-fix.patch";

     

       37
       37
       -
           })

     

       38
       38
       -
         ];

     

       39
       39
       -
       

     

       40
       30
        
         # https://github.com/raysan5/raylib/wiki/CMake-Build-Options

     

       41
       31
        
         cmakeFlags = [

     

       42
       32
        
           "-DUSE_EXTERNAL_GLFW=ON"

     
···

       45
       35
        
         ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"

     

       46
       36
        
           ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";

     

       47
       37
        
       

     

       48
       48
       -
         # fix libasound.so/libpulse.so not being found

     

       49
       49
       -
         preFixup = ''

     

       50
       50
       -
           ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"}

     

       51
       51
       -
           ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"}

     

       52
       52
       -
         '';

     

       53
       53
       -
       

     

       54
       38
        
         passthru.tests = [ raylib-games ];

     

       55
       39
        
       

     

       56
       40
        
         meta = with lib; {

     
···

       59
       43
        
           license = licenses.zlib;

     

       60
       44
        
           maintainers = with maintainers; [ adamlwgriffiths ];

     

       61
       45
        
           platforms = platforms.linux;

     

       62
       62
       -
           changelog = "https://github.com/raysan5/raylib/blob/${version}/CHANGELOG";

     

       46
       46
       +
           changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";

     

       63
       47
        
         };

     

       64
       64
       -
       }

     

       48
       48
       +
       })

+3 -3

pkgs/development/python-modules/python3-application/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "python3-application";

     

       5
       5
       -
         version = "3.0.4";

     

       5
       5
       +
         version = "3.0.6";

     

       6
       6
        
       

     

       7
       7
        
         disabled = !isPy3k;

     

       8
       8
        
       

     
···

       10
       10
        
           owner = "AGProjects";

     

       11
       11
        
           repo = pname;

     

       12
       12
        
           rev = "release-${version}";

     

       13
       13
       -
           hash = "sha256-XXAKp/RlBVs3KmcnuiexdYfxf0zt2A/DrsJzdC9I4vA=";

     

       13
       13
       +
           hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ zope_interface twisted ];

     
···

       18
       18
        
         pythonImportsCheck = [ "application" ];

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

     

       21
       21
       -
           broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;

     

       21
       21
       +
           broken = stdenv.isDarwin;

     

       22
       22
        
           description = "A collection of modules that are useful when building python applications";

     

       23
       23
        
           homepage = "https://github.com/AGProjects/python3-application";

     

       24
       24
        
           license = licenses.lgpl21Plus;

+19 -2

pkgs/development/tools/build-managers/buck2/default.nix

···

       1
       1
        
       { fetchurl, lib, stdenv, zstd

     

       2
       2
        
       , autoPatchelfHook, gcc-unwrapped

     

       3
       3
       +
       , testers, buck2 # for passthru.tests

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       5
       6
        
       let

     
···

       65
       66
        
         doInstallCheck = true;

     

       66
       67
        
         installCheckPhase = "$out/bin/buck2 --version";

     

       67
       68
        
       

     

       68
       68
       -
         passthru.updateScript = ./update.sh;

     

       69
       69
       +
         passthru = {

     

       70
       70
       +
           updateScript = ./update.sh;

     

       71
       71
       +
           tests = testers.testVersion {

     

       72
       72
       +
             package = buck2;

     

       73
       73
       +
       

     

       74
       74
       +
             # NOTE (aseipp): the buck2 --version command doesn't actually print out

     

       75
       75
       +
             # the given version tagged in the release, but a hash, but not the git

     

       76
       76
       +
             # hash; the entire version logic is bizarrely specific to buck2, and needs

     

       77
       77
       +
             # to be reworked the open source build to behave like expected. in the

     

       78
       78
       +
             # mean time, it *does* always print out 'buck2 <hash>...' so we can just

     

       79
       79
       +
             # match on "buck2"

     

       80
       80
       +
             version = "buck2";

     

       81
       81
       +
           };

     

       82
       82
       +
         };

     

       83
       83
       +
       

     

       69
       84
        
         meta = with lib; {

     

       70
       85
        
           description = "Fast, hermetic, multi-language build system";

     

       71
       86
        
           homepage = "https://buck2.build";

     

       87
       87
       +
           changelog = "https://github.com/facebook/buck2/releases/tag/${buck2-version}";

     

       72
       88
        
           license = with licenses; [ asl20 /* or */ mit ];

     

       89
       89
       +
           mainProgram = "buck2";

     

       90
       90
       +
           maintainers = with maintainers; [ thoughtpolice ];

     

       73
       91
        
           platforms = [

     

       74
       92
        
             "x86_64-linux" "aarch64-linux"

     

       75
       93
        
             "x86_64-darwin" "aarch64-darwin"

     

       76
       94
        
           ];

     

       77
       77
       -
           maintainers = with maintainers; [ thoughtpolice ];

     

       78
       95
        
         };

     

       79
       96
        
       }

+3 -3

pkgs/development/tools/fnm/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "fnm";

     

       13
       13
       -
         version = "1.34.0";

     

       13
       13
       +
         version = "1.35.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "Schniz";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           sha256 = "sha256-ttzfyTfv0835w4BaSWxT17/e/fjNCxWABW/kZKpy7q8=";

     

       19
       19
       +
           sha256 = "sha256-EqaEbPMjDybsl8IsLyjDXVPaF9oH1DYRjNb94uBOxL8=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ installShellFiles ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ];

     

       25
       25
        
       

     

       26
       26
       -
         cargoHash = "sha256-hYRVlCQ9+FCQFtT6uku7FynzHMdHvKATqkr5tCJoZCU=";

     

       26
       26
       +
         cargoHash = "sha256-MkfgK+fm0kKZpFobNFtv6cVvTF/76U2Kzs/MxMwXHjs=";

     

       27
       27
        
       

     

       28
       28
        
         doCheck = false;

     

       29
       29

+3 -3

pkgs/development/tools/language-servers/ansible-language-server/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildNpmPackage rec {

     

       8
       8
        
         pname = "ansible-language-server";

     

       9
       9
       -
         version = "1.1.0";

     

       9
       9
       +
         version = "1.2.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "ansible";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-kyyYHA0+n8zo1GOzC5lW+QnAn2EtLq0bB1L11yONJbE=";

     

       15
       15
       +
           hash = "sha256-5QzwDsWjuq/gMWFQEkl4sqvsqfxTOZhaFBMhjiiOZSY=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         npmDepsHash = "sha256-0mOj0HV6fbImuYDKr3S2SUO8nHN7R0FX9Ihi0GtoSR4=";

     

       18
       18
       +
         npmDepsHash = "sha256-bzffCAGn0aYVoG8IDaXd5I3x3AnGl5urX7BaBKf0tVI=";

     

       19
       19
        
         npmBuildScript = "compile";

     

       20
       20
        
       

     

       21
       21
        
         # We remove/ignore the prepare and prepack scripts because they run the

+38

pkgs/development/tools/misc/doq/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python3

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
       +
         pname = "doq";

     

       8
       8
       +
         version = "0.9.1";

     

       9
       9
       +
         format = "setuptools";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "heavenshell";

     

       13
       13
       +
           repo = "py-doq";

     

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

     

       15
       15
       +
           hash = "sha256-6ff7R/2Jo4jYm1hA70yopjklpKIMWlj7DH9eKxOlfgU=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       19
       19
       +
           jinja2

     

       20
       20
       +
           parso

     

       21
       21
       +
           toml

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         nativeCheckInputs = with python3.pkgs; [

     

       25
       25
       +
           parameterized

     

       26
       26
       +
           unittestCheckHook

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [ "doq" ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with lib; {

     

       32
       32
       +
           description = "Docstring generator for Python";

     

       33
       33
       +
           homepage = "https://github.com/heavenshell/py-doq";

     

       34
       34
       +
           changelog = "https://github.com/heavenshell/py-doq/releases/tag/${src.rev}";

     

       35
       35
       +
           license = licenses.bsd3;

     

       36
       36
       +
           maintainers = with maintainers; [ natsukium ];

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+4 -4

pkgs/development/tools/reindeer/default.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "reindeer";

     

       14
       14
       -
         version = "unstable-2023-06-20";

     

       14
       14
       +
         version = "unstable-2023-07-14";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "facebookincubator";

     

       18
       18
        
           repo = pname;

     

       19
       19
       -
           rev = "43a317cad6e7205bd4aee067539bf613971a5624";

     

       20
       20
       -
           sha256 = "sha256-y2/tQR8kYLpBwhow59F9pvyh/pgZ0fAGYd5zow2N1Es=";

     

       19
       19
       +
           rev = "381fe232bcab77b432e2f29dbbd685e013d19c76";

     

       20
       20
       +
           sha256 = "sha256-xyoGmleJAZA/tdB2Q11vPe9rcn74SCBPiTR//Cpx1Lw=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoSha256 = "sha256-mzQHEtKEiP/COHgeZnRN1CfFPcK+RaD7WuvWJO0OJHs=";

     

       23
       23
       +
         cargoSha256 = "sha256-GVOkZcleKakXE58LbJthAa5ZWArKkIok/RawLXcwGPw=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkg-config ];

     

       26
       26
        
         buildInputs =

+1 -1

pkgs/os-specific/linux/kernel/hardened/config.nix

···

       28
       28
        
         #

     

       29
       29
        
         # We set SECURITY_WRITABLE_HOOKS n primarily for documentation purposes; the

     

       30
       30
        
         # config builder fails to detect that it has indeed been unset.

     

       31
       31
       -
         SECURITY_SELINUX_DISABLE = no;

     

       31
       31
       +
         SECURITY_SELINUX_DISABLE = whenOlder "6.4" no; # On 6.4: error: unused option: SECURITY_SELINUX_DISABLE

     

       32
       32
        
         SECURITY_WRITABLE_HOOKS  = option no;

     

       33
       33
        
       

     

       34
       34
        
         STRICT_KERNEL_RWX = yes;

+10

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       68
       68
        
               },

     

       69
       69
        
               "sha256": "1mvcirkhqnf03cci3jiq077fs9b42a3xdk3zjkpyim3x43ydwzyb",

     

       70
       70
        
               "version": "6.3.12"

     

       71
       71
       +
           },

     

       72
       72
       +
           "6.4": {

     

       73
       73
       +
               "patch": {

     

       74
       74
       +
                   "extra": "-hardened1",

     

       75
       75
       +
                   "name": "linux-hardened-6.4.3-hardened1.patch",

     

       76
       76
       +
                   "sha256": "1xwy9088f8qy7algv1gad90gd6sv03diz16jvfnk2yb01k4f87wv",

     

       77
       77
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.3-hardened1/linux-hardened-6.4.3-hardened1.patch"

     

       78
       78
       +
               },

     

       79
       79
       +
               "sha256": "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i",

     

       80
       80
       +
               "version": "6.4.3"

     

       71
       81
        
           }

     

       72
       82
        
       }

+1

pkgs/servers/prowlarr/default.nix

···

       63
       63
        
           changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}";

     

       64
       64
        
           license = licenses.gpl3Only;

     

       65
       65
        
           maintainers = with maintainers; [ jdreaver ];

     

       66
       66
       +
           mainProgram = "Prowlarr";

     

       66
       67
        
           platforms = [

     

       67
       68
        
             "aarch64-darwin"

     

       68
       69
        
             "aarch64-linux"

+120 -12

pkgs/tools/networking/pritunl-client/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub, installShellFiles }:

     

       2
       2
       -
       

     

       3
       3
       -
       buildGoModule rec {

     

       4
       4
       -
         pname = "pritunl-client";

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , runtimeShell

     

       5
       5
       +
       , runCommand

     

       6
       6
       +
       , makeWrapper

     

       7
       7
       +
       , installShellFiles

     

       8
       8
       +
       , buildGoModule

     

       9
       9
       +
       , coreutils

     

       10
       10
       +
       , which

     

       11
       11
       +
       , gnugrep

     

       12
       12
       +
       , gnused

     

       13
       13
       +
       , openresolv

     

       14
       14
       +
       , systemd

     

       15
       15
       +
       , iproute2

     

       16
       16
       +
       , openvpn

     

       17
       17
       +
       , electron

     

       18
       18
       +
       }: let

     

       5
       19
        
         version = "1.3.3584.5";

     

       6
       6
       -
       

     

       7
       20
        
         src = fetchFromGitHub {

     

       8
       21
        
           owner = "pritunl";

     

       9
       22
        
           repo = "pritunl-client-electron";

     
···

       11
       24
        
           sha256 = "sha256-wWpP2u+oQSESjkRvAn5by7efvssYtKBYg2E+FZ/+tg0=";

     

       12
       25
        
         };

     

       13
       26
        
       

     

       14
       14
       -
         modRoot = "cli";

     

       15
       15
       -
         vendorHash = "sha256-miwGLWpoaavg/xcw/0pNBYCdovBnvjP5kdaaGPcRuWk=";

     

       27
       27
       +
         cli = buildGoModule {

     

       28
       28
       +
           pname = "pritunl-cli";

     

       29
       29
       +
           inherit version src;

     

       30
       30
       +
       

     

       31
       31
       +
           modRoot = "cli";

     

       32
       32
       +
           vendorHash = "sha256-miwGLWpoaavg/xcw/0pNBYCdovBnvjP5kdaaGPcRuWk=";

     

       33
       33
       +
       

     

       34
       34
       +
           postInstall = ''

     

       35
       35
       +
             mv $out/bin/cli $out/bin/pritunl-client

     

       36
       36
       +
           '';

     

       37
       37
       +
         };

     

       38
       38
       +
       

     

       39
       39
       +
         service = buildGoModule {

     

       40
       40
       +
           pname = "pritunl-client-service";

     

       41
       41
       +
           inherit version src;

     

       42
       42
       +
       

     

       43
       43
       +
           modRoot = "service";

     

       44
       44
       +
           vendorHash = "sha256-9Fv8m3eWlxv4WWDSdI0VMavgy+0OSIVZ98dkDBwm4Gc=";

     

       45
       45
       +
       

     

       46
       46
       +
           nativeBuildInputs = [ makeWrapper ];

     

       47
       47
       +
       

     

       48
       48
       +
           postPatch = ''

     

       49
       49
       +
             sed -Ei service/profile/scripts.go \

     

       50
       50
       +
               -e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g'

     

       51
       51
       +
           '' + lib.optionalString stdenv.isLinux ''

     

       52
       52
       +
             sed -Ei service/profile/scripts.go \

     

       53
       53
       +
               -e 's|(/usr)?/s?bin/busctl\b|busctl|g' \

     

       54
       54
       +
               -e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \

     

       55
       55
       +
               -e 's|(/usr)?/s?bin/ip\b|ip|g'

     

       56
       56
       +
           '';

     

       57
       57
       +
       

     

       58
       58
       +
           postInstall = ''

     

       59
       59
       +
             mv $out/bin/service $out/bin/pritunl-client-service

     

       60
       60
       +
           '' + lib.optionalString stdenv.isLinux ''

     

       61
       61
       +
             mkdir -p $out/lib/systemd/system/

     

       62
       62
       +
             cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/

     

       63
       63
       +
             substituteInPlace $out/lib/systemd/system/pritunl-client.service \

     

       64
       64
       +
               --replace "/usr" "$out"

     

       65
       65
       +
           '';

     

       66
       66
       +
       

     

       67
       67
       +
           postFixup = let

     

       68
       68
       +
             hookScriptsDeps = [

     

       69
       69
       +
               coreutils

     

       70
       70
       +
               which

     

       71
       71
       +
               gnused

     

       72
       72
       +
               gnugrep

     

       73
       73
       +
             ] ++ lib.optionals stdenv.isLinux [

     

       74
       74
       +
               openresolv

     

       75
       75
       +
               systemd

     

       76
       76
       +
               iproute2

     

       77
       77
       +
             ];

     

       78
       78
       +
             openvpn-wrapped = runCommand "openvpn-wrapped" {

     

       79
       79
       +
               nativeBuildInputs = [ makeWrapper ];

     

       80
       80
       +
             } ''

     

       81
       81
       +
               mkdir -p $out/bin

     

       82
       82
       +
               makeWrapper ${openvpn}/bin/openvpn $out/bin/openvpn \

     

       83
       83
       +
                 --prefix PATH : ${lib.makeBinPath hookScriptsDeps} \

     

       84
       84
       +
                 --add-flags "--setenv PATH \$PATH"

     

       85
       85
       +
             '';

     

       86
       86
       +
           in lib.optionalString stdenv.isLinux ''

     

       87
       87
       +
             wrapProgram $out/bin/pritunl-client-service \

     

       88
       88
       +
               --prefix PATH : "${lib.makeBinPath ([ openvpn-wrapped ])}"

     

       89
       89
       +
           '';

     

       90
       90
       +
         };

     

       91
       91
       +
       in stdenv.mkDerivation {

     

       92
       92
       +
         pname = "pritunl-client";

     

       93
       93
       +
         inherit version src;

     

       94
       94
       +
       

     

       95
       95
       +
         dontBuild = true;

     

       96
       96
       +
         dontConfigure = true;

     

       16
       97
        
       

     

       17
       98
        
         nativeBuildInputs = [

     

       99
       99
       +
           makeWrapper

     

       18
       100
        
           installShellFiles

     

       19
       101
        
         ];

     

       20
       102
        
       

     

       21
       21
       -
         postInstall = ''

     

       22
       22
       -
           mv $out/bin/cli $out/bin/pritunl-client

     

       103
       103
       +
         installPhase = ''

     

       104
       104
       +
           runHook preInstall

     

       105
       105
       +
       

     

       106
       106
       +
           mkdir -p $out/bin/

     

       107
       107
       +
           ln -s ${cli}/bin/pritunl-client $out/bin/

     

       108
       108
       +
           ln -s ${service}/bin/pritunl-client-service $out/bin/

     

       109
       109
       +
       

     

       110
       110
       +
           mkdir -p $out/lib/

     

       111
       111
       +
           cp -r client $out/lib/pritunl_client_electron

     

       112
       112
       +
       

     

       113
       113
       +
           makeWrapper ${electron}/bin/electron $out/bin/pritunl-client-electron \

     

       114
       114
       +
             --add-flags $out/lib/pritunl_client_electron

     

       115
       115
       +
       

     

       116
       116
       +
         '' + lib.optionalString stdenv.isLinux ''

     

       117
       117
       +
           mkdir -p $out/lib/systemd/system/

     

       118
       118
       +
           ln -s ${service}/lib/systemd/system/pritunl-client.service $out/lib/systemd/system/

     

       119
       119
       +
       

     

       120
       120
       +
           mkdir -p $out/share/icons/

     

       121
       121
       +
           cp -r resources_linux/icons $out/share/icons/hicolor

     

       122
       122
       +
       

     

       123
       123
       +
           mkdir -p $out/share/applications/

     

       124
       124
       +
           cp resources_linux/pritunl-client-electron.desktop $out/share/applications/

     

       125
       125
       +
           substituteInPlace $out/share/applications/pritunl-client-electron.desktop \

     

       126
       126
       +
             --replace "/usr/lib/pritunl_client_electron/Pritunl" "$out/bin/pritunl-client-electron"

     

       127
       127
       +
         '' + ''

     

       128
       128
       +
           # install shell completions for pritunl-client

     

       23
       129
        
           installShellCompletion --cmd pritunl-client \

     

       24
       130
        
             --bash <($out/bin/pritunl-client completion bash) \

     

       25
       131
        
             --fish <($out/bin/pritunl-client completion fish) \

     

       26
       132
        
             --zsh <($out/bin/pritunl-client completion zsh)

     

       133
       133
       +
       

     

       134
       134
       +
           runHook postInstall

     

       27
       135
        
         '';

     

       28
       136
        
       

     

       29
       137
        
         meta = with lib; {

     

       30
       30
       -
           description = "Pritunl OpenVPN client CLI";

     

       31
       31
       -
           homepage = "https://github.com/pritunl/pritunl-client-electron/tree/master/cli";

     

       138
       138
       +
           description = "Pritunl OpenVPN client";

     

       139
       139
       +
           homepage = "https://client.pritunl.com/";

     

       32
       140
        
           license = licenses.unfree;

     

       33
       33
       -
           maintainers = with maintainers; [ minizilla ];

     

       141
       141
       +
           maintainers = with maintainers; [ minizilla andrevmatos ];

     

       34
       142
        
         };

     

       35
       143
        
       }

+2 -2

pkgs/tools/system/openipmi/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, popt, ncurses, python39, readline, lib }:

     

       1
       1
       +
       { stdenv, fetchurl, popt, ncurses, python3, readline, lib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "OpenIPMI";

     
···

       9
       9
        
           sha256 = "sha256-+1Pp6l4mgc+K982gJLGgBExnX4QRbKJ66WFsi3rZW0k=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ ncurses popt python39 readline ];

     

       12
       12
       +
         buildInputs = [ ncurses popt python3 readline ];

     

       13
       13
        
       

     

       14
       14
        
         outputs = [ "out" "lib" "dev" "man" ];

     

       15
       15

+41

pkgs/tools/text/xml/xq/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , testers

     

       5
       5
       +
       , xq

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildGoModule rec {

     

       9
       9
       +
         pname = "xq";

     

       10
       10
       +
         version = "1.2.1";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "sibprogrammer";

     

       14
       14
       +
           repo = "xq";

     

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

     

       16
       16
       +
           hash = "sha256-Z14x1b25wKNm9fECkNqGJglK/Z8Xq8VHmYfp5aEvvMU=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         vendorHash = "sha256-CP4QsrTkFcOLDxnFc0apevXRmXHA9aJSU4AK9+TAxOU=";

     

       20
       20
       +
       

     

       21
       21
       +
         ldflags = [

     

       22
       22
       +
           "-s"

     

       23
       23
       +
           "-w"

     

       24
       24
       +
           "-X=main.commit=${src.rev}"

     

       25
       25
       +
           "-X=main.version=${version}"

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         passthru.tests = {

     

       29
       29
       +
           version = testers.testVersion {

     

       30
       30
       +
             package = xq;

     

       31
       31
       +
           };

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "Command-line XML and HTML beautifier and content extractor";

     

       36
       36
       +
           homepage = "https://github.com/sibprogrammer/xq";

     

       37
       37
       +
           changelog = "https://github.com/sibprogrammer/xq/releases/tag/${src.rev}";

     

       38
       38
       +
           license = licenses.mit;

     

       39
       39
       +
           maintainers = with maintainers; [ figsoda ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+11 -37

pkgs/top-level/all-packages.nix

···

       13176
       13176
        
       

     

       13177
       13177
        
         tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { };

     

       13178
       13178
        
       

     

       13179
       13179
       +
         tango = callPackage ../applications/misc/tango { };

     

       13180
       13180
       +
       

     

       13179
       13181
        
         tangram = callPackage ../applications/networking/instant-messengers/tangram { };

     

       13180
       13182
        
       

     

       13181
       13183
        
         t1utils = callPackage ../tools/misc/t1utils { };

     
···

       14513
       14515
        
         xprite-editor = callPackage ../tools/misc/xprite-editor {

     

       14514
       14516
        
           inherit (darwin.apple_sdk.frameworks) AppKit;

     

       14515
       14517
        
         };

     

       14518
       14518
       +
       

     

       14519
       14519
       +
         xq-xml = callPackage ../tools/text/xml/xq { };

     

       14516
       14520
        
       

     

       14517
       14521
        
         xsecurelock = callPackage ../tools/X11/xsecurelock { };

     

       14518
       14522
        
       

     
···

       18038
       18042
        
         ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };

     

       18039
       18043
        
       

     

       18040
       18044
        
         dbus-test-runner = callPackage ../development/tools/dbus-test-runner { };

     

       18045
       18045
       +
       

     

       18046
       18046
       +
         doq = callPackage ../development/tools/misc/doq { };

     

       18041
       18047
        
       

     

       18042
       18048
        
         phpunit = callPackage ../development/tools/misc/phpunit { };

     

       18043
       18049
        
       

     
···

       27647
       27653
        
         linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;

     

       27648
       27654
        
         linuxPackages_6_3_hardened = linuxKernel.packages.linux_6_3_hardened;

     

       27649
       27655
        
         linux_6_3_hardened = linuxKernel.kernels.linux_6_3_hardened;

     

       27656
       27656
       +
         linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened;

     

       27657
       27657
       +
         linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened;

     

       27650
       27658
        
       

     

       27651
       27659
        
         # Hardkernel (Odroid) kernels.

     

       27652
       27660
        
         linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;

     
···

       33341
       33349
        
       

     

       33342
       33350
        
         mpvpaper = callPackage ../tools/wayland/mpvpaper { };

     

       33343
       33351
        
       

     

       33344
       33344
       -
         mpvScripts = recurseIntoAttrs ({

     

       33345
       33345
       -
           acompressor = callPackage ../applications/video/mpv/scripts/acompressor.nix {};

     

       33346
       33346
       -
           autocrop = callPackage ../applications/video/mpv/scripts/autocrop.nix { };

     

       33347
       33347
       -
           autodeint = callPackage ../applications/video/mpv/scripts/autodeint.nix { };

     

       33348
       33348
       -
           autoload = callPackage ../applications/video/mpv/scripts/autoload.nix { };

     

       33349
       33349
       -
           convert = callPackage ../applications/video/mpv/scripts/convert.nix { };

     

       33350
       33350
       -
           inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix { };

     

       33351
       33351
       -
           mpris = callPackage ../applications/video/mpv/scripts/mpris.nix { };

     

       33352
       33352
       -
           mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix { };

     

       33353
       33353
       -
           mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix { };

     

       33354
       33354
       -
           simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix { };

     

       33355
       33355
       -
           sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix { };

     

       33356
       33356
       -
           thumbfast = callPackage ../applications/video/mpv/scripts/thumbfast.nix { };

     

       33357
       33357
       -
           thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };

     

       33358
       33358
       -
           uosc = callPackage ../applications/video/mpv/scripts/uosc.nix { };

     

       33359
       33359
       -
           vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix { };

     

       33360
       33360
       -
           webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { };

     

       33361
       33361
       -
           youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { };

     

       33362
       33362
       -
           cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { };

     

       33363
       33363
       -
         } // (callPackage ../applications/video/mpv/scripts/occivink.nix {}));

     

       33352
       33352
       +
         mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; };

     

       33364
       33353
        
       

     

       33365
       33354
        
         open-in-mpv = callPackage ../applications/video/open-in-mpv { };

     

       33366
       33355
        
       

     
···

       36377
       36366
        
       

     

       36378
       36367
        
         bitcoin  = libsForQt5.callPackage ../applications/blockchains/bitcoin {

     

       36379
       36368
        
           stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;

     

       36380
       36380
       -
           boost = boost179;

     

       36381
       36369
        
           withGui = true;

     

       36382
       36370
        
           inherit (darwin) autoSignDarwinBinariesHook;

     

       36383
       36371
        
         };

     

       36384
       36372
        
       

     

       36385
       36373
        
         bitcoind = callPackage ../applications/blockchains/bitcoin {

     

       36386
       36386
       -
           boost = boost179;

     

       36387
       36374
        
           withGui = false;

     

       36388
       36375
        
           inherit (darwin) autoSignDarwinBinariesHook;

     

       36389
       36376
        
         };

     

       36390
       36377
        
       

     

       36391
       36378
        
         bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {

     

       36392
       36392
       -
           boost = boost179;

     

       36393
       36379
        
           withGui = false;

     

       36394
       36380
        
           inherit (darwin) autoSignDarwinBinariesHook;

     

       36395
       36381
        
         };

     
···

       36411
       36397
        
         besu = callPackage ../applications/blockchains/besu { };

     

       36412
       36398
        
       

     

       36413
       36399
        
         bitcoin-abc  = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {

     

       36414
       36414
       -
           boost = boost179;

     

       36415
       36400
        
           withGui = true;

     

       36416
       36401
        
         };

     

       36417
       36402
        
         bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc {

     

       36418
       36418
       -
           boost = boost179;

     

       36419
       36403
        
           mkDerivation = stdenv.mkDerivation;

     

       36420
       36404
        
           withGui = false;

     

       36421
       36405
        
         };

     
···

       36442
       36426
        
         dcrwallet = callPackage ../applications/blockchains/dcrwallet { };

     

       36443
       36427
        
       

     

       36444
       36428
        
         dogecoin  = libsForQt5.callPackage ../applications/blockchains/dogecoin {

     

       36445
       36445
       -
           boost = boost179;

     

       36446
       36429
        
           withGui = true;

     

       36447
       36430
        
         };

     

       36448
       36431
        
         dogecoind = callPackage ../applications/blockchains/dogecoin {

     

       36449
       36449
       -
           boost = boost179;

     

       36450
       36432
        
           withGui = false;

     

       36451
       36433
        
         };

     

       36452
       36434
        
       

     
···

       36493
       36475
        
       

     

       36494
       36476
        
         groestlcoin  = libsForQt5.callPackage ../applications/blockchains/groestlcoin {

     

       36495
       36477
        
           stdenv = darwin.apple_sdk_11_0.stdenv;

     

       36496
       36496
       -
           boost = boost179;

     

       36497
       36478
        
           withGui = true;

     

       36498
       36479
        
           inherit (darwin) autoSignDarwinBinariesHook;

     

       36499
       36480
        
         };

     

       36500
       36481
        
       

     

       36501
       36482
        
         groestlcoind = callPackage ../applications/blockchains/groestlcoin {

     

       36502
       36502
       -
           boost = boost179;

     

       36503
       36483
        
           inherit (darwin) autoSignDarwinBinariesHook;

     

       36504
       36484
        
         };

     

       36505
       36485
        
       

     
···

       36535
       36515
        
           inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;

     

       36536
       36516
        
         };

     

       36537
       36517
        
       

     

       36538
       36538
       -
         monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {

     

       36539
       36539
       -
           boost = boost179;

     

       36540
       36540
       -
         };

     

       36518
       36518
       +
         monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { };

     

       36541
       36519
        
       

     

       36542
       36520
        
         oxen = callPackage ../applications/blockchains/oxen

     

       36543
       36521
        
           { stdenv = gcc10StdenvCompat; boost = boost179; };

     
···

       36568
       36546
        
       

     

       36569
       36547
        
         stellar-core = callPackage ../applications/blockchains/stellar-core { };

     

       36570
       36548
        
       

     

       36571
       36571
       -
         sumokoin = callPackage ../applications/blockchains/sumokoin {

     

       36572
       36572
       -
           boost = boost179;

     

       36573
       36573
       -
         };

     

       36549
       36549
       +
         sumokoin = callPackage ../applications/blockchains/sumokoin { };

     

       36574
       36550
        
       

     

       36575
       36551
        
         solana-cli = callPackage ../applications/blockchains/solana { };

     

       36576
       36552
        
       

     
···

       36595
       36571
        
         torq = callPackage ../applications/blockchains/torq { };

     

       36596
       36572
        
       

     

       36597
       36573
        
         vertcoin  = libsForQt5.callPackage ../applications/blockchains/vertcoin {

     

       36598
       36598
       -
           boost = boost179;

     

       36599
       36574
        
           withGui = true;

     

       36600
       36575
        
         };

     

       36601
       36576
        
         vertcoind = callPackage ../applications/blockchains/vertcoin {

     

       36602
       36602
       -
           boost = boost179;

     

       36603
       36577
        
           withGui = false;

     

       36604
       36578
        
         };

     

       36605
       36579

+2

pkgs/top-level/linux-kernels.nix

···

       268
       268
        
           linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };

     

       269
       269
        
           linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };

     

       270
       270
        
           linux_6_3_hardened = hardenedKernelFor kernels.linux_6_3 { };

     

       271
       271
       +
           linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { };

     

       271
       272
        
       

     

       272
       273
        
         } // lib.optionalAttrs config.allowAliases {

     

       273
       274
        
           linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";

     
···

       614
       615
        
           linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);

     

       615
       616
        
           linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);

     

       616
       617
        
           linux_6_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened);

     

       618
       618
       +
           linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened);

     

       617
       619
        
       

     

       618
       620
        
           linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);

     

       619
       621
        
           linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);