commit e930b19aca9d8ec610d17a73cd9c43079e3c121d · pyrox.dev/nixpkgs

-6

maintainers/maintainer-list.nix

···

       11068
       11068
        
           github = "johnpyp";

     

       11069
       11069
        
           githubId = 20625636;

     

       11070
       11070
        
         };

     

       11071
       11071
       -
         johnramsden = {

     

       11072
       11072
       -
           email = "johnramsden@riseup.net";

     

       11073
       11073
       -
           github = "johnramsden";

     

       11074
       11074
       -
           githubId = 8735102;

     

       11075
       11075
       -
           name = "John Ramsden";

     

       11076
       11076
       -
         };

     

       11077
       11071
        
         johnrichardrinehart = {

     

       11078
       11072
        
           email = "johnrichardrinehart@gmail.com";

     

       11079
       11073
        
           github = "johnrichardrinehart";

+4 -1

nixos/modules/programs/tmux.nix

···

       8
       8
        
       let

     

       9
       9
        
         inherit (lib)

     

       10
       10
        
           mkOption

     

       11
       11
       +
           mkPackageOption

     

       11
       12
        
           mkIf

     

       12
       13
        
           types

     

       13
       14
        
           optionalString

     
···

       86
       87
        
               description = "Whenever to configure {command}`tmux` system-wide.";

     

       87
       88
        
               relatedPackages = [ "tmux" ];

     

       88
       89
        
             };

     

       90
       90
       +
       

     

       91
       91
       +
             package = mkPackageOption pkgs "tmux" { };

     

       89
       92
        
       

     

       90
       93
        
             aggressiveResize = mkOption {

     

       91
       94
        
               default = false;

     
···

       224
       227
        
           environment = {

     

       225
       228
        
             etc."tmux.conf".text = tmuxConf;

     

       226
       229
        
       

     

       227
       227
       -
             systemPackages = [ pkgs.tmux ] ++ cfg.plugins;

     

       230
       230
       +
             systemPackages = [ cfg.package ] ++ cfg.plugins;

     

       228
       231
        
       

     

       229
       232
        
             variables = {

     

       230
       233
        
               TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}'';

+2 -2

pkgs/applications/backup/timeshift/unwrapped.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "timeshift";

     

       21
       21
       -
         version = "24.06.5";

     

       21
       21
       +
         version = "24.06.6";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "linuxmint";

     

       25
       25
        
           repo = "timeshift";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           hash = "sha256-2qNLgUZLMcfoemdLvvjdkR7Ln5loSKGqbd402y5Id8k=";

     

       27
       27
       +
           hash = "sha256-umMekxP9bvV01KzfIh2Zxa9Xb+tR5x+tG9dOnBIOkjY=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         patches = [

+8 -4

pkgs/by-name/bu/buck2/hashes.json

···

       1
       1
        
       { "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh"

     

       2
       2
        
       , "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs="

     

       3
       3
       -
       , "x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo="

     

       4
       4
       -
       , "x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E="

     

       5
       5
       -
       , "aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs="

     

       6
       6
       -
       , "aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M="

     

       3
       3
       +
       , "buck2-x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo="

     

       4
       4
       +
       , "rust-project-x86_64-linux": "sha256-UbC43xyEIIT76K2OHnp4lBo3saoTeuZxYDRieEry+tE="

     

       5
       5
       +
       , "buck2-x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E="

     

       6
       6
       +
       , "rust-project-x86_64-darwin": "sha256-mp8xR4bFb9esN3QABG03H07t09caMNQLKOqxdg8+CEw="

     

       7
       7
       +
       , "buck2-aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs="

     

       8
       8
       +
       , "rust-project-aarch64-linux": "sha256-rwT6mO0lyRnyCfdUtYcdelJArHZCHP6K/A//n+yLtgA="

     

       9
       9
       +
       , "buck2-aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M="

     

       10
       10
       +
       , "rust-project-aarch64-darwin": "sha256-JYQiCEcplVHTK2iPLDBpGyyoMXU5B0/P/r8VCN1IDko="

     

       7
       11
        
       }

+33 -18

pkgs/by-name/bu/buck2/package.nix

···

       46
       46
        
         # our version of buck2; this should be a git tag

     

       47
       47
        
         version = "2025-01-02";

     

       48
       48
        
       

     

       49
       49
       +
         # map our platform name to the rust toolchain suffix

     

       50
       50
       +
         # NOTE (aseipp): must be synchronized with update.sh!

     

       51
       51
       +
         platform-suffix =

     

       52
       52
       +
           {

     

       53
       53
       +
             x86_64-darwin = "x86_64-apple-darwin";

     

       54
       54
       +
             aarch64-darwin = "aarch64-apple-darwin";

     

       55
       55
       +
             x86_64-linux = "x86_64-unknown-linux-musl";

     

       56
       56
       +
             aarch64-linux = "aarch64-unknown-linux-musl";

     

       57
       57
       +
           }

     

       58
       58
       +
           ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       59
       59
       +
       

     

       49
       60
        
         # the platform-specific, statically linked binary — which is also

     

       50
       61
        
         # zstd-compressed

     

       51
       51
       -
         src =

     

       62
       62
       +
         buck2-src =

     

       52
       63
        
           let

     

       53
       53
       -
             suffix =

     

       54
       54
       -
               {

     

       55
       55
       -
                 # map our platform name to the rust toolchain suffix

     

       56
       56
       -
                 # NOTE (aseipp): must be synchronized with update.sh!

     

       57
       57
       -
                 x86_64-darwin = "x86_64-apple-darwin";

     

       58
       58
       -
                 aarch64-darwin = "aarch64-apple-darwin";

     

       59
       59
       -
                 x86_64-linux = "x86_64-unknown-linux-musl";

     

       60
       60
       -
                 aarch64-linux = "aarch64-unknown-linux-musl";

     

       61
       61
       -
               }

     

       62
       62
       -
               ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       64
       64
       +
             name = "buck2-${version}-${platform-suffix}.zst";

     

       65
       65
       +
             hash = buildHashes."buck2-${stdenv.hostPlatform.system}";

     

       66
       66
       +
             url = "https://github.com/facebook/buck2/releases/download/${version}/buck2-${platform-suffix}.zst";

     

       67
       67
       +
           in

     

       68
       68
       +
           fetchurl { inherit name url hash; };

     

       63
       69
        
       

     

       64
       64
       -
             name = "buck2-${version}-${suffix}.zst";

     

       65
       65
       -
             hash = buildHashes."${stdenv.hostPlatform.system}";

     

       66
       66
       -
             url = "https://github.com/facebook/buck2/releases/download/${version}/buck2-${suffix}.zst";

     

       70
       70
       +
         # rust-project, which is used to provide IDE integration Buck2 Rust projects,

     

       71
       71
       +
         # is part of the official distribution

     

       72
       72
       +
         rust-project-src =

     

       73
       73
       +
           let

     

       74
       74
       +
             name = "rust-project-${version}-${platform-suffix}.zst";

     

       75
       75
       +
             hash = buildHashes."rust-project-${stdenv.hostPlatform.system}";

     

       76
       76
       +
             url = "https://github.com/facebook/buck2/releases/download/${version}/rust-project-${platform-suffix}.zst";

     

       67
       77
        
           in

     

       68
       78
        
           fetchurl { inherit name url hash; };

     

       69
       79
        
       

     
···

       83
       93
        
       stdenv.mkDerivation {

     

       84
       94
        
         pname = "buck2";

     

       85
       95
        
         version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made

     

       86
       86
       -
         inherit src;

     

       96
       96
       +
         srcs = [

     

       97
       97
       +
           buck2-src

     

       98
       98
       +
           rust-project-src

     

       99
       99
       +
         ];

     

       100
       100
       +
         sourceRoot = ".";

     

       87
       101
        
       

     

       88
       102
        
         nativeBuildInputs = [

     

       89
       103
        
           installShellFiles

     
···

       94
       108
        
         dontConfigure = true;

     

       95
       109
        
         dontStrip = true;

     

       96
       110
        
       

     

       97
       97
       -
         unpackPhase = "unzstd ${src} -o ./buck2";

     

       98
       98
       -
         buildPhase = "chmod +x ./buck2";

     

       99
       99
       -
         checkPhase = "./buck2 --version";

     

       111
       111
       +
         unpackPhase = "unzstd ${buck2-src} -o ./buck2 && unzstd ${rust-project-src} -o ./rust-project";

     

       112
       112
       +
         buildPhase = "chmod +x ./buck2 && chmod +x ./rust-project";

     

       113
       113
       +
         checkPhase = "./buck2 --version && ./rust-project --version";

     

       100
       114
        
         installPhase = ''

     

       101
       115
        
           mkdir -p $out/bin

     

       102
       116
        
           install -D buck2 $out/bin/buck2

     

       117
       117
       +
           install -D rust-project $out/bin/rust-project

     

       103
       118
        
         '';

     

       104
       119
        
         postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       105
       120
        
           installShellCompletion --cmd buck2 \

+6 -1

pkgs/by-name/bu/buck2/update.sh

···

       36
       36
        
           IFS=: read -r arch_name arch_target <<< "$arch"

     

       37
       37
        
           sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/buck2-${arch_target}.zst")"

     

       38
       38
        
           srihash="$(nix hash to-sri --type sha256 "$sha256hash")"

     

       39
       39
       -
           echo ", \"$arch_name\": \"$srihash\"" >> "$HFILE"

     

       39
       39
       +
           echo ", \"buck2-$arch_name\": \"$srihash\"" >> "$HFILE"

     

       40
       40
       +
       

     

       41
       41
       +
           IFS=: read -r arch_name arch_target <<< "$arch"

     

       42
       42
       +
           sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/rust-project-${arch_target}.zst")"

     

       43
       43
       +
           srihash="$(nix hash to-sri --type sha256 "$sha256hash")"

     

       44
       44
       +
           echo ", \"rust-project-$arch_name\": \"$srihash\"" >> "$HFILE"

     

       40
       45
        
       done

     

       41
       46
        
       echo "}" >> "$HFILE"

     

       42
       47

+2 -2

pkgs/by-name/ci/cinnamon-common/package.nix

···

       76
       76
        
       # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon

     

       77
       77
        
       stdenv.mkDerivation rec {

     

       78
       78
        
         pname = "cinnamon-common";

     

       79
       79
       -
         version = "6.4.3";

     

       79
       79
       +
         version = "6.4.6";

     

       80
       80
        
       

     

       81
       81
        
         src = fetchFromGitHub {

     

       82
       82
        
           owner = "linuxmint";

     

       83
       83
        
           repo = "cinnamon";

     

       84
       84
        
           rev = version;

     

       85
       85
       -
           hash = "sha256-Nq4CFLmvgyPFg+mALE1UYauWAR7ZjtJGJOSChbIjm4g=";

     

       85
       85
       +
           hash = "sha256-hvQINRvEqTDWV0ja1tHzkpJMexc0htL0IlCHuy8QCQk=";

     

       86
       86
        
         };

     

       87
       87
        
       

     

       88
       88
        
         patches = [

+3 -3

pkgs/by-name/fo/folder-color-switcher/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
       10
        
         pname = "folder-color-switcher";

     

       11
       11
       -
         version = "1.6.6";

     

       11
       11
       +
         version = "1.6.7";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "linuxmint";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           # They don't really do tags, this is just a named commit.

     

       17
       17
       -
           rev = "208e66285ec33a078205a221af579c79bc8cad01";

     

       18
       18
       -
           hash = "sha256-t38eEFgbrFsZ+vy+axIeL8j6todPLg4NqS6DM20iIxQ=";

     

       17
       17
       +
           rev = "5bd94d3ffdb9585c09832f0beabb14f0e67e8d58";

     

       18
       18
       +
           hash = "sha256-77+b7yVcTvBjtmXGOUIrh88IaxvCiBNM+hbZoN0+zoI=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/ga/garnet/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildDotnetModule rec {

     

       10
       10
        
         pname = "garnet";

     

       11
       11
       -
         version = "1.0.48";

     

       11
       11
       +
         version = "1.0.50";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "microsoft";

     

       15
       15
        
           repo = "garnet";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-L+yML0VgD+rTReRurfH78U4uXZJWOW4mE+dmBQRbb9U=";

     

       17
       17
       +
           hash = "sha256-jmEPgGO9kQvzyGktFfsyEZdHlgJOZokzE3d5Xneu6/E=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         projectFile = "main/GarnetServer/GarnetServer.csproj";

+59

pkgs/by-name/ma/macskk/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenvNoCC,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         _7zz,

     

       6
       6
       +
         cpio,

     

       7
       7
       +
         xar,

     

       8
       8
       +
         darwin,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       12
       12
       +
         pname = "macskk";

     

       13
       13
       +
         version = "1.4.1";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchurl {

     

       16
       16
       +
           url = "https://github.com/mtgto/macSKK/releases/download/${finalAttrs.version}/macSKK-${finalAttrs.version}.dmg";

     

       17
       17
       +
           hash = "sha256-lLIFVGwt3VDsXRRGczY5VeqUyUgkX+G9tB3SGrO0voM=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [

     

       21
       21
       +
           _7zz

     

       22
       22
       +
           cpio

     

       23
       23
       +
           xar

     

       24
       24
       +
         ] ++ lib.optionals stdenvNoCC.hostPlatform.isAarch64 [ darwin.autoSignDarwinBinariesHook ];

     

       25
       25
       +
       

     

       26
       26
       +
         unpackPhase = ''

     

       27
       27
       +
           runHook preUnpack

     

       28
       28
       +
       

     

       29
       29
       +
           7zz x $src

     

       30
       30
       +
           xar -xf macSKK-${finalAttrs.version}.pkg

     

       31
       31
       +
           cat app.pkg/Payload | gunzip -dc | cpio -i

     

       32
       32
       +
           cat dict.pkg/Payload | gunzip -dc | cpio -i

     

       33
       33
       +
       

     

       34
       34
       +
           runHook postUnpack

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         installPhase = ''

     

       38
       38
       +
           runHook preInstall

     

       39
       39
       +
       

     

       40
       40
       +
           mkdir -p "$out"/Library/{Containers,Input\ Methods}

     

       41
       41
       +
           mkdir -p "$out/bin"

     

       42
       42
       +
           cp -a "Library/Input Methods/macSKK.app" "$out/Library/Input Methods/"

     

       43
       43
       +
           cp -a "Library/Containers/net.mtgto.inputmethod.macSKK" "$out/Library/Containers/"

     

       44
       44
       +
           ln -s "$out/Library/Input Methods/macSKK.app/Contents/MacOS/macSKK" "$out/bin/macSKK"

     

       45
       45
       +
       

     

       46
       46
       +
           runHook postInstall

     

       47
       47
       +
         '';

     

       48
       48
       +
       

     

       49
       49
       +
         meta = {

     

       50
       50
       +
           description = "Yet Another macOS SKK Input Method";

     

       51
       51
       +
           homepage = "https://github.com/mtgto/macSKK";

     

       52
       52
       +
           changelog = "https://github.com/mtgto/macSKK/blob/${finalAttrs.version}/CHANGELOG.md";

     

       53
       53
       +
           license = lib.licenses.gpl3Plus;

     

       54
       54
       +
           maintainers = with lib.maintainers; [ wattmto ];

     

       55
       55
       +
           platforms = lib.platforms.darwin;

     

       56
       56
       +
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       57
       57
       +
           mainProgram = "macSKK";

     

       58
       58
       +
         };

     

       59
       59
       +
       })

+3 -3

pkgs/by-name/mi/mint-artwork/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "mint-artwork";

     

       11
       11
       -
         version = "1.8.4";

     

       11
       11
       +
         version = "1.8.9";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           urls = [

     

       15
       15
        
             "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"

     

       16
       16
       -
             "https://web.archive.org/web/20240707114553/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"

     

       16
       16
       +
             "https://web.archive.org/web/20250111022232/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"

     

       17
       17
        
           ];

     

       18
       18
       -
           hash = "sha256-DpRoGTVB1vaif4UNiCEaVO/pyQY8Hc/QG1vmYkVr3Iw=";

     

       18
       18
       +
           hash = "sha256-MKXKne3wqxfIqmOawpmZbX/NRVSA5fBetpSE+mr/eqA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/mi/mint-themes/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
       10
        
         pname = "mint-themes";

     

       11
       11
       -
         version = "2.2.2";

     

       11
       11
       +
         version = "2.2.3";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "linuxmint";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = version;

     

       17
       17
       -
           hash = "sha256-97H2gVSZh0azl2ui4iWsNqgKzkBXRo6Daza2XtRdqII=";

     

       17
       17
       +
           hash = "sha256-QCf0hF1qtTiYo9F/M3UiCrGj6EPSrrSWZaLXqH0UNWs=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

-23

pkgs/by-name/mp/mpack/CVE-2011-4919.patch

···

       1
       1
       -
       commit 0c87201f64491575350b18d04c62ec142e119d1f

     

       2
       2
       -
       Author: Sebastian Pipping <sebastian@pipping.org>

     

       3
       3
       -
       Date:   Sat, 31 Dec 2011 19:17:20 +0000 (20:17 +0100)

     

       4
       4
       -
       Source: https://web.archive.org/web/20120128080247/http://git.goodpoint.de/?p=mpack.git;a=commitdiff;h=0c87201f64491575350b18d04c62ec142e119d1f

     

       5
       5
       -
       

     

       6
       6
       -
           Fix permissions

     

       7
       7
       -
       

     

       8
       8
       -
       diff --git a/unixos.c b/unixos.c

     

       9
       9
       -
       index fa6d0a7..0e2f469 100644 (file)

     

       10
       10
       -
       --- a/unixos.c

     

       11
       11
       -
       +++ b/unixos.c

     

       12
       12
       -
       @@ -134,9 +134,9 @@ FILE *os_createnewfile(char *fname)

     

       13
       13
       -
            FILE *ret;

     

       14
       14
       -
             

     

       15
       15
       -
        #ifdef O_EXCL

     

       16
       16
       -
       -    fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0644);

     

       17
       17
       -
       +    fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0600);

     

       18
       18
       -
        #else

     

       19
       19
       -
       -    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0644);

     

       20
       20
       -
       +    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);

     

       21
       21
       -
        #endif

     

       22
       22
       -
        

     

       23
       23
       -
            if (fd == -1)

-29

pkgs/by-name/mp/mpack/build-fix.patch

···

       1
       1
       -
       diff -ubr mpack-1.6-orig/unixos.c mpack-1.6/unixos.c

     

       2
       2
       -
       --- mpack-1.6-orig/unixos.c	2013-08-17 14:32:38.102772775 +0200

     

       3
       3
       -
       +++ mpack-1.6/unixos.c	2013-08-17 14:32:43.180792505 +0200

     

       4
       4
       -
       @@ -38,10 +38,6 @@

     

       5
       5
       -
        #define MAXHOSTNAMELEN 64

     

       6
       6
       -
        #endif

     

       7
       7
       -
        

     

       8
       8
       -
       -extern int errno;

     

       9
       9
       -
       -extern char *malloc();

     

       10
       10
       -
       -extern char *getenv();

     

       11
       11
       -
       -

     

       12
       12
       -
        int overwrite_files = 0;

     

       13
       13
       -
        int didchat;

     

       14
       14
       -
        

     

       15
       15
       -
       Only in mpack-1.6: unixos.o

     

       16
       16
       -
       Only in mpack-1.6: unixunpk.o

     

       17
       17
       -
       Only in mpack-1.6: uudecode.o

     

       18
       18
       -
       diff -ubr mpack-1.6-orig/xmalloc.c mpack-1.6/xmalloc.c

     

       19
       19
       -
       --- mpack-1.6-orig/xmalloc.c	2013-08-17 14:32:38.102772775 +0200

     

       20
       20
       -
       +++ mpack-1.6/xmalloc.c	2013-08-17 14:33:08.900892319 +0200

     

       21
       21
       -
       @@ -24,7 +24,6 @@

     

       22
       22
       -
         */

     

       23
       23
       -
        #include <stdio.h>

     

       24
       24
       -
        #include <string.h>

     

       25
       25
       -
       -extern char *malloc(), *realloc();

     

       26
       26
       -
        

     

       27
       27
       -
        char *xmalloc (int size)

     

       28
       28
       -
        {

     

       29
       29
       -
       Only in mpack-1.6: xmalloc.o

+55 -12

pkgs/by-name/mp/mpack/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         fetchpatch,

     

       6
       6
       +
         autoreconfHook,

     

       5
       7
        
         testers,

     

       6
       8
        
         mpack,

     

       7
       9
        
       }:

     
···

       15
       17
        
           hash = "sha256-J0EIuzo5mCpO/BT7OmUpjmbI5xNnw9q/STOBYtIHqUw=";

     

       16
       18
        
         };

     

       17
       19
        
       

     

       18
       18
       -
         patches = [

     

       19
       19
       -
           ./build-fix.patch

     

       20
       20
       -
           ./sendmail-via-execvp.diff

     

       21
       21
       -
           ./CVE-2011-4919.patch

     

       22
       22
       -
         ];

     

       20
       20
       +
         patches =

     

       21
       21
       +
           let

     

       22
       22
       +
             # https://salsa.debian.org/debian/mpack/-/tree/7d6514b314a7341614ec8275b03acfcb6a854a6f/debian/patches

     

       23
       23
       +
             fetchDebPatch =

     

       24
       24
       +
               { name, hash }:

     

       25
       25
       +
               fetchpatch {

     

       26
       26
       +
                 inherit name hash;

     

       27
       27
       +
                 url = "https://salsa.debian.org/debian/mpack/-/raw/7d6514b314a7341614ec8275b03acfcb6a854a6f/debian/patches/${name}";

     

       28
       28
       +
               };

     

       29
       29
       +
           in

     

       30
       30
       +
           [

     

       31
       31
       +
             ./sendmail-via-execvp.diff

     

       32
       32
       +
           ]

     

       33
       33
       +
           ++ (map fetchDebPatch [

     

       34
       34
       +
             {

     

       35
       35
       +
               name = "01_legacy.patch";

     

       36
       36
       +
               hash = "sha256-v2pZUXecgxJqoHadBhpAAoferQNSeYE+m7qzEiggeO4=";

     

       37
       37
       +
             }

     

       38
       38
       +
             {

     

       39
       39
       +
               name = "02_fix-permissions.patch";

     

       40
       40
       +
               hash = "sha256-sltnIqgv7+pwwSFQRCDeCwnjoo2OrvmGFm+SM9U/HB4=";

     

       41
       41
       +
             }

     

       42
       42
       +
             {

     

       43
       43
       +
               name = "03_specify-filename-replacement-character.patch";

     

       44
       44
       +
               hash = "sha256-vmLIGFSqKK/qSsltzhdLQGoekew3r25EwAu56umeXlU=";

     

       45
       45
       +
             }

     

       46
       46
       +
             {

     

       47
       47
       +
               name = "04_fix-return-error-code.patch";

     

       48
       48
       +
               hash = "sha256-l23D6xhkgtkEsErzUy/q6U3aPf5N7YUw2PEToU1YXKI=";

     

       49
       49
       +
             }

     

       50
       50
       +
             {

     

       51
       51
       +
               name = "06_fix-makefile.patch";

     

       52
       52
       +
               hash = "sha256-69plDqy2sLzO1O4mqjJIlTRCw5ZeVySiqwo93ZkX3Ho=";

     

       53
       53
       +
             }

     

       54
       54
       +
             {

     

       55
       55
       +
               name = "07_fix-decode-base64-attachment.patch";

     

       56
       56
       +
               hash = "sha256-hzSCrEg0j6dJNLbfwRNn+rWGRnyUBLjJUlORJS9aDD4=";

     

       57
       57
       +
             }

     

       58
       58
       +
             {

     

       59
       59
       +
               name = "08_fix-mime-version.patch";

     

       60
       60
       +
               hash = "sha256-l2rBqbyKmnz5tEPeuX6HCqw7rSV8pDb7ijpCHsdh57g=";

     

       61
       61
       +
             }

     

       62
       62
       +
             {

     

       63
       63
       +
               name = "09_remove-debugging-message.patch";

     

       64
       64
       +
               hash = "sha256-dtq6BHgH4ciho0+TNW/rU3KWoeKs/1jwJafnHTr9ebI=";

     

       65
       65
       +
             }

     

       66
       66
       +
           ]);

     

       23
       67
        
       

     

       24
       68
        
         postPatch = ''

     

       25
       25
       -
           for f in *.{c,man,pl,unix} ; do

     

       26
       26
       -
             substituteInPlace $f --replace /usr/tmp /tmp

     

       27
       27
       -
           done

     

       69
       69
       +
           substituteInPlace *.{c,man,pl,unix} --replace-quiet /usr/tmp /tmp

     

       28
       70
        
       

     

       29
       29
       -
           # this just shuts up some warnings

     

       30
       30
       -
           for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do

     

       31
       31
       -
             sed -i 'i#include <stdlib.h>' $f

     

       32
       32
       -
           done

     

       71
       71
       +
           # silence a buffer overflow warning

     

       72
       72
       +
           substituteInPlace uudecode.c \

     

       73
       73
       +
             --replace-fail "char buf[1024], buf2[1024];" "char buf[1024], buf2[1066];"

     

       33
       74
        
         '';

     

       75
       75
       +
       

     

       76
       76
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       34
       77
        
       

     

       35
       78
        
         postInstall = ''

     

       36
       79
        
           install -Dm644 -t $out/share/doc/mpack INSTALL README.*

+7 -3

pkgs/by-name/ni/niri/package.nix

···

       24
       24
        
       

     

       25
       25
        
       rustPlatform.buildRustPackage rec {

     

       26
       26
        
         pname = "niri";

     

       27
       27
       -
         version = "0.1.10.1";

     

       27
       27
       +
         version = "25.01";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitHub {

     

       30
       30
        
           owner = "YaLTeR";

     

       31
       31
        
           repo = "niri";

     

       32
       32
        
           tag = "v${version}";

     

       33
       33
       -
           hash = "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=";

     

       33
       33
       +
           hash = "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         postPatch = ''

     
···

       40
       40
        
         '';

     

       41
       41
        
       

     

       42
       42
        
         useFetchCargoVendor = true;

     

       43
       43
       -
         cargoHash = "sha256-2hFavY3Y6aBPjo53o7GMjuvUKOcj+ZQiV0M1mpoH/Ck=";

     

       43
       43
       +
         cargoHash = "sha256-eGI3i7FnjZGEfcGvEpNLOog8cgExBJuGoXM/oHsui0M=";

     

       44
       44
        
       

     

       45
       45
        
         strictDeps = true;

     

       46
       46
        
       

     
···

       101
       101
        
             ]

     

       102
       102
        
           );

     

       103
       103
        
         };

     

       104
       104
       +
       

     

       105
       105
       +
         preCheck = ''

     

       106
       106
       +
           export XDG_RUNTIME_DIR=$(mktemp -d)

     

       107
       107
       +
         '';

     

       104
       108
        
       

     

       105
       109
        
         passthru = {

     

       106
       110
        
           providedSessions = [ "niri" ];

+1 -1

pkgs/by-name/on/onboard/package.nix

···

       191
       191
        
         meta = with lib; {

     

       192
       192
        
           homepage = "https://launchpad.net/onboard";

     

       193
       193
        
           description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users";

     

       194
       194
       -
           maintainers = with maintainers; [ johnramsden ];

     

       194
       194
       +
           maintainers = with maintainers; [ ];

     

       195
       195
        
           license = licenses.gpl3;

     

       196
       196
        
         };

     

       197
       197
        
       }

+3 -2

pkgs/by-name/pd/pdm/package.nix

···

       24
       24
        
       in

     

       25
       25
        
       python.pkgs.buildPythonApplication rec {

     

       26
       26
        
         pname = "pdm";

     

       27
       27
       -
         version = "2.22.1";

     

       27
       27
       +
         version = "2.22.2";

     

       28
       28
        
         pyproject = true;

     

       29
       29
        
       

     

       30
       30
        
         disabled = python.pkgs.pythonOlder "3.8";

     
···

       33
       33
        
           owner = "pdm-project";

     

       34
       34
        
           repo = "pdm";

     

       35
       35
        
           tag = version;

     

       36
       36
       -
           hash = "sha256-khAS/OpuvZTJGh9/lIGtKONajIonCwc/M9D9lSwzFvw=";

     

       36
       36
       +
           hash = "sha256-se0Xvziyg4CU6wENO0oYVAI4f2uBv3Ubadiptf/uPgQ=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         pythonRelaxDeps = [ "hishel" ];

     
···

       117
       117
        
           "test_lock_all_with_excluded_groups"

     

       118
       118
        
           "test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV"

     

       119
       119
        
           "test_build_distributions"

     

       120
       120
       +
           "test_init_project_respect"

     

       120
       121
        
         ];

     

       121
       122
        
       

     

       122
       123
        
         __darwinAllowLocalNetworking = true;

+2 -2

pkgs/by-name/pi/pix/package.nix

···

       34
       34
        
       

     

       35
       35
        
       stdenv.mkDerivation rec {

     

       36
       36
        
         pname = "pix";

     

       37
       37
       -
         version = "3.4.4";

     

       37
       37
       +
         version = "3.4.5";

     

       38
       38
        
       

     

       39
       39
        
         src = fetchFromGitHub {

     

       40
       40
        
           owner = "linuxmint";

     

       41
       41
        
           repo = pname;

     

       42
       42
        
           rev = version;

     

       43
       43
       -
           hash = "sha256-BasS0Z8fj7vxFnMZ6KOd5LkvSvTaw6+DDfcRFrdus7A=";

     

       43
       43
       +
           hash = "sha256-c/+NQHvscW/XE49Twmg1Rk1IfsjReCtRQWffobZtgTs=";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/st/sticky/package.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "sticky";

     

       19
       19
       -
         version = "1.23";

     

       19
       19
       +
         version = "1.24";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "linuxmint";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = version;

     

       25
       25
       -
           hash = "sha256-vNS2p3cmuQB+wusx9VSi81ZyGmUYgVXlMjIMkrnvyrI=";

     

       25
       25
       +
           hash = "sha256-Mj14S4M7NMQE17SN8uED4UIJN6nwTo3E+D3j0tGKXc4=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

+3 -3

pkgs/by-name/te/television/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "television";

     

       11
       11
       -
         version = "0.9.1";

     

       11
       11
       +
         version = "0.9.2";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "alexpasmantier";

     

       15
       15
        
           repo = "television";

     

       16
       16
        
           tag = version;

     

       17
       17
       -
           hash = "sha256-7TsSgT6UdcGd1/yoRT0SzclEPTCYkBgPcoRMDTKHcEU=";

     

       17
       17
       +
           hash = "sha256-XMANif4WbI+imSYeQRlvZJYjtaVbKrD4wVx2mQ1HYHg=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoHash = "sha256-Kb4vc1tCz6cxy/wpuZxowxTaUqpMHROwdiYRDIz22/I=";

     

       20
       20
       +
         cargoHash = "sha256-IXtmQdDO3OHBZALWQKhJVgEimvuNyAj0/7aUlnL395M=";

     

       21
       21
        
       

     

       22
       22
        
         passthru = {

     

       23
       23
        
           tests.version = testers.testVersion {

+4

pkgs/development/libraries/onnxruntime/default.nix

···

       275
       275
        
           platforms = platforms.unix;

     

       276
       276
        
           license = licenses.mit;

     

       277
       277
        
           maintainers = with maintainers; [ puffnfresh ck3d cbourjau ];

     

       278
       278
       +
           badPlatforms = [

     

       279
       279
       +
             # error: implicit capture of 'this' with a capture default of '=' is deprecated [-Werror,-Wdeprecated-this-capture]

     

       280
       280
       +
             lib.systems.inspect.patterns.isDarwin

     

       281
       281
       +
           ];

     

       278
       282
        
         };

     

       279
       283
        
       }

+2 -2

pkgs/development/python-modules/edk2-pytool-library/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "edk2-pytool-library";

     

       20
       20
       -
         version = "0.22.4";

     

       20
       20
       +
         version = "0.22.5";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.11";

     
···

       26
       26
        
           owner = "tianocore";

     

       27
       27
        
           repo = "edk2-pytool-library";

     

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

     

       29
       29
       -
           hash = "sha256-uTXE5b9iqGhrkbevz6GIw4MMDh3yA4Op0JHCTRo0ZfY=";

     

       29
       29
       +
           hash = "sha256-cnJTDMlkegd21X1meNTbS57y4qPYR+JkRtiTPof+PiQ=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [

+2 -2

pkgs/development/python-modules/faster-whisper/default.nix

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "faster-whisper";

     

       22
       22
       -
         version = "1.1.0";

     

       22
       22
       +
         version = "1.1.1";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "SYSTRAN";

     

       27
       27
        
           repo = "faster-whisper";

     

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

     

       29
       29
       -
           hash = "sha256-oJBCEwTfon80XQ9XIgnRw0SLvpwX0L5jnezwG0jv3Eg=";

     

       29
       29
       +
           hash = "sha256-1j0ZNQY+P7ZflFCxKkFncJl7Rwuf3AMhzsS6CO9uLD0=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [

+12 -8

pkgs/development/python-modules/lazr-restfulclient/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         isPy27,

     

       5
       4
        
         fetchPypi,

     

       6
       5
        
         distro,

     

       7
       6
        
         httplib2,

     
···

       16
       15
        
       }:

     

       17
       16
        
       

     

       18
       17
        
       buildPythonPackage rec {

     

       19
       19
       -
         pname = "lazr.restfulclient";

     

       18
       18
       +
         pname = "lazr-restfulclient";

     

       20
       19
        
         version = "0.14.6";

     

       21
       21
       -
       

     

       22
       22
       -
         disabled = isPy27; # namespace is broken for python2

     

       20
       20
       +
         pyproject = true;

     

       23
       21
        
       

     

       24
       22
        
         src = fetchPypi {

     

       25
       25
       -
           inherit pname version;

     

       23
       23
       +
           pname = "lazr.restfulclient";

     

       24
       24
       +
           inherit version;

     

       26
       25
        
           hash = "sha256-Q/EqHTlIRjsUYgOMR7Qp3LXkLgun8uFlEbArpdKt/9s=";

     

       27
       26
        
         };

     

       28
       27
        
       

     

       29
       29
       -
         propagatedBuildInputs = [

     

       28
       28
       +
         build-system = [ setuptools ];

     

       29
       29
       +
       

     

       30
       30
       +
         dependencies = [

     

       30
       31
        
           distro

     

       31
       32
        
           httplib2

     

       32
       33
        
           oauthlib

     
···

       46
       47
        
       

     

       47
       48
        
         pythonImportsCheck = [ "lazr.restfulclient" ];

     

       48
       49
        
       

     

       49
       49
       -
         meta = with lib; {

     

       50
       50
       +
         pythonNamespaces = [ "lazr" ];

     

       51
       51
       +
       

     

       52
       52
       +
         meta = {

     

       50
       53
        
           description = "Programmable client library that takes advantage of the commonalities among";

     

       51
       54
        
           homepage = "https://launchpad.net/lazr.restfulclient";

     

       52
       52
       -
           license = licenses.lgpl3;

     

       55
       55
       +
           changelog = "https://git.launchpad.net/lazr.restfulclient/tree/NEWS.rst?h=${version}";

     

       56
       56
       +
           license = lib.licenses.lgpl3Plus;

     

       53
       57
        
           maintainers = [ ];

     

       54
       58
        
         };

     

       55
       59
        
       }

+19 -10

pkgs/development/python-modules/lazr-uri/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         isPy27,

     

       5
       4
        
         fetchPypi,

     

       6
       5
        
         setuptools,

     

       6
       6
       +
         pytestCheckHook,

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
       -
         pname = "lazr.uri";

     

       11
       11
       -
         version = "1.0.6";

     

       12
       12
       -
       

     

       13
       13
       -
         disabled = isPy27; # namespace is broken for python2

     

       10
       10
       +
         pname = "lazr-uri";

     

       11
       11
       +
         version = "1.0.7";

     

       12
       12
       +
         pyproject = true;

     

       14
       13
        
       

     

       15
       14
        
         src = fetchPypi {

     

       16
       16
       -
           inherit pname version;

     

       17
       17
       -
           sha256 = "5026853fcbf6f91d5a6b11ea7860a641fe27b36d4172c731f4aa16b900cf8464";

     

       15
       15
       +
           pname = "lazr_uri";

     

       16
       16
       +
           inherit version;

     

       17
       17
       +
           hash = "sha256-7Qz28zPkUBFHUq+xzgwpnDasSxCQY+tQNUxPh/glo+4=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         propagatedBuildInputs = [ setuptools ];

     

       20
       20
       +
         build-system = [ setuptools ];

     

       21
       21
       +
       

     

       22
       22
       +
         dependencies = [ setuptools ];

     

       23
       23
       +
       

     

       24
       24
       +
         pythonImportsCheck = [ "lazr.uri" ];

     

       21
       25
        
       

     

       22
       22
       -
         meta = with lib; {

     

       26
       26
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       27
       27
       +
       

     

       28
       28
       +
         pythonNamespaces = [ "lazr" ];

     

       29
       29
       +
       

     

       30
       30
       +
         meta = {

     

       23
       31
        
           description = "Self-contained, easily reusable library for parsing, manipulating";

     

       24
       32
        
           homepage = "https://launchpad.net/lazr.uri";

     

       25
       25
       -
           license = licenses.lgpl3;

     

       33
       33
       +
           changelog = "https://git.launchpad.net/lazr.uri/tree/NEWS.rst?h=${version}";

     

       34
       34
       +
           license = lib.licenses.lgpl3Only;

     

       26
       35
        
           maintainers = [ ];

     

       27
       36
        
         };

     

       28
       37
        
       }

+10 -10

pkgs/development/python-modules/lazr/config.nix pkgs/development/python-modules/lazr-config/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       4
       4
       +
         fetchgit,

     

       5
       5
        
         setuptools,

     

       6
       6
        
         lazr-delegates,

     

       7
       7
        
         zope-interface,

     
···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "lazr-config";

     

       13
       13
       -
         version = "3.0";

     

       13
       13
       +
         version = "3.1";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
       -
         src = fetchPypi {

     

       17
       17
       -
           pname = "lazr.config";

     

       18
       18
       -
           inherit version;

     

       19
       19
       -
           hash = "sha256-oU5PbMCa68HUCxdhWK6g7uIlLBQAO40O8LMcfFFMNkQ=";

     

       16
       16
       +
         src = fetchgit {

     

       17
       17
       +
           url = "https://git.launchpad.net/lazr.config";

     

       18
       18
       +
           rev = "3c659114e8e947fbd46954336f5577351d786de9";

     

       19
       19
       +
           hash = "sha256-eYJY4JRoqTMG4j1jyiYrI8xEKdJ+wQYVVU/6OqVIodk=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ setuptools ];

     

       22
       22
       +
         build-system = [ setuptools ];

     

       23
       23
        
       

     

       24
       24
       -
         propagatedBuildInputs = [

     

       24
       24
       +
         dependencies = [

     

       25
       25
        
           lazr-delegates

     

       26
       26
        
           zope-interface

     

       27
       27
        
         ];

     
···

       38
       38
        
       

     

       39
       39
        
         pythonNamespaces = [ "lazr" ];

     

       40
       40
        
       

     

       41
       41
       -
         meta = with lib; {

     

       41
       41
       +
         meta = {

     

       42
       42
        
           description = "Create configuration schemas, and process and validate configurations";

     

       43
       43
        
           homepage = "https://launchpad.net/lazr.config";

     

       44
       44
        
           changelog = "https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=${version}";

     

       45
       45
       -
           license = licenses.lgpl3Only;

     

       45
       45
       +
           license = lib.licenses.lgpl3Only;

     

       46
       46
        
         };

     

       47
       47
        
       }

+7 -7

pkgs/development/python-modules/lazr/delegates.nix pkgs/development/python-modules/lazr-delegates/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "lazr-delegates";

     

       12
       12
       -
         version = "2.1.0";

     

       12
       12
       +
         version = "2.1.1";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
       -
           pname = "lazr.delegates";

     

       16
       16
       +
           pname = "lazr_delegates";

     

       17
       17
        
           inherit version;

     

       18
       18
       -
           hash = "sha256-UNT7iHK5UuV6SOEmEOVQ+jBm7rV8bGx1tqUUJBi6wZw=";

     

       18
       18
       +
           hash = "sha256-rs6yYW5Rtz8yf78SxOwrfXZwy4IL1eT2hRIV+3lsAtw=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ setuptools ];

     

       21
       21
       +
         build-system = [ setuptools ];

     

       22
       22
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ zope-interface ];

     

       23
       23
       +
         dependencies = [ zope-interface ];

     

       24
       24
        
       

     

       25
       25
        
         pythonImportsCheck = [ "lazr.delegates" ];

     

       26
       26
        
       

     
···

       28
       28
        
       

     

       29
       29
        
         pythonNamespaces = [ "lazr" ];

     

       30
       30
        
       

     

       31
       31
       -
         meta = with lib; {

     

       31
       31
       +
         meta = {

     

       32
       32
        
           description = "Easily write objects that delegate behavior";

     

       33
       33
        
           homepage = "https://launchpad.net/lazr.delegates";

     

       34
       34
        
           changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}";

     

       35
       35
       -
           license = licenses.lgpl3Only;

     

       35
       35
       +
           license = lib.licenses.lgpl3Only;

     

       36
       36
        
         };

     

       37
       37
        
       }

+35

pkgs/development/python-modules/standard-imghdr/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         setuptools,

     

       6
       6
       +
         pytestCheckHook,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "standard-imghdr";

     

       11
       11
       +
         version = "3.13.0";

     

       12
       12
       +
         pyproject = true;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "youknowone";

     

       16
       16
       +
           repo = "python-deadlib";

     

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

     

       18
       18
       +
           hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         sourceRoot = "${src.name}/imghdr";

     

       22
       22
       +
       

     

       23
       23
       +
         build-system = [ setuptools ];

     

       24
       24
       +
       

     

       25
       25
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       26
       26
       +
       

     

       27
       27
       +
         pythonImportsCheck = [ "imghdr" ];

     

       28
       28
       +
       

     

       29
       29
       +
         meta = {

     

       30
       30
       +
           description = "Python dead batteries. See PEP 594";

     

       31
       31
       +
           homepage = "https://github.com/youknowone/python-deadlib";

     

       32
       32
       +
           license = lib.licenses.psfl;

     

       33
       33
       +
           maintainers = with lib.maintainers; [ hexa ];

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+2

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

···

       12
       12
        
         absl-py,

     

       13
       13
        
         google-auth-oauthlib,

     

       14
       14
        
         setuptools,

     

       15
       15
       +
         standard-imghdr,

     

       15
       16
        
         tensorboard-data-server,

     

       16
       17
        
         tensorboard-plugin-wit,

     

       17
       18
        
         tensorboard-plugin-profile,

     
···

       47
       48
        
           numpy

     

       48
       49
        
           protobuf

     

       49
       50
        
           setuptools

     

       51
       51
       +
           standard-imghdr

     

       50
       52
        
           tensorboard-data-server

     

       51
       53
        
           tensorboard-plugin-profile

     

       52
       54
        
           tensorboard-plugin-wit

+3 -2

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

···

       87
       87
        
         # dependencies for torch.utils.tensorboard

     

       88
       88
        
         pillow,

     

       89
       89
        
         six,

     

       90
       90
       -
         future,

     

       91
       90
        
         tensorboard,

     

       92
       91
        
         protobuf,

     

       93
       92
        
       

     
···

       298
       297
        
                 "# Upstream: set(CUDAToolkit_ROOT"

     

       299
       298
        
             substituteInPlace third_party/gloo/cmake/Cuda.cmake \

     

       300
       299
        
               --replace-warn "find_package(CUDAToolkit 7.0" "find_package(CUDAToolkit"

     

       300
       300
       +
       

     

       301
       301
       +
             # annotations (3.7), print_function (3.0), with_statement (2.6) are all supported

     

       302
       302
       +
             sed -i -e "/from __future__ import/d" **.py

     

       301
       303
        
           ''

     

       302
       304
        
           + lib.optionalString rocmSupport ''

     

       303
       305
        
             # https://github.com/facebookincubator/gloo/pull/297

     
···

       529
       531
        
             # the following are required for tensorboard support

     

       530
       532
        
             pillow

     

       531
       533
        
             six

     

       532
       532
       -
             future

     

       533
       534
        
             tensorboard

     

       534
       535
        
             protobuf

     

       535
       536

+14

pkgs/servers/matrix-synapse/default.nix

···

       10
       10
        
         rustc,

     

       11
       11
        
         nixosTests,

     

       12
       12
        
         callPackage,

     

       13
       13
       +
         fetchpatch2,

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       let

     
···

       34
       35
        
           hash = "sha256-LGFuz3NtNqH+XumJOirvflH0fyfTtqz5qgYlJx2fmAU=";

     

       35
       36
        
         };

     

       36
       37
        
       

     

       38
       38
       +
         patches = [

     

       39
       39
       +
           # Fixes test compat with twisted 24.11.0.

     

       40
       40
       +
           # Can be removed in next release.

     

       41
       41
       +
           (fetchpatch2 {

     

       42
       42
       +
             url = "https://github.com/element-hq/synapse/commit/3eb92369ca14012a07da2fbf9250e66f66afb710.patch";

     

       43
       43
       +
             sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A=";

     

       44
       44
       +
           })

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       37
       47
        
         postPatch = ''

     

       38
       48
        
           # Remove setuptools_rust from runtime dependencies

     

       39
       49
        
           # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185

     
···

       47
       57
        
           # Don't force pillow to be 10.0.1 because we already have patched it, and

     

       48
       58
        
           # we don't use the pillow wheels.

     

       49
       59
        
           sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml

     

       60
       60
       +
       

     

       61
       61
       +
           # https://github.com/element-hq/synapse/pull/17878#issuecomment-2575412821

     

       62
       62
       +
           substituteInPlace tests/storage/databases/main/test_events_worker.py \

     

       63
       63
       +
             --replace-fail "def test_recovery" "def no_test_recovery"

     

       50
       64
        
         '';

     

       51
       65
        
       

     

       52
       66
        
         nativeBuildInputs = with python3.pkgs; [

+2 -2

pkgs/tools/networking/lldpd/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "lldpd";

     

       16
       16
       -
         version = "1.0.18";

     

       16
       16
       +
         version = "1.0.19";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";

     

       20
       20
       -
           hash = "sha256-SzIGddYIkBpKDU/v+PlruEbUkT2RSwz3W30K6ASQ8vc=";

     

       20
       20
       +
           hash = "sha256-+H3zFj1eUTjakB0FWzhACXhdHrUP2xeiNDkQ/PMKmX8=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         configureFlags =

+8 -6

pkgs/top-level/python-packages.nix

···

       1004
       1004
        
       

     

       1005
       1005
        
         audio-metadata = callPackage ../development/python-modules/audio-metadata { };

     

       1006
       1006
        
       

     

       1007
       1007
       -
         audioop-lts = callPackage ../development/python-modules/audioop-lts { };

     

       1007
       1007
       +
         audioop-lts = if pythonAtLeast "3.13" then callPackage ../development/python-modules/audioop-lts { } else null;

     

       1008
       1008
        
       

     

       1009
       1009
        
         audioread = callPackage ../development/python-modules/audioread { };

     

       1010
       1010
        
       

     
···

       7147
       7147
        
       

     

       7148
       7148
        
         layoutparser = callPackage ../development/python-modules/layoutparser { };

     

       7149
       7149
        
       

     

       7150
       7150
       -
         lazr-config = callPackage ../development/python-modules/lazr/config.nix { };

     

       7150
       7150
       +
         lazr-config = callPackage ../development/python-modules/lazr-config { };

     

       7151
       7151
        
       

     

       7152
       7152
       -
         lazr-delegates = callPackage ../development/python-modules/lazr/delegates.nix { };

     

       7152
       7152
       +
         lazr-delegates = callPackage ../development/python-modules/lazr-delegates { };

     

       7153
       7153
        
       

     

       7154
       7154
        
         lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { };

     

       7155
       7155
        
       

     
···

       15532
       15532
        
       

     

       15533
       15533
        
         stm32loader = callPackage ../development/python-modules/stm32loader { };

     

       15534
       15534
        
       

     

       15535
       15535
       -
         standard-aifc = callPackage ../development/python-modules/standard-aifc { };

     

       15535
       15535
       +
         standard-aifc = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-aifc { } else null;

     

       15536
       15536
        
       

     

       15537
       15537
       -
         standard-chunk = callPackage ../development/python-modules/standard-chunk { };

     

       15537
       15537
       +
         standard-chunk = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-chunk { } else null;

     

       15538
       15538
        
       

     

       15539
       15539
       -
         standard-telnetlib = callPackage ../development/python-modules/standard-telnetlib { };

     

       15539
       15539
       +
         standard-imghdr = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-imghdr { } else null;

     

       15540
       15540
       +
       

     

       15541
       15541
       +
         standard-telnetlib = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-telnetlib { } else null;

     

       15540
       15542
        
       

     

       15541
       15543
        
         stone = callPackage ../development/python-modules/stone { };

     

       15542
       15544