summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schütz <github@dotlambda.de>2023-03-11 12:34:34 -0800
committerGitHub <noreply@github.com>2023-03-11 12:34:34 -0800
commit955850834125d3e94e8389e6001d46594b927c0f (patch)
treecd9a66bc55ba9ce28788bad3b4cec25186cc0ec7
parentMerge pull request #220716 from superherointj/github-runner-fix-hash (diff)
downloadnixpkgs-origin/revert-220653-alpine-git-revisions.tar.gz
Revert "tree-wide: add git revisions to alpine git urls"origin/revert-220653-alpine-git-revisions
-rw-r--r--pkgs/development/libraries/presage/default.nix2
-rw-r--r--pkgs/development/libraries/rapidjson/default.nix2
-rw-r--r--pkgs/development/python-modules/python-rapidjson/default.nix2
-rw-r--r--pkgs/os-specific/linux/musl/default.nix12
4 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix
index 6b23f9441809..b3c3c21e3046 100644
--- a/pkgs/development/libraries/presage/default.nix
+++ b/pkgs/development/libraries/presage/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
- url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch?id=40e2044c9ecb36eacb3a1fd043f09548d210dc01";
+ url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch";
sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj";
})
./fixed-cppunit-detection.patch
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix
index e5a207d9b656..b67824b5cc55 100644
--- a/pkgs/development/libraries/rapidjson/default.nix
+++ b/pkgs/development/libraries/rapidjson/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82";
})
(fetchpatch {
- url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909";
+ url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch";
hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4=";
})
];
diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index 6f058e0d9d0d..f2cd6d285b75 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -21,7 +21,7 @@ let
};
patches = [
(fetchpatch {
- url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909";
+ url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch";
hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4=";
})
];
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 454c81747444..7a0fabf9d468 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -4,24 +4,20 @@
}:
let
cdefs_h = fetchurl {
- name = "sys-cdefs.h";
- url = "https://git.alpinelinux.org/aports/plain/main/libc-dev/sys-cdefs.h?id=7ca0ed62d4c0d713d9c7dd5b9a077fba78bce578";
+ url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-cdefs.h";
sha256 = "16l3dqnfq0f20rzbkhc38v74nqcsh9n3f343bpczqq8b1rz6vfrh";
};
queue_h = fetchurl {
- name = "sys-queue.h";
- url = "http://git.alpinelinux.org/aports/plain/main/libc-dev/sys-queue.h?id=7ca0ed62d4c0d713d9c7dd5b9a077fba78bce578";
+ url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-queue.h";
sha256 = "12qm82id7zys92a1qh2l1qf2wqgq6jr4qlbjmqyfffz3s3nhfd61";
};
tree_h = fetchurl {
- name = "sys-tree.h";
- url = "http://git.alpinelinux.org/aports/plain/main/libc-dev/sys-tree.h?id=7ca0ed62d4c0d713d9c7dd5b9a077fba78bce578";
+ url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-tree.h";
sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71";
};
stack_chk_fail_local_c = fetchurl {
- name = "__stack_chk_fail_local.c";
- url = "https://git.alpinelinux.org/aports/plain/main/musl/__stack_chk_fail_local.c?id=9afbe3cbbf4c30ff23c733218c3c03d7e8c6461d";
+ url = "https://git.alpinelinux.org/aports/plain/main/musl/__stack_chk_fail_local.c?h=3.10-stable";
sha256 = "1nhkzzy9pklgjcq2yg89d3l18jif331srd3z3vhy5qwxl1spv6i9";
};