nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 19:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #276112 from tweag/some-eval-fixes

Browse Source 
Various eval fixes with `allowAliases = false`
This commit is contained in:
Silvan Mosberger 2023-12-31 22:07:46 +01:00 committed by GitHub
commit c98d1bdee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 75 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pkgs/applications/networking/instant-messengers/teams/default.nix
View File

@ -26,37 +26,33 @@ let
};
appName = "Teams.app";
darwin = stdenv.mkDerivation {
inherit pname meta;
version = versions.darwin;
src = fetchurl {
url = "https://statics.teams.cdn.office.net/production-osx/${versions.darwin}/Teams_osx.pkg";
hash = hashes.darwin;
};
nativeBuildInputs = [ xar cpio makeWrapper ];
unpackPhase = ''
xar -xf $src
zcat < Teams_osx_app.pkg/Payload | cpio -i
'';
sourceRoot = "Microsoft\ Teams.app";
dontPatch = true;
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{Applications/${appName},bin}
cp -R . $out/Applications/${appName}
makeWrapper $out/Applications/${appName}/Contents/MacOS/Teams $out/bin/teams
runHook postInstall
'';
};
in
if stdenv.isDarwin
then darwin
else throw "Teams app for Linux has been removed as it is unmaintained by upstream. (2023-09-29)"
stdenv.mkDerivation {
inherit pname meta;
version = versions.darwin;
src = fetchurl {
url = "https://statics.teams.cdn.office.net/production-osx/${versions.darwin}/Teams_osx.pkg";
hash = hashes.darwin;
};
nativeBuildInputs = [ xar cpio makeWrapper ];
unpackPhase = ''
xar -xf $src
zcat < Teams_osx_app.pkg/Payload | cpio -i
'';
sourceRoot = "Microsoft\ Teams.app";
dontPatch = true;
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{Applications/${appName},bin}
cp -R . $out/Applications/${appName}
makeWrapper $out/Applications/${appName}/Contents/MacOS/Teams $out/bin/teams
runHook postInstall
'';
}

4
pkgs/by-name/gr/gruvbox-plus-icons/package.nix
View File

@ -3,7 +3,7 @@
, stdenvNoCC
, fetchFromGitHub
, gtk3
, breeze-icons
, plasma5Packages
, gnome-icon-theme
, hicolor-icon-theme
}:
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation {
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [ breeze-icons gnome-icon-theme hicolor-icon-theme ];
propagatedBuildInputs = [ plasma5Packages.breeze-icons gnome-icon-theme hicolor-icon-theme ];
installPhase = ''
runHook preInstall

4
pkgs/development/compilers/dotnet/default.nix
View File

@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7
Hashes and urls are retrieved from:
https://dotnet.microsoft.com/download/dotnet
*/
{ callPackage }:
{ lib, config, callPackage }:
let
buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};
buildAttrs = {
@ -35,7 +35,7 @@ in
inherit systemToDotnetRid;
combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {};
} // lib.optionalAttrs config.allowAliases {
# EOL
sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)";
sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

3
pkgs/development/libraries/wtk/default.nix
View File

@ -1,7 +1,5 @@
{ lib, stdenv, requireFile, unzip, xorg }:
assert stdenv.hostPlatform.system == "i686-linux";
stdenv.mkDerivation rec {
pname = "sun-java-wtk";
version = "2.5.2_01";
@ -23,5 +21,6 @@ stdenv.mkDerivation rec {
description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
platforms = [ "i686-linux" ];
};
}

4
pkgs/development/tools/gofumpt/default.nix
View File

@ -2,7 +2,7 @@
, buildGoModule
, fetchFromGitHub
, nix-update-script
, testVersion
, testers
, gofumpt
}:
@ -30,7 +30,7 @@ buildGoModule rec {
passthru = {
updateScript = nix-update-script { };
tests.version = testVersion {
tests.version = testers.testVersion {
package = gofumpt;
version = "v${version}";
};

12
pkgs/servers/nextcloud/default.nix
View File

@ -42,18 +42,6 @@ let
};
};
in {
nextcloud25 = throw ''
Nextcloud v25 has been removed from `nixpkgs` as the support for is dropped
by upstream in 2023-10. Please upgrade to at least Nextcloud v26 by declaring
services.nextcloud.package = pkgs.nextcloud26;
in your NixOS config.
WARNING: if you were on Nextcloud 24 you have to upgrade to Nextcloud 25
first on 23.05 because Nextcloud doesn't support upgrades across multiple major versions!
'';
nextcloud26 = generic {
version = "26.0.10";
hash = "sha256-yArkYMxOmvfQsJd6TJJX+t22a/V5OW9nwHfgLZsmlIw=";

34
pkgs/top-level/aliases.nix
View File

@ -141,6 +141,9 @@ mapAliases ({
ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09
certmgr-selfsigned = certmgr; # Added 2023-11-30
chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22
chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
chocolateDoom = chocolate-doom; # Added 2023-05-01
chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18
@ -204,6 +207,9 @@ mapAliases ({
dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16
dotty = scala_3; # Added 2023-08-20
dotnet-netcore = dotnet-runtime; # Added 2021-10-07
dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; # Added 2020-01-19
dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; # Added 2020-01-19
dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; # Added 2020-09-11
drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15
dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
@ -611,6 +617,18 @@ mapAliases ({
minetestserver_5 = minetestserver; # Added 2023-12-11
minizip2 = pkgs.minizip-ng; # Added 2022-12-28
mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26
mod_dnssd = apacheHttpdPackages.mod_dnssd; # Added 2014-11-07
mod_fastcgi = apacheHttpdPackages.mod_fastcgi; # Added 2014-11-07
mod_python = apacheHttpdPackages.mod_python; # Added 2014-11-07
mod_wsgi = apacheHttpdPackages.mod_wsgi; # Added 2014-11-07
mod_ca = apacheHttpdPackages.mod_ca; # Added 2019-12-24
mod_crl = apacheHttpdPackages.mod_crl; # Added 2019-12-24
mod_csr = apacheHttpdPackages.mod_csr; # Added 2019-12-24
mod_ocsp = apacheHttpdPackages.mod_ocsp; # Added 2019-12-24
mod_scep = apacheHttpdPackages.mod_scep; # Added 2019-12-24
mod_spkac = apacheHttpdPackages.mod_spkac; # Added 2019-12-24
mod_pkcs12 = apacheHttpdPackages.mod_pkcs12; # Added 2019-12-24
mod_timestamp = apacheHttpdPackages.mod_timestamp; # Added 2019-12-24
monero = monero-cli; # Added 2021-11-28
mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05
mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06
@ -636,10 +654,26 @@ mapAliases ({
net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10
netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
nextcloud25 = throw ''
Nextcloud v25 has been removed from `nixpkgs` as the support for is dropped
by upstream in 2023-10. Please upgrade to at least Nextcloud v26 by declaring
services.nextcloud.package = pkgs.nextcloud26;
in your NixOS config.
WARNING: if you were on Nextcloud 24 you have to upgrade to Nextcloud 25
first on 23.05 because Nextcloud doesn't support upgrades across multiple major versions!
''; # Added 2023-10-13
nextcloud25Packages = throw "Nextcloud25 is EOL!"; # Added 2023-10-13
nagiosPluginsOfficial = monitoring-plugins;
neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
nitrokey-udev-rules = libnitrokey; # Added 2023-03-25
nix-direnv-flakes = nix-direnv;
nix-repl = throw ( # Added 2018-08-26
"nix-repl has been removed because it's not maintained anymore, " +
"use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"
);
nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10
nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained" ; # Added 2023-11-20
nixFlakes = nixVersions.stable; # Added 2021-05-21

38
pkgs/top-level/all-packages.nix
View File

@ -939,9 +939,6 @@ with pkgs;
dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
dotnet-sdk_2 = dotnetCorePackages.sdk_2_1;
dotnet-sdk_3 = dotnetCorePackages.sdk_3_1;
dotnet-sdk_5 = dotnetCorePackages.sdk_5_0;
dotnet-sdk_6 = dotnetCorePackages.sdk_6_0;
dotnet-sdk_7 = dotnetCorePackages.sdk_7_0;
dotnet-sdk_8 = dotnetCorePackages.sdk_8_0;
@ -11211,9 +11208,8 @@ with pkgs;
grocy = callPackage ../servers/grocy { };
inherit (callPackage ../servers/nextcloud {})
nextcloud25 nextcloud26 nextcloud27 nextcloud28;
nextcloud26 nextcloud27 nextcloud28;
nextcloud25Packages = throw "Nextcloud25 is EOL!";
nextcloud26Packages = callPackage ../servers/nextcloud/packages {
apps = lib.importJSON ../servers/nextcloud/packages/26.json;
};
@ -26186,7 +26182,6 @@ with pkgs;
mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };
mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
mod_perl = callPackage ../servers/http/apache-modules/mod_perl { };
@ -26196,8 +26191,6 @@ with pkgs;
mod_tile = callPackage ../servers/http/apache-modules/mod_tile { };
mod_wsgi = self.mod_wsgi2;
mod_wsgi2 = throw "mod_wsgi2 has been removed since Python 2 is EOL. Use mod_wsgi3 instead";
mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { };
mod_itk = callPackage ../servers/http/apache-modules/mod_itk { };
@ -26207,6 +26200,10 @@ with pkgs;
php = pkgs.php.override { inherit apacheHttpd; };
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
} // lib.optionalAttrs config.allowAliases {
mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
mod_wsgi = self.mod_wsgi2;
mod_wsgi2 = throw "mod_wsgi2 has been removed since Python 2 is EOL. Use mod_wsgi3 instead";
};
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor apacheHttpd_2_4 apacheHttpdPackages_2_4);
@ -26676,20 +26673,6 @@ with pkgs;
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
# Backwards compatibility.
mod_dnssd = apacheHttpdPackages.mod_dnssd;
mod_fastcgi = apacheHttpdPackages.mod_fastcgi;
mod_python = apacheHttpdPackages.mod_python;
mod_wsgi = apacheHttpdPackages.mod_wsgi;
mod_ca = apacheHttpdPackages.mod_ca;
mod_crl = apacheHttpdPackages.mod_crl;
mod_csr = apacheHttpdPackages.mod_csr;
mod_ocsp = apacheHttpdPackages.mod_ocsp;
mod_scep = apacheHttpdPackages.mod_scep;
mod_spkac = apacheHttpdPackages.mod_spkac;
mod_pkcs12 = apacheHttpdPackages.mod_pkcs12;
mod_timestamp = apacheHttpdPackages.mod_timestamp;
inherit (callPackages ../servers/mpd {
inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
}) mpd mpd-small mpdWithFeatures;
@ -36997,12 +36980,6 @@ with pkgs;
cgminer = callPackage ../applications/blockchains/cgminer { };
chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clboss = callPackage ../applications/blockchains/clboss { };
clightning = callPackage ../applications/blockchains/clightning { };
@ -40733,11 +40710,6 @@ with pkgs;
nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { };
nix-repl = throw (
"nix-repl has been removed because it's not maintained anymore, " +
"use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"
);
nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
nix-serve = callPackage ../tools/package-management/nix-serve { };