commit 56736d0fbc5f9e5f4e83e201dd7c856c93ec6b22 · pyrox.dev/nixpkgs

+7

maintainers/maintainer-list.nix

···

       4550
       4550
        
           githubId = 2405974;

     

       4551
       4551
        
           name = "Sébastian Méric de Bellefon";

     

       4552
       4552
        
         };

     

       4553
       4553
       +
         henkkalkwater = {

     

       4554
       4554
       +
           email = "chris+nixpkgs@netsoj.nl";

     

       4555
       4555
       +
           github = "HenkKalkwater";

     

       4556
       4556
       +
           githubId = 4262067;

     

       4557
       4557
       +
           matrix = "@chris:netsoj.nl";

     

       4558
       4558
       +
           name = "Chris Josten";

     

       4559
       4559
       +
         };

     

       4553
       4560
        
         henrikolsson = {

     

       4554
       4561
        
           email = "henrik@fixme.se";

     

       4555
       4562
        
           github = "henrikolsson";

+17 -3

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

···

       24
       24
        
           (mkRemovedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")

     

       25
       25
        
           (mkRemovedOptionModule [ "services" "matomo" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")

     

       26
       26
        
           (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])

     

       27
       27
       +
           (mkRenamedOptionModule [ "services" "matomo" "periodicArchiveProcessingUrl" ] [ "services" "matomo" "hostname" ])

     

       27
       28
        
         ];

     

       28
       29
        
       

     

       29
       30
        
         options = {

     
···

       77
       78
        
               '';

     

       78
       79
        
             };

     

       79
       80
        
       

     

       80
       80
       -
             periodicArchiveProcessingUrl = mkOption {

     

       81
       81
       +
             hostname = mkOption {

     

       81
       82
        
               type = types.str;

     

       82
       83
        
               default = "${user}.${fqdn}";

     

       83
       84
        
               example = "matomo.yourdomain.org";

     
···

       170
       171
        
               fi

     

       171
       172
        
               chown -R ${user}:${user} ${dataDir}

     

       172
       173
        
               chmod -R ug+rwX,o-rwx ${dataDir}

     

       174
       174
       +
       

     

       175
       175
       +
               if [ -e ${dataDir}/current-package ]; then

     

       176
       176
       +
                 CURRENT_PACKAGE=$(readlink ${dataDir}/current-package)

     

       177
       177
       +
                 NEW_PACKAGE=${cfg.package}

     

       178
       178
       +
                 if [ "$CURRENT_PACKAGE" != "$NEW_PACKAGE" ]; then

     

       179
       179
       +
                   # keeping tmp arround between upgrades seems to bork stuff, so delete it

     

       180
       180
       +
                   rm -rf ${dataDir}/tmp

     

       181
       181
       +
                 fi

     

       182
       182
       +
               elif [ -e ${dataDir}/tmp ]; then

     

       183
       183
       +
                 # upgrade from 4.4.1

     

       184
       184
       +
                 rm -rf ${dataDir}/tmp

     

       185
       185
       +
               fi

     

       186
       186
       +
               ln -sfT ${cfg.package} ${dataDir}/current-package

     

       173
       187
        
               '';

     

       174
       188
        
             script = ''

     

       175
       189
        
                   # Use User-Private Group scheme to protect Matomo data, but allow administration / backup via 'matomo' group

     
···

       202
       216
        
               UMask = "0007";

     

       203
       217
        
               CPUSchedulingPolicy = "idle";

     

       204
       218
        
               IOSchedulingClass = "idle";

     

       205
       205
       -
               ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${cfg.periodicArchiveProcessingUrl}";

     

       219
       219
       +
               ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${cfg.hostname}";

     

       206
       220
        
             };

     

       207
       221
        
           };

     

       208
       222
        
       

     
···

       258
       272
        
             # References:

     

       259
       273
        
             # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html

     

       260
       274
        
             # https://github.com/perusio/piwik-nginx

     

       261
       261
       -
             "${user}.${fqdn}" = mkMerge [ cfg.nginx {

     

       275
       275
       +
             "${cfg.hostname}" = mkMerge [ cfg.nginx {

     

       262
       276
        
               # don't allow to override the root easily, as it will almost certainly break Matomo.

     

       263
       277
        
               # disadvantage: not shown as default in docs.

     

       264
       278
        
               root = mkForce "${cfg.package}/share";

+1 -1

nixos/tests/all-tests.nix

···

       33
       33
        
         avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };

     

       34
       34
        
         babeld = handleTest ./babeld.nix {};

     

       35
       35
        
         bazarr = handleTest ./bazarr.nix {};

     

       36
       36
       -
         bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64

     

       36
       36
       +
         bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {};

     

       37
       37
        
         beanstalkd = handleTest ./beanstalkd.nix {};

     

       38
       38
        
         bees = handleTest ./bees.nix {};

     

       39
       39
        
         bind = handleTest ./bind.nix {};

+15 -1

nixos/tests/tinydns.nix

···

       21
       21
        
         testScript = ''

     

       22
       22
        
           nameserver.start()

     

       23
       23
        
           nameserver.wait_for_unit("tinydns.service")

     

       24
       24
       -
           nameserver.succeed("host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'")

     

       24
       24
       +
       

     

       25
       25
       +
           # We query tinydns a few times to trigger the bug:

     

       26
       26
       +
           #

     

       27
       27
       +
           #   nameserver # [    6.105872] mmap: tinydns (842): VmData 331776 exceed data ulimit 300000. Update limits or use boot option ignore_rlimit_data.

     

       28
       28
       +
           #

     

       29
       29
       +
           # which was reported in https://github.com/NixOS/nixpkgs/issues/119066.

     

       30
       30
       +
           # Without the patch <nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch>

     

       31
       31
       +
           # it fails on the 10th iteration.

     

       32
       32
       +
           nameserver.succeed(

     

       33
       33
       +
               """

     

       34
       34
       +
                 for i in {1..100}; do

     

       35
       35
       +
                   host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'

     

       36
       36
       +
                 done

     

       37
       37
       +
               """

     

       38
       38
       +
           )

     

       25
       39
        
         '';

     

       26
       40
        
       })

+6 -7

pkgs/applications/audio/mmtc/default.nix

···

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

     

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, installShellFiles }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "mmtc";

     

       5
       5
       -
         version = "0.2.13";

     

       5
       5
       +
         version = "0.2.14";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "figsoda";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz";

     

       11
       11
       +
           sha256 = "sha256-g2JHY95vkG/Ep2eqz8guteF8fHUso/JuuVijNGkgykA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "0lkx0zj9xc0rlrq91l4wydzp430hxlrqyq7ii8wq2fcan8ln22lv";

     

       14
       14
       +
         cargoSha256 = "sha256-tVjy/O5hfnQFC6to8VMGc39mEXhA5lwUIne6pVvDec0=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17
       17
        
       

     

       18
       18
        
         preFixup = ''

     

       19
       19
        
           completions=($releaseDir/build/mmtc-*/out/completions)

     

       20
       20
       -
           installShellCompletion ''${completions[0]}/mmtc.{bash,fish}

     

       21
       21
       -
           installShellCompletion --zsh ''${completions[0]}/_mmtc

     

       20
       20
       +
           installShellCompletion $completions/mmtc.{bash,fish} --zsh $completions/_mmtc

     

       22
       21
        
         '';

     

       23
       22
        
       

     

       24
       24
       -
         GEN_COMPLETIONS = "1";

     

       23
       23
       +
         GEN_COMPLETIONS = 1;

     

       25
       24
        
       

     

       26
       25
        
         meta = with lib; {

     

       27
       26
        
           description = "Minimal mpd terminal client that aims to be simple yet highly configurable";

+3 -3

pkgs/applications/audio/plexamp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "plexamp";

     

       5
       5
       -
         version = "3.8.0";

     

       5
       5
       +
         version = "3.8.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";

     

       9
       9
        
           name="${pname}-${version}.AppImage";

     

       10
       10
       -
           sha512 = "wdOJYmUHPSuijQjmkwq1jLX3qgLzmFxDihlETELlzk13RcpCcczL++V5dqdiQY6UmZVP3KL4VPjXubSq4CmXlQ==";

     

       10
       10
       +
           sha512 = "JVzfWlrX21KHw4tSrGpCYqqoWFudnyFG4YnHKsnIUtxLDkjyQA8N2/OrDIR+SlK/b0RRs9KZ4lbqQMX8PXUHsg==";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         appimageContents = appimageTools.extractType2 {

     
···

       33
       33
        
         meta = with lib; {

     

       34
       34
        
           description = "A beautiful Plex music player for audiophiles, curators, and hipsters";

     

       35
       35
        
           homepage = "https://plexamp.com/";

     

       36
       36
       -
           changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/33";

     

       36
       36
       +
           changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/35";

     

       37
       37
        
           license = licenses.unfree;

     

       38
       38
        
           maintainers = with maintainers; [ killercup synthetica ];

     

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

+13 -6

pkgs/applications/audio/sublime-music/default.nix

···

       15
       15
        
       

     

       16
       16
        
       python3Packages.buildPythonApplication rec {

     

       17
       17
        
         pname = "sublime-music";

     

       18
       18
       -
         version = "0.11.13";

     

       18
       18
       +
         version = "0.11.14";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitLab {

     
···

       57
       57
        
          ++ lib.optional serverSupport bottle

     

       58
       58
        
         ;

     

       59
       59
        
       

     

       60
       60
       +
         postPatch = ''

     

       61
       61
       +
           sed -i "/--cov/d" setup.cfg

     

       62
       62
       +
           sed -i "/--no-cov-on-fail/d" setup.cfg

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       60
       65
        
         # hook for gobject-introspection doesn't like strictDeps

     

       61
       66
        
         # https://github.com/NixOS/nixpkgs/issues/56943

     

       62
       67
        
         strictDeps = false;

     

       63
       68
        
       

     

       64
       64
       -
         # Use the test suite provided by the upstream project.

     

       65
       69
        
         checkInputs = with python3Packages; [

     

       66
       70
        
           pytest

     

       67
       67
       -
           pytest-cov

     

       68
       71
        
         ];

     

       69
       69
       -
         checkPhase = "${xvfb-run}/bin/xvfb-run pytest";

     

       72
       72
       +
       

     

       73
       73
       +
         checkPhase = ''

     

       74
       74
       +
           ${xvfb-run}/bin/xvfb-run pytest -k "not test_json_load_unload"

     

       75
       75
       +
         '';

     

       70
       76
        
       

     

       71
       71
       -
         # Also run the python import check for sanity

     

       72
       72
       -
         pythonImportsCheck = [ "sublime_music" ];

     

       77
       77
       +
         pythonImportsCheck = [

     

       78
       78
       +
           "sublime_music"

     

       79
       79
       +
         ];

     

       73
       80
        
       

     

       74
       81
        
         postInstall = ''

     

       75
       82
        
           install -Dm444 sublime-music.desktop      -t $out/share/applications

+2 -2

pkgs/applications/misc/smpq/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, cmake, StormLib }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "smpq";

     

       5
       5
        
         version = "1.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "https://launchpad.net/smpq/trunk/1.6/+download/smpq_1.6.orig.tar.gz";

     

       8
       8
       +
           url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz";

     

       9
       9
        
           sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm";

     

       10
       10
        
         };

     

       11
       11

+11 -11

pkgs/applications/science/logic/proverif/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "proverif";

     

       5
       5
       -
         version = "2.02pl1";

     

       5
       5
       +
         version = "2.03";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url    = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz";

     

       9
       9
       -
           sha256 = "1jmzfpx0hdgfmkq0jp6i3k5av9xxgndjaj743wfy37svn0ga4jjx";

     

       8
       8
       +
           url    = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${version}.tar.gz";

     

       9
       9
       +
           sha256 = "sha256:1q5mp9il09jylimcaqczb3kh34gb5px88js127gxv0jj5b4bqfc7";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ];

     

       12
       12
       +
         buildInputs = with ocamlPackages; [ ocaml findlib ];

     

       13
       13
        
       

     

       14
       14
       -
         buildPhase = "./build";

     

       14
       14
       +
         buildPhase = "./build -nointeract";

     

       15
       15
        
         installPhase = ''

     

       16
       16
       -
           mkdir -p $out/bin

     

       17
       17
       -
           cp ./proverif      $out/bin

     

       18
       18
       -
           cp ./proveriftotex $out/bin

     

       16
       16
       +
           runHook preInstall

     

       17
       17
       +
           install -D -t $out/bin proverif proveriftotex

     

       19
       18
        
           install -D -t $out/share/emacs/site-lisp/ emacs/proverif.el

     

       19
       19
       +
           runHook postInstall

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         meta = {

     

       23
       23
       -
           description = "Cryptographic protocol verifier in the Dolev-Yao model";

     

       24
       24
       -
           homepage    = "https://prosecco.gforge.inria.fr/personal/bblanche/proverif/";

     

       23
       23
       +
           description = "Cryptographic protocol verifier in the formal model";

     

       24
       24
       +
           homepage    = "https://bblanche.gitlabpages.inria.fr/proverif/";

     

       25
       25
        
           license     = lib.licenses.gpl2;

     

       26
       26
        
           platforms   = lib.platforms.unix;

     

       27
       27
       -
           maintainers = [ lib.maintainers.thoughtpolice ];

     

       27
       27
       +
           maintainers = with lib.maintainers; [ thoughtpolice vbgl ];

     

       28
       28
        
         };

     

       29
       29
        
       }

+40

pkgs/data/icons/vimix-icon-theme/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "vimix-icon-theme";

     

       5
       5
       +
         version = "2021-11-09";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "vinceliuice";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "1ali128027yw5kllip7p32c92pby5gaqs0i393m3bp69547np1d4";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ gtk3 jdupes ];

     

       15
       15
       +
       

     

       16
       16
       +
         propagatedBuildInputs = [ hicolor-icon-theme ];

     

       17
       17
       +
       

     

       18
       18
       +
         dontDropIconThemeCache = true;

     

       19
       19
       +
       

     

       20
       20
       +
         # These fixup steps are slow and unnecessary for this package

     

       21
       21
       +
         dontPatchELF = true;

     

       22
       22
       +
         dontRewriteSymlinks = true;

     

       23
       23
       +
       

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           runHook preInstall

     

       26
       26
       +
           patchShebangs install.sh

     

       27
       27
       +
           ./install.sh -a -d $out/share/icons

     

       28
       28
       +
           # replace duplicate files with symlinks

     

       29
       29
       +
           jdupes -l -r $out/share/icons

     

       30
       30
       +
           runHook postInstall

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           description = "A Material Design icon theme based on Paper icon theme";

     

       35
       35
       +
           homepage = "https://github.com/vinceliuice/vimix-icon-theme";

     

       36
       36
       +
           license = with licenses; [ cc-by-sa-40 ];

     

       37
       37
       +
           platforms = platforms.linux;

     

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

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+4 -2

pkgs/desktops/gnome/apps/gnome-todo/default.nix

···

       36
       36
        
         patches = [

     

       37
       37
        
           # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667

     

       38
       38
        
           (fetchpatch {

     

       39
       39
       -
             url = "https://cgit.freebsd.org/ports/patch/?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";

     

       40
       40
       -
             sha256 = "sha256-IMBfqtrqBw3DdmJG0qchZFR6Am1PICMnM5P6BcS8oqI=";

     

       39
       39
       +
             url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";

     

       40
       40
       +
             sha256 = "sha256:0ihixyq72yhx6njij7bldsqb80x3y217yh6livknlf5r1wr3hakn";

     

       41
       41
       +
             extraPrefix = "";

     

       42
       42
       +
             name = "gnome-todo_meson-build.patch";

     

       41
       43
        
           })

     

       42
       44
        
         ];

     

       43
       45

+1 -7

pkgs/development/compilers/yosys/default.nix

···

       51
       51
        
       

     

       52
       52
        
         patches = [

     

       53
       53
        
           ./plugin-search-dirs.patch

     

       54
       54
       +
           ./fix-clang-build.patch # see https://github.com/YosysHQ/yosys/issues/2011

     

       54
       55
        
         ];

     

       55
       56
        
       

     

       56
       57
        
         postPatch = ''

     
···

       104
       105
        
           license     = licenses.isc;

     

       105
       106
        
           platforms   = platforms.all;

     

       106
       107
        
           maintainers = with maintainers; [ shell thoughtpolice emily ];

     

       107
       107
       -
           #In file included from kernel/driver.cc:20:

     

       108
       108
       -
           #./kernel/yosys.h:42:10: fatal error: 'map' file not found

     

       109
       109
       -
           ##include <map>

     

       110
       110
       -
       

     

       111
       111
       -
           #https://github.com/YosysHQ/yosys/issues/681

     

       112
       112
       -
           #https://github.com/YosysHQ/yosys/issues/2011

     

       113
       113
       -
           broken = stdenv.isDarwin;

     

       114
       108
        
         };

     

       115
       109
        
       }

+26

pkgs/development/compilers/yosys/fix-clang-build.patch

···

       1
       1
       +
       diff --git a/Makefile b/Makefile

     

       2
       2
       +
       index 86abc6958..a72f7b792 100644

     

       3
       3
       +
       --- a/Makefile

     

       4
       4
       +
       +++ b/Makefile

     

       5
       5
       +
       @@ -145,7 +145,12 @@ bumpversion:

     

       6
       6
       +
        ABCREV = 4f5f73d

     

       7
       7
       +
        ABCPULL = 1

     

       8
       8
       +
        ABCURL ?= https://github.com/YosysHQ/abc

     

       9
       9
       +
       +

     

       10
       10
       +
       +ifneq ($(CONFIG),clang)

     

       11
       11
       +
       +ABCMKARGS = CC=clang CXX="$(CXX)" LD=clang ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)

     

       12
       12
       +
       +else

     

       13
       13
       +
        ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)

     

       14
       14
       +
       +endif

     

       15
       15
       +
        

     

       16
       16
       +
        # set ABCEXTERNAL = <abc-command> to use an external ABC instance

     

       17
       17
       +
        # Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set.

     

       18
       18
       +
       @@ -187,7 +192,7 @@ endif

     

       19
       19
       +
        endif

     

       20
       20
       +
        

     

       21
       21
       +
        ifeq ($(CONFIG),clang)

     

       22
       22
       +
       -CXX = clang

     

       23
       23
       +
       +CXX = clang++

     

       24
       24
       +
        LD = clang++

     

       25
       25
       +
        CXXFLAGS += -std=$(CXXSTD) -Os

     

       26
       26
       +
        ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"

+2 -2

pkgs/development/libraries/intel-media-driver/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "intel-media-driver";

     

       16
       16
       -
         version = "21.3.5";

     

       16
       16
       +
         version = "21.4.1";

     

       17
       17
        
       

     

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

     

       19
       19
        
       

     
···

       21
       21
        
           owner = "intel";

     

       22
       22
        
           repo = "media-driver";

     

       23
       23
        
           rev = "intel-media-${version}";

     

       24
       24
       -
           sha256 = "1wc8qhz1j4z42jmnsr38y15kc0jhfqfx8ssnb5055kmmmvzwk1sh";

     

       24
       24
       +
           sha256 = "1gf3gkxr68n8ca5bk269w469jykq90z8d3a9v0gag02cl1d6ca3i";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         patches = [

+2 -2

pkgs/development/libraries/libfyaml/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "libfyaml";

     

       5
       5
       -
         version = "0.7.1";

     

       5
       5
       +
         version = "0.7.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "pantoniou";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "1367cbny5msapy48z0yysbkawmk1qjqk7cjnqkjszs47riwvjz3h";

     

       11
       11
       +
           sha256 = "0wq7ah9a83w0c5qppdpwqqjffwi85q7slz4im0kmkhxdp23v9m1i";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

+18

pkgs/development/python-modules/filelock/3.2.nix

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "filelock";

     

       5
       5
       +
         version = "3.2.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "1qry67zv2pmz8px6wdfbjqv75nmryy2ac7asqgs6q6db2722kpcw";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         meta = with lib; {

     

       13
       13
       +
           homepage = "https://github.com/benediktschmitt/py-filelock";

     

       14
       14
       +
           description = "A platform independent file lock for Python";

     

       15
       15
       +
           license = licenses.unlicense;

     

       16
       16
       +
           maintainers = with maintainers; [ henkkalkwater ];

     

       17
       17
       +
         };

     

       18
       18
       +
       }

+51 -45

pkgs/development/python-modules/flask-admin/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , arrow

     

       2
       3
        
       , buildPythonPackage

     

       4
       4
       +
       , colour

     

       5
       5
       +
       , email_validator

     

       6
       6
       +
       , enum34

     

       3
       7
        
       , fetchPypi

     

       4
       4
       -
       , nose

     

       5
       5
       -
       , pillow

     

       8
       8
       +
       , flask

     

       9
       9
       +
       , flask_sqlalchemy

     

       10
       10
       +
       , flask-babelex

     

       11
       11
       +
       , flask-mongoengine

     

       12
       12
       +
       , geoalchemy2

     

       13
       13
       +
       , isPy27

     

       6
       14
        
       , mongoengine

     

       15
       15
       +
       , pillow

     

       16
       16
       +
       , psycopg2

     

       7
       17
        
       , pymongo

     

       8
       8
       -
       , wtf-peewee

     

       18
       18
       +
       , pytestCheckHook

     

       19
       19
       +
       , shapely

     

       9
       20
        
       , sqlalchemy

     

       10
       21
        
       , sqlalchemy-citext

     

       11
       22
        
       , sqlalchemy-utils

     

       12
       12
       -
       , flask-mongoengine

     

       13
       13
       -
       , flask_sqlalchemy

     

       14
       14
       -
       , flask-babelex

     

       15
       15
       -
       , shapely

     

       16
       16
       -
       , geoalchemy2

     

       17
       17
       -
       , psycopg2

     

       18
       18
       -
       , arrow

     

       19
       19
       -
       , colour

     

       20
       20
       -
       , email_validator

     

       21
       21
       -
       , flask

     

       23
       23
       +
       , wtf-peewee

     

       22
       24
        
       , wtforms

     

       23
       23
       -
       , isPy27

     

       24
       24
       -
       , enum34

     

       25
       25
        
       }:

     

       26
       26
        
       

     

       27
       27
        
       buildPythonPackage rec {

     

       28
       28
        
         pname = "flask-admin";

     

       29
       29
       -
         version = "1.5.6";

     

       29
       29
       +
         version = "1.5.8";

     

       30
       30
       +
         format = "setuptools";

     

       30
       31
        
       

     

       31
       32
        
         src = fetchPypi {

     

       32
       33
        
           pname = "Flask-Admin";

     

       33
       34
        
           inherit version;

     

       34
       34
       -
           sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8";

     

       35
       35
       +
           sha256 = "sha256-6wah8xuYiB3uU6VcZPrr0ZkNaqw4gmNksoDfCyZ5/3Q=";

     

       35
       36
        
         };

     

       36
       37
        
       

     

       38
       38
       +
         propagatedBuildInputs = [

     

       39
       39
       +
           flask

     

       40
       40
       +
           wtforms

     

       41
       41
       +
         ] ++ lib.optionals isPy27 [

     

       42
       42
       +
           enum34

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       37
       45
        
         checkInputs = [

     

       38
       38
       -
           nose

     

       39
       39
       -
           pillow

     

       46
       46
       +
           arrow

     

       47
       47
       +
           colour

     

       48
       48
       +
           email_validator

     

       49
       49
       +
           flask_sqlalchemy

     

       50
       50
       +
           flask-babelex

     

       51
       51
       +
           flask-mongoengine

     

       52
       52
       +
           geoalchemy2

     

       40
       53
        
           mongoengine

     

       54
       54
       +
           pillow

     

       55
       55
       +
           psycopg2

     

       41
       56
        
           pymongo

     

       42
       42
       -
           wtf-peewee

     

       57
       57
       +
           pytestCheckHook

     

       58
       58
       +
           shapely

     

       43
       59
        
           sqlalchemy

     

       44
       60
        
           sqlalchemy-citext

     

       45
       61
        
           sqlalchemy-utils

     

       46
       46
       -
           flask-mongoengine

     

       47
       47
       -
           flask_sqlalchemy

     

       48
       48
       -
           flask-babelex

     

       49
       49
       -
           shapely

     

       50
       50
       -
           geoalchemy2

     

       51
       51
       -
           psycopg2

     

       52
       52
       -
           arrow

     

       53
       53
       -
           colour

     

       54
       54
       -
           email_validator

     

       62
       62
       +
           wtf-peewee

     

       55
       63
        
         ];

     

       56
       64
        
       

     

       57
       57
       -
         propagatedBuildInputs = [

     

       58
       58
       -
           flask

     

       59
       59
       -
           wtforms

     

       60
       60
       -
         ] ++ lib.optionals isPy27 [ enum34 ];

     

       65
       65
       +
         disabledTestPaths = [

     

       66
       66
       +
           # Tests have additional requirements

     

       67
       67
       +
           "flask_admin/tests/geoa/test_basic.py"

     

       68
       68
       +
           "flask_admin/tests/mongoengine/test_basic.py"

     

       69
       69
       +
           "flask_admin/tests/pymongo/test_basic.py"

     

       70
       70
       +
           "flask_admin/tests/sqla/test_basic.py"

     

       71
       71
       +
           "flask_admin/tests/sqla/test_form_rules.py"

     

       72
       72
       +
           "flask_admin/tests/sqla/test_postgres.py"

     

       73
       73
       +
           "flask_admin/tests/sqla/test_translation.py"

     

       74
       74
       +
         ];

     

       61
       75
        
       

     

       62
       62
       -
         checkPhase = ''

     

       63
       63
       -
           # disable tests that require mongodb, postresql, or network

     

       64
       64
       -
           nosetests \

     

       65
       65
       -
            -e "mongoengine" \

     

       66
       66
       -
            -e "pymongo" \

     

       67
       67
       -
            -e "test_form_upload" \

     

       68
       68
       -
            -e "test_postgres" \

     

       69
       69
       -
            -e "geoa" \

     

       70
       70
       -
            -e "test_ajax_fk" \

     

       71
       71
       -
            flask_admin/tests

     

       72
       72
       -
         '';

     

       76
       76
       +
         pythonImportsCheck = [

     

       77
       77
       +
           "flask_admin"

     

       78
       78
       +
         ];

     

       73
       79
        
       

     

       74
       80
        
         meta = with lib; {

     

       75
       81
        
           description = "Simple and extensible admin interface framework for Flask";

     

       76
       82
        
           homepage = "https://github.com/flask-admin/flask-admin/";

     

       77
       83
        
           license = licenses.bsd3;

     

       78
       78
       -
           maintainers = [ maintainers.costrouc ];

     

       84
       84
       +
           maintainers = with maintainers; [ costrouc ];

     

       79
       85
        
         };

     

       80
       86
        
       }

+38 -13

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

···

       1
       1
       -
       { buildPythonPackage, fetchFromGitHub, lib

     

       2
       2
       -
       # propagatedBuildInputs

     

       3
       3
       -
       , absl-py, numpy, opt-einsum

     

       4
       4
       -
       # checkInputs

     

       5
       5
       -
       , jaxlib, pytestCheckHook

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , absl-py

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , jaxlib

     

       6
       6
       +
       , numpy

     

       7
       7
       +
       , opt-einsum

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       , pythonOlder

     

       10
       10
       +
       , scipy

     

       11
       11
       +
       , typing-extensions

     

       6
       12
        
       }:

     

       7
       13
        
       

     

       8
       14
        
       buildPythonPackage rec {

     

       9
       15
        
         pname = "jax";

     

       10
       10
       -
         version = "0.2.21";

     

       16
       16
       +
         version = "0.2.24";

     

       17
       17
       +
         format = "setuptools";

     

       18
       18
       +
       

     

       19
       19
       +
         disabled = pythonOlder "3.7";

     

       11
       20
        
       

     

       12
       12
       -
         # Fetching from pypi doesn't allow us to run the test suite. See https://discourse.nixos.org/t/pythonremovetestsdir-hook-being-run-before-checkphase/14612/3.

     

       13
       21
        
         src = fetchFromGitHub {

     

       14
       22
        
           owner = "google";

     

       15
       23
        
           repo = pname;

     

       16
       24
        
           rev = "jax-v${version}";

     

       17
       17
       -
           sha256 = "05w157h6jv20k8w2gnmlxbycmzf24lr5v392q0c5v0qcql11q7pn";

     

       25
       25
       +
           sha256 = "1mmn1m4mprpwqlb1smjfdy3f74zm9p3l9dhhn25x6jrcj2cgc5pi";

     

       18
       26
        
         };

     

       19
       27
        
       

     

       20
       28
        
         # jaxlib is _not_ included in propagatedBuildInputs because there are

     

       21
       29
        
         # different versions of jaxlib depending on the desired target hardware. The

     

       22
       30
        
         # JAX project ships separate wheels for CPU, GPU, and TPU. Currently only the

     

       23
       31
        
         # CPU wheel is packaged.

     

       24
       24
       -
         propagatedBuildInputs = [ absl-py numpy opt-einsum ];

     

       32
       32
       +
         propagatedBuildInputs = [

     

       33
       33
       +
           absl-py

     

       34
       34
       +
           numpy

     

       35
       35
       +
           opt-einsum

     

       36
       36
       +
           scipy

     

       37
       37
       +
           typing-extensions

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         checkInputs = [

     

       41
       41
       +
           jaxlib

     

       42
       42
       +
           pytestCheckHook

     

       43
       43
       +
         ];

     

       25
       44
        
       

     

       26
       26
       -
         checkInputs = [ jaxlib pytestCheckHook ];

     

       27
       45
        
         # NOTE: Don't run the tests in the expiremental directory as they require flax

     

       28
       46
        
         # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2.

     

       29
       47
        
         # Not a big deal, this is how the JAX docs suggest running the test suite

     

       30
       48
        
         # anyhow.

     

       31
       31
       -
         pytestFlagsArray = [ "-W ignore::DeprecationWarning" "tests/" ];

     

       49
       49
       +
         pytestFlagsArray = [

     

       50
       50
       +
           "-W ignore::DeprecationWarning"

     

       51
       51
       +
           "tests/"

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         pythonImportsCheck = [

     

       55
       55
       +
           "jax"

     

       56
       56
       +
         ];

     

       32
       57
        
       

     

       33
       58
        
         meta = with lib; {

     

       34
       59
        
           description = "Differentiate, compile, and transform Numpy code";

     

       35
       35
       -
           homepage    = "https://github.com/google/jax";

     

       36
       36
       -
           license     = licenses.asl20;

     

       60
       60
       +
           homepage = "https://github.com/google/jax";

     

       61
       61
       +
           license = licenses.asl20;

     

       37
       62
        
           maintainers = with maintainers; [ samuela ];

     

       38
       63
        
         };

     

       39
       64
        
       }

+51

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , bson

     

       6
       6
       +
       , pytest

     

       7
       7
       +
       , pytest-cov

     

       8
       8
       +
       , pytest-runner

     

       9
       9
       +
       , pytestCheckHook

     

       10
       10
       +
       , pyyaml

     

       11
       11
       +
       , setuptools

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname = "pymarshal";

     

       16
       16
       +
         version = "2.2.0";

     

       17
       17
       +
         disabled = pythonOlder "3.0";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "stargateaudio";

     

       21
       21
       +
           repo = pname;

     

       22
       22
       +
           rev = version;

     

       23
       23
       +
           sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           setuptools

     

       28
       28
       +
           pytest-runner

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         propagatedBuildInputs = [

     

       32
       32
       +
           bson

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         checkInputs = [

     

       36
       36
       +
           pytestCheckHook

     

       37
       37
       +
           bson

     

       38
       38
       +
           pytest

     

       39
       39
       +
           pytest-cov

     

       40
       40
       +
           pyyaml

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         pytestFlagsArray = [ "test" ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = {

     

       46
       46
       +
           description = "Python data serialization library";

     

       47
       47
       +
           homepage = "https://github.com/stargateaudio/pymarshal";

     

       48
       48
       +
           maintainers = with lib.maintainers; [ yuu ];

     

       49
       49
       +
           license = lib.licenses.bsd2;

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+5 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "pytile";

     

       16
       16
       -
         version = "5.2.4";

     

       16
       16
       +
         version = "2021.10.0";

     

       17
       17
        
         format = "pyproject";

     

       18
       18
       +
       

     

       18
       19
        
         disabled = pythonOlder "3.7";

     

       19
       20
        
       

     

       20
       21
        
         src = fetchFromGitHub {

     
···

       45
       46
        
           "examples/"

     

       46
       47
        
         ];

     

       47
       48
        
       

     

       48
       48
       -
         pythonImportsCheck = [ "pytile" ];

     

       49
       49
       +
         pythonImportsCheck = [

     

       50
       50
       +
           "pytile"

     

       51
       51
       +
         ];

     

       49
       52
        
       

     

       50
       53
        
         __darwinAllowLocalNetworking = true;

     

       51
       54

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-requests";

     

       8
       8
       -
         version = "2.25.11";

     

       8
       8
       +
         version = "2.25.12";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "sha256-snkoTlH2aOOO4S2WZeTXiQifUy3CoL5KFQjKDv2Yup4=";

     

       12
       12
       +
           sha256 = "sha256-BVhjwKrPj48pzSyg0zIO/fOfKOcd5o0yd2F1HS9iu1c=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         # Modules doesn't have tests

+2 -2

pkgs/development/python-modules/velbus-aio/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "velbus-aio";

     

       12
       12
       -
         version = "2021.11.0";

     

       12
       12
       +
         version = "2021.11.6";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     

       15
       15
        
       

     
···

       17
       17
        
           owner = "Cereal2nd";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "sha256-4N1wamy0nqAmVezOd3kBicUAZXRob8gNA89N3fY1Y7o=";

     

       20
       20
       +
           sha256 = "sha256-Vm/CgrSSCU76CzAxCtpMsE8/GtPE9SlfqDyzYp4Gc8E=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+6 -3

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "yamale";

     

       12
       12
       -
         version = "3.0.8";

     

       12
       12
       +
         version = "4.0.2";

     

       13
       13
       +
         format = "setuptools";

     

       13
       14
        
       

     

       14
       15
        
         disabled = pythonOlder "3.6";

     

       15
       16
        
       

     
···

       17
       18
        
           owner = "23andMe";

     

       18
       19
        
           repo = pname;

     

       19
       20
        
           rev = version;

     

       20
       20
       -
           sha256 = "0bn0himn5fwndaxn205s55bdc4np7lhd940i0lkv0m7ybhbw7dap";

     

       21
       21
       +
           sha256 = "sha256-hFBU3o3HpL0Schgzcx3oYq0IAUVGKThIfEteYcFbLnk=";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       24
        
         propagatedBuildInputs = [

     
···

       29
       30
        
           pytestCheckHook

     

       30
       31
        
         ];

     

       31
       32
        
       

     

       32
       32
       -
         pythonImportsCheck = [ "yamale" ];

     

       33
       33
       +
         pythonImportsCheck = [

     

       34
       34
       +
           "yamale"

     

       35
       35
       +
         ];

     

       33
       36
        
       

     

       34
       37
        
         meta = with lib; {

     

       35
       38
        
           description = "A schema and validator for YAML";

+1 -1

pkgs/games/devilutionx/default.nix

···

       79
       79
        
         buildInputs = [

     

       80
       80
        
           fmt

     

       81
       81
        
           libpng

     

       82
       82
       -
           (SDL2.override { withStatic = true; })

     

       82
       82
       +
           SDL2

     

       83
       83
        
           SDL2_image

     

       84
       84
        
         ];

     

       85
       85

+12

pkgs/misc/vim-plugins/generated.nix

···

       3970
       3970
        
           meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";

     

       3971
       3971
        
         };

     

       3972
       3972
        
       

     

       3973
       3973
       +
         nui-nvim = buildVimPluginFrom2Nix {

     

       3974
       3974
       +
           pname = "nui.nvim";

     

       3975
       3975
       +
           version = "2021-10-30";

     

       3976
       3976
       +
           src = fetchFromGitHub {

     

       3977
       3977
       +
             owner = "MunifTanjim";

     

       3978
       3978
       +
             repo = "nui.nvim";

     

       3979
       3979
       +
             rev = "362585d6515805d4be4eb665cf8707759a92a254";

     

       3980
       3980
       +
             sha256 = "0gzanzyn7fa0qmngrqzlflzzyjzqkn21nhwbgw48hd0x143p0fab";

     

       3981
       3981
       +
           };

     

       3982
       3982
       +
           meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";

     

       3983
       3983
       +
         };

     

       3984
       3984
       +
       

     

       3973
       3985
        
         null-ls-nvim = buildVimPluginFrom2Nix {

     

       3974
       3986
        
           pname = "null-ls.nvim";

     

       3975
       3987
        
           version = "2021-11-04";

+4

pkgs/misc/vim-plugins/overrides.nix

···

       178
       178
        
           '';

     

       179
       179
        
         });

     

       180
       180
        
       

     

       181
       181
       +
         crates-nvim = super.crates-nvim.overrideAttrs (old: {

     

       182
       182
       +
           dependencies = with self; [ plenary-nvim ];

     

       183
       183
       +
         });

     

       184
       184
       +
       

     

       181
       185
        
         ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: {

     

       182
       186
        
           buildInputs = [ python ];

     

       183
       187
        
           buildPhase = ''

+1

pkgs/misc/vim-plugins/vim-plugin-names

···

       475
       475
        
       mpickering/hlint-refactor-vim

     

       476
       476
        
       ms-jpq/chadtree@chad

     

       477
       477
        
       mtikekar/vim-bsv

     

       478
       478
       +
       MunifTanjim/nui.nvim@main

     

       478
       479
        
       mzlogin/vim-markdown-toc

     

       479
       480
        
       mzlogin/vim-smali

     

       480
       481
        
       nacro90/numb.nvim

+4 -5

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchpatch

     

       3
       3
        
       , kernel

     

       4
       4
       -
       , date ? "2021-07-08"

     

       5
       5
       -
       , commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f"

     

       6
       6
       -
       , diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw"

     

       4
       4
       +
       , date ? "2021-11-06"

     

       5
       5
       +
       , commit ? "10669a2c540de3276c8d2fc0e43be62f2886f377"

     

       6
       6
       +
       , diffHash ? "1rn72wd8jg919j74x8banl70b2bdd6r9fgvnw693j20dq96j5cnw"

     

       7
       7
        
       , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage

     

       8
       8
        
       , argsOverride ? {}

     

       9
       9
        
       , ...

     
···

       16
       16
        
           extraMeta = {

     

       17
       17
        
             branch = "master";

     

       18
       18
        
             maintainers = with lib.maintainers; [ davidak chiiruno ];

     

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

     

       20
       19
        
           };

     

       21
       20
        
         } // argsOverride;

     

       22
       21
        
       

     
···

       30
       29
        
             extraConfig = "BCACHEFS_FS m";

     

       31
       30
        
           } ] ++ kernelPatches;

     

       32
       31
        
       

     

       33
       33
       -
       })).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })

     

       32
       32
       +
       }))

+3 -3

pkgs/servers/invidious/default.nix

···

       8
       8
        
         #  * shards.nix (by running `crystal2nix` in invidious’ source tree)

     

       9
       9
        
         #  * If the lsquic.cr dependency changed: lsquic in lsquic.nix (version, sha256)

     

       10
       10
        
         #  * If the lsquic version changed: boringssl' in lsquic.nix (version, sha256)

     

       11
       11
       -
         rev = "21b96a31599e890fe063e3e24cf5f3a995779a69";

     

       11
       11
       +
         rev = "21879da80d2dfa97e789a13b90e82e466c4854e3";

     

       12
       12
        
       in

     

       13
       13
        
       crystal.buildCrystalPackage rec {

     

       14
       14
        
         pname = "invidious";

     

       15
       15
       -
         version = "unstable-2021-10-15";

     

       15
       15
       +
         version = "unstable-2021-11-08";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "iv-org";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           inherit rev;

     

       21
       21
       -
           sha256 = "sha256-Rp3YqjHbP6szohlaEpgopFNdLK31yrcHtyKCeVz76CA=";

     

       21
       21
       +
           sha256 = "0jvnwjdh2l0hxfvzim00r3zbs528bb93y1nk0bjrbbrcfv5cn5ss";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         postPatch =

+9 -8

pkgs/servers/web-apps/matomo/default.nix

···

       3
       3
        
       let

     

       4
       4
        
         versions = {

     

       5
       5
        
           matomo = {

     

       6
       6
       -
             version = "4.4.1";

     

       7
       7
       -
             sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";

     

       6
       6
       +
             version = "4.5.0";

     

       7
       7
       +
             sha256 = "sha256-OyjdzY+ENYxOTVjDLjj2unJbpaGODIH2I5Acmt45HDA=";

     

       8
       8
        
           };

     

       9
       9
        
       

     

       10
       10
        
           matomo-beta = {

     

       11
       11
       -
             version = "4.4.1";

     

       11
       11
       +
             version = "4.6.0";

     

       12
       12
        
             # `beta` examples: "b1", "rc1", null

     

       13
       13
       -
             # TOOD when updating: use null if stable version is >= latest beta or release candidate

     

       14
       14
       -
             beta = null;

     

       15
       15
       -
             sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";

     

       13
       13
       +
             # when updating: use null if stable version is >= latest beta or release candidate

     

       14
       14
       +
             beta = "b2";

     

       15
       15
       +
             sha256 = "sha256-7p/ZPtr5a/tBjrM27ILF3rNfxDIWuzWKCXNom3HlyL8=";

     

       16
       16
        
           };

     

       17
       17
        
         };

     

       18
       18
        
         common = pname: { version, sha256, beta ? null }:

     
···

       74
       74
        
                 "misc/composer/clean-xhprof.sh"

     

       75
       75
        
                 "misc/cron/archive.sh"

     

       76
       76
        
                 "plugins/Installation/FormDatabaseSetup.php"

     

       77
       77
       -
                 "vendor/leafo/lessphp/package.sh"

     

       78
       77
        
                 "vendor/pear/archive_tar/sync-php4"

     

       79
       78
        
                 "vendor/szymach/c-pchart/coverage.sh"

     

       80
       80
       -
                 # drupal_test.sh does not exist in 3.12.0-b3; added for 3.13.0

     

       79
       79
       +
                 "vendor/matomo/matomo-php-tracker/run_tests.sh"

     

       81
       80
        
                 "vendor/twig/twig/drupal_test.sh"

     

       82
       81
        
               ];

     

       83
       82
        
       

     
···

       92
       91
        
                     length="$(wc -c "$f" | cut -d' ' -f1)"

     

       93
       92
        
                     hash="$(md5sum "$f" | cut -d' ' -f1)"

     

       94
       93
        
                     sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php

     

       94
       94
       +
                   else

     

       95
       95
       +
                     echo "INFO(files-to-fix): $f does not exist in this version"

     

       95
       96
        
                   fi

     

       96
       97
        
                 done

     

       97
       98
        
                 popd > /dev/null

+6 -5

pkgs/tools/filesystems/bcachefs-tools/default.nix

···

       22
       22
        
       

     

       23
       23
        
       stdenv.mkDerivation {

     

       24
       24
        
         pname = "bcachefs-tools";

     

       25
       25
       -
         version = "unstable-2021-07-08";

     

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

     

       26
       26
        
       

     

       27
       27
        
         src = fetchFromGitHub {

     

       28
       28
        
           owner = "koverstreet";

     

       29
       29
        
           repo = "bcachefs-tools";

     

       30
       30
       -
           rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";

     

       31
       31
       -
           sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";

     

       30
       30
       +
           rev = "5b84952401146fec9a181a40877352f7faf9ee7b";

     

       31
       31
       +
           sha256 = "09zs2h3vzqn163v4i9lrvgy9gcjlw24lld7715j3kyyxnc5vav32";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         postPatch = ''

     

       35
       35
       +
           patchShebangs .

     

       35
       36
        
           substituteInPlace Makefile \

     

       36
       37
        
             --replace "pytest-3" "pytest --verbose" \

     

       37
       38
        
             --replace "INITRAMFS_DIR=/etc/initramfs-tools" \

     

       38
       39
        
                       "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"

     

       39
       40
        
         '';

     

       40
       41
        
       

     

       41
       41
       -
         nativeBuildInputs = [ pkg-config docutils ];

     

       42
       42
       +
         nativeBuildInputs = [ pkg-config docutils python3Packages.python ];

     

       42
       43
        
       

     

       43
       44
        
         buildInputs = [

     

       44
       45
        
           libuuid libscrypt libsodium keyutils liburcu zlib libaio

     
···

       64
       65
        
           homepage = "https://bcachefs.org/";

     

       65
       66
        
           license = licenses.gpl2;

     

       66
       67
        
           maintainers = with maintainers; [ davidak chiiruno ];

     

       67
       67
       -
           platforms = [ "x86_64-linux" ]; # does not build on aarch64, see https://github.com/koverstreet/bcachefs-tools/issues/39

     

       68
       68
       +
           platforms = platforms.linux;

     

       68
       69
        
         };

     

       69
       70
        
       }

+4 -2

pkgs/tools/graphics/goverlay/default.nix

···

       17
       17
        
       , polkit

     

       18
       18
        
       , procps

     

       19
       19
        
       , systemd

     

       20
       20
       +
       , util-linux

     

       20
       21
        
       , vulkan-tools

     

       21
       22
        
       , which

     

       22
       23
        
       }:

     
···

       35
       36
        
         '';

     

       36
       37
        
       in stdenv.mkDerivation rec {

     

       37
       38
        
         pname = "goverlay";

     

       38
       38
       -
         version = "0.6.3";

     

       39
       39
       +
         version = "0.6.4";

     

       39
       40
        
       

     

       40
       41
        
         src = fetchFromGitHub {

     

       41
       42
        
           owner = "benjamimgois";

     

       42
       43
        
           repo = pname;

     

       43
       44
        
           rev = version;

     

       44
       44
       -
           hash = "sha256-ZksQse0xWAtH+U6EjcGWT2BOG5dfSnm6XvZLLE5ynHs=";

     

       45
       45
       +
           sha256 = "sha256-xuv7u2lLQAB0Zmu7UHGXP/sJwcb8vHDf9hFL+pF+818=";

     

       45
       46
        
         };

     

       46
       47
        
       

     

       47
       48
        
         outputs = [ "out" "man" ];

     
···

       91
       92
        
             polkit

     

       92
       93
        
             procps

     

       93
       94
        
             systemd

     

       95
       95
       +
             util-linux.bin

     

       94
       96
        
             vulkan-tools

     

       95
       97
        
             which

     

       96
       98
        
           ]}"

+5 -5

pkgs/tools/graphics/goverlay/find-xdg-data-files.patch

···

       1
       1
        
       diff --git a/overlayunit.pas b/overlayunit.pas

     

       2
       2
       -
       index a56cea7..9a4f547 100644

     

       2
       2
       +
       index 8c2276d..a62e60a 100644

     

       3
       3
        
       --- a/overlayunit.pas

     

       4
       4
        
       +++ b/overlayunit.pas

     

       5
       5
       -
       @@ -4880,7 +4880,7 @@ begin

     

       5
       5
       +
       @@ -4913,7 +4913,7 @@ begin

     

       6
       6
        
           //Determine Mangohud dependency status

     

       7
       7
        
        

     

       8
       8
        
                  //locate MangoHud and store result in tmp folder

     
···

       11
       11
        
        

     

       12
       12
        
                  // Assign Text file dependency_mangohud to variable mangohudVAR

     

       13
       13
        
                  AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud');

     

       14
       14
       -
       @@ -4889,7 +4889,7 @@ begin

     

       14
       14
       +
       @@ -4922,7 +4922,7 @@ begin

     

       15
       15
        
                  CloseFile(mangohudVAR);

     

       16
       16
        
        

     

       17
       17
        
                  // Read String and store value on mangohuddependencyVALUE based on result

     
···

       20
       20
        
                  mangohuddependencyVALUE := 1

     

       21
       21
        
                  else

     

       22
       22
        
                  mangohuddependencyVALUE := 0;

     

       23
       23
       -
       @@ -4898,7 +4898,7 @@ begin

     

       23
       23
       +
       @@ -4931,7 +4931,7 @@ begin

     

       24
       24
        
           //Determine vkBasalt dependency staus

     

       25
       25
        
        

     

       26
       26
        
                   //locate vkBasalt and store result in tmp folder

     
···

       29
       29
        
        

     

       30
       30
        
                   // Assign Text file dependency_mangohud to variable mangohudVAR

     

       31
       31
        
                   AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt');

     

       32
       32
       -
       @@ -4907,7 +4907,7 @@ begin

     

       32
       32
       +
       @@ -4940,7 +4940,7 @@ begin

     

       33
       33
        
                   CloseFile(vkbasaltVAR);

     

       34
       34
        
        

     

       35
       35
        
                   // Read String and store value on vkbasaltdependencyVALUE based on result

+3 -3

pkgs/tools/misc/zellij/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "zellij";

     

       13
       13
       -
         version = "0.19.0";

     

       13
       13
       +
         version = "0.20.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "zellij-org";

     

       17
       17
        
           repo = "zellij";

     

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

     

       19
       19
       -
           sha256 = "sha256-/1ngmthzWp9K7pBBOBiSMUv0yC66K3Tg2g2PoBskpTU=";

     

       19
       19
       +
           sha256 = "022bxird7jblxix7h2fk91090c87033a1j6hf4wvckwpqywm0wac";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoSha256 = "sha256-eFWsqjXO6QFTO26ppZ4tiJXc/PEYD+5ZdbTBMoDoLFI=";

     

       22
       22
       +
         cargoSha256 = "04fyq0n4v01rsx6xw5raf139ml3nq6casz2nyk23zp3349kb8vad";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

     

       25
       25
        
           installShellFiles

+13 -2

pkgs/tools/networking/djbdns/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, glibc, dns-root-data } :

     

       1
       1
       +
       { lib, stdenv, fetchurl, glibc, dns-root-data, nixosTests } :

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "1.05";

     
···

       19
       19
        
           sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         patches = [ ./hier.patch ./fix-nix-usernamespace-build.patch ];

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           ./hier.patch

     

       24
       24
       +
           ./fix-nix-usernamespace-build.patch

     

       25
       25
       +
       

     

       26
       26
       +
           # To fix https://github.com/NixOS/nixpkgs/issues/119066.

     

       27
       27
       +
           # Note that the NixOS test <nixpkgs/nixos/tests/tinydns.nix> tests for this.

     

       28
       28
       +
           ./softlimit.patch

     

       29
       29
       +
         ];

     

       23
       30
        
       

     

       24
       31
        
         postPatch = ''

     

       25
       32
        
           echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc

     
···

       40
       47
        
           done;

     

       41
       48
        
           rm -rv djbdns-man;

     

       42
       49
        
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         passthru.tests = {

     

       52
       52
       +
           tinydns = nixosTests.tinydns;

     

       53
       53
       +
         };

     

       43
       54
        
       

     

       44
       55
        
         meta = with lib; {

     

       45
       56
        
           description = "A collection of Domain Name System tools";

+12

pkgs/tools/networking/djbdns/softlimit.patch

···

       1
       1
       +
       diff -Naur a/tinydns-conf.c b/tinydns-conf.c

     

       2
       2
       +
       --- a/tinydns-conf.c	2001-02-11 21:11:45.000000000 +0000

     

       3
       3
       +
       +++ b/tinydns-conf.c	2021-11-08 17:23:06.181385437 +0000

     

       4
       4
       +
       @@ -46,7 +46,7 @@

     

       5
       5
       +
       

     

       6
       6
       +
          start("run");

     

       7
       7
       +
          outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);

     

       8
       8
       +
       -  outs(" envdir ./env softlimit -d300000 ");

     

       9
       9
       +
       +  outs(" envdir ./env softlimit -d4500000 ");

     

       10
       10
       +
          outs(auto_home); outs("/bin/tinydns\n");

     

       11
       11
       +
          finish();

     

       12
       12
       +
          perm(0755);

+7 -1

pkgs/top-level/all-packages.nix

···

       23639
       23639
        
           inherit (gnome) gnome-shell;

     

       23640
       23640
        
         };

     

       23641
       23641
        
       

     

       23642
       23642
       +
         vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { };

     

       23643
       23643
       +
       

     

       23642
       23644
        
         vistafonts = callPackage ../data/fonts/vista-fonts { };

     

       23643
       23645
        
       

     

       23644
       23646
        
         vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };

     
···

       29831
       29833
        
       

     

       29832
       29834
        
         ddnet = callPackage ../games/ddnet { };

     

       29833
       29835
        
       

     

       29834
       29834
       -
         devilutionx = callPackage ../games/devilutionx {};

     

       29836
       29836
       +
         devilutionx = callPackage ../games/devilutionx {

     

       29837
       29837
       +
           SDL2 = SDL2.override {

     

       29838
       29838
       +
             withStatic = true;

     

       29839
       29839
       +
           };

     

       29840
       29840
       +
         };

     

       29835
       29841
        
       

     

       29836
       29842
        
         dhewm3 = callPackage ../games/dhewm3 {};

     

       29837
       29843

+1 -1

pkgs/top-level/linux-kernels.nix

···

       189
       189
        
           };

     

       190
       190
        
       

     

       191
       191
        
           linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {

     

       192
       192
       -
             kernel = linux_5_14;

     

       192
       192
       +
             kernel = linux_5_15;

     

       193
       193
        
             kernelPatches = kernel.kernelPatches;

     

       194
       194
        
          };

     

       195
       195

+2

pkgs/top-level/python-packages.nix

···

       6630
       6630
        
       

     

       6631
       6631
        
         pymanopt = callPackage ../development/python-modules/pymanopt { };

     

       6632
       6632
        
       

     

       6633
       6633
       +
         pymarshal = callPackage ../development/python-modules/pymarshal { };

     

       6634
       6634
       +
       

     

       6633
       6635
        
         pymata-express = callPackage ../development/python-modules/pymata-express { };

     

       6634
       6636
        
       

     

       6635
       6637
        
         pymatgen = callPackage ../development/python-modules/pymatgen { };

+2

pkgs/top-level/python2-packages.nix

···

       110
       110
        
       

     

       111
       111
        
         feedparser = callPackage ../development/python-modules/feedparser/5.nix { };

     

       112
       112
        
       

     

       113
       113
       +
         filelock =  callPackage ../development/python-modules/filelock/3.2.nix { };

     

       114
       114
       +
       

     

       113
       115
        
         flask = callPackage ../development/python-modules/flask/1.nix { };

     

       114
       116
        
       

     

       115
       117
        
         flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { };