commit c80ab7a746e28dfc62679d2a89650da528691d2b · pyrox.dev/nixpkgs

+2 -2

nixos/modules/security/acme/default.nix

···

       62
       62
        
           SystemCallArchitectures = "native";

     

       63
       63
        
           SystemCallFilter = [

     

       64
       64
        
             # 1. allow a reasonable set of syscalls

     

       65
       65
       -
             "@system-service"

     

       65
       65
       +
             "@system-service @resources"

     

       66
       66
        
             # 2. and deny unreasonable ones

     

       67
       67
       -
             "~@privileged @resources"

     

       67
       67
       +
             "~@privileged"

     

       68
       68
        
             # 3. then allow the required subset within denied groups

     

       69
       69
        
             "@chown"

     

       70
       70
        
           ];

+1 -1

nixos/modules/services/web-apps/changedetection-io.nix

···

       127
       127
        
             defaultStateDir = cfg.datastorePath == "/var/lib/changedetection-io";

     

       128
       128
        
           in {

     

       129
       129
        
             services.changedetection-io = {

     

       130
       130
       -
               wantedBy = [ "mutli-user.target" ];

     

       130
       130
       +
               wantedBy = [ "multi-user.target" ];

     

       131
       131
        
               after = [ "network.target" ];

     

       132
       132
        
               preStart = ''

     

       133
       133
        
                 mkdir -p ${cfg.datastorePath}

+1

nixos/release-combined.nix

···

       55
       55
        
               (onFullSupported "nixos.manual")

     

       56
       56
        
               (onSystems ["x86_64-linux"] "nixos.ova")

     

       57
       57
        
               (onSystems ["aarch64-linux"] "nixos.sd_image")

     

       58
       58
       +
               (onFullSupported "nixos.tests.acme")

     

       58
       59
        
               (onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom")

     

       59
       60
        
               (onSystems ["x86_64-linux"] "nixos.tests.boot.biosUsb")

     

       60
       61
        
               (onFullSupported "nixos.tests.boot-stage1")

+2

nixos/release-small.nix

···

       31
       31
        
           inherit (nixos') channel manual options iso_minimal amazonImage dummy;

     

       32
       32
        
           tests = {

     

       33
       33
        
             inherit (nixos'.tests)

     

       34
       34
       +
               acme

     

       34
       35
        
               containers-imperative

     

       35
       36
        
               containers-ip

     

       36
       37
        
               firewall

     
···

       110
       111
        
               "nixos.iso_minimal"

     

       111
       112
        
               "nixos.amazonImage"

     

       112
       113
        
               "nixos.manual"

     

       114
       114
       +
               "nixos.tests.acme"

     

       113
       115
        
               "nixos.tests.boot.uefiCdrom"

     

       114
       116
        
               "nixos.tests.containers-imperative"

     

       115
       117
        
               "nixos.tests.containers-ip"

+10 -4

nixos/tests/chromium.nix

···

       39
       39
        
         name = "chromium-${channel}";

     

       40
       40
        
         meta = {

     

       41
       41
        
           maintainers = with maintainers; [ aszlig primeos ];

     

       42
       42
       +
         } // optionalAttrs (chromiumPkg.meta ? timeout) {

     

       42
       43
        
           # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621

     

       44
       44
       +
           # Note: optionalAttrs is used since meta.timeout is not set for Google Chrome

     

       43
       45
        
           inherit (chromiumPkg.meta) timeout;

     

       44
       46
        
         };

     

       45
       47
        
       

     
···

       65
       67
        
           from contextlib import contextmanager

     

       66
       68
        
       

     

       67
       69
        
       

     

       70
       70
       +
           major_version = "${versions.major (getVersion chromiumPkg.name)}"

     

       71
       71
       +
       

     

       72
       72
       +
       

     

       68
       73
        
           # Run as user alice

     

       69
       74
        
           def ru(cmd):

     

       70
       75
        
               return "su - ${user} -c " + shlex.quote(cmd)

     
···

       84
       89
        
                   binary = pname

     

       85
       90
        
               # Add optional CLI options:

     

       86
       91
        
               options = []

     

       87
       87
       -
               major_version = "${versions.major (getVersion chromiumPkg.name)}"

     

       88
       92
        
               if major_version > "95" and not pname.startswith("google-chrome"):

     

       89
       93
        
                   # Workaround to avoid a GPU crash:

     

       90
       94
        
                   options.append("--use-gl=swiftshader")

     
···

       242
       246
        
               machine.screenshot("after_copy_from_chromium")

     

       243
       247
        
       

     

       244
       248
        
       

     

       245
       245
       -
           with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):

     

       246
       246
       -
               # To check the text rendering (catches regressions like #131074):

     

       247
       247
       -
               machine.wait_for_text("Graphics Feature Status")

     

       249
       249
       +
           if major_version < "107":

     

       250
       250
       +
               # TODO: Fix the chrome://gpu test for M107+

     

       251
       251
       +
               with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):

     

       252
       252
       +
                   # To check the text rendering (catches regressions like #131074):

     

       253
       253
       +
                   machine.wait_for_text("Graphics Feature Status")

     

       248
       254
        
       

     

       249
       255
        
       

     

       250
       256
        
           with test_new_win("version_info", "chrome://version", "About Version") as clipboard:

+12

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

···

       4893
       4893
        
           meta.homepage = "https://github.com/Shougo/neco-vim/";

     

       4894
       4894
        
         };

     

       4895
       4895
        
       

     

       4896
       4896
       +
         neo-tree-nvim = buildVimPluginFrom2Nix {

     

       4897
       4897
       +
           pname = "neo-tree.nvim";

     

       4898
       4898
       +
           version = "2022-10-22";

     

       4899
       4899
       +
           src = fetchFromGitHub {

     

       4900
       4900
       +
             owner = "nvim-neo-tree";

     

       4901
       4901
       +
             repo = "neo-tree.nvim";

     

       4902
       4902
       +
             rev = "ab8ca9fac52949d7a741b538c5d9c3898cd0f45a";

     

       4903
       4903
       +
             sha256 = "0ccrxj04md7lssfwy9lvw4sn99iwkpci9lddc577m6zs1nz00lw0";

     

       4904
       4904
       +
           };

     

       4905
       4905
       +
           meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";

     

       4906
       4906
       +
         };

     

       4907
       4907
       +
       

     

       4896
       4908
        
         neocomplete-vim = buildVimPluginFrom2Nix {

     

       4897
       4909
        
           pname = "neocomplete.vim";

     

       4898
       4910
        
           version = "2021-02-18";

+4

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

···

       624
       624
        
           dependencies = with self; [ plenary-nvim ];

     

       625
       625
        
         });

     

       626
       626
        
       

     

       627
       627
       +
         neo-tree-nvim = super.neo-tree-nvim.overrideAttrs (old: {

     

       628
       628
       +
           dependencies = with self; [ plenary-nvim nui-nvim ];

     

       629
       629
       +
         });

     

       630
       630
       +
       

     

       627
       631
        
         noice-nvim = super.noice-nvim.overrideAttrs(old: {

     

       628
       632
        
           dependencies = with self; [ nui-nvim nvim-notify ];

     

       629
       633
        
         });

+1

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

···

       410
       410
        
       https://github.com/ujihisa/neco-look/,,

     

       411
       411
        
       https://github.com/Shougo/neco-syntax/,,

     

       412
       412
        
       https://github.com/Shougo/neco-vim/,,

     

       413
       413
       +
       https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD,

     

       413
       414
        
       https://github.com/Shougo/neocomplete.vim/,,

     

       414
       415
        
       https://github.com/KeitaNakamura/neodark.vim/,,

     

       415
       416
        
       https://github.com/folke/neodev.nvim/,HEAD,

+2 -2

pkgs/applications/misc/dmenu/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "dmenu";

     

       5
       5
       -
         version = "5.1";

     

       5
       5
       +
         version = "5.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-H01wnrujfrcybroOZl4PE75Pok7jXJWw15ww8Uo0j9U=";

     

       9
       9
       +
           sha256 = "sha256-1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ libX11 libXinerama zlib libXft ];

+3 -6

pkgs/applications/misc/nwg-wrapper/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonPackage rec {

     

       4
       4
        
         pname = "nwg-wrapper";

     

       5
       5
       -
         version = "0.1.2";

     

       5
       5
       +
         version = "0.1.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nwg-piotr";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "114y55mv2rgnp75a3c7rk46v5v84d1zqb6wkha7x16ab6xa9phzl";

     

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

     

       11
       11
       +
           sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];

     
···

       16
       16
        
         buildInputs = [ gtk3 gtk-layer-shell ];

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ];

     

       19
       19
       -
       

     

       20
       20
       -
         # ValueError: Namespace GtkLayerShell not available

     

       21
       21
       -
         strictDeps = false;

     

       22
       19
        
       

     

       23
       20
        
         # No tests

     

       24
       21
        
         doCheck = false;

+54

pkgs/applications/misc/watchmate/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       , gtk4

     

       6
       6
       +
       , libadwaita

     

       7
       7
       +
       , bluez

     

       8
       8
       +
       , dbus

     

       9
       9
       +
       , openssl

     

       10
       10
       +
       , wrapGAppsHook4

     

       11
       11
       +
       , glib

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       rustPlatform.buildRustPackage rec {

     

       15
       15
       +
         pname = "watchmate";

     

       16
       16
       +
         version = "0.3.0";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitLab {

     

       19
       19
       +
           owner = "azymohliad";

     

       20
       20
       +
           repo = "watchmate";

     

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

     

       22
       22
       +
           sha256 = "sha256-HyH+9KMbdiJSmjo2NsAvz8rN3JhYKz1nNqfuZufKjQA=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         cargoSha256 = "sha256-HvuxKPIVwVrcsTKgPwNosF/ar8QL9Jlldq7SBe2nh6o=";

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           pkg-config

     

       29
       29
       +
           wrapGAppsHook4

     

       30
       30
       +
           glib

     

       31
       31
       +
         ];

     

       32
       32
       +
         buildInputs = [

     

       33
       33
       +
           gtk4

     

       34
       34
       +
           libadwaita

     

       35
       35
       +
           bluez

     

       36
       36
       +
           dbus

     

       37
       37
       +
           openssl

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         postInstall = ''

     

       41
       41
       +
           install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/

     

       42
       42
       +
           install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/

     

       43
       43
       +
           install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/

     

       44
       44
       +
           install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         meta = with lib; {

     

       48
       48
       +
           description = "PineTime smart watch companion app for Linux phone and desktop";

     

       49
       49
       +
           homepage = "https://gitlab.com/azymohliad/watchmate";

     

       50
       50
       +
           license = licenses.gpl3Plus;

     

       51
       51
       +
           maintainers = with maintainers; [ chuangzhu ];

     

       52
       52
       +
           platforms = platforms.linux;

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+1 -1

pkgs/applications/networking/instant-messengers/discord/darwin.nix

···

       1
       1
       -
       { pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, withOpenASAR ? false }:

     

       1
       1
       +
       { pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, branch, withOpenASAR ? false }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         inherit pname version src meta;

+3 -3

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

···

       2
       2
        
       let

     

       3
       3
        
         versions = if stdenv.isLinux then {

     

       4
       4
        
           stable = "0.0.21";

     

       5
       5
       -
           ptb = "0.0.29";

     

       5
       5
       +
           ptb = "0.0.34";

     

       6
       6
        
           canary = "0.0.140";

     

       7
       7
        
         } else {

     

       8
       8
        
           stable = "0.0.264";

     
···

       18
       18
        
             };

     

       19
       19
        
             ptb = fetchurl {

     

       20
       20
        
               url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

     

       21
       21
       -
               sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc=";

     

       21
       21
       +
               sha256 = "CD6dLoBnlvhpwEFfLI9OqjhviZPj3xNDyPK9qBJUqck=";

     

       22
       22
        
             };

     

       23
       23
        
             canary = fetchurl {

     

       24
       24
        
               url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     
···

       69
       69
        
             (_: value:

     

       70
       70
        
               callPackage package (value

     

       71
       71
        
                 // {

     

       72
       72
       -
                 inherit src version openasar;

     

       72
       72
       +
                 inherit src version openasar branch;

     

       73
       73
        
                 meta = meta // { mainProgram = value.binaryName; };

     

       74
       74
        
               }))

     

       75
       75
        
             {

+2 -1

pkgs/applications/networking/instant-messengers/discord/linux.nix

···

       5
       5
        
       , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes

     

       6
       6
        
       , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss

     

       7
       7
        
       , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand

     

       8
       8
       +
       , branch

     

       8
       9
        
       , common-updater-scripts, withOpenASAR ? false }:

     

       9
       10
        
       

     

       10
       11
        
       let

     
···

       141
       142
        
             }?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')

     

       142
       143
        
             version=''${url##https://dl*.discordapp.net/apps/linux/}

     

       143
       144
        
             version=''${version%%/*.tar.gz}

     

       144
       144
       -
             update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix

     

       145
       145
       +
             update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}

     

       145
       146
        
           '';

     

       146
       147
        
         };

     

       147
       148
        
       }

+9

pkgs/applications/science/physics/dawn/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
       +
       , tk

     

       5
       5
       +
       , makeWrapper

     

       4
       6
        
       }:

     

       5
       7
        
       

     

       6
       8
        
       stdenv.mkDerivation rec {

     
···

       18
       20
        
             --replace 'INSTALL_DIR =' "INSTALL_DIR = $out/bin#"

     

       19
       21
        
         '';

     

       20
       22
        
       

     

       23
       23
       +
         nativeBuildInputs = [ makeWrapper ];

     

       24
       24
       +
       

     

       21
       25
        
         dontConfigure = true;

     

       22
       26
        
       

     

       23
       27
        
         preInstall = ''

     

       24
       28
        
           mkdir -p "$out/bin"

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         postInstall = ''

     

       32
       32
       +
           wrapProgram "$out/bin/DAWN_GUI" \

     

       33
       33
       +
             --prefix PATH : ${lib.makeBinPath [ tk ]}

     

       25
       34
        
         '';

     

       26
       35
        
       

     

       27
       36
        
         meta = with lib; {

+40

pkgs/applications/science/physics/dawncut/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         pname = "dawncut";

     

       8
       8
       +
         version = "1.54a";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchurl {

     

       11
       11
       +
           name = "${pname}-${version}.tar.gz";

     

       12
       12
       +
           url = "https://geant4.kek.jp/~tanaka/src/dawncut_${builtins.replaceStrings ["."] ["_"] version}.taz";

     

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

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         postPatch = ''

     

       17
       17
       +
           substituteInPlace Makefile.architecture \

     

       18
       18
       +
             --replace 'CXX      := g++' ""

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         dontConfigure = true;

     

       22
       22
       +
       

     

       23
       23
       +
         NIX_CFLAGS_COMPILE="-std=c++98";

     

       24
       24
       +
       

     

       25
       25
       +
         installPhase = ''

     

       26
       26
       +
           runHook preInstall

     

       27
       27
       +
       

     

       28
       28
       +
           install -Dm 500 dawncut "$out/bin/dawncut"

     

       29
       29
       +
       

     

       30
       30
       +
           runHook postInstall

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           description = "A tool to generate a 3D scene data clipped with an arbitrary plane";

     

       35
       35
       +
           license = licenses.unfree;

     

       36
       36
       +
           homepage = "https://geant4.kek.jp/~tanaka/DAWN/About_DAWNCUT.html";

     

       37
       37
       +
           platforms = platforms.unix;

     

       38
       38
       +
           maintainers = with maintainers; [ veprbl ];

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+2 -2

pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix

···

       12
       12
        
       

     

       13
       13
        
       mkDerivation rec {

     

       14
       14
        
         pname = "bismuth";

     

       15
       15
       -
         version = "3.1.3";

     

       15
       15
       +
         version = "3.1.4";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "Bismuth-Forge";

     

       19
       19
        
           repo = pname;

     

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

     

       21
       21
       -
           sha256 = "sha256-IWwFsYqoqW3924+pf8L+acIt31aU/mhqakXbT9Q4Bqw=";

     

       21
       21
       +
           sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         cmakeFlags = [

+14

pkgs/development/libraries/boost/1.80.nix

···

       1
       1
       +
       { callPackage, fetchurl, fetchpatch, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       callPackage ./generic.nix (args // rec {

     

       4
       4
       +
         version = "1.80.0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           urls = [

     

       8
       8
       +
             "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"

     

       9
       9
       +
             "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"

     

       10
       10
       +
           ];

     

       11
       11
       +
           # SHA256 from http://www.boost.org/users/history/version_1_80_0.html

     

       12
       12
       +
           sha256 = "1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0";

     

       13
       13
       +
         };

     

       14
       14
       +
       })

+1

pkgs/development/libraries/boost/default.nix

···

       32
       32
        
         boost177 = makeBoost ./1.77.nix;

     

       33
       33
        
         boost178 = makeBoost ./1.78.nix;

     

       34
       34
        
         boost179 = makeBoost ./1.79.nix;

     

       35
       35
       +
         boost180 = makeBoost ./1.80.nix;

     

       35
       36
        
       }

+20 -6

pkgs/development/libraries/libvarlink/default.nix

···

       4
       4
        
       , meson

     

       5
       5
        
       , ninja

     

       6
       6
        
       , python3

     

       7
       7
       +
       , nix-update-script

     

       8
       8
       +
       , testers

     

       7
       9
        
       }:

     

       8
       10
        
       

     

       9
       9
       -
       stdenv.mkDerivation rec {

     

       11
       11
       +
       stdenv.mkDerivation (finalAttrs: {

     

       10
       12
        
         pname = "libvarlink";

     

       11
       11
       -
         version = "22";

     

       13
       13
       +
         version = "23";

     

       12
       14
        
       

     

       13
       15
        
         src = fetchFromGitHub {

     

       14
       16
        
           owner = "varlink";

     

       15
       15
       -
           repo = pname;

     

       16
       16
       -
           rev = version;

     

       17
       17
       -
           sha256 = "1i15227vlc9k4276r833ndhxrcys9305pf6dga1j0alx2vj85yz2";

     

       17
       17
       +
           repo = finalAttrs.pname;

     

       18
       18
       +
           rev = finalAttrs.version;

     

       19
       19
       +
           sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE=";

     

       18
       20
        
         };

     

       19
       21
        
       

     

       20
       22
        
         nativeBuildInputs = [ meson ninja ];

     
···

       33
       35
        
       

     

       34
       36
        
         doCheck = true;

     

       35
       37
        
       

     

       38
       38
       +
         passthru = {

     

       39
       39
       +
           updateScript = nix-update-script {

     

       40
       40
       +
             attrPath = finalAttrs.pname;

     

       41
       41
       +
           };

     

       42
       42
       +
           tests = {

     

       43
       43
       +
             version = testers.testVersion {

     

       44
       44
       +
               package = finalAttrs.finalPackage;

     

       45
       45
       +
               command = "varlink --version";

     

       46
       46
       +
             };

     

       47
       47
       +
           };

     

       48
       48
       +
         };

     

       49
       49
       +
       

     

       36
       50
        
         meta = with lib; {

     

       37
       51
        
           description = "C implementation of the Varlink protocol and command line tool";

     

       38
       52
        
           homepage = "https://github.com/varlink/libvarlink";

     
···

       40
       54
        
           maintainers = with maintainers; [ artturin ];

     

       41
       55
        
           platforms = platforms.linux;

     

       42
       56
        
         };

     

       43
       43
       -
       }

     

       57
       57
       +
       })

+21 -8

pkgs/development/libraries/ncnn/cmakelists.patch

···

       1
       1
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index 98611276..989350bb 100644

     

       2
       2
       +
       index c453d23e..66b4aa24 100644

     

       3
       3
        
       --- a/CMakeLists.txt

     

       4
       4
        
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -260,6 +260,8 @@ if(NCNN_VULKAN)

     

       6
       6
       -
                        include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")

     

       7
       7
       -
                    endif()

     

       8
       8
       -
                    include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")

     

       5
       5
       +
       @@ -478,6 +478,8 @@ if(NCNN_VULKAN)

     

       6
       6
       +
        

     

       7
       7
       +
                    find_package(Threads)

     

       8
       8
       +
        

     

       9
       9
        
       +            include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake")

     

       10
       10
        
       +            include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake")

     

       11
       11
       -
                    include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")

     

       12
       12
       -
        

     

       13
       13
       -
                    if (NOT TARGET glslang OR NOT TARGET SPIRV)

     

       11
       11
       +
                    include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")

     

       12
       12
       +
                    include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")

     

       13
       13
       +
                    if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")

     

       14
       14
       +
       diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in

     

       15
       15
       +
       index b580fcee..be2becd0 100644

     

       16
       16
       +
       --- a/src/ncnn.pc.in

     

       17
       17
       +
       +++ b/src/ncnn.pc.in

     

       18
       18
       +
       @@ -1,6 +1,6 @@

     

       19
       19
       +
        prefix=${pcfiledir}/../..

     

       20
       20
       +
       -librarydir=${prefix}/@CMAKE_INSTALL_LIBDIR@

     

       21
       21
       +
       -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

     

       22
       22
       +
       +librarydir=@CMAKE_INSTALL_FULL_LIBDIR@

     

       23
       23
       +
       +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

     

       24
       24
       +
        

     

       25
       25
       +
        Name: @CMAKE_PROJECT_NAME@

     

       26
       26
       +
        Description: high-performance neural network inference framework optimized for the mobile platform

-1

pkgs/development/libraries/ncnn/default.nix

···

       45
       45
        
           homepage = "https://github.com/Tencent/ncnn";

     

       46
       46
        
           license = licenses.bsd3;

     

       47
       47
        
           maintainers = with maintainers; [ tilcreator ];

     

       48
       48
       -
           broken = true; # at 2022-11-23

     

       49
       48
        
         };

     

       50
       49
        
       }

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "aiobiketrax";

     

       16
       16
       -
         version = "0.3.0";

     

       16
       16
       +
         version = "0.4.0";

     

       17
       17
        
         format = "pyproject";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.9";

     
···

       22
       22
        
           owner = "basilfx";

     

       23
       23
        
           repo = pname;

     

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

     

       25
       25
       -
           hash = "sha256-goS+BLIeFJ2fXQ2srbhKRfEjsMFX3+eA7iWzpBWMqZQ=";

     

       25
       25
       +
           hash = "sha256-P8BExzL22rRj1IFPpojKR8ITdVq0RF8e3qLgb+H1PzE=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+3 -3

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "denonavr";

     

       18
       18
       -
         version = "0.10.11";

     

       18
       18
       +
         version = "0.10.12";

     

       19
       19
        
         format = "setuptools";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.6";

     
···

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "scarface-4711";

     

       25
       25
        
           repo = pname;

     

       26
       26
       -
           rev = version;

     

       27
       27
       -
           hash = "sha256-RY1XRGuwSFL429foEjEN93fBucUyyYc6cmpzYmYRorc=";

     

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

     

       27
       27
       +
           hash = "sha256-QNiDoPjOuwwAgUqDzXHzn0BE9bwXQrQKAIFlHCywl88=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = [

+12 -3

pkgs/development/python-modules/localstack-client/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , boto3

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
       +
       

     

       7
       7
       +
       # downstream dependencies

     

       8
       8
       +
       , localstack

     

       6
       9
        
       }:

     

       7
       10
        
       

     

       8
       11
        
       buildPythonPackage rec {

     

       9
       12
        
         pname = "localstack-client";

     

       10
       10
       -
         version = "1.36";

     

       13
       13
       +
         version = "1.39";

     

       11
       14
        
       

     

       12
       15
        
         src = fetchFromGitHub {

     

       13
       16
        
           owner = "localstack";

     

       14
       17
        
           repo = "localstack-python-client";

     

       15
       18
        
           # Request for proper tags: https://github.com/localstack/localstack-python-client/issues/38

     

       16
       16
       -
           rev = "92229c02c5b3cd0cef006e99c3d47db15aefcb4f";

     

       17
       17
       -
           sha256 = "sha256-pbDpe/5o4YU/2UIi8YbhzhIlXigOb/M2vjW9DKcIxoI=";

     

       19
       19
       +
           rev = "f1e538ad23700e5b1afe98720404f4801475e470";

     

       20
       20
       +
           sha256 = "sha256-MBXTiTzCwkduJPPRN7OKaWy2q9J8xCX/GGu09tyac3A=";

     

       18
       21
        
         };

     

       19
       22
        
       

     

       20
       23
        
         propagatedBuildInputs = [

     
···

       25
       28
        
           "localstack_client"

     

       26
       29
        
         ];

     

       27
       30
        
       

     

       31
       31
       +
         # All commands test `localstack` which is a downstream dependency

     

       32
       32
       +
         doCheck = false;

     

       28
       33
        
         checkInputs = [

     

       29
       34
        
           pytestCheckHook

     

       30
       35
        
         ];

     
···

       36
       41
        
       

     

       37
       42
        
         # For tests

     

       38
       43
        
         __darwinAllowLocalNetworking = true;

     

       44
       44
       +
       

     

       45
       45
       +
         passthru.tests = {

     

       46
       46
       +
           inherit localstack;

     

       47
       47
       +
         };

     

       39
       48
        
       

     

       40
       49
        
         meta = with lib; {

     

       41
       50
        
           description = "A lightweight Python client for LocalStack";

+9 -2

pkgs/development/python-modules/localstack-ext/default.nix

···

       9
       9
        
       , python-jose

     

       10
       10
        
       , requests

     

       11
       11
        
       , tabulate

     

       12
       12
       +
       

     

       13
       13
       +
       # Sensitive downstream dependencies

     

       14
       14
       +
       , localstack

     

       12
       15
        
       }:

     

       13
       16
        
       

     

       14
       17
        
       buildPythonPackage rec {

     

       15
       18
        
         pname = "localstack-ext";

     

       16
       16
       -
         version = "1.1.0";

     

       19
       19
       +
         version = "1.2.0";

     

       17
       20
        
       

     

       18
       21
        
         src = fetchPypi {

     

       19
       22
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "sha256-EpFkam2xqRSiIhLkcBFSFKr9j0P5oRP4CIUVcjKT5gM=";

     

       23
       23
       +
           sha256 = "sha256-F+FQJwvB1WH7qcfOG6IGY+ZlfKwz39UE5rwoQKnxaac=";

     

       21
       24
        
         };

     

       22
       25
        
       

     

       23
       26
        
         postPatch = ''

     
···

       49
       52
        
       

     

       50
       53
        
         # No tests in repo

     

       51
       54
        
         doCheck = false;

     

       55
       55
       +
       

     

       56
       56
       +
         passthru.tests = {

     

       57
       57
       +
           inherit localstack;

     

       58
       58
       +
         };

     

       52
       59
        
       

     

       53
       60
        
         meta = with lib; {

     

       54
       61
        
           description = "Extensions for LocalStack";

+2 -2

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

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "localstack";

     

       22
       22
       -
         version = "1.0.4";

     

       22
       22
       +
         version = "1.2.0";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "localstack";

     

       26
       26
        
           repo = "localstack";

     

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

     

       28
       28
       -
           sha256 = "sha256-JDF3wM5AVhfkAFlxmy1f3aMxs4J5LWd0JOY8MzRAzT4=";

     

       28
       28
       +
           sha256 = "sha256-en/9kxhiW4aesc2SOpg/jRXiRa222iBQuq1O3cHeBJs=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "lxmf";

     

       10
       10
       -
         version = "0.2.1";

     

       10
       10
       +
         version = "0.2.2";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.7";

     
···

       16
       16
        
           owner = "markqvist";

     

       17
       17
        
           repo = "lxmf";

     

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

     

       19
       19
       -
           hash = "sha256-ULYo2eFzBoEc5OeuRW/o35P/9oeYob8lG4T++nDrnNg=";

     

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

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -11

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , fetchpatch

     

       5
       4
        
       , poetry-core

     

       6
       5
        
       , pytestCheckHook

     

       7
       6
        
       , pythonOlder

     
···

       9
       8
        
       

     

       10
       9
        
       buildPythonPackage rec {

     

       11
       10
        
         pname = "pyhumps";

     

       12
       12
       -
         version = "3.7.3";

     

       11
       11
       +
         version = "3.8.0";

     

       13
       12
        
         format = "pyproject";

     

       14
       13
        
       

     

       15
       14
        
         disabled = pythonOlder "3.7";

     
···

       18
       17
        
           owner = "nficano";

     

       19
       18
        
           repo = "humps";

     

       20
       19
        
           rev = "v${version}";

     

       21
       21
       -
           hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc=";

     

       20
       20
       +
           hash = "sha256-ElL/LY2V2Z3efdV5FnDy9dSoBltULrzxsjaOx+7W9Oo=";

     

       22
       21
        
         };

     

       23
       23
       -
       

     

       24
       24
       -
         patches = [

     

       25
       25
       -
           (fetchpatch {

     

       26
       26
       -
             # https://github.com/nficano/humps/pull/281

     

       27
       27
       -
             url = "https://github.com/nficano/humps/commit/e248c26195804fa04c43e88c5682528f367e27b3.patch";

     

       28
       28
       -
             hash = "sha256-+TCVfuMgfkDaS1tPu4q6PIOC3Kn1MBWyuoyAO6W0/h4=";

     

       29
       29
       -
           })

     

       30
       30
       -
         ];

     

       31
       22
        
       

     

       32
       23
        
         nativeBuildInputs = [

     

       33
       24
        
           poetry-core

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "pynobo";

     

       9
       9
       -
         version = "1.5.0";

     

       9
       9
       +
         version = "1.6.0";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     
···

       15
       15
        
           owner = "echoromeo";

     

       16
       16
        
           repo = pname;

     

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

     

       18
       18
       -
           hash = "sha256-msJClYHljib8sATooI8q4irz6cC8hEgvcxLmmgatvwU=";

     

       18
       18
       +
           hash = "sha256-YbQfdOLO1gs7+oiwe4rDmmD1o7MG+vma5xPlrtNZ00M=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         # Project has no tests

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "rns";

     

       12
       12
       -
         version = "0.3.16";

     

       12
       12
       +
         version = "0.3.17";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
           owner = "markqvist";

     

       19
       19
        
           repo = "Reticulum";

     

       20
       20
        
           rev = "refs/tags/${version}";

     

       21
       21
       -
           hash = "sha256-+TXIxyLLIWK0lLUyh4irTYHXZLAv8zFYUGKAbA7D9qA=";

     

       21
       21
       +
           hash = "sha256-2e1mUDIDxgjGY4PGfgtbGwkktQfH1LsAczXKVW4jCLA=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/types-python-dateutil/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-python-dateutil";

     

       8
       8
       -
         version = "2.8.19.1";

     

       8
       8
       +
         version = "2.8.19.2";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           hash = "sha256-1kL3ryu5n+ePWndv0MpOMpMnIAR/QA4lrWK8KlsY3JQ=";

     

       13
       13
       +
           hash = "sha256-5uMs4Y83dlsIxGYiKHvI2BNtwMVi2a1bj9FYxZlj16c=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # Modules doesn't have tests

+3 -3

pkgs/development/tools/operator-sdk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "operator-sdk";

     

       5
       5
       -
         version = "1.24.1";

     

       5
       5
       +
         version = "1.25.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "operator-framework";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-6Al9EkAnaa7/wJzV4xy6FifPXa4MdA9INwJWpkWzCb8=";

     

       11
       11
       +
           sha256 = "sha256-Ej+Ai5bxqT3x/snFD0WaakcXlHCWJQh3vanyUJyJ/ks=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-eczTVlArpO+uLC6IsTkj4LBIi+fXq7CMBf1zJShDN58=";

     

       14
       14
       +
         vendorSha256 = "sha256-7I/Hcrp50Nyp2yjALoEX/+sr3B/XJ8JKmkAB1SgAuGg=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+7 -3

pkgs/misc/flashfocus/default.nix

···

       1
       1
       -
       { lib, python3, netcat-openbsd }:

     

       1
       1
       +
       { lib, python3, netcat-openbsd, nix-update-script }:

     

       2
       2
        
       

     

       3
       3
        
       python3.pkgs.buildPythonApplication rec {

     

       4
       4
        
         pname = "flashfocus";

     

       5
       5
       -
         version = "2.2.3";

     

       5
       5
       +
         version = "2.3.1";

     

       6
       6
        
       

     

       7
       7
        
         src = python3.pkgs.fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0cn44hryvz2wl7xklaslxsb3l2i3f8jkgmml0n9v2ks22j5l4r4h";

     

       9
       9
       +
           sha256 = "sha256-XT3CKJWn1uKnPPsJC+MWlEAd8sWdVTEXz5b3n0UUedY=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         postPatch = ''

     
···

       35
       35
        
         doCheck = false;

     

       36
       36
        
       

     

       37
       37
        
         pythonImportsCheck = [ "flashfocus" ];

     

       38
       38
       +
       

     

       39
       39
       +
         passthru.updateScript = nix-update-script {

     

       40
       40
       +
           attrPath = pname;

     

       41
       41
       +
         };

     

       38
       42
        
       

     

       39
       43
        
         meta = with lib; {

     

       40
       44
        
           homepage = "https://github.com/fennerm/flashfocus";

-11

pkgs/servers/web-apps/changedetection-io/default.nix

···

       19
       19
        
                 "test_redirect"

     

       20
       20
        
               ];

     

       21
       21
        
             });

     

       22
       22
       -
             lxml = prev.lxml.override {

     

       23
       23
       -
               libxml2 = prev.libxml2.overrideAttrs (old: rec {

     

       24
       24
       -
                 # etree.fromstring always returns None with 2.10.0

     

       25
       25
       -
                 version = "2.9.14";

     

       26
       26
       -
       

     

       27
       27
       -
                 src = fetchurl {

     

       28
       28
       -
                   url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";

     

       29
       29
       -
                   sha256 = "sha256-YNdKJX0czsBHXnScui8hVZ5IE577pv8oIkNXx8eY3+4=";

     

       30
       30
       -
                 };

     

       31
       31
       -
               });

     

       32
       32
       -
             };

     

       33
       22
        
             werkzeug = prev.werkzeug.overridePythonAttrs (old: rec {

     

       34
       23
        
               version = "2.0.3";

     

       35
       24
        
               src = old.src.override {

+3 -3

pkgs/shells/fish/plugins/forgit.nix

···

       2
       2
        
       

     

       3
       3
        
       buildFishPlugin rec {

     

       4
       4
        
         pname = "forgit";

     

       5
       5
       -
         version = "unstable-2022-08-16";

     

       5
       5
       +
         version = "unstable-2022-10-14";

     

       6
       6
        
       

     

       7
       7
        
         preFixup = ''

     

       8
       8
        
           substituteInPlace $out/share/fish/vendor_conf.d/forgit.plugin.fish \

     
···

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "wfxr";

     

       15
       15
        
           repo = "forgit";

     

       16
       16
       -
           rev = "3f50933f047510020428114551da0ee5cdfb32a3";

     

       17
       17
       -
           sha256 = "sha256-TSF4Vr5uf/+MVU4yCdIHNnwB7kkp4mF+hkhKtLqQvmk=";

     

       16
       16
       +
           rev = "2872548075e63bc83a0b960e2813b16571998563";

     

       17
       17
       +
           sha256 = "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

+3 -3

pkgs/shells/zsh/oh-my-zsh/default.nix

···

       5
       5
        
       , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         version = "2022-10-22";

     

       8
       8
       +
         version = "2022-10-24";

     

       9
       9
        
         pname = "oh-my-zsh";

     

       10
       10
       -
         rev = "0066280c3e971e1e45a9037f6d0b993dabcc3576";

     

       10
       10
       +
         rev = "bb8a0aa2c1c54c3aeb3e703397ab050fd62e36e6";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           inherit rev;

     

       14
       14
        
           owner = "ohmyzsh";

     

       15
       15
        
           repo = "ohmyzsh";

     

       16
       16
       -
           sha256 = "SiP58GhkhgaxdTG1A6jvWFkBs7D3mRCXZtNziCvPKKU=";

     

       16
       16
       +
           sha256 = "bLuUkT81eJ37WtLasNzDNiGY21SveCZO7Ma5fbb61mc=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         strictDeps = true;

+8 -8

pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch

···

       1
       1
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index a234caa..cd9d2c5 100644

     

       2
       2
       +
       index a234caa..d94388a 100644

     

       3
       3
        
       --- a/CMakeLists.txt

     

       4
       4
        
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -114,6 +114,8 @@ if(USE_SYSTEM_NCNN)

     

       6
       6
       -
                    include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")

     

       7
       7
       -
                endif()

     

       8
       8
       -
                include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")

     

       5
       5
       +
       @@ -107,6 +107,8 @@ if(USE_SYSTEM_NCNN)

     

       6
       6
       +
        

     

       7
       7
       +
                find_package(Threads)

     

       8
       8
       +
        

     

       9
       9
        
       +        include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake")

     

       10
       10
        
       +        include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake")

     

       11
       11
       -
                include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")

     

       12
       12
       -
        

     

       13
       13
       -
                if (NOT TARGET glslang OR NOT TARGET SPIRV)

     

       11
       11
       +
                include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")

     

       12
       12
       +
                include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")

     

       13
       13
       +
                if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")

+2 -2

pkgs/tools/system/btop/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "btop";

     

       11
       11
       -
         version = "1.2.9";

     

       12
       12
       -
         hash = "sha256-YCVRWmBZmzAAFxMIWMBb8NPCRp8NeBtMqEbkgXYS9M4=";

     

       11
       11
       +
         version = "1.2.12";

     

       12
       12
       +
         hash = "sha256-ieNwFCDJF0U1wTfAeWM22CS3RE1SEp12ODHsRVYFoKU=";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "aristocratos";

+76

pkgs/tools/text/textpieces/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , python3

     

       5
       5
       +
       , meson

     

       6
       6
       +
       , ninja

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       , vala

     

       9
       9
       +
       , glib

     

       10
       10
       +
       , gtk4

     

       11
       11
       +
       , libgee

     

       12
       12
       +
       , libadwaita

     

       13
       13
       +
       , json-glib

     

       14
       14
       +
       , blueprint-compiler

     

       15
       15
       +
       , gtksourceview5

     

       16
       16
       +
       , gobject-introspection

     

       17
       17
       +
       , wrapGAppsHook4

     

       18
       18
       +
       , appstream-glib

     

       19
       19
       +
       , desktop-file-utils

     

       20
       20
       +
       }:

     

       21
       21
       +
       

     

       22
       22
       +
       let

     

       23
       23
       +
         pythonEnv = python3.withPackages ( ps: with ps; [ pyyaml ] );

     

       24
       24
       +
       in

     

       25
       25
       +
       stdenv.mkDerivation rec {

     

       26
       26
       +
         pname = "textpieces";

     

       27
       27
       +
         version = "3.3.0";

     

       28
       28
       +
       

     

       29
       29
       +
         src = fetchFromGitHub {

     

       30
       30
       +
           owner = "liferooter";

     

       31
       31
       +
           repo = pname;

     

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

     

       33
       33
       +
           hash = "sha256-QLPvK2kiOGf8XN2aors6cZtl9d9uqsxcho2A1kISO5Y=";

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
         nativeBuildInputs = [

     

       37
       37
       +
           meson

     

       38
       38
       +
           ninja

     

       39
       39
       +
           pkg-config

     

       40
       40
       +
           pythonEnv

     

       41
       41
       +
           vala

     

       42
       42
       +
           blueprint-compiler

     

       43
       43
       +
           wrapGAppsHook4

     

       44
       44
       +
           appstream-glib

     

       45
       45
       +
           desktop-file-utils

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         buildInputs = [

     

       49
       49
       +
           glib

     

       50
       50
       +
           gtk4

     

       51
       51
       +
           libadwaita

     

       52
       52
       +
           libgee

     

       53
       53
       +
           json-glib

     

       54
       54
       +
           gtksourceview5

     

       55
       55
       +
           gobject-introspection

     

       56
       56
       +
         ];

     

       57
       57
       +
       

     

       58
       58
       +
         runtimeDependencies = [

     

       59
       59
       +
           pythonEnv

     

       60
       60
       +
         ];

     

       61
       61
       +
       

     

       62
       62
       +
         postPatch = ''

     

       63
       63
       +
           chmod +x build-aux/meson/postinstall.py

     

       64
       64
       +
           patchShebangs build-aux/meson/postinstall.py

     

       65
       65
       +
           patchShebangs scripts/

     

       66
       66
       +
         '';

     

       67
       67
       +
       

     

       68
       68
       +
         meta = with lib; {

     

       69
       69
       +
           description = "Quick text processing";

     

       70
       70
       +
           longDescription = "A small tool for quick text transformations such as checksums, encoding, decoding and so on.";

     

       71
       71
       +
           homepage = "https://github.com/liferooter/textpieces";

     

       72
       72
       +
           license = licenses.gpl3Plus;

     

       73
       73
       +
           platforms = platforms.linux;

     

       74
       74
       +
           maintainers = with maintainers; [ zendo ];

     

       75
       75
       +
         };

     

       76
       76
       +
       }

+8

pkgs/top-level/all-packages.nix

···

       18097
       18097
        
           boost177

     

       18098
       18098
        
           boost178

     

       18099
       18099
        
           boost179

     

       18100
       18100
       +
           boost180

     

       18100
       18101
        
         ;

     

       18101
       18102
        
       

     

       18102
       18103
        
         boost15x = boost159;

     

       18103
       18104
        
         boost16x = boost169;

     

       18104
       18105
        
         boost17x = boost179;

     

       18106
       18106
       +
         boost18x = boost180;

     

       18105
       18107
        
         boost = boost17x;

     

       18106
       18108
        
       

     

       18107
       18109
        
         boost_process = callPackage ../development/libraries/boost-process { };

     
···

       32061
       32063
        
       

     

       32062
       32064
        
         terminal-notifier = callPackage ../applications/misc/terminal-notifier {};

     

       32063
       32065
        
       

     

       32066
       32066
       +
         textpieces = callPackage ../tools/text/textpieces { };

     

       32067
       32067
       +
       

     

       32064
       32068
        
         textplots = callPackage ../tools/graphics/textplots { };

     

       32065
       32069
        
       

     

       32066
       32070
        
         texture-synthesis = callPackage ../tools/graphics/texture-synthesis { };

     
···

       32653
       32657
        
           x11Support = false;

     

       32654
       32658
        
           imlib2 = imlib2-nox;

     

       32655
       32659
        
         };

     

       32660
       32660
       +
       

     

       32661
       32661
       +
         watchmate = callPackage ../applications/misc/watchmate { };

     

       32656
       32662
        
       

     

       32657
       32663
        
         watson = callPackage ../applications/office/watson { };

     

       32658
       32664
        
       

     
···

       35449
       35455
        
         ### SCIENCE/PHYSICS

     

       35450
       35456
        
       

     

       35451
       35457
        
         dawn = callPackage ../applications/science/physics/dawn {};

     

       35458
       35458
       +
       

     

       35459
       35459
       +
         dawncut = callPackage ../applications/science/physics/dawncut {};

     

       35452
       35460
        
       

     

       35453
       35461
        
         elmerfem = callPackage ../applications/science/physics/elmerfem {};

     

       35454
       35462