ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-09 00:07:43 +00:00 committed by GitHub
commit 11a84bc3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 175 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/system/activation/switch-to-configuration.pl
View File

@ -351,8 +351,14 @@ foreach my $device (keys %$prevSwaps) {
# Should we have systemd re-exec itself?
my $prevSystemd = abs_path("/proc/1/exe") // "/unknown";
my $prevSystemdSystemConfig = abs_path("/etc/systemd/system.conf") // "/unknown";
my $newSystemd = abs_path("@systemd@/lib/systemd/systemd") or die;
my $newSystemdSystemConfig = abs_path("$out/etc/systemd/system.conf") // "/unknown";
my $restartSystemd = $prevSystemd ne $newSystemd;
if ($prevSystemdSystemConfig ne $newSystemdSystemConfig) {
$restartSystemd = 1;
}
sub filterUnits {

6
pkgs/applications/networking/browsers/amfora/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "amfora";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "makeworld-the-better-one";
repo = "amfora";
rev = "v${version}";
sha256 = "sha256-q83fKs27vkrUs3+AoKZ2342llj6u3bvbLsdnT9DnVUs=";
sha256 = "sha256-Vj5aFSpyC7X9e9A9r4FAI6a0U8dx8uj7bpAFrQjLSzo=";
};
vendorSha256 = "sha256-0blHwZwOcgC4LcmZSJPRvyQzArCsaMGgIw+cesO+qOo=";
vendorSha256 = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0=";
postInstall = lib.optionalString (!stdenv.isDarwin) ''
sed -i "s:amfora:$out/bin/amfora:" amfora.desktop

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "21.04.14";
version = "21.11.29";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "1z8c0179r8g0y9zh4383brsfhkcyfy79dc8hw94p9zjn5a66547w";
sha256 = "sha256-0hGxgmNNYvNT1QQpA7SdOdN1VM8Iix+kZZFcO2R1V/Y=";
};
nativeBuildInputs = [ gtk3 ];

3
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -11,6 +11,7 @@
, libxml2
, gtk3
, libnotify
, gvfs
, cinnamon-desktop
, xapps
, libexif
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
xapps
libexif
exempi
gvfs
gobject-introspection
libgsf
];
@ -73,3 +75,4 @@ stdenv.mkDerivation rec {
maintainers = teams.cinnamon.members;
};
}

4
pkgs/desktops/cinnamon/pix/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "pix";
version = "2.6.5";
version = "2.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "qBF5lc7ZNwuTr6x4c4pJA6a7oXqOYsYA1lpTmQkylT0=";
sha256 = "sha256-m508pkbiSVuIaEx7EznOd5QTkpM66TBbpM5HRkjKRQA=";
};
nativeBuildInputs = [

34
pkgs/development/libraries/elfio/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, boost
}:
stdenv.mkDerivation rec {
pname = "elfio";
version = "3.9";
src = fetchFromGitHub {
owner = "serge1";
repo = "elfio";
rev = "Release_${version}";
sha256 = "sha256-5O9KnHZXzepp3O1PGenJarrHElWLHgyBvvDig1Hkmo4=";
};
nativeBuildInputs = [ cmake ];
checkInputs = [ boost ];
cmakeFlags = [ "-DELFIO_BUILD_TESTS=ON" ];
doCheck = true;
meta = with lib; {
description = "Header-only C++ library for reading and generating files in the ELF binary format";
homepage = "https://github.com/serge1/ELFIO";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ prusnak ];
};
}

7
pkgs/development/libraries/libcyaml/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libcyaml";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "tlsa";
repo = "libcyaml";
rev = "v${version}";
sha256 = "sha256-u5yLrAXaavALNArj6yw+v5Yn4eqXWTHmUxHe+pVCbXM=";
sha256 = "sha256-8Dd6LQovPx+y2957zY8blA0ls10ekGvTCeKmLyHZnOI=";
};
buildInputs = [ libyaml ];
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/tlsa/libcyaml";
description = "C library for reading and writing YAML";
changelog = "https://github.com/tlsa/libcyaml/raw/v${version}/CHANGES.md";
license = licenses.isc;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -3,7 +3,7 @@
}:
let
version = "2.0.4";
version = "2.0.5";
# Make sure we override python, so the correct version is chosen
boostPython = boost.override { enablePython = true; inherit python; };
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
owner = "arvidn";
repo = "libtorrent";
rev = "v${version}";
sha256 = "sha256-D+Euv71pquqyKGPvk76IwYKvVj+/oNtJfiLleiafthQ=";
sha256 = "sha256-wTyeGTxihnjTGBsVa0Yq2M/cxhWhZ9KLHVy10ya2gc4=";
fetchSubmodules = true;
};

37
pkgs/development/libraries/termcolor/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "termcolor";
version = "2.0.0";
src = fetchFromGitHub {
owner = "ikalnytskyi";
repo = "termcolor";
rev = "v${version}";
sha256 = "sha256-W0hB+lFJ2sm7DsbOzITOtjJuntSM55BfwUunOOS4RcA=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DTERMCOLOR_TESTS=ON" ];
doCheck = true;
checkPhase = ''
runHook preCheck
./test_termcolor
runHook postCheck
'';
meta = with lib; {
description = "Header-only C++ library for printing colored messages";
homepage = "https://github.com/ikalnytskyi/termcolor";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ prusnak ];
};
}

4
pkgs/development/python-modules/casbin/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.12.0";
version = "1.13.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "sha256-kUM4Oc4T3PSFAprUx6eY/aJpDM8RiHjPtAxMKjfHj6s=";
sha256 = "1qraxp0nij5412pvz9lvysb38px551arl29q06pd0z6rg1d8gdkx";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/django-sites/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "django-sites";
version = "0.10";
version = "0.11";
src = fetchPypi {
inherit pname version;
sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3";
sha256 = "1cbee714fdf2bfbe92e4f5055de4e6c41b64ebb32e1f96b1016c0748210928b8";
};
# LICENSE file appears to be missing from pypi package, but expected by the installer
# https://github.com/niwinz/django-sites/issues/11

8
pkgs/development/python-modules/ocrmypdf/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, cffi
, coloredlogs
, fetchFromGitHub
, ghostscript
@ -17,7 +16,6 @@
, pytestCheckHook
, pythonOlder
, reportlab
, setuptools
, setuptools-scm
, setuptools-scm-git-archive
, stdenv
@ -29,7 +27,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
version = "13.0.0";
version = "13.1.0";
src = fetchFromGitHub {
owner = "jbarlow83";
@ -41,7 +39,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
sha256 = "sha256-W5RFCWKDIRrsgHZL8uSOQWvEltLbqYAweZkgIZZrSIo=";
sha256 = "sha256-K8amHifxaR/tRiQODWVZcOd5nL5zzjd8C7h5whl/HoQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -63,7 +61,6 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
cffi
coloredlogs
img2pdf
pdfminer
@ -71,7 +68,6 @@ buildPythonPackage rec {
pillow
pluggy
reportlab
setuptools
tqdm
] ++ (lib.optionals (pythonOlder "3.8") [
importlib-metadata

57
pkgs/development/tools/misc/libtree/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, binutils
, chrpath
, cmake
, cxxopts
, elfio
, termcolor
, gtest
}:
stdenv.mkDerivation rec {
pname = "libtree";
version = "2.0.0";
src = fetchFromGitHub {
owner = "haampie";
repo = "libtree";
rev = "v${version}";
sha256 = "sha256-j54fUwMkX4x4MwL8gMraguK9GqQRBjCC+W6ojFnQdHQ=";
};
patches = [
# add missing include
# https://github.com/haampie/libtree/pull/42
(fetchpatch {
url = "https://github.com/haampie/libtree/commit/219643ff6edcae42c9546b8ba38cfec9d19b034e.patch";
sha256 = "sha256-vdFmmBdBiOT3QBcwd3SuiolcaFTFAb88kU1KN8229K0=";
})
];
postPatch = ''
substituteInPlace src/main.cpp \
--replace "std::string strip = \"strip\";" "std::string strip = \"${binutils}/bin/strip\";" \
--replace "std::string chrpath = \"chrpath\";" "std::string chrpath = \"${chrpath}/bin/chrpath\";"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ cxxopts elfio termcolor ];
doCheck = true;
checkInputs = [ gtest ];
cmakeFlags = [ "-DLIBTREE_BUILD_TESTS=ON" ];
meta = with lib; {
description = "Tree ldd with an option to bundle dependencies into a single folder";
homepage = "https://github.com/haampie/libtree";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ prusnak rardiol ];
};
}

8
pkgs/games/sm64ex/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "sm64ex";
version = "unstable-2020-10-09";
version = "unstable-2021-11-30";
src = fetchFromGitHub {
owner = "sm64pc";
repo = "sm64ex";
rev = "57c203465b2b3eee03dcb796ed1fad07d8283a2c";
sha256 = "0k6a3r9f4spa7y2v1lyqs9lwa05lw8xgywllb7w828nal8y33cs6";
rev = "db9a6345baa5acb41f9d77c480510442cab26025";
sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8=";
};
nativeBuildInputs = [ python3 pkg-config ];
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://github.com/sm64pc/sm64ex";
description = "Super Mario 64 port based off of decompilation";

4
pkgs/servers/mattermost/matterircd.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "matterircd";
version = "0.24.2";
version = "0.25.0";
src = fetchFromGitHub {
owner = "42wim";
repo = "matterircd";
rev = "v${version}";
sha256 = "sha256-SatnrRKYCngBZJwRNMad9Vt2xd7FktH79t3TB83cwhg=";
sha256 = "sha256-AuY6tAZ1WlUkiKcbDcXBDh2OdKwWllx2xJxPCbqQguM=";
};
goPackagePath = "github.com/42wim/matterircd";

4
pkgs/tools/graphics/pngquant/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pngquant";
version = "2.16.0";
version = "2.17.0";
src = fetchFromGitHub {
owner = "kornelski";
repo = "pngquant";
rev = version;
sha256 = "0ny6h3fwf6gvzkqkc3zb5mrkqxm6s7xzb6bvzn6vlamklncqgl78";
sha256 = "sha256-D2KNn6AJ4eIHeb/2Oo1Wf0djMCXTtVGrua0D6z7+9V4=";
fetchSubmodules = true;
};

4
pkgs/tools/misc/ostree/default.nix
View File

@ -41,13 +41,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
version = "2021.4";
version = "2021.6";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "sha256-21zgGhYGrzRm7HcjZwD1OmPOIOSYSlSdDquj9mo9k2E=";
sha256 = "sha256-6AYxyxNj1HNP6dDJH2mmi+OEgWbW4EgdsZzkSpy09TE=";
};
patches = [

4
pkgs/tools/misc/parallel/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "parallel";
version = "20210722";
version = "20211122";
src = fetchurl {
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
sha256 = "0jaa5137sjw2szvmnnslkqv1n3gg2rkkgr71j7hpp5a3q15hjf9j";
sha256 = "sha256-SLJWMixWpMsaeBj+CJT93lddqw4PklxqIolRe2vYli4=";
};
outputs = [ "out" "man" "doc" ];

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

@ -7343,6 +7343,8 @@ with pkgs;
libtins = callPackage ../development/libraries/libtins { };
libtree = callPackage ../development/tools/misc/libtree { };
libshout = callPackage ../development/libraries/libshout { };
libqb = callPackage ../development/libraries/libqb { };
@ -10015,6 +10017,8 @@ with pkgs;
telescope = callPackage ../applications/networking/browsers/telescope { };
termcolor = callPackage ../development/libraries/termcolor { };
termscp = callPackage ../tools/networking/termscp {
inherit (darwin.apple_sdk.frameworks) Foundation Security;
};
@ -16136,6 +16140,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
elfio = callPackage ../development/libraries/elfio { };
enchant1 = callPackage ../development/libraries/enchant/1.x.nix { };
enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };