diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management')
28 files changed, 378 insertions, 286 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index 524f912cf045..620a0b05a95c 100644 --- a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -11,29 +11,30 @@ let appimagekit_src = fetchFromGitHub { owner = "AppImage"; repo = "AppImageKit"; - rev = "b0859501df61cde198b54a317c03b41dbafc98b1"; - sha256 = "0qqg79jw9w9rs8c2w3lla4kz62ihafrf7jm370pp1dl8y2i81jzg"; + rev = "8bbf694455d00f48d835f56afaa1dabcd9178ba6"; + sha256 = "sha256-pqg+joomC5CI9WdKP/h/XKPsruMgZEaIOjPLOqnNPZw="; + fetchSubmodules = true; }; - # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/cmake/dependencies.cmake" + # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" appimagekit_squashfuse = squashfuse.overrideAttrs (attrs: rec { - name = "squashfuse-${version}"; - version = "20161009"; + pname = "squashfuse"; + version = "unstable-2016-10-09"; src = fetchFromGitHub { owner = "vasi"; - repo = "squashfuse"; - rev = "1f980303b89c779eabfd0a0fdd36d6a7a311bf92"; - sha256 = "0lrw9ff8k15l34wjwyllw3i35hl0cms97jj2hpnr2q8ipgxpb5q5"; + repo = pname; + rev = "1f980303b89c779eabfd0a0fdd36d6a7a311bf92"; + sha256 = "sha256-BZd1+7sRYZHthULKk3RlgMIy4uCUei45GbSEiZxLPFM="; }; patches = [ - "${appimagekit_src}/squashfuse.patch" - "${appimagekit_src}/squashfuse_dlopen.patch" + "${appimagekit_src}/lib/libappimage/src/patches/squashfuse.patch" + "${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.patch" ]; postPatch = '' - cp -v ${appimagekit_src}/squashfuse_dlopen.[hc] . + cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] . ''; preConfigure = '' @@ -58,27 +59,27 @@ let }); in stdenv.mkDerivation rec { - name = "appimagekit-20180727"; + pname = "appimagekit"; + version = "unstable-2020-12-31"; src = appimagekit_src; patches = [ ./nix.patch ]; + postPatch = '' + patchShebangs src/embed-magic-bytes-in-file.sh + ''; + nativeBuildInputs = [ pkg-config cmake autoconf automake libtool wget xxd - desktop-file-utils + desktop-file-utils makeWrapper ]; buildInputs = [ - glib zlib cairo openssl fuse - xz inotify-tools libarchive - squashfsTools makeWrapper + glib zlib cairo openssl fuse xz inotify-tools + libarchive squashfsTools appimagekit_squashfuse ]; - postPatch = '' - substituteInPlace src/appimagetool.c --replace "/usr/bin/file" "${file}/bin/file" - ''; - preConfigure = '' export HOME=$(pwd) ''; @@ -87,22 +88,22 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_XZ=ON" "-DUSE_SYSTEM_SQUASHFUSE=ON" "-DSQUASHFUSE=${appimagekit_squashfuse}" - "-DUSE_SYSTEM_INOTIFY_TOOLS=ON" "-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON" ]; postInstall = '' + mkdir -p $out/lib/appimagekit cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" wrapProgram "$out/bin/appimagetool" \ - --prefix PATH : "${lib.makeBinPath [ file gnupg ]}" + --prefix PATH : "${lib.makeBinPath [ file gnupg ]}" \ + --unset SOURCE_DATE_EPOCH ''; checkInputs = [ gtest ]; - doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why # for debugging passthru = { @@ -117,6 +118,7 @@ in stdenv.mkDerivation rec { AppImages. ''; license = licenses.mit; + maintainers = with maintainers; [ taeer ]; homepage = src.meta.homepage; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch b/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch index 9725cef5ba7d..f03922cb5ca4 100644 --- a/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch +++ b/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch @@ -1,174 +1,82 @@ -diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake -index ea133a3..916606c 100644 ---- a/cmake/dependencies.cmake -+++ b/cmake/dependencies.cmake -@@ -224,21 +224,23 @@ if(NOT USE_SYSTEM_XZ) - LIBRARY_DIRS <INSTALL_DIR>/lib/ - LIBRARIES "<INSTALL_DIR>/lib/liblzma.a" - INCLUDE_DIRS "<SOURCE_DIR>/src/liblzma/api/" +Submodule lib/libappimage contains modified content +diff --git a/lib/libappimage/cmake/dependencies.cmake b/lib/libappimage/cmake/dependencies.cmake +index 8d96484..c7b17a1 100644 +--- a/lib/libappimage/cmake/dependencies.cmake ++++ b/lib/libappimage/cmake/dependencies.cmake +@@ -91,9 +91,18 @@ if(NOT USE_SYSTEM_SQUASHFUSE) + INCLUDE_DIRS "<SOURCE_DIR>" ) else() - message(STATUS "Using system xz") - - import_pkgconfig_target(TARGET_NAME xz PKGCONFIG_TARGET liblzma STATIC) - endif() - -+set(USE_SYSTEM_SQUASHFUSE OFF CACHE BOOL "Use system squashfuse instead of building our own") - -+if(NOT USE_SYSTEM_SQUASHFUSE) - # as distros don't provide suitable squashfuse and squashfs-tools, those dependencies are bundled in, can, and should - # be used from this repository - # TODO: implement out-of-source builds for squashfuse, as for the other dependencies - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/src/patch-squashfuse.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/patch-squashfuse.sh - @ONLY - ) - - ExternalProject_Add(squashfuse-EXTERNAL -@@ -259,20 +261,34 @@ ExternalProject_Add(squashfuse-EXTERNAL - BUILD_IN_SOURCE ON - INSTALL_COMMAND ${MAKE} install - ) - - import_external_project( - TARGET_NAME squashfuse - EXT_PROJECT_NAME squashfuse-EXTERNAL - LIBRARIES "<SOURCE_DIR>/.libs/libsquashfuse.a;<SOURCE_DIR>/.libs/libsquashfuse_ll.a;<SOURCE_DIR>/.libs/libfuseprivate.a" - INCLUDE_DIRS "<SOURCE_DIR>" - ) -+else() +- message(STATUS "Using system squashfuse") + message(STATUS "Using system squashfsfuse from ${SQUASHFUSE}") -+ -+ add_library(squashfuse INTERFACE IMPORTED GLOBAL) + +- import_pkgconfig_target(TARGET_NAME libsquashfuse PKGCONFIG_TARGET squashfuse) ++ add_library(libsquashfuse INTERFACE IMPORTED GLOBAL) + + set(squashfuse_INCLUDE_DIRS "${SQUASHFUSE}/include") + set(squashfuse_LIBRARIES "${SQUASHFUSE}/lib/libsquashfuse.a;${SQUASHFUSE}/lib/libsquashfuse_ll.a;${SQUASHFUSE}/lib/libfuseprivate.a") + + set_property( -+ TARGET squashfuse ++ TARGET libsquashfuse + PROPERTY INTERFACE_LINK_LIBRARIES ${squashfuse_LIBRARIES} + ) + include_directories(${squashfuse_INCLUDE_DIRS}) -+endif() - - - set(USE_SYSTEM_INOTIFY_TOOLS OFF CACHE BOOL "Use system libinotifytools instead of building our own") - - if(NOT USE_SYSTEM_INOTIFY_TOOLS) - message(STATUS "Downloading and building inotify-tools") - - # TODO: build out of source - ExternalProject_Add(inotify-tools-EXTERNAL - URL https://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-3.14.tar.gz -@@ -345,20 +361,23 @@ if(NOT USE_SYSTEM_GTEST) - INCLUDE_DIRS "<INSTALL_DIR>/include/" - ) - else() - message(STATUS "Using system GTest") - - import_find_pkg_target(gtest GTest GTEST) - endif() - endif() - - -+set(USE_SYSTEM_MKSQUASHFS OFF CACHE BOOL "Use system mksquashfs instead of downloading and building our own") -+ -+if(NOT USE_SYSTEM_MKSQUASHFS) - # TODO: allow using system wide mksquashfs - set(mksquashfs_cflags "-DXZ_SUPPORT ${CFLAGS}") - - if(xz_LIBRARIES MATCHES "\\.a$") - set(mksquashfs_ldflags "${xz_LIBRARIES}") - else() - set(mksquashfs_ldflags "-l${xz_LIBRARIES}") - endif() - - if(xz_INCLUDE_DIRS) -@@ -385,20 +404,25 @@ ExternalProject_Add(mksquashfs - INSTALL_COMMAND ${MAKE} -C squashfs-tools/ install INSTALL_DIR=<INSTALL_DIR> - ) - - ExternalProject_Get_Property(mksquashfs INSTALL_DIR) - set(mksquashfs_INSTALL_DIR "${INSTALL_DIR}") - mark_as_advanced(mksquashfs_INSTALL_DIR) - - # for later use when packaging as an AppImage - set(mksquashfs_BINARY "${mksquashfs_INSTALL_DIR}/mksquashfs") - mark_as_advanced(mksquashfs_BINARY) -+else() -+ message(STATUS "Using system mksquashfs") -+ -+ set(mksquashfs_BINARY "mksquashfs") -+endif() - - - #### build dependency configuration #### - - # only have to build custom xz when not using system libxz - if(TARGET xz-EXTERNAL) - if(TARGET squashfuse-EXTERNAL) - ExternalProject_Add_StepDependencies(squashfuse-EXTERNAL configure xz-EXTERNAL) - endif() - if(TARGET mksquashfs) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3f25442..974ed0e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -197,27 +197,27 @@ target_include_directories(digest_md5 - - target_link_libraries(digest_md5 - PRIVATE - libglib - ) - - - # install binaries - if(AUXILIARY_FILES_DESTINATION) - install( -- PROGRAMS ${mksquashfs_INSTALL_DIR}/mksquashfs ${CMAKE_CURRENT_BINARY_DIR}/runtime -+ PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/runtime - DESTINATION ${AUXILIARY_FILES_DESTINATION} - COMPONENT applications - ) - else() - install( -- PROGRAMS ${mksquashfs_INSTALL_DIR}/mksquashfs ${CMAKE_CURRENT_BINARY_DIR}/runtime -+ PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/runtime - DESTINATION bin - COMPONENT applications - ) endif() - - install( - TARGETS AppRun appimagetool digest validate - RUNTIME DESTINATION bin COMPONENT applications - LIBRARY DESTINATION lib COMPONENT applications - ARCHIVE DESTINATION lib/static COMPONENT applications -diff --git a/src/shared.c b/src/shared.c -index cf5fd5c..4f48dbc 100644 ---- a/src/shared.c -+++ b/src/shared.c -@@ -34,21 +34,21 @@ + + +diff --git a/src/appimagetool.c b/src/appimagetool.c +index 6b37419..23425e7 100644 +--- a/src/appimagetool.c ++++ b/src/appimagetool.c +@@ -38,7 +38,7 @@ + #include <argp.h> + + #include <fcntl.h> +-#include "squashfuse.h" ++#include <squashfuse.h> + + #include <sys/types.h> #include <sys/stat.h> +@@ -96,7 +96,7 @@ static void die(const char *msg) { + } + + /* Function that prints the contents of a squashfs file +-* using libsquashfuse (#include "squashfuse.h") */ ++* using libsquashfuse (#include <squashfuse.h>) */ + int sfs_ls(char* image) { + sqfs_err err = SQFS_OK; + sqfs_traverse trv; +diff --git a/src/appimagetoolnoglib.c b/src/appimagetoolnoglib.c +index f900e76..ffa87f8 100644 +--- a/src/appimagetoolnoglib.c ++++ b/src/appimagetoolnoglib.c +@@ -3,7 +3,7 @@ + + #include <stdlib.h> + #include <fcntl.h> +-#include "squashfuse.h" ++#include <squashfuse.h> + #include <sys/types.h> - #include <dirent.h> - #include <errno.h> - - #include <glib.h> - #include <glib/gprintf.h> - #include <glib/gstdio.h> - #include <gio/gio.h> - + #include <sys/stat.h> +@@ -118,7 +118,7 @@ int is_regular_file(const char *path) + } + + /* Function that prints the contents of a squashfs file +- * using libsquashfuse (#include "squashfuse.h") */ ++ * using libsquashfuse (#include <squashfuse.h>) */ + int sfs_ls(char* image) { + sqfs_err err = SQFS_OK; + sqfs_traverse trv; +diff --git a/src/runtime.c b/src/runtime.c +index bada3af..70a642b 100644 +--- a/src/runtime.c ++++ b/src/runtime.c +@@ -29,7 +29,7 @@ + + #define _GNU_SOURCE + -#include "squashfuse.h" +#include <squashfuse.h> #include <squashfs_fs.h> - #include "getsection.h" - #include "elf.h" - - #include "xdg-basedir.h" - - // own header - #include "shared.h" - - #if HAVE_LIBARCHIVE3 == 1 // CentOS + #include <nonstd.h> diff --git a/nixpkgs/pkgs/tools/package-management/apt/default.nix b/nixpkgs/pkgs/tools/package-management/apt/default.nix index 178103cdb380..86982bf7f3a2 100644 --- a/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, cmake, perlPackages, curl, gtest -, gnutls, libtasn1, lzma, bzip2, lz4, zstd, libseccomp, udev +, gnutls, libtasn1, xz, bzip2, lz4, zstd, libseccomp, udev , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 # used when WITH_DOC=ON @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake gtest libxslt.bin ]; buildInputs = [ - perlPackages.perl curl gnutls libtasn1 lzma bzip2 lz4 zstd libseccomp udev db dpkg + perlPackages.perl curl gnutls libtasn1 xz bzip2 lz4 zstd libseccomp udev db dpkg ] ++ lib.optionals withDocs [ doxygen perlPackages.Po4a w3m docbook_xml_dtd_45 ] ++ lib.optionals withNLS [ diff --git a/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix index c2cda02ca255..3cb5340d1d7c 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "1jdp5ksxm4rsqhirgl5zwpiahrz2lx046pkvf6xvr6ms70l2xiwj"; + sha256 = "sha256-MsXNneKj2xCci1guj1TKcIrX7XByJ5/lWUmjxAsgzPY="; }; - cargoSha256 = "07bjxsg5kgx8dg3wf6mvi5460db206l68irqc21hz10plz5llmnr"; + cargoSha256 = "sha256-NdzgIB6uXMtGiLwOACEIeAb4iv7mYLnwRte3M/TkSMA="; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix index df492863a142..d5be54b71b05 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,20 +1,23 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "1q8i2c3f8ir1pxkvla4dshz7n0cl97mjydc64xis5pph39f69yc1"; + sha256 = "sha256-w3wKUAAp9z4iQbx16z5chpKHYxCDLZzJesnIct2Qy4g="; }; - cargoSha256 = "1b62mcj4gjz2arjf3r30k9qcg81i5x0149a4bfj39xdrz55gg0wh"; + cargoSha256 = "sha256-ychF3qbwEjumLyqc+xDI8bbKzvdoRYF/X/idlk+JxDE="; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; + # enables `cargo audit fix` + cargoBuildFlags = [ "--features fix" ]; + # The tests require network access which is not available in sandboxed Nix builds. doCheck = false; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix index 668a623ee2a5..f171a1500454 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix @@ -8,24 +8,26 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.24.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; - rev = "b49351f6770aa7aeb053dd1d4a02d6b086caad2a"; - sha256 = "1hs96yv0awgi7ggpxp7k3n21jpv642sm0529b21hs9ib6kp4vs8s"; + rev = "v${version}"; + sha256 = "sha256-oWivGy2azF9zpeZ0UAi7Bxm4iXFWAjcBG0pN7qtkSU8="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; - - checkType = "debug"; + cargoSha256 = "0j9frvcmy9hydw73v0ffr0bjvq2ykylnpmiw700z344djpaaa08y"; preCheck = '' substituteInPlace tests/command.rs \ - --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/debug" + --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release" + + # This is an FHS specific assert depending on glibc location + substituteInPlace src/dependencies.rs \ + --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix new file mode 100644 index 000000000000..ba3c51822e90 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -0,0 +1,28 @@ +{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: + +stdenv.mkDerivation { + name = "DisnixWebService-0.10"; + src = fetchurl { + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; + sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; + }; + buildInputs = [ apacheAnt jdk ]; + PREFIX = "\${env.out}"; + AXIS2_LIB = "${axis2}/lib"; + AXIS2_WEBAPP = "${axis2}/webapps/axis2"; + DBUS_JAVA_LIB = "${dbus_java}/share/java"; + prePatch = '' + sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ + -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ + scripts/disnix-soap-client + ''; + buildPhase = "ant"; + installPhase = "ant install"; + + meta = { + description = "A SOAP interface and client for Disnix"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/default.nix new file mode 100644 index 000000000000..14be0924f271 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/disnix/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: + +stdenv.mkDerivation { + name = "disnix-0.10"; + + src = fetchurl { + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; + sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; + + meta = { + description = "A Nix-based distributed service deployment tool"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ sander tomberek ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix new file mode 100644 index 000000000000..1b9d2eaefcd8 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: + +stdenv.mkDerivation { + name = "disnixos-0.9"; + + src = fetchurl { + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; + sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ socat dysnomia disnix getopt ]; + + meta = { + description = "Provides complementary NixOS infrastructure deployment to Disnix"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix new file mode 100644 index 000000000000..b4c3851a50ff --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: + +stdenv.mkDerivation rec { + version="2020-07-04"; + name = "dydisnix-${version}"; + + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "dydisnix"; + rev = "e99091f1c2329d562097e35faedee80622d387f0"; + sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; + }; + + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; + buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; + preConfigure = '' + ./bootstrap + ''; + + meta = { + description = "A toolset enabling self-adaptive redeployment on top of Disnix"; + longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.tomberek ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix new file mode 100644 index 000000000000..56ba16afb47b --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -0,0 +1,71 @@ +{ lib, stdenv, fetchurl, netcat +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null +, enableApacheWebApplication ? false +, enableAxis2WebService ? false +, enableEjabberdDump ? false +, enableMySQLDatabase ? false +, enablePostgreSQLDatabase ? false +, enableSubversionRepository ? false +, enableTomcatWebApplication ? false +, enableMongoDatabase ? false +, enableInfluxDatabase ? false +, enableSupervisordProgram ? false +, enableDockerContainer ? true +, enableLegacy ? false +, catalinaBaseDir ? "/var/tomcat" +, jobTemplate ? "systemd" +, getopt +}: + +assert enableMySQLDatabase -> mysql != null; +assert enablePostgreSQLDatabase -> postgresql != null; +assert enableSubversionRepository -> subversion != null; +assert enableEjabberdDump -> ejabberd != null; +assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); +assert enableInfluxDatabase -> influxdb != null; +assert enableSupervisordProgram -> supervisor != null; +assert enableDockerContainer -> docker != null; + +stdenv.mkDerivation { + name = "dysnomia-0.10"; + src = fetchurl { + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; + sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; + }; + + preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; + + configureFlags = [ + (if enableApacheWebApplication then "--with-apache" else "--without-apache") + (if enableAxis2WebService then "--with-axis2" else "--without-axis2") + (if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") + (if enableMySQLDatabase then "--with-mysql" else "--without-mysql") + (if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") + (if enableSubversionRepository then "--with-subversion" else "--without-subversion") + (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") + (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") + (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") + (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") + (if enableDockerContainer then "--with-docker" else "--without-docker") + "--with-job-template=${jobTemplate}" + ] ++ lib.optional enableLegacy "--enable-legacy"; + + buildInputs = [ getopt netcat ] + ++ lib.optional stdenv.isLinux systemd + ++ lib.optional enableEjabberdDump ejabberd + ++ lib.optional enableMySQLDatabase mysql.out + ++ lib.optional enablePostgreSQLDatabase postgresql + ++ lib.optional enableSubversionRepository subversion + ++ lib.optional enableMongoDatabase mongodb + ++ lib.optional enableMongoDatabase mongodb-tools + ++ lib.optional enableInfluxDatabase influxdb + ++ lib.optional enableSupervisordProgram supervisor + ++ lib.optional enableDockerContainer docker; + + meta = { + description = "Automated deployment of mutable components and services for Disnix"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 7eee52f8efa8..459b9550b7c8 100644 --- a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.20.5"; + version = "1.20.7.1"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1pg0yd1q9l5cx7pr0853yds1n3mh5b28zkw79gjqjzcmjwqkzwpj"; + sha256 = "sha256-Cq0t5of3l++OvavHuv0W3BSX8c4jvZFG+apz85alY28="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/nixpkgs/pkgs/tools/package-management/emplace/default.nix index e5da9a1d7b42..735c940f18b1 100644 --- a/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.0.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dDFc13IVD4f5UgiHXAcqRKoZEPTn/iBOogT3XfdstK0="; + sha256 = "sha256-lBCGSeEVxlXrn1RHqMEYSXLOehJw/DiL+33nx4+rV2Y="; }; - cargoSha256 = "sha256-QsYOR7tk5cRCF0+xkpJ/F+Z3pjBPxTDFvA1gEi82AOQ="; + cargoSha256 = "sha256-QL71pJ5RBWRRse5DXwctMvu+z818jEEQjaNBXHLy20Y="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index 8897a313e8db..db60d5e8429e 100644 --- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2021-01-16"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "8127799f79ee96129b295d78294f40a54078131f"; - sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns"; + rev = "ddcd476603dfd3388b1dc8234fa9d550156a51f5"; + sha256 = "sha256-E6ABXtzw6bHmrIirB1sJL6S2MEa3sfcvRLzRa92frCo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 59df56f86fa9..5d4a0716cc7a 100644 --- a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.58.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l"; + sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s="; }; patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; diff --git a/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock b/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock index 9f1a24337b81..e631b63963c3 100644 --- a/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock @@ -4,29 +4,35 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) dotenv (2.7.6) - faraday (1.0.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - licensee (9.14.1) + ruby2_keywords + faraday-net_http (1.0.1) + licensee (9.15.1) dotenv (~> 2.0) - octokit (~> 4.17) + octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.18.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) public_suffix (4.0.6) + racc (1.5.2) reverse_markdown (1.4.0) nokogiri + ruby2_keywords (0.0.4) rugged (1.1.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - thor (1.0.1) + thor (1.1.0) PLATFORMS ruby diff --git a/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix b/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix index 281f9376e178..b9b11b465f69 100644 --- a/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix +++ b/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix @@ -21,12 +21,22 @@ version = "2.7.6"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + type = "gem"; + }; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; type = "gem"; }; version = "1.0.1"; @@ -37,20 +47,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5"; + sha256 = "1pvrz9fjvxzk3aq85zgh8dkw98kz54jmwi10k3shc8dqbrlvragy"; type = "gem"; }; - version = "9.14.1"; + version = "9.15.1"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; multipart-post = { groups = ["default"]; @@ -63,15 +73,15 @@ version = "2.1.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -79,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.18.0"; + version = "4.20.0"; }; public_suffix = { groups = ["default"]; @@ -94,6 +104,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; reverse_markdown = { dependencies = ["nokogiri"]; groups = ["default"]; @@ -105,6 +125,16 @@ }; version = "1.4.0"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; rugged = { groups = ["default"]; platforms = []; @@ -131,9 +161,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index bd19f30f1c12..521616a5472d 100644 --- a/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.2.4"; + version = "2.3.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EIHEdU1H5XhhzuWJUEvnKNsuNV8CBJrHBlaZlSfrSro="; + sha256 = "sha256-zS8HXzu0oX66oVmupMU9YZKXGF+IQ/tCrO32PXfHPGY="; }; - vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ="; + vendorSha256 = "sha256-1zPrCmC+J9LbD3tRKzdJbyWbyTtD6SiPZ6efc9CSjsg="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix index 41ce0967b2e3..7b52f2585f35 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0hdvdjm467w37clkhbifn54hbdmnxlbk66cj88lwaz26j4s2ik5g"; }; + nativeBuildInputs = [ makeWrapper ]; + # coreutils, gnutar is actually needed by nix for bootstrap - buildInputs = [ nix coreutils makeWrapper gnutar gzip bzip2 ]; + buildInputs = [ nix coreutils gnutar gzip bzip2 ]; binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ]; diff --git a/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix b/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix index 0e4005022ff9..4dc0098316c6 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix @@ -9,7 +9,8 @@ let self = stdenv.mkDerivation rec { rev = "version-${version}"; sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy"; }; - buildInputs = [ python3 mypy makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 mypy ]; checkPhase = '' mypy bin/* ''; diff --git a/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 8b318306873c..a77d0961c843 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, makeWrapper, buildEnv, - breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion +{ lib, stdenv, makeWrapper, buildEnv +, breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion }: let mkPrefetchScript = tool: src: deps: @@ -22,7 +22,7 @@ let mkPrefetchScript = tool: src: deps: meta = with lib; { description = "Script used to obtain source hashes for fetch${tool}"; maintainers = with maintainers; [ bennofs ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; }; in rec { @@ -40,7 +40,7 @@ in rec { meta = with lib; { description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; maintainers = with maintainers; [ bennofs ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 9ab08007ec71..c54a5b28cee1 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -10,13 +10,13 @@ let common = { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz - , bash, coreutils, gzip, gnutar + , bash, coreutils, util-linuxMinimal, gzip, gnutar , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex - , jq, libarchive + , jq, libarchive, libcpuid , lowdown, mdbook # Used by tests - , gmock + , gtest , busybox-sandbox-shell , storeDir , stateDir @@ -41,6 +41,7 @@ common = nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive @@ -55,7 +56,8 @@ common = ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock lowdown ] + ++ lib.optionals is24 [ libarchive gtest lowdown ] + ++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { @@ -138,7 +140,7 @@ common = doInstallCheck = true; # not cross # socket path becomes too long otherwise - preInstallCheck = lib.optional stdenv.isDarwin '' + preInstallCheck = lib.optionalString stdenv.isDarwin '' export TMPDIR=$NIX_BUILD_TOP ''; @@ -212,28 +214,15 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20201205_a5d85d0"; + suffix = "pre20210326_dd77f71"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a5d85d07faa94cf3518e98273be4bee3d495f06a"; - sha256 = "0g9jjhh0vs4hjrff5yx88x6sh7rk87ngvni3gnyxajqia957dipg"; + rev = "dd77f71afe6733e9790dd001125c423cb648b7ce"; + sha256 = "rVHzrsCtdiWjyLuHnDplG2mx+7dw5VyzZ9ReXxuCvHY="; }; - patches = [ - (fetchpatch { # Fix build on gcc10 - url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; - sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; - }) - # Fix the ETag bug. PR merged. Remove when updating to >= 20210125 - # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750 - (fetchpatch { - url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch"; - sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4="; - }) - ]; - inherit storeDir stateDir confDir boehmgc; }); diff --git a/nixpkgs/pkgs/tools/package-management/nixops/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/default.nix index 0dcbeb8abfed..16ecc7f11de8 100644 --- a/nixpkgs/pkgs/tools/package-management/nixops/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixops/default.nix @@ -63,7 +63,7 @@ in python2Packages.buildPythonApplication { meta = { homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob ]; platforms = lib.platforms.unix; license = lib.licenses.lgpl3; }; diff --git a/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/nixpkgs/pkgs/tools/package-management/opkg/default.nix index c4fc804b80f7..631274cb7222 100644 --- a/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 +{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, xz, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.4.4"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "06278gmb26b9nl8l328cc2c2mhfi0dhac65syws17kf09f2m596x"; + sha256 = "sha256-IhesxYuOsxMAYx66514iLrxwDJwc9kCAiHBdGaRyyDk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; + buildInputs = [ curl gpgme libarchive bzip2 xz attr acl libxml2 ]; meta = with lib; { description = "A lightweight package management system based upon ipkg"; diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix index f87ce8258fa0..d1d135c15795 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; + dontWrapQtApps = true; + meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; }; diff --git a/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/nixpkgs/pkgs/tools/package-management/pacman/default.nix index 771454cd409f..48fa91c7966b 100644 --- a/nixpkgs/pkgs/tools/package-management/pacman/default.nix +++ b/nixpkgs/pkgs/tools/package-management/pacman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2, -lzma, curl, runtimeShell }: +xz, curl, runtimeShell }: stdenv.mkDerivation rec { pname = "pacman"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; + buildInputs = [ curl perl libarchive openssl zlib bzip2 xz ]; postFixup = '' substituteInPlace $out/bin/repo-add \ diff --git a/nixpkgs/pkgs/tools/package-management/python2nix/default.nix b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix deleted file mode 100644 index b6ffe9abc024..000000000000 --- a/nixpkgs/pkgs/tools/package-management/python2nix/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, fetchFromGitHub, pythonPackages }: - -pythonPackages.buildPythonApplication { - name = "python2nix-20140927"; - - src = fetchFromGitHub { - owner = "proger"; - repo = "python2nix"; - rev = "84e3a5bbe82e5d9d694d6db8dabf73def4ac917b"; - sha256 = "022gr0gw6azfi3iq4ggb3fhkw2jljs6n5rncn45hb5liwakigj8i"; - }; - - propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; - - meta = with lib; { - maintainers = [ maintainers.domenkozar ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/nixpkgs/pkgs/tools/package-management/rpm/default.nix index 5c72dc071521..f942efe6dd7b 100644 --- a/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rpm"; - version = "4.16.1.2"; + version = "4.16.1.3"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - sha256 = "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3"; + sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai"; }; outputs = [ "out" "dev" "man" ]; @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.rpm.org/"; - license = licenses.gpl2; + homepage = "https://www.rpm.org/"; + license = with licenses; [ gpl2Plus lgpl21Plus ]; description = "The RPM Package Manager"; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.linux ++ platforms.darwin; |