commit d4b7bd6f6f41978cedbf7abb201efee9e526345c · pyrox.dev/nixpkgs

+6

maintainers/maintainer-list.nix

···

       20122
       20122
        
           githubId = 69053978;

     

       20123
       20123
        
           name = "rogarb";

     

       20124
       20124
        
         };

     

       20125
       20125
       +
         RoGreat = {

     

       20126
       20126
       +
           email = "roguegreat@gmail.com";

     

       20127
       20127
       +
           github = "RoGreat";

     

       20128
       20128
       +
           githubId = 64620440;

     

       20129
       20129
       +
           name = "RoGreat";

     

       20130
       20130
       +
         };

     

       20125
       20131
        
         rohanssrao = {

     

       20126
       20132
        
           email = "rohanssrao@gmail.com";

     

       20127
       20133
        
           github = "rohanssrao";

+23 -22

nixos/modules/system/boot/loader/grub/install-grub.pl

···

       3
       3
        
       use Class::Struct;

     

       4
       4
        
       use XML::LibXML;

     

       5
       5
        
       use File::Basename;

     

       6
       6
       -
       use File::Path;

     

       6
       6
       +
       use File::Path qw(make_path);

     

       7
       7
        
       use File::stat;

     

       8
       8
        
       use File::Copy;

     

       9
       9
        
       use File::Copy::Recursive qw(rcopy pathrm);

     
···

       37
       37
        
           my ($fn) = @_;

     

       38
       38
        
           # enable slurp mode: read entire file in one go

     

       39
       39
        
           local $/ = undef;

     

       40
       40
       -
           open my $fh, "<$fn" or return undef;

     

       40
       40
       +
           open my $fh, "<", $fn

     

       41
       41
       +
               or return;

     

       41
       42
        
           my $s = <$fh>;

     

       42
       43
        
           close $fh;

     

       43
       44
        
           # disable slurp mode

     
···

       48
       49
        
       

     

       49
       50
        
       sub writeFile {

     

       50
       51
        
           my ($fn, $s) = @_;

     

       51
       51
       -
           open my $fh, ">$fn" or die "cannot create $fn: $!\n";

     

       52
       52
       +
           open my $fh, ">", $fn or die "cannot create $fn: $!\n";

     

       52
       53
        
           print $fh $s or die "cannot write to $fn: $!\n";

     

       53
       54
        
           close $fh or die "cannot close $fn: $!\n";

     

       54
       55
        
       }

     
···

       98
       99
        
       

     

       99
       100
        
       print STDERR "updating GRUB 2 menu...\n";

     

       100
       101
        
       

     

       101
       101
       -
       mkpath("$bootPath/grub", 0, 0700);

     

       102
       102
       +
       make_path("$bootPath/grub", {  mode => 0700 });

     

       102
       103
        
       

     

       103
       104
        
       # Discover whether the bootPath is on the same filesystem as / and

     

       104
       105
        
       # /nix/store.  If not, then all kernels and initrds must be copied to

     
···

       438
       439
        
       $conf .= "\n";

     

       439
       440
        
       

     

       440
       441
        
       my %copied;

     

       441
       441
       -
       mkpath("$bootPath/kernels", 0, 0755) if $copyKernels;

     

       442
       442
       +
       make_path("$bootPath/kernels", { mode => 0755 }) if $copyKernels;

     

       442
       443
        
       

     

       443
       444
        
       sub copyToKernelsDir {

     

       444
       445
        
           my ($path) = @_;

     
···

       471
       472
        
               my $systemName = basename(Cwd::abs_path("$path"));

     

       472
       473
        
               my $initrdSecretsPath = "$bootPath/kernels/$systemName-secrets";

     

       473
       474
        
       

     

       474
       474
       -
               mkpath(dirname($initrdSecretsPath), 0, 0755);

     

       475
       475
       +
               make_path(dirname($initrdSecretsPath), { mode => 0755 });

     

       475
       476
        
               my $oldUmask = umask;

     

       476
       477
        
               # Make sure initrd is not world readable (won't work if /boot is FAT)

     

       477
       478
        
               umask 0137;

     
···

       690
       691
        
       # because it is read line-by-line.

     

       691
       692
        
       sub readGrubState {

     

       692
       693
        
           my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "", extraGrubInstallArgs => () );

     

       693
       693
       -
           open FILE, "<$bootPath/grub/state" or return $defaultGrubState;

     

       694
       694
       +
           open my $fh, "<", "$bootPath/grub/state" or return $defaultGrubState;

     

       694
       695
        
           local $/ = "\n";

     

       695
       695
       -
           my $name = <FILE>;

     

       696
       696
       +
           my $name = <$fh>;

     

       696
       697
        
           chomp($name);

     

       697
       697
       -
           my $version = <FILE>;

     

       698
       698
       +
           my $version = <$fh>;

     

       698
       699
        
           chomp($version);

     

       699
       699
       -
           my $efi = <FILE>;

     

       700
       700
       +
           my $efi = <$fh>;

     

       700
       701
        
           chomp($efi);

     

       701
       701
       -
           my $devices = <FILE>;

     

       702
       702
       +
           my $devices = <$fh>;

     

       702
       703
        
           chomp($devices);

     

       703
       703
       -
           my $efiMountPoint = <FILE>;

     

       704
       704
       +
           my $efiMountPoint = <$fh>;

     

       704
       705
        
           chomp($efiMountPoint);

     

       705
       706
        
           # Historically, arguments in the state file were one per each line, but that

     

       706
       707
        
           # gets really messy when newlines are involved, structured arguments

     
···

       708
       709
        
           # when we need to remove a setting in the future. Thus, the 6th line is a JSON

     

       709
       710
        
           # object that can store structured data, with named keys, and all new state

     

       710
       711
        
           # should go in there.

     

       711
       711
       -
           my $jsonStateLine = <FILE>;

     

       712
       712
       +
           my $jsonStateLine = <$fh>;

     

       712
       713
        
           # For historical reasons we do not check the values above for un-definedness

     

       713
       714
        
           # (that is, when the state file has too few lines and EOF is reached),

     

       714
       715
        
           # because the above come from the first version of this logic and are thus

     
···

       720
       721
        
           }

     

       721
       722
        
           my %jsonState = %{decode_json($jsonStateLine)};

     

       722
       723
        
           my @extraGrubInstallArgs = exists($jsonState{'extraGrubInstallArgs'}) ? @{$jsonState{'extraGrubInstallArgs'}} : ();

     

       723
       723
       -
           close FILE;

     

       724
       724
       +
           close $fh;

     

       724
       725
        
           my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint, extraGrubInstallArgs => \@extraGrubInstallArgs );

     

       725
       726
        
           return $grubState

     

       726
       727
        
       }

     
···

       787
       788
        
           my $stateFile = "$bootPath/grub/state";

     

       788
       789
        
           my $stateFileTmp = $stateFile . ".tmp";

     

       789
       790
        
       

     

       790
       790
       -
           open FILE, ">$stateFileTmp" or die "cannot create $stateFileTmp: $!\n";

     

       791
       791
       -
           print FILE get("fullName"), "\n" or die;

     

       792
       792
       -
           print FILE get("fullVersion"), "\n" or die;

     

       793
       793
       -
           print FILE $efiTarget, "\n" or die;

     

       794
       794
       -
           print FILE join( ",", @deviceTargets ), "\n" or die;

     

       795
       795
       -
           print FILE $efiSysMountPoint, "\n" or die;

     

       791
       791
       +
           open my $fh, ">", "$stateFileTmp" or die "cannot create $stateFileTmp: $!\n";

     

       792
       792
       +
           print $fh get("fullName"), "\n" or die;

     

       793
       793
       +
           print $fh get("fullVersion"), "\n" or die;

     

       794
       794
       +
           print $fh $efiTarget, "\n" or die;

     

       795
       795
       +
           print $fh join( ",", @deviceTargets ), "\n" or die;

     

       796
       796
       +
           print $fh $efiSysMountPoint, "\n" or die;

     

       796
       797
        
           my %jsonState = (

     

       797
       798
        
               extraGrubInstallArgs => \@extraGrubInstallArgs

     

       798
       799
        
           );

     

       799
       800
        
           my $jsonStateLine = encode_json(\%jsonState);

     

       800
       800
       -
           print FILE $jsonStateLine, "\n" or die;

     

       801
       801
       -
           close FILE or die;

     

       801
       801
       +
           print $fh $jsonStateLine, "\n" or die;

     

       802
       802
       +
           close $fh or die;

     

       802
       803
        
       

     

       803
       804
        
           # Atomically switch to the new state file

     

       804
       805
        
           rename $stateFileTmp, $stateFile or die "cannot rename $stateFileTmp to $stateFile: $!\n";

+5 -5

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "2.61.28",

     

       2
       2
       +
         "version": "2.63.32",

     

       3
       3
        
         "linux-x64": {

     

       4
       4
       -
           "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=",

     

       4
       4
       +
           "hash": "sha256-laI6zoydOKAkRHZvHXQ6eFEJoFrb2I2Fe6gvti3eoJg=",

     

       5
       5
        
           "binaries": [

     

       6
       6
        
             ".debugger/createdump",

     

       7
       7
        
             ".debugger/vsdbg",

     
···

       11
       11
        
           ]

     

       12
       12
        
         },

     

       13
       13
        
         "linux-arm64": {

     

       14
       14
       -
           "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=",

     

       14
       14
       +
           "hash": "sha256-3XWSzNhPSoAUlVVe3RNQ/Ttxm4WIuWahH0hGd4FXFhw=",

     

       15
       15
        
           "binaries": [

     

       16
       16
        
             ".debugger/createdump",

     

       17
       17
        
             ".debugger/vsdbg",

     
···

       21
       21
        
           ]

     

       22
       22
        
         },

     

       23
       23
        
         "darwin-x64": {

     

       24
       24
       -
           "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=",

     

       24
       24
       +
           "hash": "sha256-TfI6XR2jCxKCNt3mNu+ndH3KqHctWK+JF52eNd+QaLQ=",

     

       25
       25
        
           "binaries": [

     

       26
       26
        
             ".debugger/x86_64/createdump",

     

       27
       27
        
             ".debugger/x86_64/vsdbg",

     
···

       31
       31
        
           ]

     

       32
       32
        
         },

     

       33
       33
        
         "darwin-arm64": {

     

       34
       34
       -
           "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=",

     

       34
       34
       +
           "hash": "sha256-SoTaPgFYuxilmXZ/QXrc8xrMa58u6HnmuhiNK9knfME=",

     

       35
       35
        
           "binaries": [

     

       36
       36
        
             ".debugger/arm64/createdump",

     

       37
       37
        
             ".debugger/arm64/vsdbg",

+32 -11

pkgs/applications/radio/unixcw/default.nix pkgs/by-name/un/unixcw/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         mkDerivation,

     

       3
       3
       +
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
        
         libpulseaudio,

     

       6
       6
        
         alsa-lib,

     

       7
       7
        
         pkg-config,

     

       8
       8
       -
         qtbase,

     

       8
       8
       +
         qt5,

     

       9
       9
       +
         ncurses,

     

       10
       10
       +
         autoreconfHook,

     

       9
       11
        
       }:

     

       10
       12
        
       

     

       11
       11
       -
       mkDerivation rec {

     

       13
       13
       +
       stdenv.mkDerivation rec {

     

       12
       14
        
         pname = "unixcw";

     

       13
       15
        
         version = "3.5.1";

     

       16
       16
       +
       

     

       14
       17
        
         src = fetchurl {

     

       15
       18
        
           url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz";

     

       16
       16
       -
           sha256 = "5f3aacd8a26e16e6eff437c7ae1e9b389956fb137eeb3de24670ce05de479e7a";

     

       19
       19
       +
           hash = "sha256-Xzqs2KJuFubv9DfHrh6bOJlW+xN+6z3iRnDOBd5Hnno=";

     

       17
       20
        
         };

     

       21
       21
       +
       

     

       18
       22
        
         patches = [

     

       19
       23
        
           ./remove-use-of-dlopen.patch

     

       24
       24
       +
       

     

       25
       25
       +
           # fix pkg-config searching for ncurses

     

       26
       26
       +
           # yoinked from gentoo (https://gitweb.gentoo.org/repo/gentoo.git/tree/media-radio/unixcw/files/unixcw-3.6-tinfo.patch), with modifications

     

       27
       27
       +
           ./unixcw-3.6-tinfo.patch

     

       20
       28
        
         ];

     

       21
       21
       -
         nativeBuildInputs = [ pkg-config ];

     

       29
       29
       +
       

     

       30
       30
       +
         postPatch = ''

     

       31
       31
       +
           substituteInPlace src/cwcp/Makefile.am \

     

       32
       32
       +
             --replace-fail '-lcurses' '-lncurses'

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         nativeBuildInputs = [

     

       36
       36
       +
           autoreconfHook

     

       37
       37
       +
           pkg-config

     

       38
       38
       +
           qt5.wrapQtAppsHook

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       22
       41
        
         buildInputs = [

     

       23
       42
        
           libpulseaudio

     

       24
       43
        
           alsa-lib

     

       25
       25
       -
           qtbase

     

       44
       44
       +
           qt5.qtbase

     

       45
       45
       +
           ncurses

     

       26
       46
        
         ];

     

       47
       47
       +
       

     

       27
       48
        
         CFLAGS = "-lasound -lpulse-simple";

     

       28
       49
        
       

     

       29
       29
       -
         meta = with lib; {

     

       30
       30
       -
           description = "sound characters as Morse code on the soundcard or console speaker";

     

       50
       50
       +
         meta = {

     

       51
       51
       +
           description = "Sound characters as Morse code on the soundcard or console speaker";

     

       31
       52
        
           longDescription = ''

     

       32
       53
        
             unixcw is a project providing libcw library and a set of programs

     

       33
       54
        
             using the library: cw, cwgen, cwcp and xcwcp.

     
···

       44
       65
        
             cw reports any errors in  embedded  commands

     

       45
       66
        
           '';

     

       46
       67
        
           homepage = "https://unixcw.sourceforge.net";

     

       47
       47
       -
           maintainers = [ maintainers.mafo ];

     

       48
       48
       -
           license = licenses.gpl2;

     

       49
       49
       -
           platforms = platforms.linux;

     

       68
       68
       +
           maintainers = [ lib.maintainers.mafo ];

     

       69
       69
       +
           license = lib.licenses.gpl2Plus;

     

       70
       70
       +
           platforms = lib.platforms.linux;

     

       50
       71
        
         };

     

       51
       72
        
       }

pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch

+3 -3

pkgs/by-name/b3/b3sum/package.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "b3sum";

     

       9
       9
       -
         version = "1.5.5";

     

       9
       9
       +
         version = "1.6.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchCrate {

     

       12
       12
        
           inherit version pname;

     

       13
       13
       -
           hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE=";

     

       13
       13
       +
           hash = "sha256-nsixj/zskHNIkv/qiD1DvrjeqkzVuN76tH+vCLGvPW8=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         useFetchCargoVendor = true;

     

       17
       17
       -
         cargoHash = "sha256-4RD6GcBGUHMXS8BYs1NqpR3fVul2J3qh5E4MFnMbwoE=";

     

       17
       17
       +
         cargoHash = "sha256-HAbL/3StlK+VlonoviB2hFxCj7oyG93ReUytE3pFOMQ=";

     

       18
       18
        
       

     

       19
       19
        
         meta = {

     

       20
       20
        
           description = "BLAKE3 cryptographic hash function";

+3 -3

pkgs/by-name/ci/civo/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "civo";

     

       10
       10
       -
         version = "1.1.95";

     

       10
       10
       +
         version = "1.1.97";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "civo";

     

       14
       14
        
           repo = "cli";

     

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

     

       16
       16
       -
           hash = "sha256-/byI9QFxkCiyVvxF0K1RjK5xW4EE8l/+LqqKy9GW1Pw=";

     

       16
       16
       +
           hash = "sha256-0BIvKzG+ePN4VyXPj4VfCoZiq/pDZb9/7k/kTIa4Fqs=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-ZylfnOeS6tXYaBbXg5znus6CKE+IZXmPSOc9UwYtscc=";

     

       19
       19
       +
         vendorHash = "sha256-V1R5MQ3y8mcm8ffc2INKk6BTYUROEvr8lHBs6MvbpkQ=";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ installShellFiles ];

     

       22
       22

+9 -7

pkgs/by-name/cl/clapper/package.nix

···

       20
       20
        
         libmicrodns,

     

       21
       21
        
         gtuber,

     

       22
       22
        
         glib-networking,

     

       23
       23
       +
         libpeas2,

     

       23
       24
        
       }:

     

       24
       25
        
       

     

       25
       26
        
       stdenv.mkDerivation (finalAttrs: {

     

       26
       27
        
         pname = "clapper";

     

       27
       27
       -
         version = "0.6.1";

     

       28
       28
       +
         version = "0.8.0";

     

       28
       29
        
       

     

       29
       30
        
         src = fetchFromGitHub {

     

       30
       31
        
           owner = "Rafostar";

     

       31
       32
        
           repo = "clapper";

     

       32
       32
       -
           rev = finalAttrs.version;

     

       33
       33
       -
           hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc=";

     

       33
       33
       +
           tag = finalAttrs.version;

     

       34
       34
       +
           hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs=";

     

       34
       35
        
         };

     

       35
       36
        
       

     

       36
       37
        
         nativeBuildInputs = [

     
···

       59
       60
        
           libadwaita

     

       60
       61
        
           libsoup_3

     

       61
       62
        
           libmicrodns

     

       63
       63
       +
           libpeas2

     

       62
       64
        
         ];

     

       63
       65
        
       

     

       64
       66
        
         postPatch = ''

     
···

       72
       74
        
           )

     

       73
       75
        
         '';

     

       74
       76
        
       

     

       75
       75
       -
         meta = with lib; {

     

       77
       77
       +
         meta = {

     

       76
       78
        
           description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering";

     

       77
       79
        
           longDescription = ''

     

       78
       80
        
             Clapper is a GNOME media player built using the GTK4 toolkit.

     

       79
       81
        
             The media player is using GStreamer as a media backend.

     

       80
       82
        
           '';

     

       81
       83
        
           homepage = "https://github.com/Rafostar/clapper";

     

       82
       82
       -
           license = licenses.gpl3Plus;

     

       83
       83
       -
           maintainers = with maintainers; [ aleksana ];

     

       84
       84
       -
           platforms = platforms.linux;

     

       84
       84
       +
           license = lib.licenses.gpl3Plus;

     

       85
       85
       +
           maintainers = with lib.maintainers; [ aleksana ];

     

       86
       86
       +
           platforms = lib.platforms.linux;

     

       85
       87
        
         };

     

       86
       88
        
       })

+52

pkgs/by-name/cl/clashtui/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         rustPlatform,

     

       5
       5
       +
         versionCheckHook,

     

       6
       6
       +
         nix-update-script,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       rustPlatform.buildRustPackage rec {

     

       10
       10
       +
         pname = "clashtui";

     

       11
       11
       +
         version = "0.2.3";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "JohanChane";

     

       15
       15
       +
           repo = "clashtui";

     

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

     

       17
       17
       +
           hash = "sha256-2iQVYZrqo55EO0ZGn6ktP/3Py5v+LiVgrSYTtaxYXyQ=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         sourceRoot = "${src.name}/clashtui";

     

       21
       21
       +
       

     

       22
       22
       +
         useFetchCargoVendor = true;

     

       23
       23
       +
       

     

       24
       24
       +
         cargoHash = "sha256-8oDnumyn0Ry1AIWNLO2+1HSPsxkVLRLItgEVEXqSRFI=";

     

       25
       25
       +
       

     

       26
       26
       +
         cargoBuildFlags = [ "--all-features" ];

     

       27
       27
       +
       

     

       28
       28
       +
         checkFlags = [

     

       29
       29
       +
           # need fhs

     

       30
       30
       +
           "--skip=utils::config::test::test_save_and_load"

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         doInstallCheck = true;

     

       34
       34
       +
       

     

       35
       35
       +
         versionCheckProgramArg = "--version";

     

       36
       36
       +
       

     

       37
       37
       +
         nativeInstallCheckInputs = [

     

       38
       38
       +
           versionCheckHook

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         passthru.updateScript = nix-update-script { };

     

       42
       42
       +
       

     

       43
       43
       +
         meta = {

     

       44
       44
       +
           description = "Mihomo (Clash.Meta) TUI Client";

     

       45
       45
       +
           homepage = "https://github.com/JohanChane/clashtui";

     

       46
       46
       +
           changelog = "https://github.com/JohanChane/clashtui/releases/tag/v${version}";

     

       47
       47
       +
           mainProgram = "clashtui";

     

       48
       48
       +
           license = lib.licenses.mit;

     

       49
       49
       +
           platforms = lib.platforms.linux;

     

       50
       50
       +
           maintainers = with lib.maintainers; [ nayeko ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+8 -8

pkgs/by-name/de/deltachat-desktop/package.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , copyDesktopItems

     

       3
       3
       -
       , electron_32

     

       3
       3
       +
       , electron_34

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , deltachat-rpc-server

     

       6
       6
        
       , makeDesktopItem

     
···

       19
       19
        
       

     

       20
       20
        
       let

     

       21
       21
        
         deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {

     

       22
       22
       -
           version = "1.155.1";

     

       22
       22
       +
           version = "1.155.5";

     

       23
       23
        
           src = fetchFromGitHub {

     

       24
       24
        
             owner = "deltachat";

     

       25
       25
        
             repo = "deltachat-core-rust";

     

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

     

       27
       27
       -
             hash = "sha256-XZLKvOvdyvR5poRY/oo9MHi1f2XzBmSDR8VqjW3wq74=";

     

       27
       27
       +
             hash = "sha256-U0phIPkR4lt/WsCDt2TQv8NfjG04JdmCVDbMA1/ySdo=";

     

       28
       28
        
           };

     

       29
       29
        
           cargoDeps = rustPlatform.fetchCargoVendor {

     

       30
       30
        
             pname = "deltachat-core-rust";

     

       31
       31
        
             inherit version src;

     

       32
       32
       -
             hash = "sha256-ZxKR1M9wqmzKVbSdBKzTsKF9tDVRGHnd+Ra9Jy5CQQY=";

     

       32
       32
       +
             hash = "sha256-lkqBC/b128GSMpvAWpWmkrrf/E0twCDtDM1EBPOnp7Y=";

     

       33
       33
        
           };

     

       34
       34
        
         };

     

       35
       35
       -
         electron = electron_32;

     

       35
       35
       +
         electron = electron_34;

     

       36
       36
        
         pnpm = pnpm_9;

     

       37
       37
        
       in

     

       38
       38
        
       stdenv.mkDerivation (finalAttrs: {

     

       39
       39
        
         pname = "deltachat-desktop";

     

       40
       40
       -
         version = "1.52.1";

     

       40
       40
       +
         version = "1.54.1";

     

       41
       41
        
       

     

       42
       42
        
         src = fetchFromGitHub {

     

       43
       43
        
           owner = "deltachat";

     

       44
       44
        
           repo = "deltachat-desktop";

     

       45
       45
        
           tag = "v${finalAttrs.version}";

     

       46
       46
       -
           hash = "sha256-L/dgdg7Yrosy054Jdo2ST3x37kQ+CHOEN92/YNjnTYc=";

     

       46
       46
       +
           hash = "sha256-mt0y7W16ThRYQNALFPBNcnR34MDqs6m3Vt+mYALqGs8=";

     

       47
       47
        
         };

     

       48
       48
        
       

     

       49
       49
        
         pnpmDeps = pnpm.fetchDeps {

     

       50
       50
        
           inherit (finalAttrs) pname version src;

     

       51
       51
       -
           hash = "sha256-ovwdFpVFqXaGqsYc1ldhimqgdi0CXjQYMMMcmUXtMFc=";

     

       51
       51
       +
           hash = "sha256-/1utoiKw/BycWPuwWykcJniUw9kUGk/WtPCqqZu8E+U=";

     

       52
       52
        
         };

     

       53
       53
        
       

     

       54
       54
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/de/devenv/package.nix

···

       27
       27
        
           doInstallCheck = false;

     

       28
       28
        
         });

     

       29
       29
        
       

     

       30
       30
       -
         version = "1.4";

     

       30
       30
       +
         version = "1.4.1";

     

       31
       31
        
       in

     

       32
       32
        
       rustPlatform.buildRustPackage {

     

       33
       33
        
         pname = "devenv";

     
···

       37
       37
        
           owner = "cachix";

     

       38
       38
        
           repo = "devenv";

     

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

     

       40
       40
       -
           hash = "sha256-ax0264nOyPcTJvIJAnPKGfkfXQ8Oe8ZVFziKf3UV26o=";

     

       40
       40
       +
           hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4=";

     

       41
       41
        
         };

     

       42
       42
        
       

     

       43
       43
        
         useFetchCargoVendor = true;

     

       44
       44
       -
         cargoHash = "sha256-K06D4tD3IOCA7/iqQ7fhybsgcSmMxPUcoUi+VNPtgAY=";

     

       44
       44
       +
         cargoHash = "sha256-Z7xf1fuXi2Lx005rQwWa7ZNw8nJGz1z33KPnX/pxO3E=";

     

       45
       45
        
       

     

       46
       46
        
         buildAndTestSubdir = "devenv";

     

       47
       47

+36

pkgs/by-name/hu/humblebundle-downloader/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         fetchFromGitHub,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         python3Packages,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       python3Packages.buildPythonApplication rec {

     

       8
       8
       +
         pname = "humblebundle-downloader";

     

       9
       9
       +
         version = "0.4.3";

     

       10
       10
       +
         pyproject = true;

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "xtream1101";

     

       14
       14
       +
           repo = "humblebundle-downloader";

     

       15
       15
       +
           tag = version;

     

       16
       16
       +
           hash = "sha256-fLfAGDKn6AWHJKsgQ0fBYdN6mGfZNrVs9n6Zo9VRgIY=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         build-system = with python3Packages; [

     

       20
       20
       +
           poetry-core

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         dependencies = with python3Packages; [

     

       24
       24
       +
           parsel

     

       25
       25
       +
           requests

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         meta = {

     

       29
       29
       +
           description = "Download your Humble Bundle Library";

     

       30
       30
       +
           mainProgram = "hbd";

     

       31
       31
       +
           homepage = "https://github.com/xtream1101/humblebundle-downloader";

     

       32
       32
       +
           changelog = "https://github.com/xtream1101/humblebundle-downloader/blob/${src.tag}/CHANGELOG.md";

     

       33
       33
       +
           license = with lib.licenses; [ mit ];

     

       34
       34
       +
           maintainers = with lib.maintainers; [ jopejoe1 ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+3 -3

pkgs/by-name/li/libdeltachat/package.nix

···

       20
       20
        
       

     

       21
       21
        
       stdenv.mkDerivation rec {

     

       22
       22
        
         pname = "libdeltachat";

     

       23
       23
       -
         version = "1.155.4";

     

       23
       23
       +
         version = "1.155.6";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "deltachat";

     

       27
       27
        
           repo = "deltachat-core-rust";

     

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

     

       29
       29
       -
           hash = "sha256-cSk3GK6jlFkZ7XckB9PKIYHyK1Yj1qoJvWDrlbRmrhw=";

     

       29
       29
       +
           hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         patches = [

     
···

       36
       36
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       37
       37
        
           pname = "deltachat-core-rust";

     

       38
       38
        
           inherit version src;

     

       39
       39
       -
           hash = "sha256-+j6ENk6wvA3t2I2C8J2tOYJUVSS6s1Wa/8sDwGqF9Ho=";

     

       39
       39
       +
           hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/mi/mitra/package.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "mitra";

     

       9
       9
       -
         version = "3.14.0";

     

       9
       9
       +
         version = "3.16.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitea {

     

       12
       12
        
           domain = "codeberg.org";

     

       13
       13
        
           owner = "silverpill";

     

       14
       14
        
           repo = "mitra";

     

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

     

       16
       16
       -
           hash = "sha256-4f0zh7rdS0lTnN4OzUEL8tn6S18cYTj92vA8akyt4K4=";

     

       16
       16
       +
           hash = "sha256-jVm1ftFSOxEseNgze6xsF9k8G02UJc3f/CGxzdNzfhw=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         useFetchCargoVendor = true;

     

       20
       20
       -
         cargoHash = "sha256-MA/C/8x7Bmh6ekd4iHvjX9Lf/hG43Qb5nhEHINpeBHA=";

     

       20
       20
       +
         cargoHash = "sha256-QQRl9/Rc0cVs1ug5LXN9OFZI4uTO7Jgu1vQQM/RQsLo=";

     

       21
       21
        
       

     

       22
       22
        
         # require running database

     

       23
       23
        
         doCheck = false;

+3 -3

pkgs/by-name/nc/ncmpc/package.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         pname = "ncmpc";

     

       20
       20
       -
         version = "0.51";

     

       20
       20
       +
         version = "0.52";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "MusicPlayerDaemon";

     

       24
       24
        
           repo = "ncmpc";

     

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

     

       26
       26
       -
           sha256 = "sha256-mFZ8szJT7eTPHQHxjpP5pThCcY0YERGkGR8528Xu9MA=";

     

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

     

       26
       26
       +
           sha256 = "sha256-j/hZdKl1LQ/yEGDUv9k5PQJ6pngAl52mVCpfacWrRw0=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [

+13 -6

pkgs/by-name/oc/oculante/package.nix

···

       55
       55
        
             libXi

     

       56
       56
        
             libXrandr

     

       57
       57
        
             gtk3

     

       58
       58
       -
       

     

       59
       58
        
             libxkbcommon

     

       60
       59
        
             wayland

     

       61
       60
        
           ]

     
···

       70
       69
        
         ];

     

       71
       70
        
       

     

       72
       71
        
         postInstall = ''

     

       73
       73
       -
           install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/

     

       72
       72
       +
           install -Dm444 $src/res/icons/icon.png $out/share/icons/hicolor/128x128/apps/oculante.png

     

       74
       73
        
           install -Dm444 $src/res/oculante.desktop -t $out/share/applications

     

       75
       74
        
           wrapProgram $out/bin/oculante \

     

       76
       76
       -
             --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}

     

       75
       75
       +
             --prefix LD_LIBRARY_PATH : ${

     

       76
       76
       +
               lib.makeLibraryPath (

     

       77
       77
       +
                 [

     

       78
       78
       +
                   libGL

     

       79
       79
       +
                   libxkbcommon

     

       80
       80
       +
                 ]

     

       81
       81
       +
                 ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]

     

       82
       82
       +
               )

     

       83
       83
       +
             }

     

       77
       84
        
         '';

     

       78
       85
        
       

     

       79
       79
       -
         meta = with lib; {

     

       86
       86
       +
         meta = {

     

       80
       87
        
           broken = stdenv.hostPlatform.isDarwin;

     

       81
       88
        
           description = "Minimalistic crossplatform image viewer written in Rust";

     

       82
       89
        
           homepage = "https://github.com/woelper/oculante";

     

       83
       90
        
           changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";

     

       84
       84
       -
           license = licenses.mit;

     

       91
       91
       +
           license = lib.licenses.mit;

     

       85
       92
        
           mainProgram = "oculante";

     

       86
       86
       -
           maintainers = with maintainers; [

     

       93
       93
       +
           maintainers = with lib.maintainers; [

     

       87
       94
        
             dit7ya

     

       88
       95
        
             figsoda

     

       89
       96
        
           ];

+3 -3

pkgs/by-name/pr/prometheus-node-exporter/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "node_exporter";

     

       12
       12
       -
         version = "1.8.2";

     

       12
       12
       +
         version = "1.9.0";

     

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

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           inherit rev;

     

       17
       17
        
           owner = "prometheus";

     

       18
       18
        
           repo = "node_exporter";

     

       19
       19
       -
           hash = "sha256-b2uior67RcCCpUE+qx55G1eWiT2wWDVsnosSH9fd3/I=";

     

       19
       19
       +
           hash = "sha256-mm4ZQjpIxaCbKIhZak0ZD4HVx3t+0m6YwjtIWak8RXc=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-sly8AJk+jNZG8ijTBF1Pd5AOOUJJxIG8jHwBUdlt8fM=";

     

       22
       22
       +
         vendorHash = "sha256-rItbct0UIWs9zulyoQF647RwLJkTsBTDJHLORCgVDo8=";

     

       23
       23
        
       

     

       24
       24
        
         # FIXME: tests fail due to read-only nix store

     

       25
       25
        
         doCheck = false;

+2 -2

pkgs/by-name/ri/rimgo/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         fetchFromGitea,

     

       4
       4
        
         buildGoModule,

     

       5
       5
       -
         tailwindcss,

     

       5
       5
       +
         tailwindcss_3,

     

       6
       6
        
       }:

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "rimgo";

     
···

       18
       18
        
       

     

       19
       19
        
         vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU=";

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ tailwindcss ];

     

       21
       21
       +
         nativeBuildInputs = [ tailwindcss_3 ];

     

       22
       22
        
       

     

       23
       23
        
         preBuild = ''

     

       24
       24
        
           tailwindcss -i static/tailwind.css -o static/app.css -m

+13 -15

pkgs/by-name/ro/root/package.nix

···

       11
       11
        
         coreutils,

     

       12
       12
        
         git,

     

       13
       13
        
         davix,

     

       14
       14
       +
         fftw,

     

       14
       15
        
         ftgl,

     

       15
       16
        
         gl2ps,

     

       16
       17
        
         glew,

     

       17
       18
        
         gnugrep,

     

       18
       19
        
         gnused,

     

       19
       20
        
         gsl,

     

       20
       20
       -
         gtest,

     

       21
       21
        
         lapack,

     

       22
       22
       -
         libX11,

     

       23
       23
       -
         libXpm,

     

       24
       24
       -
         libXft,

     

       25
       25
       -
         libXext,

     

       26
       22
        
         libGLU,

     

       27
       23
        
         libGL,

     

       28
       24
        
         libxcrypt,

     
···

       30
       26
        
         llvm_18,

     

       31
       27
        
         lsof,

     

       32
       28
        
         lz4,

     

       29
       29
       +
         xorg,

     

       33
       30
        
         xz,

     

       34
       31
        
         man,

     

       35
       32
        
         openblas,

     
···

       56
       53
        
       

     

       57
       54
        
       stdenv.mkDerivation rec {

     

       58
       55
        
         pname = "root";

     

       59
       59
       -
         version = "6.34.02";

     

       56
       56
       +
         version = "6.34.04";

     

       60
       57
        
       

     

       61
       58
        
         passthru = {

     

       62
       59
        
           tests = import ./tests { inherit callPackage; };

     
···

       64
       61
        
       

     

       65
       62
        
         src = fetchurl {

     

       66
       63
        
           url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";

     

       67
       67
       -
           hash = "sha256-FmvsVi5CDhd6rzEz+j+wn4Ls3avoouGQY0W61EJRP5Q=";

     

       64
       64
       +
           hash = "sha256-4yDFNzqOh7sptygJVMqDVa2MQpXPSSNWBvDIsgCss3Q=";

     

       68
       65
        
         };

     

       69
       66
        
       

     

       70
       67
        
         clad_src = fetchgit {

     
···

       87
       84
        
         buildInputs =

     

       88
       85
        
           [

     

       89
       86
        
             davix

     

       87
       87
       +
             fftw

     

       90
       88
        
             ftgl

     

       91
       89
        
             giflib

     

       92
       90
        
             gl2ps

     

       93
       91
        
             glew

     

       94
       92
        
             gsl

     

       95
       95
       -
             gtest

     

       96
       93
        
             lapack

     

       97
       94
        
             libjpeg

     

       98
       95
        
             libpng

     
···

       117
       114
        
           ]

     

       118
       115
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ]

     

       119
       116
        
           ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

     

       120
       120
       -
             libX11

     

       121
       121
       -
             libXpm

     

       122
       122
       -
             libXft

     

       123
       123
       -
             libXext

     

       124
       117
        
             libGLU

     

       125
       118
        
             libGL

     

       119
       119
       +
             xorg.libX11

     

       120
       120
       +
             xorg.libXpm

     

       121
       121
       +
             xorg.libXft

     

       122
       122
       +
             xorg.libXext

     

       126
       123
        
           ];

     

       127
       124
        
       

     

       128
       125
        
         preConfigure =

     
···

       135
       132
        
             substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \

     

       136
       133
        
               --replace-fail 'set(lcgpackages ' '#set(lcgpackages '

     

       137
       134
        
       

     

       138
       138
       -
             # Make sure that clad is not downloaded when building

     

       139
       139
       -
             substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \

     

       140
       140
       -
               --replace-fail 'UPDATE_COMMAND ""' 'DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'

     

       141
       135
        
             # Make sure that clad is finding the right llvm version

     

       142
       136
        
             substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \

     

       143
       137
        
               --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}'

     
···

       151
       145
        
             # Eliminate impure reference to /System/Library/PrivateFrameworks

     

       152
       146
        
             substituteInPlace core/macosx/CMakeLists.txt \

     

       153
       147
        
               --replace-fail "-F/System/Library/PrivateFrameworks " ""

     

       148
       148
       +
             # Just like in libpng/12.nix to build the builtin libpng on macOS

     

       149
       149
       +
             substituteInPlace graf2d/asimage/src/libAfterImage/libpng/pngpriv.h \

     

       150
       150
       +
               --replace-fail '<fp.h>' '<math.h>'

     

       154
       151
        
           ''

     

       155
       152
        
           +

     

       156
       153
        
             lib.optionalString

     
···

       167
       164
        
             "-DCMAKE_INSTALL_LIBDIR=lib"

     

       168
       165
        
             "-Dbuiltin_llvm=OFF"

     

       169
       166
        
             "-Dfail-on-missing=ON"

     

       167
       167
       +
             "-Dfftw3=ON"

     

       170
       168
        
             "-Dfitsio=OFF"

     

       171
       169
        
             "-Dgnuinstall=ON"

     

       172
       170
        
             "-Dmathmore=ON"

-1

pkgs/by-name/ro/root5/package.nix

···

       115
       115
        
             done

     

       116
       116
        
       

     

       117
       117
        
             patchShebangs build/unix/

     

       118
       118
       -
             ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/

     

       119
       118
        
       

     

       120
       119
        
             # __malloc_hook is deprecated

     

       121
       120
        
             substituteInPlace misc/memstat/src/TMemStatHook.cxx \

+2 -2

pkgs/by-name/st/stalwart-mail/webadmin.nix

···

       3
       3
        
         rustPlatform,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         trunk,

     

       6
       6
       -
         tailwindcss,

     

       6
       6
       +
         tailwindcss_3,

     

       7
       7
        
         fetchNpmDeps,

     

       8
       8
        
         nix-update-script,

     

       9
       9
        
         nodejs,

     
···

       44
       44
        
           llvmPackages.bintools-unwrapped

     

       45
       45
        
           nodejs

     

       46
       46
        
           npmHooks.npmConfigHook

     

       47
       47
       -
           tailwindcss

     

       47
       47
       +
           tailwindcss_3

     

       48
       48
        
           trunk

     

       49
       49
        
           # needs to match with wasm-bindgen version in upstreams Cargo.lock

     

       50
       50
        
           wasm-bindgen-cli_0_2_93

+1 -1

pkgs/by-name/ta/tailwindcss/package.nix

···

       1
       1
       -
       { tailwindcss_4 }: tailwindcss_4

     

       1
       1
       +
       { tailwindcss_3 }: tailwindcss_3

+20

pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch

···

       1
       1
       +
       --- a/configure.ac	2017-03-07 13:31:46.074580930 +0100

     

       2
       2
       +
       +++ b/configure.ac	2017-03-07 13:33:25.640924331 +0100

     

       3
       3
       +
       @@ -347,7 +347,7 @@

     

       4
       4
       +
            AC_DEFINE([LIBCW_WITH_PULSEAUDIO], [1], [Define as 1 if your build machine can support PulseAudio.])

     

       5
       5
       +
        fi

     

       6
       6
       +
        

     

       7
       7
       +
       -

     

       8
       8
       +
       +PKG_PROG_PKG_CONFIG

     

       9
       9
       +
        

     

       10
       10
       +
        if test "$enable_cwcp" = "no" ; then

     

       11
       11
       +
           WITH_CWCP='no'

     

       12
       12
       +
       @@ -355,6 +355,7 @@

     

       13
       13
       +
            AC_CHECK_LIB(curses, initscr)

     

       14
       14
       +
       -    if test $ac_cv_lib_curses_initscr = 'yes' ; then

     

       15
       15
       +
       +    if true ; then

     

       16
       16
       +
        	WITH_CWCP='yes'

     

       17
       17
       +
       +	PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], )

     

       18
       18
       +
            else

     

       19
       19
       +
        	WITH_CWCP='no'

     

       20
       20
       +
        	AC_MSG_WARN([Cannot find libcurses - unable to build cwcp])

+2 -2

pkgs/development/interpreters/php/8.3.nix

···

       4
       4
        
         base = callPackage ./generic.nix (

     

       5
       5
        
           _args

     

       6
       6
        
           // {

     

       7
       7
       -
             version = "8.3.16";

     

       8
       8
       -
             hash = "sha256-6SCCGMvcuBaDS2xe2N3FdI+xL/d3z54OA7tIlidmCLY=";

     

       7
       7
       +
             version = "8.3.17";

     

       8
       8
       +
             hash = "sha256-TgNNynqxb8YGLIxTBnUo9OyqJGvyIxDmhB9wCAlCZKw=";

     

       9
       9
        
           }

     

       10
       10
        
         );

     

       11
       11
        
       in

+11 -11

pkgs/development/libraries/physics/yoda/default.nix pkgs/by-name/yo/yoda/package.nix

···

       4
       4
        
         fetchFromGitLab,

     

       5
       5
        
         autoreconfHook,

     

       6
       6
        
         bash,

     

       7
       7
       -
         python,

     

       7
       7
       +
         python3,

     

       8
       8
        
         root,

     

       9
       9
        
         makeWrapper,

     

       10
       10
        
         zlib,

     
···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "yoda";

     

       16
       16
       -
         version = "2.0.2";

     

       16
       16
       +
         version = "2.0.3";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitLab {

     

       19
       19
        
           owner = "hepcedar";

     

       20
       20
        
           repo = pname;

     

       21
       21
        
           rev = "yoda-${version}";

     

       22
       22
       -
           hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84=";

     

       22
       22
       +
           hash = "sha256-No2Lr4nmYNfFnJVpg7xYjd35g12CbQtpW9QMjM3owko=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         nativeBuildInputs = with python.pkgs; [

     

       25
       25
       +
         nativeBuildInputs = with python3.pkgs; [

     

       26
       26
        
           autoreconfHook

     

       27
       27
        
           bash

     

       28
       28
        
           cython

     
···

       31
       31
        
       

     

       32
       32
        
         buildInputs =

     

       33
       33
        
           [

     

       34
       34
       -
             python

     

       34
       34
       +
             python3

     

       35
       35
        
           ]

     

       36
       36
       -
           ++ (with python.pkgs; [

     

       36
       36
       +
           ++ (with python3.pkgs; [

     

       37
       37
        
             numpy

     

       38
       38
        
             matplotlib

     

       39
       39
        
           ])

     
···

       54
       54
        
           patchShebangs .

     

       55
       55
        
       

     

       56
       56
        
           substituteInPlace pyext/yoda/plotting/script_generator.py \

     

       57
       57
       -
             --replace '/usr/bin/env python' '${python.interpreter}'

     

       57
       57
       +
             --replace '/usr/bin/env python' '${python3.interpreter}'

     

       58
       58
        
         '';

     

       59
       59
        
       

     

       60
       60
        
         postInstall = ''

     
···

       70
       70
        
       

     

       71
       71
        
         installCheckTarget = "check";

     

       72
       72
        
       

     

       73
       73
       -
         meta = with lib; {

     

       73
       73
       +
         meta = {

     

       74
       74
        
           description = "Provides small set of data analysis (specifically histogramming) classes";

     

       75
       75
       -
           license = licenses.gpl3Only;

     

       75
       75
       +
           license = lib.licenses.gpl3Only;

     

       76
       76
        
           homepage = "https://yoda.hepforge.org";

     

       77
       77
        
           changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog";

     

       78
       78
       -
           platforms = platforms.unix;

     

       79
       79
       -
           maintainers = with maintainers; [ veprbl ];

     

       78
       78
       +
           platforms = lib.platforms.unix;

     

       79
       79
       +
           maintainers = with lib.maintainers; [ veprbl ];

     

       80
       80
        
         };

     

       81
       81
        
       }

+19 -35

pkgs/development/ocaml-modules/bitv/default.nix

···

       1
       1
        
       {

     

       2
       2
       -
         stdenv,

     

       3
       2
        
         lib,

     

       4
       3
        
         fetchFromGitHub,

     

       5
       5
       -
         autoreconfHook,

     

       6
       6
       -
         which,

     

       7
       7
       -
         ocaml,

     

       8
       8
       -
         findlib,

     

       4
       4
       +
         buildDunePackage,

     

       9
       5
        
       }:

     

       10
       6
        
       

     

       11
       11
       -
       if lib.versionOlder ocaml.version "4.02" then

     

       12
       12
       -
         throw "bitv is not available for OCaml ${ocaml.version}"

     

       13
       13
       -
       else

     

       14
       14
       -
       

     

       15
       15
       -
         stdenv.mkDerivation rec {

     

       16
       16
       -
           pname = "ocaml${ocaml.version}-bitv";

     

       17
       17
       -
           version = "1.3";

     

       18
       18
       -
       

     

       19
       19
       -
           src = fetchFromGitHub {

     

       20
       20
       -
             owner = "backtracking";

     

       21
       21
       -
             repo = "bitv";

     

       22
       22
       -
             rev = version;

     

       23
       23
       -
             sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4=";

     

       24
       24
       -
           };

     

       25
       25
       -
       

     

       26
       26
       -
           nativeBuildInputs = [

     

       27
       27
       -
             autoreconfHook

     

       28
       28
       -
             which

     

       29
       29
       -
             ocaml

     

       30
       30
       -
             findlib

     

       31
       31
       -
           ];

     

       7
       7
       +
       buildDunePackage rec {

     

       8
       8
       +
         pname = "bitv";

     

       9
       9
       +
         version = "2.0";

     

       10
       10
       +
         minimalOCamlVersion = "4.08";

     

       32
       11
        
       

     

       33
       33
       -
           createFindlibDestdir = true;

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "backtracking";

     

       14
       14
       +
           repo = "bitv";

     

       15
       15
       +
           tag = version;

     

       16
       16
       +
           hash = "sha256-llfbdrvxrz6323G2LBAtKaXOrHQriFzaz3ulvFVhH6s=";

     

       17
       17
       +
         };

     

       34
       18
        
       

     

       35
       35
       -
           meta = {

     

       36
       36
       -
             description = "Bit vector library for OCaml";

     

       37
       37
       -
             license = lib.licenses.lgpl21;

     

       38
       38
       -
             homepage = "https://github.com/backtracking/bitv";

     

       39
       39
       -
             maintainers = [ lib.maintainers.vbgl ];

     

       40
       40
       -
             inherit (ocaml.meta) platforms;

     

       41
       41
       -
           };

     

       42
       42
       -
         }

     

       19
       19
       +
         meta = {

     

       20
       20
       +
           description = "Bit vector library for OCaml";

     

       21
       21
       +
           license = lib.licenses.lgpl21;

     

       22
       22
       +
           homepage = "https://github.com/backtracking/bitv";

     

       23
       23
       +
           changelog = "https://github.com/backtracking/bitv/releases/tag/${version}";

     

       24
       24
       +
           maintainers = [ lib.maintainers.vbgl ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+6 -2

pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix

···

       14
       14
        
         pname = "ctypes_stubs_js";

     

       15
       15
        
         version = "0.1";

     

       16
       16
        
       

     

       17
       17
       -
         duneVersion = "3";

     

       18
       17
        
         minimalOCamlVersion = "4.08";

     

       19
       18
        
       

     

       20
       19
        
         src = fetchFromGitLab {

     
···

       27
       26
        
         propagatedBuildInputs = [ integers_stubs_js ];

     

       28
       27
        
         nativeCheckInputs = [

     

       29
       28
        
           nodejs

     

       30
       30
       -
           js_of_ocaml-compiler

     

       29
       29
       +
           (

     

       30
       30
       +
             if lib.versionAtLeast js_of_ocaml-compiler.version "6.0" then

     

       31
       31
       +
               js_of_ocaml-compiler.override { version = "5.9.1"; }

     

       32
       32
       +
             else

     

       33
       33
       +
               js_of_ocaml-compiler

     

       34
       34
       +
           )

     

       31
       35
        
         ];

     

       32
       36
        
         checkInputs = [

     

       33
       37
        
           ctypes

-1

pkgs/development/ocaml-modules/gen_js_api/ojs.nix

···

       8
       8
        
         pname = "ojs";

     

       9
       9
        
       

     

       10
       10
        
         inherit (gen_js_api) version src;

     

       11
       11
       -
         duneVersion = "3";

     

       12
       11
        
       

     

       13
       12
        
         propagatedBuildInputs = [ js_of_ocaml-compiler ];

     

       14
       13

+10

pkgs/development/ocaml-modules/janestreet/0.15.nix

···

       9
       9
        
         zstd,

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       +
       let

     

       13
       13
       +
         js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };

     

       14
       14
       +
         js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };

     

       15
       15
       +
         gen_js_api = self.gen_js_api.override {

     

       16
       16
       +
           inherit js_of_ocaml-compiler;

     

       17
       17
       +
           ojs = self.ojs.override { inherit js_of_ocaml-compiler; };

     

       18
       18
       +
         };

     

       19
       19
       +
         js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };

     

       20
       20
       +
       in

     

       21
       21
       +
       

     

       12
       22
        
       with self;

     

       13
       23
        
       

     

       14
       24
        
       {

+10

pkgs/development/ocaml-modules/janestreet/0.16.nix

···

       9
       9
        
         krb5,

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       +
       let

     

       13
       13
       +
         js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };

     

       14
       14
       +
         js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };

     

       15
       15
       +
         gen_js_api = self.gen_js_api.override {

     

       16
       16
       +
           inherit js_of_ocaml-compiler;

     

       17
       17
       +
           ojs = self.ojs.override { inherit js_of_ocaml-compiler; };

     

       18
       18
       +
         };

     

       19
       19
       +
         js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };

     

       20
       20
       +
       in

     

       21
       21
       +
       

     

       12
       22
        
       with self;

     

       13
       23
        
       

     

       14
       24
        
       {

+10

pkgs/development/ocaml-modules/janestreet/0.17.nix

···

       8
       8
        
         zstd,

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       +
       let

     

       12
       12
       +
         js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };

     

       13
       13
       +
         js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };

     

       14
       14
       +
         gen_js_api = self.gen_js_api.override {

     

       15
       15
       +
           inherit js_of_ocaml-compiler;

     

       16
       16
       +
           ojs = self.ojs.override { inherit js_of_ocaml-compiler; };

     

       17
       17
       +
         };

     

       18
       18
       +
         js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };

     

       19
       19
       +
       in

     

       20
       20
       +
       

     

       11
       21
        
       with self;

     

       12
       22
        
       

     

       13
       23
        
       {

+5 -9

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

···

       26
       26
        
       

     

       27
       27
        
       buildPythonPackage rec {

     

       28
       28
        
         pname = "aioesphomeapi";

     

       29
       29
       -
         version = "29.0.0";

     

       29
       29
       +
         version = "29.1.0";

     

       30
       30
        
         pyproject = true;

     

       31
       31
        
       

     

       32
       32
        
         disabled = pythonOlder "3.9";

     
···

       35
       35
        
           owner = "esphome";

     

       36
       36
        
           repo = "aioesphomeapi";

     

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

     

       38
       38
       -
           hash = "sha256-1H6+/V87mjkBvHwPTs3sgrqY24Gc/MCKb97r2ly6oTA=";

     

       38
       38
       +
           hash = "sha256-/4/FNb6lGlitsAzO0OadWqP02Wx+mnlrA6yzXFm72sg=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         build-system = [

     
···

       62
       62
        
         ];

     

       63
       63
        
       

     

       64
       64
        
         disabledTests = [

     

       65
       65
       -
           # https://github.com/esphome/aioesphomeapi/issues/837

     

       66
       66
       -
           "test_reconnect_logic_stop_callback"

     

       67
       67
       -
           # python3.12.4 regression

     

       68
       68
       -
           # https://github.com/esphome/aioesphomeapi/issues/889

     

       69
       69
       -
           "test_start_connection_cannot_increase_recv_buffer"

     

       70
       70
       -
           "test_start_connection_can_only_increase_buffer_size_to_262144"

     

       65
       65
       +
           # https://github.com/esphome/aioesphomeapi/pull/1081

     

       66
       66
       +
           "test_request_while_handshaking"

     

       71
       67
        
         ];

     

       72
       68
        
       

     

       73
       69
        
         disabledTestPaths = [

     

       74
       70
        
           # benchmarking requires pytest-codespeed

     

       75
       75
       -
           "tests/test_bluetooth_benchmarks.py"

     

       71
       71
       +
           "tests/benchmarks"

     

       76
       72
        
         ];

     

       77
       73
        
       

     

       78
       74
        
         pythonImportsCheck = [ "aioesphomeapi" ];

+1 -1

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

···

       48
       48
        
         ];

     

       49
       49
        
       

     

       50
       50
        
         optional-dependencies = {

     

       51
       51
       -
           ssh = [ paramiko paramiko.optional-dependencies.ed25519 ];

     

       51
       51
       +
           ssh = [ paramiko ];

     

       52
       52
        
           tls = [];

     

       53
       53
        
           websockets = [ websocket-client ];

     

       54
       54
        
         };

+2 -2

pkgs/development/python-modules/docling-ibm-models/default.nix

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "docling-ibm-models";

     

       22
       22
       -
         version = "3.3.0";

     

       22
       22
       +
         version = "3.3.2";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "DS4SD";

     

       27
       27
        
           repo = "docling-ibm-models";

     

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

     

       29
       29
       -
           hash = "sha256-wxkHd+TCBibOTWO09JOsjX6oBtUxZ/9IOmyLdeptzeQ=";

     

       29
       29
       +
           hash = "sha256-8mqDgbTj5g6jXEumj16Me9NjHLCOdR+pXmAwn2dghfg=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [

+34

pkgs/development/python-modules/esphome-glyphsets/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         setuptools,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "esphome-glyphsets";

     

       10
       10
       +
         version = "0.1.0";

     

       11
       11
       +
         pyproject = true;

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "esphome";

     

       15
       15
       +
           repo = "esphome-glyphsets";

     

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

     

       17
       17
       +
           hash = "sha256-kST2AsZRWZrVmInUNN153+FOXa/t9vbHN3hAReKQJaU=";

     

       18
       18
       +
           fetchSubmodules = true;

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         build-system = [ setuptools ];

     

       22
       22
       +
       

     

       23
       23
       +
         pythonImportsCheck = [

     

       24
       24
       +
           "esphome_glyphsets"

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         meta = {

     

       28
       28
       +
           description = "A lightweight version of glyphsets for ESPHome";

     

       29
       29
       +
           homepage = "https://github.com/esphome/esphome-glyphsets";

     

       30
       30
       +
           changelog = "https://github.com/esphome/esphome-glyphsets/blob/${src.tag}/CHANGELOG.md";

     

       31
       31
       +
           license = lib.licenses.asl20;

     

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

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+7 -9

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "explorerscript";

     

       17
       17
       -
         version = "0.2.1.post2";

     

       17
       17
       +
         version = "0.2.3";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "SkyTemple";

     

       22
       22
        
           repo = "explorerscript";

     

       23
       23
        
           tag = version;

     

       24
       24
       -
           hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY=";

     

       24
       24
       +
           hash = "sha256-fh40HCU12AVA3cZ5xvRott+93qo8VzHFsbPzTkoV3x4=";

     

       25
       25
        
           # Include a pinned antlr4 fork used as a C++ library

     

       26
       26
        
           fetchSubmodules = true;

     

       27
       27
        
         };

     
···

       29
       29
        
         build-system = [

     

       30
       30
        
           setuptools

     

       31
       31
        
           scikit-build-core

     

       32
       32
       -
           ninja

     

       33
       33
       -
           cmake

     

       34
       32
        
           pybind11

     

       35
       33
        
         ];

     

       36
       34
        
       

     

       35
       35
       +
         nativeBuildInputs = [

     

       36
       36
       +
           cmake

     

       37
       37
       +
           ninja

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       37
       40
        
         # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb.

     

       38
       41
        
         # We thus do not rebuild them.

     

       39
       39
       -
       

     

       40
       40
       -
         postPatch = ''

     

       41
       41
       -
           substituteInPlace pyproject.toml \

     

       42
       42
       -
             --replace-fail "scikit-build-core<=0.9.8" scikit-build-core

     

       43
       43
       -
         '';

     

       44
       42
        
       

     

       45
       43
        
         dontUseCmakeConfigure = true;

     

       46
       44

+5 -8

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

···

       10
       10
        
         pillow,

     

       11
       11
        
         pyjwt,

     

       12
       12
        
         pytestCheckHook,

     

       13
       13
       +
         pytest-cov-stub,

     

       13
       14
        
         pythonOlder,

     

       14
       15
        
         requests,

     

       15
       16
        
         requests-futures,

     
···

       30
       31
        
       

     

       31
       32
        
         src = fetchFromGitHub {

     

       32
       33
        
           owner = "pycontribs";

     

       33
       33
       -
           repo = pname;

     

       34
       34
       +
           repo = "jira";

     

       34
       35
        
           tag = version;

     

       35
       36
        
           hash = "sha256-P3dbrBKpHvLNIA+JBeSXEQl4QVZ0FdKkNIU8oPHWw6k=";

     

       36
       37
        
         };

     

       37
       38
        
       

     

       38
       38
       -
         nativeBuildInputs = [

     

       39
       39
       +
         build-system = [

     

       39
       40
        
           setuptools

     

       40
       41
        
           setuptools-scm

     

       41
       42
        
         ];

     

       42
       43
        
       

     

       43
       43
       -
         propagatedBuildInputs = [

     

       44
       44
       +
         dependencies = [

     

       44
       45
        
           defusedxml

     

       45
       46
        
           packaging

     

       46
       47
        
           requests

     
···

       67
       68
        
         nativeCheckInputs = [

     

       68
       69
        
           flaky

     

       69
       70
        
           pytestCheckHook

     

       71
       71
       +
           pytest-cov-stub

     

       70
       72
        
           requests-mock

     

       71
       73
        
         ];

     

       72
       72
       -
       

     

       73
       73
       -
         postPatch = ''

     

       74
       74
       -
           substituteInPlace setup.cfg \

     

       75
       75
       -
             --replace "--cov-report=xml --cov jira" ""

     

       76
       76
       -
         '';

     

       77
       74
        
       

     

       78
       75
        
         pythonImportsCheck = [ "jira" ];

     

       79
       76

+1 -1

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

···

       27
       27
        
           paramiko

     

       28
       28
        
           lxml

     

       29
       29
        
           six

     

       30
       30
       -
         ] ++ paramiko.optional-dependencies.ed25519;

     

       30
       30
       +
         ];

     

       31
       31
        
       

     

       32
       32
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       33
       33

+7

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

···

       50
       50
        
             oneDNN

     

       51
       51
        
             re2

     

       52
       52
        
             onnxruntime.protobuf

     

       53
       53
       +
       

     

       54
       54
       +
             # https://github.com/NixOS/nixpkgs/pull/357656 patches the onnx lib to ${pkgs.onnxruntime}/lib

     

       55
       55
       +
             # but these files are copied into this package too. If the origional non-python onnxruntime

     

       56
       56
       +
             # package is GC-ed, cuda support in this python package will break.

     

       57
       57
       +
             # Two options, rebuild onnxruntime twice with the different paths hard-coded, or just hold a runtime

     

       58
       58
       +
             # dependency between the two. Option 2, because onnxruntime takes forever to build with cuda support.

     

       59
       59
       +
             onnxruntime

     

       53
       60
        
           ]

     

       54
       61
        
           ++ lib.optionals onnxruntime.passthru.cudaSupport (

     

       55
       62
        
             with onnxruntime.passthru.cudaPackages;

-2

pkgs/development/python-modules/smart-open/default.nix

···

       11
       11
        
         requests,

     

       12
       12
        
         moto,

     

       13
       13
        
         paramiko,

     

       14
       14
       -
         pynacl,

     

       15
       14
        
         pytestCheckHook,

     

       16
       15
        
         responses,

     

       17
       16
        
         setuptools,

     
···

       57
       56
        
           moto

     

       58
       57
        
           pytestCheckHook

     

       59
       58
        
           responses

     

       60
       60
       -
           pynacl

     

       61
       59
        
         ] ++ lib.flatten (lib.attrValues optional-dependencies);

     

       62
       60
        
       

     

       63
       61
        
         pytestFlagsArray = [ "smart_open" ];

+1 -1

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

···

       20
       20
        
       

     

       21
       21
        
         build-system = [ setuptools ];

     

       22
       22
        
       

     

       23
       23
       -
         dependencies = [ paramiko ] ++ paramiko.optional-dependencies.ed25519;

     

       23
       23
       +
         dependencies = [ paramiko ];

     

       24
       24
        
       

     

       25
       25
        
         nativeCheckInputs = [

     

       26
       26
        
           pytestCheckHook

-2

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

···

       19
       19
        
         paramiko,

     

       20
       20
        
         pbr,

     

       21
       21
        
         prettytable,

     

       22
       22
       -
         pynacl,

     

       23
       22
        
         python,

     

       24
       23
        
         pythonOlder,

     

       25
       24
        
         pyyaml,

     
···

       75
       74
        
         nativeCheckInputs = [

     

       76
       75
        
           hacking

     

       77
       76
        
           oslotest

     

       78
       78
       -
           pynacl

     

       79
       77
        
           stestr

     

       80
       78
        
         ];

     

       81
       79

+3 -13

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch,

     

       6
       5
        
       

     

       7
       6
        
         # build-system

     

       8
       7
        
         setuptools,

     
···

       59
       58
        
       

     

       60
       59
        
       buildPythonPackage rec {

     

       61
       60
        
         pname = "transformers";

     

       62
       62
       -
         version = "4.48.3";

     

       61
       61
       +
         version = "4.49.0";

     

       63
       62
        
         pyproject = true;

     

       64
       63
        
       

     

       65
       64
        
         src = fetchFromGitHub {

     

       66
       65
        
           owner = "huggingface";

     

       67
       66
        
           repo = "transformers";

     

       68
       67
        
           tag = "v${version}";

     

       69
       69
       -
           hash = "sha256-gDPJx/kgFa8KCoX8XCMtFrSY/z2as22yDSNEW3UDm/0=";

     

       68
       68
       +
           hash = "sha256-drq7RWoRaRejiQjCUHIYuzaKa9rA4eQZI2do74scp1c=";

     

       70
       69
        
         };

     

       71
       71
       -
       

     

       72
       72
       -
         patches = [

     

       73
       73
       -
           # Remove on the next major version bump

     

       74
       74
       -
           (fetchpatch {

     

       75
       75
       -
             url = "https://github.com/huggingface/transformers/commit/db864b5526d56fd99143619abff969bfcb5596d5.patch?full_index=1";

     

       76
       76
       -
             name = "dont-import-torch-distributed-if-not-available.patch";

     

       77
       77
       -
             hash = "sha256-XOraJmSt9Rp/oNiil6vDUBqZhd8MDbA0nz1Tx16Mk14=";

     

       78
       78
       -
           })

     

       79
       79
       -
         ];

     

       80
       70
        
       

     

       81
       71
        
         build-system = [ setuptools ];

     

       82
       72
        
       

     
···

       200
       190
        
           homepage = "https://github.com/huggingface/transformers";

     

       201
       191
        
           description = "Natural Language Processing for TensorFlow 2.0 and PyTorch";

     

       202
       192
        
           mainProgram = "transformers-cli";

     

       203
       203
       -
           changelog = "https://github.com/huggingface/transformers/releases/tag/${src.tag}";

     

       193
       193
       +
           changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";

     

       204
       194
        
           license = lib.licenses.asl20;

     

       205
       195
        
           platforms = lib.platforms.unix;

     

       206
       196
        
           maintainers = with lib.maintainers; [

+4 -3

pkgs/development/tools/build-managers/gradle/default.nix

···

       230
       230
        
         # https://docs.gradle.org/current/userguide/compatibility.html

     

       231
       231
        
       

     

       232
       232
        
         gradle_8 = gen {

     

       233
       233
       -
           version = "8.12";

     

       234
       234
       -
           hash = "sha256-egDVH7kxR4Gaq3YCT+7OILa4TkIGlBAfJ2vpUuCL7wM=";

     

       233
       233
       +
           version = "8.12.1";

     

       234
       234
       +
           hash = "sha256-jZepeYT2y9K4X+TGCnQ0QKNHVEvxiBgEjmEfUojUbJQ=";

     

       235
       235
        
           defaultJava = jdk21;

     

       236
       236
        
         };

     

       237
       237
        
       

     
···

       259
       259
        
               gradle = gradle-unwrapped.override args;

     

       260
       260
        
             in

     

       261
       261
        
             symlinkJoin {

     

       262
       262
       -
               name = "gradle-${gradle.version}";

     

       262
       262
       +
               pname = "gradle";

     

       263
       263
       +
               inherit (gradle) version;

     

       263
       264
        
       

     

       264
       265
        
               paths = [

     

       265
       266
        
                 (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {

+2 -1

pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix

···

       10
       10
        
         menhir,

     

       11
       11
        
         menhirLib,

     

       12
       12
        
         sedlex,

     

       13
       13
       -
         version ? if lib.versionAtLeast ocaml.version "4.11" then "5.9.1" else "5.8.2",

     

       13
       13
       +
         version ? if lib.versionAtLeast ocaml.version "4.11" then "6.0.1" else "5.8.2",

     

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       buildDunePackage {

     
···

       22
       22
        
           url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";

     

       23
       23
        
           hash =

     

       24
       24
        
             {

     

       25
       25
       +
               "6.0.1" = "sha256-gT2+4rYuFUEEnqI6IOQFzyROJ+v6mFl4XPpT4obSxhQ=";

     

       25
       26
        
               "5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc=";

     

       26
       27
        
               "5.8.2" = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo=";

     

       27
       28
        
             }

+1 -4

pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix

···

       1
       1
        
       {

     

       2
       2
        
         buildDunePackage,

     

       3
       3
       -
         js_of_ocaml-compiler,

     

       4
       3
        
         js_of_ocaml-ppx,

     

       5
       4
        
         js_of_ocaml,

     

       6
       5
        
         lwt,

     
···

       10
       9
        
       buildDunePackage {

     

       11
       10
        
         pname = "js_of_ocaml-lwt";

     

       12
       11
        
       

     

       13
       13
       -
         inherit (js_of_ocaml-compiler) version src;

     

       12
       12
       +
         inherit (js_of_ocaml) version src meta;

     

       14
       13
        
       

     

       15
       14
        
         buildInputs = [ js_of_ocaml-ppx ];

     

       16
       15
        
       

     
···

       19
       18
        
           lwt

     

       20
       19
        
           lwt_log

     

       21
       20
        
         ];

     

       22
       22
       -
       

     

       23
       23
       -
         meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];

     

       24
       21
        
       }

+2 -5

pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix

···

       1
       1
        
       {

     

       2
       2
        
         buildDunePackage,

     

       3
       3
       -
         js_of_ocaml-compiler,

     

       3
       3
       +
         js_of_ocaml,

     

       4
       4
        
         ppxlib,

     

       5
       5
       -
         js_of_ocaml,

     

       6
       5
        
       }:

     

       7
       6
        
       

     

       8
       7
        
       buildDunePackage {

     

       9
       8
        
         pname = "js_of_ocaml-ppx";

     

       10
       9
        
       

     

       11
       11
       -
         inherit (js_of_ocaml-compiler) version src;

     

       10
       10
       +
         inherit (js_of_ocaml) version src meta;

     

       12
       11
        
       

     

       13
       12
        
         buildInputs = [ js_of_ocaml ];

     

       14
       13
        
         propagatedBuildInputs = [ ppxlib ];

     

       15
       15
       -
       

     

       16
       16
       -
         meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];

     

       17
       14
        
       }

+1 -4

pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix

···

       1
       1
        
       {

     

       2
       2
        
         buildDunePackage,

     

       3
       3
       -
         js_of_ocaml-compiler,

     

       4
       3
        
         js_of_ocaml,

     

       5
       4
        
         ppxlib,

     

       6
       5
        
       }:

     
···

       8
       7
        
       buildDunePackage {

     

       9
       8
        
         pname = "js_of_ocaml-ppx_deriving_json";

     

       10
       9
        
       

     

       11
       11
       -
         inherit (js_of_ocaml-compiler) version src;

     

       10
       10
       +
         inherit (js_of_ocaml) version src meta;

     

       12
       11
        
       

     

       13
       12
        
         propagatedBuildInputs = [

     

       14
       13
        
           js_of_ocaml

     

       15
       14
        
           ppxlib

     

       16
       15
        
         ];

     

       17
       17
       -
       

     

       18
       18
       -
         meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];

     

       19
       16
        
       }

+1 -4

pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix

···

       1
       1
        
       {

     

       2
       2
        
         buildDunePackage,

     

       3
       3
       -
         js_of_ocaml-compiler,

     

       4
       3
        
         js_of_ocaml-ppx,

     

       5
       4
        
         js_of_ocaml,

     

       6
       5
        
         reactivedata,

     
···

       10
       9
        
       buildDunePackage {

     

       11
       10
        
         pname = "js_of_ocaml-tyxml";

     

       12
       11
        
       

     

       13
       13
       -
         inherit (js_of_ocaml-compiler) version src;

     

       12
       12
       +
         inherit (js_of_ocaml) version src meta;

     

       14
       13
        
       

     

       15
       14
        
         buildInputs = [ js_of_ocaml-ppx ];

     

       16
       15
        
       

     
···

       19
       18
        
           reactivedata

     

       20
       19
        
           tyxml

     

       21
       20
        
         ];

     

       22
       22
       -
       

     

       23
       23
       -
         meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];

     

       24
       21
        
       }

+2 -2

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

···

       9
       9
        
         nixosTests,

     

       10
       10
        
         npm-lockfile-fix,

     

       11
       11
        
         brotli,

     

       12
       12
       -
         tailwindcss,

     

       12
       12
       +
         tailwindcss_3,

     

       13
       13
        
         esbuild,

     

       14
       14
        
         ...

     

       15
       15
        
       }:

     
···

       141
       141
        
           cp -r ${tracker} tracker

     

       142
       142
        
       

     

       143
       143
        
           cat >> config/config.exs <<EOF

     

       144
       144
       -
           config :tailwind, path: "${lib.getExe tailwindcss}"

     

       144
       144
       +
           config :tailwind, path: "${lib.getExe tailwindcss_3}"

     

       145
       145
        
           config :esbuild, path: "${lib.getExe esbuild}"

     

       146
       146
        
           EOF

     

       147
       147
        
         '';

+10 -13

pkgs/tools/graphics/goverlay/default.nix pkgs/by-name/go/goverlay/package.nix

···

       12
       12
        
         libGL,

     

       13
       13
        
         libGLU,

     

       14
       14
        
         libnotify,

     

       15
       15
       -
         libqtpas,

     

       16
       15
        
         libX11,

     

       16
       16
       +
         lsb-release,

     

       17
       17
        
         nix-update-script,

     

       18
       18
        
         polkit,

     

       19
       19
        
         procps,

     

       20
       20
       -
         qt6,

     

       20
       20
       +
         qt6Packages,

     

       21
       21
        
         systemd,

     

       22
       22
        
         util-linux,

     

       23
       23
        
         vulkan-tools,

     

       24
       24
        
         which,

     

       25
       25
       -
         wrapQtAppsHook,

     

       26
       25
        
       }:

     

       27
       26
        
       

     

       28
       27
        
       stdenv.mkDerivation rec {

     
···

       48
       47
        
           substituteInPlace overlayunit.pas \

     

       49
       48
        
             --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \

     

       50
       49
        
             --replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \

     

       51
       51
       -
             --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}"

     

       50
       50
       +
             --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \

     

       51
       51
       +
             --replace-fail '/usr/lib/os-release' '/etc/os-release' \

     

       52
       52
       +
             --replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null"

     

       52
       53
        
         '';

     

       53
       54
        
       

     

       54
       55
        
         nativeBuildInputs = [

     

       55
       56
        
           fpc

     

       56
       57
        
           lazarus-qt6

     

       57
       57
       -
           wrapQtAppsHook

     

       58
       58
       +
           qt6Packages.wrapQtAppsHook

     

       58
       59
        
         ];

     

       59
       60
        
       

     

       60
       61
        
         buildInputs = [

     

       61
       62
        
           libGL

     

       62
       63
        
           libGLU

     

       63
       63
       -
           libqtpas

     

       64
       64
       +
           qt6Packages.libqtpas

     

       64
       65
        
           libX11

     

       65
       65
       -
           qt6.qtbase

     

       66
       66
       +
           qt6Packages.qtbase

     

       66
       67
        
         ];

     

       67
       68
        
       

     

       68
       68
       -
         NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";

     

       69
       69
       +
         NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}";

     

       69
       70
        
       

     

       70
       71
        
         buildPhase = ''

     

       71
       72
        
           runHook preBuild

     
···

       89
       90
        
               which

     

       90
       91
        
             ]

     

       91
       92
        
           }"

     

       92
       92
       -
       

     

       93
       93
       -
           # Force xcb since libqt5pas doesn't support Wayland

     

       94
       94
       -
           # See https://github.com/benjamimgois/goverlay/issues/107

     

       95
       95
       -
           "--set QT_QPA_PLATFORM xcb"

     

       96
       93
        
         ];

     

       97
       94
        
       

     

       98
       95
        
         passthru.updateScript = nix-update-script { };

     
···

       101
       98
        
           description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays";

     

       102
       99
        
           homepage = "https://github.com/benjamimgois/goverlay";

     

       103
       100
        
           license = licenses.gpl3Plus;

     

       104
       104
       -
           maintainers = with maintainers; [ ];

     

       101
       101
       +
           maintainers = with maintainers; [ RoGreat ];

     

       105
       102
        
           platforms = platforms.linux;

     

       106
       103
        
           mainProgram = "goverlay";

     

       107
       104
        
         };

+4

pkgs/tools/networking/telepresence/default.nix

···

       29
       29
        
           sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
       +
         patches = [

     

       33
       33
       +
           ./fix-versioneer.patch

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       32
       36
        
         nativeBuildInputs = [ makeWrapper ];

     

       33
       37
        
       

     

       34
       38
        
         postInstall = ''

+16

pkgs/tools/networking/telepresence/fix-versioneer.patch

···

       1
       1
       +
       diff --git a/versioneer.py b/versioneer.py

     

       2
       2
       +
       index 7e5bb402e..60d65ef76 100644

     

       3
       3
       +
       --- a/versioneer.py

     

       4
       4
       +
       +++ b/versioneer.py

     

       5
       5
       +
       @@ -339,9 +339,9 @@ def get_config_from_root(root):

     

       6
       6
       +
            # configparser.NoOptionError (if it lacks "VCS="). See the docstring at

     

       7
       7
       +
            # the top of versioneer.py for instructions on writing your setup.cfg .

     

       8
       8
       +
            setup_cfg = os.path.join(root, "setup.cfg")

     

       9
       9
       +
       -    parser = configparser.SafeConfigParser()

     

       10
       10
       +
       +    parser = configparser.ConfigParser()

     

       11
       11
       +
            with open(setup_cfg, "r") as f:

     

       12
       12
       +
       -        parser.readfp(f)

     

       13
       13
       +
       +        parser.read_file(f)

     

       14
       14
       +
            VCS = parser.get("versioneer", "VCS")  # mandatory

     

       15
       15
       +
       

     

       16
       16
       +
            def get(parser, name):

+2 -2

pkgs/tools/system/clinfo/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "clinfo";

     

       12
       12
       -
         version = "3.0.23.01.25";

     

       12
       12
       +
         version = "3.0.25.02.14";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Oblomov";

     

       16
       16
        
           repo = "clinfo";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU=";

     

       18
       18
       +
           sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs =

-9

pkgs/top-level/all-packages.nix

···

       3476
       3476
        
       

     

       3477
       3477
        
         gdown = with python3Packages; toPythonApplication gdown;

     

       3478
       3478
        
       

     

       3479
       3479
       -
         goverlay = qt6Packages.callPackage ../tools/graphics/goverlay {

     

       3480
       3480
       -
           inherit (qt6Packages) libqtpas wrapQtAppsHook;

     

       3481
       3481
       -
         };

     

       3482
       3482
       -
       

     

       3483
       3479
        
         gpt4all-cuda = gpt4all.override {

     

       3484
       3480
        
           cudaSupport = true;

     

       3485
       3481
        
         };

     
···

       17368
       17364
        
           imagemagick = graphicsmagick-imagemagick-compat;

     

       17369
       17365
        
         };

     

       17370
       17366
        
       

     

       17371
       17371
       -
         yoda = callPackage ../development/libraries/physics/yoda {

     

       17372
       17372
       -
           python = python3;

     

       17373
       17373
       -
         };

     

       17374
       17367
        
         yoda-with-root = lowPrio (yoda.override {

     

       17375
       17368
        
           withRootSupport = true;

     

       17376
       17369
        
         });

     
···

       17924
       17917
        
         };

     

       17925
       17918
        
       

     

       17926
       17919
        
         unityhub = callPackage ../development/tools/unityhub { };

     

       17927
       17927
       -
       

     

       17928
       17928
       -
         unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };

     

       17929
       17920
        
       

     

       17930
       17921
        
         vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;

     

       17931
       17922

+15 -2

pkgs/top-level/ocaml-packages.nix

···

       460
       460
        
             stdenv = pkgs.gcc13Stdenv;

     

       461
       461
        
           };

     

       462
       462
        
       

     

       463
       463
       -
           eliom = callPackage ../development/ocaml-modules/eliom { };

     

       463
       463
       +
           eliom = let

     

       464
       464
       +
             js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };

     

       465
       465
       +
             js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };

     

       466
       466
       +
           in callPackage ../development/ocaml-modules/eliom rec {

     

       467
       467
       +
             js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };

     

       468
       468
       +
             js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; };

     

       469
       469
       +
             js_of_ocaml-lwt = self.js_of_ocaml-lwt.override { inherit js_of_ocaml js_of_ocaml-ppx; };

     

       470
       470
       +
             js_of_ocaml-tyxml = self.js_of_ocaml-tyxml.override { inherit js_of_ocaml js_of_ocaml-ppx; };

     

       471
       471
       +
           };

     

       464
       472
        
       

     

       465
       473
        
           elpi = callPackage ../development/ocaml-modules/elpi (

     

       466
       474
        
             let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15"

     
···

       1425
       1433
        
       

     

       1426
       1434
        
           ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };

     

       1427
       1435
        
       

     

       1428
       1428
       -
           ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };

     

       1436
       1436
       +
           ocsigen-toolkit = let

     

       1437
       1437
       +
             js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };

     

       1438
       1438
       +
             js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };

     

       1439
       1439
       +
           in callPackage ../development/ocaml-modules/ocsigen-toolkit {

     

       1440
       1440
       +
             js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; };

     

       1441
       1441
       +
           };

     

       1429
       1442
        
       

     

       1430
       1443
        
           ocsipersist = callPackage ../development/ocaml-modules/ocsipersist {};

     

       1431
       1444

+3 -1

pkgs/top-level/python-packages.nix

···

       4275
       4275
        
       

     

       4276
       4276
        
         esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { };

     

       4277
       4277
        
       

     

       4278
       4278
       +
         esphome-glyphsets = callPackage ../development/python-modules/esphome-glyphsets { };

     

       4279
       4279
       +
       

     

       4278
       4280
        
         esprima = callPackage ../development/python-modules/esprima { };

     

       4279
       4281
        
       

     

       4280
       4282
        
         escapism = callPackage ../development/python-modules/escapism { };

     
···

       18630
       18632
        
       

     

       18631
       18633
        
         yfinance = callPackage ../development/python-modules/yfinance { };

     

       18632
       18634
        
       

     

       18633
       18633
       -
         yoda = toPythonModule (pkgs.yoda.override { inherit python; });

     

       18635
       18635
       +
         yoda = toPythonModule (pkgs.yoda.override { python3 = python; });

     

       18634
       18636
        
       

     

       18635
       18637
        
         yolink-api = callPackage ../development/python-modules/yolink-api { };

     

       18636
       18638