diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/darwin/m-cli/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/disk-indicator/default.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lvm2/common.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rdma-core/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rdma-core/pkg-config-template.patch | 14 |
7 files changed, 44 insertions, 20 deletions
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index 939ff36ef0ce..9134fad6012c 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "m-cli"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rgcr"; - repo = "m-cli"; + repo = pname; rev = "v${version}"; - sha512 = "0mkcx7jq91pbfs8327qc8434gj73fvjgdfdsrza0lyd9wns6jhsqsf0585klzl68aqscvksgzi2asdnim4va35cdkp2fdzl0g3sm4kd"; + sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4="; }; dontBuild = true; @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { platforms = platforms.darwin; maintainers = with maintainers; []; + mainProgram = "m"; }; } diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index ac30a947ad91..44dd19b27dfb 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, libX11 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation { pname = "disk-indicator"; version = "unstable-2014-05-19"; - src = fetchgit { - url = "https://github.com/MeanEYE/Disk-Indicator.git"; + src = fetchFromGitHub { + owner = "MeanEYE"; + repo = "Disk-Indicator"; rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; - sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd"; + sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI="; }; buildInputs = [ libX11 ]; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 5adb1b5355ad..7b9b35614a45 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { provides the reference implementation for communicating with the FUSE kernel module. ''; - inherit (src.meta) homepage; + homepage = "https://github.com/libfuse/libfuse"; changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}"; platforms = platforms.linux; license = with licenses; [ gpl2Only lgpl21Only ]; diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 0f2e6efe3a26..07e8c9cb02da 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -9,8 +9,8 @@ , libaio , enableCmdlib ? false , enableDmeventd ? false -, udevSupport ? !stdenv.targetPlatform.isStatic, udev ? null -, onlyLib ? stdenv.targetPlatform.isStatic +, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null +, onlyLib ? stdenv.hostPlatform.isStatic , nixosTests }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals udevSupport [ "--enable-udev_rules" "--enable-udev_sync" - ] ++ lib.optionals stdenv.targetPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "--enable-static_link" ]; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) - ] ++ lib.optionals stdenv.targetPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ ./no-shared.diff ]; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { ]; installPhase = lib.optionalString onlyLib '' - install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.targetPlatform.isStatic then "a" else "so"} + install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"} make -C libdm install_include make -C libdm install_pkgconfig ''; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 246295eb7340..a5695dc981f8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -54,10 +54,10 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.94"; - sha256_64bit = "lYWqKTMOutm98izjyiusICbIWpoy8D18WfcUp3mFAOs="; - settingsSha256 = "blJNKuFu/Th/ceexkKhTH/eYk8miUlTT+ESrcIyJNn0="; - persistencedSha256 = "xnccQ/EgafwnReBlk5Y7iClAj4hwXyFq9gUmwqyEuwE="; + version = "470.103.01"; + sha256_64bit = "VsIwn4nCE0Y7DEY2D3siddc3HTxyevP+3IjElu3Ih6U="; + settingsSha256 = "Roc2OFSNEnIGLVwP0D9f8vFTf5v3KkL99S0mZBWN7s0="; + persistencedSha256 = "AVI0j2bpfMCMBTKuQp+BoCewaXIW3Xt4NnV1fjAHOr0="; }; # Last one supporting x86 @@ -67,6 +67,8 @@ rec { sha256_64bit = "09qcdfn4j5jza3iw59wqwgq4a489qf7kx355yssrcahaw9g87lxz"; settingsSha256 = "16qqw0jy31da65cdi17y3j2kcdhw09vra7g17bkcimaqnf70j0ni"; persistencedSha256 = "1ad81y4qfpxrx0vqsk81a3h0bi1yg8hw5gi5y5d58p76vc8083i9"; + + broken = kernel.kernelAtLeast "5.17"; }; legacy_340 = generic { @@ -77,7 +79,7 @@ rec { persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; - broken = with kernel; kernelAtLeast "5.5"; + broken = kernel.kernelAtLeast "5.5"; patches = [ ./vm_operations_struct-fault.patch ]; }; } diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index f7543291deda..d9f6196d931d 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "39.0"; + version = "39.1"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "sha256-7Z06bdCtv/gdZKzKfcU+JrWl4+b6b/cdKp8pMLCZZo0="; + sha256 = "19jfrb0jv050abxswzh34nx2zr8if3rb2k5a7n5ydvi3x9r8827w"; }; strictDeps = true; @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib" ]; + patches = [ + # this has been fixed in master. As soon as it gets into a release, this + # patch won't apply anymore and can be removed. + ./pkg-config-template.patch + ]; + postPatch = '' substituteInPlace srp_daemon/srp_daemon.sh.in \ --replace /bin/rm rm diff --git a/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch b/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch new file mode 100644 index 000000000000..22898bc75282 --- /dev/null +++ b/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch @@ -0,0 +1,14 @@ +diff -ru source/buildlib/template.pc.in source-fixed/buildlib/template.pc.in +--- source/buildlib/template.pc.in 1970-01-01 01:00:01.000000000 +0100 ++++ source-fixed/buildlib/template.pc.in 2022-03-30 22:29:12.988625941 +0200 +@@ -1,7 +1,6 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++exec_prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ + + Name: lib@PC_LIB_NAME@ + Description: RDMA Core Userspace Library |