commit be1f07fc6e802114970aa9f7efcadaaa98cac9d3 · pyrox.dev/nixpkgs

+16 -24

doc/languages-frameworks/nim.section.md

···

       15
       15
        
       The following example shows a Nim program that depends only on Nim libraries:

     

       16
       16
        
       

     

       17
       17
        
       ```nix

     

       18
       18
       -
       { lib, nimPackages, fetchurl }:

     

       19
       19
       -
       

     

       20
       20
       -
       nimPackages.buildNimPackage rec {

     

       21
       21
       -
         pname = "hottext";

     

       22
       22
       -
         version = "1.4";

     

       18
       18
       +
       { lib, nimPackages, fetchFromGitHub }:

     

       23
       19
        
       

     

       20
       20
       +
       nimPackages.buildNimPackage (finalAttrs: {

     

       21
       21
       +
         pname = "ttop";

     

       22
       22
       +
         version = "1.0.1";

     

       24
       23
        
         nimBinOnly = true;

     

       25
       24
        
       

     

       26
       26
       -
         src = fetchurl {

     

       27
       27
       -
           url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz";

     

       28
       28
       -
           hash = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY=";

     

       25
       25
       +
         src = fetchFromGitHub {

     

       26
       26
       +
           owner = "inv2004";

     

       27
       27
       +
           repo = "ttop";

     

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

     

       29
       29
       +
           hash = "sha256-x4Uczksh6p3XX/IMrOFtBxIleVHdAPX9e8n32VAUTC4=";

     

       29
       30
        
         };

     

       30
       31
        
       

     

       31
       31
       -
         buildInputs = with nimPackages; [

     

       32
       32
       -
           bumpy

     

       33
       33
       -
           chroma

     

       34
       34
       -
           flatty

     

       35
       35
       -
           nimsimd

     

       36
       36
       -
           pixie

     

       37
       37
       -
           sdl2

     

       38
       38
       -
           typography

     

       39
       39
       -
           vmath

     

       40
       40
       -
           zippy

     

       41
       41
       -
         ];

     

       42
       42
       -
       }

     

       32
       32
       +
         buildInputs = with nimPackages; [ asciigraph illwill parsetoml zippy ];

     

       43
       33
        
       

     

       34
       34
       +
       })

     

       44
       35
        
       ```

     

       45
       36
        
       

     

       46
       37
        
       ## Nim library packages in Nixpkgs {#nim-library-packages-in-nixpkgs}

     
···

       60
       51
        
       ```nix

     

       61
       52
        
       { lib, buildNimPackage, fetchNimble, SDL2 }:

     

       62
       53
        
       

     

       63
       63
       -
       buildNimPackage rec {

     

       54
       54
       +
       buildNimPackage (finalAttrs: {

     

       64
       55
        
         pname = "sdl2";

     

       65
       56
        
         version = "2.0.4";

     

       66
       57
        
         src = fetchNimble {

     

       67
       67
       -
           inherit pname version;

     

       68
       68
       -
           hash = "sha256-qDtVSnf+7rTq36WAxgsUZ8XoUk4sKwHyt8EJcY5WP+o=";

     

       58
       58
       +
           inherit (finalAttrs) pname version;

     

       59
       59
       +
           hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";

     

       69
       60
        
         };

     

       70
       61
        
         propagatedBuildInputs = [ SDL2 ];

     

       71
       71
       -
       }

     

       62
       62
       +
         doCheck = true;

     

       63
       63
       +
       })

     

       72
       64
        
       ```

     

       73
       65
        
       

     

       74
       66
        
       ## `buildNimPackage` parameters {#buildnimpackage-parameters}

+1 -1

nixos/doc/manual/release-notes/rl-2305.section.md

···

553
553

554
554

- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`.

555
555

556
556
-
- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.

556
556
+
- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.

557
557

558
558

- Top-level `buildPlatform`, `hostPlatform`, `targetPlatform` have been deprecated, use `stdenv.X` instead.

559
559

+2 -1

nixos/modules/services/web-apps/nextcloud.nix

···

       381
       381
        
               type = types.str;

     

       382
       382
        
               description = lib.mdDoc ''

     

       383
       383
        
                 The full path to a file that contains the admin's password. Must be

     

       384
       384
       -
                 readable by user `nextcloud`.

     

       384
       384
       +
                 readable by user `nextcloud`. The password is set only in the initial

     

       385
       385
       +
                 setup of nextcloud by the systemd `nextcloud-setup.service`.

     

       385
       386
        
               '';

     

       386
       387
        
             };

     

       387
       388

+2 -2

pkgs/applications/audio/ardour/default.nix

···

       58
       58
        
       }:

     

       59
       59
        
       stdenv.mkDerivation rec {

     

       60
       60
        
         pname = "ardour";

     

       61
       61
       -
         version = "7.3";

     

       61
       61
       +
         version = "7.4";

     

       62
       62
        
       

     

       63
       63
        
         # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       64
       64
        
         # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       65
       65
        
         src = fetchgit {

     

       66
       66
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       67
       67
        
           rev = version;

     

       68
       68
       -
           hash = "sha256-fDZGmKQ6qgENkq8NY/J67Jym+IXoOYs8DT4xyPXLcC4=";

     

       68
       68
       +
           hash = "sha256-CUGhJi3ji0F6v41Y08sQvo7oKITOJ96ojdJL+FyCxmw=";

     

       69
       69
        
         };

     

       70
       70
        
       

     

       71
       71
        
         bundledContent = fetchzip {

+3 -3

pkgs/applications/blockchains/lnd/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "lnd";

     

       9
       9
       -
         version = "0.16.2-beta";

     

       9
       9
       +
         version = "0.16.3-beta";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "lightningnetwork";

     

       13
       13
        
           repo = "lnd";

     

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

     

       15
       15
       -
           sha256 = "sha256-s0m/aS99uB6LZb0+73SQ++mF0Ukg6IYIL+jbEi8ezW0=";

     

       15
       15
       +
           hash = "sha256-/seSpWnlQmeU4vQtlHMOSedPXP9HJp1GyxcB1LqHayA=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "sha256-7Ydl56Z6aOMBQ1RamFzjD/yp3zgQLkF5WEoOQe1Urv0=";

     

       18
       18
       +
         vendorHash = "sha256-obrSVMqTwHe7231wa0OuoT6ANBqkQbkHIy93J2f68Zk=";

     

       19
       19
        
       

     

       20
       20
        
         subPackages = [ "cmd/lncli" "cmd/lnd" ];

     

       21
       21

+10 -2

pkgs/applications/display-managers/lightdm-slick-greeter/default.nix

···

       7
       7
        
       , intltool

     

       8
       8
        
       , autoreconfHook

     

       9
       9
        
       , wrapGAppsHook

     

       10
       10
       +
       , cinnamon

     

       10
       11
        
       , lightdm

     

       11
       12
        
       , gtk3

     

       12
       13
        
       , pixman

     

       13
       14
        
       , libcanberra

     

       15
       15
       +
       , libgnomekbd

     

       14
       16
        
       , libX11

     

       15
       17
        
       , libXext

     

       16
       18
        
       , linkFarm

     
···

       20
       22
        
       

     

       21
       23
        
       stdenv.mkDerivation rec {

     

       22
       24
        
         pname = "lightdm-slick-greeter";

     

       23
       23
       -
         version = "1.6.1";

     

       25
       25
       +
         version = "1.8.1";

     

       24
       26
        
       

     

       25
       27
        
         src = fetchFromGitHub {

     

       26
       28
        
           owner = "linuxmint";

     

       27
       29
        
           repo = "slick-greeter";

     

       28
       30
        
           rev = version;

     

       29
       29
       -
           sha256 = "sha256-k/E3bR63kesHQ/we+ctC0UEYE5YdZ6Lv5lYuXqCOvKA=";

     

       31
       31
       +
           sha256 = "sha256-40RyGWn32ppPjsuPljGBO6o7bu2rKYBweDycRS7xAVA=";

     

       30
       32
        
         };

     

       31
       33
        
       

     

       32
       34
        
         nativeBuildInputs = [

     
···

       40
       42
        
         ];

     

       41
       43
        
       

     

       42
       44
        
         buildInputs = [

     

       45
       45
       +
           cinnamon.xapp

     

       43
       46
        
           lightdm

     

       44
       47
        
           gtk3

     

       45
       48
        
           pixman

     

       46
       49
        
           libcanberra

     

       50
       50
       +
           libgnomekbd # needed by XApp.KbdLayoutController

     

       47
       51
        
           libX11

     

       48
       52
        
           libXext

     

       49
       53
        
         ];

     
···

       61
       65
        
       

     

       62
       66
        
           substituteInPlace src/session-list.vala \

     

       63
       67
        
             --replace "/usr/share" "${placeholder "out"}/share"

     

       68
       68
       +
       

     

       69
       69
       +
           # We prefer stable path here.

     

       70
       70
       +
           substituteInPlace data/x.dm.slick-greeter.gschema.xml \

     

       71
       71
       +
             --replace "/usr/share/onboard" "/run/current-system/sw/share/onboard"

     

       64
       72
        
       

     

       65
       73
        
           patchShebangs files/usr/bin/*

     

       66
       74
        
         '';

+1 -1

pkgs/applications/editors/emacs/generic.nix

···

       98
       98
        
       , withWebP ? lib.versionAtLeast version "29"

     

       99
       99
        
       , withX ? !(stdenv.isDarwin || noGui || withPgtk)

     

       100
       100
        
       , withXinput2 ? withX && lib.versionAtLeast version "29"

     

       101
       101
       -
       , withXwidgets ? !noGui && (withGTK3 || withPgtk)

     

       101
       101
       +
       , withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk)

     

       102
       102
        
       

     

       103
       103
        
       # Options

     

       104
       104
        
       , siteStart ? ./site-start.el

+12 -5

pkgs/applications/misc/dbx/default.nix

···

       16
       16
        
           hash = "sha256-dArR1z3wkGDd3Y1WHK0sLjhuaKHAcsx6cCH2rgVdUGs=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         postPatch = ''

     

       20
       20
       -
           substituteInPlace setup.py \

     

       21
       21
       -
             --replace "mlflow-skinny>=1.28.0,<3.0.0" "mlflow" \

     

       22
       22
       -
             --replace "rich==12.6.0" "rich"

     

       23
       23
       -
         '';

     

       19
       19
       +
         pythonRelaxDeps = [

     

       20
       20
       +
           "rich"

     

       21
       21
       +
           "typer"

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         pythonRemoveDeps = [

     

       25
       25
       +
           "mlflow-skinny"

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = with python3.pkgs; [

     

       29
       29
       +
           pythonRelaxDepsHook

     

       30
       30
       +
         ];

     

       24
       31
        
       

     

       25
       32
        
         propagatedBuildInputs = with python3.pkgs; [

     

       26
       33
        
           aiohttp

+5 -5

pkgs/applications/misc/deadd-notification-center/default.nix

···

       17
       17
        
         '';

     

       18
       18
        
       in mkDerivation rec {

     

       19
       19
        
         pname = "deadd-notification-center";

     

       20
       20
       -
         version = "unstable-2022-11-07";

     

       20
       20
       +
         version = "2.0.3";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "phuhl";

     

       24
       24
        
           repo = "linux_notification_center";

     

       25
       25
       -
           rev = "f4b8e2b724d86def9e7b0e12ea624f95760352d5";

     

       26
       26
       -
           hash = "sha256-ClJfWqStULvmj5YRAUDAmn2WOSA2sVtyZsa+qSY51Gk=";

     

       25
       25
       +
           rev = "${version}";

     

       26
       26
       +
           hash = "sha256-OM4zzKdo0HMvzAl7BG9IuSHmTauSC5rLWoJJOAshDYg=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         isLibrary = false;

     
···

       31
       31
        
         isExecutable = true;

     

       32
       32
        
       

     

       33
       33
        
         libraryHaskellDepends = with haskellPackages; [

     

       34
       34
       -
           base bytestring ConfigFile containers dbus directory env-locale

     

       34
       34
       +
           aeson base bytestring ConfigFile containers dbus directory env-locale

     

       35
       35
        
           filepath gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject

     

       36
       36
        
           gi-gtk gi-pango haskell-gettext haskell-gi haskell-gi-base

     

       37
       37
        
           hdaemonize here lens mtl process regex-tdfa setlocale split stm

     

       38
       38
       -
           tagsoup text time transformers tuple unix

     

       38
       38
       +
           tagsoup text time transformers tuple unix yaml

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
        
         executableHaskellDepends = with haskellPackages; [ base ];

+2 -9

pkgs/applications/misc/feedbackd/default.nix

···

       31
       31
        
       in

     

       32
       32
        
       stdenv.mkDerivation rec {

     

       33
       33
        
         pname = "feedbackd";

     

       34
       34
       -
         version = "0.1.0";

     

       34
       34
       +
         version = "0.2.0";

     

       35
       35
        
       

     

       36
       36
        
         outputs = [ "out" "dev" "devdoc" ];

     

       37
       37
        
       

     
···

       40
       40
        
           owner = "Librem5";

     

       41
       41
        
           repo = "feedbackd";

     

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

     

       43
       43
       -
           hash = "sha256-7H5Ah4zo+wLKd0WoKoOgtIm7HcUSw8PTf/KzBlY75oc=";

     

       43
       43
       +
           hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s=";

     

       44
       44
        
           fetchSubmodules = true;

     

       45
       45
        
         };

     

       46
       46
       -
       

     

       47
       47
       -
         patches = [

     

       48
       48
       -
           (fetchpatch2 {

     

       49
       49
       -
             url = "https://source.puri.sm/Librem5/feedbackd/-/merge_requests/109.patch";

     

       50
       50
       -
             hash = "sha256-z3Ud6P2GHYOaGA2vJDD3Sz47+M8p0VcYZ5gbYcGydMk=";

     

       51
       51
       -
           })

     

       52
       52
       -
         ];

     

       53
       46
        
       

     

       54
       47
        
         depsBuildBuild = [

     

       55
       48
        
           pkg-config

+2 -2

pkgs/applications/misc/phoc/default.nix

···

       52
       52
        
         });

     

       53
       53
        
       in stdenv.mkDerivation rec {

     

       54
       54
        
         pname = "phoc";

     

       55
       55
       -
         version = "0.25.0";

     

       55
       55
       +
         version = "0.27.0";

     

       56
       56
        
       

     

       57
       57
        
         src = fetchFromGitLab {

     

       58
       58
        
           domain = "gitlab.gnome.org";

     
···

       60
       60
        
           owner = "Phosh";

     

       61
       61
        
           repo = pname;

     

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

     

       63
       63
       -
           sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE=";

     

       63
       63
       +
           sha256 = "sha256-4/Fxo72KXLy3gxXMS+PrTUbZl0EFt2GPMXg8+/fE7MY=";

     

       64
       64
        
           fetchSubmodules = true;

     

       65
       65
        
         };

     

       66
       66

+5

pkgs/applications/misc/shell-genie/default.nix

···

       16
       16
        
           hash = "sha256-z7LiAq2jLzqjg4Q/r9o7M6VbedeT34NyPpgctfqBp+8=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       +
         pythonRelaxDeps = [

     

       20
       20
       +
           "typer"

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       19
       23
        
         nativeBuildInputs = [

     

       20
       24
        
           poetry-core

     

       25
       25
       +
           pythonRelaxDepsHook

     

       21
       26
        
         ];

     

       22
       27
        
       

     

       23
       28
        
         propagatedBuildInputs = [

+2 -2

pkgs/applications/misc/syncthingtray/default.nix

···

       30
       30
        
       }:

     

       31
       31
        
       

     

       32
       32
        
       mkDerivation rec {

     

       33
       33
       -
         version = "1.4.1";

     

       33
       33
       +
         version = "1.4.3";

     

       34
       34
        
         pname = "syncthingtray";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchFromGitHub {

     

       37
       37
        
           owner = "Martchus";

     

       38
       38
        
           repo = "syncthingtray";

     

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

     

       40
       40
       -
           sha256 = "sha256-6s78vytYxU7FWGQRO56qgmtZBlHbXMz3iVAbBXycDmI=";

     

       40
       40
       +
           sha256 = "sha256-6J/P/DDD17QtXAISQn77EDIYqQu1hY7EnIX0FC6H/20=";

     

       41
       41
        
         };

     

       42
       42
        
       

     

       43
       43
        
         buildInputs = [

+3 -3

pkgs/applications/misc/valent/default.nix

···

       22
       22
        
       

     

       23
       23
        
       stdenv.mkDerivation rec {

     

       24
       24
        
         pname = "valent";

     

       25
       25
       -
         version = "unstable-2023-05-01";

     

       25
       25
       +
         version = "unstable-2023-06-11";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchFromGitHub {

     

       28
       28
        
           owner = "andyholmes";

     

       29
       29
        
           repo = "valent";

     

       30
       30
       -
           rev = "74f5d9349a60f0d9fcf88cda01713980a221d639";

     

       30
       30
       +
           rev = "e6a121efa7eb7b432517d610de4deea6dfa876b0";

     

       31
       31
        
           fetchSubmodules = true;

     

       32
       32
       -
           sha256 = "sha256-wqdujEKizrDFXtsjSTWpFgDL7MH3tsLTc7yd3LFgIQU=";

     

       32
       32
       +
           hash = "sha256-8X4Yu8VY5ehptJN1KtsCuoECtEZNLZMzOvU91j8UmDk=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [

+14 -14

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       110
       110
        
           "vendorHash": null

     

       111
       111
        
         },

     

       112
       112
        
         "aws": {

     

       113
       113
       -
           "hash": "sha256-hu4+FAqub+dah9is4iCyy784L8kIiFqkyrcZzll8LoU=",

     

       113
       113
       +
           "hash": "sha256-+0La1Gx8uBnz5WEidTfW5yqyNT2Ii+UaJJxWh05VAks=",

     

       114
       114
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/aws",

     

       115
       115
        
           "owner": "hashicorp",

     

       116
       116
        
           "repo": "terraform-provider-aws",

     

       117
       117
       -
           "rev": "v5.2.0",

     

       117
       117
       +
           "rev": "v5.3.0",

     

       118
       118
        
           "spdx": "MPL-2.0",

     

       119
       119
       -
           "vendorHash": "sha256-y4JNZ4cMqXwvRNys+llQNGw91EuU/dzGY6Ifs/0cX8c="

     

       119
       119
       +
           "vendorHash": "sha256-stvcLz/5DosG+c9syv5i2diTp8cCnCMfW1vngsXl7fQ="

     

       120
       120
        
         },

     

       121
       121
        
         "azuread": {

     

       122
       122
        
           "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",

     
···

       128
       128
        
           "vendorHash": null

     

       129
       129
        
         },

     

       130
       130
        
         "azurerm": {

     

       131
       131
       -
           "hash": "sha256-OEybd46MRwtxnE11oy6KKg9uEqkzzUxrrMwbF0RkjUg=",

     

       131
       131
       +
           "hash": "sha256-YrAEwWHlxh8e0uH9UEy7F5wZkOzbqXUfy2g2uVwBrxA=",

     

       132
       132
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",

     

       133
       133
        
           "owner": "hashicorp",

     

       134
       134
        
           "repo": "terraform-provider-azurerm",

     

       135
       135
       -
           "rev": "v3.60.0",

     

       135
       135
       +
           "rev": "v3.61.0",

     

       136
       136
        
           "spdx": "MPL-2.0",

     

       137
       137
        
           "vendorHash": null

     

       138
       138
        
         },

     
···

       381
       381
        
           "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="

     

       382
       382
        
         },

     

       383
       383
        
         "fastly": {

     

       384
       384
       -
           "hash": "sha256-zjeiA09kTc9qE+YGGrmMhken7oh3pX309t6VKE/fKN0=",

     

       384
       384
       +
           "hash": "sha256-ZskfmyYqUFa848uAl+ejBUaYiD0dWdwUyWBw5TKRrHg=",

     

       385
       385
        
           "homepage": "https://registry.terraform.io/providers/fastly/fastly",

     

       386
       386
        
           "owner": "fastly",

     

       387
       387
        
           "repo": "terraform-provider-fastly",

     

       388
       388
       -
           "rev": "v5.0.0",

     

       388
       388
       +
           "rev": "v5.1.0",

     

       389
       389
        
           "spdx": "MPL-2.0",

     

       390
       390
        
           "vendorHash": null

     

       391
       391
        
         },

     
···

       484
       484
        
           "vendorHash": null

     

       485
       485
        
         },

     

       486
       486
        
         "hcloud": {

     

       487
       487
       -
           "hash": "sha256-aqx6oMIqMUgpVMInZPxGFPT9i+pBdU3ufjM6YUSiOss=",

     

       487
       487
       +
           "hash": "sha256-PAsXAZMCo4mXLLh2h40xN9SuTnCnScwdjAT2j5HvNrI=",

     

       488
       488
        
           "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",

     

       489
       489
        
           "owner": "hetznercloud",

     

       490
       490
        
           "repo": "terraform-provider-hcloud",

     

       491
       491
       -
           "rev": "v1.39.0",

     

       491
       491
       +
           "rev": "v1.40.0",

     

       492
       492
        
           "spdx": "MPL-2.0",

     

       493
       493
       -
           "vendorHash": "sha256-qa6DUmzL+JB/WTJM+a5VDvBCsrbt8gq/LeqzdAHLm0Q="

     

       493
       493
       +
           "vendorHash": "sha256-dORrQ0gmSLOfyPOuFE84h9OkFI9yslRBfYhwnZM3iQc="

     

       494
       494
        
         },

     

       495
       495
        
         "helm": {

     

       496
       496
        
           "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=",

     
···

       539
       539
        
           "vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg="

     

       540
       540
        
         },

     

       541
       541
        
         "huaweicloud": {

     

       542
       542
       -
           "hash": "sha256-2N8BmYd/8Mf65ARYeQcbMKLjNlxP6uZe+3+lsNZbiZg=",

     

       542
       542
       +
           "hash": "sha256-ullp0qBo2BFokbXMek5Y5s7qN2Ig3L5ekXSlbLhvrWU=",

     

       543
       543
        
           "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",

     

       544
       544
        
           "owner": "huaweicloud",

     

       545
       545
        
           "repo": "terraform-provider-huaweicloud",

     

       546
       546
       -
           "rev": "v1.49.0",

     

       546
       546
       +
           "rev": "v1.50.0",

     

       547
       547
        
           "spdx": "MPL-2.0",

     

       548
       548
        
           "vendorHash": null

     

       549
       549
        
         },

     
···

       1026
       1026
        
           "vendorHash": null

     

       1027
       1027
        
         },

     

       1028
       1028
        
         "snowflake": {

     

       1029
       1029
       -
           "hash": "sha256-1a2zGEZgMdmH6/dBJ+19VHDMfOs7Xwd4wJ/CA/mVI3g=",

     

       1029
       1029
       +
           "hash": "sha256-0TnsoK1B6npf4zkaG2hkE8WVXgrI7DsFZFuqFd8kz/4=",

     

       1030
       1030
        
           "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",

     

       1031
       1031
        
           "owner": "Snowflake-Labs",

     

       1032
       1032
        
           "repo": "terraform-provider-snowflake",

     

       1033
       1033
       -
           "rev": "v0.66.1",

     

       1033
       1033
       +
           "rev": "v0.66.2",

     

       1034
       1034
        
           "spdx": "MIT",

     

       1035
       1035
        
           "vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM="

     

       1036
       1036
        
         },

-20

pkgs/applications/video/natron/config.pri

···

       1
       1
       -
       boost: LIBS += -lboost_serialization

     

       2
       2
       -
       expat: LIBS += -lexpat

     

       3
       3
       -
       expat: PKGCONFIG -= expat

     

       4
       4
       -
       cairo {

     

       5
       5
       -
               PKGCONFIG += cairo

     

       6
       6
       -
               LIBS -=  $$system(pkg-config --variable=libdir cairo)/libcairo.a

     

       7
       7
       -
       }

     

       8
       8
       -
       pyside {

     

       9
       9
       -
               PKGCONFIG -= pyside

     

       10
       10
       -
               INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)

     

       11
       11
       -
               INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtCore

     

       12
       12
       -
               INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtGui

     

       13
       13
       -
               INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui)

     

       14
       14
       -
               LIBS += -lpyside-python2.7

     

       15
       15
       -
       }

     

       16
       16
       -
       shiboken {

     

       17
       17
       -
               PKGCONFIG -= shiboken

     

       18
       18
       -
               INCLUDEPATH += $$system(pkg-config --variable=includedir shiboken)

     

       19
       19
       -
               LIBS += -lshiboken-python2.7

     

       20
       20
       -
       }

+48 -103

pkgs/applications/video/natron/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,

     

       2
       2
       -
         cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,

     

       3
       3
       -
         poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio_1,

     

       4
       4
       -
         qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , wrapQtAppsHook

     

       7
       7
       +
       , boost

     

       8
       8
       +
       , cairo

     

       9
       9
       +
       , ceres-solver

     

       10
       10
       +
       , expat

     

       11
       11
       +
       , extra-cmake-modules

     

       12
       12
       +
       , glog

     

       13
       13
       +
       , libXdmcp

     

       14
       14
       +
       , python3

     

       15
       15
       +
       , wayland

     

       16
       16
       +
       }:

     

       5
       17
        
       

     

       6
       18
        
       let

     

       7
       7
       -
         minorVersion = "2.3";

     

       8
       8
       -
         version = "${minorVersion}.15";

     

       9
       9
       -
         OpenColorIO-Configs = fetchurl {

     

       10
       10
       -
           url = "https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v${minorVersion}.tar.gz";

     

       11
       11
       -
           sha256 = "AZK9J+RnMyxOYcAQOAQZj5QciPQ999m6jrtBt5rdpkA=";

     

       12
       12
       -
         };

     

       13
       13
       -
         seexpr = stdenv.mkDerivation rec {

     

       14
       14
       -
           version = "1.0.1";

     

       15
       15
       -
           pname = "seexpr";

     

       16
       16
       -
           src = fetchurl {

     

       17
       17
       -
             url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";

     

       18
       18
       -
             sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";

     

       19
       19
       -
           };

     

       20
       20
       -
           nativeBuildInputs = [ cmake ];

     

       21
       21
       -
           buildInputs = [ libpng flex bison ];

     

       22
       22
       -
         };

     

       23
       23
       -
         buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "", postPatch ? "" }:

     

       24
       24
       -
           stdenv.mkDerivation {

     

       25
       25
       -
             pname = "openfx-${pluginName}";

     

       26
       26
       -
             version = version;

     

       27
       27
       -
             src = fetchurl {

     

       28
       28
       -
               url = "https://github.com/NatronGitHub/openfx-${pluginName}/releases/download/Natron-${version}/openfx-${pluginName}-Natron-${version}.tar.xz";

     

       29
       29
       -
               inherit sha256;

     

       30
       30
       -
             };

     

       31
       31
       -
             inherit nativeBuildInputs buildInputs postPatch;

     

       32
       32
       -
             preConfigure = ''

     

       33
       33
       -
               makeFlagsArray+=("CONFIG=release")

     

       34
       34
       -
               makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")

     

       35
       35
       -
               ${preConfigure}

     

       36
       36
       -
             '';

     

       37
       37
       -
           };

     

       38
       38
       -
         lodepngcpp = fetchurl {

     

       39
       39
       -
           url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp";

     

       40
       40
       -
           sha256 = "1dxkkr4jbmvlwfr7m16i1mgcj1pqxg9s1a7y3aavs9rrk0ki8ys2";

     

       41
       41
       -
         };

     

       42
       42
       -
         lodepngh = fetchurl {

     

       43
       43
       -
           url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h";

     

       44
       44
       -
           sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq";

     

       19
       19
       +
         minorVersion = "2.5";

     

       20
       20
       +
         version = "${minorVersion}.0";

     

       21
       21
       +
         OpenColorIO-Configs = fetchFromGitHub {

     

       22
       22
       +
           owner = "NatronGitHub";

     

       23
       23
       +
           repo = "OpenColorIO-Configs";

     

       24
       24
       +
           rev = "Natron-v${minorVersion}";

     

       25
       25
       +
           hash = "sha256-TD7Uge9kKbFxOmOCn+TSQovnKTmFS3uERTu5lmZFHbc=";

     

       45
       26
        
         };

     

       46
       46
       -
         cimgversion = "89b9d062ec472df3d33989e6d5d2a8b50ba0775c";

     

       47
       47
       -
         CImgh = fetchurl {

     

       48
       48
       -
           url = "https://raw.githubusercontent.com/dtschump/CImg/${cimgversion}/CImg.h";

     

       49
       49
       -
           sha256 = "sha256-NbYpZDNj2oZ+wqoEkRwwCjiujdr+iGOLA0Pa0Ynso6U=";

     

       50
       50
       -
         };

     

       51
       51
       -
         inpainth = fetchurl {

     

       52
       52
       -
           url = "https://raw.githubusercontent.com/dtschump/CImg/${cimgversion}/plugins/inpaint.h";

     

       53
       53
       -
           sha256 = "sha256-cd28a3VOs5002GkthHkbIUrxZfKuGhqIYO4Oxe/2HIQ=";

     

       54
       54
       -
         };

     

       55
       55
       -
         plugins = map buildPlugin [

     

       56
       56
       -
           ({

     

       57
       57
       -
             pluginName = "arena";

     

       58
       58
       -
             sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c=";

     

       59
       59
       -
             nativeBuildInputs = [ pkg-config ];

     

       60
       60
       -
             buildInputs = [

     

       61
       61
       -
               pango librsvg librevenge libcdr opencolorio_1 libxml2 libzip

     

       62
       62
       -
               poppler imagemagick

     

       63
       63
       -
             ];

     

       64
       64
       -
             preConfigure = ''

     

       65
       65
       -
               sed -i 's|pkg-config poppler-glib|pkg-config poppler poppler-glib|g' Makefile.master

     

       66
       66
       -
               for i in Extra Bundle; do

     

       67
       67
       -
                 cp ${lodepngcpp} $i/lodepng.cpp

     

       68
       68
       -
                 cp ${lodepngh} $i/lodepng.h

     

       69
       69
       -
               done

     

       70
       70
       -
             '';

     

       71
       71
       -
           })

     

       72
       72
       -
           ({

     

       73
       73
       -
             pluginName = "io";

     

       74
       74
       -
             sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";

     

       75
       75
       -
             nativeBuildInputs = [ pkg-config ];

     

       76
       76
       -
             buildInputs = [

     

       77
       77
       -
               libpng ffmpeg openexr opencolorio_1 openimageio_1 boost libGL

     

       78
       78
       -
               seexpr libraw openjpeg libwebp

     

       79
       79
       -
             ];

     

       80
       80
       -
           })

     

       81
       81
       -
           ({

     

       82
       82
       -
             pluginName = "misc";

     

       83
       83
       -
             sha256 = "XkdQyWI9ilF6IoP3yuHulNUZRPLX1m4lq/+RbXsrFEQ=";

     

       84
       84
       -
             buildInputs = [

     

       85
       85
       -
               libGL

     

       86
       86
       -
             ];

     

       87
       87
       -
             postPatch = ''

     

       88
       88
       -
               cp '${inpainth}' CImg/Inpaint/inpaint.h

     

       89
       89
       -
               patch -p0 -dCImg < CImg/Inpaint/inpaint.h.patch # taken from the Makefile; it gets skipped if the file already exists

     

       90
       90
       -
               cp '${CImgh}' CImg/CImg.h

     

       91
       91
       -
             '';

     

       92
       92
       -
           })

     

       93
       93
       -
         ];

     

       94
       27
        
       in

     

       95
       28
        
       stdenv.mkDerivation {

     

       96
       29
        
         inherit version;

     
···

       101
       34
        
           repo = "Natron";

     

       102
       35
        
           rev = "v${version}";

     

       103
       36
        
           fetchSubmodules = true;

     

       104
       104
       -
           sha256 = "sha256-KuXJmmIsvwl4uqmAxXqWU+273jsdWrCuUSwWn5vuu8M=";

     

       37
       37
       +
           hash = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8=";

     

       105
       38
        
         };

     

       106
       39
        
       

     

       107
       107
       -
         nativeBuildInputs = [ qmake4Hook pkg-config python2Packages.wrapPython ];

     

       40
       40
       +
         cmakeFlags = [ "-DNATRON_SYSTEM_LIBS=ON" ];

     

       41
       41
       +
       

     

       42
       42
       +
         nativeBuildInputs = [

     

       43
       43
       +
           cmake

     

       44
       44
       +
           pkg-config

     

       45
       45
       +
           wrapQtAppsHook

     

       46
       46
       +
         ];

     

       108
       47
        
       

     

       109
       48
        
         buildInputs = [

     

       110
       110
       -
           qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken

     

       49
       49
       +
           boost

     

       50
       50
       +
           expat

     

       51
       51
       +
           cairo

     

       52
       52
       +
           python3

     

       53
       53
       +
           python3.pkgs.pyside2

     

       54
       54
       +
           python3.pkgs.shiboken2

     

       55
       55
       +
           extra-cmake-modules

     

       56
       56
       +
           wayland

     

       57
       57
       +
           glog

     

       58
       58
       +
           ceres-solver

     

       59
       59
       +
           libXdmcp

     

       111
       60
        
         ];

     

       112
       61
        
       

     

       113
       113
       -
         preConfigure = ''

     

       114
       114
       -
           export MAKEFLAGS=-j$NIX_BUILD_CORES

     

       115
       115
       -
           cp ${./config.pri} config.pri

     

       116
       116
       -
           mkdir OpenColorIO-Configs

     

       117
       117
       -
           tar -xf ${OpenColorIO-Configs} --strip-components=1 -C OpenColorIO-Configs

     

       62
       62
       +
         postInstall = ''

     

       63
       63
       +
           mkdir -p $out/share

     

       64
       64
       +
           cp -r ${OpenColorIO-Configs} $out/share/OpenColorIO-Configs

     

       118
       65
        
         '';

     

       119
       66
        
       

     

       120
       67
        
         postFixup = ''

     

       121
       121
       -
           for i in ${lib.escapeShellArgs plugins}; do

     

       122
       122
       -
             ${lndir}/bin/lndir $i $out

     

       123
       123
       -
           done

     

       124
       68
        
           wrapProgram $out/bin/Natron \

     

       125
       125
       -
             --set PYTHONPATH "$PYTHONPATH"

     

       69
       69
       +
             --prefix PYTHONPATH : "${python3.pkgs.makePythonPath [ python3.pkgs.qtpy python3.pkgs.pyside2 ]}" \

     

       70
       70
       +
             --set-default OCIO "$out/share/OpenColorIO-Configs/blender/config.ocio"

     

       126
       71
        
         '';

     

       127
       72
        
       

     

       128
       73
        
         meta = with lib; {

     
···

       135
       80
        
           license = lib.licenses.gpl2;

     

       136
       81
        
           maintainers = [ maintainers.puffnfresh ];

     

       137
       82
        
           platforms = platforms.linux;

     

       138
       138
       -
           broken = true; # Last evaluated on Hydra on 2021-05-18

     

       83
       83
       +
           broken = stdenv.isLinux && stdenv.isAarch64;

     

       139
       84
        
         };

     

       140
       85
        
       }

+2 -2

pkgs/applications/window-managers/phosh/default.nix

···

       36
       36
        
       

     

       37
       37
        
       stdenv.mkDerivation rec {

     

       38
       38
        
         pname = "phosh";

     

       39
       39
       -
         version = "0.25.1";

     

       39
       39
       +
         version = "0.27.0";

     

       40
       40
        
       

     

       41
       41
        
         src = fetchFromGitLab {

     

       42
       42
        
           domain = "gitlab.gnome.org";

     
···

       45
       45
        
           repo = pname;

     

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

     

       47
       47
        
           fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects

     

       48
       48
       -
           sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8=";

     

       48
       48
       +
           sha256 = "sha256-dnSYeXn3aPwvxeIjjk+PsnOVKyuGlxXMXGWDdrRrIM0=";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/gvm-libs/default.nix

···

       23
       23
        
       

     

       24
       24
        
       stdenv.mkDerivation rec {

     

       25
       25
        
         pname = "gvm-libs";

     

       26
       26
       -
         version = "22.5.0";

     

       26
       26
       +
         version = "22.6.2";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "greenbone";

     

       30
       30
        
           repo = pname;

     

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

     

       32
       32
       -
           hash = "sha256-QHAkPZoLQG+UQ1YNdad+XYOywqLqIW1vBmcFkuf3pXU=";

     

       32
       32
       +
           hash = "sha256-b7a9LD291LT28TujOQ3DE76+wtmBYeAGrXZXTM0quWw=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [

+39 -40

pkgs/development/nim-packages/build-nim-package/default.nix

···

       1
       1
        
       { lib, stdenv, nim, nim_builder }:

     

       2
       2
       +
       pkgArgs:

     

       2
       3
        
       

     

       3
       3
       -
       { strictDeps ? true, depsBuildBuild ? [ ], nativeBuildInputs ? [ ]

     

       4
       4
       -
       , configurePhase ? null, buildPhase ? null, checkPhase ? null

     

       5
       5
       -
       , installPhase ? null, enableParallelBuilding ? true, meta ? { }, ... }@attrs:

     

       4
       4
       +
       let

     

       5
       5
       +
         baseAttrs = {

     

       6
       6
       +
           strictDeps = true;

     

       7
       7
       +
           enableParallelBuilding = true;

     

       8
       8
       +
           configurePhase = ''

     

       9
       9
       +
             runHook preConfigure

     

       10
       10
       +
             export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS

     

       11
       11
       +
             nim_builder --phase:configure

     

       12
       12
       +
             runHook postConfigure

     

       13
       13
       +
           '';

     

       14
       14
       +
           buildPhase = ''

     

       15
       15
       +
             runHook preBuild

     

       16
       16
       +
             nim_builder --phase:build

     

       17
       17
       +
             runHook postBuild

     

       18
       18
       +
           '';

     

       19
       19
       +
           checkPhase = ''

     

       20
       20
       +
             runHook preCheck

     

       21
       21
       +
             nim_builder --phase:check

     

       22
       22
       +
             runHook postCheck

     

       23
       23
       +
           '';

     

       24
       24
       +
           installPhase = ''

     

       25
       25
       +
             runHook preInstall

     

       26
       26
       +
             nim_builder --phase:install

     

       27
       27
       +
             runHook postInstall

     

       28
       28
       +
           '';

     

       29
       29
       +
           meta = { inherit (nim.meta) maintainers platforms; };

     

       30
       30
       +
         };

     

       6
       31
        
       

     

       7
       7
       -
       stdenv.mkDerivation (attrs // {

     

       8
       8
       -
         inherit strictDeps enableParallelBuilding;

     

       9
       9
       -
         depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;

     

       10
       10
       -
         nativeBuildInputs = [ nim ] ++ nativeBuildInputs;

     

       32
       32
       +
         inputsOverride =

     

       33
       33
       +
           { depsBuildBuild ? [ ], nativeBuildInputs ? [ ], meta, ... }: {

     

       34
       34
       +
             depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;

     

       35
       35
       +
             nativeBuildInputs = [ nim ] ++ nativeBuildInputs;

     

       36
       36
       +
           };

     

       11
       37
        
       

     

       12
       12
       -
         configurePhase = if (configurePhase == null) then ''

     

       13
       13
       -
           runHook preConfigure

     

       14
       14
       -
           export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS

     

       15
       15
       -
           nim_builder --phase:configure

     

       16
       16
       -
           runHook postConfigure

     

       17
       17
       -
         '' else

     

       18
       18
       -
           configurePhase;

     

       19
       19
       -
       

     

       20
       20
       -
         buildPhase = if (buildPhase == null) then ''

     

       21
       21
       -
           runHook preBuild

     

       22
       22
       -
           nim_builder --phase:build

     

       23
       23
       -
           runHook postBuild

     

       24
       24
       -
         '' else

     

       25
       25
       -
           buildPhase;

     

       38
       38
       +
         composition = finalAttrs:

     

       39
       39
       +
           let

     

       40
       40
       +
             asFunc = x: if builtins.isFunction x then x else (_: x);

     

       41
       41
       +
             prev = baseAttrs // (asFunc ((asFunc pkgArgs) finalAttrs)) baseAttrs;

     

       42
       42
       +
           in prev // inputsOverride prev;

     

       26
       43
        
       

     

       27
       27
       -
         checkPhase = if (checkPhase == null) then ''

     

       28
       28
       -
           runHook preCheck

     

       29
       29
       -
           nim_builder --phase:check

     

       30
       30
       -
           runHook postCheck

     

       31
       31
       -
         '' else

     

       32
       32
       -
           checkPhase;

     

       33
       33
       -
       

     

       34
       34
       -
         installPhase = if (installPhase == null) then ''

     

       35
       35
       -
           runHook preInstall

     

       36
       36
       -
           nim_builder --phase:install

     

       37
       37
       -
           runHook postInstall

     

       38
       38
       -
         '' else

     

       39
       39
       -
           installPhase;

     

       40
       40
       -
       

     

       41
       41
       -
         meta = meta // {

     

       42
       42
       -
           platforms = meta.platforms or nim.meta.platforms;

     

       43
       43
       -
           maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ];

     

       44
       44
       -
         };

     

       45
       45
       -
       })

     

       44
       44
       +
       in stdenv.mkDerivation composition

+3 -3

pkgs/development/nim-packages/sdl2/default.nix

···

       1
       1
        
       { lib, buildNimPackage, fetchNimble, SDL2 }:

     

       2
       2
        
       

     

       3
       3
       -
       buildNimPackage rec {

     

       3
       3
       +
       buildNimPackage (finalAttrs: {

     

       4
       4
        
         pname = "sdl2";

     

       5
       5
        
         version = "2.0.4";

     

       6
       6
        
         src = fetchNimble {

     

       7
       7
       -
           inherit pname version;

     

       7
       7
       +
           inherit (finalAttrs) pname version;

     

       8
       8
        
           hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";

     

       9
       9
        
         };

     

       10
       10
        
         propagatedBuildInputs = [ SDL2 ];

     
···

       14
       14
        
           platforms = lib.platforms.linux; # Problems with Darwin.

     

       15
       15
        
           license = [ lib.licenses.mit ];

     

       16
       16
        
         };

     

       17
       17
       -
       }

     

       17
       17
       +
       })

+50

pkgs/development/python-modules/apispec-webframeworks/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , apispec

     

       3
       3
       +
       , bottle

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , flask

     

       7
       7
       +
       , mock

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       , pythonOlder

     

       10
       10
       +
       , tornado

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "apispec-webframeworks";

     

       15
       15
       +
         version = "0.5.2";

     

       16
       16
       +
         format = "setuptools";

     

       17
       17
       +
       

     

       18
       18
       +
         disabled = pythonOlder "3.7";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "marshmallow-code";

     

       22
       22
       +
           repo = "apispec-webframeworks";

     

       23
       23
       +
           rev = version;

     

       24
       24
       +
           hash = "sha256-ByNmmBLO99njw9JrT+cCW/K4NJBH92smAiIgg47Cvkk=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           apispec

     

       29
       29
       +
         ] ++ apispec.optional-dependencies.yaml;

     

       30
       30
       +
       

     

       31
       31
       +
         nativeCheckInputs = [

     

       32
       32
       +
           bottle

     

       33
       33
       +
           flask

     

       34
       34
       +
           mock

     

       35
       35
       +
           pytestCheckHook

     

       36
       36
       +
           tornado

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         pythonImportsCheck = [

     

       40
       40
       +
           "apispec_webframeworks"

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         meta = with lib; {

     

       44
       44
       +
           description = "Web framework plugins for apispec";

     

       45
       45
       +
           homepage = "https://github.com/marshmallow-code/apispec-webframeworks";

     

       46
       46
       +
           changelog = "https://github.com/marshmallow-code/apispec-webframeworks/blob/${version}/CHANGELOG.rst";

     

       47
       47
       +
           license = licenses.mit;

     

       48
       48
       +
           maintainers = with maintainers; [ fab ];

     

       49
       49
       +
         };

     

       50
       50
       +
       }

+13 -5

pkgs/development/python-modules/coinmetrics-api-client/default.nix

···

       5
       5
        
       , orjson

     

       6
       6
        
       , pandas

     

       7
       7
        
       , poetry-core

     

       8
       8
       +
       , pytest-mock

     

       8
       9
        
       , pytestCheckHook

     

       9
       9
       -
       , pytest-mock

     

       10
       10
       +
       , python-dateutil

     

       10
       11
        
       , pythonOlder

     

       11
       11
       -
       , python-dateutil

     

       12
       12
       +
       , pythonRelaxDepsHook

     

       12
       13
        
       , requests

     

       13
       14
        
       , typer

     

       14
       15
        
       , websocket-client

     
···

       16
       17
        
       

     

       17
       18
        
       buildPythonPackage rec {

     

       18
       19
        
         pname = "coinmetrics-api-client";

     

       19
       19
       -
         version = "2023.5.26.17";

     

       20
       20
       +
         version = "2023.6.8.20";

     

       20
       21
        
         format = "pyproject";

     

       21
       22
        
       

     

       22
       23
        
         disabled = pythonOlder "3.9";

     
···

       26
       27
        
         src = fetchPypi {

     

       27
       28
        
           inherit version;

     

       28
       29
        
           pname = "coinmetrics_api_client";

     

       29
       29
       -
           hash = "sha256-GCHXraeH6WWTlCnw9B1Xwtb6jwcxcvW1siy2T/8x14Q=";

     

       30
       30
       +
           hash = "sha256-Koll0pod0vSW/F3veGTn8JYOMQI61REUW6Eh+TDJKNI=";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       33
       33
       +
         pythonRelaxDeps = [

     

       34
       34
       +
           "typer"

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       32
       37
        
         nativeBuildInputs = [

     

       33
       38
        
           poetry-core

     

       39
       39
       +
           pythonRelaxDepsHook

     

       34
       40
        
         ];

     

       35
       41
        
       

     

       36
       42
        
         propagatedBuildInputs = [

     
···

       52
       58
        
       

     

       53
       59
        
         passthru = {

     

       54
       60
        
           optional-dependencies = {

     

       55
       55
       -
             pandas = [ pandas ];

     

       61
       61
       +
             pandas = [

     

       62
       62
       +
               pandas

     

       63
       63
       +
             ];

     

       56
       64
        
           };

     

       57
       65
        
           updateScript = nix-update-script { };

     

       58
       66
        
         };

+2 -2

pkgs/development/python-modules/dvc-data/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "dvc-data";

     

       18
       18
       -
         version = "0.55.0";

     

       18
       18
       +
         version = "1.7.0";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.8";

     
···

       24
       24
        
           owner = "iterative";

     

       25
       25
        
           repo = pname;

     

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

     

       27
       27
       -
           hash = "sha256-eE1cVzhwyClVYmaotw37sG46g5W1ToUE/f3pZ2CCcE0=";

     

       27
       27
       +
           hash = "sha256-vZPhlCY7KWM521C/uFx8nddpLD/72tX0g1JRb2KeIfA=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+2 -2

pkgs/development/python-modules/elkm1-lib/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "elkm1-lib";

     

       15
       15
       -
         version = "2.2.4";

     

       15
       15
       +
         version = "2.2.5";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.9";

     
···

       21
       21
        
           owner = "gwww";

     

       22
       22
        
           repo = "elkm1";

     

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

     

       24
       24
       -
           hash = "sha256-qqkKsVSspVBVxX96vlM8+6SqfdIBTcVyODJzQ4Ga+6g=";

     

       24
       24
       +
           hash = "sha256-8Mzxaww6a+vi3i8H4W9jRgY+5mpTGaJbNBXPDPn8sl4=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "fakeredis";

     

       19
       19
       -
         version = "2.12.1";

     

       19
       19
       +
         version = "2.14.1";

     

       20
       20
        
         format = "pyproject";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     
···

       25
       25
        
           owner = "dsoftwareinc";

     

       26
       26
        
           repo = "fakeredis-py";

     

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

     

       28
       28
       -
           hash = "sha256-WF3dITWCrTQDORfaGWPpJBQFkPrUN6faHohjvBuOW7I=";

     

       28
       28
       +
           hash = "sha256-kLCCCUbre/Bi0DFv/+PVHvw1NXn2HhQx5kYtEaOqP58=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+64

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , anyascii

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , flaky

     

       6
       6
       +
       , mock

     

       7
       7
       +
       , paste

     

       8
       8
       +
       , pillow

     

       9
       9
       +
       , pymongo

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       , pythonOlder

     

       12
       12
       +
       , requests

     

       13
       13
       +
       , sqlalchemy

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "filedepot";

     

       18
       18
       +
         version = "0.9.0";

     

       19
       19
       +
         format = "setuptools";

     

       20
       20
       +
       

     

       21
       21
       +
         disabled = pythonOlder "3.7";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "amol-";

     

       25
       25
       +
           repo = "depot";

     

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

     

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

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         propagatedBuildInputs = [

     

       31
       31
       +
           anyascii

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         nativeCheckInputs = [

     

       35
       35
       +
           flaky

     

       36
       36
       +
           mock

     

       37
       37
       +
           paste

     

       38
       38
       +
           pillow

     

       39
       39
       +
           pymongo

     

       40
       40
       +
           pytestCheckHook

     

       41
       41
       +
           requests

     

       42
       42
       +
           sqlalchemy

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         disabledTestPaths = [

     

       46
       46
       +
           # The examples have tests

     

       47
       47
       +
           "examples"

     

       48
       48
       +
           # Missing dependencies (TurboGears2 and ming)

     

       49
       49
       +
           "tests/test_fields_ming.py"

     

       50
       50
       +
           "tests/test_wsgi_middleware.py"

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       53
       53
       +
         pythonImportsCheck = [

     

       54
       54
       +
           "depot"

     

       55
       55
       +
         ];

     

       56
       56
       +
       

     

       57
       57
       +
         meta = with lib; {

     

       58
       58
       +
           description = "Toolkit for storing files and attachments in web applications";

     

       59
       59
       +
           homepage = "https://github.com/amol-/depot";

     

       60
       60
       +
           changelog = "https://github.com/amol-/depot/releases/tag/${version}";

     

       61
       61
       +
           license = licenses.mit;

     

       62
       62
       +
           maintainers = with maintainers; [ fab ];

     

       63
       63
       +
         };

     

       64
       64
       +
       }

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "openaiauth";

     

       9
       9
       -
         version = "0.3.6";

     

       9
       9
       +
         version = "1.0.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit version;

     

       13
       13
        
           pname = "OpenAIAuth";

     

       14
       14
       -
           hash = "sha256-SaiTqs2HVv5ajUkrLJv24ed1+iJg5HqsCNe0IETkA00=";

     

       14
       14
       +
           hash = "sha256-0Vd8gvE2guHNlrPBahu23NpUFrJHvm6Q6NSNawX9gbY=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = [ requests ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "publicsuffixlist";

     

       12
       12
       -
         version = "0.10.0.20230611";

     

       12
       12
       +
         version = "0.10.0.20230614";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-z5mh/8sFulky9LX0LPwBuYWebjsqWc0EsPjDZMuTCX8=";

     

       19
       19
       +
           hash = "sha256-8tB95lcW4IQBeU5cY0YFfLKW3a0g1SQH9sJbn0cduho=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         passthru.optional-dependencies = {

+46

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cryptography

     

       5
       5
       +
       , dictdiffer

     

       6
       6
       +
       , grpcio

     

       7
       7
       +
       , protobuf

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "pygnmi";

     

       13
       13
       +
         version = "0.8.12";

     

       14
       14
       +
         format = "setuptools";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "akarneliuk";

     

       18
       18
       +
           repo = "pygnmi";

     

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

     

       20
       20
       +
           sha256 = "sha256-5dAjN/HDFKQmJIjhergBjSmHQKhBxqy/Jneh1pLCHrw=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [

     

       24
       24
       +
           cryptography

     

       25
       25
       +
           dictdiffer

     

       26
       26
       +
           grpcio

     

       27
       27
       +
           protobuf

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         # almost all tests fail with:

     

       31
       31
       +
         # TypeError: expected string or bytes-like object

     

       32
       32
       +
         doCheck = false;

     

       33
       33
       +
       

     

       34
       34
       +
         nativeCheckInputs = [

     

       35
       35
       +
           pytestCheckHook

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         pythonImportsCheck = [ "pygnmi" ];

     

       39
       39
       +
       

     

       40
       40
       +
         meta = with lib; {

     

       41
       41
       +
           description = "Pure Python gNMI client to manage network functions and collect telemetry";

     

       42
       42
       +
           homepage = "https://github.com/akarneliuk/pygnmi";

     

       43
       43
       +
           license = licenses.bsd3;

     

       44
       44
       +
           maintainers = with maintainers; [ SuperSandro2000 ];

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+55

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromBitbucket

     

       4
       4
       +
       , h5py

     

       5
       5
       +
       , termcolor

     

       6
       6
       +
       , pexpect

     

       7
       7
       +
       , jinja2

     

       8
       8
       +
       , sphinxHook

     

       9
       9
       +
       , sphinx-rtd-theme

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage {

     

       13
       13
       +
         pname = "pylion";

     

       14
       14
       +
         version = "0.5.2";

     

       15
       15
       +
         format = "setuptools";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchFromBitbucket {

     

       18
       18
       +
           owner = "dtrypogeorgos";

     

       19
       19
       +
           repo = "pylion";

     

       20
       20
       +
           # Version is set in setup.cfg, but not in a git tag / bitbucket release

     

       21
       21
       +
           rev = "8945a7b6f1912ae6b9c705f8a2bd521101f5ba59";

     

       22
       22
       +
           hash = "sha256-4AdJkoQ1hAssDUpgmARGmN+ihQqRPPOncWJ5ErQyWII=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         # Docs are not available online, besides the article:

     

       26
       26
       +
         # http://dx.doi.org/10.1016/j.cpc.2020.107187

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           sphinxHook

     

       29
       29
       +
           sphinx-rtd-theme

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         propagatedBuildInputs = [

     

       33
       33
       +
           h5py

     

       34
       34
       +
           termcolor

     

       35
       35
       +
           pexpect

     

       36
       36
       +
           jinja2

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         pythonImportsCheck = [ "pylion" ];

     

       40
       40
       +
       

     

       41
       41
       +
         # Tests fail from some reason - some files seem to be missing from the repo.

     

       42
       42
       +
         doCheck = false;

     

       43
       43
       +
       

     

       44
       44
       +
         postInstall = ''

     

       45
       45
       +
           mkdir -p $out/share/doc/$name

     

       46
       46
       +
           cp -r examples $out/share/doc/$name/examples

     

       47
       47
       +
         '';

     

       48
       48
       +
       

     

       49
       49
       +
         meta = with lib; {

     

       50
       50
       +
           description = "A LAMMPS wrapper for molecular dynamics simulations of trapped ions";

     

       51
       51
       +
           homepage = "https://bitbucket.org/dtrypogeorgos/pylion";

     

       52
       52
       +
           license = licenses.mit;

     

       53
       53
       +
           maintainers = with maintainers; [ doronbehar ];

     

       54
       54
       +
         };

     

       55
       55
       +
       }

+6

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

···

       7
       7
        
       , pydantic

     

       8
       8
        
       , pytestCheckHook

     

       9
       9
        
       , pythonOlder

     

       10
       10
       +
       , pythonRelaxDepsHook

     

       10
       11
        
       , rstcheck-core

     

       11
       12
        
       , typer

     

       12
       13
        
       , types-docutils

     
···

       27
       28
        
           hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU=";

     

       28
       29
        
         };

     

       29
       30
        
       

     

       31
       31
       +
         pythonRelaxDeps = [

     

       32
       32
       +
           "typer"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       30
       35
        
         nativeBuildInputs = [

     

       31
       36
        
           poetry-core

     

       37
       37
       +
           pythonRelaxDepsHook

     

       32
       38
        
         ];

     

       33
       39
        
       

     

       34
       40
        
         propagatedBuildInputs = [

+48

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , dulwich

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , mock

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       , pythonOlder

     

       8
       8
       +
       , six

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "simplekv";

     

       13
       13
       +
         version = "0.14.1";

     

       14
       14
       +
         format = "setuptools";

     

       15
       15
       +
       

     

       16
       16
       +
         disabled = pythonOlder "3.7";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "mbr";

     

       20
       20
       +
           repo = "simplekv";

     

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

     

       22
       22
       +
           hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         nativeCheckInputs = [

     

       26
       26
       +
           dulwich

     

       27
       27
       +
           mock

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
           six

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         pythonImportsCheck = [

     

       33
       33
       +
           "simplekv"

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         disabledTests = [

     

       37
       37
       +
           # Issue with fixture

     

       38
       38
       +
           "test_concurrent_mkdir"

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "A simple key-value store for binary data";

     

       43
       43
       +
           homepage = "https://github.com/mbr/simplekv";

     

       44
       44
       +
           changelog = "https://github.com/mbr/simplekv/releases/tag/${version}";

     

       45
       45
       +
           license = licenses.mit;

     

       46
       46
       +
           maintainers = with maintainers; [ fab ];

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+14 -6

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

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , blis

     

       3
       4
        
       , buildPythonPackage

     

       4
       5
        
       , callPackage

     
···

       17
       18
        
       , pytest

     

       18
       19
        
       , python

     

       19
       20
        
       , pythonOlder

     

       21
       21
       +
       , pythonRelaxDepsHook

     

       20
       22
        
       , requests

     

       21
       23
        
       , setuptools

     

       22
       24
        
       , spacy-legacy

     
···

       28
       30
        
       , typing-extensions

     

       29
       31
        
       , wasabi

     

       30
       32
        
       , writeScript

     

       31
       31
       -
       , stdenv

     

       32
       33
        
       , nix

     

       33
       34
        
       , git

     

       34
       35
        
       , nix-update

     
···

       36
       37
        
       

     

       37
       38
        
       buildPythonPackage rec {

     

       38
       39
        
         pname = "spacy";

     

       39
       39
       -
         version = "3.5.2";

     

       40
       40
       +
         version = "3.5.3";

     

       40
       41
        
         format = "setuptools";

     

       41
       42
        
       

     

       42
       43
        
         disabled = pythonOlder "3.6";

     

       43
       44
        
       

     

       44
       45
        
         src = fetchPypi {

     

       45
       46
        
           inherit pname version;

     

       46
       46
       -
           hash = "sha256-IsH/qrKFt0dwA9S1sDhBTMMkaKaQ1HkBW5ppjFMcgTs=";

     

       47
       47
       +
           hash = "sha256-NZcdZyFXZTjWxCPGagnOAL9m4Q5AcmpXt6gZkxgMJIw=";

     

       47
       48
        
         };

     

       48
       49
        
       

     

       50
       50
       +
         pythonRelaxDeps = [

     

       51
       51
       +
           "typer"

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         nativeBuildInputs = [

     

       55
       55
       +
           pythonRelaxDepsHook

     

       56
       56
       +
         ];

     

       57
       57
       +
       

     

       49
       58
        
         propagatedBuildInputs = [

     

       50
       59
        
           blis

     

       51
       60
        
           catalogue

     
···

       70
       79
        
           wasabi

     

       71
       80
        
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       72
       81
        
           typing-extensions

     

       73
       73
       -
         ];

     

       74
       74
       -
       

     

       75
       75
       -
         postPatch = ''

     

       82
       82
       +
         ];  postPatch = ''

     

       76
       83
        
           substituteInPlace setup.cfg \

     

       77
       84
        
             --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0"

     

       78
       85
        
         '';

     
···

       82
       89
        
         ];

     

       83
       90
        
       

     

       84
       91
        
         doCheck = false;

     

       92
       92
       +
       

     

       85
       93
        
         checkPhase = ''

     

       86
       94
        
           ${python.interpreter} -m pytest spacy/tests --vectors --models --slow

     

       87
       95
        
         '';

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "sqltrie";

     

       14
       14
       -
         version = "0.5.0";

     

       14
       14
       +
         version = "0.6.0";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.8";

     
···

       20
       20
        
           owner = "iterative";

     

       21
       21
        
           repo = pname;

     

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

     

       23
       23
       -
           hash = "sha256-caCzFHQG0fnSmIdesk4k1W/VheY1DWxZb2W8/Xen/ZU=";

     

       23
       23
       +
           hash = "sha256-f3nQMkDI4n/hORW038KL+LQcyc6Hzx1MDrcChk7W8t4=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "teslajsonpy";

     

       20
       20
       -
         version = "3.8.1";

     

       20
       20
       +
         version = "3.9.0";

     

       21
       21
        
         format = "pyproject";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.7";

     
···

       26
       26
        
           owner = "zabuldon";

     

       27
       27
        
           repo = pname;

     

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

     

       29
       29
       -
           hash = "sha256-RPR1ek1gpbermSRaGqT2v31UVB6044E2ZxIqv1yr2bs=";

     

       29
       29
       +
           hash = "sha256-6H8miS0tKB99ZkiBvqJ77NIsswJ+ivYt1VZOLwTQr24=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

+14 -13

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       +
       , click

     

       4
       5
        
       , colorama

     

       6
       6
       +
       , coverage

     

       5
       7
        
       , fetchpatch

     

       6
       8
        
       , fetchPypi

     

       7
       9
        
       , flit-core

     

       8
       8
       -
       , click

     

       10
       10
       +
       , pytest-sugar

     

       11
       11
       +
       , pytest-xdist

     

       9
       12
        
       , pytestCheckHook

     

       13
       13
       +
       , pythonOlder

     

       10
       14
        
       , rich

     

       11
       15
        
       , shellingham

     

       12
       12
       -
       , pytest-xdist

     

       13
       13
       -
       , pytest-sugar

     

       14
       14
       -
       , coverage

     

       15
       15
       -
       , pythonOlder

     

       16
       16
       +
       , typing-extensions

     

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       19
        
       buildPythonPackage rec {

     

       19
       20
        
         pname = "typer";

     

       20
       20
       -
         version = "0.7.0";

     

       21
       21
       +
         version = "0.9.0";

     

       21
       22
        
         format = "pyproject";

     

       22
       23
        
       

     

       23
       24
        
         disabled = pythonOlder "3.6";

     

       24
       25
        
       

     

       25
       26
        
         src = fetchPypi {

     

       26
       27
        
           inherit pname version;

     

       27
       27
       -
           hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU=";

     

       28
       28
       +
           hash = "sha256-UJIv15rqL0dRqOBAj/ENJmK9DIu/qEdVppnzutopeLI=";

     

       28
       29
        
         };

     

       29
       29
       -
       

     

       30
       30
       -
         postPatch = ''

     

       31
       31
       -
           substituteInPlace pyproject.toml \

     

       32
       32
       -
             --replace "rich >=10.11.0,<13.0.0" "rich"

     

       33
       33
       -
         '';

     

       34
       30
        
       

     

       35
       31
        
         nativeBuildInputs = [

     

       36
       32
        
           flit-core

     
···

       38
       34
        
       

     

       39
       35
        
         propagatedBuildInputs = [

     

       40
       36
        
           click

     

       37
       37
       +
           typing-extensions

     

       41
       38
        
         ];

     

       42
       39
        
       

     

       43
       40
        
         passthru.optional-dependencies = {

     
···

       58
       55
        
         preCheck = ''

     

       59
       56
        
           export HOME=$(mktemp -d);

     

       60
       57
        
         '';

     

       61
       61
       -
         disabledTests = lib.optionals stdenv.isDarwin [

     

       58
       58
       +
       

     

       59
       59
       +
         disabledTests = [

     

       60
       60
       +
           "test_scripts"

     

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

     

       62
       62
        
           # likely related to https://github.com/sarugaku/shellingham/issues/35

     

       63
       63
        
           "test_show_completion"

     

       64
       64
        
           "test_install_completion"

     
···

       73
       73
        
         meta = with lib; {

     

       74
       74
        
           description = "Library for building CLI applications";

     

       75
       75
        
           homepage = "https://typer.tiangolo.com/";

     

       76
       76
       +
           changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";

     

       76
       77
        
           license = licenses.mit;

     

       77
       78
        
           maintainers = with maintainers; [ winpat ];

     

       78
       79
        
         };

+22

pkgs/development/tools/gendef/default.nix

···

       1
       1
       +
       { fetchgit, lib, stdenv }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       4
       +
         pname = "gendef";

     

       5
       5
       +
         version = "11.0.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchgit {

     

       8
       8
       +
           url = "https://git.code.sf.net/p/mingw-w64/mingw-w64.git";

     

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

     

       10
       10
       +
           hash = "sha256-0vbAHSN+uwxoXXZtbuycP67PxjcB8Ftxd/Oij1gqE3Y=";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         sourceRoot = "mingw-w64/mingw-w64-tools/gendef";

     

       14
       14
       +
       

     

       15
       15
       +
         meta = {

     

       16
       16
       +
           description = "A tool which generate def files from DLLs";

     

       17
       17
       +
           homepage = "https://sourceforge.net/p/mingw-w64/wiki2/gendef/";

     

       18
       18
       +
           license = lib.licenses.gpl3Plus;

     

       19
       19
       +
           maintainers = with lib.maintainers; [ hughobrien ];

     

       20
       20
       +
           platforms = lib.platforms.linux;

     

       21
       21
       +
         };

     

       22
       22
       +
       })

+4 -2

pkgs/games/mudlet/default.nix

···

       54
       54
        
       in

     

       55
       55
        
       stdenv.mkDerivation rec {

     

       56
       56
        
         pname = "mudlet";

     

       57
       57
       -
         version = "4.17.0";

     

       57
       57
       +
         version = "4.17.2";

     

       58
       58
        
       

     

       59
       59
        
         src = fetchFromGitHub {

     

       60
       60
        
           owner = "Mudlet";

     

       61
       61
        
           repo = "Mudlet";

     

       62
       62
        
           rev = "Mudlet-${version}";

     

       63
       63
        
           fetchSubmodules = true;

     

       64
       64
       -
           hash = "sha256-j0d37C1TTb6ggXk1wTaqEcBKwsxE/B7Io90gTkc2q0M=";

     

       64
       64
       +
           hash = "sha256-K75frptePKfHeGQNXaX4lKsLwO6Rs6AAka6hvP8MA+k=";

     

       65
       65
        
         };

     

       66
       66
        
       

     

       67
       67
        
         nativeBuildInputs = [

     
···

       112
       112
        
       

     

       113
       113
        
           mkdir -pv $out/share/pixmaps

     

       114
       114
        
           cp -r ../mudlet.png $out/share/pixmaps/

     

       115
       115
       +
       

     

       116
       116
       +
           cp -r ../translations $out/share/

     

       115
       117
        
       

     

       116
       118
        
           makeQtWrapper $out/mudlet $out/bin/mudlet \

     

       117
       119
        
             --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \

+2 -2

pkgs/games/unciv/default.nix

···

       25
       25
        
       in

     

       26
       26
        
       stdenv.mkDerivation rec {

     

       27
       27
        
         pname = "unciv";

     

       28
       28
       -
         version = "4.6.15";

     

       28
       28
       +
         version = "4.6.19";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";

     

       32
       32
       -
           hash = "sha256-69JEf5dG3Nf4CLT8eKfeo/8givyyxb9QpQSAZ2dG7TI=";

     

       32
       32
       +
           hash = "sha256-21Pge/b6pZ4csGVr2J0V6rwZGKBEEqEkuef+7imGtl4=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         dontUnpack = true;

-1

pkgs/os-specific/linux/apfs/default.nix

···

       44
       44
        
           homepage = "https://github.com/linux-apfs/linux-apfs-rw";

     

       45
       45
        
           license = licenses.gpl2Only;

     

       46
       46
        
           platforms = platforms.linux;

     

       47
       47
       -
           broken = kernel.kernelOlder "4.9";

     

       48
       47
        
           maintainers = with maintainers; [ Luflosi ];

     

       49
       48
        
         };

     

       50
       49
        
       }

+3 -3

pkgs/servers/minio/default.nix

···

       15
       15
        
       in

     

       16
       16
        
       buildGoModule rec {

     

       17
       17
        
         pname = "minio";

     

       18
       18
       -
         version = "2023-05-27T05-56-19Z";

     

       18
       18
       +
         version = "2023-06-09T07-32-12Z";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "minio";

     

       22
       22
        
           repo = "minio";

     

       23
       23
        
           rev = "RELEASE.${version}";

     

       24
       24
       -
           sha256 = "sha256-HwyPrXywhJ0D/eelcPOE8CPrEeJkaLr7wMdW5O+8cZA=";

     

       24
       24
       +
           sha256 = "sha256-YhABdJ+4KU/UGRukCR4iQ4ClHUz/icbIO/yd8rGIs48=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         vendorHash = "sha256-jvJM4I5ruDYwJsB258aZ3UP9FjtzYc0XSYpXdjqafMI=";

     

       27
       27
       +
         vendorHash = "sha256-c2rB8Or4tt84caEmfbwcHCow3/fllk0mNW0R/MwB5Vg=";

     

       28
       28
        
       

     

       29
       29
        
         doCheck = false;

     

       30
       30

+2 -2

pkgs/servers/web-apps/jitsi-meet/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "jitsi-meet";

     

       5
       5
       -
         version = "1.0.7235";

     

       5
       5
       +
         version = "1.0.7322";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "OlAInpGl6I5rKgIsO3nXUQfksU326lsSDdiZdCYM3NU=";

     

       9
       9
       +
           sha256 = "BjoNu1cQOw9JjX6i2R/K8Txx6m6ndVRnWPjze9y14pQ=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontBuild = true;

+39 -5

pkgs/tools/archivers/arc_unpacker/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libiconv

     

       2
       2
       -
       , libjpeg, zlib, openssl, libwebp, catch2 }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , makeWrapper

     

       7
       7
       +
       , boost

     

       8
       8
       +
       , libpng

     

       9
       9
       +
       , libiconv

     

       10
       10
       +
       , libjpeg

     

       11
       11
       +
       , zlib

     

       12
       12
       +
       , openssl

     

       13
       13
       +
       , libwebp

     

       14
       14
       +
       , catch2

     

       15
       15
       +
       }:

     

       3
       16
        
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       17
       17
       +
       stdenv.mkDerivation {

     

       5
       18
        
         pname = "arc_unpacker";

     

       6
       19
        
         version = "unstable-2021-08-06";

     

       7
       20
        
       

     
···

       12
       25
        
           hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8=";

     

       13
       26
        
         };

     

       14
       27
        
       

     

       15
       15
       -
         nativeBuildInputs = [ cmake makeWrapper catch2 ];

     

       16
       16
       -
         buildInputs = [ boost libiconv libjpeg libpng libwebp openssl zlib ];

     

       28
       28
       +
         patches = [

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
             name = "failing_tests.patch";

     

       31
       31
       +
             url = "https://aur.archlinux.org/cgit/aur.git/plain/failing_tests.patch?h=arc_unpacker-git&id=bda1ad9f69e6802e703b2e6913d71a36d76cfef9";

     

       32
       32
       +
             hash = "sha256-bClACsf/+SktyLAPtt7EcSqprkw8JVIi1ZLpcJcv9IE=";

     

       33
       33
       +
           })

     

       34
       34
       +
         ];

     

       17
       35
        
       

     

       18
       36
        
         postPatch = ''

     

       19
       37
        
           cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h

     

       20
       38
        
           sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12

     

       21
       39
        
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         nativeBuildInputs = [

     

       42
       42
       +
           cmake

     

       43
       43
       +
           makeWrapper

     

       44
       44
       +
           catch2

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         buildInputs = [

     

       48
       48
       +
           boost

     

       49
       49
       +
           libiconv

     

       50
       50
       +
           libjpeg

     

       51
       51
       +
           libpng

     

       52
       52
       +
           libwebp

     

       53
       53
       +
           openssl

     

       54
       54
       +
           zlib

     

       55
       55
       +
         ];

     

       22
       56
        
       

     

       23
       57
        
         checkPhase = ''

     

       24
       58
        
           runHook preCheck

+2 -2

pkgs/tools/backup/borgmatic/default.nix

···

       13
       13
        
       

     

       14
       14
        
       python3Packages.buildPythonApplication rec {

     

       15
       15
        
         pname = "borgmatic";

     

       16
       16
       -
         version = "1.7.9";

     

       16
       16
       +
         version = "1.7.14";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "sha256-v3Qxwy7V6rqX90G4/Xp6mVTUkrqDXmudgh3th0GCjuk=";

     

       20
       20
       +
           sha256 = "sha256-rABJfdrV+D2v6yHpAbzj/0MSGc9bo49pwXEC45Mmmlk=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];

+33 -2

pkgs/tools/misc/ffsend/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, openssl

     

       1
       1
       +
       { lib, stdenv, fetchFromGitLab, fetchpatch, rustPlatform, pkg-config, openssl

     

       2
       2
        
       , installShellFiles

     

       3
       3
        
       , Security, AppKit

     

       4
       4
        
       

     
···

       24
       24
        
           sha256 = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         cargoSha256 = "sha256-zNLU9QnBGna5qb+iu2imOUvCIw3ZWRFsQlpFo5ECtKo=";

     

       27
       27
       +
         cargoHash = "sha256-r1yIPV2sW/EpHJpdaJyi6pzE+rtNkBIxSUJF+XA8kbA=";

     

       28
       28
       +
       

     

       29
       29
       +
         cargoPatches = [

     

       30
       30
       +
       

     

       31
       31
       +
           # Update dependencies (needed for the below patch to merge cleanly)

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             name = "Update-dependencies-1";

     

       34
       34
       +
             url = "https://github.com/timvisee/ffsend/commit/afb004680b9ed672c7e87ff23f16bb2c51fea06e.patch";

     

       35
       35
       +
             hash = "sha256-eDcbyi05aOq+muVWdLmlLzLXUKcrv/9Y0R+0aHgL4+s=";

     

       36
       36
       +
           })

     

       37
       37
       +
       

     

       38
       38
       +
           # Disable unused features in prettytable-rs crate (needed for the below patch to merge cleanly)

     

       39
       39
       +
           (fetchpatch {

     

       40
       40
       +
             name = "Disable-unused-features";

     

       41
       41
       +
             url = "https://github.com/timvisee/ffsend/commit/9b8dee12ea839f911ed207ff9602d929cab5d34b.patch";

     

       42
       42
       +
             hash = "sha256-6LK1Fqov+zEbPZ4+B6JCLXtXmgSad9vr9YO2oYodBSM=";

     

       43
       43
       +
           })

     

       44
       44
       +
       

     

       45
       45
       +
           # Update dependencies (needed for the below patch to merge cleanly)

     

       46
       46
       +
           (fetchpatch {

     

       47
       47
       +
             name = "Update-dependencies-2";

     

       48
       48
       +
             url = "https://github.com/timvisee/ffsend/commit/fd5b38f9ab9cbc5f962d1024f4809eb36ba8986c.patch";

     

       49
       49
       +
             hash = "sha256-BDZKrVtQHpOewmB2Lb6kUfy02swcNK+CYZ3lj3kwFV4=";

     

       50
       50
       +
           })

     

       51
       51
       +
       

     

       52
       52
       +
           # Fix seg fault

     

       53
       53
       +
           (fetchpatch {

     

       54
       54
       +
             name = "Fix-segfault";

     

       55
       55
       +
             url = "https://github.com/timvisee/ffsend/commit/3c1c2dc28ca1d88c45f87496a7a96052f5c37858.patch";

     

       56
       56
       +
             hash = "sha256-2hWlFXDopNy26Df74nJoB1J8qzPEOpf61wEOEtxOVx8=";

     

       57
       57
       +
           })

     

       58
       58
       +
         ];

     

       28
       59
        
       

     

       29
       60
        
         nativeBuildInputs = [ installShellFiles ]

     

       30
       61
        
           ++ lib.optionals stdenv.isLinux [ pkg-config ];

+53

pkgs/tools/misc/ugs/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , copyDesktopItems

     

       4
       4
       +
       , makeDesktopItem

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , jre

     

       7
       7
       +
       , fetchzip

     

       8
       8
       +
       , bash

     

       9
       9
       +
       }:

     

       10
       10
       +
       let

     

       11
       11
       +
         desktopItem = makeDesktopItem {

     

       12
       12
       +
           name = "ugs";

     

       13
       13
       +
           exec = "ugs";

     

       14
       14
       +
           comment = "A cross-platform G-Code sender for GRBL, Smoothieware, TinyG and G2core.";

     

       15
       15
       +
           desktopName = "Universal-G-Code-Sender";

     

       16
       16
       +
           categories = [ "Game" ];

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
       in

     

       20
       20
       +
       stdenv.mkDerivation rec {

     

       21
       21
       +
         pname = "ugs";

     

       22
       22
       +
         version = "2.0.17";

     

       23
       23
       +
       

     

       24
       24
       +
         src = fetchzip {

     

       25
       25
       +
           url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";

     

       26
       26
       +
           hash = "sha256-m4oD0ibrlVwP8ZS1pjnu/QaWmQMQlAWtZV2MGhB9X1A=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         dontUnpack = true;

     

       30
       30
       +
       

     

       31
       31
       +
         nativeBuildInputs = [ copyDesktopItems makeWrapper ];

     

       32
       32
       +
       

     

       33
       33
       +
         installPhase = ''

     

       34
       34
       +
           runHook preInstall

     

       35
       35
       +
       

     

       36
       36
       +
           makeWrapper ${jre}/bin/java $out/bin/ugs \

     

       37
       37
       +
             --prefix PATH : ${lib.makeBinPath [ jre ]} \

     

       38
       38
       +
             --add-flags "-jar ${src}/UniversalGcodeSender.jar"

     

       39
       39
       +
       

     

       40
       40
       +
           runHook postInstall

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         desktopItems = [ desktopItem ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       46
       46
       +
           description = "A cross-platform G-Code sender for GRBL, Smoothieware, TinyG and G2core.";

     

       47
       47
       +
           homepage = "https://github.com/winder/Universal-G-Code-Sender";

     

       48
       48
       +
           maintainers = with maintainers; [ matthewcroughan ];

     

       49
       49
       +
           sourceProvenance = with sourceTypes; [ binaryBytecode ];

     

       50
       50
       +
           license = licenses.gpl3;

     

       51
       51
       +
           platforms = platforms.all;

     

       52
       52
       +
         };

     

       53
       53
       +
       }

+3 -3

pkgs/tools/security/cloudfox/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "cloudfox";

     

       8
       8
       -
         version = "1.10.3";

     

       8
       8
       +
         version = "1.11.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "BishopFox";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           hash = "sha256-XLn2GwoVNPoGTgXZx/q9dEmWigKB1BNylzxO9dBT3Zg=";

     

       14
       14
       +
           hash = "sha256-46w0/Da5sJkw2jLEGiFICEaX9bvCs0sbad1RyDCxINw=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorHash = "sha256-v8rEsp2mDgfjCO2VvWNIxex8F350MDnZ40bR4szv+3o=";

     

       17
       17
       +
         vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ=";

     

       18
       18
        
       

     

       19
       19
        
         # Some tests are failing because of wrong filename/path

     

       20
       20
        
         doCheck = false;

+4 -4

pkgs/tools/system/ttop/default.nix

···

       1
       1
        
       { lib, nimPackages, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       nimPackages.buildNimPackage rec {

     

       3
       3
       +
       nimPackages.buildNimPackage (finalAttrs: {

     

       4
       4
        
         pname = "ttop";

     

       5
       5
        
         version = "1.0.1";

     

       6
       6
        
         nimBinOnly = true;

     
···

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "inv2004";

     

       10
       10
        
           repo = "ttop";

     

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

     

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

     

       12
       12
        
           hash = "sha256-x4Uczksh6p3XX/IMrOFtBxIleVHdAPX9e8n32VAUTC4=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = with nimPackages; [ asciigraph illwill parsetoml zippy ];

     

       16
       16
        
       

     

       17
       17
        
         meta = with lib;

     

       18
       18
       -
           src.meta // {

     

       18
       18
       +
           finalAttrs.src.meta // {

     

       19
       19
        
             description = "Top-like system monitoring tool";

     

       20
       20
        
             license = licenses.mit;

     

       21
       21
        
             platforms = platforms.linux;

     

       22
       22
        
             maintainers = with maintainers; [ sikmir ];

     

       23
       23
        
           };

     

       24
       24
       -
       }

     

       24
       24
       +
       })

+6 -4

pkgs/top-level/all-packages.nix

···

       589
       589
        
       

     

       590
       590
        
         functiontrace-server = callPackage ../development/tools/functiontrace-server { };

     

       591
       591
        
       

     

       592
       592
       +
         gendef = callPackage ../development/tools/gendef { };

     

       593
       593
       +
       

     

       592
       594
        
         glade = callPackage ../development/tools/glade { };

     

       593
       595
        
       

     

       594
       596
        
         goda = callPackage ../development/tools/goda { };

     
···

       1359
       1361
        
           type = "OPN";

     

       1360
       1362
        
         };

     

       1361
       1363
        
       

     

       1362
       1362
       -
         arc_unpacker = callPackage ../tools/archivers/arc_unpacker {

     

       1363
       1363
       -
           boost = boost175; # checkPhase fails with Boost 1.77

     

       1364
       1364
       -
         };

     

       1364
       1364
       +
         arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };

     

       1365
       1365
        
       

     

       1366
       1366
        
         adminer = callPackage ../servers/adminer { };

     

       1367
       1367
        
       

     
···

       13458
       13458
        
         uget-integrator = callPackage ../tools/networking/uget-integrator { };

     

       13459
       13459
        
       

     

       13460
       13460
        
         ugrep = callPackage ../tools/text/ugrep { };

     

       13461
       13461
       +
       

     

       13462
       13462
       +
         ugs = callPackage ../tools/misc/ugs { };

     

       13461
       13463
        
       

     

       13462
       13464
        
         uhk-agent = callPackage ../os-specific/linux/uhk-agent { };

     

       13463
       13465
        
       

     
···

       32972
       32974
        
       

     

       32973
       32975
        
         neomutt = callPackage ../applications/networking/mailreaders/neomutt { };

     

       32974
       32976
        
       

     

       32975
       32975
       -
         natron = callPackage ../applications/video/natron { };

     

       32977
       32977
       +
         natron = libsForQt5.callPackage ../applications/video/natron { };

     

       32976
       32978
        
       

     

       32977
       32979
        
         natural-docs = callPackage ../applications/misc/natural-docs { };

     

       32978
       32980

+10

pkgs/top-level/python-packages.nix

···

       544
       544
        
       

     

       545
       545
        
         apispec = callPackage ../development/python-modules/apispec { };

     

       546
       546
        
       

     

       547
       547
       +
         apispec-webframeworks = callPackage ../development/python-modules/apispec-webframeworks { };

     

       548
       548
       +
       

     

       547
       549
        
         aplpy = callPackage ../development/python-modules/aplpy { };

     

       548
       550
        
       

     

       549
       551
        
         app-model = callPackage ../development/python-modules/app-model { };

     
···

       3561
       3563
        
         filebytes = callPackage ../development/python-modules/filebytes { };

     

       3562
       3564
        
       

     

       3563
       3565
        
         filecheck = callPackage ../development/python-modules/filecheck { };

     

       3566
       3566
       +
       

     

       3567
       3567
       +
         filedepot = callPackage ../development/python-modules/filedepot { };

     

       3564
       3568
        
       

     

       3565
       3569
        
         filelock = callPackage ../development/python-modules/filelock { };

     

       3566
       3570
        
       

     
···

       7709
       7713
        
       

     

       7710
       7714
        
         pygments-style-github = callPackage ../development/python-modules/pygments-style-github { };

     

       7711
       7715
        
       

     

       7716
       7716
       +
         pygnmi = callPackage ../development/python-modules/pygnmi { };

     

       7717
       7717
       +
       

     

       7712
       7718
        
         pygti = callPackage ../development/python-modules/pygti { };

     

       7713
       7719
        
       

     

       7714
       7720
        
         pyheos = callPackage ../development/python-modules/pyheos { };

     
···

       8816
       8822
        
         pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { };

     

       8817
       8823
        
       

     

       8818
       8824
        
         pylint-venv = callPackage ../development/python-modules/pylint-venv { };

     

       8825
       8825
       +
       

     

       8826
       8826
       +
         pylion = callPackage ../development/python-modules/pylion { };

     

       8819
       8827
        
       

     

       8820
       8828
        
         pylitterbot = callPackage ../development/python-modules/pylitterbot { };

     

       8821
       8829
        
       

     
···

       11200
       11208
        
         simplejson = callPackage ../development/python-modules/simplejson { };

     

       11201
       11209
        
       

     

       11202
       11210
        
         simplekml = callPackage ../development/python-modules/simplekml { };

     

       11211
       11211
       +
       

     

       11212
       11212
       +
         simplekv = callPackage ../development/python-modules/simplekv { };

     

       11203
       11213
        
       

     

       11204
       11214
        
         simplenote = callPackage ../development/python-modules/simplenote { };

     

       11205
       11215