commit 403b148aa51073bc343febbbfd041ecd495dbe3e · pyrox.dev/nixpkgs

+6 -1

maintainers/maintainer-list.nix

···

       7804
       7804
        
           name = "Claudius Holeksa";

     

       7805
       7805
        
         };

     

       7806
       7806
        
         ken-matsui = {

     

       7807
       7807
       -
           email = "nix@kmatsui.me";

     

       7808
       7807
        
           github = "ken-matsui";

     

       7809
       7808
        
           githubId = 26405363;

     

       7810
       7809
        
           name = "Ken Matsui";

     
···

       9254
       9253
        
           name = "Marius David";

     

       9255
       9254
        
           github = "marius851000";

     

       9256
       9255
        
           githubId = 22586596;

     

       9256
       9256
       +
         };

     

       9257
       9257
       +
         markbeep = {

     

       9258
       9258
       +
           email = "mrkswrn@gmail.com";

     

       9259
       9259
       +
           github = "markbeep";

     

       9260
       9260
       +
           githubId = 20665331;

     

       9261
       9261
       +
           name = "Mark";

     

       9257
       9262
        
         };

     

       9258
       9263
        
         markus1189 = {

     

       9259
       9264
        
           email = "markus1189@gmail.com";

+7

nixos/tests/pomerium.nix

···

       20
       20
        
         }; in {

     

       21
       21
        
           pomerium = { pkgs, lib, ... }: {

     

       22
       22
        
             imports = [ (base "192.168.1.1") ];

     

       23
       23
       +
             environment.systemPackages = with pkgs; [ chromium ];

     

       23
       24
        
             services.pomerium = {

     

       24
       25
        
               enable = true;

     

       25
       26
        
               settings = {

     
···

       97
       98
        
               )

     

       98
       99
        
               pomerium.succeed(

     

       99
       100
        
                   "curl -L --resolve login.required:80:127.0.0.1 http://login.required | grep 'hello I am login page'"

     

       101
       101
       +
               )

     

       102
       102
       +
       

     

       103
       103
       +
           with subtest("ui"):

     

       104
       104
       +
               pomerium.succeed(

     

       105
       105
       +
                 # check for a string that only appears if the UI is displayed correctly

     

       106
       106
       +
                   "chromium --no-sandbox --headless --disable-gpu --dump-dom --host-resolver-rules='MAP login.required 127.0.0.1:80' http://login.required/.pomerium | grep 'contact your administrator'"

     

       100
       107
        
               )

     

       101
       108
        
         '';

     

       102
       109
        
       })

+4 -4

pkgs/applications/networking/instant-messengers/chatterino2/default.nix

···

       1
       1
       -
       { stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook }:

     

       1
       1
       +
       { stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "chatterino2";

     

       5
       5
       -
         version = "2.4.0";

     

       5
       5
       +
         version = "2.4.2";

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "Chatterino";

     

       8
       8
        
           repo = pname;

     

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

     

       10
       10
       -
           sha256 = "sha256-6t7Or2heyV0B5zdWZpN80iADe52faNVlIEZYtcixpZo=";

     

       10
       10
       +
           sha256 = "sha256-d/rsY4pgPpA4JcMmoD6AG1DzHovfSERaeuYkMY603kA=";

     

       11
       11
        
           fetchSubmodules = true;

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

     

       14
       14
       -
         buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl ];

     

       14
       14
       +
         buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ];

     

       15
       15
        
         postInstall = lib.optionalString stdenv.isDarwin ''

     

       16
       16
        
           mkdir -p "$out/Applications"

     

       17
       17
        
           mv bin/chatterino.app "$out/Applications/"

+5 -4

pkgs/applications/radio/sdrangel/default.nix

···

       1
       1
       -
       { airspy

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , airspy

     

       2
       4
        
       , airspyhf

     

       3
       5
        
       , aptdec

     

       4
       6
        
       , boost

     
···

       13
       15
        
       , glew

     

       14
       16
        
       , hackrf

     

       15
       17
        
       , hidapi

     

       16
       16
       -
       , lib

     

       17
       18
        
       , ffmpeg

     

       18
       19
        
       , libiio

     

       19
       20
        
       , libopus

     
···

       95
       96
        
           "-DDAB_LIB=${dab_lib}"

     

       96
       97
        
           "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"

     

       97
       98
        
           "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"

     

       98
       98
       -
           "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"

     

       99
       99
       +
           "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite${stdenv.hostPlatform.extensions.sharedLibrary}"

     

       99
       100
        
           "-DSGP4_DIR=${sgp4}"

     

       100
       101
        
           "-DSOAPYSDR_DIR=${soapysdr-with-plugins}"

     

       101
       102
        
         ];

     
···

       110
       111
        
           homepage = "https://github.com/f4exb/sdrangel";

     

       111
       112
        
           license = licenses.gpl3Plus;

     

       112
       113
        
           maintainers = with maintainers; [ alkeryn ];

     

       113
       113
       -
           platforms = platforms.linux;

     

       114
       114
       +
           platforms = platforms.unix;

     

       114
       115
        
         };

     

       115
       116
        
       }

+5 -4

pkgs/applications/science/biology/nest/default.nix

···

       20
       20
        
       

     

       21
       21
        
       stdenv.mkDerivation rec {

     

       22
       22
        
         pname = "nest";

     

       23
       23
       -
         version = "3.3";

     

       23
       23
       +
         version = "3.4";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "nest";

     

       27
       27
        
           repo = "nest-simulator";

     

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

     

       29
       29
       -
           sha256 = "sha256-wmn5LOOHlSuyPdV6O6v7j10dxdcvqpym6MfveZdL+dU=";

     

       29
       29
       +
           hash = "sha256-+wjsZxW2l0WGyGTm/6vyzPEeqCfyxJml9oP/zn6W1L0=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         postPatch = ''

     
···

       67
       67
        
         postInstall = ''

     

       68
       68
        
           # Alternative to autoPatchElf, moves libraries where

     

       69
       69
        
           # Nest expects them to be

     

       70
       70
       -
           find $out/lib/nest -type f -exec ln -s {} $out/lib \;

     

       70
       70
       +
           find $out/lib/nest -exec ln -s {} $out/lib \;

     

       71
       71
        
         '';

     

       72
       72
        
       

     

       73
       73
        
         passthru.tests.version = testers.testVersion {

     
···

       78
       78
        
         meta = with lib; {

     

       79
       79
        
           description = "NEST is a command line tool for simulating neural networks";

     

       80
       80
        
           homepage = "https://www.nest-simulator.org/";

     

       81
       81
       -
           license = licenses.gpl2;

     

       81
       81
       +
           changelog = "https://github.com/nest/nest-simulator/releases/tag/v${version}";

     

       82
       82
       +
           license = licenses.gpl2Plus;

     

       82
       83
        
           maintainers = with maintainers; [ jiegec davidcromp ];

     

       83
       84
        
           platforms = platforms.unix;

     

       84
       85
        
         };

-2

pkgs/build-support/trivial-builders/test/references.nix

···

       45
       45
        
             """)

     

       46
       46
        
           '';

     

       47
       47
        
         meta = {

     

       48
       48
       -
           license = lib.licenses.mit; # nixpkgs license

     

       49
       48
        
           maintainers = with lib.maintainers; [

     

       50
       49
        
             roberth

     

       51
       50
        
           ];

     

       52
       52
       -
           description = "Run the Nixpkgs trivial builders tests";

     

       53
       51
        
         };

     

       54
       52
        
       }

+2 -2

pkgs/data/themes/orchis-theme/default.nix

···

       26
       26
        
       stdenvNoCC.mkDerivation

     

       27
       27
        
       rec {

     

       28
       28
        
         inherit pname;

     

       29
       29
       -
         version = "2023-02-26";

     

       29
       29
       +
         version = "2023-03-18";

     

       30
       30
        
       

     

       31
       31
        
         src = fetchFromGitHub {

     

       32
       32
        
           repo = "Orchis-theme";

     

       33
       33
        
           owner = "vinceliuice";

     

       34
       34
        
           rev = version;

     

       35
       35
       -
           sha256 = "sha256-Qk5MK8S8rIcwO7Kmze6eAl5qcwnrGsiWbn0WNIPjRnA=";

     

       35
       35
       +
           hash = "sha256-ixVHQRJXoXuPEsrbWOVMC/qdF3szpxYzC/8kKe47Bs8=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         nativeBuildInputs = [ gtk3 sassc ];

+28 -5

pkgs/development/embedded/bossa/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , wxGTK32

     

       5
       5
       +
       , libX11

     

       6
       6
       +
       , readline

     

       7
       7
       +
       , darwin

     

       8
       8
       +
       }:

     

       2
       9
        
       

     

       3
       10
        
       let

     

       4
       11
        
         # BOSSA needs a "bin2c" program to embed images.

     
···

       24
       31
        
           sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";

     

       25
       32
        
         };

     

       26
       33
        
       

     

       34
       34
       +
         postPatch = ''

     

       35
       35
       +
           substituteInPlace Makefile \

     

       36
       36
       +
             --replace "-arch x86_64" ""

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       27
       39
        
         nativeBuildInputs = [ bin2c ];

     

       28
       28
       -
         buildInputs = [ wxGTK libX11 readline ];

     

       40
       40
       +
         buildInputs = [

     

       41
       41
       +
           wxGTK32

     

       42
       42
       +
           libX11

     

       43
       43
       +
           readline

     

       44
       44
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       45
       45
       +
           darwin.apple_sdk.frameworks.Cocoa

     

       46
       46
       +
         ];

     

       29
       47
        
       

     

       30
       30
       -
         # Explicitly specify targets so they don't get stripped.

     

       31
       31
       -
         makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ];

     

       48
       48
       +
         makeFlags = [

     

       49
       49
       +
           "WXVERSION=3.2"

     

       50
       50
       +
           # Explicitly specify targets so they don't get stripped.

     

       51
       51
       +
           "bin/bossac"

     

       52
       52
       +
           "bin/bossash"

     

       53
       53
       +
           "bin/bossa"

     

       54
       54
       +
         ];

     

       32
       55
        
         env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

     

       33
       56
        
       

     

       34
       57
        
         installPhase = ''

     
···

       47
       70
        
           '';

     

       48
       71
        
           homepage = "http://www.shumatech.com/web/products/bossa";

     

       49
       72
        
           license = licenses.bsd3;

     

       50
       50
       -
           platforms = platforms.linux;

     

       73
       73
       +
           platforms = platforms.unix;

     

       51
       74
        
         };

     

       52
       75
        
       }

+1 -1

pkgs/development/libraries/aptdec/default.nix

···

       26
       26
        
           homepage = "https://github.com/Xerbo/aptdec";

     

       27
       27
        
           license = licenses.gpl2;

     

       28
       28
        
           maintainers = with maintainers; [ alexwinter ];

     

       29
       29
       -
           platforms = platforms.linux;

     

       29
       29
       +
           platforms = platforms.unix;

     

       30
       30
        
         };

     

       31
       31
        
       }

+1 -1

pkgs/development/libraries/cm256cc/default.nix

···

       23
       23
        
         meta = with lib; {

     

       24
       24
        
           description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++";

     

       25
       25
        
           homepage = "https://github.com/f4exb/cm256cc";

     

       26
       26
       -
           platforms = platforms.linux;

     

       26
       26
       +
           platforms = platforms.unix;

     

       27
       27
        
           maintainers = with maintainers; [ alkeryn ];

     

       28
       28
        
           license = licenses.gpl3;

     

       29
       29
        
         };

+1 -1

pkgs/development/libraries/dab_lib/default.nix

···

       23
       23
        
           homepage = "https://github.com/JvanKatwijk/dab-cmdline";

     

       24
       24
        
           license = licenses.gpl2;

     

       25
       25
        
           maintainers = with maintainers; [ alexwinter ];

     

       26
       26
       -
           platforms = platforms.linux;

     

       26
       26
       +
           platforms = platforms.unix;

     

       27
       27
        
         };

     

       28
       28
        
       }

+1 -1

pkgs/development/libraries/dsdcc/default.nix

···

       30
       30
        
           homepage = "https://github.com/f4exb/dsdcc";

     

       31
       31
        
           license = licenses.gpl3;

     

       32
       32
        
           maintainers = with maintainers; [ alexwinter ];

     

       33
       33
       -
           platforms = platforms.linux;

     

       33
       33
       +
           platforms = platforms.unix;

     

       34
       34
        
         };

     

       35
       35
        
       }

+2 -3

pkgs/development/libraries/opencv/3.x.nix

···

       32
       32
        
       , enableDC1394    ? false, libdc1394

     

       33
       33
        
       , enableDocs      ? false, doxygen, graphviz-nox

     

       34
       34
        
       

     

       35
       35
       -
       , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2

     

       35
       35
       +
       , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2, CoreMedia, MediaToolbox

     

       36
       36
        
       }:

     

       37
       37
        
       

     

       38
       38
        
       assert blas.implementation == "openblas" && lapack.implementation == "openblas";

     
···

       211
       211
        
           # tesseract & leptonica.

     

       212
       212
        
           ++ lib.optionals enableTesseract [ tesseract leptonica ]

     

       213
       213
        
           ++ lib.optional enableTbb tbb

     

       214
       214
       -
           ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]

     

       214
       214
       +
           ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ]

     

       215
       215
        
           ++ lib.optionals enableDocs [ doxygen graphviz-nox ];

     

       216
       216
        
       

     

       217
       217
        
         propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy

     
···

       250
       250
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       251
       251
        
           "-DWITH_OPENCL=OFF"

     

       252
       252
        
           "-DWITH_LAPACK=OFF"

     

       253
       253
       -
           "-DBUILD_opencv_videoio=OFF"

     

       254
       253
        
         ] ++ lib.optionals enablePython [

     

       255
       254
        
           "-DOPENCV_SKIP_PYTHON_LOADER=ON"

     

       256
       255
        
         ] ++ lib.optionals enableEigen [

+2 -2

pkgs/development/libraries/qt-5/modules/qtspeech.nix

···

       1
       1
       -
       { qtModule, speechd, pkg-config }:

     

       1
       1
       +
       { lib, qtModule, stdenv, speechd, pkg-config }:

     

       2
       2
        
       

     

       3
       3
        
       qtModule {

     

       4
       4
        
         pname = "qtspeech";

     

       5
       5
        
         qtInputs = [ ];

     

       6
       6
       -
         buildInputs = [ speechd ];

     

       6
       6
       +
         buildInputs = lib.optionals stdenv.isLinux [ speechd ];

     

       7
       7
        
         nativeBuildInputs = [ pkg-config ];

     

       8
       8
        
         outputs = [ "out" "dev" ];

     

       9
       9
        
       }

+1

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

···

       221
       221
        
           Prefix = ..

     

       222
       222
        
           EOF

     

       223
       223
        
       

     

       224
       224
       +
         '' + ''

     

       224
       225
        
           # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3)

     

       225
       226
        
           sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake

     

       226
       227
        
         '';

+1 -1

pkgs/development/libraries/serialdv/default.nix

···

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link";

     

       18
       18
        
           homepage = "https://github.com/f4exb/serialdv";

     

       19
       19
       -
           platforms = platforms.linux;

     

       19
       19
       +
           platforms = platforms.unix;

     

       20
       20
        
           maintainers = with maintainers; [ alkeryn ];

     

       21
       21
        
           license = licenses.gpl3;

     

       22
       22
        
         };

+1 -1

pkgs/development/libraries/sgp4/default.nix

···

       18
       18
        
           homepage = "https://github.com/dnwrnr/sgp4";

     

       19
       19
        
           license = licenses.asl20;

     

       20
       20
        
           maintainers = with maintainers; [ alexwinter ];

     

       21
       21
       -
           platforms = platforms.linux;

     

       21
       21
       +
           platforms = platforms.unix;

     

       22
       22
        
         };

     

       23
       23
        
       }

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "peaqevcore";

     

       9
       9
       -
         version = "13.2.0";

     

       9
       9
       +
         version = "13.2.2";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-fu4NL5m8+eae2+sTyi1yNA1J2qQfjfSlbIQyorlXZ6Y=";

     

       16
       16
       +
           hash = "sha256-N/tLoZNiMY1rzzToVvE9U4buUsmsDEcnKPOuifh7qg0=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         postPatch = ''

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pyobihai";

     

       11
       11
       -
         version = "1.4.0";

     

       11
       11
       +
         version = "1.4.1";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     
···

       16
       16
        
         # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-P6tKpssey59SdjS/QWpuv1UUagjR7RVAl6rse/O79mg=";

     

       19
       19
       +
           hash = "sha256-L/AQy9IxsBDeSlu+45j+/86jjMFzTjAkPGwZoa1QYho=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+1

pkgs/development/python-modules/python-lsp-server/default.nix

···

       161
       161
        
           changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md";

     

       162
       162
        
           license = licenses.mit;

     

       163
       163
        
           maintainers = with maintainers; [ fab ];

     

       164
       164
       +
           mainProgram = "pylsp";

     

       164
       165
        
         };

     

       165
       166
        
       }

+5 -5

pkgs/development/tools/analysis/codeql/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchzip, zlib, xorg, freetype, jdk11, curl }:

     

       1
       1
       +
       { lib, stdenv, fetchzip, zlib, xorg, freetype, jdk17, curl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "codeql";

     

       5
       5
       -
         version = "2.12.3";

     

       5
       5
       +
         version = "2.12.4";

     

       6
       6
        
       

     

       7
       7
        
         dontConfigure = true;

     

       8
       8
        
         dontBuild = true;

     
···

       10
       10
        
       

     

       11
       11
        
         src = fetchzip {

     

       12
       12
        
           url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";

     

       13
       13
       -
           sha256 = "sha256-xBTL3atnLsw7HWhkWq32LdQmSBtsQ2ydK+8On8l+OcA=";

     

       13
       13
       +
           sha256 = "sha256-Rmz35iyLXmNePHFVN8QmjeoKbR3eRy7nrY1FJpTfL7o=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [

     
···

       21
       21
        
           xorg.libXtst

     

       22
       22
        
           xorg.libXrender

     

       23
       23
        
           freetype

     

       24
       24
       -
           jdk11

     

       24
       24
       +
           jdk17

     

       25
       25
        
           stdenv.cc.cc.lib

     

       26
       26
        
           curl

     

       27
       27
        
         ];

     
···

       34
       34
        
       

     

       35
       35
        
           ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so

     

       36
       36
        
       

     

       37
       37
       -
           sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk11}%g' $out/codeql/codeql

     

       37
       37
       +
           sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk17}%g' $out/codeql/codeql

     

       38
       38
        
       

     

       39
       39
        
           ln -s $out/codeql/codeql $out/bin/

     

       40
       40
        
         '';

+3

pkgs/development/tools/buf/default.nix

···

       44
       44
        
           export CI=true

     

       45
       45
        
         '';

     

       46
       46
        
       

     

       47
       47
       +
         # Allow tests that bind or connect to localhost on macOS.

     

       48
       48
       +
         __darwinAllowLocalNetworking = true;

     

       49
       49
       +
       

     

       47
       50
        
         installPhase = ''

     

       48
       51
        
           runHook preInstall

     

       49
       52

+2 -2

pkgs/development/tools/esbuild/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "esbuild";

     

       5
       5
       -
         version = "0.17.11";

     

       5
       5
       +
         version = "0.17.12";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "evanw";

     

       9
       9
        
           repo = "esbuild";

     

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

     

       11
       11
       -
           hash = "sha256-k7bXEDAmxyn2u/cniqKtr9zbrWnzwbhTZkL35/igctM=";

     

       11
       11
       +
           hash = "sha256-75qDQWAp6cmuXtq90oIIQCj5IKUoQxNARxhFo2Sm5mk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

+3 -5

pkgs/development/tools/golangci-lint/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "golangci-lint";

     

       5
       5
       -
         version = "1.51.2";

     

       5
       5
       +
         version = "1.52.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "golangci";

     

       9
       9
        
           repo = "golangci-lint";

     

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

     

       11
       11
       -
           hash = "sha256-F2rkVZ5ia9/wyTw1WIeizFnuaHoS2A8VzVOGDcshy64=";

     

       11
       11
       +
           hash = "sha256-XcrWBHmxsDwsP/+H0OTmGKVG9NgBwR5dBY9sJZWo+K8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-JO/mRJB3gRTtBj6pW1267/xXUtalTJo0p3q5e34vqTs=";

     

       15
       15
       -
       

     

       16
       16
       -
         doCheck = false;

     

       14
       14
       +
         vendorHash = "sha256-N20AJaREqmvCey5P0YuUd3l/5xRzrIG+mPOiVHOUFWc=";

     

       17
       15
        
       

     

       18
       16
        
         subPackages = [ "cmd/golangci-lint" ];

     

       19
       17

+2 -2

pkgs/games/itchiodl/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3Packages.buildPythonApplication rec {

     

       7
       7
        
         pname = "itchiodl";

     

       8
       8
       -
         version = "2.2.0";

     

       8
       8
       +
         version = "2.3.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "Emersont1";

     

       12
       12
        
           repo = "itchio";

     

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

     

       14
       14
       -
           hash = "sha256-tylMEsUdeMUuLcxRMkkJE7vPAVuqc/cVJ4DB3xmV+iA=";

     

       14
       14
       +
           hash = "sha256-XuNkqTAT9LlSwruchGQbombAKHZvKhpnqLfvJdDcrj0=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         format = "pyproject";

+11 -9

pkgs/servers/http/pomerium/default.nix

···

       14
       14
        
       in

     

       15
       15
        
       buildGoModule rec {

     

       16
       16
        
         pname = "pomerium";

     

       17
       17
       -
         version = "0.20.0";

     

       17
       17
       +
         version = "0.21.2";

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pomerium";

     

       20
       20
        
           repo = "pomerium";

     

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

     

       22
       22
       -
           sha256 = "sha256-J8ediRreV80lzPcKIOSl1CNHp04ZW9ePyNyejlN50cE=";

     

       22
       22
       +
           sha256 = "sha256-wsfbG4VAS3U3voDdry35QlWknlWIfThZQalf9S/9GO0=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         vendorSha256 = "sha256-V8asyi1Nm+h3KK/loBRZQN6atfEGUEdRydeZsp9wyQY=";

     

       25
       25
       +
         vendorSha256 = "sha256-8g3jhxKIT0EGUXh0hrvDbw3i04khqlAfGzM6k4q3O8g=";

     

       26
       26
        
       

     

       27
       27
        
         ui = mkYarnPackage {

     

       28
       28
        
           inherit version;

     

       29
       29
        
           src = "${src}/ui";

     

       30
       30
        
       

     

       31
       31
       -
           # update pomerium-ui-package.json when updating package, sourced from ui/package.json

     

       32
       32
       -
           packageJSON = ./pomerium-ui-package.json;

     

       31
       31
       +
           packageJSON = ./package.json;

     

       33
       32
        
           offlineCache = fetchYarnDeps {

     

       34
       33
        
             yarnLock = "${src}/ui/yarn.lock";

     

       35
       35
       -
             sha256 = "sha256:1n6swanrds9hbd4yyfjzpnfhsb8fzj1pwvvcg3w7b1cgnihclrmv";

     

       34
       34
       +
             sha256 = lib.fileContents ./yarn-hash;

     

       36
       35
        
           };

     

       37
       36
        
       

     

       38
       37
        
           buildPhase = ''

     
···

       111
       110
        
           install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium

     

       112
       111
        
         '';

     

       113
       112
        
       

     

       114
       114
       -
         passthru.tests = {

     

       115
       115
       -
           inherit (nixosTests) pomerium;

     

       116
       116
       -
           inherit pomerium-cli;

     

       113
       113
       +
         passthru = {

     

       114
       114
       +
           tests = {

     

       115
       115
       +
             inherit (nixosTests) pomerium;

     

       116
       116
       +
             inherit pomerium-cli;

     

       117
       117
       +
           };

     

       118
       118
       +
           updateScript = ./updater.sh;

     

       117
       119
        
         };

     

       118
       120
        
       

     

       119
       121
        
         meta = with lib; {

+1 -1

pkgs/servers/http/pomerium/pomerium-ui-package.json pkgs/servers/http/pomerium/package.json

···

       29
       29
        
           "@fontsource/dm-sans": "^4.5.1",

     

       30
       30
        
           "@mui/icons-material": "^5.3.1",

     

       31
       31
        
           "@mui/material": "^5.4.0",

     

       32
       32
       -
           "luxon": "^2.3.0",

     

       32
       32
       +
           "luxon": "^2.5.2",

     

       33
       33
        
           "markdown-to-jsx": "^7.1.7",

     

       34
       34
        
           "react": "^17.0.2",

     

       35
       35
        
           "react-dom": "^17.0.2",

+23

pkgs/servers/http/pomerium/updater.sh

···

       1
       1
       +
       #! /usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -i bash -p gnugrep coreutils curl wget jq nix-update prefetch-yarn-deps

     

       3
       3
       +
       

     

       4
       4
       +
       set -euo pipefail

     

       5
       5
       +
       pushd "$(dirname "${BASH_SOURCE[0]}")"

     

       6
       6
       +
       

     

       7
       7
       +
       owner="pomerium"

     

       8
       8
       +
       repo="pomerium"

     

       9
       9
       +
       version=`curl -s "https://api.github.com/repos/$owner/$repo/tags" | jq -r .[0].name | grep -oP "^v\K.*"`

     

       10
       10
       +
       url="https://raw.githubusercontent.com/$owner/$repo/v$version/"

     

       11
       11
       +
       

     

       12
       12
       +
       if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then

     

       13
       13
       +
           echo "Already up to date!"

     

       14
       14
       +
           exit 0

     

       15
       15
       +
       fi

     

       16
       16
       +
       

     

       17
       17
       +
       rm -f package.json yarn.lock

     

       18
       18
       +
       wget "$url/ui/yarn.lock" "$url/ui/package.json"

     

       19
       19
       +
       echo $(prefetch-yarn-deps) > yarn-hash

     

       20
       20
       +
       rm -f yarn.lock

     

       21
       21
       +
       

     

       22
       22
       +
       popd

     

       23
       23
       +
       nix-update pomerium --version $version

+1

pkgs/servers/http/pomerium/yarn-hash

···

       1
       1
       +
       085nghha82q30b3vgzs76xsa85kbxqk7mjrknxxc5z7awrjhdmkb

+3 -2

pkgs/servers/klipper/klipper-firmware.nix

···

       5
       5
        
       , bintools-unwrapped

     

       6
       6
        
       , libffi

     

       7
       7
        
       , libusb1

     

       8
       8
       -
       , wxGTK30

     

       8
       8
       +
       , wxGTK32

     

       9
       9
        
       , python3

     

       10
       10
        
       , gcc-arm-embedded

     

       11
       11
        
       , klipper

     
···

       28
       28
        
           avrdude

     

       29
       29
        
           stm32flash

     

       30
       30
        
           pkg-config

     

       31
       31
       -
           wxGTK30 # Required for bossac

     

       31
       31
       +
           wxGTK32 # Required for bossac

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         preBuild = "cp ${firmwareConfig} ./.config";

     
···

       40
       40
        
         makeFlags = [

     

       41
       41
        
           "V=1"

     

       42
       42
        
           "KCONFIG_CONFIG=${firmwareConfig}"

     

       43
       43
       +
           "WXVERSION=3.2"

     

       43
       44
        
         ];

     

       44
       45
        
       

     

       45
       46
        
         installPhase = ''

+1

pkgs/tools/X11/xpra/default.nix

···

       190
       190
        
         postInstall = ''

     

       191
       191
        
           # append module paths to xorg.conf

     

       192
       192
        
           cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf

     

       193
       193
       +
           cat ${xorgModulePaths} >> $out/etc/xpra/xorg-uinput.conf

     

       193
       194
        
       

     

       194
       195
        
           # make application icon visible to desktop environemnts

     

       195
       196
        
           icon_dir="$out/share/icons/hicolor/64x64/apps"

+33

pkgs/tools/misc/ramfetch/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchgit

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         name = "ramfetch";

     

       8
       8
       +
         version = "1.1.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchgit {

     

       11
       11
       +
           url = "https://codeberg.org/o69mar/ramfetch.git";

     

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

     

       13
       13
       +
           hash = "sha256-XUph+rTbw5LXWRq+OSKl0EjFac+MQAx3NBu4rWdWR3w=";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         dontBuild = true;

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           runHook preInstall

     

       20
       20
       +
       

     

       21
       21
       +
           install -D ramfetch $out/bin/ramfetch

     

       22
       22
       +
       

     

       23
       23
       +
           runHook postInstall

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         meta = {

     

       27
       27
       +
           description = "A tool which displays memory information";

     

       28
       28
       +
           homepage = "https://codeberg.org/o69mar/ramfetch";

     

       29
       29
       +
           platforms = lib.platforms.linux;

     

       30
       30
       +
           license = lib.licenses.mit;

     

       31
       31
       +
           maintainers = [ lib.maintainers.markbeep ];

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+4 -4

pkgs/top-level/all-packages.nix

···

       11543
       11543
        
       

     

       11544
       11544
        
         rambox = callPackage ../applications/networking/instant-messengers/rambox { };

     

       11545
       11545
        
       

     

       11546
       11546
       +
         ramfetch = callPackage ../tools/misc/ramfetch { };

     

       11547
       11547
       +
       

     

       11546
       11548
        
         rar = callPackage ../tools/archivers/rar { };

     

       11547
       11549
        
       

     

       11548
       11550
        
         rarcrack = callPackage ../tools/security/rarcrack { };

     
···

       17559
       17561
        
       

     

       17560
       17562
        
         bloop = callPackage ../development/tools/build-managers/bloop { };

     

       17561
       17563
        
       

     

       17562
       17562
       -
         bossa = callPackage ../development/embedded/bossa {

     

       17563
       17563
       -
           wxGTK = wxGTK30;

     

       17564
       17564
       -
         };

     

       17564
       17564
       +
         bossa = callPackage ../development/embedded/bossa { };

     

       17565
       17565
        
       

     

       17566
       17566
        
         bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };

     

       17567
       17567
        
       

     
···

       22815
       22815
        
         };

     

       22816
       22816
        
       

     

       22817
       22817
        
         opencv3 = callPackage ../development/libraries/opencv/3.x.nix {

     

       22818
       22818
       -
           inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;

     

       22818
       22818
       +
           inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;

     

       22819
       22819
        
           ffmpeg = ffmpeg_4;

     

       22820
       22820
        
         };

     

       22821
       22821

+2 -1

pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix

···

       4
       4
        
       let

     

       5
       5
        
         inherit (lib.strings) escapeNixIdentifier;

     

       6
       6
        
       

     

       7
       7
       -
         allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages;

     

       7
       7
       +
         allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v)

     

       8
       8
       +
           (builtins.removeAttrs defaultPkgConfigPackages ["recurseForDerivations"]);

     

       8
       9
        
       

     

       9
       10
        
         # nix-build rejects attribute names with periods

     

       10
       11
        
         # This will build those regardless.