diff options
author | Zitrone <nix@dev.quantenzitrone.eu> | 2024-06-12 07:48:59 +0200 |
---|---|---|
committer | Zitrone <general@dev.quantenzitrone.eu> | 2024-06-16 16:24:30 +0200 |
commit | 895f3506f3196aca9c898fc86478acfa55413fc7 (patch) | |
tree | 0222a708686ca3d79036a13762879a208b9d8009 | |
parent | 6f35d8d79416ecaabd062437baa2ee68eb7b2cfa (diff) |
CoinMP: rename to coinmp
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/co/coinmp/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch (renamed from pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/coinmp/0001-use-static_cast-for-static-cast-fixes-319.patch (renamed from pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/coinmp/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch (renamed from pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/coinmp/package.nix (renamed from pkgs/development/libraries/CoinMP/default.nix) | 8 | ||||
-rw-r--r-- | pkgs/by-name/sy/symphony/package.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
8 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 28ffe6d11bbe5..d679b168e24ff 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -47,7 +47,7 @@ , libGLU , libGL , bsh -, CoinMP +, coinmp , libwps , libabw , libargon2 @@ -288,7 +288,7 @@ in stdenv.mkDerivation (finalAttrs: { # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html (libpng.override { apngSupport = false; }) perlPackages.ArchiveZip - CoinMP + coinmp perlPackages.IOCompress abseil-cpp ant diff --git a/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch b/pkgs/by-name/co/coinmp/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch index fccba169df490..fccba169df490 100644 --- a/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch +++ b/pkgs/by-name/co/coinmp/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch diff --git a/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch b/pkgs/by-name/co/coinmp/0001-use-static_cast-for-static-cast-fixes-319.patch index 3f1790bd50c39..3f1790bd50c39 100644 --- a/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch +++ b/pkgs/by-name/co/coinmp/0001-use-static_cast-for-static-cast-fixes-319.patch diff --git a/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch b/pkgs/by-name/co/coinmp/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch index b1ca1806b5a9c..b1ca1806b5a9c 100644 --- a/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch +++ b/pkgs/by-name/co/coinmp/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/by-name/co/coinmp/package.nix index 7b829305b0319..8c15c5ca62c34 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/by-name/co/coinmp/package.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation rec { - pname = "CoinMP"; +stdenv.mkDerivation (finalAttrs: { + pname = "coinmp"; version = "1.8.4"; src = fetchurl { - url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/CoinMP-${finalAttrs.version}.tgz"; sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.epl10; }; -} +}) diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix index 51d3316c7d17b..cb75fae961b1c 100644 --- a/pkgs/by-name/sy/symphony/package.nix +++ b/pkgs/by-name/sy/symphony/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , coin-utils -, CoinMP +, coinmp , gfortran , libtool , glpk @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; }; - nativeBuildInputs = [ libtool pkg-config glpk gfortran CoinMP osi coin-utils ]; + nativeBuildInputs = [ libtool pkg-config glpk gfortran coinmp osi coin-utils ]; meta = { description = "SYMPHONY is an open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs) written in C with a number of unique features"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef306928..34f01f6b13936 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -186,6 +186,7 @@ mapAliases ({ inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12ff3f330bae..376094260fde5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20333,8 +20333,6 @@ with pkgs; soxt = callPackage ../development/libraries/soxt { }; - CoinMP = callPackage ../development/libraries/CoinMP { }; - coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; }; |