commit 812ef443d89fa49480f89f748e6ecb6227fef138 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/fzf.nix

···

       44
       44
        
             };

     

       45
       45
        
       

     

       46
       46
        
             fish.interactiveShellInit = lib.optionalString cfg.keybindings ''

     

       47
       47
       -
               source ${pkgs.fzf}/share/fzf/key-bindings.fish

     

       47
       47
       +
               source ${pkgs.fzf}/share/fzf/key-bindings.fish && fzf_key_bindings

     

       48
       48
        
             '';

     

       49
       49
        
           };

     

       50
       50
        
         };

nixos/modules/programs/yubikey-manager.nix

···

       12
       12
        
         options = {

     

       13
       13
        
           programs.yubikey-manager = {

     

       14
       14
        
             enable = lib.mkEnableOption "yubikey-manager";

     

       15
       15
       +
       

     

       16
       16
       +
             package = lib.mkPackageOption pkgs "yubikey-manager" { };

     

       15
       17
        
           };

     

       16
       18
        
         };

     

       17
       19

+2 -2

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

···

       65
       65
        
       invoked by using the `nextcloud-occ` wrapper that's globally available on a system with Nextcloud enabled.

     

       66
       66
        
       

     

       67
       67
        
       It requires elevated permissions to become the `nextcloud` user. Given the way the privilege

     

       68
       68
       -
       escalation is implemented, parameters passed via the environment to Nextcloud (e.g. `OC_PASS`) are

     

       69
       69
       -
       currently ignored.

     

       68
       68
       +
       escalation is implemented, parameters passed via the environment to Nextcloud are

     

       69
       69
       +
       currently ignored, except for `OC_PASS` and `NC_PASS`.

     

       70
       70
        
       

     

       71
       71
        
       Custom service units that need to run `nextcloud-occ` either need elevated privileges

     

       72
       72
        
       or the systemd configuration from `nextcloud-setup.service` (recommended):

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

···

       163
       163
        
                   --wait \

     

       164
       164
        
                   --collect \

     

       165
       165
        
                   --service-type=exec \

     

       166
       166
       +
                   --setenv OC_PASS \

     

       167
       167
       +
                   --setenv NC_PASS \

     

       166
       168
        
                   --quiet \

     

       167
       169
        
                   ${command}

     

       168
       170
        
               elif [[ "$USER" != nextcloud ]]; then

     

       169
       171
        
                 if [[ -x /run/wrappers/bin/sudo ]]; then

     

       170
       172
        
                   exec /run/wrappers/bin/sudo \

     

       171
       173
        
                     --preserve-env=CREDENTIALS_DIRECTORY \

     

       174
       174
       +
                     --preserve-env=OC_PASS \

     

       175
       175
       +
                     --preserve-env=NC_PASS \

     

       172
       176
        
                     --user=nextcloud \

     

       173
       177
        
                     ${command}

     

       174
       178
        
                 else

     

       175
       179
        
                   exec ${lib.getExe' pkgs.util-linux "runuser"} \

     

       176
       180
        
                     --whitelist-environment=CREDENTIALS_DIRECTORY \

     

       181
       181
       +
                     --whitelist-environment=OC_PASS \

     

       182
       182
       +
                     --whitelist-environment=NC_PASS \

     

       177
       183
        
                     --user=nextcloud \

     

       178
       184
        
                     ${command}

     

       179
       185
        
                 fi

pkgs/applications/networking/cluster/terraform-providers/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         buildGoModule,

     

       5
       5
       +
         buildGo125Module,

     

       5
       6
        
         fetchFromGitHub,

     

       6
       7
        
         fetchFromGitLab,

     

       7
       8
        
         callPackage,

     
···

       109
       110
        
             propagatedBuildInputs = [ cdrtools ];

     

       110
       111
        
           });

     

       111
       112
        
           minio = automated-providers.minio.override { spdx = "AGPL-3.0-only"; };

     

       113
       113
       +
           # requires go >= 1.25.0

     

       114
       114
       +
           talos = automated-providers.talos.override { mkProviderGoModule = buildGo125Module; };

     

       112
       115
        
         };

     

       113
       116
        
       

     

       114
       117
        
         # Put all the providers we not longer support in this list.

+6 -6

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

···

       1093
       1093
        
           "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="

     

       1094
       1094
        
         },

     

       1095
       1095
        
         "proxmox": {

     

       1096
       1096
       -
           "hash": "sha256-vrlZ2bt2Eczst+Xu5BZZqFp2aJzb1WrHZS/p3f99gRI=",

     

       1096
       1096
       +
           "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=",

     

       1097
       1097
        
           "homepage": "https://registry.terraform.io/providers/Telmate/proxmox",

     

       1098
       1098
        
           "owner": "Telmate",

     

       1099
       1099
        
           "repo": "terraform-provider-proxmox",

     

       1100
       1100
       -
           "rev": "v3.0.2-rc01",

     

       1100
       1100
       +
           "rev": "v3.0.2-rc04",

     

       1101
       1101
        
           "spdx": "MIT",

     

       1102
       1102
       -
           "vendorHash": "sha256-H8nmIaBwyBLO61Wys16YZgMHVFcCLe0eP+VbUUMc47c="

     

       1102
       1102
       +
           "vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg="

     

       1103
       1103
        
         },

     

       1104
       1104
        
         "rabbitmq": {

     

       1105
       1105
        
           "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=",

     
···

       1336
       1336
        
           "vendorHash": "sha256-nTKqpoJKabvtMDdI++Luq41vB0X2NWS6gufJbru2ZPI="

     

       1337
       1337
        
         },

     

       1338
       1338
        
         "talos": {

     

       1339
       1339
       -
           "hash": "sha256-O5S0XYdTyNGihPx4hQhYN5+ApnMuCaIcWlHA9D9/3nM=",

     

       1339
       1339
       +
           "hash": "sha256-PPD4blyXt4/IalzwEn4+lvuD1Qx7VuUD/CUJILDRI5k=",

     

       1340
       1340
        
           "homepage": "https://registry.terraform.io/providers/siderolabs/talos",

     

       1341
       1341
        
           "owner": "siderolabs",

     

       1342
       1342
        
           "repo": "terraform-provider-talos",

     

       1343
       1343
       -
           "rev": "v0.8.1",

     

       1343
       1343
       +
           "rev": "v0.9.0",

     

       1344
       1344
        
           "spdx": "MPL-2.0",

     

       1345
       1345
       -
           "vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg="

     

       1345
       1345
       +
           "vendorHash": "sha256-J2fLyYvlnefFIaJ6UwRfJ5nas86JCuOHAdWalr9T9fw="

     

       1346
       1346
        
         },

     

       1347
       1347
        
         "temporalcloud": {

     

       1348
       1348
        
           "hash": "sha256-tXNnDoUskOcmOKPpgBIcLcup0jMqRVWkhwSU3GKjAFI=",

+2 -2

pkgs/by-name/al/allure/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "allure";

     

       11
       11
       -
         version = "2.34.1";

     

       11
       11
       +
         version = "2.35.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";

     

       15
       15
       -
           hash = "sha256-3xPFiDQp7dUEGiTW0HKolE5lJ00ddqRB/UXSWFURNJo=";

     

       15
       15
       +
           hash = "sha256-LUbwg2jOORIqHbw5EritSBHbsVJgRYyc1cFMuAy3nAg=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         dontConfigure = true;

-6

pkgs/by-name/fz/fzf/package.nix

···

       65
       65
        
       

     

       66
       66
        
           # Install shell integrations

     

       67
       67
        
           install -D shell/* -t $out/share/fzf/

     

       68
       68
       -
           install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish

     

       69
       69
       -
           mkdir -p $out/share/fish/vendor_conf.d

     

       70
       70
       -
           cat << EOF > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish

     

       71
       71
       -
             status is-interactive; or exit 0

     

       72
       72
       -
             fzf_key_bindings

     

       73
       73
       -
           EOF

     

       74
       68
        
       

     

       75
       69
        
           cat <<SCRIPT > $out/bin/fzf-share

     

       76
       70
        
           #!${runtimeShell}

+3 -3

pkgs/by-name/go/gokapi/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "gokapi";

     

       12
       12
       -
         version = "2.0.1";

     

       12
       12
       +
         version = "2.1.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Forceu";

     

       16
       16
        
           repo = "Gokapi";

     

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

     

       18
       18
       -
           hash = "sha256-sYosoG4bZ5B024tFr2tEjf5EezoWmtO3vFE6W6grm1M=";

     

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

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-GeS+lfFw7jUuXX1qQPiu9eKjz6nswpRtbZXjqu4DnHg=";

     

       21
       21
       +
         vendorHash = "sha256-gP9bCnRN40y7NWwh3V8dv1yOBqpmzlcp8Bf6IkdjoWU=";

     

       22
       22
        
       

     

       23
       23
        
         patches = [ ];

     

       24
       24

+3 -3

pkgs/by-name/re/renode-dts2repl/package.nix

···

       7
       7
        
       

     

       8
       8
        
       python3.pkgs.buildPythonApplication {

     

       9
       9
        
         pname = "renode-dts2repl";

     

       10
       10
       -
         version = "0-unstable-2025-08-21";

     

       10
       10
       +
         version = "0-unstable-2025-09-01";

     

       11
       11
        
         pyproject = true;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "antmicro";

     

       15
       15
        
           repo = "dts2repl";

     

       16
       16
       -
           rev = "94e40c3622d08312226bed788b5d7970e06283c6";

     

       17
       17
       -
           hash = "sha256-a8QlQujBQT1ho9JbZjKH2v0l5LugemlGzBKoSSheFMA=";

     

       16
       16
       +
           rev = "f0ecb42d5fd3a8d9d4b215c532b2824e8d22cf99";

     

       17
       17
       +
           hash = "sha256-jI0zpv3OpLWh+CUGP+duyr7s2waPZu0+ULxzX9VmHY8=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+30

pkgs/by-name/sl/slack/darwin.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pname,

     

       3
       3
       +
         version,

     

       4
       4
       +
         src,

     

       5
       5
       +
         passthru,

     

       6
       6
       +
         meta,

     

       7
       7
       +
       

     

       8
       8
       +
         stdenvNoCC,

     

       9
       9
       +
         undmg,

     

       10
       10
       +
       }:

     

       11
       11
       +
       stdenvNoCC.mkDerivation {

     

       12
       12
       +
         inherit

     

       13
       13
       +
           pname

     

       14
       14
       +
           version

     

       15
       15
       +
           src

     

       16
       16
       +
           passthru

     

       17
       17
       +
           meta

     

       18
       18
       +
           ;

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [ undmg ];

     

       21
       21
       +
       

     

       22
       22
       +
         sourceRoot = ".";

     

       23
       23
       +
       

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           runHook preInstall

     

       26
       26
       +
           mkdir -p $out/Applications

     

       27
       27
       +
           cp -a Slack.app $out/Applications

     

       28
       28
       +
           runHook postInstall

     

       29
       29
       +
         '';

     

       30
       30
       +
       }

+154

pkgs/by-name/sl/slack/linux.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pname,

     

       3
       3
       +
         version,

     

       4
       4
       +
         src,

     

       5
       5
       +
         passthru,

     

       6
       6
       +
         meta,

     

       7
       7
       +
       

     

       8
       8
       +
         lib,

     

       9
       9
       +
         stdenv,

     

       10
       10
       +
         dpkg,

     

       11
       11
       +
         makeWrapper,

     

       12
       12
       +
         asar,

     

       13
       13
       +
         alsa-lib,

     

       14
       14
       +
         at-spi2-atk,

     

       15
       15
       +
         at-spi2-core,

     

       16
       16
       +
         atk,

     

       17
       17
       +
         cairo,

     

       18
       18
       +
         cups,

     

       19
       19
       +
         curl,

     

       20
       20
       +
         dbus,

     

       21
       21
       +
         expat,

     

       22
       22
       +
         fontconfig,

     

       23
       23
       +
         freetype,

     

       24
       24
       +
         gdk-pixbuf,

     

       25
       25
       +
         glib,

     

       26
       26
       +
         gtk3,

     

       27
       27
       +
         libGL,

     

       28
       28
       +
         libappindicator-gtk3,

     

       29
       29
       +
         libdrm,

     

       30
       30
       +
         libnotify,

     

       31
       31
       +
         libpulseaudio,

     

       32
       32
       +
         libuuid,

     

       33
       33
       +
         libxcb,

     

       34
       34
       +
         libxkbcommon,

     

       35
       35
       +
         libgbm,

     

       36
       36
       +
         nspr,

     

       37
       37
       +
         nss,

     

       38
       38
       +
         pango,

     

       39
       39
       +
         pipewire,

     

       40
       40
       +
         systemd,

     

       41
       41
       +
         wayland,

     

       42
       42
       +
         xdg-utils,

     

       43
       43
       +
         xorg,

     

       44
       44
       +
       }:

     

       45
       45
       +
       stdenv.mkDerivation rec {

     

       46
       46
       +
         inherit

     

       47
       47
       +
           pname

     

       48
       48
       +
           version

     

       49
       49
       +
           src

     

       50
       50
       +
           passthru

     

       51
       51
       +
           meta

     

       52
       52
       +
           ;

     

       53
       53
       +
       

     

       54
       54
       +
         rpath =

     

       55
       55
       +
           lib.makeLibraryPath [

     

       56
       56
       +
             alsa-lib

     

       57
       57
       +
             at-spi2-atk

     

       58
       58
       +
             at-spi2-core

     

       59
       59
       +
             atk

     

       60
       60
       +
             cairo

     

       61
       61
       +
             cups

     

       62
       62
       +
             curl

     

       63
       63
       +
             dbus

     

       64
       64
       +
             expat

     

       65
       65
       +
             fontconfig

     

       66
       66
       +
             freetype

     

       67
       67
       +
             gdk-pixbuf

     

       68
       68
       +
             glib

     

       69
       69
       +
             gtk3

     

       70
       70
       +
             libGL

     

       71
       71
       +
             libappindicator-gtk3

     

       72
       72
       +
             libdrm

     

       73
       73
       +
             libnotify

     

       74
       74
       +
             libpulseaudio

     

       75
       75
       +
             libuuid

     

       76
       76
       +
             libxcb

     

       77
       77
       +
             libxkbcommon

     

       78
       78
       +
             libgbm

     

       79
       79
       +
             nspr

     

       80
       80
       +
             nss

     

       81
       81
       +
             pango

     

       82
       82
       +
             pipewire

     

       83
       83
       +
             stdenv.cc.cc

     

       84
       84
       +
             systemd

     

       85
       85
       +
             wayland

     

       86
       86
       +
             xorg.libX11

     

       87
       87
       +
             xorg.libXScrnSaver

     

       88
       88
       +
             xorg.libXcomposite

     

       89
       89
       +
             xorg.libXcursor

     

       90
       90
       +
             xorg.libXdamage

     

       91
       91
       +
             xorg.libXext

     

       92
       92
       +
             xorg.libXfixes

     

       93
       93
       +
             xorg.libXi

     

       94
       94
       +
             xorg.libXrandr

     

       95
       95
       +
             xorg.libXrender

     

       96
       96
       +
             xorg.libXtst

     

       97
       97
       +
             xorg.libxkbfile

     

       98
       98
       +
             xorg.libxshmfence

     

       99
       99
       +
           ]

     

       100
       100
       +
           + ":${lib.getLib stdenv.cc.cc}/lib64";

     

       101
       101
       +
       

     

       102
       102
       +
         buildInputs = [

     

       103
       103
       +
           gtk3 # needed for GSETTINGS_SCHEMAS_PATH

     

       104
       104
       +
         ];

     

       105
       105
       +
       

     

       106
       106
       +
         nativeBuildInputs = [

     

       107
       107
       +
           dpkg

     

       108
       108
       +
           makeWrapper

     

       109
       109
       +
           asar

     

       110
       110
       +
         ];

     

       111
       111
       +
       

     

       112
       112
       +
         dontUnpack = true;

     

       113
       113
       +
         dontBuild = true;

     

       114
       114
       +
         dontPatchELF = true;

     

       115
       115
       +
       

     

       116
       116
       +
         installPhase = ''

     

       117
       117
       +
           runHook preInstall

     

       118
       118
       +
       

     

       119
       119
       +
           # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here

     

       120
       120
       +
           dpkg --fsys-tarfile $src | tar --extract

     

       121
       121
       +
           rm -rf usr/share/lintian

     

       122
       122
       +
       

     

       123
       123
       +
           mkdir -p $out

     

       124
       124
       +
           mv usr/* $out

     

       125
       125
       +
       

     

       126
       126
       +
           # Otherwise it looks "suspicious"

     

       127
       127
       +
           chmod -R g-w $out

     

       128
       128
       +
       

     

       129
       129
       +
           for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do

     

       130
       130
       +
             patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true

     

       131
       131
       +
             patchelf --set-rpath ${rpath}:$out/lib/slack $file || true

     

       132
       132
       +
           done

     

       133
       133
       +
       

     

       134
       134
       +
           # Replace the broken bin/slack symlink with a startup wrapper.

     

       135
       135
       +
           # Make xdg-open overrideable at runtime.

     

       136
       136
       +
           rm $out/bin/slack

     

       137
       137
       +
           makeWrapper $out/lib/slack/slack $out/bin/slack \

     

       138
       138
       +
             --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \

     

       139
       139
       +
             --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \

     

       140
       140
       +
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}"

     

       141
       141
       +
       

     

       142
       142
       +
           # Fix the desktop link

     

       143
       143
       +
           substituteInPlace $out/share/applications/slack.desktop \

     

       144
       144
       +
             --replace /usr/bin/ $out/bin/ \

     

       145
       145
       +
             --replace /usr/share/pixmaps/slack.png slack \

     

       146
       146
       +
             --replace bin/slack "bin/slack -s"

     

       147
       147
       +
       

     

       148
       148
       +
           # Prevent Un-blacklist pipewire integration to enable screen sharing on wayland.

     

       149
       149
       +
           # https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763

     

       150
       150
       +
           sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar

     

       151
       151
       +
       

     

       152
       152
       +
           runHook postInstall

     

       153
       153
       +
         '';

     

       154
       154
       +
       }

+17 -217

pkgs/by-name/sl/slack/package.nix

···

       1
       1
        
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       2
       2
       +
         callPackage,

     

       4
       3
        
         fetchurl,

     

       5
       5
       -
         dpkg,

     

       6
       6
       -
         undmg,

     

       7
       7
       -
         makeWrapper,

     

       8
       8
       -
         asar,

     

       9
       9
       -
         alsa-lib,

     

       10
       10
       -
         at-spi2-atk,

     

       11
       11
       -
         at-spi2-core,

     

       12
       12
       -
         atk,

     

       13
       13
       -
         cairo,

     

       14
       14
       -
         cups,

     

       15
       15
       -
         curl,

     

       16
       16
       -
         dbus,

     

       17
       17
       -
         expat,

     

       18
       18
       -
         fontconfig,

     

       19
       19
       -
         freetype,

     

       20
       20
       -
         gdk-pixbuf,

     

       21
       21
       -
         glib,

     

       22
       22
       -
         gtk3,

     

       23
       23
       -
         libGL,

     

       24
       24
       -
         libappindicator-gtk3,

     

       25
       25
       -
         libdrm,

     

       26
       26
       -
         libnotify,

     

       27
       27
       -
         libpulseaudio,

     

       28
       28
       -
         libuuid,

     

       29
       29
       -
         libxcb,

     

       30
       30
       -
         libxkbcommon,

     

       31
       31
       -
         libxshmfence,

     

       32
       32
       -
         libgbm,

     

       33
       33
       -
         nspr,

     

       34
       34
       -
         nss,

     

       35
       35
       -
         pango,

     

       36
       36
       -
         pipewire,

     

       37
       37
       -
         systemd,

     

       38
       38
       -
         wayland,

     

       39
       39
       -
         xdg-utils,

     

       40
       40
       -
         xorg,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         stdenvNoCC,

     

       41
       6
        
       }:

     

       42
       7
        
       

     

       43
       8
        
       let

     

       44
       44
       -
         inherit (stdenv.hostPlatform) system;

     

       45
       45
       -
         throwSystem = throw "slack does not support system: ${system}";

     

       9
       9
       +
         inherit (stdenvNoCC.hostPlatform) system;

     

       10
       10
       +
         sources = import ./sources.nix { inherit fetchurl; };

     

       46
       11
        
       

     

       47
       12
        
         pname = "slack";

     

       48
       13
        
       

     

       49
       49
       -
         x86_64-darwin-version = "4.45.64";

     

       50
       50
       -
         x86_64-darwin-sha256 = "0skhh16lc0czxd5ifkqy39hibk4ydlfhn41zdif3hl0sd4vcqbvb";

     

       51
       51
       -
       

     

       52
       52
       -
         x86_64-linux-version = "4.45.64";

     

       53
       53
       -
         x86_64-linux-sha256 = "7c6af86ab1d5778aec930d4e7d77b9f9948a83a87e8458e821d6f9e8dfed180f";

     

       54
       54
       -
       

     

       55
       55
       -
         aarch64-darwin-version = "4.45.64";

     

       56
       56
       -
         aarch64-darwin-sha256 = "136crd17ybaznp680qb2rl0c8cllkkv21ymf3dck2jhkqbp7v2kj";

     

       14
       14
       +
         passthru = {

     

       15
       15
       +
           updateScript = ./update.sh;

     

       16
       16
       +
         };

     

       57
       17
        
       

     

       58
       58
       -
         version =

     

       59
       59
       -
           {

     

       60
       60
       -
             x86_64-darwin = x86_64-darwin-version;

     

       61
       61
       -
             x86_64-linux = x86_64-linux-version;

     

       62
       62
       -
             aarch64-darwin = aarch64-darwin-version;

     

       63
       63
       -
           }

     

       64
       64
       -
           .${system} or throwSystem;

     

       65
       65
       -
       

     

       66
       66
       -
         src =

     

       67
       67
       -
           let

     

       68
       68
       -
             base = "https://downloads.slack-edge.com";

     

       69
       69
       -
           in

     

       70
       70
       -
           {

     

       71
       71
       -
             x86_64-darwin = fetchurl {

     

       72
       72
       -
               url = "${base}/desktop-releases/mac/universal/${version}/Slack-${version}-macOS.dmg";

     

       73
       73
       -
               sha256 = x86_64-darwin-sha256;

     

       74
       74
       -
             };

     

       75
       75
       -
             x86_64-linux = fetchurl {

     

       76
       76
       -
               url = "${base}/desktop-releases/linux/x64/${version}/slack-desktop-${version}-amd64.deb";

     

       77
       77
       -
               sha256 = x86_64-linux-sha256;

     

       78
       78
       -
             };

     

       79
       79
       -
             aarch64-darwin = fetchurl {

     

       80
       80
       -
               url = "${base}/desktop-releases/mac/arm64/${version}/Slack-${version}-macOS.dmg";

     

       81
       81
       -
               sha256 = aarch64-darwin-sha256;

     

       82
       82
       -
             };

     

       83
       83
       -
           }

     

       84
       84
       -
           .${system} or throwSystem;

     

       85
       85
       -
       

     

       86
       86
       -
         meta = with lib; {

     

       18
       18
       +
         meta = {

     

       87
       19
        
           description = "Desktop client for Slack";

     

       88
       20
        
           homepage = "https://slack.com";

     

       89
       21
        
           changelog = "https://slack.com/release-notes";

     

       90
       90
       -
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       91
       91
       -
           license = licenses.unfree;

     

       92
       92
       -
           maintainers = with maintainers; [

     

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

     

       23
       23
       +
           license = lib.licenses.unfree;

     

       24
       24
       +
           maintainers = with lib.maintainers; [

     

       93
       25
        
             mmahut

     

       26
       26
       +
             prince213

     

       94
       27
        
             teutat3s

     

       95
       28
        
           ];

     

       96
       29
        
           platforms = [

     
···

       100
       33
        
           ];

     

       101
       34
        
           mainProgram = "slack";

     

       102
       35
        
         };

     

       103
       103
       -
       

     

       104
       104
       -
         linux = stdenv.mkDerivation rec {

     

       105
       105
       -
           inherit

     

       106
       106
       -
             pname

     

       107
       107
       -
             version

     

       108
       108
       -
             src

     

       109
       109
       -
             meta

     

       110
       110
       -
             ;

     

       111
       111
       -
       

     

       112
       112
       -
           passthru.updateScript = ./update.sh;

     

       113
       113
       -
       

     

       114
       114
       -
           rpath =

     

       115
       115
       -
             lib.makeLibraryPath [

     

       116
       116
       -
               alsa-lib

     

       117
       117
       -
               at-spi2-atk

     

       118
       118
       -
               at-spi2-core

     

       119
       119
       -
               atk

     

       120
       120
       -
               cairo

     

       121
       121
       -
               cups

     

       122
       122
       -
               curl

     

       123
       123
       -
               dbus

     

       124
       124
       -
               expat

     

       125
       125
       -
               fontconfig

     

       126
       126
       -
               freetype

     

       127
       127
       -
               gdk-pixbuf

     

       128
       128
       -
               glib

     

       129
       129
       -
               gtk3

     

       130
       130
       -
               libGL

     

       131
       131
       -
               libappindicator-gtk3

     

       132
       132
       -
               libdrm

     

       133
       133
       -
               libnotify

     

       134
       134
       -
               libpulseaudio

     

       135
       135
       -
               libuuid

     

       136
       136
       -
               libxcb

     

       137
       137
       -
               libxkbcommon

     

       138
       138
       -
               libgbm

     

       139
       139
       -
               nspr

     

       140
       140
       -
               nss

     

       141
       141
       -
               pango

     

       142
       142
       -
               pipewire

     

       143
       143
       -
               stdenv.cc.cc

     

       144
       144
       -
               systemd

     

       145
       145
       -
               wayland

     

       146
       146
       -
               xorg.libX11

     

       147
       147
       -
               xorg.libXScrnSaver

     

       148
       148
       -
               xorg.libXcomposite

     

       149
       149
       -
               xorg.libXcursor

     

       150
       150
       -
               xorg.libXdamage

     

       151
       151
       -
               xorg.libXext

     

       152
       152
       -
               xorg.libXfixes

     

       153
       153
       -
               xorg.libXi

     

       154
       154
       -
               xorg.libXrandr

     

       155
       155
       -
               xorg.libXrender

     

       156
       156
       -
               xorg.libXtst

     

       157
       157
       -
               xorg.libxkbfile

     

       158
       158
       -
               xorg.libxshmfence

     

       159
       159
       -
             ]

     

       160
       160
       -
             + ":${lib.getLib stdenv.cc.cc}/lib64";

     

       161
       161
       -
       

     

       162
       162
       -
           buildInputs = [

     

       163
       163
       -
             gtk3 # needed for GSETTINGS_SCHEMAS_PATH

     

       164
       164
       -
           ];

     

       165
       165
       -
       

     

       166
       166
       -
           nativeBuildInputs = [

     

       167
       167
       -
             dpkg

     

       168
       168
       -
             makeWrapper

     

       169
       169
       -
             asar

     

       170
       170
       -
           ];

     

       171
       171
       -
       

     

       172
       172
       -
           dontUnpack = true;

     

       173
       173
       -
           dontBuild = true;

     

       174
       174
       -
           dontPatchELF = true;

     

       175
       175
       -
       

     

       176
       176
       -
           installPhase = ''

     

       177
       177
       -
             runHook preInstall

     

       178
       178
       -
       

     

       179
       179
       -
             # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here

     

       180
       180
       -
             dpkg --fsys-tarfile $src | tar --extract

     

       181
       181
       -
             rm -rf usr/share/lintian

     

       182
       182
       -
       

     

       183
       183
       -
             mkdir -p $out

     

       184
       184
       -
             mv usr/* $out

     

       185
       185
       -
       

     

       186
       186
       -
             # Otherwise it looks "suspicious"

     

       187
       187
       -
             chmod -R g-w $out

     

       188
       188
       -
       

     

       189
       189
       -
             for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do

     

       190
       190
       -
               patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true

     

       191
       191
       -
               patchelf --set-rpath ${rpath}:$out/lib/slack $file || true

     

       192
       192
       -
             done

     

       193
       193
       -
       

     

       194
       194
       -
             # Replace the broken bin/slack symlink with a startup wrapper.

     

       195
       195
       -
             # Make xdg-open overrideable at runtime.

     

       196
       196
       -
             rm $out/bin/slack

     

       197
       197
       -
             makeWrapper $out/lib/slack/slack $out/bin/slack \

     

       198
       198
       -
               --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \

     

       199
       199
       -
               --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \

     

       200
       200
       -
               --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}"

     

       201
       201
       -
       

     

       202
       202
       -
             # Fix the desktop link

     

       203
       203
       -
             substituteInPlace $out/share/applications/slack.desktop \

     

       204
       204
       -
               --replace /usr/bin/ $out/bin/ \

     

       205
       205
       -
               --replace /usr/share/pixmaps/slack.png slack \

     

       206
       206
       -
               --replace bin/slack "bin/slack -s"

     

       207
       207
       -
           ''

     

       208
       208
       -
           + lib.optionalString stdenv.hostPlatform.isLinux ''

     

       209
       209
       -
             # Prevent Un-blacklist pipewire integration to enable screen sharing on wayland.

     

       210
       210
       -
             # https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763

     

       211
       211
       -
             sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar

     

       212
       212
       -
           ''

     

       213
       213
       -
           + ''

     

       214
       214
       -
             runHook postInstall

     

       215
       215
       -
           '';

     

       216
       216
       -
         };

     

       217
       217
       -
       

     

       218
       218
       -
         darwin = stdenv.mkDerivation {

     

       219
       219
       -
           inherit

     

       220
       220
       -
             pname

     

       221
       221
       -
             version

     

       222
       222
       -
             src

     

       223
       223
       -
             meta

     

       224
       224
       -
             ;

     

       225
       225
       -
       

     

       226
       226
       -
           passthru.updateScript = ./update.sh;

     

       227
       227
       -
       

     

       228
       228
       -
           nativeBuildInputs = [ undmg ];

     

       229
       229
       -
       

     

       230
       230
       -
           sourceRoot = "Slack.app";

     

       231
       231
       -
       

     

       232
       232
       -
           installPhase = ''

     

       233
       233
       -
             runHook preInstall

     

       234
       234
       -
             mkdir -p $out/Applications/Slack.app

     

       235
       235
       -
             cp -R . $out/Applications/Slack.app

     

       236
       236
       -
             runHook postInstall

     

       237
       237
       -
           '';

     

       238
       238
       -
         };

     

       239
       36
        
       in

     

       240
       240
       -
       if stdenv.hostPlatform.isDarwin then darwin else linux

     

       37
       37
       +
       callPackage (if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix) {

     

       38
       38
       +
         inherit pname passthru meta;

     

       39
       39
       +
         inherit (sources.${system} or (throw "Unsupported system: ${system}")) version src;

     

       40
       40
       +
       }

+26

pkgs/by-name/sl/slack/sources.nix

···

       1
       1
       +
       # Generated by ./update.sh - do not update manually!

     

       2
       2
       +
       # Last updated: 2025-08-29

     

       3
       3
       +
       { fetchurl }:

     

       4
       4
       +
       {

     

       5
       5
       +
         aarch64-darwin = {

     

       6
       6
       +
           version = "4.45.69";

     

       7
       7
       +
           src = fetchurl {

     

       8
       8
       +
             url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.45.69/Slack-4.45.69-macOS.dmg";

     

       9
       9
       +
             hash = "sha256-MaPwj0niehwNYiSl8GdzKSF1mezKtIFiAmZzBWbwq9A=";

     

       10
       10
       +
           };

     

       11
       11
       +
         };

     

       12
       12
       +
         x86_64-darwin = {

     

       13
       13
       +
           version = "4.45.69";

     

       14
       14
       +
           src = fetchurl {

     

       15
       15
       +
             url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.45.69/Slack-4.45.69-macOS.dmg";

     

       16
       16
       +
             hash = "sha256-iO5hGzYYmrHoTznw++AEhGjTKiTngzA9/ho+oFGXVeI=";

     

       17
       17
       +
           };

     

       18
       18
       +
         };

     

       19
       19
       +
         x86_64-linux = {

     

       20
       20
       +
           version = "4.45.69";

     

       21
       21
       +
           src = fetchurl {

     

       22
       22
       +
             url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.45.69/slack-desktop-4.45.69-amd64.deb";

     

       23
       23
       +
             hash = "sha256-CwM8oEyRBkE5FSBO5rl4ygRuLtaRefVVZpAEHKxXKcw=";

     

       24
       24
       +
           };

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+47 -37

pkgs/by-name/sl/slack/update.sh

···

       1
       1
        
       #!/usr/bin/env nix-shell

     

       2
       2
       -
       #! nix-shell -i bash -p curl gnused

     

       2
       2
       +
       #! nix-shell -i bash --pure -p cacert curl jq nix

     

       3
       3
        
       

     

       4
       4
       -
       set -eou pipefail

     

       4
       4
       +
       set -euo pipefail

     

       5
       5
        
       

     

       6
       6
       -
       latest_linux_data="$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=deb')"

     

       7
       7
       -
       latest_mac_data="$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=universal&variant=dmg')"

     

       8
       8
       -
       latest_mac_arm_data="$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=arm64&variant=dmg')"

     

       6
       6
       +
       cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))

     

       9
       7
        
       

     

       10
       10
       -
       latest_linux_version="$(echo ${latest_linux_data} | jq -rc '.version')"

     

       11
       11
       -
       latest_mac_version="$(echo ${latest_mac_data} | jq -rc '.version')"

     

       12
       12
       -
       latest_mac_arm_version="$(echo ${latest_mac_arm_data} | jq -rc '.version')"

     

       8
       8
       +
       aarch64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=arm64&variant=dmg')

     

       9
       9
       +
       x86_64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=dmg')

     

       10
       10
       +
       x86_64_linux_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=deb')

     

       13
       11
        
       

     

       14
       14
       -
       nixpkgs="$(git rev-parse --show-toplevel)"

     

       15
       15
       -
       slack_nix="$nixpkgs/pkgs/by-name/sl/slack/package.nix"

     

       16
       16
       -
       nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p')

     

       17
       17
       -
       nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')

     

       18
       18
       -
       nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')

     

       12
       12
       +
       aarch64_darwin_version=$(jq -r .version <<< "$aarch64_darwin_data")

     

       13
       13
       +
       x86_64_darwin_version=$(jq -r .version <<< "$x86_64_darwin_data")

     

       14
       14
       +
       x86_64_linux_version=$(jq -r .version <<< "$x86_64_linux_data")

     

       19
       15
        
       

     

       20
       20
       -
       if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \

     

       21
       21
       -
             "$nixpkgs_mac_version" == "$latest_mac_version" && \

     

       22
       22
       -
             "$nixpkgs_mac_arm_version" == "$latest_mac_version" ]]; then

     

       23
       23
       -
         echo "nixpkgs versions are all up to date!"

     

       24
       24
       -
         exit 0

     

       25
       25
       -
       fi

     

       16
       16
       +
       aarch64_darwin_url=$(jq -r .download_url <<< "$aarch64_darwin_data")

     

       17
       17
       +
       x86_64_darwin_url=$(jq -r .download_url <<< "$x86_64_darwin_data")

     

       18
       18
       +
       x86_64_linux_url=$(jq -r .download_url <<< "$x86_64_linux_data")

     

       26
       19
        
       

     

       27
       27
       -
       linux_url="$(echo ${latest_linux_data} | jq -rc '.download_url')"

     

       28
       28
       -
       mac_url="$(echo ${latest_mac_data} | jq -rc '.download_url')"

     

       29
       29
       -
       mac_arm_url="$(echo ${latest_mac_arm_data} | jq -rc '.download_url')"

     

       30
       30
       -
       linux_sha256=$(nix-prefetch-url ${linux_url})

     

       31
       31
       -
       mac_sha256=$(nix-prefetch-url ${mac_url})

     

       32
       32
       -
       mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url})

     

       20
       20
       +
       aarch64_darwin_hash=$(nix-prefetch-url "$aarch64_darwin_url")

     

       21
       21
       +
       x86_64_darwin_hash=$(nix-prefetch-url "$x86_64_darwin_url")

     

       22
       22
       +
       x86_64_linux_hash=$(nix-prefetch-url "$x86_64_linux_url")

     

       33
       23
        
       

     

       34
       34
       -
       sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix"

     

       35
       35
       -
       sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"

     

       36
       36
       -
       sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"

     

       37
       37
       -
       sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"

     

       38
       38
       -
       sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix"

     

       39
       39
       -
       sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"

     

       24
       24
       +
       # use friendlier hashes

     

       40
       25
        
       

     

       41
       41
       -
       if ! nix-build -A slack "$nixpkgs" --arg config '{ allowUnfree = true; }'; then

     

       42
       42
       -
         echo "The updated slack failed to build."

     

       43
       43
       -
         exit 1

     

       44
       44
       -
       fi

     

       26
       26
       +
       aarch64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$aarch64_darwin_hash")

     

       27
       27
       +
       x86_64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_darwin_hash")

     

       28
       28
       +
       x86_64_linux_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_linux_hash")

     

       45
       29
        
       

     

       46
       46
       -
       echo "Successfully updated"

     

       47
       47
       -
       echo "slack: $nixpkgs_linux_version -> $latest_linux_version"

     

       30
       30
       +
       cat >sources.nix <<EOF

     

       31
       31
       +
       # Generated by ./update.sh - do not update manually!

     

       32
       32
       +
       # Last updated: $(date +%F)

     

       33
       33
       +
       { fetchurl }:

     

       34
       34
       +
       {

     

       35
       35
       +
         aarch64-darwin = {

     

       36
       36
       +
           version = "$aarch64_darwin_version";

     

       37
       37
       +
           src = fetchurl {

     

       38
       38
       +
             url = "$aarch64_darwin_url";

     

       39
       39
       +
             hash = "$aarch64_darwin_hash";

     

       40
       40
       +
           };

     

       41
       41
       +
         };

     

       42
       42
       +
         x86_64-darwin = {

     

       43
       43
       +
           version = "$x86_64_darwin_version";

     

       44
       44
       +
           src = fetchurl {

     

       45
       45
       +
             url = "$x86_64_darwin_url";

     

       46
       46
       +
             hash = "$x86_64_darwin_hash";

     

       47
       47
       +
           };

     

       48
       48
       +
         };

     

       49
       49
       +
         x86_64-linux = {

     

       50
       50
       +
           version = "$x86_64_linux_version";

     

       51
       51
       +
           src = fetchurl {

     

       52
       52
       +
             url = "$x86_64_linux_url";

     

       53
       53
       +
             hash = "$x86_64_linux_hash";

     

       54
       54
       +
           };

     

       55
       55
       +
         };

     

       56
       56
       +
       }

     

       57
       57
       +
       EOF

+12

pkgs/by-name/wx/wxsqlite3/package.nix

···

       18
       18
        
           hash = "sha256-3t8SQJdB7ivuCnsr5TxmgslQNkvz+O/mE3NB+R/kXHM=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       +
         enableParallelBuilding = true;

     

       22
       22
       +
       

     

       21
       23
        
         nativeBuildInputs = [

     

       22
       24
        
           autoreconfHook

     

       23
       25
        
         ];

     
···

       26
       28
        
           sqlite

     

       27
       29
        
           wxGTK32

     

       28
       30
        
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         doCheck = true;

     

       33
       33
       +
       

     

       34
       34
       +
         checkPhase = ''

     

       35
       35
       +
           runHook preCheck

     

       36
       36
       +
       

     

       37
       37
       +
           ./samples/minimal -t -s ./samples

     

       38
       38
       +
       

     

       39
       39
       +
           runHook postCheck

     

       40
       40
       +
         '';

     

       29
       41
        
       

     

       30
       42
        
         meta = with lib; {

     

       31
       43
        
           homepage = "https://utelle.github.io/wxsqlite3/";

+2 -2

pkgs/development/interpreters/php/8.4.nix

···

       4
       4
        
         base = callPackage ./generic.nix (

     

       5
       5
        
           _args

     

       6
       6
        
           // {

     

       7
       7
       -
             version = "8.4.11";

     

       8
       8
       -
             hash = "sha256-LDnHW1TfibARlbcq0O4fzUkMcdsYvFK81h+y/7V7Jvo=";

     

       7
       7
       +
             version = "8.4.12";

     

       8
       8
       +
             hash = "sha256-Lr1TgusJDWAwh9pkntId5ksHlha8mgKrvFMribF+NGg=";

     

       9
       9
        
           }

     

       10
       10
        
         );

     

       11
       11
        
       in

+2 -2

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

···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "cvxpy";

     

       28
       28
       -
         version = "1.7.1";

     

       28
       28
       +
         version = "1.7.2";

     

       29
       29
        
         pyproject = true;

     

       30
       30
        
       

     

       31
       31
        
         src = fetchFromGitHub {

     

       32
       32
        
           owner = "cvxpy";

     

       33
       33
        
           repo = "cvxpy";

     

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

     

       35
       35
       -
           hash = "sha256-gJL9j2hA+PvNhN1twv31dxb5Gz+q8uoIzwhXB12aIr4=";

     

       35
       35
       +
           hash = "sha256-kt/PFPztYhz1pkj50z9FYJNWlHYpqlxsGa1WctBfBy0=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         postPatch =

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

···

       57
       57
        
         pythonRelaxDeps = [

     

       58
       58
        
           "anthropic"

     

       59
       59
        
           "google-generativeai"

     

       60
       60
       +
           "html2text"

     

       60
       61
        
           "psutil"

     

       61
       62
        
           "rich"

     

       62
       63
        
           "starlette"

+5 -9

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         cliff,

     

       5
       5
       -
         fetchFromGitea,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
        
         keystoneauth1,

     

       7
       7
        
         openstackdocstheme,

     

       8
       8
        
         oslo-i18n,

     

       9
       9
        
         oslo-serialization,

     

       10
       10
        
         oslo-utils,

     

       11
       11
        
         pbr,

     

       12
       12
       -
         pythonOlder,

     

       13
       12
        
         requests-mock,

     

       14
       13
        
         requests,

     

       15
       14
        
         setuptools,

     
···

       20
       19
        
       

     

       21
       20
        
       buildPythonPackage rec {

     

       22
       21
        
         pname = "python-barbicanclient";

     

       23
       23
       -
         version = "7.1.0";

     

       22
       22
       +
         version = "7.2.0";

     

       24
       23
        
         pyproject = true;

     

       25
       24
        
       

     

       26
       26
       -
         disabled = pythonOlder "3.9";

     

       27
       27
       -
       

     

       28
       28
       -
         src = fetchFromGitea {

     

       29
       29
       -
           domain = "opendev.org";

     

       25
       25
       +
         src = fetchFromGitHub {

     

       30
       26
        
           owner = "openstack";

     

       31
       27
        
           repo = "python-barbicanclient";

     

       32
       32
       -
           rev = version;

     

       33
       33
       -
           hash = "sha256-VEK3MDuvciF4hpyNKTKWX2v3pSCcVi+YGgSKCLaWAuI=";

     

       28
       28
       +
           tag = version;

     

       29
       29
       +
           hash = "sha256-HhWWUM0lK0B0ySItrT6z5QCXzStuiJzDZFoEb+WRodA=";

     

       34
       30
        
         };

     

       35
       31
        
       

     

       36
       32
        
         env.PBR_VERSION = version;

+4 -7

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

···

       6
       6
        
         fetchFromGitHub,

     

       7
       7
        
         fixtures,

     

       8
       8
        
         keystoneauth1,

     

       9
       9
       +
         openstacksdk,

     

       9
       10
        
         openstackdocstheme,

     

       10
       10
       -
         os-client-config,

     

       11
       11
        
         osc-lib,

     

       12
       12
        
         oslo-i18n,

     

       13
       13
        
         oslo-log,

     
···

       18
       18
        
         pbr,

     

       19
       19
        
         prettytable,

     

       20
       20
        
         python-openstackclient,

     

       21
       21
       -
         pythonOlder,

     

       22
       21
        
         requests-mock,

     

       23
       22
        
         requests,

     

       24
       23
        
         setuptools,

     
···

       30
       29
        
       

     

       31
       30
        
       buildPythonPackage rec {

     

       32
       31
        
         pname = "python-magnumclient";

     

       33
       33
       -
         version = "4.8.1";

     

       32
       32
       +
         version = "4.9.0";

     

       34
       33
        
         pyproject = true;

     

       35
       34
        
       

     

       36
       36
       -
         disabled = pythonOlder "3.8";

     

       37
       37
       -
       

     

       38
       35
        
         src = fetchFromGitHub {

     

       39
       36
        
           owner = "openstack";

     

       40
       37
        
           repo = "python-magnumclient";

     

       41
       38
        
           tag = version;

     

       42
       42
       -
           hash = "sha256-rXLJnvGc5VHkHghCoBLRhARwl3hhS/oI2VOsGWfESkM=";

     

       39
       39
       +
           hash = "sha256-Ok211QgvsKqkotXrC4HwMyonLv7LzuCjs2hjruGDEvY=";

     

       43
       40
        
         };

     

       44
       41
        
       

     

       45
       42
        
         env.PBR_VERSION = version;

     
···

       60
       57
        
           cryptography

     

       61
       58
        
           decorator

     

       62
       59
        
           keystoneauth1

     

       63
       63
       -
           os-client-config

     

       60
       60
       +
           openstacksdk

     

       64
       61
        
           osc-lib

     

       65
       62
        
           oslo-i18n

     

       66
       63
        
           oslo-log

+7 -11

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         cliff,

     

       5
       5
       -
         fetchFromGitea,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
        
         keystoneauth1,

     

       7
       7
        
         openstackdocstheme,

     

       8
       8
       -
         os-client-config,

     

       8
       8
       +
         openstacksdk,

     

       9
       9
        
         osc-lib,

     

       10
       10
        
         oslo-i18n,

     

       11
       11
        
         oslo-serialization,

     
···

       13
       13
        
         oslotest,

     

       14
       14
        
         osprofiler,

     

       15
       15
        
         pbr,

     

       16
       16
       -
         pythonOlder,

     

       17
       16
        
         pyyaml,

     

       18
       17
        
         requests-mock,

     

       19
       18
        
         requests,

     
···

       27
       26
        
       

     

       28
       27
        
       buildPythonPackage rec {

     

       29
       28
        
         pname = "python-mistralclient";

     

       30
       30
       -
         version = "5.4.0";

     

       29
       29
       +
         version = "6.0.0";

     

       31
       30
        
         pyproject = true;

     

       32
       31
        
       

     

       33
       33
       -
         disabled = pythonOlder "3.8";

     

       34
       34
       -
       

     

       35
       35
       -
         src = fetchFromGitea {

     

       36
       36
       -
           domain = "opendev.org";

     

       32
       32
       +
         src = fetchFromGitHub {

     

       37
       33
        
           owner = "openstack";

     

       38
       34
        
           repo = "python-mistralclient";

     

       39
       39
       -
           rev = version;

     

       40
       40
       -
           hash = "sha256-c1kMDyRNMZKnDvL993WvZSsjkXgYLM2+9KBmF+I4vnM=";

     

       35
       35
       +
           tag = version;

     

       36
       36
       +
           hash = "sha256-zdCqBua6S+a7iS3VzELM02oJKwLlI24tHWfx4Pt3nQw=";

     

       41
       37
        
         };

     

       42
       38
        
       

     

       43
       39
        
         env.PBR_VERSION = version;

     
···

       69
       65
        
         ];

     

       70
       66
        
       

     

       71
       67
        
         nativeCheckInputs = [

     

       72
       72
       -
           os-client-config

     

       68
       68
       +
           openstacksdk

     

       73
       69
        
           oslotest

     

       74
       70
        
           osprofiler

     

       75
       71
        
           requests-mock

+8 -5

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
        
         setuptools,

     

       6
       6
        
         # Build and Runtime

     

       7
       7
        
         pbr,

     
···

       36
       36
        
         version = "11.6.0";

     

       37
       37
        
         pyproject = true;

     

       38
       38
        
       

     

       39
       39
       -
         src = fetchPypi {

     

       40
       40
       -
           pname = "python_neutronclient";

     

       41
       41
       -
           inherit version;

     

       42
       42
       -
           hash = "sha256-PGlYCI0YyGdqEKv52UuNvxqYR0HLuYhVTyFogHl+By8=";

     

       39
       39
       +
         src = fetchFromGitHub {

     

       40
       40
       +
           owner = "openstack";

     

       41
       41
       +
           repo = "python-neutronclient";

     

       42
       42
       +
           tag = version;

     

       43
       43
       +
           hash = "sha256-nz7KiFe8IWJypGCjFgrEgGTEsC0xlW3YG/QRNJUzcpc=";

     

       43
       44
        
         };

     

       45
       45
       +
       

     

       46
       46
       +
         env.PBR_VERSION = version;

     

       44
       47
        
       

     

       45
       48
        
         build-system = [

     

       46
       49
        
           setuptools

pkgs/top-level/all-packages.nix

···

       8644
       8644
        
         magnumclient = with python313Packages; toPythonApplication python-magnumclient;

     

       8645
       8645
        
         manilaclient = with python313Packages; toPythonApplication python-manilaclient;

     

       8646
       8646
        
         mistralclient = with python313Packages; toPythonApplication python-mistralclient;

     

       8647
       8647
       +
         neutronclient = with python313Packages; toPythonApplication python-neutronclient;

     

       8647
       8648
        
         swiftclient = with python313Packages; toPythonApplication python-swiftclient;

     

       8648
       8649
        
         troveclient = with python313Packages; toPythonApplication python-troveclient;

     

       8649
       8650
        
         watcherclient = with python313Packages; toPythonApplication python-watcherclient;