commit f9d40952954abaac0c57fef2dee574567d4b3a94 · pyrox.dev/nixpkgs

+10 -9

nixos/modules/programs/fish_completion-generator.patch

···

       1
       1
        
       --- a/create_manpage_completions.py

     

       2
       2
        
       +++ b/create_manpage_completions.py

     

       3
       3
       -
       @@ -844,10 +844,6 @@ def parse_manpage_at_path(manpage_path, output_directory):

     

       3
       3
       +
       @@ -879,10 +879,6 @@ def parse_manpage_at_path(manpage_path, output_directory):

     

       4
       4
       +
                        )

     

       5
       5
       +
                        return False

     

       4
       6
        
        

     

       5
       5
       -
                    built_command_output.insert(0, "# " + CMDNAME)

     

       7
       7
       +
       -        # Output the magic word Autogenerated so we can tell if we can overwrite this

     

       8
       8
       +
       -        built_command_output.insert(

     

       9
       9
       +
       -            0, "# " + CMDNAME + "\n# Autogenerated from man page " + manpage_path

     

       10
       10
       +
       -        )

     

       11
       11
       +
                # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABLE PARSER! Was really using Type2 but reporting TypeDeroffManParser

     

       6
       12
        
        

     

       7
       7
       -
       -            # Output the magic word Autogenerated so we can tell if we can overwrite this

     

       8
       8
       -
       -            built_command_output.insert(

     

       9
       9
       -
       -                1, "# Autogenerated from man page " + manpage_path

     

       10
       10
       -
       -            )

     

       11
       11
       -
                    # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser

     

       12
       12
       -
        

     

       13
       13
       -
                    for line in built_command_output:

     

       13
       13
       +
                for line in built_command_output:

     

       14
       14
       +

+1 -1

pkgs/applications/audio/audacity/default.nix

···

       132
       132
        
           homepage = "https://www.audacityteam.org/";

     

       133
       133
        
           license = licenses.gpl2Plus;

     

       134
       134
        
           maintainers = with maintainers; [ lheckemann ];

     

       135
       135
       -
           platforms = intersectLists platforms.linux platforms.x86; # fails on ARM

     

       135
       135
       +
           platforms = platforms.linux;

     

       136
       136
        
         };

     

       137
       137
        
       }

+38

pkgs/applications/audio/freac/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       

     

       5
       5
       +
       , boca

     

       6
       6
       +
       , smooth

     

       7
       7
       +
       , systemd

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "freac";

     

       12
       12
       +
         version = "1.1.3";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "enzo1982";

     

       16
       16
       +
           repo = "freac";

     

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

     

       18
       18
       +
           sha256 = "1sdrsc5pn5901bbds7dj02n71zn5rs4wnv2xxs8ffql4b7jjva0m";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           boca

     

       23
       23
       +
           smooth

     

       24
       24
       +
           systemd

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         makeFlags = [

     

       28
       28
       +
           "prefix=$(out)"

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with lib; {

     

       32
       32
       +
           description = "The fre:ac audio converter project";

     

       33
       33
       +
           license = licenses.gpl2Plus;

     

       34
       34
       +
           homepage = "https://www.freac.org/";

     

       35
       35
       +
           maintainers = with maintainers; [ shamilton ];

     

       36
       36
       +
           platforms = platforms.linux;

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+5 -5

pkgs/applications/editors/neovim/gnvim/default.nix

···

       17
       17
        
       

     

       18
       18
        
         # The default build script tries to get the version through Git, so we

     

       19
       19
        
         # replace it

     

       20
       20
       -
         prePatch = ''

     

       20
       20
       +
         postPatch = ''

     

       21
       21
        
           cat << EOF > build.rs

     

       22
       22
        
           use std::env;

     

       23
       23
        
           use std::fs::File;

     
···

       31
       31
        
               f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();

     

       32
       32
        
           }

     

       33
       33
        
           EOF

     

       34
       34
       -
         '';

     

       35
       34
        
       

     

       36
       36
       -
         buildPhase = ''

     

       37
       37
       -
           make build

     

       35
       35
       +
           # Install the binary ourselves, since the Makefile doesn't have the path

     

       36
       36
       +
           # containing the target architecture

     

       37
       37
       +
           sed -e "/target\/release/d" -i Makefile

     

       38
       38
        
         '';

     

       39
       39
        
       

     

       40
       40
       -
         installPhase = ''

     

       40
       40
       +
         postInstall = ''

     

       41
       41
        
           make install PREFIX="${placeholder "out"}"

     

       42
       42
        
         '';

     

       43
       43

+1 -1

pkgs/applications/networking/browsers/nyxt/default.nix

···

       52
       52
        
           homepage = "https://nyxt.atlas.engineer";

     

       53
       53
        
           license = licenses.bsd3;

     

       54
       54
        
           maintainers = with maintainers; [ lewo ];

     

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

     

       55
       55
       +
           platforms = platforms.all;

     

       56
       56
        
         };

     

       57
       57
        
       }

+2 -2

pkgs/applications/science/astronomy/kstars/default.nix

···

       14
       14
        
       

     

       15
       15
        
       mkDerivation rec {

     

       16
       16
        
         pname = "kstars";

     

       17
       17
       -
         version = "3.5.1";

     

       17
       17
       +
         version = "3.5.2";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchurl {

     

       20
       20
        
           url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";

     

       21
       21
       -
           sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU=";

     

       21
       21
       +
           sha256 = "sha256-iX7rMQbctdK3AeH4ZvH+T4rv1ZHwn55urJh150KoXXU=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         patches = [

+2 -2

pkgs/applications/virtualization/containerd/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoPackage rec {

     

       12
       12
        
         pname = "containerd";

     

       13
       13
       -
         version = "1.4.3";

     

       13
       13
       +
         version = "1.4.4";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "containerd";

     

       17
       17
        
           repo = "containerd";

     

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

     

       19
       19
       -
           sha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";

     

       19
       19
       +
           sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         goPackagePath = "github.com/containerd/containerd";

+2 -2

pkgs/data/misc/osinfo-db/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "osinfo-db";

     

       5
       5
       -
         version = "20210202";

     

       5
       5
       +
         version = "20210215";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs=";

     

       9
       9
       +
           sha256 = "sha256-HIM3sq47+0nImiaw+CjjjgYnBIorwmA6UxaNefjYNZg=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];

+9 -1

pkgs/development/interpreters/clips/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "6.31";

     

       5
       5
        
         pname = "clips";

     

       6
       6
       +
       

     

       6
       7
        
         src = fetchurl {

     

       7
       8
        
           url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${

     

       8
       9
        
               builtins.replaceStrings [ "." ] [ "" ] version

     

       9
       10
        
             }.tar.gz";

     

       10
       11
        
           sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6";

     

       11
       12
        
         };

     

       13
       13
       +
       

     

       14
       14
       +
         postPatch = ''

     

       15
       15
       +
           substituteInPlace core/makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc'

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       12
       18
        
         makeFlags = [ "-C" "core" ];

     

       19
       19
       +
       

     

       13
       20
        
         installPhase = ''

     

       14
       21
        
           runHook preInstall

     

       15
       22
        
           install -D -t $out/bin core/clips

     

       16
       23
        
           runHook postInstall

     

       17
       24
        
         '';

     

       25
       25
       +
       

     

       18
       26
        
         meta = with lib; {

     

       19
       27
        
           description = "A Tool for Building Expert Systems";

     

       20
       28
        
           homepage = "http://www.clipsrules.net/";

     
···

       26
       34
        
           '';

     

       27
       35
        
           license = licenses.publicDomain;

     

       28
       36
        
           maintainers = [ maintainers.league ];

     

       29
       29
       -
           platforms = platforms.linux;

     

       37
       37
       +
           platforms = platforms.unix;

     

       30
       38
        
         };

     

       31
       39
        
       }

+2 -2

pkgs/development/libraries/babl/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "babl";

     

       13
       13
       -
         version = "0.1.84";

     

       13
       13
       +
         version = "0.1.86";

     

       14
       14
        
       

     

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

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       19
       19
       -
           sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo=";

     

       19
       19
       +
           sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+51

pkgs/development/libraries/boca/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       

     

       6
       6
       +
       , expat

     

       7
       7
       +
       , libcdio

     

       8
       8
       +
       , libcdio-paranoia

     

       9
       9
       +
       , libpulseaudio

     

       10
       10
       +
       , smooth

     

       11
       11
       +
       , uriparser

     

       12
       12
       +
       , zlib

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       stdenv.mkDerivation rec {

     

       16
       16
       +
         pname = "BoCA";

     

       17
       17
       +
         version = "1.0.3";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "enzo1982";

     

       21
       21
       +
           repo = "boca";

     

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

     

       23
       23
       +
           sha256 = "0x6pqd5cdag0l283lkq01qaqwyf1skxbncdwig8b2s742nbzjlz8";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           pkg-config

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           expat

     

       32
       32
       +
           libcdio

     

       33
       33
       +
           libcdio-paranoia

     

       34
       34
       +
           libpulseaudio

     

       35
       35
       +
           smooth

     

       36
       36
       +
           uriparser

     

       37
       37
       +
           zlib

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         makeFlags = [

     

       41
       41
       +
           "prefix=$(out)"

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         meta = with lib; {

     

       45
       45
       +
           description = "A component library used by the fre:ac audio converter";

     

       46
       46
       +
           license = licenses.gpl2Plus;

     

       47
       47
       +
           homepage = "https://github.com/enzo1982/boca";

     

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

     

       49
       49
       +
           platforms = platforms.linux;

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+1 -1

pkgs/development/libraries/boolstuff/default.nix

···

       17
       17
        
           homepage = "${baseurl}/boolstuff.html";

     

       18
       18
        
           license = "GPL";

     

       19
       19
        
           maintainers = [ lib.maintainers.marcweber ];

     

       20
       20
       -
           platforms = lib.platforms.linux;

     

       20
       20
       +
           platforms = lib.platforms.all;

     

       21
       21
        
         };

     

       22
       22
        
       }

+1 -1

pkgs/development/libraries/cpptest/default.nix

···

       13
       13
        
           description = "Simple C++ unit testing framework";

     

       14
       14
        
           maintainers = with maintainers; [ bosu ];

     

       15
       15
        
           license = lib.licenses.lgpl3;

     

       16
       16
       -
           platforms = with platforms; linux;

     

       16
       16
       +
           platforms = platforms.all;

     

       17
       17
        
         };

     

       18
       18
        
       }

+1 -1

pkgs/development/libraries/cpputest/default.nix

···

       12
       12
        
         meta = with lib; {

     

       13
       13
        
           homepage = "https://cpputest.github.io/";

     

       14
       14
        
           description = "Unit testing and mocking framework for C/C++";

     

       15
       15
       -
           platforms = platforms.linux ;

     

       15
       15
       +
           platforms = platforms.all;

     

       16
       16
        
           license = licenses.bsd3;

     

       17
       17
        
           maintainers = [ maintainers.juliendehos ];

     

       18
       18
        
         };

+2 -2

pkgs/development/libraries/gtk-layer-shell/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "gtk-layer-shell";

     

       16
       16
       -
         version = "0.5.2";

     

       16
       16
       +
         version = "0.6.0";

     

       17
       17
        
       

     

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

     

       19
       19
        
       

     
···

       21
       21
        
           owner = "wmww";

     

       22
       22
        
           repo = "gtk-layer-shell";

     

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

     

       24
       24
       -
           sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk=";

     

       24
       24
       +
           sha256 = "sha256-jLWXBoYcVoUSzw4OIYVM5iPvsmpy+Wg5TbDpo8cll80=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/gtksourceview/4.x.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "gtksourceview";

     

       7
       7
       -
         version = "4.8.0";

     

       7
       7
       +
         version = "4.8.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

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

     

       11
       11
       -
           sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880";

     

       11
       11
       +
           sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/libraries/libabigail/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "libabigail";

     

       13
       13
       -
         version = "1.8";

     

       13
       13
       +
         version = "1.8.2";

     

       14
       14
        
       

     

       15
       15
        
         outputs = [ "bin" "out" "dev" ];

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz";

     

       19
       19
       -
           sha256 = "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw";

     

       19
       19
       +
           sha256 = "sha256-hjR8nwqGZvJj/WP4w/5MT5yxvbPsQmDsuvEX0Tfol4c=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/libgxps/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "libgxps";

     

       7
       7
       -
         version = "0.3.1";

     

       7
       7
       +
         version = "0.3.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

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

     

       11
       11
       -
           sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs";

     

       11
       11
       +
           sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];

+43

pkgs/development/libraries/smooth/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       

     

       6
       6
       +
       , gtk3

     

       7
       7
       +
       , curl

     

       8
       8
       +
       , libxml2

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       stdenv.mkDerivation rec {

     

       12
       12
       +
         pname = "smooth";

     

       13
       13
       +
         version = "0.9.6";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "enzo1982";

     

       17
       17
       +
           repo = "smooth";

     

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

     

       19
       19
       +
           sha256 = "05j5gk6kz2089x8bcq2l0kjspfiiymxn69jcxl4dh9lw96blbadr";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           pkg-config

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         makeFlags = [

     

       27
       27
       +
           "prefix=$(out)"

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           gtk3

     

       32
       32
       +
           curl

     

       33
       33
       +
           libxml2

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         meta = with lib; {

     

       37
       37
       +
           description = "The smooth Class Library";

     

       38
       38
       +
           license = licenses.artistic2;

     

       39
       39
       +
           homepage = "http://www.smooth-project.org/";

     

       40
       40
       +
           maintainers = with maintainers; [ shamilton ];

     

       41
       41
       +
           platforms = platforms.linux;

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+2 -2

pkgs/development/python-modules/desktop-notifier/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "desktop-notifier";

     

       13
       13
       -
         version = "3.2.2";

     

       13
       13
       +
         version = "3.2.3";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "0b333594af6e54677f9620480226dbc88ec6dd7c004352de9268d01aa49467f4";

     

       17
       17
       +
           sha256 = "cf359450efc0944ac4db3106e50faa9d49dcef072307c3531e6af2c8a10cd523";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

+24 -12

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

···

       1
       1
       -
       { buildPythonPackage, lib, fetchPypi, file, stdenv }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , python

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , substituteAll

     

       7
       7
       +
       , file

     

       8
       8
       +
       , glibcLocales

     

       9
       9
       +
       }:

     

       2
       10
        
       

     

       3
       11
        
       buildPythonPackage rec {

     

       4
       12
        
         pname = "python-magic";

     

       5
       13
        
         version = "0.4.22";

     

       6
       14
        
       

     

       7
       7
       -
         src = fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62";

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "ahupp";

     

       17
       17
       +
           repo = "python-magic";

     

       18
       18
       +
           rev = version;

     

       19
       19
       +
           sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6";

     

       10
       20
        
         };

     

       11
       21
        
       

     

       12
       12
       -
         postPatch = ''

     

       13
       13
       -
           substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"

     

       14
       14
       -
         '';

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           (substituteAll {

     

       24
       24
       +
             src = ./libmagic-path.patch;

     

       25
       25
       +
             libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       26
       26
       +
           })

     

       27
       27
       +
         ];

     

       15
       28
        
       

     

       16
       16
       -
         doCheck = false;

     

       29
       29
       +
         checkInputs = [ glibcLocales ];

     

       17
       30
        
       

     

       18
       18
       -
         # TODO: tests are failing

     

       19
       19
       -
         #checkPhase = ''

     

       20
       20
       -
         #  ${python}/bin/${python.executable} ./test.py

     

       21
       21
       -
         #'';

     

       31
       31
       +
         checkPhase = ''

     

       32
       32
       +
           LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py

     

       33
       33
       +
         '';

     

       22
       34
        
       

     

       23
       35
        
         meta = {

     

       24
       36
        
           description = "A python interface to the libmagic file type identification library";

+17

pkgs/development/python-modules/python-magic/libmagic-path.patch

···

       1
       1
       +
       diff --git a/magic/loader.py b/magic/loader.py

     

       2
       2
       +
       index 6b2bfcb..69778af 100644

     

       3
       3
       +
       --- a/magic/loader.py

     

       4
       4
       +
       +++ b/magic/loader.py

     

       5
       5
       +
       @@ -5,11 +5,7 @@ import glob

     

       6
       6
       +
        def load_lib():

     

       7
       7
       +
          libmagic = None

     

       8
       8
       +
          # Let's try to find magic or magic1

     

       9
       9
       +
       -  dll = ctypes.util.find_library('magic') \

     

       10
       10
       +
       -        or ctypes.util.find_library('magic1') \

     

       11
       11
       +
       -        or ctypes.util.find_library('cygmagic-1') \

     

       12
       12
       +
       -        or ctypes.util.find_library('libmagic-1') \

     

       13
       13
       +
       -        or ctypes.util.find_library('msys-magic-1')  # for MSYS2

     

       14
       14
       +
       +  dll = '@libmagic@'

     

       15
       15
       +
        

     

       16
       16
       +
          # necessary because find_library returns None if it doesn't find the library

     

       17
       17
       +
          if dll:

+1 -1

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

···

       15
       15
        
           description = "Directory event monitoring daemon";

     

       16
       16
        
           homepage = "https://www.gnu.org.ua/software/direvent/";

     

       17
       17
        
           license = licenses.gpl3Plus;

     

       18
       18
       -
           platforms = platforms.linux;

     

       18
       18
       +
           platforms = platforms.unix;

     

       19
       19
        
           maintainers = with maintainers; [ puffnfresh ];

     

       20
       20
        
         };

     

       21
       21
        
       }

+19 -16

pkgs/games/warsow/engine.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype

     

       1
       1
       +
       { stdenv, lib, substituteAll, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype

     

       2
       2
        
       , libjpeg, libpng, SDL2, libGL, openal, zlib

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       let

     

       6
       6
       -
         # The game loads all those via dlopen().

     

       7
       7
       -
         libs = lib.mapAttrs (name: x: lib.getLib x) {

     

       8
       8
       -
           inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype;

     

       9
       9
       -
         };

     

       10
       10
       -
       

     

       11
       11
       -
       in stdenv.mkDerivation (libs // rec {

     

       12
       12
       -
         name = "warsow-engine-${version}";

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         pname = "warsow-engine";

     

       13
       7
        
         version = "2.1.0";

     

       14
       8
        
       

     

       15
       9
        
         src = fetchurl {

     
···

       17
       11
        
           sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r";

     

       18
       12
        
         };

     

       19
       13
        
       

     

       14
       14
       +
         patches = [

     

       15
       15
       +
           (substituteAll {

     

       16
       16
       +
             src = ./libpath.patch;

     

       17
       17
       +
             inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype;

     

       18
       18
       +
           })

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       20
       21
        
         nativeBuildInputs = [ cmake ];

     

       21
       22
        
       

     

       22
       23
        
         buildInputs = [

     
···

       24
       25
        
           libpng

     

       25
       26
        
         ];

     

       26
       27
        
       

     

       27
       27
       -
         patches = [ ./libpath.patch ];

     

       28
       28
       -
         postPatch = ''

     

       28
       28
       +
         cmakeFlags = [ "-DQFUSION_GAME=Warsow" ];

     

       29
       29
       +
       

     

       30
       30
       +
         preConfigure = ''

     

       29
       31
        
           cd source/source

     

       30
       30
       -
           substituteAllInPlace gameshared/q_arch.h

     

       31
       32
        
         '';

     

       32
       33
        
       

     

       33
       33
       -
         cmakeFlags = [ "-DQFUSION_GAME=Warsow" ];

     

       34
       34
       +
         installPhase = ''

     

       35
       35
       +
           runHook preInstall

     

       34
       36
        
       

     

       35
       35
       -
         installPhase = ''

     

       36
       37
        
           mkdir -p $out/lib

     

       37
       38
        
           cp -r libs $out/lib/warsow

     

       38
       39
        
           for i in warsow.* wsw_server.* wswtv_server.*; do

     

       39
       40
        
             install -Dm755 "$i" "$out/bin/''${i%.*}"

     

       40
       41
        
           done

     

       42
       42
       +
       

     

       43
       43
       +
           runHook postInstall

     

       41
       44
        
         '';

     

       42
       45
        
       

     

       43
       46
        
         meta = with lib; {

     

       44
       47
        
           description = "Multiplayer FPS game designed for competitive gaming (engine only)";

     

       45
       48
        
           homepage = "http://www.warsow.net";

     

       46
       46
       -
           license = licenses.gpl2;

     

       49
       49
       +
           license = licenses.gpl2Plus;

     

       47
       50
        
           maintainers = with maintainers; [ astsmtl abbradar ];

     

       48
       51
        
           platforms = platforms.linux;

     

       49
       52
        
           broken = stdenv.isAarch64;

     

       50
       53
        
         };

     

       51
       51
       -
       })

     

       54
       54
       +
       }

+1 -1

pkgs/misc/emulators/libdsk/default.nix

···

       14
       14
        
           homepage = "http://www.seasip.info/Unix/LibDsk/";

     

       15
       15
        
           license = licenses.gpl2Plus;

     

       16
       16
        
           maintainers = [ ];

     

       17
       17
       -
           platforms = platforms.linux;

     

       17
       17
       +
           platforms = platforms.unix;

     

       18
       18
        
         };

     

       19
       19
        
       }

+1 -1

pkgs/misc/emulators/mednafen/server.nix

···

       16
       16
        
           homepage = "https://mednafen.github.io/";

     

       17
       17
        
           license = licenses.gpl2;

     

       18
       18
        
           maintainers = with maintainers; [ AndersonTorres ];

     

       19
       19
       -
           platforms = platforms.linux;

     

       19
       19
       +
           platforms = platforms.unix;

     

       20
       20
        
         };

     

       21
       21
        
       }

+2 -2

pkgs/servers/minio/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "minio";

     

       5
       5
       -
         version = "2021-02-24T18-44-45Z";

     

       5
       5
       +
         version = "2021-03-01T04-20-55Z";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "minio";

     

       9
       9
        
           repo = "minio";

     

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

     

       11
       11
       -
           sha256 = "sha256-htrIRZXpr3V7GoeldeULndSfJNMmLKPVOimg3l+UisA=";

     

       11
       11
       +
           sha256 = "sha256-VTmnpZzidongzv6BzPY01qggai0w+ztGL3grDv6VGD4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-m2Nv3OcPq/qc+4Cu/JUut59fZTDZwJn9gyG4jQ5n6Pg=";

+53 -12

pkgs/shells/fish/default.nix

···

       17
       17
        
       , python3

     

       18
       18
        
       , cmake

     

       19
       19
        
       , fishPlugins

     

       20
       20
       +
       , procps

     

       20
       21
        
       

     

       21
       22
        
       , runCommand

     

       22
       23
        
       , writeText

     
···

       130
       131
        
       

     

       131
       132
        
         fish = stdenv.mkDerivation rec {

     

       132
       133
        
           pname = "fish";

     

       133
       133
       -
           version = "3.1.2";

     

       134
       134
       +
           version = "3.2.0";

     

       134
       135
        
       

     

       135
       136
        
           src = fetchurl {

     

       136
       137
        
             # There are differences between the release tarball and the tarball GitHub

     
···

       139
       140
        
             # the shell's actual version (and what it displays when running `fish

     

       140
       141
        
             # --version`), as well as the local documentation for all builtins (and

     

       141
       142
        
             # maybe other things).

     

       142
       142
       -
             url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";

     

       143
       143
       -
             sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm";

     

       143
       143
       +
             url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";

     

       144
       144
       +
             sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE=";

     

       144
       145
        
           };

     

       145
       146
        
       

     

       146
       146
       -
           # We don't have access to the codesign executable, so we patch this out.

     

       147
       147
       -
           # For more information, see: https://github.com/fish-shell/fish-shell/issues/6952

     

       148
       148
       -
           patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff;

     

       147
       147
       +
           # Fix FHS paths in tests

     

       148
       148
       +
           postPatch = ''

     

       149
       149
       +
             # src/fish_tests.cpp

     

       150
       150
       +
             sed -i 's|/bin/ls|${coreutils}/bin/ls|' src/fish_tests.cpp

     

       151
       151
       +
             sed -i 's|L"/usr"|L"/nix"|' src/fish_tests.cpp

     

       152
       152
       +
             sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp

     

       153
       153
       +
             sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp

     

       154
       154
       +
             sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp

     

       155
       155
       +
       

     

       156
       156
       +
             # tests/checks/cd.fish

     

       157
       157
       +
             sed -i 's|/bin/pwd|${coreutils}/bin/pwd|' tests/checks/cd.fish

     

       158
       158
       +
       

     

       159
       159
       +
             # tests/checks/redirect.fish

     

       160
       160
       +
             sed -i 's|/bin/echo|${coreutils}/bin/echo|' tests/checks/redirect.fish

     

       161
       161
       +
       

     

       162
       162
       +
             # tests/checks/vars_as_commands.fish

     

       163
       163
       +
             sed -i 's|/usr/bin|${coreutils}/bin|' tests/checks/vars_as_commands.fish

     

       164
       164
       +
       

     

       165
       165
       +
             # tests/checks/jobs.fish

     

       166
       166
       +
             sed -i 's|ps -o stat|${procps}/bin/ps -o stat|' tests/checks/jobs.fish

     

       167
       167
       +
             sed -i 's|/bin/echo|${coreutils}/bin/echo|' tests/checks/jobs.fish

     

       168
       168
       +
       

     

       169
       169
       +
             # tests/checks/job-control-noninteractive.fish

     

       170
       170
       +
             sed -i 's|/bin/echo|${coreutils}/bin/echo|' tests/checks/job-control-noninteractive.fish

     

       171
       171
       +
       

     

       172
       172
       +
             # tests/checks/complete.fish

     

       173
       173
       +
             sed -i 's|/bin/ls|${coreutils}/bin/ls|' tests/checks/complete.fish

     

       174
       174
       +
           '' + lib.optionalString stdenv.isDarwin ''

     

       175
       175
       +
             # Tests use pkill/pgrep which are currently not built on Darwin

     

       176
       176
       +
             # See https://github.com/NixOS/nixpkgs/pull/103180

     

       177
       177
       +
             rm tests/pexpects/exit.py

     

       178
       178
       +
             rm tests/pexpects/job_summary.py

     

       179
       179
       +
             rm tests/pexpects/signals.py

     

       180
       180
       +
           '';

     

       149
       181
        
       

     

       150
       182
        
           nativeBuildInputs = [

     

       151
       183
        
             cmake

     
···

       159
       191
        
       

     

       160
       192
        
           cmakeFlags = [

     

       161
       193
        
             "-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish"

     

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

     

       195
       195
       +
             "-DMAC_CODESIGN_ID=OFF"

     

       162
       196
        
           ];

     

       163
       197
        
       

     

       164
       198
        
           preConfigure = ''

     
···

       176
       210
        
             gettext

     

       177
       211
        
           ] ++ lib.optional (!stdenv.isDarwin) man-db;

     

       178
       212
        
       

     

       213
       213
       +
           doCheck = true;

     

       214
       214
       +
       

     

       215
       215
       +
           checkInputs = [

     

       216
       216
       +
             coreutils

     

       217
       217
       +
             (python3.withPackages(ps: [ps.pexpect]))

     

       218
       218
       +
             procps

     

       219
       219
       +
           ];

     

       220
       220
       +
       

     

       221
       221
       +
           checkPhase = ''

     

       222
       222
       +
             make test

     

       223
       223
       +
           '';

     

       224
       224
       +
       

     

       179
       225
        
           postInstall = with lib; ''

     

       180
       226
        
             sed -r "s|command grep|command ${gnugrep}/bin/grep|" \

     

       181
       227
        
                 -i "$out/share/fish/functions/grep.fish"

     

       182
       182
       -
             sed -i "s|which |${which}/bin/which |"               \

     

       183
       183
       -
                    "$out/share/fish/functions/type.fish"

     

       184
       228
        
             sed -e "s|\|cut|\|${coreutils}/bin/cut|"             \

     

       185
       229
        
                 -i "$out/share/fish/functions/fish_prompt.fish"

     

       186
       186
       -
             sed -e "s|gettext |${gettext}/bin/gettext |"         \

     

       187
       187
       -
                 -e "s|which |${which}/bin/which |"               \

     

       188
       188
       -
                 -i "$out/share/fish/functions/_.fish"

     

       189
       230
        
             sed -e "s|uname|${coreutils}/bin/uname|"             \

     

       190
       231
        
                 -i "$out/share/fish/functions/__fish_pwd.fish"   \

     

       191
       232
        
                    "$out/share/fish/functions/prompt_pwd.fish"

     
···

       255
       296
        
                   # if we don't set `delete=False`, the file will get cleaned up

     

       256
       297
        
                   # automatically (leading the test to fail because there's no

     

       257
       298
        
                   # tempfile to check)

     

       258
       258
       -
                   sed -e "s@, mode='w'@, mode='w', delete=False@" -i webconfig.py

     

       299
       299
       +
                   sed -e 's@, mode="w"@, mode="w", delete=False@' -i webconfig.py

     

       259
       300
        
       

     

       260
       301
        
                   # we delete everything after the fileurl is assigned

     

       261
       302
        
                   sed -e '/fileurl =/q' -i webconfig.py

-12

pkgs/shells/fish/dont-codesign-on-mac.diff

···

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

     

       2
       2
       -
       index 7d220a032..786b60e6e 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target)

     

       6
       6
       -
        # Define a function to link dependencies.

     

       7
       7
       -
        FUNCTION(FISH_LINK_DEPS_AND_SIGN target)

     

       8
       8
       -
          TARGET_LINK_LIBRARIES(${target} fishlib)

     

       9
       9
       -
       -  CODESIGN_ON_MAC(${target})

     

       10
       10
       -
        ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN)

     

       11
       11
       -
        

     

       12
       12
       -
        # Define libfish.a.

+2 -2

pkgs/tools/graphics/gmic/default.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "gmic";

     

       18
       18
       -
         version = "2.9.5";

     

       18
       18
       +
         version = "2.9.6";

     

       19
       19
        
       

     

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

     

       21
       21
        
       

     

       22
       22
        
         src = fetchurl {

     

       23
       23
        
           url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";

     

       24
       24
       -
           sha256 = "sha256-KV/Ti6mPW+FASjug6q8Qfgra8L/TIyl/Y6JwANzQreE=";

     

       24
       24
       +
           sha256 = "sha256-0i/oUVrxbc0FDQmgvHEn7Cn0eVznMqDGw+r4OTVrwRo=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+1 -1

pkgs/tools/inputmethods/anthy/default.nix

···

       8
       8
        
           homepage    = "https://anthy.osdn.jp/";

     

       9
       9
        
           license     = licenses.gpl2Plus;

     

       10
       10
        
           maintainers = with maintainers; [ ericsagnes ];

     

       11
       11
       -
           platforms   = platforms.linux;

     

       11
       11
       +
           platforms   = platforms.unix;

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

+2 -2

pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "ibus-bamboo";

     

       14
       14
       -
         version = "0.6.8";

     

       14
       14
       +
         version = "0.6.9";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "BambooEngine";

     

       18
       18
        
           repo = pname;

     

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

     

       20
       20
       -
           sha256 = "17zgxqlsjkqyjywynqzmymw310aypcsjdrwnc7hx7v7xwal8iwjk";

     

       20
       20
       +
           sha256 = "sha256-7UXURvZX5UrpLHFYgBnuTX/sKQkubnBlvkSD/WBa4ZU=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+1 -1

pkgs/tools/misc/agedu/default.nix

···

       32
       32
        
           homepage = "https://www.chiark.greenend.org.uk/~sgtatham/agedu/";

     

       33
       33
        
           license = licenses.mit;

     

       34
       34
        
           maintainers = with maintainers; [ symphorien ];

     

       35
       35
       -
           platforms = platforms.linux;

     

       35
       35
       +
           platforms = platforms.unix;

     

       36
       36
        
         };

     

       37
       37
        
       }

+2 -2

pkgs/tools/misc/pcb2gcode/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "pcb2gcode";

     

       16
       16
       -
         version = "2.2.2";

     

       16
       16
       +
         version = "2.2.3";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pcb2gcode";

     

       20
       20
        
           repo = "pcb2gcode";

     

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

     

       22
       22
       -
           sha256 = "sha256-GSLWpLp/InAxVolKmBIjljpe3ZzmS/87TWKwzax5SkY=";

     

       22
       22
       +
           sha256 = "sha256-CIhhwUsnX+Wx4hLNE8uQf17QbDDm4vCbv/XZVuCrWdw=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

+7 -4

pkgs/tools/misc/vimv/default.nix

···

       1
       1
       -
       { lib, stdenv, bash, fetchFromGitHub }:

     

       2
       2
       -
       stdenv.mkDerivation {

     

       1
       1
       +
       { lib, stdenvNoCC, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenvNoCC.mkDerivation {

     

       3
       4
        
         pname = "vimv";

     

       4
       5
        
         version = "unstable-2019-10-31";

     

       6
       6
       +
       

     

       5
       7
        
         src = fetchFromGitHub {

     

       6
       8
        
           owner = "thameera";

     

       7
       9
        
           repo = "vimv";

     

       8
       10
        
           rev = "4152496c1946f68a13c648fb7e583ef23dac4eb8";

     

       9
       11
        
           sha256 = "1fsrfx2gs6bqx7wk7pgcji2i2x4alqpsi66aif4kqvnpqfhcfzjd";

     

       10
       12
        
         };

     

       11
       11
       -
         phases = [ "installPhase" ];

     

       13
       13
       +
       

     

       12
       14
        
         installPhase = ''

     

       13
       15
        
           install -d $out/bin

     

       14
       16
        
           install $src/vimv $out/bin/vimv

     

       15
       17
        
           patchShebangs $out/bin/vimv

     

       16
       18
        
         '';

     

       19
       19
       +
       

     

       17
       20
        
         meta = with lib; {

     

       18
       21
        
           homepage = "https://github.com/thameera/vimv";

     

       19
       22
        
           description = "Batch-rename files using Vim";

     

       20
       23
        
           license = licenses.mit;

     

       21
       21
       -
           platforms = platforms.linux;

     

       24
       24
       +
           platforms = platforms.all;

     

       22
       25
        
           maintainers = [ maintainers.kmein ];

     

       23
       26
        
         };

     

       24
       27
        
       }

+2 -2

pkgs/tools/networking/dnsproxy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "dnsproxy";

     

       5
       5
       -
         version = "0.35.1";

     

       5
       5
       +
         version = "0.35.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "AdguardTeam";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-+k8dGVYyCY+CI8+8OPBqoICu0KO2eM+6Hy8E+KyOqPs=";

     

       11
       11
       +
           sha256 = "sha256-XOTHvI80WMn5j52+N/bR/NfaPX9v6cRB2VCVWJ6fJw8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

+1 -1

pkgs/tools/networking/pcapfix/default.nix

···

       15
       15
        
           description = "Repair your broken pcap and pcapng files";

     

       16
       16
        
           license = licenses.gpl3;

     

       17
       17
        
           maintainers = [ maintainers.ehmry ];

     

       18
       18
       -
           platforms = platforms.linux;

     

       18
       18
       +
           platforms = platforms.all;

     

       19
       19
        
         };

     

       20
       20
        
       }

+2 -2

pkgs/tools/networking/stunnel/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "stunnel";

     

       5
       5
       -
         version = "5.56";

     

       5
       5
       +
         version = "5.58";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url    = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "08kb4gi9fzqngrczykvba6xhaxhq9m4wmdbhxvgrva5rasrvz13k";

     

       9
       9
       +
           sha256 = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79";

     

       10
       10
        
           # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",

     

       11
       11
        
           # not the output of `nix-prefetch-url`

     

       12
       12
        
         };

+2 -2

pkgs/tools/package-management/libdnf/default.nix

···

       3
       3
        
       

     

       4
       4
        
       gcc9Stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "libdnf";

     

       6
       6
       -
         version = "0.58.0";

     

       6
       6
       +
         version = "0.60.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "rpm-software-management";

     

       10
       10
        
           repo = pname;

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l";

     

       12
       12
       +
           sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];

+1 -1

pkgs/tools/security/aespipe/default.nix

···

       24
       24
        
           homepage = "http://loop-aes.sourceforge.net/aespipe.README";

     

       25
       25
        
           license = licenses.gpl2;

     

       26
       26
        
           maintainers = [ maintainers.goibhniu ];

     

       27
       27
       -
           platforms = platforms.linux;

     

       27
       27
       +
           platforms = platforms.unix;

     

       28
       28
        
         };

     

       29
       29
        
       }

+2 -2

pkgs/tools/security/aide/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "aide";

     

       5
       5
       -
         version = "0.17.1";

     

       5
       5
       +
         version = "0.17.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-pAHJUZOPEWnOrshozjWUc26JxciBV4wmPYqCSgawAC0=";

     

       9
       9
       +
           sha256 = "sha256-ousYg8r6rQVvvkPuHorgn9NsqjCgvI7f6l1HvWfEZPg=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ];

+3

pkgs/tools/security/hashdeep/default.nix

···

       17
       17
        
           description = "A set of cross-platform tools to compute hashes";

     

       18
       18
        
           homepage = "https://github.com/jessek/hashdeep";

     

       19
       19
        
           license = licenses.gpl2;

     

       20
       20
       +
           # Build fails on Darwin:

     

       21
       21
       +
           # > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]

     

       22
       22
       +
           # >     void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }

     

       20
       23
        
           platforms = with platforms; linux ++ freebsd ++ openbsd;

     

       21
       24
        
           maintainers = [ maintainers.karantan ];

     

       22
       25
        
         };

+1 -1

pkgs/tools/system/loadwatch/default.nix

···

       15
       15
        
           description = "Run a program using only idle cycles";

     

       16
       16
        
           license = licenses.gpl2;

     

       17
       17
        
           maintainers = with maintainers; [ woffs ];

     

       18
       18
       -
           platforms = platforms.linux;

     

       18
       18
       +
           platforms = platforms.all;

     

       19
       19
        
         };

     

       20
       20
        
       }

+6 -5

pkgs/tools/text/cconv/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, autoreconfHook }:

     

       2
       2
       -
       let version = "0.6.3"; in

     

       3
       3
       -
         stdenv.mkDerivation {

     

       1
       1
       +
       { lib, stdenv, fetchurl, autoreconfHook, libiconv }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cconv";

     

       5
       5
       -
         inherit version;

     

       5
       5
       +
         version = "0.6.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ autoreconfHook ];

     

       13
       13
       +
         buildInputs = [ libiconv ];

     

       13
       14
        
       

     

       14
       15
        
         meta = with lib; {

     

       15
       16
        
           description = "A iconv based simplified-traditional chinese conversion tool";

     

       16
       17
        
           homepage = "https://github.com/xiaoyjy/cconv";

     

       17
       18
        
           license = licenses.mit;

     

       18
       18
       -
           platforms = platforms.linux;

     

       19
       19
       +
           platforms = platforms.all;

     

       19
       20
        
           maintainers = [ maintainers.redfish64 ];

     

       20
       21
        
         };

     

       21
       22
        
       }

+3 -1

pkgs/tools/text/dadadodo/default.nix

···

       9
       9
        
           sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

     

       13
       13
       +
       

     

       12
       14
        
         installPhase = ''

     

       13
       15
        
           mkdir -p $out/bin

     

       14
       16
        
           cp dadadodo $out/bin

     
···

       20
       22
        
           description = "Markov chain-based text generator";

     

       21
       23
        
           homepage = "http://www.jwz.org/dadadodo";

     

       22
       24
        
           maintainers = with maintainers; [ pSub ];

     

       23
       23
       -
           platforms = with platforms; linux;

     

       25
       25
       +
           platforms = platforms.all;

     

       24
       26
        
         };

     

       25
       27
        
       }

+1

pkgs/tools/text/dos2unix/default.nix

···

       18
       18
        
           changelog = "https://sourceforge.net/p/dos2unix/dos2unix/ci/dos2unix-${version}/tree/dos2unix/NEWS.txt?format=raw";

     

       19
       19
        
           license = licenses.bsd2;

     

       20
       20
        
           maintainers = with maintainers; [ c0bw3b ];

     

       21
       21
       +
           platforms = platforms.all;

     

       21
       22
        
         };

     

       22
       23
        
       }

+1 -1

pkgs/tools/text/fanficfare/default.nix

···

       22
       22
        
           description = "Tool for making eBooks from fanfiction web sites";

     

       23
       23
        
           homepage = "https://github.com/JimmXinu/FanFicFare";

     

       24
       24
        
           license = licenses.gpl3;

     

       25
       25
       -
           platforms = platforms.linux;

     

       25
       25
       +
           platforms = platforms.unix;

     

       26
       26
        
           maintainers = with maintainers; [ dwarfmaster ];

     

       27
       27
        
         };

     

       28
       28
        
       }

+1 -1

pkgs/tools/text/podiff/default.nix

···

       20
       20
        
           homepage = "http://puszcza.gnu.org.ua/software/podiff";

     

       21
       21
        
           license = licenses.gpl3Plus;

     

       22
       22
        
           maintainers = [ maintainers.goibhniu ];

     

       23
       23
       -
           platforms = platforms.linux;

     

       23
       23
       +
           platforms = platforms.unix;

     

       24
       24
        
         };

     

       25
       25
        
       }

+6

pkgs/top-level/all-packages.nix

···

       1721
       1721
        
       

     

       1722
       1722
        
         bmake = callPackage ../development/tools/build-managers/bmake { };

     

       1723
       1723
        
       

     

       1724
       1724
       +
         boca = callPackage ../development/libraries/boca { };

     

       1725
       1725
       +
       

     

       1724
       1726
        
         bochs = callPackage ../applications/virtualization/bochs { };

     

       1725
       1727
        
       

     

       1726
       1728
        
         bubblewrap = callPackage ../tools/admin/bubblewrap { };

     
···

       4375
       4377
        
         franz = callPackage ../applications/networking/instant-messengers/franz {

     

       4376
       4378
        
           mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };

     

       4377
       4379
        
         };

     

       4380
       4380
       +
       

     

       4381
       4381
       +
         freac = callPackage ../applications/audio/freac { };

     

       4378
       4382
        
       

     

       4379
       4383
        
         freedroid = callPackage ../games/freedroid { };

     

       4380
       4384
        
       

     
···

       23021
       23025
        
         spectmorph = callPackage ../applications/audio/spectmorph { };

     

       23022
       23026
        
       

     

       23023
       23027
        
         smallwm = callPackage ../applications/window-managers/smallwm { };

     

       23028
       23028
       +
       

     

       23029
       23029
       +
         smooth = callPackage ../development/libraries/smooth { };

     

       23024
       23030
        
       

     

       23025
       23031
        
         smos = callPackage ../applications/misc/smos { };

     

       23026
       23032

+21 -17

pkgs/top-level/php-packages.nix

···

       268
       268
        
               buildInputs = [ libxml2 ];

     

       269
       269
        
               configureFlags = [ "--enable-dom" ]

     

       270
       270
        
                 # Required to build on darwin.

     

       271
       271
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       271
       271
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       272
       272
        
             { name = "enchant";

     

       273
       273
        
               buildInputs = [ enchant1 ];

     

       274
       274
        
               configureFlags = [ "--with-enchant=${enchant1}" ];

     
···

       331
       331
        
             # interbase (7.3, 7.2)

     

       332
       332
        
             { name = "intl";

     

       333
       333
        
               buildInputs = [ icu64 ];

     

       334
       334
       -
               patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch {

     

       335
       335
       -
                 url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";

     

       336
       336
       -
                 sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";

     

       337
       337
       -
               });

     

       334
       334
       +
               patches = lib.optionals (lib.versionOlder php.version "7.4") [

     

       335
       335
       +
                 (fetchpatch {

     

       336
       336
       +
                   url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";

     

       337
       337
       +
                   sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";

     

       338
       338
       +
                 })

     

       339
       339
       +
               ];

     

       338
       340
        
             }

     

       339
       341
        
             { name = "json"; enable = lib.versionOlder php.version "8.0"; }

     

       340
       342
        
             { name = "ldap";

     
···

       344
       346
        
                 "LDAP_DIR=${openldap.dev}"

     

       345
       347
        
                 "LDAP_INCDIR=${openldap.dev}/include"

     

       346
       348
        
                 "LDAP_LIBDIR=${openldap.out}/lib"

     

       347
       347
       -
               ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}";

     

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

     

       350
       350
       +
                 "--with-ldap-sasl=${cyrus_sasl.dev}"

     

       351
       351
       +
               ];

     

       348
       352
        
               doCheck = false; }

     

       349
       353
        
             { name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [

     

       350
       354
        
                 pcre'

     
···

       374
       378
        
                      +----------------------------------------------------------------------+

     

       375
       379
        
                      | Copyright (c) The PHP Group                                          |

     

       376
       380
        
                 '')

     

       377
       377
       -
               ] ++ lib.optional (lib.versionOlder php.version "7.4.8") [

     

       381
       381
       +
               ] ++ lib.optionals (lib.versionOlder php.version "7.4.8") [

     

       378
       382
        
                 (pkgs.writeText "mysqlnd_fix_compression.patch" ''

     

       379
       383
        
                   --- a/ext/mysqlnd/mysqlnd.h

     

       380
       384
        
                   +++ b/ext/mysqlnd/mysqlnd.h

     
···

       398
       402
        
               buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [

     

       399
       403
        
                 valgrind.dev

     

       400
       404
        
               ];

     

       401
       401
       -
               patches = [] ++ lib.optional (lib.versionOlder php.version "7.4") [

     

       405
       405
       +
               patches = [] ++ lib.optionals (lib.versionOlder php.version "7.4") [

     

       402
       406
        
                 (pkgs.writeText "zend_file_cache_config.patch" ''

     

       403
       407
        
                   --- a/ext/opcache/zend_file_cache.c

     

       404
       408
        
                   +++ b/ext/opcache/zend_file_cache.c

     
···

       468
       472
        
               buildInputs = [ libxml2 pcre' ];

     

       469
       473
        
               configureFlags = [ "--enable-simplexml" ]

     

       470
       474
        
                 # Required to build on darwin.

     

       471
       471
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       475
       475
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       472
       476
        
             { name = "snmp";

     

       473
       477
        
               buildInputs = [ net-snmp openssl ];

     

       474
       478
        
               configureFlags = [ "--with-snmp" ];

     
···

       479
       483
        
               buildInputs = [ libxml2 ];

     

       480
       484
        
               configureFlags = [ "--enable-soap" ]

     

       481
       485
        
                 # Required to build on darwin.

     

       482
       482
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];

     

       486
       486
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];

     

       483
       487
        
               doCheck = false; }

     

       484
       488
        
             { name = "sockets"; doCheck = false; }

     

       485
       489
        
             { name = "sodium"; buildInputs = [ libsodium ]; }

     
···

       499
       503
        
               buildInputs = [ libxml2 ];

     

       500
       504
        
               configureFlags = [ "--enable-xml" ]

     

       501
       505
        
                 # Required to build on darwin.

     

       502
       502
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];

     

       506
       506
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];

     

       503
       507
        
               doCheck = false; }

     

       504
       508
        
             { name = "xmlreader";

     

       505
       509
        
               buildInputs = [ libxml2 ];

     
···

       507
       511
        
               NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ];

     

       508
       512
        
               configureFlags = [ "--enable-xmlreader" ]

     

       509
       513
        
                 # Required to build on darwin.

     

       510
       510
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       514
       514
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       511
       515
        
             { name = "xmlrpc";

     

       512
       516
        
               buildInputs = [ libxml2 libiconv ];

     

       513
       517
        
               # xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc

     

       514
       518
        
               enable = lib.versionOlder php.version "8.0";

     

       515
       519
        
               configureFlags = [ "--with-xmlrpc" ]

     

       516
       520
        
                 # Required to build on darwin.

     

       517
       517
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       521
       521
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       518
       522
        
             { name = "xmlwriter";

     

       519
       523
        
               buildInputs = [ libxml2 ];

     

       520
       524
        
               configureFlags = [ "--enable-xmlwriter" ]

     

       521
       525
        
                 # Required to build on darwin.

     

       522
       522
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       526
       526
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     

       523
       527
        
             { name = "xsl";

     

       524
       528
        
               buildInputs = [ libxslt libxml2 ];

     

       525
       529
        
               doCheck = lib.versionOlder php.version "8.0";

     
···

       528
       532
        
             { name = "zip";

     

       529
       533
        
               buildInputs = [ libzip pcre' ];

     

       530
       534
        
               configureFlags = [ "--with-zip" ]

     

       531
       531
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]

     

       532
       532
       -
                 ++ lib.optional (lib.versionOlder php.version "7.3") [ "--with-libzip" ];

     

       535
       535
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]

     

       536
       536
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.3") [ "--with-libzip" ];

     

       533
       537
        
               doCheck = false; }

     

       534
       538
        
             { name = "zlib";

     

       535
       539
        
               buildInputs = [ zlib ];

     
···

       538
       542
        
                 ../development/interpreters/php/zlib-darwin-tests.patch

     

       539
       543
        
               ];

     

       540
       544
        
               configureFlags = [ "--with-zlib" ]

     

       541
       541
       -
                 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]; }

     

       545
       545
       +
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]; }

     

       542
       546
        
           ];

     

       543
       547
        
       

     

       544
       548
        
           # Convert the list of attrs: